Commit b44cfd4f authored by Jacob Keller's avatar Jacob Keller Committed by Jakub Kicinski
Browse files

devlink: move request_firmware out of driver 



All drivers which implement the devlink flash update support, with the
exception of netdevsim, use either request_firmware or
request_firmware_direct to locate the firmware file. Rather than having
each driver do this separately as part of its .flash_update
implementation, perform the request_firmware within net/core/devlink.c

Replace the file_name parameter in the struct devlink_flash_update_params
with a pointer to the fw object.

Use request_firmware rather than request_firmware_direct. Although most
Linux distributions today do not have the fallback mechanism
implemented, only about half the drivers used the _direct request, as
compared to the generic request_firmware. In the event that
a distribution does support the fallback mechanism, the devlink flash
update ought to be able to use it to provide the firmware contents. For
distributions which do not support the fallback userspace mechanism,
there should be essentially no difference between request_firmware and
request_firmware_direct.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Acked-by: default avatarShannon Nelson <snelson@pensando.io>
Acked-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 56495a24

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ bnxt_dl_flash_update(struct devlink *dl, 


	devlink_flash_update_begin_notify(dl);

	devlink_flash_update_status_notify(dl, "Preparing to flash", NULL, 0, 0);

	rc = bnxt_flash_package_from_file(bp->dev, params->file_name, 0);

	rc = bnxt_flash_package_from_fw_obj(bp->dev, params->fw, 0);

	if (!rc)

		devlink_flash_update_status_notify(dl, "Flashing done", NULL, 0, 0);

	else

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

+22 −11
Original line number Diff line number Diff line
@@ -2419,13 +2419,12 @@ static int bnxt_flash_firmware_from_file(struct net_device *dev, 
	return rc;

}



int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,

int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware *fw,

				   u32 install_type)

{

	struct bnxt *bp = netdev_priv(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;

	u32 item_len;

	int rc = 0;

	u16 index;
@@ -2440,13 +2439,6 @@ int bnxt_flash_package_from_file(struct net_device *dev, const char *filename, 
		return rc;

	}



	rc = request_firmware(&fw, filename, &dev->dev);

	if (rc != 0) {

		netdev_err(dev, "PKG error %d requesting file: %s\n",

			   rc, filename);

		return rc;

	}



	if (fw->size > item_len) {

		netdev_err(dev, "PKG insufficient update area in nvram: %lu\n",

			   (unsigned long)fw->size);
@@ -2478,7 +2470,6 @@ int bnxt_flash_package_from_file(struct net_device *dev, const char *filename, 
					  dma_handle);

		}

	}

	release_firmware(fw);

	if (rc)

		goto err_exit;
@@ -2517,6 +2508,26 @@ err_exit: 
	return rc;

}



static int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,

					u32 install_type)

{

	const struct firmware *fw;

	int rc;



	rc = request_firmware(&fw, filename, &dev->dev);

	if (rc != 0) {

		netdev_err(dev, "PKG error %d requesting file: %s\n",

			   rc, filename);

		return rc;

	}



	rc = bnxt_flash_package_from_fw_obj(dev, fw, install_type);



	release_firmware(fw);



	return rc;

}



static int bnxt_flash_device(struct net_device *dev,

			     struct ethtool_flash *flash)

{

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

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ u32 bnxt_fw_to_ethtool_speed(u16); 
u16 bnxt_get_fw_auto_link_speeds(u32);

int bnxt_hwrm_nvm_get_dev_info(struct bnxt *bp,

			       struct hwrm_nvm_get_dev_info_output *nvm_dev_info);

int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,

int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware *fw,

				   u32 install_type);

void bnxt_ethtool_init(struct bnxt *bp);

void bnxt_ethtool_free(struct bnxt *bp);

drivers/net/ethernet/huawei/hinic/hinic_devlink.c

+1 −11
Original line number Diff line number Diff line
@@ -285,18 +285,8 @@ static int hinic_devlink_flash_update(struct devlink *devlink, 
				      struct netlink_ext_ack *extack)

{

	struct hinic_devlink_priv *priv = devlink_priv(devlink);

	const struct firmware *fw;

	int err;



	err = request_firmware_direct(&fw, params->file_name,

				      &priv->hwdev->hwif->pdev->dev);

	if (err)

		return err;



	err = hinic_firmware_update(priv, fw, extack);

	release_firmware(fw);



	return err;

	return hinic_firmware_update(priv, params->fw, extack);

}



static const struct devlink_ops hinic_devlink_ops = {

drivers/net/ethernet/intel/ice/ice_devlink.c

+1 −13
Original line number Diff line number Diff line
@@ -247,9 +247,7 @@ ice_devlink_flash_update(struct devlink *devlink, 
			 struct netlink_ext_ack *extack)

{

	struct ice_pf *pf = devlink_priv(devlink);

	struct device *dev = &pf->pdev->dev;

	struct ice_hw *hw = &pf->hw;

	const struct firmware *fw;

	u8 preservation;

	int err;
@@ -277,21 +275,11 @@ ice_devlink_flash_update(struct devlink *devlink, 
	if (err)

		return err;



	err = request_firmware(&fw, params->file_name, dev);

	if (err) {

		NL_SET_ERR_MSG_MOD(extack, "Unable to read file from disk");

		return err;

	}



	dev_dbg(dev, "Beginning flash update with file '%s'\n", params->file_name);



	devlink_flash_update_begin_notify(devlink);

	devlink_flash_update_status_notify(devlink, "Preparing to flash", NULL, 0, 0);

	err = ice_flash_pldm_image(pf, fw, preservation, extack);

	err = ice_flash_pldm_image(pf, params->fw, preservation, extack);

	devlink_flash_update_end_notify(devlink);



	release_firmware(fw);



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE