bnxt_en: Return linux standard errors in bnxt_ethtool.c (7c675421) · Commits · 戴 / test

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+39 −17

Original line number	Diff line number	Diff line
		@@ -1636,14 +1636,22 @@ static int bnxt_flash_nvram(struct net_device *dev,
		rc = hwrm_send_message(bp, &req, sizeof(req), FLASH_NVRAM_TIMEOUT);
		dma_free_coherent(&bp->pdev->dev, data_len, kmem, dma_handle);

		if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {
		netdev_info(dev,
		"PF does not have admin privileges to flash the device\n");
		rc = -EACCES;
		} else if (rc) {
		rc = -EIO;
		}
		return rc;
		}

		static int bnxt_firmware_reset(struct net_device *dev,
		u16 dir_type)
		{
		struct bnxt *bp = netdev_priv(dev);
		struct hwrm_fw_reset_input req = {0};
		struct bnxt *bp = netdev_priv(dev);
		int rc;

		bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FW_RESET, -1, -1);

		@@ -1683,7 +1691,15 @@ static int bnxt_firmware_reset(struct net_device *dev,
		return -EINVAL;
		}

		return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
		rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
		if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {
		netdev_info(dev,
		"PF does not have admin privileges to reset the device\n");
		rc = -EACCES;
		} else if (rc) {
		rc = -EIO;
		}
		return rc;
		}

		static int bnxt_flash_firmware(struct net_device *dev,
		@@ -1890,9 +1906,9 @@ static int bnxt_flash_package_from_file(struct net_device *dev,
		struct hwrm_nvm_install_update_output *resp = bp->hwrm_cmd_resp_addr;
		struct hwrm_nvm_install_update_input install = {0};
		const struct firmware *fw;
		int rc, hwrm_err = 0;
		u32 item_len;
		u16 index;
		int rc;

		bnxt_hwrm_fw_set_time(bp);

		@@ -1935,15 +1951,16 @@ static int bnxt_flash_package_from_file(struct net_device *dev,
		memcpy(kmem, fw->data, fw->size);
		modify.host_src_addr = cpu_to_le64(dma_handle);

		rc = hwrm_send_message(bp, &modify, sizeof(modify),
		hwrm_err = hwrm_send_message(bp, &modify,
		sizeof(modify),
		FLASH_PACKAGE_TIMEOUT);
		dma_free_coherent(&bp->pdev->dev, fw->size, kmem,
		dma_handle);
		}
		}
		release_firmware(fw);
		if (rc)
		return rc;
		if (rc \|\| hwrm_err)
		goto err_exit;

		if ((install_type & 0xffff) == 0)
		install_type >>= 16;
		@@ -1951,12 +1968,10 @@ static int bnxt_flash_package_from_file(struct net_device *dev,
		install.install_type = cpu_to_le32(install_type);

		mutex_lock(&bp->hwrm_cmd_lock);
		rc = _hwrm_send_message(bp, &install, sizeof(install),
		hwrm_err = _hwrm_send_message(bp, &install, sizeof(install),
		INSTALL_PACKAGE_TIMEOUT);
		if (rc) {
		rc = -EOPNOTSUPP;
		if (hwrm_err)
		goto flash_pkg_exit;
		}

		if (resp->error_code) {
		u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;
		@@ -1964,14 +1979,13 @@ static int bnxt_flash_package_from_file(struct net_device *dev,
		if (error_code == NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
		install.flags \|= cpu_to_le16(
		NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);
		rc = _hwrm_send_message(bp, &install, sizeof(install),
		hwrm_err = _hwrm_send_message(bp, &install,
		sizeof(install),
		INSTALL_PACKAGE_TIMEOUT);
		if (rc) {
		rc = -EOPNOTSUPP;
		if (hwrm_err)
		goto flash_pkg_exit;
		}
		}
		}

		if (resp->result) {
		netdev_err(dev, "PKG install error = %d, problem_item = %d\n",
		@@ -1980,6 +1994,14 @@ static int bnxt_flash_package_from_file(struct net_device *dev,
		}
		flash_pkg_exit:
		mutex_unlock(&bp->hwrm_cmd_lock);
		err_exit:
		if (hwrm_err == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {
		netdev_info(dev,
		"PF does not have admin privileges to flash the device\n");
		rc = -EACCES;
		} else if (hwrm_err) {
		rc = -EOPNOTSUPP;
		}
		return rc;
		}

Admin message