diff options
author | Pascal Coudurier <coudu@wanadoo.fr> | 2022-03-19 18:39:04 +0100 |
---|---|---|
committer | Christian Lamparter <chunkeey@gmail.com> | 2022-03-26 21:28:41 +0100 |
commit | 8cf9ba23a4a0ec9e807543612af27dbe2411dd5d (patch) | |
tree | c02d20797de8ef5c8bebe23be58444a30167930a /target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch | |
parent | 2ce4ae55db3e463647e9b6e1598346dc40e484c9 (diff) | |
download | upstream-8cf9ba23a4a0ec9e807543612af27dbe2411dd5d.tar.gz upstream-8cf9ba23a4a0ec9e807543612af27dbe2411dd5d.tar.bz2 upstream-8cf9ba23a4a0ec9e807543612af27dbe2411dd5d.zip |
kernel: backport two intel igc patches from 5.15
to allow proper initialization of device
- igc: Remove _I_PHY_ID checking
- igc: Remove phy->type checking
Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>
(refreshed)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(cherry picked from commit dd45cc2123b75abb0b41eb90c21d8d3506f2a3c2)
Diffstat (limited to 'target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch b/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch new file mode 100644 index 0000000000..ad4d1bb0dc --- /dev/null +++ b/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch @@ -0,0 +1,43 @@ +From 47bca7de6a4fb8dcb564c7ca14d885c91ed19e03 Mon Sep 17 00:00:00 2001 +From: Sasha Neftin <sasha.neftin@intel.com> +Date: Sat, 10 Jul 2021 20:57:50 +0300 +Subject: igc: Remove phy->type checking + +i225 devices have only one phy->type: copper. There is no point checking +phy->type during the igc_has_link method from the watchdog that +invoked every 2 seconds. +This patch comes to clean up these pointless checkings. + +Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> +Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com> +Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> +--- + drivers/net/ethernet/intel/igc/igc_main.c | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +(limited to 'drivers/net/ethernet/intel/igc') + +--- a/drivers/net/ethernet/intel/igc/igc_main.c ++++ b/drivers/net/ethernet/intel/igc/igc_main.c +@@ -4177,17 +4177,10 @@ bool igc_has_link(struct igc_adapter *ad + * false until the igc_check_for_link establishes link + * for copper adapters ONLY + */ +- switch (hw->phy.media_type) { +- case igc_media_type_copper: +- if (!hw->mac.get_link_status) +- return true; +- hw->mac.ops.check_for_link(hw); +- link_active = !hw->mac.get_link_status; +- break; +- default: +- case igc_media_type_unknown: +- break; +- } ++ if (!hw->mac.get_link_status) ++ return true; ++ hw->mac.ops.check_for_link(hw); ++ link_active = !hw->mac.get_link_status; + + if (hw->mac.type == igc_i225) { + if (!netif_carrier_ok(adapter->netdev)) { |