[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: Nandibasappa, Girish <girish.nandibasa...@amd.com>
Sent: Tuesday, December 1, 2020 5:27 PM
To: dev@dpdk.org
Cc: Somalapuram, Amaranath <amaranath.somalapu...@amd.com>
Subject: [PATCH v2] net/axgbe: enabling VLAN support in axgbe
From: gnandiba <girish.nandibasa...@amd.com>
Added VLAN support for AMD XGBE driver
adding below APIs for axgbe
- axgbe_enable_rx_vlan_stripping: to enable vlan header stipping
- axgbe_disable_rx_vlan_stripping: to disable vlan header stipping
- axgbe_enable_rx_vlan_filtering: to enable vlan filter mode
- axgbe_disable_rx_vlan_filtering: to disable vlan filter mode
- axgbe_update_vlan_hash_table: crc calculation and hash table update based on
vlan values post filter enable
- axgbe_vlan_filter_set: setting of active vlan out of max 4K values before
doing hash update of same
- axgbe_vlan_tpid_set: setting of default tpid values
- axgbe_vlan_offload_set: a top layer function to call stip/filter etc based on
mask values
Signed-off-by: gnandiba <girish.nandibasa...@amd.com>
---
doc/guides/nics/features/axgbe.ini | 1 +
drivers/net/axgbe/axgbe_common.h | 30 +++++
drivers/net/axgbe/axgbe_dev.c | 171 +++++++++++++++++++++++++++--
drivers/net/axgbe/axgbe_ethdev.c | 170 +++++++++++++++++++++++++++-
drivers/net/axgbe/axgbe_ethdev.h | 16 +++
drivers/net/axgbe/axgbe_rxtx.c | 70 +++++++++++-
6 files changed, 442 insertions(+), 16 deletions(-)
diff --git a/doc/guides/nics/features/axgbe.ini
b/doc/guides/nics/features/axgbe.ini
index 34df0d1ee..4da9e6263 100644
--- a/doc/guides/nics/features/axgbe.ini
+++ b/doc/guides/nics/features/axgbe.ini
@@ -13,6 +13,7 @@ Allmulticast mode = Y
RSS hash = Y
RSS key update = Y
RSS reta update = Y
+VLAN filter = Y
CRC offload = Y
L3 checksum offload = Y
L4 checksum offload = Y
diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h
index fb97f0b5b..91404ca01 100644
--- a/drivers/net/axgbe/axgbe_common.h
+++ b/drivers/net/axgbe/axgbe_common.h
@@ -259,6 +259,7 @@
#define MAC_HWF0R0x011c
#define MAC_HWF1R0x0120
#define MAC_HWF2R0x0124
+#define MAC_HWF3R0x0128
#define MAC_MDIOSCAR0x0200
#define MAC_MDIOSCCDR0x0204
#define MAC_MDIOISR0x0214
@@ -284,6 +285,19 @@
#define MAC_TXSNR0x0d30
#define MAC_TXSSR0x0d34
+/*VLAN control bit mask*/
+#define AXGBE_VLNCTRL_MASK0x0000FFFF
+#define VLAN_PRIO_MASK0xe000 /* Priority Code Point */
+#define VLAN_PRIO_SHIFT13
+#define VLAN_CFI_MASK0x1000 /* Canonical Format Indicator */
+#define VLAN_TAG_PRESENTVLAN_CFI_MASK
+#define VLAN_VID_MASK0x0fff /* VLAN Identifier */
+#define VLAN_N_VID4096
+#define VLAN_TABLE_SIZE64
+#define VLAN_TABLE_BIT(vlan_id)(1UL << ((vlan_id) & 0x3F))
+#define VLAN_TABLE_IDX(vlan_id)((vlan_id) >> 6)
+#define RX_CVLAN_TAG_PRESENT 9
+
#define MAC_QTFCR_INC4
#define MAC_MACA_INC4
#define MAC_HTR_INC4
@@ -361,6 +375,10 @@
#define MAC_HWF2R_TXCHCNT_WIDTH4
#define MAC_HWF2R_TXQCNT_INDEX6
#define MAC_HWF2R_TXQCNT_WIDTH4
+#define MAC_HWF3R_CBTISEL_INDEX4
+#define MAC_HWF3R_CBTISEL_WIDTH1
+#define MAC_HWF3R_NRVF_INDEX0
+#define MAC_HWF3R_NRVF_WIDTH3
#define MAC_IER_TSIE_INDEX12
#define MAC_IER_TSIE_WIDTH1
#define MAC_ISR_MMCRXIS_INDEX9
@@ -519,6 +537,8 @@
#define MAC_VLANIR_VLTI_WIDTH1
#define MAC_VLANIR_CSVL_INDEX19
#define MAC_VLANIR_CSVL_WIDTH1
+#define MAC_VLANIR_VLC_INDEX16
+#define MAC_VLANIR_VLC_WIDTH2
#define MAC_VLANTR_DOVLTC_INDEX20
#define MAC_VLANTR_DOVLTC_WIDTH1
#define MAC_VLANTR_ERSVLM_INDEX19
@@ -529,12 +549,18 @@
#define MAC_VLANTR_ETV_WIDTH1
#define MAC_VLANTR_EVLS_INDEX21
#define MAC_VLANTR_EVLS_WIDTH2
+#define MAC_VLANTR_EIVLS_INDEX21
+#define MAC_VLANTR_EIVLS_WIDTH2
#define MAC_VLANTR_EVLRXS_INDEX24
#define MAC_VLANTR_EVLRXS_WIDTH1
+#define MAC_VLANTR_EIVLRXS_INDEX31
+#define MAC_VLANTR_EIVLRXS_WIDTH1
#define MAC_VLANTR_VL_INDEX0
#define MAC_VLANTR_VL_WIDTH16
#define MAC_VLANTR_VTHM_INDEX25
#define MAC_VLANTR_VTHM_WIDTH1
+#define MAC_VLANTR_EDVLP_INDEX26
+#define MAC_VLANTR_EDVLP_WIDTH1
#define MAC_VLANTR_VTIM_INDEX17
#define MAC_VLANTR_VTIM_WIDTH1
#define MAC_VR_DEVID_INDEX8
@@ -543,6 +569,10 @@
#define MAC_VR_SNPSVER_WIDTH8
#define MAC_VR_USERVER_INDEX16
#define MAC_VR_USERVER_WIDTH8
+#define MAC_VLANIR_VLT_INDEX0
+#define MAC_VLANIR_VLT_WIDTH16
+#define MAC_VLANTR_ERIVLT_INDEX27
+#define MAC_VLANTR_ERIVLT_WIDTH1
/* MMC register offsets */
diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c
index af62eae3b..786288a7b 100644
--- a/drivers/net/axgbe/axgbe_dev.c
+++ b/drivers/net/axgbe/axgbe_dev.c
@@ -8,6 +8,46 @@
#include "axgbe_phy.h"
#include "axgbe_rxtx.h"
+static uint32_t bitrev32(uint32_t x)
+{
+x = (x >> 16) | (x << 16);
+x = (((x & 0xff00ff00) >> 8) | ((x & 0x00ff00ff) << 8));
+x = (((x & 0xf0f0f0f0) >> 4) | ((x & 0x0f0f0f0f) << 4));
+x = (((x & 0xcccccccc) >> 2) | ((x & 0x33333333) << 2));
+x = (((x & 0xaaaaaaaa) >> 1) | ((x & 0x55555555) << 1));
+return x;
+}
+
+/*MSB set bit from 32 to 1*/
+static int get_lastbit_set(int x)
+{
+int r = 32;
+
+if (!x)
+return 0;
+if (!(x & 0xffff0000)) {
+x <<= 16;
+r -= 16;
+}
+if (!(x & 0xff000000)) {
+x <<= 8;
+r -= 8;
+}
+if (!(x & 0xf0000000)) {
+x <<= 4;
+r -= 4;
+}
+if (!(x & 0xc0000000)) {
+x <<= 2;
+r -= 2;
+}
+if (!(x & 0x80000000)) {
+x <<= 1;
+r -= 1;
+}
+return r;
+}
+
static inline unsigned int axgbe_get_max_frame(struct axgbe_port *pdata) {
return pdata->eth_dev->data->mtu + RTE_ETHER_HDR_LEN + @@ -407,6 +447,120 @@
static void axgbe_config_flow_control_threshold(struct axgbe_port *pdata)
}
}
+static int axgbe_enable_rx_vlan_stripping(struct axgbe_port *pdata) {
+/* Put the VLAN tag in the Rx descriptor */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EVLRXS, 1);
+
+/* Don't check the VLAN type */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, DOVLTC, 1);
+
+/* Check only C-TAG (0x8100) packets */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ERSVLM, 0);
+
+/* Don't consider an S-TAG (0x88A8) packet as a VLAN packet */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ESVL, 0);
+
+/* Enable VLAN tag stripping */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EVLS, 0x3);
+return 0;
+}
+
+static int axgbe_disable_rx_vlan_stripping(struct axgbe_port *pdata) {
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EVLS, 0);
+return 0;
+}
+
+static int axgbe_enable_rx_vlan_filtering(struct axgbe_port *pdata) {
+/* Enable VLAN filtering */
+AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 1);
+
+/* Enable VLAN Hash Table filtering */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, VTHM, 1);
+
+/* Disable VLAN tag inverse matching */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, VTIM, 0);
+
+/* Only filter on the lower 12-bits of the VLAN tag */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ETV, 1);
+
+/* In order for the VLAN Hash Table filtering to be effective,
+ * the VLAN tag identifier in the VLAN Tag Register must not
+ * be zero. Set the VLAN tag identifier to "1" to enable the
+ * VLAN Hash Table filtering. This implies that a VLAN tag of
+ * 1 will always pass filtering.
+ */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, VL, 1);
+return 0;
+}
+
+static int axgbe_disable_rx_vlan_filtering(struct axgbe_port *pdata) {
+/* Disable VLAN filtering */
+AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 0);
+return 0;
+}
+
+static u32 axgbe_vid_crc32_le(__le16 vid_le) {
+u32 poly = 0xedb88320; /* CRCPOLY_LE */
+u32 crc = ~0;
+u32 temp = 0;
+unsigned char *data = (unsigned char *)&vid_le;
+unsigned char data_byte = 0;
+int i, bits;
+
+bits = get_lastbit_set(VLAN_VID_MASK);
+for (i = 0; i < bits; i++) {
+if ((i % 8) == 0)
+data_byte = data[i / 8];
+
+temp = ((crc & 1) ^ data_byte) & 1;
+crc >>= 1;
+data_byte >>= 1;
+
+if (temp)
+crc ^= poly;
+}
+return crc;
+}
+
+static int axgbe_update_vlan_hash_table(struct axgbe_port *pdata) {
+u32 crc = 0;
+u16 vid;
+__le16 vid_le = 0;
+u16 vlan_hash_table = 0;
+unsigned int reg = 0;
+unsigned long vid_idx, vid_valid;
+
+/* Generate the VLAN Hash Table value */
+for (vid = 0; vid < VLAN_N_VID; vid++) {
+vid_idx = VLAN_TABLE_IDX(vid);
+vid_valid = pdata->active_vlans[vid_idx];
+vid_valid = (unsigned long)vid_valid >> (vid - (64 * vid_idx));
+if (vid_valid & 1)
+PMD_DRV_LOG(DEBUG,
+ "vid:%d pdata->active_vlans[%ld]=0x%lx\n",
+ vid, vid_idx, pdata->active_vlans[vid_idx]);
+else
+continue;
+
+vid_le = rte_cpu_to_le_16(vid);
+crc = bitrev32(~axgbe_vid_crc32_le(vid_le)) >> 28;
+vlan_hash_table |= (1 << crc);
+PMD_DRV_LOG(DEBUG, "crc = %d vlan_hash_table = 0x%x\n",
+ crc, vlan_hash_table);
+}
+/* Set the VLAN Hash Table filtering register */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANHTR, VLHT, vlan_hash_table);
+reg = AXGMAC_IOREAD(pdata, MAC_VLANHTR);
+PMD_DRV_LOG(DEBUG, "vlan_hash_table reg val = 0x%x\n", reg);
+return 0;
+}
+
static int __axgbe_exit(struct axgbe_port *pdata) {
unsigned int count = 2000;
@@ -1009,16 +1163,6 @@ static void axgbe_enable_mtl_interrupts(struct
axgbe_port *pdata)
}
}
-static uint32_t bitrev32(uint32_t x)
-{
-x = (x >> 16) | (x << 16);
-x = (((x & 0xff00ff00) >> 8) | ((x & 0x00ff00ff) << 8));
-x = (((x & 0xf0f0f0f0) >> 4) | ((x & 0x0f0f0f0f) << 4));
-x = (((x & 0xcccccccc) >> 2) | ((x & 0x33333333) << 2));
-x = (((x & 0xaaaaaaaa) >> 1) | ((x & 0x55555555) << 1));
-return x;
-}
-
static uint32_t crc32_le(uint32_t crc, uint8_t *p, uint32_t len) {
int i;
@@ -1218,4 +1362,11 @@ void axgbe_init_function_ptrs_dev(struct axgbe_hw_if
*hw_if)
/* For FLOW ctrl */
hw_if->config_tx_flow_control = axgbe_config_tx_flow_control;
hw_if->config_rx_flow_control = axgbe_config_rx_flow_control;
+
+/*vlan*/
+hw_if->enable_rx_vlan_stripping = axgbe_enable_rx_vlan_stripping;
+hw_if->disable_rx_vlan_stripping = axgbe_disable_rx_vlan_stripping;
+hw_if->enable_rx_vlan_filtering = axgbe_enable_rx_vlan_filtering;
+hw_if->disable_rx_vlan_filtering = axgbe_disable_rx_vlan_filtering;
+hw_if->update_vlan_hash_table = axgbe_update_vlan_hash_table;
}
diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index cfe6aba73..760426029 100644
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -109,6 +109,11 @@ axgbe_set_tstamp_time(struct axgbe_port *pdata, unsigned
int sec, static void axgbe_update_tstamp_addend(struct axgbe_port *pdata,
unsigned int addend);
+static int
+axgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vid, int on);
+static int axgbe_vlan_tpid_set(struct rte_eth_dev *dev,
+enum rte_vlan_type vlan_type, uint16_t tpid); static int
+axgbe_vlan_offload_set(struct rte_eth_dev *dev, int mask);
struct axgbe_xstats {
char name[RTE_ETH_XSTATS_NAME_SIZE];
@@ -250,6 +255,9 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = {
.txq_info_get = axgbe_txq_info_get,
.dev_supported_ptypes_get = axgbe_dev_supported_ptypes_get,
.mtu_set= axgb_mtu_set,
+.vlan_filter_set = axgbe_vlan_filter_set,
+.vlan_tpid_set = axgbe_vlan_tpid_set,
+.vlan_offload_set = axgbe_vlan_offload_set,
.timesync_enable = axgbe_timesync_enable,
.timesync_disable = axgbe_timesync_disable,
.timesync_read_rx_timestamp = axgbe_timesync_read_rx_timestamp,
@@ -1163,6 +1171,9 @@ axgbe_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->speed_capa = ETH_LINK_SPEED_10G;
dev_info->rx_offload_capa =
+DEV_RX_OFFLOAD_VLAN_STRIP |
+DEV_RX_OFFLOAD_VLAN_FILTER |
+DEV_RX_OFFLOAD_VLAN_EXTEND |
DEV_RX_OFFLOAD_IPV4_CKSUM |
DEV_RX_OFFLOAD_UDP_CKSUM |
DEV_RX_OFFLOAD_TCP_CKSUM |
@@ -1171,6 +1182,8 @@ axgbe_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
DEV_RX_OFFLOAD_KEEP_CRC;
dev_info->tx_offload_capa =
+DEV_TX_OFFLOAD_VLAN_INSERT |
+DEV_TX_OFFLOAD_QINQ_INSERT |
DEV_TX_OFFLOAD_IPV4_CKSUM |
DEV_TX_OFFLOAD_UDP_CKSUM |
DEV_TX_OFFLOAD_TCP_CKSUM;
@@ -1756,14 +1769,163 @@ axgbe_timesync_read_tx_timestamp(struct rte_eth_dev
*dev,
return 0;
}
+static int
+axgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vid, int on) {
+struct axgbe_port *pdata = dev->data->dev_private;
+unsigned long vid_bit, vid_idx;
+
+vid_bit = VLAN_TABLE_BIT(vid);
+vid_idx = VLAN_TABLE_IDX(vid);
+
+if (on) {
+PMD_DRV_LOG(DEBUG, "Set VLAN vid=%d for device = %s\n",
+ vid, pdata->eth_dev->device->name);
+pdata->active_vlans[vid_idx] |= vid_bit;
+} else {
+PMD_DRV_LOG(DEBUG, "Reset VLAN vid=%d for device = %s\n",
+ vid, pdata->eth_dev->device->name);
+pdata->active_vlans[vid_idx] &= ~vid_bit;
+}
+pdata->hw_if.update_vlan_hash_table(pdata);
+return 0;
+}
+
+static int
+axgbe_vlan_tpid_set(struct rte_eth_dev *dev,
+ enum rte_vlan_type vlan_type,
+ uint16_t tpid)
+{
+struct axgbe_port *pdata = dev->data->dev_private;
+uint32_t reg = 0;
+uint32_t qinq = 0;
+
+qinq = AXGMAC_IOREAD_BITS(pdata, MAC_VLANTR, EDVLP);
+PMD_DRV_LOG(DEBUG, "EDVLP: qinq = 0x%x\n", qinq);
+
+switch (vlan_type) {
+case ETH_VLAN_TYPE_INNER:
+PMD_DRV_LOG(DEBUG, "ETH_VLAN_TYPE_INNER\n");
+if (qinq) {
+if (tpid != 0x8100 && tpid != 0x88a8)
+PMD_DRV_LOG(ERR,
+ "tag supported 0x8100/0x88A8\n");
+PMD_DRV_LOG(DEBUG, "qinq with inner tag\n");
+
+/*Enable Inner VLAN Tag */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ERIVLT, 1);
+reg = AXGMAC_IOREAD_BITS(pdata, MAC_VLANTR, ERIVLT);
+PMD_DRV_LOG(DEBUG, "bit ERIVLT = 0x%x\n", reg);
+
+} else {
+PMD_DRV_LOG(ERR,
+ "Inner type not supported in single tag\n");
+}
+break;
+case ETH_VLAN_TYPE_OUTER:
+PMD_DRV_LOG(DEBUG, "ETH_VLAN_TYPE_OUTER\n");
+if (qinq) {
+PMD_DRV_LOG(DEBUG, "double tagging is enabled\n");
+/*Enable outer VLAN tag*/
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, ERIVLT, 0);
+reg = AXGMAC_IOREAD_BITS(pdata, MAC_VLANTR, ERIVLT);
+PMD_DRV_LOG(DEBUG, "bit ERIVLT = 0x%x\n", reg);
+
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, CSVL, 1);
+reg = AXGMAC_IOREAD_BITS(pdata, MAC_VLANIR, CSVL);
+PMD_DRV_LOG(DEBUG, "bit CSVL = 0x%x\n", reg);
+} else {
+if (tpid != 0x8100 && tpid != 0x88a8)
+PMD_DRV_LOG(ERR,
+ "tag supported 0x8100/0x88A8\n");
+}
+break;
+case ETH_VLAN_TYPE_MAX:
+PMD_DRV_LOG(ERR, "ETH_VLAN_TYPE_MAX\n");
+break;
+case ETH_VLAN_TYPE_UNKNOWN:
+PMD_DRV_LOG(ERR, "ETH_VLAN_TYPE_UNKNOWN\n");
+break;
+}
+return 0;
+}
+
+static void axgbe_vlan_extend_enable(struct axgbe_port *pdata) {
+int qinq = 0;
+
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EDVLP, 1);
+qinq = AXGMAC_IOREAD_BITS(pdata, MAC_VLANTR, EDVLP);
+PMD_DRV_LOG(DEBUG, "vlan double tag enabled EDVLP:qinq=0x%x\n", qinq);
+}
+
+static void axgbe_vlan_extend_disable(struct axgbe_port *pdata) {
+int qinq = 0;
+
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANTR, EDVLP, 0);
+qinq = AXGMAC_IOREAD_BITS(pdata, MAC_VLANTR, EDVLP);
+PMD_DRV_LOG(DEBUG, "vlan double tag disable EDVLP:qinq=0x%x\n", qinq);
+}
+
+static int
+axgbe_vlan_offload_set(struct rte_eth_dev *dev, int mask) {
+struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+struct axgbe_port *pdata = dev->data->dev_private;
+
+/* Indicate that VLAN Tx CTAGs come from context descriptors */
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, CSVL, 0);
+AXGMAC_IOWRITE_BITS(pdata, MAC_VLANIR, VLTI, 1);
+
+if (mask & ETH_VLAN_STRIP_MASK) {
+if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) {
+PMD_DRV_LOG(DEBUG, "Strip ON for device = %s\n",
+ pdata->eth_dev->device->name);
+pdata->hw_if.enable_rx_vlan_stripping(pdata);
+} else {
+PMD_DRV_LOG(DEBUG, "Strip OFF for device = %s\n",
+ pdata->eth_dev->device->name);
+pdata->hw_if.disable_rx_vlan_stripping(pdata);
+}
+}
+if (mask & ETH_VLAN_FILTER_MASK) {
+if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER) {
+PMD_DRV_LOG(DEBUG, "Filter ON for device = %s\n",
+ pdata->eth_dev->device->name);
+pdata->hw_if.enable_rx_vlan_filtering(pdata);
+} else {
+PMD_DRV_LOG(DEBUG, "Filter OFF for device = %s\n",
+ pdata->eth_dev->device->name);
+pdata->hw_if.disable_rx_vlan_filtering(pdata);
+}
+}
+if (mask & ETH_VLAN_EXTEND_MASK) {
+if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND) {
+PMD_DRV_LOG(DEBUG, "enabling vlan extended mode\n");
+axgbe_vlan_extend_enable(pdata);
+/* Set global registers with default ethertype*/
+axgbe_vlan_tpid_set(dev, ETH_VLAN_TYPE_OUTER,
+ RTE_ETHER_TYPE_VLAN);
+axgbe_vlan_tpid_set(dev, ETH_VLAN_TYPE_INNER,
+ RTE_ETHER_TYPE_VLAN);
+} else {
+PMD_DRV_LOG(DEBUG, "disabling vlan extended mode\n");
+axgbe_vlan_extend_disable(pdata);
+}
+}
+return 0;
+}
+
static void axgbe_get_all_hw_features(struct axgbe_port *pdata) {
-unsigned int mac_hfr0, mac_hfr1, mac_hfr2;
+unsigned int mac_hfr0, mac_hfr1, mac_hfr2, mac_hfr3;
struct axgbe_hw_features *hw_feat = &pdata->hw_feat;
mac_hfr0 = AXGMAC_IOREAD(pdata, MAC_HWF0R);
mac_hfr1 = AXGMAC_IOREAD(pdata, MAC_HWF1R);
mac_hfr2 = AXGMAC_IOREAD(pdata, MAC_HWF2R);
+mac_hfr3 = AXGMAC_IOREAD(pdata, MAC_HWF3R);
memset(hw_feat, 0, sizeof(*hw_feat));
@@ -1814,6 +1976,12 @@ static void axgbe_get_all_hw_features(struct axgbe_port
*pdata)
hw_feat->aux_snap_num = AXGMAC_GET_BITS(mac_hfr2, MAC_HWF2R,
AUXSNAPNUM);
+/* Hardware feature register 3 */
+hw_feat->tx_q_vlan_tag_ins = AXGMAC_GET_BITS(mac_hfr3,
+ MAC_HWF3R, CBTISEL);
+hw_feat->no_of_vlan_extn = AXGMAC_GET_BITS(mac_hfr3,
+ MAC_HWF3R, NRVF);
+
/* Translate the Hash Table size into actual number */
switch (hw_feat->hash_table_size) {
case 0:
diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h
index 35a847646..1481fd9ff 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -299,6 +299,13 @@ struct axgbe_hw_if {
int (*config_tx_flow_control)(struct axgbe_port *);
int (*config_rx_flow_control)(struct axgbe_port *);
+/* vlan */
+int (*enable_rx_vlan_stripping)(struct axgbe_port *);
+int (*disable_rx_vlan_stripping)(struct axgbe_port *);
+int (*enable_rx_vlan_filtering)(struct axgbe_port *);
+int (*disable_rx_vlan_filtering)(struct axgbe_port *);
+int (*update_vlan_hash_table)(struct axgbe_port *);
+
int (*exit)(struct axgbe_port *);
};
@@ -433,6 +440,12 @@ struct axgbe_hw_features {
unsigned int tx_ch_cnt;/* Number of DMA Transmit Channels */
unsigned int pps_out_num;/* Number of PPS outputs */
unsigned int aux_snap_num;/* Number of Aux snapshot inputs */
+
+/* HW Feature Register3 */
+unsigned int tx_q_vlan_tag_ins; /* Queue/Channel based VLAN tag */
+/* insertion on Tx Enable */
+unsigned int no_of_vlan_extn; /* Number of Extended VLAN Tag */
+/* Filters Enabled */
};
struct axgbe_version_data {
@@ -654,6 +667,9 @@ struct axgbe_port {
unsigned int uc_hash_mac_addr;
unsigned int uc_hash_table[AXGBE_MAC_HASH_TABLE_SIZE];
+/* Filtering support */
+unsigned long active_vlans[VLAN_TABLE_SIZE];
+
/* For IEEE1588 PTP */
struct rte_timecounter systime_tc;
struct rte_timecounter tx_tstamp;
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 032e3cebc..71e3cffc5 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -209,9 +209,10 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
volatile union axgbe_rx_desc *desc;
uint64_t old_dirty = rxq->dirty;
struct rte_mbuf *mbuf, *tmbuf;
-unsigned int err;
+unsigned int err, etlt;
uint32_t error_status;
uint16_t idx, pidx, pkt_len;
+uint64_t offloads;
idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
while (nb_rx < nb_pkts) {
@@ -276,6 +277,26 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
/* Get the RSS hash */
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
+etlt = AXGMAC_GET_BITS_LE(desc->write.desc3,
+RX_NORMAL_DESC3, ETLT);
+offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads;
+if (!err || !etlt) {
+if (etlt == RX_CVLAN_TAG_PRESENT) {
+mbuf->ol_flags |= PKT_RX_VLAN;
+mbuf->vlan_tci =
+AXGMAC_GET_BITS_LE(desc->write.desc0,
+RX_NORMAL_DESC0, OVT);
+if (offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
+mbuf->ol_flags |= PKT_RX_VLAN_STRIPPED;
+else
+mbuf->ol_flags &= ~PKT_RX_VLAN_STRIPPED;
+} else {
+mbuf->ol_flags &=
+~(PKT_RX_VLAN
+| PKT_RX_VLAN_STRIPPED);
+mbuf->vlan_tci = 0;
+}
+}
/* Indicate if a Context Descriptor is next */
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, CDA))
mbuf->ol_flags |= PKT_RX_IEEE1588_PTP @@ -324,9 +345,10 @@ uint16_t
eth_axgbe_recv_scattered_pkts(void *rx_queue,
uint64_t old_dirty = rxq->dirty;
struct rte_mbuf *first_seg = NULL;
struct rte_mbuf *mbuf, *tmbuf;
-unsigned int err;
+unsigned int err, etlt;
uint32_t error_status;
uint16_t idx, pidx, data_len = 0, pkt_len = 0;
+uint64_t offloads;
idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
while (nb_rx < nb_pkts) {
@@ -399,7 +421,25 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
/* Get the RSS hash */
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
-
+etlt = AXGMAC_GET_BITS_LE(desc->write.desc3,
+RX_NORMAL_DESC3, ETLT);
+offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads;
+if (!err || !etlt) {
+if (etlt == RX_CVLAN_TAG_PRESENT) {
+mbuf->ol_flags |= PKT_RX_VLAN;
+mbuf->vlan_tci =
+AXGMAC_GET_BITS_LE(desc->write.desc0,
+RX_NORMAL_DESC0, OVT);
+if (offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
+mbuf->ol_flags |= PKT_RX_VLAN_STRIPPED;
+else
+mbuf->ol_flags &= ~PKT_RX_VLAN_STRIPPED;
+} else {
+mbuf->ol_flags &=
+~(PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
+mbuf->vlan_tci = 0;
+}
+}
/* Mbuf populate */
mbuf->data_off = RTE_PKTMBUF_HEADROOM;
mbuf->data_len = data_len;
@@ -492,6 +532,7 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
struct axgbe_tx_queue *txq;
unsigned int tsize;
const struct rte_memzone *tz;
+uint64_t offloads;
tx_desc = nb_desc;
pdata = dev->data->dev_private;
@@ -511,7 +552,8 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
if (!txq)
return -ENOMEM;
txq->pdata = pdata;
-
+offloads = tx_conf->offloads |
+txq->pdata->eth_dev->data->dev_conf.txmode.offloads;
txq->nb_desc = tx_desc;
txq->free_thresh = tx_conf->tx_free_thresh ?
tx_conf->tx_free_thresh : AXGBE_TX_FREE_THRESH; @@ -523,7 +565,7 @@ int
axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
if (txq->nb_desc % txq->free_thresh != 0)
txq->vector_disable = 1;
-if (tx_conf->offloads != 0)
+if (offloads != 0)
txq->vector_disable = 1;
/* Allocate TX ring hardware descriptors */ @@ -745,10 +787,28 @@ static int
axgbe_xmit_hw(struct axgbe_tx_queue *txq,
AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CIC, 0x1);
rte_wmb();
+if (mbuf->ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_QINQ_PKT)) {
+/* Mark it as a CONTEXT descriptor */
+AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3,
+ CTXT, 1);
+/* Set the VLAN tag */
+AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3,
+ VT, mbuf->vlan_tci);
+/* Indicate this descriptor contains the VLAN tag */
+AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3,
+ VLTV, 1);
+AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, VTIR,
+TX_NORMAL_DESC2_VLAN_INSERT);
+} else {
+AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, VTIR, 0x0);
+}
+rte_wmb();
+
/* Set OWN bit */
AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, OWN, 1);
rte_wmb();
+
/* Save mbuf */
txq->sw_ring[idx] = mbuf;
/* Update current index*/
--
2.25.1
For series,
Acked-by: Somalapuram Amaranath <asoma...@amd.com>
