bus/fslmc: remove the export for QBMAN version

[dpdk.git] / drivers / bus / fslmc / qbman / qbman_portal.c

diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
index 137b55d..97df703 100644 (file)
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -44,6 +44,8 @@
 #define QBMAN_CINH_SWP_IER     0xe40
 #define QBMAN_CINH_SWP_ISDR    0xe80
 #define QBMAN_CINH_SWP_IIR     0xec0
+#define QBMAN_CINH_SWP_DQRR_ITR    0xa80
+#define QBMAN_CINH_SWP_ITPR    0xf40
 
 /* CENA register offsets */
 #define QBMAN_CENA_SWP_EQCR(n) (0x000 + ((uint32_t)(n) << 6))
@@ -103,8 +105,6 @@ struct qb_attr_code code_sdqcr_dqsrc = QB_CODE(0, 0, 16);
 #define MAX_QBMAN_PORTALS  35
 static struct qbman_swp *portal_idx_map[MAX_QBMAN_PORTALS];
 
-uint32_t qman_version;
-
 /*********************************/
 /* Portal constructor/destructor */
 /*********************************/
@@ -218,6 +218,26 @@ void qbman_swp_interrupt_clear_status(struct qbman_swp *p, uint32_t mask)
        qbman_cinh_write(&p->sys, QBMAN_CINH_SWP_ISR, mask);
 }
 
+uint32_t qbman_swp_dqrr_thrshld_read_status(struct qbman_swp *p)
+{
+       return qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_DQRR_ITR);
+}
+
+void qbman_swp_dqrr_thrshld_write(struct qbman_swp *p, uint32_t mask)
+{
+       qbman_cinh_write(&p->sys, QBMAN_CINH_SWP_DQRR_ITR, mask);
+}
+
+uint32_t qbman_swp_intr_timeout_read_status(struct qbman_swp *p)
+{
+       return qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_ITPR);
+}
+
+void qbman_swp_intr_timeout_write(struct qbman_swp *p, uint32_t mask)
+{
+       qbman_cinh_write(&p->sys, QBMAN_CINH_SWP_ITPR, mask);
+}
+
 uint32_t qbman_swp_interrupt_get_trigger(struct qbman_swp *p)
 {
        return qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_IER);
@@ -458,8 +478,8 @@ static int qbman_swp_enqueue_array_mode(struct qbman_swp *s,
                return -EBUSY;
        p = qbman_cena_write_start_wo_shadow(&s->sys,
                        QBMAN_CENA_SWP_EQCR(EQAR_IDX(eqar)));
-       word_copy(&p[1], &cl[1], 7);
-       word_copy(&p[8], fd, sizeof(*fd) >> 2);
+       memcpy(&p[1], &cl[1], 28);
+       memcpy(&p[8], fd, sizeof(*fd));
        /* Set the verb byte, have to substitute in the valid-bit */
        lwsync();
        p[0] = cl[0] | EQAR_VB(eqar);
@@ -490,8 +510,8 @@ static int qbman_swp_enqueue_ring_mode(struct qbman_swp *s,
 
        p = qbman_cena_write_start_wo_shadow(&s->sys,
                QBMAN_CENA_SWP_EQCR(s->eqcr.pi & 7));
-       word_copy(&p[1], &cl[1], 7);
-       word_copy(&p[8], fd, sizeof(*fd) >> 2);
+       memcpy(&p[1], &cl[1], 28);
+       memcpy(&p[8], fd, sizeof(*fd));
        lwsync();
        /* Set the verb byte, have to substitute in the valid-bit */
        p[0] = cl[0] | s->eqcr.pi_vb;
@@ -527,9 +547,7 @@ int qbman_swp_fill_ring(struct qbman_swp *s,
        }
        p = qbman_cena_write_start_wo_shadow(&s->sys,
                QBMAN_CENA_SWP_EQCR((s->eqcr.pi/* +burst_index */) & 7));
-       /* word_copy(&p[1], &cl[1], 7); */
        memcpy(&p[1], &cl[1], 7 * 4);
-       /* word_copy(&p[8], fd, sizeof(*fd) >> 2); */
        memcpy(&p[8], fd, sizeof(struct qbman_fd));
 
        /* lwsync(); */
@@ -777,7 +795,7 @@ int qbman_swp_pull(struct qbman_swp *s, struct qbman_pull_desc *d)
         */
        qb_attr_code_encode(&code_pull_token, cl, s->desc.idx + 1);
        p = qbman_cena_write_start_wo_shadow(&s->sys, QBMAN_CENA_SWP_VDQCR);
-       word_copy(&p[1], &cl[1], 3);
+       memcpy(&p[1], &cl[1], 12);
        /* Set the verb byte, have to substitute in the valid-bit */
        lwsync();
        p[0] = cl[0] | s->vdq.valid_bit;
@@ -1463,7 +1481,7 @@ int qbman_swp_CDAN_set_context_enable(struct qbman_swp *s, uint16_t channelid,
                                  1, ctx);
 }
 
-uint8_t qbman_get_dqrr_idx(struct qbman_result *dqrr)
+uint8_t qbman_get_dqrr_idx(const struct qbman_result *dqrr)
 {
        return QBMAN_IDX_FROM_DQRR(dqrr);
 }
@@ -1559,8 +1577,3 @@ done:
 
        return sent;
 }
-
-int qbman_get_version(void)
-{
-       return qman_version;
-}