Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92491709 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

atl1: do vlan cleanup 



- unify vlan and nonvlan rx path
- kill adapter->vlgrp and atlx_vlan_rx_register
- allow to turn on/off rx/tx vlan accel via ethtool (set_features)

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4f676b8

drivers/net/atlx/atl1.c

+11 −10
Original line number Diff line number Diff line
@@ -1285,8 +1285,7 @@ static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter) 
	value |= (((u32) adapter->hw.preamble_len

		   & MAC_CTRL_PRMLEN_MASK) << MAC_CTRL_PRMLEN_SHIFT);

	/* vlan */

	if (adapter->vlgrp)

		value |= MAC_CTRL_RMV_VLAN;

	__atlx_vlan_mode(netdev->features, &value);

	/* rx checksum

	   if (adapter->rx_csum)

	   value |= MAC_CTRL_RX_CHKSUM_EN;
@@ -2023,12 +2022,13 @@ static void atl1_intr_rx(struct atl1_adapter *adapter) 
		atl1_rx_checksum(adapter, rrd, skb);

		skb->protocol = eth_type_trans(skb, adapter->netdev);



		if (adapter->vlgrp && (rrd->pkt_flg & PACKET_FLAG_VLAN_INS)) {

		if (rrd->pkt_flg & PACKET_FLAG_VLAN_INS) {

			u16 vlan_tag = (rrd->vlan_tag >> 4) |

					((rrd->vlan_tag & 7) << 13) |

					((rrd->vlan_tag & 8) << 9);

			vlan_hwaccel_rx(skb, adapter->vlgrp, vlan_tag);

		} else



			__vlan_hwaccel_put_tag(skb, vlan_tag);

		}

		netif_rx(skb);



		/* let protocol layer free skb */
@@ -2783,8 +2783,7 @@ static int atl1_suspend(struct device *dev) 
			ctrl |= MAC_CTRL_DUPLX;

		ctrl |= (((u32)adapter->hw.preamble_len &

			MAC_CTRL_PRMLEN_MASK) << MAC_CTRL_PRMLEN_SHIFT);

		if (adapter->vlgrp)

			ctrl |= MAC_CTRL_RMV_VLAN;

		__atlx_vlan_mode(netdev->features, &ctrl);

		if (wufc & ATLX_WUFC_MAG)

			ctrl |= MAC_CTRL_BC_EN;

		iowrite32(ctrl, hw->hw_addr + REG_MAC_CTRL);
@@ -2874,9 +2873,10 @@ static const struct net_device_ops atl1_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= atl1_set_mac,

	.ndo_change_mtu		= atl1_change_mtu,

	.ndo_fix_features	= atlx_fix_features,

	.ndo_set_features	= atlx_set_features,

	.ndo_do_ioctl		= atlx_ioctl,

	.ndo_tx_timeout		= atlx_tx_timeout,

	.ndo_vlan_rx_register	= atlx_vlan_rx_register,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= atl1_poll_controller,

#endif
@@ -2984,7 +2984,8 @@ static int __devinit atl1_probe(struct pci_dev *pdev, 
	netdev->features |= NETIF_F_SG;

	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);



	netdev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO;

	netdev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO |

			      NETIF_F_HW_VLAN_RX;



	/* is this valid? see atl1_setup_mac_ctrl() */

	netdev->features |= NETIF_F_RXCSUM;

drivers/net/atlx/atl1.h

+0 −1
Original line number Diff line number Diff line
@@ -753,7 +753,6 @@ struct atl1_adapter { 
	struct pci_dev *pdev;



	struct atl1_sft_stats soft_stats;

	struct vlan_group *vlgrp;

	u32 rx_buffer_len;

	u32 wol;

	u16 link_speed;

drivers/net/atlx/atlx.c

+40 −17
Original line number Diff line number Diff line
@@ -211,8 +211,18 @@ static void atlx_link_chg_task(struct work_struct *work) 
	spin_unlock_irqrestore(&adapter->lock, flags);

}



static void atlx_vlan_rx_register(struct net_device *netdev,

	struct vlan_group *grp)

static void __atlx_vlan_mode(u32 features, u32 *ctrl)

{

	if (features & NETIF_F_HW_VLAN_RX) {

		/* enable VLAN tag insert/strip */

		*ctrl |= MAC_CTRL_RMV_VLAN;

	} else {

		/* disable VLAN tag insert/strip */

		*ctrl &= ~MAC_CTRL_RMV_VLAN;

	}

}



static void atlx_vlan_mode(struct net_device *netdev, u32 features)

{

	struct atlx_adapter *adapter = netdev_priv(netdev);

	unsigned long flags;
@@ -220,27 +230,40 @@ static void atlx_vlan_rx_register(struct net_device *netdev, 


	spin_lock_irqsave(&adapter->lock, flags);

	/* atlx_irq_disable(adapter); FIXME: confirm/remove */

	adapter->vlgrp = grp;



	if (grp) {

		/* enable VLAN tag insert/strip */

	ctrl = ioread32(adapter->hw.hw_addr + REG_MAC_CTRL);

		ctrl |= MAC_CTRL_RMV_VLAN;

	__atlx_vlan_mode(features, &ctrl);

	iowrite32(ctrl, adapter->hw.hw_addr + REG_MAC_CTRL);

	} else {

		/* disable VLAN tag insert/strip */

		ctrl = ioread32(adapter->hw.hw_addr + REG_MAC_CTRL);

		ctrl &= ~MAC_CTRL_RMV_VLAN;

		iowrite32(ctrl, adapter->hw.hw_addr + REG_MAC_CTRL);

	}



	/* atlx_irq_enable(adapter); FIXME */

	spin_unlock_irqrestore(&adapter->lock, flags);

}



static void atlx_restore_vlan(struct atlx_adapter *adapter)

{

	atlx_vlan_rx_register(adapter->netdev, adapter->vlgrp);

	atlx_vlan_mode(adapter->netdev, adapter->netdev->features);

}



static u32 atlx_fix_features(struct net_device *netdev, u32 features)

{

	/*

	 * Since there is no support for separate rx/tx vlan accel

	 * enable/disable make sure tx flag is always in same state as rx.

	 */

	if (features & NETIF_F_HW_VLAN_RX)

		features |= NETIF_F_HW_VLAN_TX;

	else

		features &= ~NETIF_F_HW_VLAN_TX;



	return features;

}



static int atlx_set_features(struct net_device *netdev, u32 features)

{

	u32 changed = netdev->features ^ features;



	if (changed & NETIF_F_HW_VLAN_RX)

		atlx_vlan_mode(netdev, features);



	return 0;

}



#endif /* ATLX_C */