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

Commit e802f8e4 authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/mlx4: Prepare VLAN macros for 802.1ad Hardware accelerated support 



To add Hardware accelerated support in 802.1ad vlan, replace
Current VLAN macros to CVLAN.
Replace:
MLX4_WQE_CTRL_INS_VLAN
MLX4_CQE_VLAN_PRESENT_MASK
With:
MLX4_WQE_CTRL_INS_CVLAN
MLX4_CQE_CVLAN_PRESENT_MASK

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c509a48

drivers/infiniband/hw/mlx4/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, 
		if (is_eth) {

			wc->sl  = be16_to_cpu(cqe->sl_vid) >> 13;

			if (be32_to_cpu(cqe->vlan_my_qpn) &

					MLX4_CQE_VLAN_PRESENT_MASK) {

					MLX4_CQE_CVLAN_PRESENT_MASK) {

				wc->vlan_id = be16_to_cpu(cqe->sl_vid) &

					MLX4_CQE_VID_MASK;

			} else {

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static int check_csum(struct mlx4_cqe *cqe, struct sk_buff *skb, void *va, 


	hw_checksum = csum_unfold((__force __sum16)cqe->checksum);



	if (cqe->vlan_my_qpn & cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK) &&

	if (cqe->vlan_my_qpn & cpu_to_be32(MLX4_CQE_CVLAN_PRESENT_MASK) &&

	    !(dev_features & NETIF_F_HW_VLAN_CTAG_RX)) {

		hw_checksum = get_fixed_vlan_csum(hw_checksum, hdr);

		hdr += sizeof(struct vlan_hdr);
@@ -907,7 +907,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 
				gro_skb->csum_level = 1;



			if ((cqe->vlan_my_qpn &

			    cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)) &&

			    cpu_to_be32(MLX4_CQE_CVLAN_PRESENT_MASK)) &&

			    (dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {

				u16 vid = be16_to_cpu(cqe->sl_vid);
@@ -970,7 +970,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 
					PKT_HASH_TYPE_L3);



		if ((be32_to_cpu(cqe->vlan_my_qpn) &

		    MLX4_CQE_VLAN_PRESENT_MASK) &&

		    MLX4_CQE_CVLAN_PRESENT_MASK) &&

		    (dev->features & NETIF_F_HW_VLAN_CTAG_RX))

			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), be16_to_cpu(cqe->sl_vid));

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) 
		ring->bf.offset ^= ring->bf.buf_size;

	} else {

		tx_desc->ctrl.vlan_tag = cpu_to_be16(vlan_tag);

		tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN *

		tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_CVLAN *

			!!skb_vlan_tag_present(skb);

		tx_desc->ctrl.fence_size = real_size;

include/linux/mlx4/cq.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct mlx4_ts_cqe { 


enum {

	MLX4_CQE_L2_TUNNEL_IPOK		= 1 << 31,

	MLX4_CQE_VLAN_PRESENT_MASK	= 1 << 29,

	MLX4_CQE_CVLAN_PRESENT_MASK	= 1 << 29,

	MLX4_CQE_L2_TUNNEL		= 1 << 27,

	MLX4_CQE_L2_TUNNEL_CSUM		= 1 << 26,

	MLX4_CQE_L2_TUNNEL_IPV4		= 1 << 25,

include/linux/mlx4/qp.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ enum { 
	MLX4_WQE_CTRL_SOLICITED		= 1 << 1,

	MLX4_WQE_CTRL_IP_CSUM		= 1 << 4,

	MLX4_WQE_CTRL_TCP_UDP_CSUM	= 1 << 5,

	MLX4_WQE_CTRL_INS_VLAN		= 1 << 6,

	MLX4_WQE_CTRL_INS_CVLAN		= 1 << 6,

	MLX4_WQE_CTRL_STRONG_ORDER	= 1 << 7,

	MLX4_WQE_CTRL_FORCE_LOOPBACK	= 1 << 0,

};