bnxt_en: Bug fixes.
Michael Chan
maintainercover bnxt_en: Bug fixes.
Devlink and error recovery bug fix patches. Most of the work is by Vasundhara Volam. Please queue patch 1 and 2 for -stable also. Thanks.
Michael Chan (1):
bnxt_en: Fix devlink NVRAM related byte order related issues.
Vasundhara Volam (4):
bnxt_en: Fix the size of devlink MSIX parameters.
bnxt_en: Adjust the time to wait before polling firmware readiness.
bnxt_en: Minor formatting changes in FW devlink_health_reporter
bnxt_en: Avoid disabling pci device in bnxt_remove_one() for already
disabled device.
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 112 +++++++++++++--------- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 3 +- 3 files changed, 73 insertions(+), 52 deletions(-)
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 1/5 bnxt_en: Fix the size of devlink MSIX parameters.
From: Vasundhara Volam <[email protected]>
The current code that rounds up the NVRAM parameter bit size to the next byte size for the devlink parameter is not always correct. The MSIX devlink parameters are 4 bytes and we don't get the correct size using this method.
Fix it by adding a new dl_num_bytes member to the bnxt_dl_nvm_param structure which statically provides bytesize information according to the devlink parameter type definition.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 28 +++++++++++------------ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +14 -14
@@ -215,15 +215,15 @@ enum bnxt_dl_param_id {static const struct bnxt_dl_nvm_param nvm_params[] = { {DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV ,NVM_OFF_ENABLE_SRIOV , -BNXT_NVM_SHARED_CFG ,1 }, +BNXT_NVM_SHARED_CFG ,1 ,1 }, {DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI ,NVM_OFF_IGNORE_ARI , -BNXT_NVM_SHARED_CFG ,1 }, +BNXT_NVM_SHARED_CFG ,1 ,1 }, {DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX , -NVM_OFF_MSIX_VEC_PER_PF_MAX ,BNXT_NVM_SHARED_CFG ,10 }, +NVM_OFF_MSIX_VEC_PER_PF_MAX ,BNXT_NVM_SHARED_CFG ,10 ,4 }, {DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN , -NVM_OFF_MSIX_VEC_PER_PF_MIN ,BNXT_NVM_SHARED_CFG ,7 }, +NVM_OFF_MSIX_VEC_PER_PF_MIN ,BNXT_NVM_SHARED_CFG ,7 ,4 }, {BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK ,NVM_OFF_DIS_GRE_VER_CHECK , -BNXT_NVM_SHARED_CFG ,1 }, +BNXT_NVM_SHARED_CFG ,1 ,1 }, }; static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
@@ -232,8 +232,8 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,struct hwrm_nvm_get_variable_input *req = msg;void *data_addr =NULL , *buf =NULL ;struct bnxt_dl_nvm_param nvm_param; -int bytesize, idx =0 , rc, i;dma_addr_t data_dma_addr; +int idx =0 , rc, i;/* Get/Set NVM CFG parameter is supported only on PFs */ if (BNXT_VF (bp))
@@ -254,10 +254,9 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,else if (nvm_param.dir_type ==BNXT_NVM_FUNC_CFG ) idx = bp->pf.fw_fid -BNXT_FIRST_PF_FID ; - bytesize =roundup (nvm_param.num_bits,BITS_PER_BYTE ) /BITS_PER_BYTE ; -switch (bytesize) { +switch (nvm_param.dl_num_bytes) {case 1 : -if (nvm_param.num_bits ==1 ) +if (nvm_param.nvm_num_bits ==1 ) buf = &val->vbool;else buf = &val->vu8;
@@ -272,29 +271,30 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,return -EFAULT ; } - data_addr =dma_alloc_coherent (&bp->pdev->dev, bytesize, + data_addr =dma_alloc_coherent (&bp->pdev->dev, nvm_param.dl_num_bytes, &data_dma_addr,GFP_KERNEL );if (!data_addr)return -ENOMEM ; req->dest_data_addr =cpu_to_le64 (data_dma_addr); - req->data_len =cpu_to_le16 (nvm_param.num_bits); + req->data_len =cpu_to_le16 (nvm_param.nvm_num_bits); req->option_num =cpu_to_le16 (nvm_param.offset); req->index_0 =cpu_to_le16 (idx);if (idx) req->dimensions =cpu_to_le16 (1 );if (req->req_type ==cpu_to_le16 (HWRM_NVM_SET_VARIABLE )) { -memcpy (data_addr, buf, bytesize); +memcpy (data_addr, buf, nvm_param.dl_num_bytes); rc =hwrm_send_message (bp, msg, msg_len,HWRM_CMD_TIMEOUT ); }else { rc =hwrm_send_message_silent (bp, msg, msg_len,HWRM_CMD_TIMEOUT ); }if (!rc && req->req_type ==cpu_to_le16 (HWRM_NVM_GET_VARIABLE )) -memcpy (buf, data_addr, bytesize); +memcpy (buf, data_addr, nvm_param.dl_num_bytes); -dma_free_coherent (&bp->pdev->dev, bytesize, data_addr, data_dma_addr); +dma_free_coherent (&bp->pdev->dev, nvm_param.dl_num_bytes, data_addr, + data_dma_addr);if (rc == -EACCES )netdev_err (bp->dev,"PF does not have admin privileges to modify NVM config\n" );return rc;
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h +2 -1
@@ -52,7 +52,8 @@ struct bnxt_dl_nvm_param {u16 id;u16 offset;u16 dir_type; -u16 num_bits; +u16 nvm_num_bits; +u8 dl_num_bytes; };void bnxt_devlink_health_report (struct bnxt *bp,unsigned long event);
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 2/5 bnxt_en: Fix devlink NVRAM related byte order related issues.
In reply to Michael ChanThe current code does not do endian swapping between the devlink parameter and the internal NVRAM representation. Define a union to represent the little endian NVRAM data and add 2 helper functions to copy to and from the NVRAM data with the proper byte swapping.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 81 +++++++++++++++-------- 1 file changed, 54 insertions(+), 27 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +54 -27
@@ -226,12 +226,55 @@ static const struct bnxt_dl_nvm_param nvm_params[] = { BNXT_NVM_SHARED_CFG, 1, 1}, }; +union bnxt_nvm_data { +u8 val8; +__le32 val32; +}; + +static void bnxt_copy_to_nvm_data (union bnxt_nvm_data *dst, +union devlink_param_value *src, +int nvm_num_bits,int dl_num_bytes) +{ +u32 val32 =0 ; + +if (nvm_num_bits ==1 ) { + dst->val8 = src->vbool; +return ; + } +if (dl_num_bytes ==4 ) + val32 = src->vu32; +else if (dl_num_bytes ==2 ) + val32 = (u32 )src->vu16; +else if (dl_num_bytes ==1 ) + val32 = (u32 )src->vu8; + dst->val32 =cpu_to_le32 (val32); +} + +static void bnxt_copy_from_nvm_data (union devlink_param_value *dst, +union bnxt_nvm_data *src, +int nvm_num_bits,int dl_num_bytes) +{ +u32 val32; + +if (nvm_num_bits ==1 ) { + dst->vbool = src->val8; +return ; + } + val32 =le32_to_cpu (src->val32); +if (dl_num_bytes ==4 ) + dst->vu32 = val32; +else if (dl_num_bytes ==2 ) + dst->vu16 = (u16 )val32; +else if (dl_num_bytes ==1 ) + dst->vu8 = (u8 )val32; +} +static int bnxt_hwrm_nvm_req (struct bnxt *bp,u32 param_id,void *msg,int msg_len,union devlink_param_value *val) {struct hwrm_nvm_get_variable_input *req = msg; -void *data_addr =NULL , *buf =NULL ;struct bnxt_dl_nvm_param nvm_param; +union bnxt_nvm_data *data;dma_addr_t data_dma_addr;int idx =0 , rc, i;
@@ -254,26 +297,9 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,else if (nvm_param.dir_type ==BNXT_NVM_FUNC_CFG ) idx = bp->pf.fw_fid -BNXT_FIRST_PF_FID ; -switch (nvm_param.dl_num_bytes) { -case 1 : -if (nvm_param.nvm_num_bits ==1 ) - buf = &val->vbool; -else - buf = &val->vu8; -break ; -case 2 : - buf = &val->vu16; -break ; -case 4 : - buf = &val->vu32; -break ; -default : -return -EFAULT ; - } - - data_addr =dma_alloc_coherent (&bp->pdev->dev, nvm_param.dl_num_bytes, - &data_dma_addr,GFP_KERNEL ); -if (!data_addr) + data =dma_alloc_coherent (&bp->pdev->dev,sizeof (*data), + &data_dma_addr,GFP_KERNEL ); +if (!data)return -ENOMEM ; req->dest_data_addr =cpu_to_le64 (data_dma_addr);
@@ -284,17 +310,18 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg, req->dimensions =cpu_to_le16 (1 );if (req->req_type ==cpu_to_le16 (HWRM_NVM_SET_VARIABLE )) { -memcpy (data_addr, buf, nvm_param.dl_num_bytes); +bnxt_copy_to_nvm_data (data, val, nvm_param.nvm_num_bits, + nvm_param.dl_num_bytes); rc =hwrm_send_message (bp, msg, msg_len,HWRM_CMD_TIMEOUT ); }else { rc =hwrm_send_message_silent (bp, msg, msg_len,HWRM_CMD_TIMEOUT ); +if (!rc) +bnxt_copy_from_nvm_data (val, data, + nvm_param.nvm_num_bits, + nvm_param.dl_num_bytes); } -if (!rc && req->req_type ==cpu_to_le16 (HWRM_NVM_GET_VARIABLE )) -memcpy (buf, data_addr, nvm_param.dl_num_bytes); - -dma_free_coherent (&bp->pdev->dev, nvm_param.dl_num_bytes, data_addr, - data_dma_addr); +dma_free_coherent (&bp->pdev->dev,sizeof (*data), data, data_dma_addr);if (rc == -EACCES )netdev_err (bp->dev,"PF does not have admin privileges to modify NVM config\n" );return rc;
Signature · 1 line
2.5.1
Re: [PATCH net 2/5] bnxt_en: Fix devlink NVRAM related byte order related issues.
Quoted 13 lines · Michael Chan
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +5
-0@@ -226,12 +226,55 @@ static const struct bnxt_dl_nvm_param nvm_params[] = { BNXT_NVM_SHARED_CFG, 1, 1}, }; +union bnxt_nvm_data { +u8 val8; +__le32 val32; +}; +
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c static const struct bnxt_dl_nvm_param nvm_params[] = { · line 243
Quoted 10 lines
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +10
-0+static void bnxt_copy_to_nvm_data (union bnxt_nvm_data *dst, +union devlink_param_value *src, +int nvm_num_bits,int dl_num_bytes) +{ +u32 val32 =0 ; + +if (nvm_num_bits ==1 ) { + dst->val8 = src->vbool; +return ; + }
Why do you special case the num_bits == 1? If val32 is __le32 the low byte would have landed on the first byte anyway, no? 🤔
just curious
Quoted 8 lines
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +8
-0+if (dl_num_bytes ==4 ) + val32 = src->vu32; +else if (dl_num_bytes ==2 ) + val32 = (u32 )src->vu16; +else if (dl_num_bytes ==1 ) + val32 = (u32 )src->vu8; + dst->val32 =cpu_to_le32 (val32); +}
Michael Chan
maintainerRe: [PATCH net 2/5] bnxt_en: Fix devlink NVRAM related byte order related issues.
Quoted 29 lines · Jakub Kicinski
Quoted 13 lines · Michael Chan
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +5
-0@@ -226,12 +226,55 @@ static const struct bnxt_dl_nvm_param nvm_params[] = { BNXT_NVM_SHARED_CFG, 1, 1}, }; +union bnxt_nvm_data { +u8 val8; +__le32 val32; +}; +drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c static const struct bnxt_dl_nvm_param nvm_params[] = { · line 243
Quoted 10 lines
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +10
-0+static void bnxt_copy_to_nvm_data (union bnxt_nvm_data *dst, +union devlink_param_value *src, +int nvm_num_bits,int dl_num_bytes) +{ +u32 val32 =0 ; + +if (nvm_num_bits ==1 ) { + dst->val8 = src->vbool; +return ; + }Why do you special case the
num_bits== 1? If val32 is__le32the low byte would have landed on the first byte anyway, no?
Quoted 1 line
just curious
Just so that I don't have to do any casting. Otherwise if I assign it to the __le32, I believe I have to cast to avoid the warning.
Quoted 9 lines
Quoted 9 lines
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +8
-0+if (dl_num_bytes ==4 ) + val32 = src->vu32; +else if (dl_num_bytes ==2 ) + val32 = (u32 )src->vu16; +else if (dl_num_bytes ==1 ) + val32 = (u32 )src->vu8; + dst->val32 =cpu_to_le32 (val32); +}
Michael Chan
maintainerPATCH 3/5 bnxt_en: Adjust the time to wait before polling firmware readiness.
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
When firmware indicates that driver needs to invoke firmware reset which is common for both error recovery and live firmware reset path, driver needs a different time to wait before polling for firmware readiness.
Modify the wait time to fw_reset_min_dsecs, which is initialised to correct timeout for error recovery and firmware reset.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -5
@@ -10669,14 +10669,11 @@ static void bnxt_fw_reset_task(struct work_struct *work) bp->fw_reset_state =BNXT_FW_RESET_STATE_RESET_FW ; }/* fall through */ -case BNXT_FW_RESET_STATE_RESET_FW : { -u32 wait_dsecs = bp->fw_health->post_reset_wait_dsecs; - +case BNXT_FW_RESET_STATE_RESET_FW :bnxt_reset_all (bp); bp->fw_reset_state =BNXT_FW_RESET_STATE_ENABLE_DEV ; -bnxt_queue_fw_reset_work (bp, wait_dsecs *HZ /10 ); +bnxt_queue_fw_reset_work (bp, bp->fw_reset_min_dsecs *HZ /10 );return ; - }case BNXT_FW_RESET_STATE_ENABLE_DEV :if (test_bit (BNXT_STATE_FW_FATAL_COND , &bp->state) && bp->fw_health) {
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 4/5 bnxt_en: Minor formatting changes in FW devlink_health_reporter
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
Minor formatting changes to diagnose cb for FW devlink health reporter.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +6 -11
@@ -29,25 +29,20 @@ static int bnxt_fw_reporter_diagnose(struct devlink_health_reporter *reporter, val =bnxt_fw_health_readl (bp,BNXT_FW_HEALTH_REG ); health_status = val &0xffff ; -if (health_status ==BNXT_FW_STATUS_HEALTHY ) { - rc =devlink_fmsg_string_pair_put (fmsg,"FW status" , -"Healthy;" ); -if (rc) -return rc; - }else if (health_status <BNXT_FW_STATUS_HEALTHY ) { - rc =devlink_fmsg_string_pair_put (fmsg,"FW status" , -"Not yet completed initialization;" ); +if (health_status <BNXT_FW_STATUS_HEALTHY ) { + rc =devlink_fmsg_string_pair_put (fmsg,"Description" , +"Not yet completed initialization" );if (rc)return rc; }else if (health_status >BNXT_FW_STATUS_HEALTHY ) { - rc =devlink_fmsg_string_pair_put (fmsg,"FW status" , -"Encountered fatal error and cannot recover;" ); + rc =devlink_fmsg_string_pair_put (fmsg,"Description" , +"Encountered fatal error and cannot recover" );if (rc)return rc; }if (val >>16 ) { - rc =devlink_fmsg_u32_pair_put (fmsg,"Error" , val >>16 ); + rc =devlink_fmsg_u32_pair_put (fmsg,"Error code" , val >>16 );if (rc)return rc; }
Signature · 1 line
2.5.1
Michael Chan
maintainerPATCH 5/5 bnxt_en: Avoid disabling pci device in bnxt_remove_one() for already disabled device.
In reply to Michael ChanFrom: Vasundhara Volam <[email protected]>
With the recently added error recovery logic, the device may already be disabled if the firmware recovery is unsuccessful. In bnxt_remove_one(), check that the device is still enabled first before calling pci_disable_device().
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -1
@@ -10382,7 +10382,8 @@ static void bnxt_cleanup_pci(struct bnxt *bp) {bnxt_unmap_bars (bp, bp->pdev);pci_release_regions (bp->pdev); -pci_disable_device (bp->pdev); +if (pci_is_enabled (bp->pdev)) +pci_disable_device (bp->pdev); }static void bnxt_init_dflt_coal (struct bnxt *bp)
Signature · 1 line
2.5.1
Jakub Kicinski
AppliedQuoted 2 lines · Michael Chan
Devlink and error recovery bug fix patches. Most of the work is by Vasundhara Volam.
Thanks, applied.
Quoted 1 line
Please queue patch 1 and 2 for -stable also. Thanks.
FWIW these will likely only reach 5.3 since it looks like the bug dates to 5.1 but 5.1 and 5.2 branches of stable are already EOL.