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

Commit 836d57e5 authored by Prasad Kanneganti's avatar Prasad Kanneganti Committed by David S. Miller
Browse files

liquidio: implement vlan filter enable and disable 



Add implementation to support ethtool -K ethX rx-vlan-filter on/off.
Rename OCTNET_CMD_ENABLE_VLAN_FILTER command to OCTNET_CMD_VLAN_FILTER_CTL
and add OCTNET_CMD_VLAN_FILTER_ENABLE and OCTNET_CMD_VLAN_FILTER_DISABLE
parameters so that it can be used to enable or disable the filter.

Signed-off-by: default avatarPrasad Kanneganti <prasad.kanneganti@cavium.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06d4d450

drivers/net/ethernet/cavium/liquidio/lio_core.c

+7 −3
Original line number Diff line number Diff line
@@ -202,9 +202,13 @@ void liquidio_link_ctrl_cmd_completion(void *nctrl_ptr) 
			 netdev->name);

		break;



	case OCTNET_CMD_ENABLE_VLAN_FILTER:

		dev_info(&oct->pci_dev->dev, "%s VLAN filter enabled\n",

			 netdev->name);

	case OCTNET_CMD_VLAN_FILTER_CTL:

		if (nctrl->ncmd.s.param1)

			dev_info(&oct->pci_dev->dev,

				 "%s VLAN filter enabled\n", netdev->name);

		else

			dev_info(&oct->pci_dev->dev,

				 "%s VLAN filter disabled\n", netdev->name);

		break;



	case OCTNET_CMD_ADD_VLAN_FILTER:

drivers/net/ethernet/cavium/liquidio/lio_main.c

+22 −6
Original line number Diff line number Diff line
@@ -3591,6 +3591,10 @@ static netdev_features_t liquidio_fix_features(struct net_device *netdev, 
	    (lio->dev_capability & NETIF_F_LRO))

		request &= ~NETIF_F_LRO;



	if ((request & NETIF_F_HW_VLAN_CTAG_FILTER) &&

	    !(lio->dev_capability & NETIF_F_HW_VLAN_CTAG_FILTER))

		request &= ~NETIF_F_HW_VLAN_CTAG_FILTER;



	return request;

}
@@ -3603,14 +3607,14 @@ static int liquidio_set_features(struct net_device *netdev, 
{

	struct lio *lio = netdev_priv(netdev);



	if (!((netdev->features ^ features) & NETIF_F_LRO))

		return 0;



	if ((features & NETIF_F_LRO) && (lio->dev_capability & NETIF_F_LRO))

	if ((features & NETIF_F_LRO) &&

	    (lio->dev_capability & NETIF_F_LRO) &&

	    !(netdev->features & NETIF_F_LRO))

		liquidio_set_feature(netdev, OCTNET_CMD_LRO_ENABLE,

				     OCTNIC_LROIPV4 | OCTNIC_LROIPV6);

	else if (!(features & NETIF_F_LRO) &&

		 (lio->dev_capability & NETIF_F_LRO))

		 (lio->dev_capability & NETIF_F_LRO) &&

		 (netdev->features & NETIF_F_LRO))

		liquidio_set_feature(netdev, OCTNET_CMD_LRO_DISABLE,

				     OCTNIC_LROIPV4 | OCTNIC_LROIPV6);
@@ -3629,6 +3633,17 @@ static int liquidio_set_features(struct net_device *netdev, 
		liquidio_set_rxcsum_command(netdev, OCTNET_CMD_TNL_RX_CSUM_CTL,

					    OCTNET_CMD_RXCSUM_DISABLE);



	if ((features & NETIF_F_HW_VLAN_CTAG_FILTER) &&

	    (lio->dev_capability & NETIF_F_HW_VLAN_CTAG_FILTER) &&

	    !(netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER))

		liquidio_set_feature(netdev, OCTNET_CMD_VLAN_FILTER_CTL,

				     OCTNET_CMD_VLAN_FILTER_ENABLE);

	else if (!(features & NETIF_F_HW_VLAN_CTAG_FILTER) &&

		 (lio->dev_capability & NETIF_F_HW_VLAN_CTAG_FILTER) &&

		 (netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER))

		liquidio_set_feature(netdev, OCTNET_CMD_VLAN_FILTER_CTL,

				     OCTNET_CMD_VLAN_FILTER_DISABLE);



	return 0;

}
@@ -4199,7 +4214,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
			liquidio_set_feature(netdev, OCTNET_CMD_LRO_ENABLE,

					     OCTNIC_LROIPV4 | OCTNIC_LROIPV6);



		liquidio_set_feature(netdev, OCTNET_CMD_ENABLE_VLAN_FILTER, 0);

		liquidio_set_feature(netdev, OCTNET_CMD_VLAN_FILTER_CTL,

				     OCTNET_CMD_VLAN_FILTER_ENABLE);



		if ((debug != -1) && (debug & NETIF_MSG_HW))

			liquidio_set_feature(netdev,

drivers/net/ethernet/cavium/liquidio/liquidio_common.h

+3 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static inline void add_sg_size(struct octeon_sg_entry *sg_entry, 
#define   OCTNET_CMD_VERBOSE_ENABLE   0x14

#define   OCTNET_CMD_VERBOSE_DISABLE  0x15



#define   OCTNET_CMD_ENABLE_VLAN_FILTER 0x16

#define   OCTNET_CMD_VLAN_FILTER_CTL 0x16

#define   OCTNET_CMD_ADD_VLAN_FILTER  0x17

#define   OCTNET_CMD_DEL_VLAN_FILTER  0x18

#define   OCTNET_CMD_VXLAN_PORT_CONFIG 0x19
@@ -230,6 +230,8 @@ static inline void add_sg_size(struct octeon_sg_entry *sg_entry, 
#define   OCTNET_CMD_RXCSUM_DISABLE    0x1

#define   OCTNET_CMD_TXCSUM_ENABLE     0x0

#define   OCTNET_CMD_TXCSUM_DISABLE    0x1

#define   OCTNET_CMD_VLAN_FILTER_ENABLE 0x1

#define   OCTNET_CMD_VLAN_FILTER_DISABLE 0x0



/* RX(packets coming from wire) Checksum verification flags */

/* TCP/UDP csum */