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

net: phy: core: remove now uneeded disabling of interrupts 



After commits c974bdbc "net: phy: Use threaded IRQ, to allow IRQ from
sleeping devices" and 664fcf12 "net: phy: Threaded interrupts allow
some simplification" all relevant code pieces run in process context
anyway and I don't think we need the disabling of interrupts any longer.

Interestingly enough, latter commit already removed the comment
explaining why interrupts need to be temporarily disabled.

On my system phy interrupt mode works fine with this patch.
However I may miss something, especially in the context of shared phy
interrupts, therefore I'd appreciate if more people could test this.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6d3c96f

drivers/net/phy/phy.c

+2 −24
Original line number Diff line number Diff line
@@ -632,9 +632,6 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat) 
	if (PHY_HALTED == phydev->state)

		return IRQ_NONE;		/* It can't be ours.  */



	disable_irq_nosync(irq);

	atomic_inc(&phydev->irq_disable);



	phy_change(phydev);



	return IRQ_HANDLED;
@@ -692,7 +689,6 @@ phy_err: 
 */

int phy_start_interrupts(struct phy_device *phydev)

{

	atomic_set(&phydev->irq_disable, 0);

	if (request_threaded_irq(phydev->irq, NULL, phy_interrupt,

				 IRQF_ONESHOT | IRQF_SHARED,

				 phydev_name(phydev), phydev) < 0) {
@@ -719,13 +715,6 @@ int phy_stop_interrupts(struct phy_device *phydev) 


	free_irq(phydev->irq, phydev);



	/* If work indeed has been cancelled, disable_irq() will have

	 * been left unbalanced from phy_interrupt() and enable_irq()

	 * has to be called so that other devices on the line work.

	 */

	while (atomic_dec_return(&phydev->irq_disable) >= 0)

		enable_irq(phydev->irq);



	return err;

}

EXPORT_SYMBOL(phy_stop_interrupts);
@@ -739,7 +728,7 @@ void phy_change(struct phy_device *phydev) 
	if (phy_interrupt_is_valid(phydev)) {

		if (phydev->drv->did_interrupt &&

		    !phydev->drv->did_interrupt(phydev))

			goto ignore;

			return;



		if (phy_disable_interrupts(phydev))

			goto phy_err;
@@ -751,27 +740,16 @@ void phy_change(struct phy_device *phydev) 
	mutex_unlock(&phydev->lock);



	if (phy_interrupt_is_valid(phydev)) {

		atomic_dec(&phydev->irq_disable);

		enable_irq(phydev->irq);



		/* Reenable interrupts */

		if (PHY_HALTED != phydev->state &&

		    phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED))

			goto irq_enable_err;

			goto phy_err;

	}



	/* reschedule state queue work to run as soon as possible */

	phy_trigger_machine(phydev, true);

	return;



ignore:

	atomic_dec(&phydev->irq_disable);

	enable_irq(phydev->irq);

	return;



irq_enable_err:

	disable_irq(phydev->irq);

	atomic_inc(&phydev->irq_disable);

phy_err:

	phy_error(phydev);

}

include/linux/phy.h

+0 −1
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ struct phy_device { 
	/* Interrupt and Polling infrastructure */

	struct work_struct phy_queue;

	struct delayed_work state_queue;

	atomic_t irq_disable;



	struct mutex lock;

CRA Git | Maintained and supported by SUSTech CRA and CCSE