Commit 15772e4d authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Jakub Kicinski
Browse files

net: phy: broadcom: remove use of ack_interrupt() 



In preparation of removing the .ack_interrupt() callback, we must replace
its occurrences (aka phy_clear_interrupt), from the 2 places where it is
called from (phy_enable_interrupts and phy_disable_interrupts), with
equivalent functionality.

This means that clearing interrupts now becomes something that the PHY
driver is responsible of doing, before enabling interrupts and after
clearing them. Make this driver follow the new contract.

Cc: Michael Walle <michael@walle.cc>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4567d5c3

drivers/net/phy/bcm-cygnus.c

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static struct phy_driver bcm_cygnus_phy_driver[] = { 
	.name          = "Broadcom Cygnus PHY",

	/* PHY_GBIT_FEATURES */

	.config_init   = bcm_cygnus_config_init,

	.ack_interrupt = bcm_phy_ack_intr,

	.config_intr   = bcm_phy_config_intr,

	.handle_interrupt = bcm_phy_handle_interrupt,

	.suspend       = genphy_suspend,

drivers/net/phy/bcm-phy-lib.c

+14 −4
Original line number Diff line number Diff line
@@ -181,18 +181,28 @@ EXPORT_SYMBOL_GPL(bcm_phy_ack_intr); 


int bcm_phy_config_intr(struct phy_device *phydev)

{

	int reg;

	int reg, err;



	reg = phy_read(phydev, MII_BCM54XX_ECR);

	if (reg < 0)

		return reg;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)

	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {

		err = bcm_phy_ack_intr(phydev);

		if (err)

			return err;



		reg &= ~MII_BCM54XX_ECR_IM;

	else

		err = phy_write(phydev, MII_BCM54XX_ECR, reg);

	} else {

		reg |= MII_BCM54XX_ECR_IM;

		err = phy_write(phydev, MII_BCM54XX_ECR, reg);

		if (err)

			return err;



	return phy_write(phydev, MII_BCM54XX_ECR, reg);

		err = bcm_phy_ack_intr(phydev);

	}

	return err;

}

EXPORT_SYMBOL_GPL(bcm_phy_config_intr);

drivers/net/phy/bcm54140.c

+15 −5
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static int bcm54140_config_intr(struct phy_device *phydev) 
		BCM54140_RDB_TOP_IMR_PORT0, BCM54140_RDB_TOP_IMR_PORT1,

		BCM54140_RDB_TOP_IMR_PORT2, BCM54140_RDB_TOP_IMR_PORT3,

	};

	int reg;

	int reg, err;



	if (priv->port >= ARRAY_SIZE(port_to_imr_bit))

		return -EINVAL;
@@ -690,12 +690,23 @@ static int bcm54140_config_intr(struct phy_device *phydev) 
	if (reg < 0)

		return reg;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)

	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {

		err = bcm54140_ack_intr(phydev);

		if (err)

			return err;



		reg &= ~port_to_imr_bit[priv->port];

	else

		err = bcm54140_base_write_rdb(phydev, BCM54140_RDB_TOP_IMR, reg);

	} else {

		reg |= port_to_imr_bit[priv->port];

		err = bcm54140_base_write_rdb(phydev, BCM54140_RDB_TOP_IMR, reg);

		if (err)

			return err;



		err = bcm54140_ack_intr(phydev);

	}



	return bcm54140_base_write_rdb(phydev, BCM54140_RDB_TOP_IMR, reg);

	return err;

}



