From: Claudiu Manoil <claudiu.manoil@nxp.com>
Date: Wed, 16 Nov 2016 14:40:26 +0000 (+0200)
Subject: soc/qman: Drop unused field from eqcr/dqrr descriptors
X-Git-Tag: v4.10-rc1~75^2^2~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b539945286bdd2d7c4cb92ef1237873b1c00c778;p=karo-tx-linux.git

soc/qman: Drop unused field from eqcr/dqrr descriptors

ORP ("Order Restoration Point") mechanism not supported.

Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: Scott Wood <oss@buserror.net>
---

diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index 06626bee0e7e..c679e0285ccd 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -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);
 }
diff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h
index f3fa53fef421..20bbc716a6a8 100644
--- a/include/soc/fsl/qman.h
+++ b/include/soc/fsl/qman.h
@@ -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;