From f2115205362c7874d48d879fa2f3feb71797aa0e Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 19 Jun 2017 14:05:40 +0100 Subject: Drop patches merged in 17.05 Change-Id: I20d9adf2022638241da8e118e930a7948fe987de Signed-off-by: Luca Boccassi --- ...x-check-data-offset-alignment-requirement.patch | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 debian/patches/nicvf-0001-net-thunderx-check-data-offset-alignment-requirement.patch (limited to 'debian/patches/nicvf-0001-net-thunderx-check-data-offset-alignment-requirement.patch') diff --git a/debian/patches/nicvf-0001-net-thunderx-check-data-offset-alignment-requirement.patch b/debian/patches/nicvf-0001-net-thunderx-check-data-offset-alignment-requirement.patch deleted file mode 100644 index d5402b82..00000000 --- a/debian/patches/nicvf-0001-net-thunderx-check-data-offset-alignment-requirement.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 34c2e7026fb30f6756d2c84d07d99c94106bb2ab Mon Sep 17 00:00:00 2001 -From: Jerin Jacob -Date: Mon, 13 Mar 2017 13:32:11 +0530 -Subject: [PATCH] net/thunderx: check data offset alignment requirement - -nicvf HW expects the DMA address of the packet data to be -aligned with cache line size. - -Packet data offset is a function of struct mbuf size, -mbuf private size and headroom. mbuf private size can -be changed from the application in pool creation, this -check detects HW alignment requirement constraint in pmd -start function. - -Signed-off-by: Jerin Jacob -Acked-by: Hemant Agrawal ---- - drivers/net/thunderx/nicvf_ethdev.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -Origin: http://dpdk.org/browse/dpdk/commit/?id=34c2e7026fb30f6756d2c84d07d99c94106bb2ab -Original-Author: Jerin Jacob -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1691659 -Author: Christian Ehrhardt -Last-Update: 2017-05-18 - ---- a/drivers/net/thunderx/nicvf_ethdev.c -+++ b/drivers/net/thunderx/nicvf_ethdev.c -@@ -1407,7 +1407,7 @@ - nicvf_vf_start(struct rte_eth_dev *dev, struct nicvf *nic, uint32_t rbdrsz) - { - int ret; -- uint16_t qidx; -+ uint16_t qidx, data_off; - uint32_t total_rxq_desc, nb_rbdr_desc, exp_buffs; - uint64_t mbuf_phys_off = 0; - struct nicvf_rxq *rxq; -@@ -1448,10 +1448,18 @@ - nic->vf_id, qidx, rxq->pool->name); - return -ENOMEM; - } -- rxq->mbuf_phys_off -= nicvf_mbuff_meta_length(mbuf); -- rxq->mbuf_phys_off -= RTE_PKTMBUF_HEADROOM; -+ data_off = nicvf_mbuff_meta_length(mbuf); -+ data_off += RTE_PKTMBUF_HEADROOM; - rte_pktmbuf_free(mbuf); - -+ if (data_off % RTE_CACHE_LINE_SIZE) { -+ PMD_INIT_LOG(ERR, "%s: unaligned data_off=%d delta=%d", -+ rxq->pool->name, data_off, -+ data_off % RTE_CACHE_LINE_SIZE); -+ return -EINVAL; -+ } -+ rxq->mbuf_phys_off -= data_off; -+ - if (mbuf_phys_off == 0) - mbuf_phys_off = rxq->mbuf_phys_off; - if (mbuf_phys_off != rxq->mbuf_phys_off) { -- cgit 1.2.3-korg