Skip to content
Permalink
Browse files

bus/fslmc: fix build with 0 headroom

[ upstream commit f4435e380d7cd51327051d2de3409ba83a2b690c ]

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: beb2a78 ("bus/fslmc: define hardware annotation area size")

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
  • Loading branch information
hemantagr authored and kevintraynor committed Jul 25, 2019
1 parent 205ce87 commit c52e584dda405e167e14663a1755c5a5cfc66448
Showing with 10 additions and 4 deletions.
  1. +0 −4 drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
  2. +10 −0 drivers/net/dpaa2/dpaa2_ethdev.c
@@ -67,10 +67,6 @@
#define DPAA2_MBUF_HW_ANNOTATION 64
#define DPAA2_FD_PTA_SIZE 0

#if (DPAA2_MBUF_HW_ANNOTATION + DPAA2_FD_PTA_SIZE) > RTE_PKTMBUF_HEADROOM
#error "Annotation requirement is more than RTE_PKTMBUF_HEADROOM"
#endif

/* we will re-use the HEADROOM for annotation in RX */
#define DPAA2_HW_BUF_RESERVE 0
#define DPAA2_PACKET_LAYOUT_ALIGN 64 /*changing from 256 */
@@ -2098,6 +2098,16 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
struct rte_eth_dev *eth_dev;
int diag;

if ((DPAA2_MBUF_HW_ANNOTATION + DPAA2_FD_PTA_SIZE) >
RTE_PKTMBUF_HEADROOM) {
DPAA2_PMD_ERR(
"RTE_PKTMBUF_HEADROOM(%d) shall be > DPAA2 Annotation req(%d)",
RTE_PKTMBUF_HEADROOM,
DPAA2_MBUF_HW_ANNOTATION + DPAA2_FD_PTA_SIZE);

return -1;
}

if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
eth_dev = rte_eth_dev_allocate(dpaa2_dev->device.name);
if (!eth_dev)

0 comments on commit c52e584

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