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

bus/fslmc: remove unused funcs and align names in QBMAN

Browse Source 
name alignment for check command and result functions
putting them as separate functions instead of changing the original
functions.

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Hemant Agrawal 2017-09-16 16:22:20 +05:30 committed by Ferruh Yigit
parent f739d6f8f2
commit 69293c7762
8 changed files with 462 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h
View File

@ -194,11 +194,38 @@ void qbman_swp_interrupt_set_inhibit(struct qbman_swp *p, int inhibit);
/**
* struct qbman_result - structure for qbman dequeue response and/or
* notification.
* @dont_manipulate_directly: the 16 32bit data to represent the whole
* @donot_manipulate_directly: the 16 32bit data to represent the whole
* possible qbman dequeue result.
*/
struct qbman_result {
uint32_t dont_manipulate_directly[16];
union {
struct common {
uint8_t verb;
uint8_t reserved[63];
} common;
struct dq {
uint8_t verb;
uint8_t stat;
__le16 seqnum;
__le16 oprid;
uint8_t reserved;
uint8_t tok;
__le32 fqid;
uint32_t reserved2;
__le32 fq_byte_cnt;
__le32 fq_frm_cnt;
__le64 fqd_ctx;
uint8_t fd[32];
} dq;
struct scn {
uint8_t verb;
uint8_t stat;
uint8_t state;
uint8_t reserved;
__le32 rid_tok;
__le64 ctx;
} scn;
};
};
/* TODO:
@ -254,11 +281,21 @@ void qbman_swp_push_set(struct qbman_swp *s, uint8_t channel_idx, int enable);
/**
* struct qbman_pull_desc - the structure for pull dequeue descriptor
* @dont_manipulate_directly: the 6 32bit data to represent the whole
* possible settings for pull dequeue descriptor.
*/
struct qbman_pull_desc {
uint32_t dont_manipulate_directly[6];
union {
uint32_t donot_manipulate_directly[16];
struct pull {
uint8_t verb;
uint8_t numf;
uint8_t tok;
uint8_t reserved;
uint32_t dq_src;
uint64_t rsp_addr;
uint64_t rsp_addr_virt;
uint8_t padding[40];
} pull;
};
};
enum qbman_pull_type_e {
@ -415,7 +452,20 @@ struct qbman_result *qbman_get_dqrr_from_idx(struct qbman_swp *s, uint8_t idx);
* dequeue result.
*/
int qbman_result_has_new_result(struct qbman_swp *s,
const struct qbman_result *dq);
struct qbman_result *dq);
/**
* qbman_check_command_complete() - Check if the previous issued dq commnd
* is completed and results are available in memory.
* @s: the software portal object.
* @dq: the dequeue result read from the memory.
*
* Return 1 for getting a valid dequeue result, or 0 for not getting a valid
* dequeue result.
*/
int qbman_check_command_complete(struct qbman_result *dq);
int qbman_check_new_result(struct qbman_result *dq);
/* -------------------------------------------------------- */
/* Parsing dequeue entries (DQRR and user-provided storage) */
@ -537,7 +587,7 @@ int qbman_result_is_FQPN(const struct qbman_result *dq);
*
* Return the state field.
*/
uint32_t qbman_result_DQ_flags(const struct qbman_result *dq);
uint8_t qbman_result_DQ_flags(const struct qbman_result *dq);
/**
* qbman_result_DQ_is_pull() - Check whether the dq response is from a pull
@ -648,24 +698,6 @@ uint32_t qbman_result_SCN_rid(const struct qbman_result *scn);
*/
uint64_t qbman_result_SCN_ctx(const struct qbman_result *scn);
/**
* qbman_result_SCN_state_in_mem() - Get the state in notification written
* in memory
* @scn: the state change notification.
*
* Return the state.
*/
uint8_t qbman_result_SCN_state_in_mem(const struct qbman_result *scn);
/**
* qbman_result_SCN_rid_in_mem() - Get the resource id in notification written
* in memory.
* @scn: the state change notification.
*
* Return the resource id.
*/
uint32_t qbman_result_SCN_rid_in_mem(const struct qbman_result *scn);
/* Type-specific "resource IDs". Mainly for illustration purposes, though it
* also gives the appropriate type widths.
*/
@ -746,22 +778,36 @@ uint64_t qbman_result_cgcu_icnt(const struct qbman_result *scn);
/* Enqueues */
/************/
/**
* struct qbman_eq_desc - structure of enqueue descriptor
* @dont_manipulate_directly: the 8 32bit data to represent the whole
* possible qbman enqueue setting in enqueue descriptor.
*/
/* struct qbman_eq_desc - structure of enqueue descriptor */
struct qbman_eq_desc {
uint32_t dont_manipulate_directly[8];
union {
uint32_t donot_manipulate_directly[8];
struct eq {
uint8_t verb;
uint8_t dca;
uint16_t seqnum;
uint16_t orpid;
uint16_t reserved1;
uint32_t tgtid;
uint32_t tag;
uint16_t qdbin;
uint8_t qpri;
uint8_t reserved[3];
uint8_t wae;
uint8_t rspid;
uint64_t rsp_addr;
uint8_t fd[32];
} eq;
};
};
/**
* struct qbman_eq_response - structure of enqueue response
* @dont_manipulate_directly: the 16 32bit data to represent the whole
* @donot_manipulate_directly: the 16 32bit data to represent the whole
* enqueue response.
*/
struct qbman_eq_response {
uint32_t dont_manipulate_directly[16];
uint32_t donot_manipulate_directly[16];
};
/**
@ -801,7 +847,7 @@ void qbman_eq_desc_set_no_orp(struct qbman_eq_desc *d, int respond_success);
* sequeue number.
*/
void qbman_eq_desc_set_orp(struct qbman_eq_desc *d, int respond_success,
uint32_t opr_id, uint32_t seqnum, int incomplete);
uint16_t opr_id, uint16_t seqnum, int incomplete);
/**
* qbman_eq_desc_set_orp_hole() - fill a hole in the order-restoration sequence
@ -810,8 +856,8 @@ void qbman_eq_desc_set_orp(struct qbman_eq_desc *d, int respond_success,
* @opr_id: the order point record id.
* @seqnum: the order restoration sequence number.
*/
void qbman_eq_desc_set_orp_hole(struct qbman_eq_desc *d, uint32_t opr_id,
uint32_t seqnum);
void qbman_eq_desc_set_orp_hole(struct qbman_eq_desc *d, uint16_t opr_id,
uint16_t seqnum);
/**
* qbman_eq_desc_set_orp_nesn() - advance NESN (Next Expected Sequence Number)
@ -820,8 +866,8 @@ void qbman_eq_desc_set_orp_hole(struct qbman_eq_desc *d, uint32_t opr_id,
* @opr_id: the order point record id.
* @seqnum: the order restoration sequence number.
*/
void qbman_eq_desc_set_orp_nesn(struct qbman_eq_desc *d, uint32_t opr_id,
uint32_t seqnum);
void qbman_eq_desc_set_orp_nesn(struct qbman_eq_desc *d, uint16_t opr_id,
uint16_t seqnum);
/**
* qbman_eq_desc_set_response() - Set the enqueue response info.
* @d: the enqueue descriptor
@ -873,7 +919,7 @@ void qbman_eq_desc_set_fq(struct qbman_eq_desc *d, uint32_t fqid);
* @qd_prio: the queuing destination priority.
*/
void qbman_eq_desc_set_qd(struct qbman_eq_desc *d, uint32_t qdid,
uint32_t qd_bin, uint32_t qd_prio);
uint16_t qd_bin, uint8_t qd_prio);
/**
* qbman_eq_desc_set_eqdi() - enable/disable EQDI interrupt
@ -898,7 +944,7 @@ void qbman_eq_desc_set_eqdi(struct qbman_eq_desc *d, int enable);
* being rescheduled.)
*/
void qbman_eq_desc_set_dca(struct qbman_eq_desc *d, int enable,
uint32_t dqrr_idx, int park);
uint8_t dqrr_idx, int park);
/**
* qbman_swp_enqueue() - Issue an enqueue command.
@ -957,11 +1003,20 @@ int qbman_swp_enqueue_thresh(struct qbman_swp *s, unsigned int thresh);
/*******************/
/**
* struct qbman_release_desc - The structure for buffer release descriptor
* @dont_manipulate_directly: the 32bit data to represent the whole
* @donot_manipulate_directly: the 32bit data to represent the whole
* possible settings of qbman release descriptor.
*/
struct qbman_release_desc {
uint32_t dont_manipulate_directly[1];
union {
uint32_t donot_manipulate_directly[16];
struct br {
uint8_t verb;
uint8_t reserved;
uint16_t bpid;
uint32_t reserved2;
uint64_t buf[7];
} br;
};
};
/**
@ -975,7 +1030,7 @@ void qbman_release_desc_clear(struct qbman_release_desc *d);
* qbman_release_desc_set_bpid() - Set the ID of the buffer pool to release to
* @d: the qbman release descriptor.
*/
void qbman_release_desc_set_bpid(struct qbman_release_desc *d, uint32_t bpid);
void qbman_release_desc_set_bpid(struct qbman_release_desc *d, uint16_t bpid);
/**
* qbman_release_desc_set_rcdi() - Determines whether or not the portal's RCDI
@ -1018,7 +1073,7 @@ int qbman_swp_release_thresh(struct qbman_swp *s, unsigned int thresh);
* Return 0 for success, or negative error code if the acquire command
* fails.
*/
int qbman_swp_acquire(struct qbman_swp *s, uint32_t bpid, uint64_t *buffers,
int qbman_swp_acquire(struct qbman_swp *s, uint16_t bpid, uint64_t *buffers,
unsigned int num_buffers);
/*****************/
@ -1133,7 +1188,4 @@ int qbman_swp_CDAN_disable(struct qbman_swp *s, uint16_t channelid);
*/
int qbman_swp_CDAN_set_context_enable(struct qbman_swp *s, uint16_t channelid,
uint64_t ctx);
int qbman_check_command_complete(struct qbman_swp *s,
const struct qbman_result *dq);
#endif /* !_FSL_QBMAN_PORTAL_H */

757
drivers/bus/fslmc/qbman/qbman_portal.c
View File

File diff suppressed because it is too large Load Diff

6
drivers/bus/fslmc/qbman/qbman_portal.h
View File

@ -123,12 +123,12 @@ struct qbman_swp {
* non-NULL if only if the response is complete).
*/
void *qbman_swp_mc_start(struct qbman_swp *p);
void qbman_swp_mc_submit(struct qbman_swp *p, void *cmd, uint32_t cmd_verb);
void qbman_swp_mc_submit(struct qbman_swp *p, void *cmd, uint8_t cmd_verb);
void *qbman_swp_mc_result(struct qbman_swp *p);
/* Wraps up submit + poll-for-result */
static inline void *qbman_swp_mc_complete(struct qbman_swp *swp, void *cmd,
uint32_t cmd_verb)
uint8_t cmd_verb)
{
int loopvar;
@ -275,4 +275,4 @@ static inline int32_t qb_attr_code_makesigned(const struct qb_attr_code *code,
* an inline) is necessary to work with different descriptor types and to work
* correctly with const and non-const inputs (and similarly-qualified outputs).
*/
#define qb_cl(d) (&(d)->dont_manipulate_directly[0])
#define qb_cl(d) (&(d)->donot_manipulate_directly[0])

2
drivers/bus/fslmc/qbman/qbman_private.h
View File

@ -92,7 +92,7 @@ do { \
*
*/
#ifdef __LP64__
#define MAKE_MASK32(width) ((uint32_t)(( 1ULL << width) - 1))
#define MAKE_MASK32(width) ((uint32_t)((1ULL << width) - 1))
#else
#define MAKE_MASK32(width) (width == 32 ? 0xffffffff : \
(uint32_t)((1 << width) - 1))

12
drivers/bus/fslmc/qbman/qbman_sys.h
View File

@ -357,15 +357,3 @@ static inline void qbman_swp_sys_finish(struct qbman_swp_sys *s)
{
free_page((unsigned long)s->cena);
}
static inline void *
qbman_cena_write_start_wo_shadow_fast(struct qbman_swp_sys *s,
uint32_t offset)
{
#ifdef QBMAN_CENA_TRACE
pr_info("qbman_cena_write_start(%p:%d:0x%03x)\n",
s->addr_cena, s->idx, offset);
#endif
QBMAN_BUG_ON(offset & 63);
return (s->addr_cena + offset);
}

3
drivers/bus/fslmc/rte_bus_fslmc_version.map
View File

@ -62,11 +62,12 @@ DPDK_17.08 {
dpio_remove_static_dequeue_channel;
mc_get_soc_version;
mc_get_version;
qbman_check_new_result;
qbman_eq_desc_set_dca;
qbman_get_dqrr_from_idx;
qbman_get_dqrr_idx;
qbman_result_DQ_fqd_ctx;
qbman_result_SCN_state_in_mem;
qbman_result_SCN_state;
qbman_swp_dqrr_consume;
qbman_swp_dqrr_next;
qbman_swp_enqueue_multiple;

4
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
View File

@ -747,13 +747,13 @@ dpaa2_sec_dequeue_burst(void *qp, struct rte_crypto_op **ops,
* Also seems like the SWP is shared between the Ethernet Driver
* and the SEC driver.
*/
while (!qbman_check_command_complete(swp, dq_storage))
while (!qbman_check_command_complete(dq_storage))
;
/* Loop until the dq_storage is updated with
* new token by QBMAN
*/
while (!qbman_result_has_new_result(swp, dq_storage))
while (!qbman_check_new_result(dq_storage))
;
/* Check whether Last Pull command is Expired and
* setting Condition for Loop termination

10
drivers/net/dpaa2/dpaa2_rxtx.c
View File

@ -422,7 +422,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
qbman_pull_desc_set_storage(&pulldesc, dq_storage,
(dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1);
if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) {
while (!qbman_check_command_complete(swp,
while (!qbman_check_command_complete(
get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)))
;
clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index);
@ -445,7 +445,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
* Also seems like the SWP is shared between the Ethernet Driver
* and the SEC driver.
*/
while (!qbman_check_command_complete(swp, dq_storage))
while (!qbman_check_command_complete(dq_storage))
;
if (dq_storage == get_swp_active_dqs(q_storage->active_dpio_id))
clear_swp_active_dqs(q_storage->active_dpio_id);
@ -453,7 +453,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
/* Loop until the dq_storage is updated with
* new token by QBMAN
*/
while (!qbman_result_has_new_result(swp, dq_storage))
while (!qbman_check_new_result(dq_storage))
;
rte_prefetch0((void *)((uint64_t)(dq_storage + 1)));
/* Check whether Last Pull command is Expired and
@ -486,7 +486,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
}
if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) {
while (!qbman_check_command_complete(swp,
while (!qbman_check_command_complete(
get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)))
;
clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index);
@ -560,7 +560,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
while (nb_pkts) {
/*Check if the queue is congested*/
retry_count = 0;
if (qbman_result_SCN_state_in_mem(dpaa2_q->cscn)) {
while (qbman_result_SCN_state(dpaa2_q->cscn)) {
retry_count++;
/* Retry for some time before giving up */
if (retry_count > CONG_RETRY_COUNT)