igb: skip phy status check where unavailable
authorKevin Mitchell <kevmitch@arista.com>
Tue, 17 May 2022 18:01:05 +0000 (11:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 May 2022 13:00:51 +0000 (14:00 +0100)
igb_read_phy_reg() will silently return, leaving phy_data untouched, if
hw->ops.read_reg isn't set. Depending on the uninitialized value of
phy_data, this led to the phy status check either succeeding immediately
or looping continuously for 2 seconds before emitting a noisy err-level
timeout. This message went out to the console even though there was no
actual problem.

Instead, first check if there is read_reg function pointer. If not,
proceed without trying to check the phy status register.

Fixes: b72f3f72005d ("igb: When GbE link up, wait for Remote receiver status condition")
Signed-off-by: Kevin Mitchell <kevmitch@arista.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/igb/igb_main.c

index 34b33b2..68be297 100644 (file)
@@ -5505,7 +5505,8 @@ static void igb_watchdog_task(struct work_struct *work)
                                break;
                        }
 
-                       if (adapter->link_speed != SPEED_1000)
+                       if (adapter->link_speed != SPEED_1000 ||
+                           !hw->phy.ops.read_reg)
                                goto no_wait;
 
                        /* wait for Remote receiver status OK */