NACK: [PATCH 1/2 V2][SRU][H] net: phy: rename PHY_IGNORE_INTERRUPT to PHY_MAC_INTERRUPT
Koba Ko
koba.ko at canonical.com
Tue Aug 3 02:57:57 UTC 2021
Will add cover letter for Hirsute
On Thu, Jul 1, 2021 at 4:10 PM Koba Ko <koba.ko at canonical.com> wrote:
>
> From: Heiner Kallweit <hkallweit1 at gmail.com>
>
> BugLink: https://bugs.launchpad.net/bugs/1930645
>
> Some internal PHY's have their events like link change reported by the
> MAC interrupt. We have PHY_IGNORE_INTERRUPT to deal with this scenario.
> I'm not too happy with this name. We don't ignore interrupts, typically
> there is no interrupt exposed at a PHY level. So let's rename it to
> PHY_MAC_INTERRUPT. This is in line with phy_mac_interrupt(), which is
> called from the MAC interrupt handler to handle PHY events.
>
> Signed-off-by: Heiner Kallweit <hkallweit1 at gmail.com>
> Reviewed-by: Andrew Lunn <andrew at lunn.ch>
> Acked-by: Florian Fainelli <f.fainelli at gmail.com>
> Reviewed-by: Russell King <rmk+kernel at armlinux.org.uk>
> Signed-off-by: David S. Miller <davem at davemloft.net>
> (cherry picked from commit 93e8990c24bee30696c02e8f6aed043333491a25)
> Signed-off-by: Koba Ko <koba.ko at canonical.com>
> ---
> Documentation/networking/phy.rst | 2 +-
> drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 +-
> drivers/net/ethernet/realtek/r8169_main.c | 2 +-
> drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c | 4 ++--
> drivers/net/mdio/mdio-moxart.c | 4 ++--
> drivers/net/phy/icplus.c | 2 +-
> drivers/net/phy/phy.c | 2 +-
> drivers/net/phy/phy_device.c | 4 ++--
> include/linux/phy.h | 10 +++++-----
> 9 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/Documentation/networking/phy.rst b/Documentation/networking/phy.rst
> index b2f7ec794bc8b..23c70948a152a 100644
> --- a/Documentation/networking/phy.rst
> +++ b/Documentation/networking/phy.rst
> @@ -216,7 +216,7 @@ put into an unsupported state.
> Lastly, once the controller is ready to handle network traffic, you call
> phy_start(phydev). This tells the PAL that you are ready, and configures the
> PHY to connect to the network. If the MAC interrupt of your network driver
> -also handles PHY status changes, just set phydev->irq to PHY_IGNORE_INTERRUPT
> +also handles PHY status changes, just set phydev->irq to PHY_MAC_INTERRUPT
> before you call phy_start and use phy_mac_interrupt() from the network
> driver. If you don't want to use interrupts, set phydev->irq to PHY_POLL.
> phy_start() enables the PHY interrupts (if applicable) and starts the
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
> index 6fb6c35562854..f05608d8eb974 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
> @@ -359,7 +359,7 @@ int bcmgenet_mii_probe(struct net_device *dev)
> * those versions of GENET.
> */
> if (priv->internal_phy && !GENET_IS_V5(priv))
> - dev->phydev->irq = PHY_IGNORE_INTERRUPT;
> + dev->phydev->irq = PHY_MAC_INTERRUPT;
>
> return 0;
> }
> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
> index 6d58427739d93..bcbce17f4adac 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -5165,7 +5165,7 @@ static int r8169_mdio_register(struct rtl8169_private *tp)
> new_bus->name = "r8169";
> new_bus->priv = tp;
> new_bus->parent = &pdev->dev;
> - new_bus->irq[0] = PHY_IGNORE_INTERRUPT;
> + new_bus->irq[0] = PHY_MAC_INTERRUPT;
> snprintf(new_bus->id, MII_BUS_ID_SIZE, "r8169-%x", pci_dev_id(pdev));
>
> new_bus->read = r8169_mdio_read_reg;
> diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
> index b1e7f7ab281c9..fceb6d6372352 100644
> --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
> +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
> @@ -203,8 +203,8 @@ int sxgbe_mdio_register(struct net_device *ndev)
> case PHY_POLL:
> irq_str = "POLL";
> break;
> - case PHY_IGNORE_INTERRUPT:
> - irq_str = "IGNORE";
> + case PHY_MAC_INTERRUPT:
> + irq_str = "MAC";
> break;
> default:
> sprintf(irq_num, "%d", phy->irq);
> diff --git a/drivers/net/mdio/mdio-moxart.c b/drivers/net/mdio/mdio-moxart.c
> index b72c6d185175e..f0cff584e1767 100644
> --- a/drivers/net/mdio/mdio-moxart.c
> +++ b/drivers/net/mdio/mdio-moxart.c
> @@ -125,7 +125,7 @@ static int moxart_mdio_probe(struct platform_device *pdev)
> snprintf(bus->id, MII_BUS_ID_SIZE, "%s-%d-mii", pdev->name, pdev->id);
> bus->parent = &pdev->dev;
>
> - /* Setting PHY_IGNORE_INTERRUPT here even if it has no effect,
> + /* Setting PHY_MAC_INTERRUPT here even if it has no effect,
> * of_mdiobus_register() sets these PHY_POLL.
> * Ideally, the interrupt from MAC controller could be used to
> * detect link state changes, not polling, i.e. if there was
> @@ -133,7 +133,7 @@ static int moxart_mdio_probe(struct platform_device *pdev)
> * interrupt handled in ethernet drivercode.
> */
> for (i = 0; i < PHY_MAX_ADDR; i++)
> - bus->irq[i] = PHY_IGNORE_INTERRUPT;
> + bus->irq[i] = PHY_MAC_INTERRUPT;
>
> data = bus->priv;
> data->base = devm_platform_ioremap_resource(pdev, 0);
> diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
> index d6e8516cd146e..203cb24e35840 100644
> --- a/drivers/net/phy/icplus.c
> +++ b/drivers/net/phy/icplus.c
> @@ -184,7 +184,7 @@ static int ip175c_read_status(struct phy_device *phydev)
> genphy_read_status(phydev);
> else
> /* Don't need to read status for switch ports */
> - phydev->irq = PHY_IGNORE_INTERRUPT;
> + phydev->irq = PHY_MAC_INTERRUPT;
>
> return 0;
> }
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 28ddaad721ed1..61ebb3d82f443 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -1189,7 +1189,7 @@ void phy_state_machine(struct work_struct *work)
> }
>
> /* Only re-schedule a PHY state machine change if we are polling the
> - * PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving
> + * PHY, if PHY_MAC_INTERRUPT is set, then we will be moving
> * between states from phy_mac_interrupt().
> *
> * In state PHY_HALTED the PHY gets suspended, so rescheduling the
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index 85f3cde5ffd09..f8e0c616f7989 100644
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -1146,8 +1146,8 @@ char *phy_attached_info_irq(struct phy_device *phydev)
> case PHY_POLL:
> irq_str = "POLL";
> break;
> - case PHY_IGNORE_INTERRUPT:
> - irq_str = "IGNORE";
> + case PHY_MAC_INTERRUPT:
> + irq_str = "MAC";
> break;
> default:
> snprintf(irq_num, sizeof(irq_num), "%d", phydev->irq);
> diff --git a/include/linux/phy.h b/include/linux/phy.h
> index 08725a262f320..de0a43329d6be 100644
> --- a/include/linux/phy.h
> +++ b/include/linux/phy.h
> @@ -71,11 +71,11 @@ extern const int phy_10gbit_features_array[1];
>
> /*
> * Set phydev->irq to PHY_POLL if interrupts are not supported,
> - * or not desired for this PHY. Set to PHY_IGNORE_INTERRUPT if
> - * the attached driver handles the interrupt
> + * or not desired for this PHY. Set to PHY_MAC_INTERRUPT if
> + * the attached MAC driver handles the interrupt
> */
> #define PHY_POLL -1
> -#define PHY_IGNORE_INTERRUPT -2
> +#define PHY_MAC_INTERRUPT -2
>
> #define PHY_IS_INTERNAL 0x00000001
> #define PHY_RST_AFTER_CLK_EN 0x00000002
> @@ -1201,11 +1201,11 @@ static inline int phy_clear_bits_mmd(struct phy_device *phydev, int devad,
> * @phydev: the phy_device struct
> *
> * NOTE: must be kept in sync with addition/removal of PHY_POLL and
> - * PHY_IGNORE_INTERRUPT
> + * PHY_MAC_INTERRUPT
> */
> static inline bool phy_interrupt_is_valid(struct phy_device *phydev)
> {
> - return phydev->irq != PHY_POLL && phydev->irq != PHY_IGNORE_INTERRUPT;
> + return phydev->irq != PHY_POLL && phydev->irq != PHY_MAC_INTERRUPT;
> }
>
> /**
> --
> 2.25.1
>
More information about the kernel-team
mailing list