From: Greg Kroah-Hartman Date: Thu, 1 May 2025 07:52:25 +0000 (+0200) Subject: drop net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch from 6.1 and 5.15 X-Git-Tag: v5.4.293~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=781d6412f529cb10d571e3e4f6daf4cc7e3e02a7;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch from 6.1 and 5.15 --- diff --git a/queue-5.15/net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch b/queue-5.15/net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch deleted file mode 100644 index 39bf8d37aa..0000000000 --- a/queue-5.15/net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 30a41ed32d3088cd0d682a13d7f30b23baed7e93 Mon Sep 17 00:00:00 2001 -From: Fiona Klute -Date: Wed, 16 Apr 2025 12:24:13 +0200 -Subject: net: phy: microchip: force IRQ polling mode for lan88xx - -From: Fiona Klute - -commit 30a41ed32d3088cd0d682a13d7f30b23baed7e93 upstream. - -With lan88xx based devices the lan78xx driver can get stuck in an -interrupt loop while bringing the device up, flooding the kernel log -with messages like the following: - -lan78xx 2-3:1.0 enp1s0u3: kevent 4 may have been dropped - -Removing interrupt support from the lan88xx PHY driver forces the -driver to use polling instead, which avoids the problem. - -The issue has been observed with Raspberry Pi devices at least since -4.14 (see [1], bug report for their downstream kernel), as well as -with Nvidia devices [2] in 2020, where disabling interrupts was the -vendor-suggested workaround (together with the claim that phylib -changes in 4.9 made the interrupt handling in lan78xx incompatible). - -Iperf reports well over 900Mbits/sec per direction with client in ---dualtest mode, so there does not seem to be a significant impact on -throughput (lan88xx device connected via switch to the peer). - -[1] https://github.com/raspberrypi/linux/issues/2447 -[2] https://forums.developer.nvidia.com/t/jetson-xavier-and-lan7800-problem/142134/11 - -Link: https://lore.kernel.org/0901d90d-3f20-4a10-b680-9c978e04ddda@lunn.ch -Fixes: 792aec47d59d ("add microchip LAN88xx phy driver") -Signed-off-by: Fiona Klute -Cc: kernel-list@raspberrypi.com -Cc: stable@vger.kernel.org -Reviewed-by: Andrew Lunn -Link: https://patch.msgid.link/20250416102413.30654-1-fiona.klute@gmx.de -Signed-off-by: Paolo Abeni -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/microchip.c | 46 ++------------------------------------------ - 1 file changed, 3 insertions(+), 43 deletions(-) - ---- a/drivers/net/phy/microchip.c -+++ b/drivers/net/phy/microchip.c -@@ -31,47 +31,6 @@ static int lan88xx_write_page(struct phy - return __phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, page); - } - --static int lan88xx_phy_config_intr(struct phy_device *phydev) --{ -- int rc; -- -- if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { -- /* unmask all source and clear them before enable */ -- rc = phy_write(phydev, LAN88XX_INT_MASK, 0x7FFF); -- rc = phy_read(phydev, LAN88XX_INT_STS); -- rc = phy_write(phydev, LAN88XX_INT_MASK, -- LAN88XX_INT_MASK_MDINTPIN_EN_ | -- LAN88XX_INT_MASK_LINK_CHANGE_); -- } else { -- rc = phy_write(phydev, LAN88XX_INT_MASK, 0); -- if (rc) -- return rc; -- -- /* Ack interrupts after they have been disabled */ -- rc = phy_read(phydev, LAN88XX_INT_STS); -- } -- -- return rc < 0 ? rc : 0; --} -- --static irqreturn_t lan88xx_handle_interrupt(struct phy_device *phydev) --{ -- int irq_status; -- -- irq_status = phy_read(phydev, LAN88XX_INT_STS); -- if (irq_status < 0) { -- phy_error(phydev); -- return IRQ_NONE; -- } -- -- if (!(irq_status & LAN88XX_INT_STS_LINK_CHANGE_)) -- return IRQ_NONE; -- -- phy_trigger_machine(phydev); -- -- return IRQ_HANDLED; --} -- - static int lan88xx_suspend(struct phy_device *phydev) - { - struct lan88xx_priv *priv = phydev->priv; -@@ -388,8 +347,9 @@ static struct phy_driver microchip_phy_d - .config_aneg = lan88xx_config_aneg, - .link_change_notify = lan88xx_link_change_notify, - -- .config_intr = lan88xx_phy_config_intr, -- .handle_interrupt = lan88xx_handle_interrupt, -+ /* Interrupt handling is broken, do not define related -+ * functions to force polling. -+ */ - - .suspend = lan88xx_suspend, - .resume = genphy_resume, diff --git a/queue-5.15/series b/queue-5.15/series index 5eb7a25716..6afee12b9c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -296,7 +296,6 @@ iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch riscv-uprobes-add-missing-fence.i-after-building-the.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch net-selftests-initialize-tcp-header-and-skb-payload-with-zero.patch -net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch drm-amd-display-fix-gpu-reset-in-multidisplay-config.patch kvm-svm-allocate-ir-data-using-atomic-allocation.patch mcb-fix-a-double-free-bug-in-chameleon_parse_gdd.patch diff --git a/queue-6.1/net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch b/queue-6.1/net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch deleted file mode 100644 index 0f6b9ac8c4..0000000000 --- a/queue-6.1/net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 30a41ed32d3088cd0d682a13d7f30b23baed7e93 Mon Sep 17 00:00:00 2001 -From: Fiona Klute -Date: Wed, 16 Apr 2025 12:24:13 +0200 -Subject: net: phy: microchip: force IRQ polling mode for lan88xx - -From: Fiona Klute - -commit 30a41ed32d3088cd0d682a13d7f30b23baed7e93 upstream. - -With lan88xx based devices the lan78xx driver can get stuck in an -interrupt loop while bringing the device up, flooding the kernel log -with messages like the following: - -lan78xx 2-3:1.0 enp1s0u3: kevent 4 may have been dropped - -Removing interrupt support from the lan88xx PHY driver forces the -driver to use polling instead, which avoids the problem. - -The issue has been observed with Raspberry Pi devices at least since -4.14 (see [1], bug report for their downstream kernel), as well as -with Nvidia devices [2] in 2020, where disabling interrupts was the -vendor-suggested workaround (together with the claim that phylib -changes in 4.9 made the interrupt handling in lan78xx incompatible). - -Iperf reports well over 900Mbits/sec per direction with client in ---dualtest mode, so there does not seem to be a significant impact on -throughput (lan88xx device connected via switch to the peer). - -[1] https://github.com/raspberrypi/linux/issues/2447 -[2] https://forums.developer.nvidia.com/t/jetson-xavier-and-lan7800-problem/142134/11 - -Link: https://lore.kernel.org/0901d90d-3f20-4a10-b680-9c978e04ddda@lunn.ch -Fixes: 792aec47d59d ("add microchip LAN88xx phy driver") -Signed-off-by: Fiona Klute -Cc: kernel-list@raspberrypi.com -Cc: stable@vger.kernel.org -Reviewed-by: Andrew Lunn -Link: https://patch.msgid.link/20250416102413.30654-1-fiona.klute@gmx.de -Signed-off-by: Paolo Abeni -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/microchip.c | 46 ++------------------------------------------ - 1 file changed, 3 insertions(+), 43 deletions(-) - ---- a/drivers/net/phy/microchip.c -+++ b/drivers/net/phy/microchip.c -@@ -31,47 +31,6 @@ static int lan88xx_write_page(struct phy - return __phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, page); - } - --static int lan88xx_phy_config_intr(struct phy_device *phydev) --{ -- int rc; -- -- if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { -- /* unmask all source and clear them before enable */ -- rc = phy_write(phydev, LAN88XX_INT_MASK, 0x7FFF); -- rc = phy_read(phydev, LAN88XX_INT_STS); -- rc = phy_write(phydev, LAN88XX_INT_MASK, -- LAN88XX_INT_MASK_MDINTPIN_EN_ | -- LAN88XX_INT_MASK_LINK_CHANGE_); -- } else { -- rc = phy_write(phydev, LAN88XX_INT_MASK, 0); -- if (rc) -- return rc; -- -- /* Ack interrupts after they have been disabled */ -- rc = phy_read(phydev, LAN88XX_INT_STS); -- } -- -- return rc < 0 ? rc : 0; --} -- --static irqreturn_t lan88xx_handle_interrupt(struct phy_device *phydev) --{ -- int irq_status; -- -- irq_status = phy_read(phydev, LAN88XX_INT_STS); -- if (irq_status < 0) { -- phy_error(phydev); -- return IRQ_NONE; -- } -- -- if (!(irq_status & LAN88XX_INT_STS_LINK_CHANGE_)) -- return IRQ_NONE; -- -- phy_trigger_machine(phydev); -- -- return IRQ_HANDLED; --} -- - static int lan88xx_suspend(struct phy_device *phydev) - { - struct lan88xx_priv *priv = phydev->priv; -@@ -392,8 +351,9 @@ static struct phy_driver microchip_phy_d - .config_aneg = lan88xx_config_aneg, - .link_change_notify = lan88xx_link_change_notify, - -- .config_intr = lan88xx_phy_config_intr, -- .handle_interrupt = lan88xx_handle_interrupt, -+ /* Interrupt handling is broken, do not define related -+ * functions to force polling. -+ */ - - .suspend = lan88xx_suspend, - .resume = genphy_resume, diff --git a/queue-6.1/series b/queue-6.1/series index ef7d2957b0..abf3002a70 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -55,7 +55,6 @@ wifi-rtw88-use-ieee80211_purge_tx_queue-to-purge-tx-skb.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch xen-netfront-handle-null-returned-by-xdp_convert_buff_to_frame.patch net-selftests-initialize-tcp-header-and-skb-payload-with-zero.patch -net-phy-microchip-force-irq-polling-mode-for-lan88xx.patch drm-amd-display-fix-gpu-reset-in-multidisplay-config.patch drm-amd-display-force-full-update-in-gpu-reset.patch loongarch-return-null-from-huge_pte_offset-for-invalid-pmd.patch