Commit d740513f authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller

phy: sfp: add netlink SFP support to generic SFP code

The new netlink API for reading SFP data requires a new op to be
implemented. The idea of the new netlink SFP code is that userspace is
responsible to parsing the EEPROM data and requesting pages, rather
than have the kernel decide what pages are interesting and returning
them. This allows greater flexibility for newer formats.

Currently the generic SFP code only supports simple SFPs. Allow i2c
address 0x50 and 0x51 to be accessed with page and bank must always be
0. This interface will later be extended when for example QSFP support
is added.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarVladyslav Tarasiuk <vladyslavt@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96d971e3
...@@ -555,6 +555,26 @@ int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee, ...@@ -555,6 +555,26 @@ int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee,
} }
EXPORT_SYMBOL_GPL(sfp_get_module_eeprom); EXPORT_SYMBOL_GPL(sfp_get_module_eeprom);
/**
* sfp_get_module_eeprom_by_page() - Read a page from the SFP module EEPROM
* @bus: a pointer to the &struct sfp_bus structure for the sfp module
* @page: a &struct ethtool_module_eeprom
* @extack: extack for reporting problems
*
* Read an EEPROM page as specified by the supplied @page. See the
* documentation for &struct ethtool_module_eeprom for the page to be read.
*
* Returns 0 on success or a negative errno number. More error
* information might be provided via extack
*/
int sfp_get_module_eeprom_by_page(struct sfp_bus *bus,
const struct ethtool_module_eeprom *page,
struct netlink_ext_ack *extack)
{
return bus->socket_ops->module_eeprom_by_page(bus->sfp, page, extack);
}
EXPORT_SYMBOL_GPL(sfp_get_module_eeprom_by_page);
/** /**
* sfp_upstream_start() - Inform the SFP that the network device is up * sfp_upstream_start() - Inform the SFP that the network device is up
* @bus: a pointer to the &struct sfp_bus structure for the sfp module * @bus: a pointer to the &struct sfp_bus structure for the sfp module
......
...@@ -2330,6 +2330,30 @@ static int sfp_module_eeprom(struct sfp *sfp, struct ethtool_eeprom *ee, ...@@ -2330,6 +2330,30 @@ static int sfp_module_eeprom(struct sfp *sfp, struct ethtool_eeprom *ee,
return 0; return 0;
} }
static int sfp_module_eeprom_by_page(struct sfp *sfp,
const struct ethtool_module_eeprom *page,
struct netlink_ext_ack *extack)
{
if (page->bank) {
NL_SET_ERR_MSG(extack, "Banks not supported");
return -EOPNOTSUPP;
}
if (page->page) {
NL_SET_ERR_MSG(extack, "Only page 0 supported");
return -EOPNOTSUPP;
}
if (page->i2c_address != 0x50 &&
page->i2c_address != 0x51) {
NL_SET_ERR_MSG(extack, "Only address 0x50 and 0x51 supported");
return -EOPNOTSUPP;
}
return sfp_read(sfp, page->i2c_address == 0x51, page->offset,
page->data, page->length);
};
static const struct sfp_socket_ops sfp_module_ops = { static const struct sfp_socket_ops sfp_module_ops = {
.attach = sfp_attach, .attach = sfp_attach,
.detach = sfp_detach, .detach = sfp_detach,
...@@ -2337,6 +2361,7 @@ static const struct sfp_socket_ops sfp_module_ops = { ...@@ -2337,6 +2361,7 @@ static const struct sfp_socket_ops sfp_module_ops = {
.stop = sfp_stop, .stop = sfp_stop,
.module_info = sfp_module_info, .module_info = sfp_module_info,
.module_eeprom = sfp_module_eeprom, .module_eeprom = sfp_module_eeprom,
.module_eeprom_by_page = sfp_module_eeprom_by_page,
}; };
static void sfp_timeout(struct work_struct *work) static void sfp_timeout(struct work_struct *work)
......
...@@ -14,6 +14,9 @@ struct sfp_socket_ops { ...@@ -14,6 +14,9 @@ struct sfp_socket_ops {
int (*module_info)(struct sfp *sfp, struct ethtool_modinfo *modinfo); int (*module_info)(struct sfp *sfp, struct ethtool_modinfo *modinfo);
int (*module_eeprom)(struct sfp *sfp, struct ethtool_eeprom *ee, int (*module_eeprom)(struct sfp *sfp, struct ethtool_eeprom *ee,
u8 *data); u8 *data);
int (*module_eeprom_by_page)(struct sfp *sfp,
const struct ethtool_module_eeprom *page,
struct netlink_ext_ack *extack);
}; };
int sfp_add_phy(struct sfp_bus *bus, struct phy_device *phydev); int sfp_add_phy(struct sfp_bus *bus, struct phy_device *phydev);
......
...@@ -542,6 +542,9 @@ phy_interface_t sfp_select_interface(struct sfp_bus *bus, ...@@ -542,6 +542,9 @@ phy_interface_t sfp_select_interface(struct sfp_bus *bus,
int sfp_get_module_info(struct sfp_bus *bus, struct ethtool_modinfo *modinfo); int sfp_get_module_info(struct sfp_bus *bus, struct ethtool_modinfo *modinfo);
int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee, int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee,
u8 *data); u8 *data);
int sfp_get_module_eeprom_by_page(struct sfp_bus *bus,
const struct ethtool_module_eeprom *page,
struct netlink_ext_ack *extack);
void sfp_upstream_start(struct sfp_bus *bus); void sfp_upstream_start(struct sfp_bus *bus);
void sfp_upstream_stop(struct sfp_bus *bus); void sfp_upstream_stop(struct sfp_bus *bus);
void sfp_bus_put(struct sfp_bus *bus); void sfp_bus_put(struct sfp_bus *bus);
...@@ -587,6 +590,13 @@ static inline int sfp_get_module_eeprom(struct sfp_bus *bus, ...@@ -587,6 +590,13 @@ static inline int sfp_get_module_eeprom(struct sfp_bus *bus,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int sfp_get_module_eeprom_by_page(struct sfp_bus *bus,
const struct ethtool_module_eeprom *page,
struct netlink_ext_ack *extack)
{
return -EOPNOTSUPP;
}
static inline void sfp_upstream_start(struct sfp_bus *bus) static inline void sfp_upstream_start(struct sfp_bus *bus)
{ {
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment