d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/dpaa: fix build with 0 headroom

Browse Source 
When using RTE_PKTMBUF_HEADROOM as 0, dpaa driver throws compilation error
error "Annotation requirement is more than RTE_PKTMBUF_HEADROOM"

This patch change it into run-time check.

Bugzilla ID: 335
Fixes: ff9e112d7870 ("net/dpaa: add NXP DPAA PMD driver skeleton")
Cc: stable@dpdk.org

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Hemant Agrawal 2019-07-25 16:36:43 +05:30 committed by Thomas Monjalon
parent d879f5750f
commit 47854c1803
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/dpaa/dpaa_ethdev.c
View File

@ -1469,6 +1469,16 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused,
PMD_INIT_FUNC_TRACE();
if ((DPAA_MBUF_HW_ANNOTATION + DPAA_FD_PTA_SIZE) >
RTE_PKTMBUF_HEADROOM) {
DPAA_PMD_ERR(
"RTE_PKTMBUF_HEADROOM(%d) shall be > DPAA Annotation req(%d)",
RTE_PKTMBUF_HEADROOM,
DPAA_MBUF_HW_ANNOTATION + DPAA_FD_PTA_SIZE);
return -1;
}
/* In case of secondary process, the device is already configured
* and no further action is required, except portal initialization
* and verifying secondary attachment to port name.

4
drivers/net/dpaa/dpaa_ethdev.h
View File

@ -22,10 +22,6 @@
#define DPAA_MBUF_HW_ANNOTATION 64
#define DPAA_FD_PTA_SIZE 64
#if (DPAA_MBUF_HW_ANNOTATION + DPAA_FD_PTA_SIZE) > RTE_PKTMBUF_HEADROOM
#error "Annotation requirement is more than RTE_PKTMBUF_HEADROOM"
#endif
/* mbuf->seqn will be used to store event entry index for
* driver specific usage. For parallel mode queues, invalid
* index will be set and for atomic mode queues, valid value