| Message ID | 20231208090055.303507-2-jedrzej.jagielski@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ixgbe: Refactor ixgbe internal status | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
On 12/8/23 10:00, Jedrzej Jagielski wrote: > Currently ixgbe driver is notified of overheating events > via internal IXGBE_ERR_OVERTEMP error code. > > Change the approach to use freshly introduced is_overtemp > function parameter which set when such event occurs. > Add new parameter to the check_overtemp() and handle_lasi() > phy ops. > > Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> > --- > v2: change aproach to use additional function parameter to notify when overheat on public mailing lists its best to require links to previous versions > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 ++++---- > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++++++++---- > drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 47 ++++++++++++------- > 5 files changed, 67 insertions(+), 39 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index 227415d61efc..f6200f0d1e06 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -2756,7 +2756,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) > { > struct ixgbe_hw *hw = &adapter->hw; > u32 eicr = adapter->interrupt_event; > - s32 rc; > + bool overtemp; > > if (test_bit(__IXGBE_DOWN, &adapter->state)) > return; > @@ -2790,14 +2790,15 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) > } > > /* Check if this is not due to overtemp */ > - if (hw->phy.ops.check_overtemp(hw) != IXGBE_ERR_OVERTEMP) > + hw->phy.ops.check_overtemp(hw, &overtemp); you newer (at least in the scope of this patch) check return code of .check_overtemp(), so you could perhaps instead change it to return bool, and just return "true if overtemp detected"? > + if (!overtemp) > return; > > break; > case IXGBE_DEV_ID_X550EM_A_1G_T: > case IXGBE_DEV_ID_X550EM_A_1G_T_L: > - rc = hw->phy.ops.check_overtemp(hw); > - if (rc != IXGBE_ERR_OVERTEMP) > + hw->phy.ops.check_overtemp(hw, &overtemp); > + if (!overtemp) > return; > break; > default: > @@ -2807,6 +2808,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) > return; > break; > } > + I would remove chunks that are whitespace only > e_crit(drv, "%s\n", ixgbe_overheat_msg); > > adapter->interrupt_event = 0; > @@ -7938,7 +7940,7 @@ static void ixgbe_service_timer(struct timer_list *t) [snip]
From: Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com> Sent: Friday, December 8, 2023 11:07 AM >On 12/8/23 10:00, Jedrzej Jagielski wrote: >> Currently ixgbe driver is notified of overheating events >> via internal IXGBE_ERR_OVERTEMP error code. >> >> Change the approach to use freshly introduced is_overtemp >> function parameter which set when such event occurs. >> Add new parameter to the check_overtemp() and handle_lasi() >> phy ops. >> >> Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> >> --- >> v2: change aproach to use additional function parameter to notify when overheat > >on public mailing lists its best to require links to previous versions > >> --- >> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 ++++---- >> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++++++++---- >> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +- >> drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- >> drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 47 ++++++++++++------- >> 5 files changed, 67 insertions(+), 39 deletions(-) >> >> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >> index 227415d61efc..f6200f0d1e06 100644 >> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >> @@ -2756,7 +2756,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) >> { >> struct ixgbe_hw *hw = &adapter->hw; >> u32 eicr = adapter->interrupt_event; >> - s32 rc; >> + bool overtemp; >> >> if (test_bit(__IXGBE_DOWN, &adapter->state)) >> return; >> @@ -2790,14 +2790,15 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) >> } >> >> /* Check if this is not due to overtemp */ >> - if (hw->phy.ops.check_overtemp(hw) != IXGBE_ERR_OVERTEMP) >> + hw->phy.ops.check_overtemp(hw, &overtemp); > >you newer (at least in the scope of this patch) check return code of >.check_overtemp(), so you could perhaps instead change it to return >bool, and just return "true if overtemp detected Generally I think it is good think to give a possibility to return error code, despite here it is not used (no possibility to handle it since called from void function, just return). All other phy ops are also s32 type, so this one is aligned with them. @Nguyen, Anthony L What do you think on that solution? > >> + if (!overtemp) >> return; >> >> break; >> case IXGBE_DEV_ID_X550EM_A_1G_T: >> case IXGBE_DEV_ID_X550EM_A_1G_T_L: >> - rc = hw->phy.ops.check_overtemp(hw); >> - if (rc != IXGBE_ERR_OVERTEMP) >> + hw->phy.ops.check_overtemp(hw, &overtemp); >> + if (!overtemp) >> return; >> break; >> default: >> @@ -2807,6 +2808,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) >> return; >> break; >> } >> + > >I would remove chunks that are whitespace only > >> e_crit(drv, "%s\n", ixgbe_overheat_msg); >> >> adapter->interrupt_event = 0; >> @@ -7938,7 +7940,7 @@ static void ixgbe_service_timer(struct timer_list *t) > >[snip]
On 12/11/2023 1:45 AM, Jagielski, Jedrzej wrote: > From: Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com> > Sent: Friday, December 8, 2023 11:07 AM > >> On 12/8/23 10:00, Jedrzej Jagielski wrote: >>> Currently ixgbe driver is notified of overheating events >>> via internal IXGBE_ERR_OVERTEMP error code. >>> >>> Change the approach to use freshly introduced is_overtemp >>> function parameter which set when such event occurs. >>> Add new parameter to the check_overtemp() and handle_lasi() >>> phy ops. >>> >>> Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> >>> --- >>> v2: change aproach to use additional function parameter to notify when overheat >> >> on public mailing lists its best to require links to previous versions >> >>> --- >>> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 ++++---- >>> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++++++++---- >>> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +- >>> drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- >>> drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 47 ++++++++++++------- >>> 5 files changed, 67 insertions(+), 39 deletions(-) >>> >>> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >>> index 227415d61efc..f6200f0d1e06 100644 >>> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >>> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >>> @@ -2756,7 +2756,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) >>> { >>> struct ixgbe_hw *hw = &adapter->hw; >>> u32 eicr = adapter->interrupt_event; >>> - s32 rc; >>> + bool overtemp; >>> >>> if (test_bit(__IXGBE_DOWN, &adapter->state)) >>> return; >>> @@ -2790,14 +2790,15 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) >>> } >>> >>> /* Check if this is not due to overtemp */ >>> - if (hw->phy.ops.check_overtemp(hw) != IXGBE_ERR_OVERTEMP) >>> + hw->phy.ops.check_overtemp(hw, &overtemp); >> >> you newer (at least in the scope of this patch) check return code of >> .check_overtemp(), so you could perhaps instead change it to return >> bool, and just return "true if overtemp detected > > Generally I think it is good think to give a possibility to return error code, > despite here it is not used (no possibility to handle it since called from > void function, just return). > All other phy ops are also s32 type, so this one is aligned with them. > > @Nguyen, Anthony L What do you think on that solution? We shouldn't carry a return value only to align with other ops. If we there's no need for it, we shouldn't have it... however, aren't you using/checking it here? @@ -406,9 +407,12 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw) if (status != 0 || hw->phy.type == ixgbe_phy_none) return status; + status = hw->phy.ops.check_overtemp(hw, &overtemp); + if (status) + return status; Thanks, Tony
From: Nguyen, Anthony L <anthony.l.nguyen@intel.com> Sent: Monday, December 11, 2023 10:35 PM >On 12/11/2023 1:45 AM, Jagielski, Jedrzej wrote: >> From: Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com> >> Sent: Friday, December 8, 2023 11:07 AM >> >>> On 12/8/23 10:00, Jedrzej Jagielski wrote: >>>> Currently ixgbe driver is notified of overheating events >>>> via internal IXGBE_ERR_OVERTEMP error code. >>>> >>>> Change the approach to use freshly introduced is_overtemp >>>> function parameter which set when such event occurs. >>>> Add new parameter to the check_overtemp() and handle_lasi() >>>> phy ops. >>>> >>>> Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> >>>> --- >>>> v2: change aproach to use additional function parameter to notify when overheat >>> >>> on public mailing lists its best to require links to previous versions >>> >>>> --- >>>> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 ++++---- >>>> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++++++++---- >>>> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +- >>>> drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- >>>> drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 47 ++++++++++++------- >>>> 5 files changed, 67 insertions(+), 39 deletions(-) >>>> >>>> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >>>> index 227415d61efc..f6200f0d1e06 100644 >>>> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >>>> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c >>>> @@ -2756,7 +2756,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) >>>> { >>>> struct ixgbe_hw *hw = &adapter->hw; >>>> u32 eicr = adapter->interrupt_event; >>>> - s32 rc; >>>> + bool overtemp; >>>> >>>> if (test_bit(__IXGBE_DOWN, &adapter->state)) >>>> return; >>>> @@ -2790,14 +2790,15 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) >>>> } >>>> >>>> /* Check if this is not due to overtemp */ >>>> - if (hw->phy.ops.check_overtemp(hw) != IXGBE_ERR_OVERTEMP) >>>> + hw->phy.ops.check_overtemp(hw, &overtemp); >>> >>> you newer (at least in the scope of this patch) check return code of >>> .check_overtemp(), so you could perhaps instead change it to return >>> bool, and just return "true if overtemp detected >> >> Generally I think it is good think to give a possibility to return error code, >> despite here it is not used (no possibility to handle it since called from >> void function, just return). >> All other phy ops are also s32 type, so this one is aligned with them. >> >> @Nguyen, Anthony L What do you think on that solution? > >We shouldn't carry a return value only to align with other ops. If we Sure, just thought it is standardized some way in that case. >there's no need for it, we shouldn't have it... however, aren't you >using/checking it here? actually there is no need since just overtemp indication is checked > >@@ -406,9 +407,12 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw) > if (status != 0 || hw->phy.type == ixgbe_phy_none) > return status; > >+ status = hw->phy.ops.check_overtemp(hw, &overtemp); >+ if (status) >+ return status; > >Thanks, >Tony Thanks Jedrek
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 227415d61efc..f6200f0d1e06 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -2756,7 +2756,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) { struct ixgbe_hw *hw = &adapter->hw; u32 eicr = adapter->interrupt_event; - s32 rc; + bool overtemp; if (test_bit(__IXGBE_DOWN, &adapter->state)) return; @@ -2790,14 +2790,15 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) } /* Check if this is not due to overtemp */ - if (hw->phy.ops.check_overtemp(hw) != IXGBE_ERR_OVERTEMP) + hw->phy.ops.check_overtemp(hw, &overtemp); + if (!overtemp) return; break; case IXGBE_DEV_ID_X550EM_A_1G_T: case IXGBE_DEV_ID_X550EM_A_1G_T_L: - rc = hw->phy.ops.check_overtemp(hw); - if (rc != IXGBE_ERR_OVERTEMP) + hw->phy.ops.check_overtemp(hw, &overtemp); + if (!overtemp) return; break; default: @@ -2807,6 +2808,7 @@ static void ixgbe_check_overtemp_subtask(struct ixgbe_adapter *adapter) return; break; } + e_crit(drv, "%s\n", ixgbe_overheat_msg); adapter->interrupt_event = 0; @@ -7938,7 +7940,7 @@ static void ixgbe_service_timer(struct timer_list *t) static void ixgbe_phy_interrupt_subtask(struct ixgbe_adapter *adapter) { struct ixgbe_hw *hw = &adapter->hw; - u32 status; + bool overtemp; if (!(adapter->flags2 & IXGBE_FLAG2_PHY_INTERRUPT)) return; @@ -7948,11 +7950,9 @@ static void ixgbe_phy_interrupt_subtask(struct ixgbe_adapter *adapter) if (!hw->phy.ops.handle_lasi) return; - status = hw->phy.ops.handle_lasi(&adapter->hw); - if (status != IXGBE_ERR_OVERTEMP) - return; - - e_crit(drv, "%s\n", ixgbe_overheat_msg); + hw->phy.ops.handle_lasi(&adapter->hw, &overtemp); + if (overtemp) + e_crit(drv, "%s\n", ixgbe_overheat_msg); } static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index ca31638c6fb8..82a59382934a 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -396,9 +396,10 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) **/ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw) { - u32 i; - u16 ctrl = 0; s32 status = 0; + bool overtemp; + u16 ctrl = 0; + u32 i; if (hw->phy.type == ixgbe_phy_unknown) status = ixgbe_identify_phy_generic(hw); @@ -406,9 +407,12 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw) if (status != 0 || hw->phy.type == ixgbe_phy_none) return status; + status = hw->phy.ops.check_overtemp(hw, &overtemp); + if (status) + return status; + /* Don't reset PHY if it's shut down due to overtemp. */ - if (!hw->phy.reset_if_overtemp && - (IXGBE_ERR_OVERTEMP == hw->phy.ops.check_overtemp(hw))) + if (!hw->phy.reset_if_overtemp && overtemp) return 0; /* Blocked by MNG FW so bail */ @@ -2744,24 +2748,33 @@ static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw) /** * ixgbe_tn_check_overtemp - Checks if an overtemp occurred. * @hw: pointer to hardware structure + * @is_overtemp: indicate whether an overtemp event encountered * * Checks if the LASI temp alarm status was triggered due to overtemp **/ -s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw) +s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw, bool *is_overtemp) { u16 phy_data = 0; + u32 status; + + if (!hw || !is_overtemp) + return -EINVAL; + + *is_overtemp = false; if (hw->device_id != IXGBE_DEV_ID_82599_T3_LOM) return 0; /* Check that the LASI temp alarm status was triggered */ - hw->phy.ops.read_reg(hw, IXGBE_TN_LASI_STATUS_REG, - MDIO_MMD_PMAPMD, &phy_data); + status = hw->phy.ops.read_reg(hw, IXGBE_TN_LASI_STATUS_REG, + MDIO_MMD_PMAPMD, &phy_data); + if (status) + return status; - if (!(phy_data & IXGBE_TN_LASI_STATUS_TEMP_ALARM)) - return 0; + if (phy_data & IXGBE_TN_LASI_STATUS_TEMP_ALARM) + *is_overtemp = true; - return IXGBE_ERR_OVERTEMP; + return 0; } /** ixgbe_set_copper_phy_power - Control power for copper phy diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h index 6544c4539c0d..af5961f3c414 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h @@ -155,7 +155,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw); s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw, u16 *list_offset, u16 *data_offset); -s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw); +s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw, bool *is_overtemp); s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset, u8 dev_addr, u8 *data); s32 ixgbe_read_i2c_byte_generic_unlocked(struct ixgbe_hw *hw, u8 byte_offset, diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index 2b00db92b08f..99a814f06c61 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h @@ -3509,10 +3509,10 @@ struct ixgbe_phy_operations { s32 (*read_i2c_sff8472)(struct ixgbe_hw *, u8 , u8 *); s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *); s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8); - s32 (*check_overtemp)(struct ixgbe_hw *); + s32 (*check_overtemp)(struct ixgbe_hw *, bool *); s32 (*set_phy_power)(struct ixgbe_hw *, bool on); s32 (*enter_lplu)(struct ixgbe_hw *); - s32 (*handle_lasi)(struct ixgbe_hw *hw); + s32 (*handle_lasi)(struct ixgbe_hw *hw, bool *); s32 (*read_i2c_byte_unlocked)(struct ixgbe_hw *, u8 offset, u8 addr, u8 *value); s32 (*write_i2c_byte_unlocked)(struct ixgbe_hw *, u8 offset, u8 addr, diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c index b3509b617a4e..85e0027be601 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c @@ -600,8 +600,10 @@ static s32 ixgbe_setup_fw_link(struct ixgbe_hw *hw) rc = ixgbe_fw_phy_activity(hw, FW_PHY_ACT_SETUP_LINK, &setup); if (rc) return rc; + if (setup[0] == FW_PHY_ACT_SETUP_LINK_RSP_DOWN) - return IXGBE_ERR_OVERTEMP; + return -EIO; + return 0; } @@ -2367,18 +2369,21 @@ static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, * @hw: pointer to hardware structure * @lsc: pointer to boolean flag which indicates whether external Base T * PHY interrupt is lsc + * @is_overtemp: indicate whether an overtemp event encountered * * Determime if external Base T PHY interrupt cause is high temperature * failure alarm or link status change. - * - * Return IXGBE_ERR_OVERTEMP if interrupt is high temperature - * failure alarm, else return PHY access status. **/ -static s32 ixgbe_get_lasi_ext_t_x550em(struct ixgbe_hw *hw, bool *lsc) +static s32 ixgbe_get_lasi_ext_t_x550em(struct ixgbe_hw *hw, bool *lsc, + bool *is_overtemp) { u32 status; u16 reg; + if (!hw || !lsc || !is_overtemp) + return -EINVAL; + + *is_overtemp = false; *lsc = false; /* Vendor alarm triggered */ @@ -2410,7 +2415,8 @@ static s32 ixgbe_get_lasi_ext_t_x550em(struct ixgbe_hw *hw, bool *lsc) if (reg & IXGBE_MDIO_GLOBAL_ALM_1_HI_TMP_FAIL) { /* power down the PHY in case the PHY FW didn't already */ ixgbe_set_copper_phy_power(hw, false); - return IXGBE_ERR_OVERTEMP; + *is_overtemp = true; + return -EIO; } if (reg & IXGBE_MDIO_GLOBAL_ALM_1_DEV_FAULT) { /* device fault alarm triggered */ @@ -2424,7 +2430,8 @@ static s32 ixgbe_get_lasi_ext_t_x550em(struct ixgbe_hw *hw, bool *lsc) if (reg == IXGBE_MDIO_GLOBAL_FAULT_MSG_HI_TMP) { /* power down the PHY in case the PHY FW didn't */ ixgbe_set_copper_phy_power(hw, false); - return IXGBE_ERR_OVERTEMP; + *is_overtemp = true; + return -EIO; } } @@ -2460,12 +2467,12 @@ static s32 ixgbe_get_lasi_ext_t_x550em(struct ixgbe_hw *hw, bool *lsc) **/ static s32 ixgbe_enable_lasi_ext_t_x550em(struct ixgbe_hw *hw) { + bool lsc, overtemp; u32 status; u16 reg; - bool lsc; /* Clear interrupt flags */ - status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc); + status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc, &overtemp); /* Enable link status change alarm */ @@ -2544,21 +2551,23 @@ static s32 ixgbe_enable_lasi_ext_t_x550em(struct ixgbe_hw *hw) /** * ixgbe_handle_lasi_ext_t_x550em - Handle external Base T PHY interrupt * @hw: pointer to hardware structure + * @is_overtemp: indicate whether an overtemp event encountered * * Handle external Base T PHY interrupt. If high temperature * failure alarm then return error, else if link status change * then setup internal/external PHY link - * - * Return IXGBE_ERR_OVERTEMP if interrupt is high temperature - * failure alarm, else return PHY access status. **/ -static s32 ixgbe_handle_lasi_ext_t_x550em(struct ixgbe_hw *hw) +static s32 ixgbe_handle_lasi_ext_t_x550em(struct ixgbe_hw *hw, + bool *is_overtemp) { struct ixgbe_phy_info *phy = &hw->phy; bool lsc; u32 status; - status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc); + if (!hw || !is_overtemp) + return -EINVAL; + + status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc, is_overtemp); if (status) return status; @@ -3185,19 +3194,25 @@ static s32 ixgbe_reset_phy_fw(struct ixgbe_hw *hw) /** * ixgbe_check_overtemp_fw - Check firmware-controlled PHYs for overtemp * @hw: pointer to hardware structure + * @is_overtemp: indicate whether an overtemp event encountered */ -static s32 ixgbe_check_overtemp_fw(struct ixgbe_hw *hw) +static s32 ixgbe_check_overtemp_fw(struct ixgbe_hw *hw, bool *is_overtemp) { u32 store[FW_PHY_ACT_DATA_COUNT] = { 0 }; s32 rc; + if (!hw || !is_overtemp) + return -EINVAL; + + *is_overtemp = false; + rc = ixgbe_fw_phy_activity(hw, FW_PHY_ACT_GET_LINK_INFO, &store); if (rc) return rc; if (store[0] & FW_PHY_ACT_GET_LINK_INFO_TEMP) { ixgbe_shutdown_fw_phy(hw); - return IXGBE_ERR_OVERTEMP; + *is_overtemp = true; } return 0; }
Currently ixgbe driver is notified of overheating events via internal IXGBE_ERR_OVERTEMP error code. Change the approach to use freshly introduced is_overtemp function parameter which set when such event occurs. Add new parameter to the check_overtemp() and handle_lasi() phy ops. Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> --- v2: change aproach to use additional function parameter to notify when overheat --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 ++++---- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++++++++---- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 47 ++++++++++++------- 5 files changed, 67 insertions(+), 39 deletions(-)