ethtool: add compat for flash update

If driver does not support ethtool flash update operation
call into devlink.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 18d7a051f41218e2e06a1102cf283bb5a5448771..a2da49dd91475bf5db88d96bf5b51018e198bf01 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1195,11 +1195,18 @@ devlink_health_report(struct devlink_health_reporter *reporter,
 #if IS_REACHABLE(CONFIG_NET_DEVLINK)
 void devlink_compat_running_version(struct net_device *dev,
                                    char *buf, size_t len);
+int devlink_compat_flash_update(struct net_device *dev, const char *file_name);
 #else
 static inline void
 devlink_compat_running_version(struct net_device *dev, char *buf, size_t len)
 {
 }
+
+static inline int
+devlink_compat_flash_update(struct net_device *dev, const char *file_name)
+{
+       return -EOPNOTSUPP;
+}
 #endif
 
 #endif /* _NET_DEVLINK_H_ */

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 4a1ad0b13e52676ab83c3ffb51870ab7388283de..04d98550c78ce062937feda53adabdc9c38b3d39 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -6450,6 +6450,36 @@ out:
        mutex_unlock(&devlink_mutex);
 }
 
+int devlink_compat_flash_update(struct net_device *dev, const char *file_name)
+{
+       struct devlink_port *devlink_port;
+       struct devlink *devlink;
+
+       mutex_lock(&devlink_mutex);
+       list_for_each_entry(devlink, &devlink_list, list) {
+               mutex_lock(&devlink->lock);
+               list_for_each_entry(devlink_port, &devlink->port_list, list) {
+                       int ret = -EOPNOTSUPP;
+
+                       if (devlink_port->type != DEVLINK_PORT_TYPE_ETH ||
+                           devlink_port->type_dev != dev)
+                               continue;
+
+                       mutex_unlock(&devlink_mutex);
+                       if (devlink->ops->flash_update)
+                               ret = devlink->ops->flash_update(devlink,
+                                                                file_name,
+                                                                NULL, NULL);
+                       mutex_unlock(&devlink->lock);
+                       return ret;
+               }
+               mutex_unlock(&devlink->lock);
+       }
+       mutex_unlock(&devlink_mutex);
+
+       return -EOPNOTSUPP;
+}
+
 static int __init devlink_module_init(void)
 {
        return genl_register_family(&devlink_nl_family);

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index d2c47cdf25da743e28315c3f28144258ab1c9ef9..1320e8dce559fd2ae19eb0f54e0dd7f261c7a7a2 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -2038,11 +2038,17 @@ static noinline_for_stack int ethtool_flash_device(struct net_device *dev,
 
        if (copy_from_user(&efl, useraddr, sizeof(efl)))
                return -EFAULT;
+       efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;
 
-       if (!dev->ethtool_ops->flash_device)
-               return -EOPNOTSUPP;
+       if (!dev->ethtool_ops->flash_device) {
+               int ret;
 
-       efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;
+               rtnl_unlock();
+               ret = devlink_compat_flash_update(dev, efl.data);
+               rtnl_lock();
+
+               return ret;
+       }
 
        return dev->ethtool_ops->flash_device(dev, &efl);
 }