Commit 22ec3d23 authored by Jacob Keller's avatar Jacob Keller Committed by David S. Miller
Browse files

devlink: check flash_update parameter support in net core 



When implementing .flash_update, drivers which do not support
per-component update are manually checking the component parameter to
verify that it is NULL. Without this check, the driver might accept an
update request with a component specified even though it will not honor
such a request.

Instead of having each driver check this, move the logic into
net/core/devlink.c, and use a new `supported_flash_update_params` field
in the devlink_ops. Drivers which will support per-component update must
now specify this by setting DEVLINK_SUPPORT_FLASH_UPDATE_COMPONENT in
the supported_flash_update_params in their devlink_ops.

This helps ensure that drivers do not forget to check for a NULL
component if they do not support per-component update. This also enables
a slightly better error message by enabling the core stack to set the
netlink bad attribute message to indicate precisely the unsupported
attribute in the message.

Going forward, any new additional parameter to flash update will require
a bit in the supported_flash_update_params bitfield.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Chan <michael.chan@broadcom.com>
Cc: Bin Luo <luobin9@huawei.com>
Cc: Saeed Mahameed <saeedm@mellanox.com>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Ido Schimmel <idosch@mellanox.com>
Cc: Danielle Ratson <danieller@mellanox.com>
Cc: Shannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6fba737a

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

+3 −9
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ bnxt_dl_flash_update(struct devlink *dl, const char *filename, 
	struct bnxt *bp = bnxt_get_bp_from_dl(dl);

	int rc;



	if (region)

		return -EOPNOTSUPP;



	if (!BNXT_PF(bp)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "flash update not supported from a VF");
@@ -33,15 +30,12 @@ bnxt_dl_flash_update(struct devlink *dl, const char *filename, 
	}



	devlink_flash_update_begin_notify(dl);

	devlink_flash_update_status_notify(dl, "Preparing to flash", region, 0,

					   0);

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

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

	if (!rc)

		devlink_flash_update_status_notify(dl, "Flashing done", region,

						   0, 0);

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

	else

		devlink_flash_update_status_notify(dl, "Flashing failed",

						   region, 0, 0);

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

	devlink_flash_update_end_notify(dl);

	return rc;

}

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

+0 −3
Original line number Diff line number Diff line
@@ -289,9 +289,6 @@ static int hinic_devlink_flash_update(struct devlink *devlink, 
	const struct firmware *fw;

	int err;



	if (component)

		return -EOPNOTSUPP;



	err = request_firmware_direct(&fw, file_name,

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

	if (err)

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

+2 −7
Original line number Diff line number Diff line
@@ -252,16 +252,12 @@ ice_devlink_flash_update(struct devlink *devlink, const char *path, 
	const struct firmware *fw;

	int err;



	/* individual component update is not yet supported */

	if (component)

		return -EOPNOTSUPP;



	if (!hw->dev_caps.common_cap.nvm_unified_update) {

		NL_SET_ERR_MSG_MOD(extack, "Current firmware does not support unified update");

		return -EOPNOTSUPP;

	}



	err = ice_check_for_pending_update(pf, component, extack);

	err = ice_check_for_pending_update(pf, NULL, extack);

	if (err)

		return err;
@@ -272,8 +268,7 @@ ice_devlink_flash_update(struct devlink *devlink, const char *path, 
	}



	devlink_flash_update_begin_notify(devlink);

	devlink_flash_update_status_notify(devlink, "Preparing to flash",

					   component, 0, 0);

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

	err = ice_flash_pldm_image(pf, fw, extack);

	devlink_flash_update_end_notify(devlink);

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ static int mlx5_devlink_flash_update(struct devlink *devlink, 
	const struct firmware *fw;

	int err;



	if (component)

		return -EOPNOTSUPP;



	err = request_firmware_direct(&fw, file_name, &dev->pdev->dev);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlxsw/core.c

+0 −3
Original line number Diff line number Diff line
@@ -1108,9 +1108,6 @@ static int mlxsw_core_fw_flash_update(struct mlxsw_core *mlxsw_core, 
	const struct firmware *firmware;

	int err;



	if (component)

		return -EOPNOTSUPP;



	err = request_firmware_direct(&firmware, file_name, mlxsw_core->bus_info->dev);

	if (err)

		return err;