Re: [PATCH 0/2] staging/fsl-mc/bus: Move DPIO from staging to drivers/soc/fsl
On 7/5/2018 10:41 PM, Roy Pledge wrote:
> Move the NXP DPIO (Datapath I/O driver) from the staging/fsl-mc/bus/dpio
> directory to the drivers/soc/fsl directory.
>
> The DPIO driver enables access to the Queue and Buffer Managemer (QBMAN)
> hardware of NXP DPAA2 devices. This is a prerequiste for moving the DPAA2
> Ethernet device driver from the staging directory.
>
Roy, Ioana,
Would it be ok to add the following patch on top of the series?
It's a dependency for dpseci object.
If not added now I fear it won't be accepted until dpaa2-ethernet
moves out of staging, thus gating dpseci upstreaming.
Thanks,
Horia
--->8---
Previous commits:
6e2387e8f19ed ("staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver")
39163c0ce0f48 ("staging: fsl-dpaa2/eth: Errors checking update")
added bits that are not specific to the WRIOP accelerator.
Move these where they belong (in DPIO) such that other accelerators
can make use of them.
Signed-off-by: Horia Geantă
---
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++--
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 18 +-
drivers/staging/fsl-mc/include/dpaa2-fd.h | 12
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
index 396371728aa1..d5f0ac5c2d1f 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
@@ -455,7 +455,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,
dpaa2_fd_set_format(fd, dpaa2_fd_sg);
dpaa2_fd_set_addr(fd, addr);
dpaa2_fd_set_len(fd, skb->len);
- dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);
+ dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);
if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
enable_tx_tstamp(fd, sgt_buf);
@@ -508,7 +508,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv,
dpaa2_fd_set_offset(fd, (u16)(skb->data - buffer_start));
dpaa2_fd_set_len(fd, skb->len);
dpaa2_fd_set_format(fd, dpaa2_fd_single);
- dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);
+ dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);
if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
enable_tx_tstamp(fd, buffer_start);
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
index 905a4e6be8fa..9269cb05a84b 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
@@ -124,21 +124,13 @@ struct dpaa2_eth_swa {
#define DPAA2_FD_FRC_FAICFDV 0x0400
/* Error bits in FD CTRL */
-#define DPAA2_FD_CTRL_UFD 0x0004
-#define DPAA2_FD_CTRL_SBE 0x0008
-#define DPAA2_FD_CTRL_FSE 0x0020
-#define DPAA2_FD_CTRL_FAERR0x0040
-
-#define DPAA2_FD_RX_ERR_MASK (DPAA2_FD_CTRL_SBE | \
-DPAA2_FD_CTRL_FAERR)
-#define DPAA2_FD_TX_ERR_MASK (DPAA2_FD_CTRL_UFD | \
-DPAA2_FD_CTRL_SBE | \
-DPAA2_FD_CTRL_FSE | \
-DPAA2_FD_CTRL_FAERR)
+#define DPAA2_FD_RX_ERR_MASK (FD_CTRL_SBE | FD_CTRL_FAERR)
+#define DPAA2_FD_TX_ERR_MASK (FD_CTRL_UFD| \
+FD_CTRL_SBE| \
+FD_CTRL_FSE| \
+FD_CTRL_FAERR)
/* Annotation bits in FD CTRL */
-#define DPAA2_FD_CTRL_PTA 0x0080
-#define DPAA2_FD_CTRL_PTV1 0x0040
#define DPAA2_FD_CTRL_ASAL 0x0002 /* ASAL = 128B */
/* Frame annotation status */
diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h
b/drivers/staging/fsl-mc/include/dpaa2-fd.h
index b55b89ba4eda..2576abaa7779 100644
--- a/drivers/staging/fsl-mc/include/dpaa2-fd.h
+++ b/drivers/staging/fsl-mc/include/dpaa2-fd.h
@@ -67,6 +67,18 @@ struct dpaa2_fd {
#define SG_FINAL_FLAG_MASK 0x1
#define SG_FINAL_FLAG_SHIFT15
+/* Error bits in FD CTRL */
+#define FD_CTRL_ERR_MASK 0x00FF
+#define FD_CTRL_UFD0x0004
+#define FD_CTRL_SBE0x0008
+#define FD_CTRL_FLC0x0010
+#define FD_CTRL_FSE0x0020
+#define FD_CTRL_FAERR 0x0040
+
+/* Annotation bits in FD CTRL */
+#define FD_CTRL_PTA0x0080
+#define FD_CTRL_PTV1 0x0040
+
enum dpaa2_fd_format {
dpaa2_fd_single = 0,
dpaa2_fd_list,
--
2.16.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 4/4] drivers/soc/fsl/dpio: Convert DPIO documentation to .rst
On 7/23/2018 8:00 PM, Roy Pledge wrote: > Convert the Datapath I/O documentation to .rst format > and move to the Documation/networking/dpaa2 directory typo: ^^^ Documentation > > Signed-off-by: Roy Pledge > --- > .../networking/dpaa2/dpio-driver.rst | 30 > +++--- > Documentation/networking/dpaa2/index.rst | 1 + > 2 files changed, 28 insertions(+), 3 deletions(-) > rename drivers/soc/fsl/dpio/dpio-driver.txt => > Documentation/networking/dpaa2/dpio-driver.rst (94%) > > diff --git a/drivers/soc/fsl/dpio/dpio-driver.txt > b/Documentation/networking/dpaa2/dpio-driver.rst > similarity index 94% > rename from drivers/soc/fsl/dpio/dpio-driver.txt > rename to Documentation/networking/dpaa2/dpio-driver.rst > index 72ba9da..3a33a33 100644 > --- a/drivers/soc/fsl/dpio/dpio-driver.txt > +++ b/Documentation/networking/dpaa2/dpio-driver.rst > @@ -1,7 +1,16 @@ > -Copyright 2016 NXP > +.. include:: > + > +DPAA2 DPIO (Data Path I/O) Overview > +=== > + > +:Copyright: |copy| 2015 Freescale Semiconductor Inc. > +:Copyright: |copy| 2018 NXP > + Existing copyright should be kept. 2018 could be appended if needed. Regards, Horia ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3 0/4] staging/fsl-mc/bus: Move DPIO from staging to drivers/soc/fsl
On 7/24/2018 5:21 PM, Roy Pledge wrote:
> Move the NXP DPIO (Datapath I/O driver) from the staging/fsl-mc/bus/dpio
> directory to the drivers/soc/fsl directory.
>
> The DPIO driver enables access to the Queue and Buffer Managemer (QBMAN)
> hardware of NXP DPAA2 devices. This is a prerequiste for moving the DPAA2
> Ethernet device driver from the staging directory.
>
For the series:
Reviewed-by: Horia Geantă
Thanks,
Horia
> Horia Geantă (1):
> staging: fsl-dpaa2/eth: move generic FD defines to DPIO
>
> Roy Pledge (3):
> staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
> drivers/staging: Remove fsl-mc driver from staging
> drivers/soc/fsl/dpio: Convert DPIO documentation to .rst
>
> .../networking/dpaa2/dpio-driver.rst | 29
> +++---
> Documentation/networking/dpaa2/index.rst | 1 +
> MAINTAINERS| 2 +-
> drivers/crypto/caam/sg_sw_qm2.h| 2 +-
> drivers/crypto/caam/sg_sw_sec4.h | 2 +-
> drivers/soc/fsl/Kconfig| 10
> drivers/soc/fsl/Makefile | 1 +
> .../{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0
> .../fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0
> .../fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +-
> .../fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +-
> .../{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c| 0
> .../{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h| 0
> .../fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +-
> .../fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +-
> drivers/staging/Kconfig| 2 --
> drivers/staging/Makefile | 1 -
> drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 +--
> drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 22 ++--
> drivers/staging/fsl-mc/Kconfig | 2 --
> drivers/staging/fsl-mc/Makefile| 3 ---
> drivers/staging/fsl-mc/bus/Kconfig | 16
> drivers/staging/fsl-mc/bus/Makefile| 9 ---
> .../fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 12 +
> .../include => include/soc/fsl}/dpaa2-global.h | 0
> .../fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0
> 26 files changed, 66 insertions(+), 60 deletions(-)
> rename drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt =>
> Documentation/networking/dpaa2/dpio-driver.rst (95%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%)
> rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%)
> delete mode 100644 drivers/staging/fsl-mc/Kconfig
> delete mode 100644 drivers/staging/fsl-mc/Makefile
> delete mode 100644 drivers/staging/fsl-mc/bus/Kconfig
> delete mode 100644 drivers/staging/fsl-mc/bus/Makefile
> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (97%)
> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h
> (100%)
> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%)
>
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
