From: Gagandeep Singh Date: Fri, 12 Apr 2019 12:29:08 +0000 (+0000) Subject: net/enetc: enable CRC offload X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=1d0c33978a6f4f7a7fddde14fc6e0d987745baf5;p=dpdk.git net/enetc: enable CRC offload CRC offload keep feature supported Signed-off-by: Gagandeep Singh --- diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst index 26d61f67dd..26204601a6 100644 --- a/doc/guides/nics/enetc.rst +++ b/doc/guides/nics/enetc.rst @@ -52,6 +52,7 @@ ENETC Features - Jumbo packets - Queue Start/Stop - Deferred Queue Start +- CRC offload NIC Driver (PMD) ~~~~~~~~~~~~~~~~ diff --git a/doc/guides/nics/features/enetc.ini b/doc/guides/nics/features/enetc.ini index bd901faf49..101dc0a693 100644 --- a/doc/guides/nics/features/enetc.ini +++ b/doc/guides/nics/features/enetc.ini @@ -12,6 +12,7 @@ Allmulticast mode = Y MTU update = Y Jumbo frame = Y Queue start/stop = Y +CRC offload = Y Linux VFIO = Y ARMv8 = Y Usage doc = Y diff --git a/doc/guides/rel_notes/release_19_05.rst b/doc/guides/rel_notes/release_19_05.rst index 6fc4666305..3312a87e28 100644 --- a/doc/guides/rel_notes/release_19_05.rst +++ b/doc/guides/rel_notes/release_19_05.rst @@ -153,6 +153,7 @@ New Features * Added MTU update support * Added jumbo frame support * Added queue start/stop + * Added CRC offload support * **Updated the QuickAssist Technology PMD.** diff --git a/drivers/net/enetc/base/enetc_hw.h b/drivers/net/enetc/base/enetc_hw.h index 2eb1df30ec..261ad157a2 100644 --- a/drivers/net/enetc/base/enetc_hw.h +++ b/drivers/net/enetc/base/enetc_hw.h @@ -97,6 +97,7 @@ enum enetc_bdr_type {TX, RX}; #define ENETC_PM0_CMD_CFG 0x08008 #define ENETC_PM0_TX_EN BIT(0) #define ENETC_PM0_RX_EN BIT(1) +#define ENETC_PM0_CRC BIT(6) #define ENETC_PM0_MAXFRM 0x08014 #define ENETC_SET_TX_MTU(val) ((val) << 16) diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h index e494eb8b8c..8c830a5c06 100644 --- a/drivers/net/enetc/enetc.h +++ b/drivers/net/enetc/enetc.h @@ -69,6 +69,7 @@ struct enetc_bdr { void *tcisr; /* Tx */ int next_to_alloc; /* Rx */ }; + uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */ }; /* diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index ff9301e018..ffae8ae25c 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -162,7 +162,9 @@ enetc_dev_infos_get(struct rte_eth_dev *dev __rte_unused, dev_info->max_rx_queues = MAX_RX_RINGS; dev_info->max_tx_queues = MAX_TX_RINGS; dev_info->max_rx_pktlen = ENETC_MAC_MAXFRM_SIZE; - dev_info->rx_offload_capa = DEV_RX_OFFLOAD_JUMBO_FRAME; + dev_info->rx_offload_capa = + (DEV_RX_OFFLOAD_KEEP_CRC | + DEV_RX_OFFLOAD_JUMBO_FRAME); } static int @@ -378,6 +380,7 @@ enetc_rx_queue_setup(struct rte_eth_dev *dev, struct rte_eth_dev_data *data = dev->data; struct enetc_eth_adapter *adapter = ENETC_DEV_PRIVATE(data->dev_private); + uint64_t rx_offloads = data->dev_conf.rxmode.offloads; PMD_INIT_FUNC_TRACE(); if (nb_rx_desc > MAX_BD_COUNT) @@ -410,6 +413,9 @@ enetc_rx_queue_setup(struct rte_eth_dev *dev, RTE_ETH_QUEUE_STATE_STOPPED; } + rx_ring->crc_len = (uint8_t)((rx_offloads & DEV_RX_OFFLOAD_KEEP_CRC) ? + ETHER_CRC_LEN : 0); + return 0; fail: rte_free(rx_ring); @@ -625,11 +631,11 @@ enetc_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) static int enetc_dev_configure(struct rte_eth_dev *dev) { - struct rte_eth_conf *eth_conf = &dev->data->dev_conf; - uint64_t rx_offloads = eth_conf->rxmode.offloads; struct enetc_eth_hw *hw = ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct enetc_hw *enetc_hw = &hw->hw; + struct rte_eth_conf *eth_conf = &dev->data->dev_conf; + uint64_t rx_offloads = eth_conf->rxmode.offloads; PMD_INIT_FUNC_TRACE(); @@ -647,6 +653,14 @@ enetc_dev_configure(struct rte_eth_dev *dev) dev->data->mtu = ETHER_MAX_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN; } + if (rx_offloads & DEV_RX_OFFLOAD_KEEP_CRC) { + int config; + + config = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG); + config |= ENETC_PM0_CRC; + enetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG, config); + } + return 0; } diff --git a/drivers/net/enetc/enetc_rxtx.c b/drivers/net/enetc/enetc_rxtx.c index 42f16cab17..4a758d25a2 100644 --- a/drivers/net/enetc/enetc_rxtx.c +++ b/drivers/net/enetc/enetc_rxtx.c @@ -208,8 +208,10 @@ enetc_clean_rx_ring(struct enetc_bdr *rx_ring, if (!bd_status) break; - rx_swbd->buffer_addr->pkt_len = rxbd->r.buf_len; - rx_swbd->buffer_addr->data_len = rxbd->r.buf_len; + rx_swbd->buffer_addr->pkt_len = rxbd->r.buf_len - + rx_ring->crc_len; + rx_swbd->buffer_addr->data_len = rxbd->r.buf_len - + rx_ring->crc_len; rx_swbd->buffer_addr->hash.rss = rxbd->r.rss_hash; rx_swbd->buffer_addr->ol_flags = 0; enetc_dev_rx_parse(rx_swbd->buffer_addr,