android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bnxt_en-2-bug-fixes'

Browse Source 
Michael Chan says:

====================
bnxt_en: 2 bug fixes.

This first patch fixes a rare but possible crash in pci_disable_msix()
when the MTU is changed.  The 2nd patch fixes a regression in error
code handling when flashing a file to NVRAM.

Please also queue these for -stable.  Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-03-01 19:15:27 -08:00
commit ab124d580a
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View File

@ -10982,13 +10982,13 @@ static int bnxt_change_mtu(struct net_device *dev, int new_mtu)
struct bnxt *bp = netdev_priv(dev); struct bnxt *bp = netdev_priv(dev);
if (netif_running(dev)) if (netif_running(dev))
bnxt_close_nic(bp, false, false); bnxt_close_nic(bp, true, false);
dev->mtu = new_mtu; dev->mtu = new_mtu;
bnxt_set_ring_params(bp); bnxt_set_ring_params(bp);
if (netif_running(dev)) if (netif_running(dev))
return bnxt_open_nic(bp, false, false); return bnxt_open_nic(bp, true, false);
return 0; return 0;
} }

24
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
View File

@ -2007,8 +2007,8 @@ int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,
struct hwrm_nvm_install_update_output *resp = bp->hwrm_cmd_resp_addr; struct hwrm_nvm_install_update_output *resp = bp->hwrm_cmd_resp_addr;
struct hwrm_nvm_install_update_input install = {0}; struct hwrm_nvm_install_update_input install = {0};
const struct firmware *fw; const struct firmware *fw;
int rc, hwrm_err = 0;
u32 item_len; u32 item_len;
int rc = 0;
u16 index; u16 index;
bnxt_hwrm_fw_set_time(bp); bnxt_hwrm_fw_set_time(bp);
@ -2052,15 +2052,14 @@ int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,
memcpy(kmem, fw->data, fw->size); memcpy(kmem, fw->data, fw->size);
modify.host_src_addr = cpu_to_le64(dma_handle); modify.host_src_addr = cpu_to_le64(dma_handle);
hwrm_err = hwrm_send_message(bp, &modify, rc = hwrm_send_message(bp, &modify, sizeof(modify),
sizeof(modify), FLASH_PACKAGE_TIMEOUT);
FLASH_PACKAGE_TIMEOUT);
dma_free_coherent(&bp->pdev->dev, fw->size, kmem, dma_free_coherent(&bp->pdev->dev, fw->size, kmem,
dma_handle); dma_handle);
} }
} }
release_firmware(fw); release_firmware(fw);
if (rc || hwrm_err) if (rc)
goto err_exit; goto err_exit;
if ((install_type & 0xffff) == 0) if ((install_type & 0xffff) == 0)
@ -2069,20 +2068,19 @@ int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,
install.install_type = cpu_to_le32(install_type); install.install_type = cpu_to_le32(install_type);
mutex_lock(&bp->hwrm_cmd_lock); mutex_lock(&bp->hwrm_cmd_lock);
hwrm_err = _hwrm_send_message(bp, &install, sizeof(install), rc = _hwrm_send_message(bp, &install, sizeof(install),
INSTALL_PACKAGE_TIMEOUT); INSTALL_PACKAGE_TIMEOUT);
if (hwrm_err) { if (rc) {
u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err; u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;
if (resp->error_code && error_code == if (resp->error_code && error_code ==
NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) { NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
install.flags |= cpu_to_le16( install.flags |= cpu_to_le16(
NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG); NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);
hwrm_err = _hwrm_send_message(bp, &install, rc = _hwrm_send_message(bp, &install, sizeof(install),
sizeof(install), INSTALL_PACKAGE_TIMEOUT);
INSTALL_PACKAGE_TIMEOUT);
} }
if (hwrm_err) if (rc)
goto flash_pkg_exit; goto flash_pkg_exit;
} }
@ -2094,7 +2092,7 @@ int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,
flash_pkg_exit: flash_pkg_exit:
mutex_unlock(&bp->hwrm_cmd_lock); mutex_unlock(&bp->hwrm_cmd_lock);
err_exit: err_exit:
if (hwrm_err == -EACCES) if (rc == -EACCES)
bnxt_print_admin_err(bp); bnxt_print_admin_err(bp);
return rc; return rc;
} }