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

Commit 6e5eed04 authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller
Browse files

amd-xgbe: VLAN Tx tag insertion fix 



The MAC_VLAN_Incl register (0x0060) must be set to indicate
that the VLAN tag to be inserted comes from a Tx context
descriptor and not the MAC_VLAN_Incl register.  Also, even
though it is the default, explicitly set the type of tag to
be inserted as a CTAG.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0a8ba6c

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -427,6 +427,10 @@ 
#define MAC_TCR_SS_WIDTH		2

#define MAC_TCR_SS_WIDTH		2

#define MAC_TCR_TE_INDEX		0

#define MAC_TCR_TE_INDEX		0

#define MAC_TCR_TE_WIDTH		1

#define MAC_TCR_TE_WIDTH		1

#define MAC_VLANIR_VLTI_INDEX		20

#define MAC_VLANIR_VLTI_WIDTH		1

#define MAC_VLANIR_CSVL_INDEX		19

#define MAC_VLANIR_CSVL_WIDTH		1

#define MAC_VLANTR_DOVLTC_INDEX		20

#define MAC_VLANTR_DOVLTC_INDEX		20

#define MAC_VLANTR_DOVLTC_WIDTH		1

#define MAC_VLANTR_DOVLTC_WIDTH		1

#define MAC_VLANTR_ERSVLM_INDEX		19

#define MAC_VLANTR_ERSVLM_INDEX		19

drivers/net/ethernet/amd/xgbe/xgbe-dev.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1541,6 +1541,10 @@ static void xgbe_config_checksum_offload(struct xgbe_prv_data *pdata) 




static void xgbe_config_vlan_support(struct xgbe_prv_data *pdata)

static void xgbe_config_vlan_support(struct xgbe_prv_data *pdata)

{

{

	/* Indicate that VLAN Tx CTAGs come from context descriptors */

	XGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, CSVL, 0);

	XGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, VLTI, 1);



	if (pdata->netdev->features & NETIF_F_HW_VLAN_CTAG_RX)

	if (pdata->netdev->features & NETIF_F_HW_VLAN_CTAG_RX)

		xgbe_enable_rx_vlan_stripping(pdata);

		xgbe_enable_rx_vlan_stripping(pdata);

	else

	else