qed: Populate nvm-file attributes while reading nvm config partition.
Subsystems (3)
PATCH v3 1/1 qed: Populate nvm-file attributes while reading nvm config partition.
NVM config file address will be modified when the MBI image is upgraded. Driver would return stale config values if user reads the nvm-config (via ethtool -d) in this state. The fix is to re-populate nvm attribute info while reading the nvm config values/partition.
Changes from previous version:
-------------------------------
v3: Corrected the formatting in 'Fixes' tag.
v2: Added 'Fixes' tag.
--- drivers/net/ethernet/qlogic/qed/qed_debug.c | 4 ++++ drivers/net/ethernet/qlogic/qed/qed_dev.c | 12 +++--------- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 7 +++++++ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 7 +++++++ 4 files changed, 21 insertions(+), 9 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_debug.c +4 -0
@@ -7941,6 +7941,10 @@ int qed_dbg_all_data(struct qed_dev *cdev, void *buffer)DP_ERR (cdev,"qed_dbg_mcp_trace failed. rc = %d\n" , rc); } +/* Re-populate nvm attribute info */ +qed_mcp_nvm_info_free (p_hwfn); +qed_mcp_nvm_info_populate (p_hwfn); +/* nvm cfg1 */ rc = qed_dbg_nvm_image(cdev, (u8 *)buffer + offset +
drivers/net/ethernet/qlogic/qed/qed_dev.c +3 -9
@@ -4472,12 +4472,6 @@ static int qed_get_dev_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)return 0 ; } -static void qed_nvm_info_free (struct qed_hwfn *p_hwfn) -{ -kfree (p_hwfn->nvm_info.image_att); - p_hwfn->nvm_info.image_att =NULL ; -} - static int qed_hw_prepare_single(struct qed_hwfn *p_hwfn, void __iomem *p_regview, void __iomem *p_doorbells,
@@ -4562,7 +4556,7 @@ static int qed_hw_prepare_single(struct qed_hwfn *p_hwfn,return rc; err3:if (IS_LEAD_HWFN (p_hwfn)) -qed_nvm_info_free (p_hwfn); +qed_mcp_nvm_info_free (p_hwfn); err2:if (IS_LEAD_HWFN (p_hwfn))qed_iov_free_hw_info (p_hwfn->cdev);
@@ -4623,7 +4617,7 @@ int qed_hw_prepare(struct qed_dev *cdev,if (rc) {if (IS_PF (cdev)) {qed_init_free (p_hwfn); -qed_nvm_info_free (p_hwfn); +qed_mcp_nvm_info_free (p_hwfn);qed_mcp_free (p_hwfn);qed_hw_hwfn_free (p_hwfn); }
@@ -4657,7 +4651,7 @@ void qed_hw_remove(struct qed_dev *cdev)qed_iov_free_hw_info (cdev); -qed_nvm_info_free (p_hwfn); +qed_mcp_nvm_info_free (p_hwfn); } static void qed_chain_free_next_ptr(struct qed_dev *cdev,
drivers/net/ethernet/qlogic/qed/qed_mcp.c +7 -0
@@ -3280,6 +3280,13 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)return rc; } +void qed_mcp_nvm_info_free (struct qed_hwfn *p_hwfn) +{ +kfree (p_hwfn->nvm_info.image_att); + p_hwfn->nvm_info.image_att =NULL ; + p_hwfn->nvm_info.valid = false; +} + int qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn, enum qed_nvm_images image_id,
drivers/net/ethernet/qlogic/qed/qed_mcp.h +7 -0
@@ -1221,6 +1221,13 @@ void qed_mcp_resc_lock_default_init(struct qed_resc_lock_params *p_lock,int qed_mcp_nvm_info_populate (struct qed_hwfn *p_hwfn);/** +* @brief Delete nvm info shadow in the given hardware function +* +* @param p_hwfn +*/ +void qed_mcp_nvm_info_free (struct qed_hwfn *p_hwfn); + +/** * @brief Get the engine affinity configuration. * * @param p_hwfn
Signature · 1 line
1.8.3.1
From: Sudarsana Reddy Kalluru <[email protected]>
Date: Wed, 8 Jul 2020 20:14:29 -0700
Quoted 5 lines
NVM config file address will be modified when the MBI image is upgraded. Driver would return stale config values if user reads the nvm-config (via ethtool -d) in this state. The fix is to re-populate nvm attribute info while reading the nvm config values/partition.
Quoted 8 lines
Changes from previous version:
-------------------------------
v3: Corrected the formatting in 'Fixes' tag.
v2: Added 'Fixes' tag.Fixes 1ac4329a1cff ("qed: Add configuration information to register dump and debug data")Signed-off-by Sudarsana Reddy Kalluru <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Applied, thanks.