Commit 93e8990c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: rename PHY_IGNORE_INTERRUPT to PHY_MAC_INTERRUPT 



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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63477a5d

Documentation/networking/phy.rst

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/broadcom/genet/bcmmii.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/ethernet/realtek/r8169_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5056,7 +5056,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;

drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/mdio/mdio-moxart.c

+2 −2
Original line number Diff line number Diff line
@@ -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);