Skip to content

GitLab

L
linux
Commit 7c2509ac authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed LAN7430 driver to use correct config init

parent 6db5acea
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 28 deletions
linux-5.12.10-improved_LAN7430_driver.patch
View file @ 7c2509ac
diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/Kconfig linux-5.12.10-cabletest/drivers/net/ethernet/microchip/Kconfig diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/Kconfig linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/Kconfig
--- linux-5.12.10/drivers/net/ethernet/microchip/Kconfig 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/ethernet/microchip/Kconfig 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/ethernet/microchip/Kconfig 2026-03-23 04:15:40.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/Kconfig 2026-06-10 04:47:13.000000000 +0000
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
select PHYLIB select PHYLIB
select CRC16 select CRC16
...@@ -9,9 +9,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/Kconfig linux-5.12.10-cab ...@@ -9,9 +9,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/Kconfig linux-5.12.10-cab
help help
Support for the Microchip LAN743x PCI Express Gigabit Ethernet chip Support for the Microchip LAN743x PCI Express Gigabit Ethernet chip
diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.c linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ethtool.c diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.c linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ethtool.c
--- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ethtool.c 2026-03-23 03:46:22.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ethtool.c 2026-06-10 04:47:13.000000000 +0000
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
#include <linux/phy.h> #include <linux/phy.h>
#include "lan743x_main.h" #include "lan743x_main.h"
...@@ -907,9 +907,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.c linux-5 ...@@ -907,9 +907,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.c linux-5
#ifdef CONFIG_PM #ifdef CONFIG_PM
.get_wol = lan743x_ethtool_get_wol, .get_wol = lan743x_ethtool_get_wol,
.set_wol = lan743x_ethtool_set_wol, .set_wol = lan743x_ethtool_set_wol,
diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.h linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ethtool.h diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.h linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ethtool.h
--- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ethtool.h 2026-03-22 21:42:17.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ethtool.h 2026-06-10 04:47:13.000000000 +0000
@@ -6,6 +6,101 @@ @@ -6,6 +6,101 @@
#include "linux/ethtool.h" #include "linux/ethtool.h"
...@@ -1012,9 +1012,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.h linux-5 ...@@ -1012,9 +1012,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ethtool.h linux-5
extern const struct ethtool_ops lan743x_ethtool_ops; extern const struct ethtool_ops lan743x_ethtool_ops;
#endif /* _LAN743X_ETHTOOL_H */ #endif /* _LAN743X_ETHTOOL_H */
diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.c linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_main.c diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.c linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_main.c
--- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_main.c 2026-03-29 05:38:33.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_main.c 2026-06-10 04:47:13.000000000 +0000
@@ -15,9 +15,73 @@ @@ -15,9 +15,73 @@
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
...@@ -2855,9 +2855,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.c linux-5.12 ...@@ -2855,9 +2855,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.c linux-5.12
{ 0, } { 0, }
}; };
diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.h linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_main.h diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.h linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_main.h
--- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_main.h 2026-03-29 05:13:12.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_main.h 2026-06-10 04:47:13.000000000 +0000
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
#define _LAN743X_H #define _LAN743X_H
...@@ -3481,9 +3481,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.h linux-5.12 ...@@ -3481,9 +3481,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_main.h linux-5.12
+int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr); +int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr);
#endif /* _LAN743X_H */ #endif /* _LAN743X_H */
diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.c linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ptp.c diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.c linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ptp.c
--- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ptp.c 2026-03-23 04:09:53.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ptp.c 2026-06-10 04:47:13.000000000 +0000
@@ -25,6 +25,18 @@ @@ -25,6 +25,18 @@
u32 seconds, u32 nano_seconds, u32 seconds, u32 nano_seconds,
u32 sub_nano_seconds); u32 sub_nano_seconds);
...@@ -4523,9 +4523,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.c linux-5.12. ...@@ -4523,9 +4523,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.c linux-5.12.
- sizeof(config)) ? -EFAULT : 0; - sizeof(config)) ? -EFAULT : 0;
- return ret; - return ret;
-} -}
diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.h linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ptp.h diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.h linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ptp.h
--- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/ethernet/microchip/lan743x_ptp.h 2026-03-23 03:20:31.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/ethernet/microchip/lan743x_ptp.h 2026-06-10 04:47:13.000000000 +0000
@@ -18,6 +18,10 @@ @@ -18,6 +18,10 @@
*/ */
#define LAN743X_PTP_N_EVENT_CHAN 2 #define LAN743X_PTP_N_EVENT_CHAN 2
...@@ -4567,9 +4567,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.h linux-5.12. ...@@ -4567,9 +4567,9 @@ diff -uNr linux-5.12.10/drivers/net/ethernet/microchip/lan743x_ptp.h linux-5.12.
bool leds_multiplexed; bool leds_multiplexed;
bool led_enabled[LAN7430_N_LED]; bool led_enabled[LAN7430_N_LED];
diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers/net/phy/micrel.c diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-improved_LAN7430_driver/drivers/net/phy/micrel.c
--- linux-5.12.10/drivers/net/phy/micrel.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/drivers/net/phy/micrel.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/drivers/net/phy/micrel.c 2026-03-29 04:02:51.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/drivers/net/phy/micrel.c 2026-06-10 04:48:06.000000000 +0000
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
* Copyright (c) 2014 Johan Hovold <johan@kernel.org> * Copyright (c) 2014 Johan Hovold <johan@kernel.org>
* *
...@@ -4866,7 +4866,7 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers ...@@ -4866,7 +4866,7 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers
.driver_data = &ksz9021_type, .driver_data = &ksz9021_type,
.probe = kszphy_probe, .probe = kszphy_probe,
.get_features = ksz9031_get_features, .get_features = ksz9031_get_features,
@@ -1354,8 +1606,32 @@ @@ -1354,8 +1606,29 @@
.get_sset_count = kszphy_get_sset_count, .get_sset_count = kszphy_get_sset_count,
.get_strings = kszphy_get_strings, .get_strings = kszphy_get_strings,
.get_stats = kszphy_get_stats, .get_stats = kszphy_get_stats,
...@@ -4884,9 +4884,7 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers ...@@ -4884,9 +4884,7 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers
+ .driver_data = &ksz9021_type, + .driver_data = &ksz9021_type,
+ .probe = kszphy_probe, + .probe = kszphy_probe,
+ .get_features = ksz9031_get_features, + .get_features = ksz9031_get_features,
+ .config_init = ksz9031_config_init, + .config_init = ksz9021_config_init,
+ .soft_reset = genphy_soft_reset,
+ .read_status = ksz9031_read_status,
+ .config_intr = kszphy_config_intr, + .config_intr = kszphy_config_intr,
+ .handle_interrupt = kszphy_handle_interrupt, + .handle_interrupt = kszphy_handle_interrupt,
+ .get_sset_count = kszphy_get_sset_count, + .get_sset_count = kszphy_get_sset_count,
...@@ -4896,11 +4894,10 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers ...@@ -4896,11 +4894,10 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers
.resume = kszphy_resume, .resume = kszphy_resume,
+ .cable_test_start = ksz9x31_cable_test_start, + .cable_test_start = ksz9x31_cable_test_start,
+ .cable_test_get_status = ksz9x31_cable_test_get_status, + .cable_test_get_status = ksz9x31_cable_test_get_status,
+ .set_loopback = ksz9031_set_loopback,
}, { }, {
.phy_id = PHY_ID_LAN8814, .phy_id = PHY_ID_LAN8814,
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,
@@ -1441,6 +1717,7 @@ @@ -1441,6 +1714,7 @@
{ PHY_ID_KSZ8081, MICREL_PHY_ID_MASK }, { PHY_ID_KSZ8081, MICREL_PHY_ID_MASK },
{ PHY_ID_KSZ8873MLL, MICREL_PHY_ID_MASK }, { PHY_ID_KSZ8873MLL, MICREL_PHY_ID_MASK },
{ PHY_ID_KSZ886X, MICREL_PHY_ID_MASK }, { PHY_ID_KSZ886X, MICREL_PHY_ID_MASK },
...@@ -4908,9 +4905,9 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers ...@@ -4908,9 +4905,9 @@ diff -uNr linux-5.12.10/drivers/net/phy/micrel.c linux-5.12.10-cabletest/drivers
{ PHY_ID_LAN8814, MICREL_PHY_ID_MASK }, { PHY_ID_LAN8814, MICREL_PHY_ID_MASK },
{ } { }
}; };
diff -uNr linux-5.12.10/include/linux/micrel_phy.h linux-5.12.10-cabletest/include/linux/micrel_phy.h diff -uNr linux-5.12.10/include/linux/micrel_phy.h linux-5.12.10-improved_LAN7430_driver/include/linux/micrel_phy.h
--- linux-5.12.10/include/linux/micrel_phy.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/include/linux/micrel_phy.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/include/linux/micrel_phy.h 2026-03-28 06:38:26.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/include/linux/micrel_phy.h 2026-06-10 04:47:13.000000000 +0000
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
#define PHY_ID_KSZ8081 0x00221560 #define PHY_ID_KSZ8081 0x00221560
#define PHY_ID_KSZ8061 0x00221570 #define PHY_ID_KSZ8061 0x00221570
...@@ -4919,9 +4916,9 @@ diff -uNr linux-5.12.10/include/linux/micrel_phy.h linux-5.12.10-cabletest/inclu ...@@ -4919,9 +4916,9 @@ diff -uNr linux-5.12.10/include/linux/micrel_phy.h linux-5.12.10-cabletest/inclu
#define PHY_ID_KSZ9131 0x00221640 #define PHY_ID_KSZ9131 0x00221640
#define PHY_ID_LAN8814 0x00221660 #define PHY_ID_LAN8814 0x00221660
diff -uNr linux-5.12.10/include/linux/mii.h linux-5.12.10-cabletest/include/linux/mii.h diff -uNr linux-5.12.10/include/linux/mii.h linux-5.12.10-improved_LAN7430_driver/include/linux/mii.h
--- linux-5.12.10/include/linux/mii.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/include/linux/mii.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/include/linux/mii.h 2026-03-29 01:59:18.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/include/linux/mii.h 2026-06-10 04:47:13.000000000 +0000
@@ -595,4 +595,39 @@ @@ -595,4 +595,39 @@
return cap; return cap;
} }
...@@ -4962,9 +4959,9 @@ diff -uNr linux-5.12.10/include/linux/mii.h linux-5.12.10-cabletest/include/linu ...@@ -4962,9 +4959,9 @@ diff -uNr linux-5.12.10/include/linux/mii.h linux-5.12.10-cabletest/include/linu
+} +}
+ +
#endif /* __LINUX_MII_H__ */ #endif /* __LINUX_MII_H__ */
diff -uNr linux-5.12.10/include/linux/phy.h linux-5.12.10-cabletest/include/linux/phy.h diff -uNr linux-5.12.10/include/linux/phy.h linux-5.12.10-improved_LAN7430_driver/include/linux/phy.h
--- linux-5.12.10/include/linux/phy.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10/include/linux/phy.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-cabletest/include/linux/phy.h 2026-03-29 01:52:51.000000000 +0000 +++ linux-5.12.10-improved_LAN7430_driver/include/linux/phy.h 2026-06-10 04:47:13.000000000 +0000
@@ -891,9 +891,67 @@ @@ -891,9 +891,67 @@
#define PHY_ANY_ID "MATCH ANY PHY" #define PHY_ANY_ID "MATCH ANY PHY"
#define PHY_ANY_UID 0xffffffff #define PHY_ANY_UID 0xffffffff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment