bus/fslmc: combine thread-specific variables

This is to reduce the thread local storage

Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Gagandeep Singh 2020-07-07 14:52:19 +05:30 committed by Ferruh Yigit
parent 7eaf13231b
commit 6b9faf650e
5 changed files with 15 additions and 21 deletions

View File

@ -35,8 +35,6 @@ rte_fslmc_get_device_count(enum rte_dpaa2_dev_type device_type)
return rte_fslmc_bus.device_count[device_type];
}
RTE_DEFINE_PER_LCORE(struct dpaa2_portal_dqrr, dpaa2_held_bufs);
static void
cleanup_fslmc_device_list(void)
{

View File

@ -28,6 +28,13 @@ RTE_DECLARE_PER_LCORE(struct dpaa2_io_portal_t, _dpaa2_io);
#define DPAA2_PER_LCORE_ETHRX_DPIO RTE_PER_LCORE(_dpaa2_io).ethrx_dpio_dev
#define DPAA2_PER_LCORE_ETHRX_PORTAL DPAA2_PER_LCORE_ETHRX_DPIO->sw_portal
#define DPAA2_PER_LCORE_DQRR_SIZE \
RTE_PER_LCORE(_dpaa2_io).dpio_dev->dpaa2_held_bufs.dqrr_size
#define DPAA2_PER_LCORE_DQRR_HELD \
RTE_PER_LCORE(_dpaa2_io).dpio_dev->dpaa2_held_bufs.dqrr_held
#define DPAA2_PER_LCORE_DQRR_MBUF(i) \
RTE_PER_LCORE(_dpaa2_io).dpio_dev->dpaa2_held_bufs.mbuf[i]
/* Variable to store DPAA2 DQRR size */
extern uint8_t dpaa2_dqrr_size;
/* Variable to store DPAA2 EQCR size */

View File

@ -87,6 +87,13 @@ struct eqresp_metadata {
struct rte_mempool *mp;
};
#define DPAA2_PORTAL_DEQUEUE_DEPTH 32
struct dpaa2_portal_dqrr {
struct rte_mbuf *mbuf[DPAA2_PORTAL_DEQUEUE_DEPTH];
uint64_t dqrr_held;
uint8_t dqrr_size;
};
struct dpaa2_dpio_dev {
TAILQ_ENTRY(dpaa2_dpio_dev) next;
/**< Pointer to Next device instance */
@ -112,6 +119,7 @@ struct dpaa2_dpio_dev {
struct rte_intr_handle intr_handle; /* Interrupt related info */
int32_t epoll_fd; /**< File descriptor created for interrupt polling */
int32_t hw_id; /**< An unique ID of this DPIO device instance */
struct dpaa2_portal_dqrr dpaa2_held_bufs;
};
struct dpaa2_dpbp_dev {

View File

@ -53,7 +53,6 @@ INTERNAL {
mc_get_version;
mc_send_command;
per_lcore__dpaa2_io;
per_lcore_dpaa2_held_bufs;
qbman_check_command_complete;
qbman_check_new_result;
qbman_eq_desc_clear;

View File

@ -137,24 +137,6 @@ struct rte_fslmc_bus {
/**< Count of all devices scanned */
};
#define DPAA2_PORTAL_DEQUEUE_DEPTH 32
/* Create storage for dqrr entries per lcore */
struct dpaa2_portal_dqrr {
struct rte_mbuf *mbuf[DPAA2_PORTAL_DEQUEUE_DEPTH];
uint64_t dqrr_held;
uint8_t dqrr_size;
};
RTE_DECLARE_PER_LCORE(struct dpaa2_portal_dqrr, dpaa2_held_bufs);
#define DPAA2_PER_LCORE_DQRR_SIZE \
RTE_PER_LCORE(dpaa2_held_bufs).dqrr_size
#define DPAA2_PER_LCORE_DQRR_HELD \
RTE_PER_LCORE(dpaa2_held_bufs).dqrr_held
#define DPAA2_PER_LCORE_DQRR_MBUF(i) \
RTE_PER_LCORE(dpaa2_held_bufs).mbuf[i]
/**
* Register a DPAA2 driver.
*