On 3/25/2021 8:13 PM, Don Bollinger wrote:
From: Vladyslav Tarasiuk <vladysl...@nvidia.com>
In case netlink get_module_eeprom_by_page() callback is not implemented
by the driver, try to call old get_module_info() and get_module_eeprom()
pair. Recalculate parameters to get_module_eeprom() offset and len using
page number and their sizes. Return error if this can't be done.
Signed-off-by: Vladyslav Tarasiuk <vladysl...@nvidia.com>
---
net/ethtool/eeprom.c | 66
+++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/net/ethtool/eeprom.c b/net/ethtool/eeprom.c index
10d5f6b34f2f..9f773b778bbe 100644
--- a/net/ethtool/eeprom.c
+++ b/net/ethtool/eeprom.c
@@ -25,6 +25,70 @@ struct eeprom_reply_data { #define
MODULE_EEPROM_REPDATA(__reply_base) \
container_of(__reply_base, struct eeprom_reply_data, base)
+static int fallback_set_params(struct eeprom_req_info *request,
+ struct ethtool_modinfo *modinfo,
+ struct ethtool_eeprom *eeprom) {
+ u32 offset = request->offset;
+ u32 length = request->length;
+
+ if (request->page)
+ offset = request->page *
ETH_MODULE_EEPROM_PAGE_LEN + offset;
The test 'if (request->page)' is not necessary, the math works with page 0
as well. Keep it if you like the style.
OK.
+
+ if (modinfo->type == ETH_MODULE_SFF_8079 &&
+ request->i2c_address == 0x51)
+ offset += ETH_MODULE_EEPROM_PAGE_LEN;
offset += ETH_MODULE_EEPROM_PAGE_LEN * 2;
Now that PAGE_LEN is 128, you need two of them to account for both low
memory and high memory at 0x50.
Right, thanks.
+
+ if (offset >= modinfo->eeprom_len)
+ return -EINVAL;
+
+ eeprom->cmd = ETHTOOL_GMODULEEEPROM;
+ eeprom->len = length;
+ eeprom->offset = offset;
+
+ return 0;
+}
+
+static int eeprom_fallback(struct eeprom_req_info *request,
+ struct eeprom_reply_data *reply,
+ struct genl_info *info)
+{
+ struct net_device *dev = reply->base.dev;
+ struct ethtool_modinfo modinfo = {0};
+ struct ethtool_eeprom eeprom = {0};
+ u8 *data;
+ int err;
+
+ if (!dev->ethtool_ops->get_module_info ||
+ !dev->ethtool_ops->get_module_eeprom || request->bank) {
+ return -EOPNOTSUPP;
+ }
+ modinfo.cmd = ETHTOOL_GMODULEINFO;
+ err = dev->ethtool_ops->get_module_info(dev, &modinfo);
+ if (err < 0)
+ return err;
+
+ err = fallback_set_params(request, &modinfo, &eeprom);
+ if (err < 0)
+ return err;
+
+ data = kmalloc(eeprom.len, GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+ err = dev->ethtool_ops->get_module_eeprom(dev, &eeprom,
data);
+ if (err < 0)
+ goto err_out;
+
+ reply->data = data;
+ reply->length = eeprom.len;
+
+ return 0;
+
+err_out:
+ kfree(data);
+ return err;
+}
+
static int eeprom_prepare_data(const struct ethnl_req_info *req_base,
struct ethnl_reply_data *reply_base,
struct genl_info *info)
@@ -36,7 +100,7 @@ static int eeprom_prepare_data(const struct
ethnl_req_info *req_base,
int ret;
if (!dev->ethtool_ops->get_module_eeprom_by_page)
- return -EOPNOTSUPP;
+ return eeprom_fallback(request, reply, info);
page_data.offset = request->offset;
page_data.length = request->length;
--
2.18.2
