Commit ceb02c91 authored by Christian Riesch's avatar Christian Riesch Committed by David S. Miller

asix: Rework reading from EEPROM

The current code for reading the EEPROM via ethtool in the asix
driver has a few issues. It cannot handle odd length values
(accesses must be aligned at 16 bit boundaries) and interprets the
offset provided by ethtool as 16 bit word offset instead as byte offset.

The new code for asix_get_eeprom() introduced by this patch is
modeled after the code in
drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
and provides read access to the entire EEPROM with arbitrary
offsets and lengths.
Signed-off-by: default avatarChristian Riesch <christian.riesch@omicron.at>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84c9f8c4
...@@ -156,8 +156,7 @@ ...@@ -156,8 +156,7 @@
#define AX_GPIO_RSE 0x80 /* Reload serial EEPROM */ #define AX_GPIO_RSE 0x80 /* Reload serial EEPROM */
#define AX_EEPROM_MAGIC 0xdeadbeef #define AX_EEPROM_MAGIC 0xdeadbeef
#define AX88172_EEPROM_LEN 0x40 #define AX_EEPROM_LEN 0x200
#define AX88772_EEPROM_LEN 0xff
/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */ /* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
struct asix_data { struct asix_data {
...@@ -165,7 +164,7 @@ struct asix_data { ...@@ -165,7 +164,7 @@ struct asix_data {
u8 mac_addr[ETH_ALEN]; u8 mac_addr[ETH_ALEN];
u8 phymode; u8 phymode;
u8 ledmode; u8 ledmode;
u8 eeprom_len; u8 res;
}; };
int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
......
...@@ -478,46 +478,51 @@ int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo) ...@@ -478,46 +478,51 @@ int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
int asix_get_eeprom_len(struct net_device *net) int asix_get_eeprom_len(struct net_device *net)
{ {
struct usbnet *dev = netdev_priv(net); return AX_EEPROM_LEN;
struct asix_data *data = (struct asix_data *)&dev->data;
return data->eeprom_len;
} }
int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom, int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
u8 *data) u8 *data)
{ {
struct usbnet *dev = netdev_priv(net); struct usbnet *dev = netdev_priv(net);
__le16 *ebuf = (__le16 *)data; u16 *eeprom_buff;
int first_word, last_word;
int i; int i;
/* Crude hack to ensure that we don't overwrite memory if (eeprom->len == 0)
* if an odd length is supplied
*/
if (eeprom->len % 2)
return -EINVAL; return -EINVAL;
eeprom->magic = AX_EEPROM_MAGIC; eeprom->magic = AX_EEPROM_MAGIC;
first_word = eeprom->offset >> 1;
last_word = (eeprom->offset + eeprom->len - 1) >> 1;
eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
GFP_KERNEL);
if (!eeprom_buff)
return -ENOMEM;
/* ax8817x returns 2 bytes from eeprom on read */ /* ax8817x returns 2 bytes from eeprom on read */
for (i=0; i < eeprom->len / 2; i++) { for (i = first_word; i <= last_word; i++) {
if (asix_read_cmd(dev, AX_CMD_READ_EEPROM, if (asix_read_cmd(dev, AX_CMD_READ_EEPROM, i, 0, 2,
eeprom->offset + i, 0, 2, &ebuf[i]) < 0) &(eeprom_buff[i - first_word])) < 0) {
return -EINVAL; kfree(eeprom_buff);
return -EIO;
}
} }
memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
kfree(eeprom_buff);
return 0; return 0;
} }
void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
{ {
struct usbnet *dev = netdev_priv(net);
struct asix_data *data = (struct asix_data *)&dev->data;
/* Inherit standard device info */ /* Inherit standard device info */
usbnet_get_drvinfo(net, info); usbnet_get_drvinfo(net, info);
strncpy (info->driver, DRIVER_NAME, sizeof info->driver); strncpy (info->driver, DRIVER_NAME, sizeof info->driver);
strncpy (info->version, DRIVER_VERSION, sizeof info->version); strncpy (info->version, DRIVER_VERSION, sizeof info->version);
info->eedump_len = data->eeprom_len; info->eedump_len = AX_EEPROM_LEN;
} }
int asix_set_mac_address(struct net_device *net, void *p) int asix_set_mac_address(struct net_device *net, void *p)
......
...@@ -201,9 +201,6 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf) ...@@ -201,9 +201,6 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
u8 buf[ETH_ALEN]; u8 buf[ETH_ALEN];
int i; int i;
unsigned long gpio_bits = dev->driver_info->data; unsigned long gpio_bits = dev->driver_info->data;
struct asix_data *data = (struct asix_data *)&dev->data;
data->eeprom_len = AX88172_EEPROM_LEN;
usbnet_get_endpoints(dev,intf); usbnet_get_endpoints(dev,intf);
...@@ -409,12 +406,9 @@ static const struct net_device_ops ax88772_netdev_ops = { ...@@ -409,12 +406,9 @@ static const struct net_device_ops ax88772_netdev_ops = {
static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
{ {
int ret, embd_phy; int ret, embd_phy;
struct asix_data *data = (struct asix_data *)&dev->data;
u8 buf[ETH_ALEN]; u8 buf[ETH_ALEN];
u32 phyid; u32 phyid;
data->eeprom_len = AX88772_EEPROM_LEN;
usbnet_get_endpoints(dev,intf); usbnet_get_endpoints(dev,intf);
/* Get the MAC address */ /* Get the MAC address */
...@@ -767,9 +761,6 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf) ...@@ -767,9 +761,6 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
{ {
int ret; int ret;
u8 buf[ETH_ALEN]; u8 buf[ETH_ALEN];
struct asix_data *data = (struct asix_data *)&dev->data;
data->eeprom_len = AX88772_EEPROM_LEN;
usbnet_get_endpoints(dev,intf); usbnet_get_endpoints(dev,intf);
......
...@@ -228,12 +228,9 @@ static int ax88172a_reset_phy(struct usbnet *dev, int embd_phy) ...@@ -228,12 +228,9 @@ static int ax88172a_reset_phy(struct usbnet *dev, int embd_phy)
static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf) static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
{ {
int ret; int ret;
struct asix_data *data = (struct asix_data *)&dev->data;
u8 buf[ETH_ALEN]; u8 buf[ETH_ALEN];
struct ax88172a_private *priv; struct ax88172a_private *priv;
data->eeprom_len = AX88772_EEPROM_LEN;
usbnet_get_endpoints(dev, intf); usbnet_get_endpoints(dev, intf);
priv = kzalloc(sizeof(*priv), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
......
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