net/ice/base: support ESP flow director to match outer IP

[dpdk.git] / drivers / net / ice / ice_rxtx.c

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index f4f6f48..fc9bb5a 100644 (file)
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -255,11 +255,11 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
        struct ice_vsi *vsi = rxq->vsi;
        struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
        struct ice_pf *pf = ICE_VSI_TO_PF(vsi);
-       struct rte_eth_dev *dev = ICE_VSI_TO_ETH_DEV(rxq->vsi);
+       struct rte_eth_dev_data *dev_data = rxq->vsi->adapter->pf.dev_data;
        struct ice_rlan_ctx rx_ctx;
        enum ice_status err;
        uint16_t buf_size, len;
-       struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+       struct rte_eth_rxmode *rxmode = &dev_data->dev_conf.rxmode;
        uint32_t rxdid = ICE_RXDID_COMMS_OVS;
        uint32_t regval;
 
@@ -270,7 +270,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
        rxq->rx_buf_len = RTE_ALIGN(buf_size, (1 << ICE_RLAN_CTX_DBUF_S));
        len = ICE_SUPPORT_CHAIN_NUM * rxq->rx_buf_len;
        rxq->max_pkt_len = RTE_MIN(len,
-                                  dev->data->dev_conf.rxmode.max_rx_pkt_len);
+                                  dev_data->dev_conf.rxmode.max_rx_pkt_len);
 
        if (rxmode->offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
                if (rxq->max_pkt_len <= ICE_ETH_MAX_LEN ||
@@ -366,7 +366,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
 
        /* Check if scattered RX needs to be used. */
        if (rxq->max_pkt_len > buf_size)
-               dev->data->scattered_rx = 1;
+               dev_data->scattered_rx = 1;
 
        rxq->qrx_tail = hw->hw_addr + QRX_TAIL(rxq->reg_idx);
 
@@ -1675,7 +1675,6 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 {
        struct ice_rx_queue *rxq = (struct ice_rx_queue *)rx_queue;
        uint16_t nb_rx = 0;
-       struct rte_eth_dev *dev;
 
        if (!nb_pkts)
                return 0;
@@ -1692,8 +1691,7 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                if (ice_rx_alloc_bufs(rxq) != 0) {
                        uint16_t i, j;
 
-                       dev = ICE_VSI_TO_ETH_DEV(rxq->vsi);
-                       dev->data->rx_mbuf_alloc_failed +=
+                       rxq->vsi->adapter->pf.dev_data->rx_mbuf_alloc_failed +=
                                rxq->rx_free_thresh;
                        PMD_RX_LOG(DEBUG, "Rx mbuf alloc failed for "
                                   "port_id=%u, queue_id=%u",
@@ -1766,7 +1764,6 @@ ice_recv_scattered_pkts(void *rx_queue,
        uint64_t dma_addr;
        uint64_t pkt_flags;
        uint32_t *ptype_tbl = rxq->vsi->adapter->ptype_tbl;
-       struct rte_eth_dev *dev;
 
        while (nb_rx < nb_pkts) {
                rxdp = &rx_ring[rx_id];
@@ -1779,8 +1776,7 @@ ice_recv_scattered_pkts(void *rx_queue,
                /* allocate mbuf */
                nmb = rte_mbuf_raw_alloc(rxq->mp);
                if (unlikely(!nmb)) {
-                       dev = ICE_VSI_TO_ETH_DEV(rxq->vsi);
-                       dev->data->rx_mbuf_alloc_failed++;
+                       rxq->vsi->adapter->pf.dev_data->rx_mbuf_alloc_failed++;
                        break;
                }
                rxd = *rxdp; /* copy descriptor in ring to temp variable*/
@@ -2104,7 +2100,7 @@ ice_fdir_setup_tx_resources(struct ice_pf *pf)
                return -EINVAL;
        }
 
-       dev = pf->adapter->eth_dev;
+       dev = &rte_eth_devices[pf->adapter->pf.dev_data->port_id];
 
        /* Allocate the TX queue data structure. */
        txq = rte_zmalloc_socket("ice fdir tx queue",
@@ -2162,7 +2158,7 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf)
                return -EINVAL;
        }
 
-       dev = pf->adapter->eth_dev;
+       dev = &rte_eth_devices[pf->adapter->pf.dev_data->port_id];
 
        /* Allocate the RX queue data structure. */
        rxq = rte_zmalloc_socket("ice fdir rx queue",
@@ -2231,7 +2227,6 @@ ice_recv_pkts(void *rx_queue,
        uint64_t dma_addr;
        uint64_t pkt_flags;
        uint32_t *ptype_tbl = rxq->vsi->adapter->ptype_tbl;
-       struct rte_eth_dev *dev;
 
        while (nb_rx < nb_pkts) {
                rxdp = &rx_ring[rx_id];
@@ -2244,8 +2239,7 @@ ice_recv_pkts(void *rx_queue,
                /* allocate mbuf */
                nmb = rte_mbuf_raw_alloc(rxq->mp);
                if (unlikely(!nmb)) {
-                       dev = ICE_VSI_TO_ETH_DEV(rxq->vsi);
-                       dev->data->rx_mbuf_alloc_failed++;
+                       rxq->vsi->adapter->pf.dev_data->rx_mbuf_alloc_failed++;
                        break;
                }
                rxd = *rxdp; /* copy descriptor in ring to temp variable*/