Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Horia Geanta <horia.geanta@nxp.com>
To:     Roy Pledge <roy.pledge@nxp.com>,
        "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        Leo Li <leoyang.li@nxp.com>,
        Ioana Ciocoi Radulescu <ruxandra.radulescu@nxp.com>
CC:     Laurentiu Tudor <laurentiu.tudor@nxp.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "arnd@arndb.de" <arnd@arndb.de>,
        "catalin.marinas@arm.com" <catalin.marinas@arm.com>,
        "robin.murphy@arm.com" <robin.murphy@arm.com>
Subject: Re: [PATCH 0/2] staging/fsl-mc/bus: Move DPIO from staging to
 drivers/soc/fsl
Thread-Topic: [PATCH 0/2] staging/fsl-mc/bus: Move DPIO from staging to
 drivers/soc/fsl
Thread-Index: AQHUFJgt6LCNXmuqP0KWKGxjabTg8Q==
Date:   Fri, 6 Jul 2018 12:25:48 +0000
Message-ID: <VI1PR0402MB34853F03375D3BCA4791432698470@VI1PR0402MB3485.eurprd04.prod.outlook.com>
References: <20180705194113.16256-1-roy.pledge@nxp.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-2"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 2db6545b-31ab-45c0-0aa3-08d5e33b9b25
X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jul 2018 12:25:48.6858
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1SPR01MB325
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 7/5/2018 10:41 PM, Roy Pledge wrote:=0A=
> Move the NXP DPIO (Datapath I/O driver) from the staging/fsl-mc/bus/dpio=
=0A=
> directory to the drivers/soc/fsl directory.=0A=
> =0A=
> The DPIO driver enables access to the Queue and Buffer Managemer (QBMAN)=
=0A=
> hardware of NXP DPAA2 devices. This is a prerequiste for moving the DPAA2=
=0A=
> Ethernet device driver from the staging directory.=0A=
> =0A=
Roy, Ioana,=0A=
=0A=
Would it be ok to add the following patch on top of the series?=0A=
It's a dependency for dpseci object.=0A=
If not added now I fear it won't be accepted until dpaa2-ethernet=0A=
moves out of staging, thus gating dpseci upstreaming.=0A=
=0A=
Thanks,=0A=
Horia=0A=
=0A=
--->8---=0A=
Previous commits:=0A=
6e2387e8f19ed ("staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver=
")=0A=
39163c0ce0f48 ("staging: fsl-dpaa2/eth: Errors checking update")=0A=
added bits that are not specific to the WRIOP accelerator.=0A=
=0A=
Move these where they belong (in DPIO) such that other accelerators=0A=
can make use of them.=0A=
=0A=
Signed-off-by: Horia Geant=E3 <horia.geanta@nxp.com>=0A=
---=0A=
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c |  4 ++--=0A=
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 18 +++++-------------=0A=
 drivers/staging/fsl-mc/include/dpaa2-fd.h      | 12 ++++++++++++=0A=
 3 files changed, 19 insertions(+), 15 deletions(-)=0A=
=0A=
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/stagi=
ng/fsl-dpaa2/ethernet/dpaa2-eth.c=0A=
index 396371728aa1..d5f0ac5c2d1f 100644=0A=
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c=0A=
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c=0A=
@@ -455,7 +455,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,=0A=
 	dpaa2_fd_set_format(fd, dpaa2_fd_sg);=0A=
 	dpaa2_fd_set_addr(fd, addr);=0A=
 	dpaa2_fd_set_len(fd, skb->len);=0A=
-	dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);=0A=
+	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);=0A=
=0A=
 	if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)=0A=
 		enable_tx_tstamp(fd, sgt_buf);=0A=
@@ -508,7 +508,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv,=
=0A=
 	dpaa2_fd_set_offset(fd, (u16)(skb->data - buffer_start));=0A=
 	dpaa2_fd_set_len(fd, skb->len);=0A=
 	dpaa2_fd_set_format(fd, dpaa2_fd_single);=0A=
-	dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);=0A=
+	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);=0A=
=0A=
 	if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)=0A=
 		enable_tx_tstamp(fd, buffer_start);=0A=
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/stagi=
ng/fsl-dpaa2/ethernet/dpaa2-eth.h=0A=
index 905a4e6be8fa..9269cb05a84b 100644=0A=
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h=0A=
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h=0A=
@@ -124,21 +124,13 @@ struct dpaa2_eth_swa {=0A=
 #define DPAA2_FD_FRC_FAICFDV		0x0400=0A=
=0A=
 /* Error bits in FD CTRL */=0A=
-#define DPAA2_FD_CTRL_UFD		0x00000004=0A=
-#define DPAA2_FD_CTRL_SBE		0x00000008=0A=
-#define DPAA2_FD_CTRL_FSE		0x00000020=0A=
-#define DPAA2_FD_CTRL_FAERR		0x00000040=0A=
-=0A=
-#define DPAA2_FD_RX_ERR_MASK		(DPAA2_FD_CTRL_SBE	| \=0A=
-					 DPAA2_FD_CTRL_FAERR)=0A=
-#define DPAA2_FD_TX_ERR_MASK		(DPAA2_FD_CTRL_UFD	| \=0A=
-					 DPAA2_FD_CTRL_SBE	| \=0A=
-					 DPAA2_FD_CTRL_FSE	| \=0A=
-					 DPAA2_FD_CTRL_FAERR)=0A=
+#define DPAA2_FD_RX_ERR_MASK		(FD_CTRL_SBE | FD_CTRL_FAERR)=0A=
+#define DPAA2_FD_TX_ERR_MASK		(FD_CTRL_UFD	| \=0A=
+					 FD_CTRL_SBE	| \=0A=
+					 FD_CTRL_FSE	| \=0A=
+					 FD_CTRL_FAERR)=0A=
=0A=
 /* Annotation bits in FD CTRL */=0A=
-#define DPAA2_FD_CTRL_PTA		0x00800000=0A=
-#define DPAA2_FD_CTRL_PTV1		0x00400000=0A=
 #define DPAA2_FD_CTRL_ASAL		0x00020000	/* ASAL =3D 128B */=0A=
=0A=
 /* Frame annotation status */=0A=
diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/drivers/staging/fs=
l-mc/include/dpaa2-fd.h=0A=
index b55b89ba4eda..2576abaa7779 100644=0A=
--- a/drivers/staging/fsl-mc/include/dpaa2-fd.h=0A=
+++ b/drivers/staging/fsl-mc/include/dpaa2-fd.h=0A=
@@ -67,6 +67,18 @@ struct dpaa2_fd {=0A=
 #define SG_FINAL_FLAG_MASK	0x1=0A=
 #define SG_FINAL_FLAG_SHIFT	15=0A=
=0A=
+/* Error bits in FD CTRL */=0A=
+#define FD_CTRL_ERR_MASK	0x000000FF=0A=
+#define FD_CTRL_UFD		0x00000004=0A=
+#define FD_CTRL_SBE		0x00000008=0A=
+#define FD_CTRL_FLC		0x00000010=0A=
+#define FD_CTRL_FSE		0x00000020=0A=
+#define FD_CTRL_FAERR		0x00000040=0A=
+=0A=
+/* Annotation bits in FD CTRL */=0A=
+#define FD_CTRL_PTA		0x00800000=0A=
+#define FD_CTRL_PTV1		0x00400000=0A=
+=0A=
 enum dpaa2_fd_format {=0A=
 	dpaa2_fd_single =3D 0,=0A=
 	dpaa2_fd_list,=0A=
-- =0A=
2.16.2=0A=