Commit cdcb3804 authored by Rand Deeb's avatar Rand Deeb Committed by Tony Nguyen
Browse files

ixgbe: Fix unreachable retry logic in combined and byte I2C write functions 



The current implementation of `ixgbe_write_i2c_combined_generic_int` and
`ixgbe_write_i2c_byte_generic_int` sets `max_retry` to `1`, which makes
the condition `retry < max_retry` always evaluate to `false`. This renders
the retry mechanism ineffective, as the debug message and retry logic are
never executed.

This patch increases `max_retry` to `3` in both functions, aligning them
with the retry logic in `ixgbe_read_i2c_combined_generic_int`. This
ensures that the retry mechanism functions as intended, improving
robustness in case of I2C write failures.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: default avatarRand Deeb <rand.sec96@gmail.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 015bac5d

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ int ixgbe_write_i2c_combined_generic_int(struct ixgbe_hw *hw, u8 addr, 
					 u16 reg, u16 val, bool lock)

{

	u32 swfw_mask = hw->phy.phy_semaphore_mask;

	int max_retry = 1;

	int max_retry = 3;

	int retry = 0;

	u8 reg_high;

	u8 csum;
@@ -2285,7 +2285,7 @@ static int ixgbe_write_i2c_byte_generic_int(struct ixgbe_hw *hw, u8 byte_offset, 
					    u8 dev_addr, u8 data, bool lock)

{

	u32 swfw_mask = hw->phy.phy_semaphore_mask;

	u32 max_retry = 1;

	u32 max_retry = 3;

	u32 retry = 0;

	int status;