static int bcm54140_get_downshift(struct phy_device *phydev, u8 *data)
@@ -850,7 +861,6 @@ static struct phy_driver bcm54140_drivers[] = { 
		.flags		= PHY_POLL_CABLE_TEST,

		.features       = PHY_GBIT_FEATURES,

		.config_init    = bcm54140_config_init,

		.ack_interrupt  = bcm54140_ack_intr,

		.handle_interrupt = bcm54140_handle_interrupt,

		.config_intr    = bcm54140_config_intr,

		.probe		= bcm54140_probe,

drivers/net/phy/bcm63xx.c

+13 −5
Original line number Diff line number Diff line
@@ -25,12 +25,22 @@ static int bcm63xx_config_intr(struct phy_device *phydev) 
	if (reg < 0)

		return reg;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)

	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {

		err = bcm_phy_ack_intr(phydev);

		if (err)

			return err;



		reg &= ~MII_BCM63XX_IR_GMASK;

	else

		err = phy_write(phydev, MII_BCM63XX_IR, reg);

	} else {

		reg |= MII_BCM63XX_IR_GMASK;



		err = phy_write(phydev, MII_BCM63XX_IR, reg);

		if (err)

			return err;



		err = bcm_phy_ack_intr(phydev);

	}



	return err;

}
@@ -67,7 +77,6 @@ static struct phy_driver bcm63xx_driver[] = { 
	/* PHY_BASIC_FEATURES */

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm63xx_config_init,

	.ack_interrupt	= bcm_phy_ack_intr,

	.config_intr	= bcm63xx_config_intr,

	.handle_interrupt = bcm_phy_handle_interrupt,

}, {
@@ -78,7 +87,6 @@ static struct phy_driver bcm63xx_driver[] = { 
	/* PHY_BASIC_FEATURES */

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm63xx_config_init,

	.ack_interrupt	= bcm_phy_ack_intr,

	.config_intr	= bcm63xx_config_intr,

	.handle_interrupt = bcm_phy_handle_interrupt,

} };

drivers/net/phy/bcm87xx.c

+13 −21
Original line number Diff line number Diff line
@@ -144,12 +144,22 @@ static int bcm87xx_config_intr(struct phy_device *phydev) 
	if (reg < 0)

		return reg;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)

	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {

		err = phy_read(phydev, BCM87XX_LASI_STATUS);

		if (err)

			return err;



		reg |= 1;

	else

		err = phy_write(phydev, BCM87XX_LASI_CONTROL, reg);

	} else {

		reg &= ~1;



		err = phy_write(phydev, BCM87XX_LASI_CONTROL, reg);

		if (err)

			return err;



		err = phy_read(phydev, BCM87XX_LASI_STATUS);

	}



	return err;

}
@@ -171,22 +181,6 @@ static irqreturn_t bcm87xx_handle_interrupt(struct phy_device *phydev) 
	return IRQ_HANDLED;

}



static int bcm87xx_ack_interrupt(struct phy_device *phydev)

{

	int reg;



	/* Reading the LASI status clears it. */

	reg = phy_read(phydev, BCM87XX_LASI_STATUS);



	if (reg < 0) {

		phydev_err(phydev,

			   "Error: Read of BCM87XX_LASI_STATUS failed: %d\n",

			   reg);

		return 0;

	}

	return (reg & 1) != 0;

}



static int bcm8706_match_phy_device(struct phy_device *phydev)

{

	return phydev->c45_ids.device_ids[4] == PHY_ID_BCM8706;
@@ -206,7 +200,6 @@ static struct phy_driver bcm87xx_driver[] = { 
	.config_init	= bcm87xx_config_init,

	.config_aneg	= bcm87xx_config_aneg,

	.read_status	= bcm87xx_read_status,

	.ack_interrupt	= bcm87xx_ack_interrupt,

	.config_intr	= bcm87xx_config_intr,

	.handle_interrupt = bcm87xx_handle_interrupt,

	.match_phy_device = bcm8706_match_phy_device,
@@ -218,7 +211,6 @@ static struct phy_driver bcm87xx_driver[] = { 
	.config_init	= bcm87xx_config_init,

	.config_aneg	= bcm87xx_config_aneg,

	.read_status	= bcm87xx_read_status,

	.ack_interrupt	= bcm87xx_ack_interrupt,

	.config_intr	= bcm87xx_config_intr,

	.handle_interrupt = bcm87xx_handle_interrupt,

	.match_phy_device = bcm8727_match_phy_device,

CRA Git | Maintained and supported by SUSTech CRA and CCSE