From: Andy Moreton <[email protected]>
Code analysis reports that efx_np_cap_mask_hw_to_sw does not always write
to sw_cap_maskp. Fix the annotation to show it is valid on input, and
initialise the mask in efx_np_cap_hw_data_to_sw_mask.
Fixes: a90549f527eb ("common/sfc_efx/base: get netport fixed capabilities on
probe")
Cc: [email protected]
Signed-off-by: Andy Moreton <[email protected]>
Reviewed-by: Ivan Malov <[email protected]>
Reviewed-by: Viacheslav Galaktionov <[email protected]>
---
drivers/common/sfc_efx/base/efx_np.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/common/sfc_efx/base/efx_np.c
b/drivers/common/sfc_efx/base/efx_np.c
index 5044eabdd3..baee83e58e 100644
--- a/drivers/common/sfc_efx/base/efx_np.c
+++ b/drivers/common/sfc_efx/base/efx_np.c
@@ -190,7 +190,7 @@ efx_np_cap_mask_hw_to_sw(
__in unsigned int hw_sw_map_nentries,
__in_bcount(hw_cap_data_nbytes) const uint8_t *hw_cap_data,
__in size_t hw_cap_data_nbytes,
- __out uint32_t *sw_cap_maskp)
+ __inout uint32_t *sw_cap_maskp)
{
FOREACH_SUP_CAP(hw_sw_map, hw_sw_map_nentries,
hw_cap_data, hw_cap_data_nbytes) {
@@ -216,6 +216,8 @@ efx_np_cap_hw_data_to_sw_mask(
__in const uint8_t *hw_data,
__out uint32_t *sw_maskp)
{
+ *sw_maskp = 0;
+
EFX_NP_CAP_MASK_HW_TO_SW(efx_np_cap_map_tech, ETH_AN_FIELDS_TECH_MASK,
hw_data, sw_maskp);
@@ -429,21 +431,21 @@ efx_np_link_state(
_NOTE(ARGUNUSED(lbp))
#endif /* EFSYS_OPT_LOOPBACK */
- if (lsp->enls_an_supported != B_FALSE)
- lsp->enls_adv_cap_mask |= 1U << EFX_PHY_CAP_AN;
-
efx_np_cap_hw_data_to_sw_mask(
MCDI_OUT2(req, const uint8_t, LINK_STATE_OUT_ADVERTISED_ABILITIES),
&lsp->enls_adv_cap_mask);
- if (status_flags & (1U << MC_CMD_LINK_STATUS_FLAGS_AN_ABLE))
- lsp->enls_lp_cap_mask |= 1U << EFX_PHY_CAP_AN;
+ if (lsp->enls_an_supported != B_FALSE)
+ lsp->enls_adv_cap_mask |= 1U << EFX_PHY_CAP_AN;
efx_np_cap_hw_data_to_sw_mask(
MCDI_OUT2(req, const uint8_t,
LINK_STATE_OUT_LINK_PARTNER_ABILITIES),
&lsp->enls_lp_cap_mask);
+ if (status_flags & (1U << MC_CMD_LINK_STATUS_FLAGS_AN_ABLE))
+ lsp->enls_lp_cap_mask |= 1U << EFX_PHY_CAP_AN;
+
tech = MCDI_OUT_WORD(req, LINK_STATE_OUT_LINK_TECHNOLOGY);
if (tech < EFX_ARRAY_SIZE(efx_np_tech_to_lane_count))
--
2.47.3
