devlink: convert flash_update to use params structure

The devlink core recently gained support for checking whether the driver
supports a flash_update parameter, via `supported_flash_update_params`.
However, parameters are specified as function arguments. Adding a new
parameter still requires modifying the signature of the .flash_update
callback in all drivers.

Convert the .flash_update function to take a new `struct
devlink_flash_update_params` instead. By using this structure, and the
`supported_flash_update_params` bit field, a new parameter to
flash_update can be added without requiring modification to existing
drivers.

As before, all parameters except file_name will require driver opt-in.
Because file_name is a necessary field to for the flash_update to make
sense, no "SUPPORTED" bitflag is provided and it is always considered
valid. All future additional parameters will require a new bit in the
supported_flash_update_params bitfield.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jakub Kicinski <kuba@kernel.org>
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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index a17764db1419252eb14822cd2107febe120e933a..d436134bdc40188684e72fc3c7a1a262e2dfde24 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -17,8 +17,9 @@
 #include "bnxt_ethtool.h"
 
 static int
-bnxt_dl_flash_update(struct devlink *dl, const char *filename,
-                    const char *region, struct netlink_ext_ack *extack)
+bnxt_dl_flash_update(struct devlink *dl,
+                    struct devlink_flash_update_params *params,
+                    struct netlink_ext_ack *extack)
 {
        struct bnxt *bp = bnxt_get_bp_from_dl(dl);
        int rc;
@@ -31,7 +32,7 @@ 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", NULL, 0, 0);
-       rc = bnxt_flash_package_from_file(bp->dev, filename, 0);
+       rc = bnxt_flash_package_from_file(bp->dev, params->file_name, 0);
        if (!rc)
                devlink_flash_update_status_notify(dl, "Flashing done", NULL, 0, 0);
        else

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_devlink.c b/drivers/net/ethernet/huawei/hinic/hinic_devlink.c
index 662a27a514ae3a7e654558643494355f2a0a3fc9..2630d667f3939278e0a584397a6cbeaa0cbdb04a 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_devlink.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_devlink.c
@@ -281,15 +281,14 @@ static int hinic_firmware_update(struct hinic_devlink_priv *priv,
 }
 
 static int hinic_devlink_flash_update(struct devlink *devlink,
-                                     const char *file_name,
-                                     const char *component,
+                                     struct devlink_flash_update_params *params,
                                      struct netlink_ext_ack *extack)
 {
        struct hinic_devlink_priv *priv = devlink_priv(devlink);
        const struct firmware *fw;
        int err;
 
-       err = request_firmware_direct(&fw, file_name,
+       err = request_firmware_direct(&fw, params->file_name,
                                      &priv->hwdev->hwif->pdev->dev);
        if (err)
                return err;

diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c
index 4666f1d5a6955aa6818ea699bb00a2e3ae9c9383..c3d61c246f0b244ce715ca5746901f7f210e2f72 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_devlink.c
+++ b/drivers/net/ethernet/intel/ice/ice_devlink.c
@@ -233,8 +233,7 @@ static int ice_devlink_info_get(struct devlink *devlink,
 /**
  * ice_devlink_flash_update - Update firmware stored in flash on the device
  * @devlink: pointer to devlink associated with device to update
- * @path: the path of the firmware file to use via request_firmware
- * @component: name of the component to update, or NULL
+ * @params: flash update parameters
  * @extack: netlink extended ACK structure
  *
  * Perform a device flash update. The bulk of the update logic is contained
@@ -243,8 +242,9 @@ static int ice_devlink_info_get(struct devlink *devlink,
  * Returns: zero on success, or an error code on failure.
  */
 static int
-ice_devlink_flash_update(struct devlink *devlink, const char *path,
-                        const char *component, struct netlink_ext_ack *extack)
+ice_devlink_flash_update(struct devlink *devlink,
+                        struct devlink_flash_update_params *params,
+                        struct netlink_ext_ack *extack)
 {
        struct ice_pf *pf = devlink_priv(devlink);
        struct device *dev = &pf->pdev->dev;
@@ -261,7 +261,7 @@ ice_devlink_flash_update(struct devlink *devlink, const char *path,
        if (err)
                return err;
 
-       err = request_firmware(&fw, path, dev);
+       err = request_firmware(&fw, params->file_name, dev);
        if (err) {
                NL_SET_ERR_MSG_MOD(extack, "Unable to read file from disk");
                return err;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index fccae4b802b6bd322853a261e01a6214d82fcdf3..9b14e3f805a279dcf9b008ba4c55a9681582206d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -8,15 +8,14 @@
 #include "eswitch.h"
 
 static int mlx5_devlink_flash_update(struct devlink *devlink,
-                                    const char *file_name,
-                                    const char *component,
+                                    struct devlink_flash_update_params *params,
                                     struct netlink_ext_ack *extack)
 {
        struct mlx5_core_dev *dev = devlink_priv(devlink);
        const struct firmware *fw;
        int err;
 
-       err = request_firmware_direct(&fw, file_name, &dev->pdev->dev);
+       err = request_firmware_direct(&fw, params->file_name, &dev->pdev->dev);
        if (err)
                return err;
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index 3ffd03ef9c0e7eaed5c158fd21b1d725d92cc504..f8dddcf461f56ea45a20eae53bf1b2e34d227a71 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -1102,13 +1102,13 @@ static int mlxsw_core_fw_rev_validate(struct mlxsw_core *mlxsw_core,
 }
 
 static int mlxsw_core_fw_flash_update(struct mlxsw_core *mlxsw_core,
-                                     const char *file_name, const char *component,
+                                     struct devlink_flash_update_params *params,
                                      struct netlink_ext_ack *extack)
 {
        const struct firmware *firmware;
        int err;
 
-       err = request_firmware_direct(&firmware, file_name, mlxsw_core->bus_info->dev);
+       err = request_firmware_direct(&firmware, params->file_name, mlxsw_core->bus_info->dev);
        if (err)
                return err;
        err = mlxsw_core_fw_flash(mlxsw_core, firmware, extack);
@@ -1431,13 +1431,12 @@ mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink,
 }
 
 static int mlxsw_devlink_flash_update(struct devlink *devlink,
-                                     const char *file_name,
-                                     const char *component,
+                                     struct devlink_flash_update_params *params,
                                      struct netlink_ext_ack *extack)
 {
        struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
 
-       return mlxsw_core_fw_flash_update(mlxsw_core, file_name, component, extack);
+       return mlxsw_core_fw_flash_update(mlxsw_core, params, extack);
 }
 
 static int mlxsw_devlink_trap_init(struct devlink *devlink,

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
index c93cb9a27e25def827a1edde8ee63178d38da475..97d2b03208de01f8497d58b7c89f6513a71ef19b 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c
@@ -329,10 +329,11 @@ err_close_nsp:
 }
 
 static int
-nfp_devlink_flash_update(struct devlink *devlink, const char *path,
-                        const char *component, struct netlink_ext_ack *extack)
+nfp_devlink_flash_update(struct devlink *devlink,
+                        struct devlink_flash_update_params *params,
+                        struct netlink_ext_ack *extack)
 {
-       return nfp_flash_update_common(devlink_priv(devlink), path, extack);
+       return nfp_flash_update_common(devlink_priv(devlink), params->file_name, extack);
 }
 
 const struct devlink_ops nfp_devlink_ops = {

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
index c125988b095483560921927148532089b3187a1f..51d64718ed9f05178f9f15d1491399eb9b1b4f60 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
@@ -10,13 +10,12 @@
 #include "ionic_devlink.h"
 
 static int ionic_dl_flash_update(struct devlink *dl,
-                                const char *fwname,
-                                const char *component,
+                                struct devlink_flash_update_params *params,
                                 struct netlink_ext_ack *extack)
 {
        struct ionic *ionic = devlink_priv(dl);
 
-       return ionic_firmware_update(ionic->lif, fwname, extack);
+       return ionic_firmware_update(ionic->lif, params->file_name, extack);
 }
 
 static int ionic_dl_info_get(struct devlink *dl, struct devlink_info_req *req,

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 424bdab8e8888cfde01a3e1c03bc7b30a9a9ce95..2d218afad37518c7809ee2cf440e832de0c5244f 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -742,8 +742,8 @@ static int nsim_dev_info_get(struct devlink *devlink,
 #define NSIM_DEV_FLASH_CHUNK_SIZE 1000
 #define NSIM_DEV_FLASH_CHUNK_TIME_MS 10
 
-static int nsim_dev_flash_update(struct devlink *devlink, const char *file_name,
-                                const char *component,
+static int nsim_dev_flash_update(struct devlink *devlink,
+                                struct devlink_flash_update_params *params,
                                 struct netlink_ext_ack *extack)
 {
        struct nsim_dev *nsim_dev = devlink_priv(devlink);
@@ -753,13 +753,13 @@ static int nsim_dev_flash_update(struct devlink *devlink, const char *file_name,
                devlink_flash_update_begin_notify(devlink);
                devlink_flash_update_status_notify(devlink,
                                                   "Preparing to flash",
-                                                  component, 0, 0);
+                                                  params->component, 0, 0);
        }
 
        for (i = 0; i < NSIM_DEV_FLASH_SIZE / NSIM_DEV_FLASH_CHUNK_SIZE; i++) {
                if (nsim_dev->fw_update_status)
                        devlink_flash_update_status_notify(devlink, "Flashing",
-                                                          component,
+                                                          params->component,
                                                           i * NSIM_DEV_FLASH_CHUNK_SIZE,
                                                           NSIM_DEV_FLASH_SIZE);
                msleep(NSIM_DEV_FLASH_CHUNK_TIME_MS);
@@ -767,13 +767,13 @@ static int nsim_dev_flash_update(struct devlink *devlink, const char *file_name,
 
        if (nsim_dev->fw_update_status) {
                devlink_flash_update_status_notify(devlink, "Flashing",
-                                                  component,
+                                                  params->component,
                                                   NSIM_DEV_FLASH_SIZE,
                                                   NSIM_DEV_FLASH_SIZE);
                devlink_flash_update_timeout_notify(devlink, "Flash select",
-                                                   component, 81);
+                                                   params->component, 81);
                devlink_flash_update_status_notify(devlink, "Flashing done",
-                                                  component, 0, 0);
+                                                  params->component, 0, 0);
                devlink_flash_update_end_notify(devlink);
        }
 

diff --git a/include/net/devlink.h b/include/net/devlink.h
index cec6b4f109fa7299888028ba39b75d94b2e7f7e3..7794e1601772876ff72bd775d4058abc1d4e33d5 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -550,6 +550,20 @@ enum devlink_param_generic_id {
 /* Firmware bundle identifier */
 #define DEVLINK_INFO_VERSION_GENERIC_FW_BUNDLE_ID      "fw.bundle_id"
 
+/**
+ * struct devlink_flash_update_params - Flash Update parameters
+ * @file_name: the name of the flash firmware file to update from
+ * @component: the flash component to update
+ *
+ * With the exception of file_name, drivers must opt-in to parameters by
+ * setting the appropriate bit in the supported_flash_update_params field in
+ * their devlink_ops structure.
+ */
+struct devlink_flash_update_params {
+       const char *file_name;
+       const char *component;
+};
+
 #define DEVLINK_SUPPORT_FLASH_UPDATE_COMPONENT BIT(0)
 
 struct devlink_region;
@@ -1112,8 +1126,8 @@ struct devlink_ops {
         * parameters supported by the driver should be set in
         * supported_flash_update_params.
         */
-       int (*flash_update)(struct devlink *devlink, const char *file_name,
-                           const char *component,
+       int (*flash_update)(struct devlink *devlink,
+                           struct devlink_flash_update_params *params,
                            struct netlink_ext_ack *extack);
        /**
         * @trap_init: Trap initialization function.

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 7c69a41016a27eb21e916ca6831058be7ceb8077..6766f9ef3152aab633382531a2cd7d6710f7ce0d 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -3147,8 +3147,8 @@ EXPORT_SYMBOL_GPL(devlink_flash_update_timeout_notify);
 static int devlink_nl_cmd_flash_update(struct sk_buff *skb,
                                       struct genl_info *info)
 {
+       struct devlink_flash_update_params params = {};
        struct devlink *devlink = info->user_ptr[0];
-       const char *file_name, *component = NULL;
        struct nlattr *nla_component;
        u32 supported_params;
 
@@ -3160,7 +3160,7 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb,
 
        supported_params = devlink->ops->supported_flash_update_params;
 
-       file_name = nla_data(info->attrs[DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME]);
+       params.file_name = nla_data(info->attrs[DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME]);
 
        nla_component = info->attrs[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT];
        if (nla_component) {
@@ -3169,11 +3169,10 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb,
                                            "component update is not supported by this device");
                        return -EOPNOTSUPP;
                }
-               component = nla_data(nla_component);
+               params.component = nla_data(nla_component);
        }
 
-       return devlink->ops->flash_update(devlink, file_name, component,
-                                         info->extack);
+       return devlink->ops->flash_update(devlink, &params, info->extack);
 }
 
 static const struct devlink_param devlink_param_generic[] = {
@@ -9651,6 +9650,7 @@ out:
 
 int devlink_compat_flash_update(struct net_device *dev, const char *file_name)
 {
+       struct devlink_flash_update_params params = {};
        struct devlink *devlink;
        int ret;
 
@@ -9663,8 +9663,10 @@ int devlink_compat_flash_update(struct net_device *dev, const char *file_name)
                goto out;
        }
 
+       params.file_name = file_name;
+
        mutex_lock(&devlink->lock);
-       ret = devlink->ops->flash_update(devlink, file_name, NULL, NULL);
+       ret = devlink->ops->flash_update(devlink, &params, NULL);
        mutex_unlock(&devlink->lock);
 
 out:

diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
index de4b32fc422336789c207069c0467b5cf233787d..1e7541688978bedd690ba43b516df86a42fadbd2 100755 (executable)
--- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
+++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh
@@ -23,6 +23,9 @@ fw_flash_test()
        devlink dev flash $DL_HANDLE file dummy
        check_err $? "Failed to flash with status updates on"
 
+       devlink dev flash $DL_HANDLE file dummy component fw.mgmt
+       check_err $? "Failed to flash with component attribute"
+
        echo "n"> $DEBUGFS_DIR/fw_update_status
        check_err $? "Failed to disable status updates"