Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a8729eb302a5b5da8b0b4d29582c42648a2e0f12

Authored by Anatolij Gustschin
Committed by David S. Miller
1 parent 140bc92903
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

phylib: Allow early-out in phy_change 

Marvell 88E1121R Dual PHY device can be hardware-configured
to use shared interrupt pin for both PHY ports. For such
PHY configurations using shared PHY interrupt phy_interrupt()
handler will also schedule a work for PHY port which didn't
cause an interrupt.

This patch adds a possibility for PHY drivers to provide
did_interrupt() function which reports if the PHY (or a PHY
port in a multi-PHY device) generated an interrupt. This
function is called in phy_change() as phy_change() shouldn't
proceed if it is invoked for a PHY which didn't cause an
interrupt. So check for interrupt originator in phy_change()
to allow early-out.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 15 additions and 0 deletions Side-by-side Diff

drivers/net/phy/phy.c
Diff comments   View file @ a8729eb
... ... @@ -655,6 +655,10 @@
655 655 struct phy_device *phydev =
656 656 container_of(work, struct phy_device, phy_queue);
657 657  
  658 + if (phydev->drv->did_interrupt &&
  659 + !phydev->drv->did_interrupt(phydev))
  660 + goto ignore;
  661 +
658 662 err = phy_disable_interrupts(phydev);
659 663  
660 664 if (err)
... ... @@ -679,6 +683,11 @@
679 683 cancel_delayed_work_sync(&phydev->state_queue);
680 684 schedule_delayed_work(&phydev->state_queue, 0);
681 685  
  686 + return;
  687 +
  688 +ignore:
  689 + atomic_dec(&phydev->irq_disable);
  690 + enable_irq(phydev->irq);
682 691 return;
683 692  
684 693 irq_enable_err:
... ... @@ -388,6 +388,12 @@
388 388 /* Enables or disables interrupts */
389 389 int (*config_intr)(struct phy_device *phydev);
390 390  
  391 + /*
  392 + * Checks if the PHY generated an interrupt.
  393 + * For multi-PHY devices with shared PHY interrupt pin
  394 + */
  395 + int (*did_interrupt)(struct phy_device *phydev);
  396 +
391 397 /* Clears up any memory if needed */
392 398 void (*remove)(struct phy_device *phydev);
393 399