Skip to content
Permalink
Browse files

net/dpaa: fix build with 0 headroom

[ upstream commit 47854c180349c3d41690e60aea9458a864572389 ]

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: ff9e112 ("net/dpaa: add NXP DPAA PMD driver skeleton")

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
  • Loading branch information...
hemantagr authored and kevintraynor committed Jul 25, 2019
1 parent 41bcafb commit 205ce8714392f69ed4ebc555ae755fcedfa47370
Showing with 10 additions and 4 deletions.
  1. +10 −0 drivers/net/dpaa/dpaa_ethdev.c
  2. +0 −4 drivers/net/dpaa/dpaa_ethdev.h
@@ -1460,6 +1460,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.
@@ -21,10 +21,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

0 comments on commit 205ce87

Please sign in to comment.
You can’t perform that action at this time.