summaryrefslogtreecommitdiff
path: root/net/ethtool
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2021-04-09 11:06:41 +0300
committerDavid S. Miller <davem@davemloft.net>2021-04-12 02:34:56 +0300
commitc97a31f66ebcab54c006878142fb683c6116bed1 (patch)
tree037c408e352f6153987c06ff9e2ef5431e2a0c8e /net/ethtool
parentd740513f05a24b1a46722325974223980f068728 (diff)
downloadlinux-c97a31f66ebcab54c006878142fb683c6116bed1.tar.xz
ethtool: wire in generic SFP module access
If the device has a sfp bus attached, call its sfp_get_module_eeprom_by_page() function, otherwise use the ethtool op for the device. This follows how the IOCTL works. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethtool')
-rw-r--r--net/ethtool/eeprom.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/net/ethtool/eeprom.c b/net/ethtool/eeprom.c
index 1a49c133d401..2a6733a6449a 100644
--- a/net/ethtool/eeprom.c
+++ b/net/ethtool/eeprom.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <linux/ethtool.h>
+#include <linux/sfp.h>
#include "netlink.h"
#include "common.h"
@@ -85,6 +86,21 @@ err_out:
return err;
}
+static int get_module_eeprom_by_page(struct net_device *dev,
+ struct ethtool_module_eeprom *page_data,
+ struct netlink_ext_ack *extack)
+{
+ const struct ethtool_ops *ops = dev->ethtool_ops;
+
+ if (dev->sfp_bus)
+ return sfp_get_module_eeprom_by_page(dev->sfp_bus, page_data, extack);
+
+ if (ops->get_module_info)
+ return ops->get_module_eeprom_by_page(dev, page_data, extack);
+
+ return -EOPNOTSUPP;
+}
+
static int eeprom_prepare_data(const struct ethnl_req_info *req_base,
struct ethnl_reply_data *reply_base,
struct genl_info *info)
@@ -95,9 +111,6 @@ static int eeprom_prepare_data(const struct ethnl_req_info *req_base,
struct net_device *dev = reply_base->dev;
int ret;
- if (!dev->ethtool_ops->get_module_eeprom_by_page)
- return eeprom_fallback(request, reply, info);
-
page_data.offset = request->offset;
page_data.length = request->length;
page_data.i2c_address = request->i2c_address;
@@ -111,8 +124,7 @@ static int eeprom_prepare_data(const struct ethnl_req_info *req_base,
if (ret)
goto err_free;
- ret = dev->ethtool_ops->get_module_eeprom_by_page(dev, &page_data,
- info->extack);
+ ret = get_module_eeprom_by_page(dev, &page_data, info->extack);
if (ret < 0)
goto err_ops;
@@ -126,6 +138,9 @@ err_ops:
ethnl_ops_complete(dev);
err_free:
kfree(page_data.data);
+
+ if (ret == -EOPNOTSUPP)
+ return eeprom_fallback(request, reply, info);
return ret;
}