upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ixgbe: workaround to prevent an i2c bus read to keep trying to read an empty slot

Browse source 
When executing `ifconfig -v` this will lead to stalls for a second per
interface due to the timeout being set to a static 10 without a module
placed, this patch makes sure this is only allowed once per insertion.
This commit is contained in:
Ad Schellevis 2021-11-09 17:21:43 +01:00 committed by Franco Fichtner
parent e9a7c3772a
commit 87a20b28d8
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/dev/ixgbe/if_ix.c
View file

@ -1079,6 +1079,11 @@ ixgbe_if_attach_post(if_ctx_t ctx)
sc = iflib_get_softc(ctx);
hw = &sc->hw;
/**
* XXX: Since we don't seem to be able to flag a missing module, make sure we don't keep reading an i2c bus for something that isn't there
* sfp_probe_timed_out will be set when i2c probe timeout is reached and will be reset on reinit using this event.
*/
hw->sfp_probe_timed_out = false;
if (sc->intr_type == IFLIB_INTR_LEGACY &&
(sc->feat_cap & IXGBE_FEATURE_LEGACY_IRQ) == 0) {

12
sys/dev/ixgbe/ixgbe_phy.c
View file

@ -2016,6 +2016,15 @@ static s32 ixgbe_read_i2c_byte_generic_int(struct ixgbe_hw *hw, u8 byte_offset,
if (ixgbe_is_sfp_probe(hw, byte_offset, dev_addr))
max_retry = IXGBE_SFP_DETECT_RETRIES;
/***
* XXX : Workaround to prevent reading an sfp slot with nothing connected to it.
* There likely should be some signal to detect an empty slot, trying to keep reading for 1 second on every attempt isn't very practical
* sfp_probe_timed_out is reset on ixgbe_if_attach_post() which should be triggered on module placement.
*/
if (hw->sfp_probe_timed_out) {
max_retry = 0;
}
do {
if (lock && hw->mac.ops.acquire_swfw_sync(hw, swfw_mask))
return IXGBE_ERR_SWFW_SYNC;
@ -2074,6 +2083,9 @@ fail:
retry++;
} while (retry <= max_retry);
/* XXX it's probably enough to set this to true since we are in the error path */
hw->sfp_probe_timed_out = hw->sfp_probe_timed_out || retry >= max_retry;
return status;
}

2
sys/dev/ixgbe/ixgbe_type.h
View file

@ -4258,6 +4258,8 @@ struct ixgbe_hw {
bool allow_unsupported_sfp;
bool wol_enabled;
bool need_crosstalk_fix;
/* XXX flag for workaround to prevent reading an sfp[+] slot with nothing connected to it. */
bool sfp_probe_timed_out;
u32 fw_rst_cnt;
};