Skip to content

Commit

Permalink
ethtool: Add fallback to get_module_eeprom from netlink command
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Andrew Lunn <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Hoommus authored and davem330 committed Apr 11, 2021
1 parent 95dfc7e commit 96d971e
Showing 1 changed file with 61 additions and 1 deletion.
62 changes: 61 additions & 1 deletion net/ethtool/eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,66 @@ 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;

if (modinfo->type == ETH_MODULE_SFF_8079 &&
request->i2c_address == 0x51)
offset += ETH_MODULE_EEPROM_PAGE_LEN * 2;

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;

modinfo.cmd = ETHTOOL_GMODULEINFO;
err = ethtool_get_module_info_call(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 = ethtool_get_module_eeprom_call(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)
Expand All @@ -36,7 +96,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;
Expand Down

0 comments on commit 96d971e

Please sign in to comment.