leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: usb: ax88179_178a: move priv to driver_priv

Browse Source 
We need more space to save WoL context. So lets allocate memory
for ax88179_data instead of using struct usbnet data field which
only supports 5 words. We continue to use the struct usbnet data
field for multicast filters. However since we no longer have the
private data stored there, we can shift it to the beginning.

Signed-off-by: Justin Chen <justinpopo6@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Justin Chen
2022-07-20 17:28:15 -07:00
committed by Jakub Kicinski
parent c4bf747c68
commit 2bcbd3d8a7
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/usb/ax88179_178a.c
View File

@@ -170,7 +170,6 @@ struct ax88179_data {
u8 eee_enabled; u8 eee_enabled;
u8 eee_active; u8 eee_active;
u16 rxctl; u16 rxctl;
u16 reserved;
u8 in_pm; u8 in_pm;
}; };
@@ -190,14 +189,14 @@ static const struct {
static void ax88179_set_pm_mode(struct usbnet *dev, bool pm_mode) static void ax88179_set_pm_mode(struct usbnet *dev, bool pm_mode)
{ {
struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data; struct ax88179_data *ax179_data = dev->driver_priv;
ax179_data->in_pm = pm_mode; ax179_data->in_pm = pm_mode;
} }
static int ax88179_in_pm(struct usbnet *dev) static int ax88179_in_pm(struct usbnet *dev)
{ {
struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data; struct ax88179_data *ax179_data = dev->driver_priv;
return ax179_data->in_pm; return ax179_data->in_pm;
} }
@@ -693,7 +692,7 @@ ax88179_ethtool_set_eee(struct usbnet *dev, struct ethtool_eee *data)
static int ax88179_chk_eee(struct usbnet *dev) static int ax88179_chk_eee(struct usbnet *dev)
{ {
struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET }; struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
struct ax88179_data *priv = (struct ax88179_data *)dev->data; struct ax88179_data *priv = dev->driver_priv;
mii_ethtool_gset(&dev->mii, &ecmd); mii_ethtool_gset(&dev->mii, &ecmd);
@@ -796,7 +795,7 @@ static void ax88179_enable_eee(struct usbnet *dev)
static int ax88179_get_eee(struct net_device *net, struct ethtool_eee *edata) static int ax88179_get_eee(struct net_device *net, struct ethtool_eee *edata)
{ {
struct usbnet *dev = netdev_priv(net); struct usbnet *dev = netdev_priv(net);
struct ax88179_data *priv = (struct ax88179_data *)dev->data; struct ax88179_data *priv = dev->driver_priv;
edata->eee_enabled = priv->eee_enabled; edata->eee_enabled = priv->eee_enabled;
edata->eee_active = priv->eee_active; edata->eee_active = priv->eee_active;
@@ -807,7 +806,7 @@ static int ax88179_get_eee(struct net_device *net, struct ethtool_eee *edata)
static int ax88179_set_eee(struct net_device *net, struct ethtool_eee *edata) static int ax88179_set_eee(struct net_device *net, struct ethtool_eee *edata)
{ {
struct usbnet *dev = netdev_priv(net); struct usbnet *dev = netdev_priv(net);
struct ax88179_data *priv = (struct ax88179_data *)dev->data; struct ax88179_data *priv = dev->driver_priv;
int ret; int ret;
priv->eee_enabled = edata->eee_enabled; priv->eee_enabled = edata->eee_enabled;
@@ -858,8 +857,8 @@ static const struct ethtool_ops ax88179_ethtool_ops = {
static void ax88179_set_multicast(struct net_device *net) static void ax88179_set_multicast(struct net_device *net)
{ {
struct usbnet *dev = netdev_priv(net); struct usbnet *dev = netdev_priv(net);
struct ax88179_data *data = (struct ax88179_data *)dev->data; struct ax88179_data *data = dev->driver_priv;
u8 *m_filter = ((u8 *)dev->data) + 12; u8 *m_filter = ((u8 *)dev->data);
data->rxctl = (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_IPE); data->rxctl = (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_IPE);
@@ -871,7 +870,7 @@ static void ax88179_set_multicast(struct net_device *net)
} else if (netdev_mc_empty(net)) { } else if (netdev_mc_empty(net)) {
/* just broadcast and directed */ /* just broadcast and directed */
} else { } else {
/* We use the 20 byte dev->data for our 8 byte filter buffer /* We use dev->data for our 8 byte filter buffer
* to avoid allocating memory that is tricky to free later * to avoid allocating memory that is tricky to free later
*/ */
u32 crc_bits; u32 crc_bits;
@@ -1270,11 +1269,15 @@ static void ax88179_get_mac_addr(struct usbnet *dev)
static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf) static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
{ {
struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data; struct ax88179_data *ax179_data;
usbnet_get_endpoints(dev, intf); usbnet_get_endpoints(dev, intf);
memset(ax179_data, 0, sizeof(*ax179_data)); ax179_data = kzalloc(sizeof(*ax179_data), GFP_KERNEL);
if (!ax179_data)
return -ENOMEM;
dev->driver_priv = ax179_data;
dev->net->netdev_ops = &ax88179_netdev_ops; dev->net->netdev_ops = &ax88179_netdev_ops;
dev->net->ethtool_ops = &ax88179_ethtool_ops; dev->net->ethtool_ops = &ax88179_ethtool_ops;
@@ -1304,6 +1307,7 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
static void ax88179_unbind(struct usbnet *dev, struct usb_interface *intf) static void ax88179_unbind(struct usbnet *dev, struct usb_interface *intf)
{ {
struct ax88179_data *ax179_data = dev->driver_priv;
u16 tmp16; u16 tmp16;
/* Configure RX control register => stop operation */ /* Configure RX control register => stop operation */
@@ -1316,6 +1320,8 @@ static void ax88179_unbind(struct usbnet *dev, struct usb_interface *intf)
/* Power down ethernet PHY */ /* Power down ethernet PHY */
tmp16 = 0; tmp16 = 0;
ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16); ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16);
kfree(ax179_data);
} }
static void static void
@@ -1492,7 +1498,7 @@ ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
static int ax88179_link_reset(struct usbnet *dev) static int ax88179_link_reset(struct usbnet *dev)
{ {
struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data; struct ax88179_data *ax179_data = dev->driver_priv;
u8 tmp[5], link_sts; u8 tmp[5], link_sts;
u16 mode, tmp16, delay = HZ / 10; u16 mode, tmp16, delay = HZ / 10;
u32 tmp32 = 0x40000000; u32 tmp32 = 0x40000000;
@@ -1567,7 +1573,7 @@ static int ax88179_reset(struct usbnet *dev)
u8 buf[5]; u8 buf[5];
u16 *tmp16; u16 *tmp16;
u8 *tmp; u8 *tmp;
struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data; struct ax88179_data *ax179_data = dev->driver_priv;
struct ethtool_eee eee_data; struct ethtool_eee eee_data;
tmp16 = (u16 *)buf; tmp16 = (u16 *)buf;