RE: [PATCH 1/2] staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
> -Original Message- > From: Roy Pledge > Sent: Monday, July 9, 2018 10:24 AM > To: Laurentiu Tudor ; > de...@driverdev.osuosl.org; linux-arm-ker...@lists.infradead.org; > gre...@linuxfoundation.org; Leo Li > Cc: Ioana Ciocoi Radulescu ; Horia Geanta > ; linux-ker...@vger.kernel.org; a...@arndb.de; > catalin.mari...@arm.com; robin.mur...@arm.com > Subject: Re: [PATCH 1/2] staging:fsl-mc: Move DPIO from staging to > drivers/soc/fsl > > On 7/9/2018 6:37 AM, Laurentiu Tudor wrote: > > Hi Roy, > > > > Couple of comments inline. > > > > On 05.07.2018 22:41, Roy Pledge wrote: > >> Move the NXP DPIO (Datapath I/O Driver) out of the drivers/staging > >> directory and into the drivers/soc/fsl directory. > >> > >> The DPIO driver enables access to Queue and Buffer Manager (QBMAN) > >> hardware on NXP DPAA2 devices. This is a prerequisite to moving the > >> DPAA2 Ethernet driver out of staging. > >> > >> Signed-off-by: Roy Pledge > >> --- > >> 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 + > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h| 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 > > Maybe this should be converted to .rst and go in the already existing > > Documentation/networking/dpaa2/? > > I can look into converting this to RST but I'm not sure it belongs in the > networking documentation folder since it will be used by other non > networking drivers in the near future - compress/decompress for example. > > > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c| 2 +- > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c| 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h| 0 > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c| 2 +- > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h| 2 +- > >> drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- > >> drivers/staging/fsl-mc/bus/Kconfig | 9 > >> - > >> drivers/staging/fsl-mc/bus/Makefile| 2 -- > >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 > >> .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 > >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 > >> 20 files changed, 20 insertions(+), 20 deletions(-) > >> 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-driver.txt > (100%) > >> 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%) > >> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h > (100%) > >> 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%) > > I received feedback in the past on mc-bus that a driver should limit > > to only one public header and one private one. Would it make sense to > > do the same for dpio too? > Looking at this the dpaa-2global.h file should probably be integrated into the > dpaa2-io.h file. > The dpaaa2-fd.h can be used by devices that don't need to used DPIO - the > definition of a frame descriptor isn't DPIO specific so I would argue it > should > be kept in a seperate file. Hi Roy, Will there be a re-spin of the patch soon so that we can probably catch the next merge window? Regards, Leo ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/2] staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
On 7/9/2018 6:37 AM, Laurentiu Tudor wrote: > Hi Roy, > > Couple of comments inline. > > On 05.07.2018 22:41, Roy Pledge wrote: >> Move the NXP DPIO (Datapath I/O Driver) out of the >> drivers/staging directory and into the drivers/soc/fsl directory. >> >> The DPIO driver enables access to Queue and Buffer Manager (QBMAN) >> hardware on NXP DPAA2 devices. This is a prerequisite to moving the >> DPAA2 Ethernet driver out of staging. >> >> Signed-off-by: Roy Pledge >> --- >> 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 + >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h| 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 > Maybe this should be converted to .rst and go in the already existing > Documentation/networking/dpaa2/? I can look into converting this to RST but I'm not sure it belongs in the networking documentation folder since it will be used by other non networking drivers in the near future - compress/decompress for example. > >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c| 2 +- >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c| 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h| 0 >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c| 2 +- >> drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h| 2 +- >> drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- >> drivers/staging/fsl-mc/bus/Kconfig | 9 >> - >> drivers/staging/fsl-mc/bus/Makefile| 2 -- >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 >> .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 >> {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 >> 20 files changed, 20 insertions(+), 20 deletions(-) >> 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-driver.txt (100%) >> 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%) >> rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h >> (100%) >> 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%) > I received feedback in the past on mc-bus that a driver should limit to > only one public header and one private one. Would it make sense to do > the same for dpio too? Looking at this the dpaa-2global.h file should probably be integrated into the dpaa2-io.h file. The dpaaa2-fd.h can be used by devices that don't need to used DPIO - the definition of a frame descriptor isn't DPIO specific so I would argue it should be kept in a seperate file. > > --- > Best Regards, Laurentiu ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/2] staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
Hi Roy, Couple of comments inline. On 05.07.2018 22:41, Roy Pledge wrote: > Move the NXP DPIO (Datapath I/O Driver) out of the > drivers/staging directory and into the drivers/soc/fsl directory. > > The DPIO driver enables access to Queue and Buffer Manager (QBMAN) > hardware on NXP DPAA2 devices. This is a prerequisite to moving the > DPAA2 Ethernet driver out of staging. > > Signed-off-by: Roy Pledge > --- > 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 + > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h| 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 Maybe this should be converted to .rst and go in the already existing Documentation/networking/dpaa2/? > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c| 2 +- > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c| 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h| 0 > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c| 2 +- > drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h| 2 +- > drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- > drivers/staging/fsl-mc/bus/Kconfig | 9 > - > drivers/staging/fsl-mc/bus/Makefile| 2 -- > {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 > .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 > {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 > 20 files changed, 20 insertions(+), 20 deletions(-) > 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-driver.txt (100%) > 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%) > rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%) > 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%) I received feedback in the past on mc-bus that a driver should limit to only one public header and one private one. Would it make sense to do the same for dpio too? --- Best Regards, Laurentiu ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
Move the NXP DPIO (Datapath I/O Driver) out of the drivers/staging directory and into the drivers/soc/fsl directory. The DPIO driver enables access to Queue and Buffer Manager (QBMAN) hardware on NXP DPAA2 devices. This is a prerequisite to moving the DPAA2 Ethernet driver out of staging. Signed-off-by: Roy Pledge --- 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 + drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h| 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c| 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c| 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h| 0 drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c| 2 +- drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h| 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++-- drivers/staging/fsl-mc/bus/Kconfig | 9 - drivers/staging/fsl-mc/bus/Makefile| 2 -- {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0 .../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0 {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0 20 files changed, 20 insertions(+), 20 deletions(-) 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-driver.txt (100%) 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%) rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%) 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%) diff --git a/MAINTAINERS b/MAINTAINERS index f771ec1..5b41d0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4442,7 +4442,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER M: Roy Pledge L: linux-ker...@vger.kernel.org S: Maintained -F: drivers/staging/fsl-mc/bus/dpio +F: drivers/soc/fsl/dpio DPAA2 ETHERNET DRIVER M: Ioana Radulescu diff --git a/drivers/crypto/caam/sg_sw_qm2.h b/drivers/crypto/caam/sg_sw_qm2.h index 31b4407..b5b4c12 100644 --- a/drivers/crypto/caam/sg_sw_qm2.h +++ b/drivers/crypto/caam/sg_sw_qm2.h @@ -35,7 +35,7 @@ #ifndef _SG_SW_QM2_H_ #define _SG_SW_QM2_H_ -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include static inline void dma_to_qm_sg_one(struct dpaa2_sg_entry *qm_sg_ptr, dma_addr_t dma, u32 len, u16 offset) diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index e586ffa..dbfa9fc 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -12,7 +12,7 @@ #include "ctrl.h" #include "regs.h" #include "sg_sw_qm2.h" -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include struct sec4_sg_entry { u64 ptr; diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig index 7a9fb9b..c17bf38 100644 --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig @@ -16,3 +16,13 @@ config FSL_GUTS Initially only reading SVR and registering soc device are supported. Other guts accesses, such as reading RCW, should eventually be moved into this driver as well. + +config FSL_MC_DPIO +tristate "QorIQ DPAA2 DPIO driver" +depends on FSL_MC_BUS +help + Driver for the DPAA2 DPIO object. A DPIO provides queue and + buffer management facilities for software to interact with + other DPAA2 objects. This driver does not expose the DPIO + objects individually, but groups them under a service layer + API. diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile index 44b3beb..803ef1b 100644 --- a/drivers/soc/fsl/Makefile +++ b/drivers/soc/fsl/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_FSL_DPAA) += qbman/ obj-$(CONFIG_QUICC_ENGINE) += qe/ obj-$(CONFIG_CPM)