soc/qman: Drop unused field from eqcr/dqrr descriptors
authorClaudiu Manoil <claudiu.manoil@nxp.com>
Wed, 16 Nov 2016 14:40:26 +0000 (16:40 +0200)
committerScott Wood <oss@buserror.net>
Wed, 23 Nov 2016 07:23:47 +0000 (01:23 -0600)
ORP ("Order Restoration Point") mechanism not supported.

Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: Scott Wood <oss@buserror.net>
drivers/soc/fsl/qbman/qman.c
include/soc/fsl/qman.h

index 06626bee0e7ee90790784496ab424f3da8b4def1..c679e0285ccdc45b5e4b61de1aeb2c8d72353807 100644 (file)
@@ -141,7 +141,7 @@ struct qm_eqcr_entry {
        u8 _ncw_verb; /* writes to this are non-coherent */
        u8 dca;
        u16 seqnum;
-       u32 orp;        /* 24-bit */
+       u8 __reserved[4];
        u32 fqid;       /* 24-bit */
        u32 tag;
        struct qm_fd fd;
@@ -470,7 +470,6 @@ static inline struct qm_eqcr_entry *qm_eqcr_start_stash(struct qm_portal
 static inline void eqcr_commit_checks(struct qm_eqcr *eqcr)
 {
        DPAA_ASSERT(eqcr->busy);
-       DPAA_ASSERT(eqcr->cursor->orp == (eqcr->cursor->orp & 0x00ffffff));
        DPAA_ASSERT(!(eqcr->cursor->fqid & ~QM_FQID_MASK));
        DPAA_ASSERT(eqcr->available >= 1);
 }
index f3fa53fef4216345ca46da8fa30450bc17c74ba3..20bbc716a6a8a6525a49321c6213c5eb1f2cfa89 100644 (file)
@@ -279,8 +279,7 @@ union qm_mr_entry {
                u8 dca;
                u16 seqnum;
                u8 rc;          /* Rej Code: 8-bit */
-               u8 orp_hi;      /* ORP: 24-bit */
-               u16 orp_lo;
+               u8 __reserved[3];
                u32 fqid;       /* 24-bit */
                u32 tag;
                struct qm_fd fd;