Implement ndo_write_rx_config for the 8139cp driver Signed-off-by: I Viswanath --- drivers/net/ethernet/realtek/8139cp.c | 78 ++++++++++++++++----------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index 5652da8a178c..3480079361f3 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -319,6 +319,11 @@ struct cp_extra_stats { unsigned long rx_frags; }; +struct cp_rx_config { + int rx_mode; + u32 mc_filter[2]; /* Multicast hash filter */ +}; + struct cp_private { void __iomem *regs; struct net_device *dev; @@ -328,7 +333,7 @@ struct cp_private { struct napi_struct napi; struct pci_dev *pdev; - u32 rx_config; + struct cp_rx_config *rx_config; u16 cpcmd; struct cp_extra_stats cp_stats; @@ -372,7 +377,6 @@ struct cp_private { } while (0) -static void __cp_set_rx_mode (struct net_device *dev); static void cp_tx (struct cp_private *cp); static void cp_clean_rings (struct cp_private *cp); #ifdef CONFIG_NET_POLL_CONTROLLER @@ -882,55 +886,53 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, goto out_unlock; } +static void cp_write_rx_config(struct net_device *dev) +{ + struct cp_private *cp = netdev_priv(dev); + struct cp_rx_config snapshot; + + read_snapshot((&snapshot), struct cp_private); + + /* We can safely update without stopping the chip. */ + cpw32_f(RxConfig, snapshot.rx_mode); + + cpw32_f(MAR0 + 0, snapshot.mc_filter[0]); + cpw32_f(MAR0 + 4, snapshot.mc_filter[1]); +}Firstly, think whether you have a bug fix or new "next-like" content. Then once decided, assuming that you use git, use the prefix flag, i.e. + /* Set or clear the multicast filter for this adaptor. This routine is not state sensitive and need not be SMP locked. */ -static void __cp_set_rx_mode (struct net_device *dev) +static void cp_set_rx_mode (struct net_device *dev) { - struct cp_private *cp = netdev_priv(dev); - u32 mc_filter[2]; /* Multicast hash filter */ - int rx_mode; + struct cp_rx_config new_config; /* Note: do not reorder, GCC is clever about common statements. */ if (dev->flags & IFF_PROMISC) { /* Unconditionally log net taps. */ - rx_mode = + new_config.rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptAllPhys; - mc_filter[1] = mc_filter[0] = 0xffffffff; + new_config.mc_filter[1] = new_config.mc_filter[0] = 0xffffffff; } else if ((netdev_mc_count(dev) > multicast_filter_limit) || (dev->flags & IFF_ALLMULTI)) { /* Too many to filter perfectly -- accept all multicasts. */ - rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; - mc_filter[1] = mc_filter[0] = 0xffffffff; + new_config.rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; + new_config.mc_filter[1] = new_config.mc_filter[0] = 0xffffffff; } else { struct netdev_hw_addr *ha; - rx_mode = AcceptBroadcast | AcceptMyPhys; - mc_filter[1] = mc_filter[0] = 0; + new_config.rx_mode = AcceptBroadcast | AcceptMyPhys; + new_config.mc_filter[1] = new_config.mc_filter[0] = 0; netdev_for_each_mc_addr(ha, dev) { int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; - mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); - rx_mode |= AcceptMulticast; + new_config.mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); + new_config.rx_mode |= AcceptMulticast; } } - /* We can safely update without stopping the chip. */ - cp->rx_config = cp_rx_config | rx_mode; - cpw32_f(RxConfig, cp->rx_config); - - cpw32_f (MAR0 + 0, mc_filter[0]); - cpw32_f (MAR0 + 4, mc_filter[1]); -} - -static void cp_set_rx_mode (struct net_device *dev) -{ - unsigned long flags; - struct cp_private *cp = netdev_priv(dev); - - spin_lock_irqsave (&cp->lock, flags); - __cp_set_rx_mode(dev); - spin_unlock_irqrestore (&cp->lock, flags); + new_config.rx_mode = cp_rx_config | new_config.rx_mode; + update_snapshot(&new_config, struct cp_private); } static void __cp_get_stats(struct cp_private *cp) @@ -1040,7 +1042,7 @@ static void cp_init_hw (struct cp_private *cp) cp_start_hw(cp); cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */ - __cp_set_rx_mode(dev); + set_and_schedule_rx_config(dev, true); cpw32_f (TxConfig, IFG | (TX_DMA_BURST << TxDMAShift)); cpw8(Config1, cpr8(Config1) | DriverLoaded | PMEnable); @@ -1188,6 +1190,12 @@ static int cp_open (struct net_device *dev) if (rc) return rc; + cp->rx_config = kmalloc(sizeof(*cp->rx_config), GFP_KERNEL); + if (!cp->rx_config) { + rc = -ENOMEM; + goto err_out_rx_config; + } + napi_enable(&cp->napi); cp_init_hw(cp); @@ -1207,6 +1215,9 @@ static int cp_open (struct net_device *dev) err_out_hw: napi_disable(&cp->napi); cp_stop_hw(cp); + kfree(cp->rx_config); + +err_out_rx_config: cp_free_rings(cp); return rc; } @@ -1227,6 +1238,8 @@ static int cp_close (struct net_device *dev) cp_stop_hw(cp); + kfree(cp->rx_config); + spin_unlock_irqrestore(&cp->lock, flags); free_irq(cp->pdev->irq, dev); @@ -1262,7 +1275,7 @@ static void cp_tx_timeout(struct net_device *dev, unsigned int txqueue) cp_clean_rings(cp); cp_init_rings(cp); cp_start_hw(cp); - __cp_set_rx_mode(dev); + set_and_schedule_rx_config(dev, false); cpw16_f(IntrMask, cp_norx_intr_mask); netif_wake_queue(dev); @@ -1870,6 +1883,7 @@ static const struct net_device_ops cp_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = cp_set_mac_address, .ndo_set_rx_mode = cp_set_rx_mode, + .ndo_write_rx_config = cp_write_rx_config, .ndo_get_stats = cp_get_stats, .ndo_eth_ioctl = cp_ioctl, .ndo_start_xmit = cp_start_xmit, -- 2.47.3