| Message ID | 20170828105405.19552-1-laurentiu.tudor@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: > From: Stuart Yoder <stuart.yoder@nxp.com> > > Move the source files out of staging into their final locations: > -include files in drivers/staging/fsl-mc/include go to include/linux/fsl > -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip > -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc > -README.txt, providing and overview of DPAA goes to > Documentation/dpaa2/overview.txt > > Update or delete other remaining staging files-- Makefile, Kconfig, TODO. > Update dpaa2_eth and dpio staging drivers. > > Signed-off-by: Stuart Yoder <stuyoder@gmail.com> > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Marc Zyngier <marc.zyngier@arm.com> This is going to have to wait until I get a chunk of time to do the review. Probably after 4.13-final is out. thanks, greg k-h
Hi, > -----Original Message----- > From: Greg KH [mailto:gregkh@linuxfoundation.org] > Sent: Thursday, August 31, 2017 7:05 PM > > On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: > > From: Stuart Yoder <stuart.yoder@nxp.com> > > > > Move the source files out of staging into their final locations: > > -include files in drivers/staging/fsl-mc/include go to include/linux/fsl > > -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip > > -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc > > -README.txt, providing and overview of DPAA goes to > > Documentation/dpaa2/overview.txt > > > > Update or delete other remaining staging files-- Makefile, Kconfig, TODO. > > Update dpaa2_eth and dpio staging drivers. > > > > Signed-off-by: Stuart Yoder <stuyoder@gmail.com> > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] > > Cc: Thomas Gleixner <tglx@linutronix.de> > > Cc: Jason Cooper <jason@lakedaemon.net> > > Cc: Marc Zyngier <marc.zyngier@arm.com> > > This is going to have to wait until I get a chunk of time to do the review. > Probably after 4.13-final is out. Any updates on this? Any chances to make it in 4.14? Thanks! --- Best Regards, Laurentiu
On Mon, Sep 11, 2017 at 11:55:22AM +0000, Laurentiu Tudor wrote: > Hi, > > > -----Original Message----- > > From: Greg KH [mailto:gregkh@linuxfoundation.org] > > Sent: Thursday, August 31, 2017 7:05 PM > > > > On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: > > > From: Stuart Yoder <stuart.yoder@nxp.com> > > > > > > Move the source files out of staging into their final locations: > > > -include files in drivers/staging/fsl-mc/include go to include/linux/fsl > > > -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip > > > -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc > > > -README.txt, providing and overview of DPAA goes to > > > Documentation/dpaa2/overview.txt > > > > > > Update or delete other remaining staging files-- Makefile, Kconfig, TODO. > > > Update dpaa2_eth and dpio staging drivers. > > > > > > Signed-off-by: Stuart Yoder <stuyoder@gmail.com> > > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > > [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] > > > Cc: Thomas Gleixner <tglx@linutronix.de> > > > Cc: Jason Cooper <jason@lakedaemon.net> > > > Cc: Marc Zyngier <marc.zyngier@arm.com> > > > > This is going to have to wait until I get a chunk of time to do the review. > > Probably after 4.13-final is out. > > Any updates on this? Any chances to make it in 4.14? Thanks! No, it's too late for 4.14, it would have had to be in linux-next before 4.13-final came out. I'm at a conference all this week, if I'm stuck in a boring talk, I'll try to do the review :) thanks, greg k-h
> -----Original Message----- > From: Greg KH [mailto:gregkh@linuxfoundation.org] > Sent: Monday, September 11, 2017 4:03 PM > > On Mon, Sep 11, 2017 at 11:55:22AM +0000, Laurentiu Tudor wrote: > > Hi, > > > > > -----Original Message----- > > > From: Greg KH [mailto:gregkh@linuxfoundation.org] > > > Sent: Thursday, August 31, 2017 7:05 PM > > > > > > On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com > wrote: > > > > From: Stuart Yoder <stuart.yoder@nxp.com> > > > > > > > > Move the source files out of staging into their final locations: > > > > -include files in drivers/staging/fsl-mc/include go to include/linux/fsl > > > > -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip > > > > -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc > > > > -README.txt, providing and overview of DPAA goes to > > > > Documentation/dpaa2/overview.txt > > > > > > > > Update or delete other remaining staging files-- Makefile, Kconfig, TODO. > > > > Update dpaa2_eth and dpio staging drivers. > > > > > > > > Signed-off-by: Stuart Yoder <stuyoder@gmail.com> > > > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > > > [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] > > > > Cc: Thomas Gleixner <tglx@linutronix.de> > > > > Cc: Jason Cooper <jason@lakedaemon.net> > > > > Cc: Marc Zyngier <marc.zyngier@arm.com> > > > > > > This is going to have to wait until I get a chunk of time to do the review. > > > Probably after 4.13-final is out. > > > > Any updates on this? Any chances to make it in 4.14? Thanks! > > No, it's too late for 4.14, it would have had to be in linux-next before 4.13-final > came out. I'm at a conference all this week, Plumbers? :-) > if I'm stuck in a boring talk, I'll try to do the review :) Great. Thanks a lot for taking the time! --- Best Regards, Laurentiu
On Thu, Aug 31, 2017 at 06:04:30PM +0200, Greg KH wrote: > On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: > > From: Stuart Yoder <stuart.yoder@nxp.com> > > > > Move the source files out of staging into their final locations: > > -include files in drivers/staging/fsl-mc/include go to include/linux/fsl > > -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip > > -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc > > -README.txt, providing and overview of DPAA goes to > > Documentation/dpaa2/overview.txt > > > > Update or delete other remaining staging files-- Makefile, Kconfig, TODO. > > Update dpaa2_eth and dpio staging drivers. > > > > Signed-off-by: Stuart Yoder <stuyoder@gmail.com> > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] > > Cc: Thomas Gleixner <tglx@linutronix.de> > > Cc: Jason Cooper <jason@lakedaemon.net> > > Cc: Marc Zyngier <marc.zyngier@arm.com> > > This is going to have to wait until I get a chunk of time to do the > review. Probably after 4.13-final is out. Ok, review comments as I go through the code: mc-sys.c 323 EXPORT_SYMBOL(mc_send_command); should be EXPORT_SYMBOL_GPL(fsl_mc_send_command); to match up with your other exports and global namespace, right? You export a lot of dpcon_* symbols that no one uses, please do not do that. Verify that all of them are actually used right now, if not, remove them. If you think you are going to use them in the future, wonderful, add them in then. Same for your dpaa2_* exported symbols, most are not used from what I can see. struct dpaa2_io { atomic_t refs; That's a kref, please use it instead of trying to roll your own. And even for this, your locking is not correct (i.e. you do not have any), that needs to be fixed so that teardown works correctly. You have a lot of WARN_ON() calls, that's going to be ignored and should all not be needed now that the code is debugged and working properly. Please remove them, or turn them into dev_err() calls with a real if () check instead. You are checking "strings" for the type of device in a lot of places, like this: if (strcmp(obj_desc->type, "dprc") == 0) { why are you not just using the built-in driver model .type field and comparing that to the different type structures? It's much easier, and you don't have to again, "roll your own". See the USB or Greybus code for examples of busses that have different "types" of devices on them at the same time. Ok, that's enough for now, please work on this, and we can go from there... thanks, greg k-h
Hi Greg, On 11/03/2017 05:17 PM, Greg KH wrote: > On Thu, Aug 31, 2017 at 06:04:30PM +0200, Greg KH wrote: >> On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: >>> From: Stuart Yoder <stuart.yoder@nxp.com> >>> >>> Move the source files out of staging into their final locations: >>> -include files in drivers/staging/fsl-mc/include go to include/linux/fsl >>> -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip >>> -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc >>> -README.txt, providing and overview of DPAA goes to >>> Documentation/dpaa2/overview.txt >>> >>> Update or delete other remaining staging files-- Makefile, Kconfig, TODO. >>> Update dpaa2_eth and dpio staging drivers. >>> >>> Signed-off-by: Stuart Yoder <stuyoder@gmail.com> >>> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> >>> [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] >>> Cc: Thomas Gleixner <tglx@linutronix.de> >>> Cc: Jason Cooper <jason@lakedaemon.net> >>> Cc: Marc Zyngier <marc.zyngier@arm.com> >> >> This is going to have to wait until I get a chunk of time to do the >> review. Probably after 4.13-final is out. > > Ok, review comments as I go through the code: Thanks a lot for taking the time. I'll take care of the comments next week. --- Best Regards, Laurentiu
On 11/03/2017 05:17 PM, Greg KH wrote: > On Thu, Aug 31, 2017 at 06:04:30PM +0200, Greg KH wrote: >> On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: >>> From: Stuart Yoder <stuart.yoder@nxp.com> >>> >>> Move the source files out of staging into their final locations: >>> -include files in drivers/staging/fsl-mc/include go to include/linux/fsl >>> -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip >>> -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc >>> -README.txt, providing and overview of DPAA goes to >>> Documentation/dpaa2/overview.txt >>> >>> Update or delete other remaining staging files-- Makefile, Kconfig, TODO. >>> Update dpaa2_eth and dpio staging drivers. >>> >>> Signed-off-by: Stuart Yoder <stuyoder@gmail.com> >>> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> >>> [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] >>> Cc: Thomas Gleixner <tglx@linutronix.de> >>> Cc: Jason Cooper <jason@lakedaemon.net> >>> Cc: Marc Zyngier <marc.zyngier@arm.com> >> >> This is going to have to wait until I get a chunk of time to do the >> review. Probably after 4.13-final is out. > > Ok, review comments as I go through the code: > mc-sys.c 323 EXPORT_SYMBOL(mc_send_command); > > should be EXPORT_SYMBOL_GPL(fsl_mc_send_command); to match up with your > other exports and global namespace, right? Right. There's an inconsistent mixture of EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() usage. I'll change them all to EXPORT_SYMBOL_GPL(). > You export a lot of dpcon_* symbols that no one uses, please do not do > that. Verify that all of them are actually used right now, if not, > remove them. If you think you are going to use them in the future, > wonderful, add them in then. Actually, most of the dpcon_* APIs are used in the ethernet driver here: drivers/staging/fsl-dpaa2/ethernet. I think i saw only a couple of functions that are not used so I'll drop those. > Same for your dpaa2_* exported symbols, most are not used from what I > can see. I'll check these too and drop the unused ones. > struct dpaa2_io { > atomic_t refs; > > That's a kref, please use it instead of trying to roll your own. > > And even for this, your locking is not correct (i.e. you do not have > any), that needs to be fixed so that teardown works correctly. I think we can drop this refcount altogether as it's not used. Roy, any comment on this? > You have a lot of WARN_ON() calls, that's going to be ignored and should > all not be needed now that the code is debugged and working properly. > Please remove them, or turn them into dev_err() calls with a real if () > check instead. Right, there are quite of few (100+) WARN_ON()s. I'll go through them and clean them up ... most of them seem paranoid checks anyway. > You are checking "strings" for the type of device in a lot of places, > like this: > if (strcmp(obj_desc->type, "dprc") == 0) { > why are you not just using the built-in driver model .type field and > comparing that to the different type structures? It's much easier, and > you don't have to again, "roll your own". See the USB or Greybus code > for examples of busses that have different "types" of devices on them at > the same time. > I had a quick look over greybus and noticed the device types declared in drivers/staging/greybus/greybus.h plus some helper macros to check the device type. I'll give this a go, though i might return with some questions (e.g. I don't yet understand what device_type::release op is used for). --- Thanks & Best Regards, Laurentiu
>> struct dpaa2_io { >> atomic_t refs; >> >> That's a kref, please use it instead of trying to roll your own. >> >> And even for this, your locking is not correct (i.e. you do not have >> any), that needs to be fixed so that teardown works correctly. > > I think we can drop this refcount altogether as it's not used. Roy, any > comment on this? > Yes I think this refcount can be removed. I'll make a note for when the DPIO is moving out of staging but that isn't part of this patchset. There are other cleanups needed in DPIO as well. I've been holding off on pushing patches for that until the bus driver gets moved to try to avoid complex patch dependencies and merge conflict confusion.
On 11/03/2017 05:17 PM, Greg KH wrote: > On Thu, Aug 31, 2017 at 06:04:30PM +0200, Greg KH wrote: >> On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: >>> From: Stuart Yoder <stuart.yoder@nxp.com> >>> >>> Move the source files out of staging into their final locations: >>> -include files in drivers/staging/fsl-mc/include go to include/linux/fsl >>> -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip >>> -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc >>> -README.txt, providing and overview of DPAA goes to >>> Documentation/dpaa2/overview.txt >>> >>> Update or delete other remaining staging files-- Makefile, Kconfig, TODO. >>> Update dpaa2_eth and dpio staging drivers. >>> >>> Signed-off-by: Stuart Yoder <stuyoder@gmail.com> >>> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> >>> [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] >>> Cc: Thomas Gleixner <tglx@linutronix.de> >>> Cc: Jason Cooper <jason@lakedaemon.net> >>> Cc: Marc Zyngier <marc.zyngier@arm.com> >> >> This is going to have to wait until I get a chunk of time to do the >> review. Probably after 4.13-final is out. > > Ok, review comments as I go through the code: > mc-sys.c 323 EXPORT_SYMBOL(mc_send_command); > > should be EXPORT_SYMBOL_GPL(fsl_mc_send_command); to match up with your > other exports and global namespace, right? > > You export a lot of dpcon_* symbols that no one uses, please do not do > that. Verify that all of them are actually used right now, if not, > remove them. If you think you are going to use them in the future, > wonderful, add them in then. > > Same for your dpaa2_* exported symbols, most are not used from what I > can see. > > struct dpaa2_io { > atomic_t refs; > > That's a kref, please use it instead of trying to roll your own. > > And even for this, your locking is not correct (i.e. you do not have > any), that needs to be fixed so that teardown works correctly. > > You have a lot of WARN_ON() calls, that's going to be ignored and should > all not be needed now that the code is debugged and working properly. > Please remove them, or turn them into dev_err() calls with a real if () > check instead. > > You are checking "strings" for the type of device in a lot of places, > like this: > if (strcmp(obj_desc->type, "dprc") == 0) { > why are you not just using the built-in driver model .type field and > comparing that to the different type structures? It's much easier, and > you don't have to again, "roll your own". See the USB or Greybus code > for examples of busses that have different "types" of devices on them at > the same time. > > Ok, that's enough for now, please work on this, and we can go from > there... > What would the next steps be, now that the patches are in staging-next? Are there plans for a new round of review? --- Thanks & Best Regards, Laurentiu
On Mon, Nov 27, 2017 at 03:32:28PM +0000, Laurentiu Tudor wrote: > > > On 11/03/2017 05:17 PM, Greg KH wrote: > > On Thu, Aug 31, 2017 at 06:04:30PM +0200, Greg KH wrote: > >> On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: > >>> From: Stuart Yoder <stuart.yoder@nxp.com> > >>> > >>> Move the source files out of staging into their final locations: > >>> -include files in drivers/staging/fsl-mc/include go to include/linux/fsl > >>> -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip > >>> -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc > >>> -README.txt, providing and overview of DPAA goes to > >>> Documentation/dpaa2/overview.txt > >>> > >>> Update or delete other remaining staging files-- Makefile, Kconfig, TODO. > >>> Update dpaa2_eth and dpio staging drivers. > >>> > >>> Signed-off-by: Stuart Yoder <stuyoder@gmail.com> > >>> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > >>> [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] > >>> Cc: Thomas Gleixner <tglx@linutronix.de> > >>> Cc: Jason Cooper <jason@lakedaemon.net> > >>> Cc: Marc Zyngier <marc.zyngier@arm.com> > >> > >> This is going to have to wait until I get a chunk of time to do the > >> review. Probably after 4.13-final is out. > > > > Ok, review comments as I go through the code: > > mc-sys.c 323 EXPORT_SYMBOL(mc_send_command); > > > > should be EXPORT_SYMBOL_GPL(fsl_mc_send_command); to match up with your > > other exports and global namespace, right? > > > > You export a lot of dpcon_* symbols that no one uses, please do not do > > that. Verify that all of them are actually used right now, if not, > > remove them. If you think you are going to use them in the future, > > wonderful, add them in then. > > > > Same for your dpaa2_* exported symbols, most are not used from what I > > can see. > > > > struct dpaa2_io { > > atomic_t refs; > > > > That's a kref, please use it instead of trying to roll your own. > > > > And even for this, your locking is not correct (i.e. you do not have > > any), that needs to be fixed so that teardown works correctly. > > > > You have a lot of WARN_ON() calls, that's going to be ignored and should > > all not be needed now that the code is debugged and working properly. > > Please remove them, or turn them into dev_err() calls with a real if () > > check instead. > > > > You are checking "strings" for the type of device in a lot of places, > > like this: > > if (strcmp(obj_desc->type, "dprc") == 0) { > > why are you not just using the built-in driver model .type field and > > comparing that to the different type structures? It's much easier, and > > you don't have to again, "roll your own". See the USB or Greybus code > > for examples of busses that have different "types" of devices on them at > > the same time. > > > > Ok, that's enough for now, please work on this, and we can go from > > there... > > > > What would the next steps be, now that the patches are in staging-next? > Are there plans for a new round of review? Send a patch that moves the files you think should be moved at this point in time, as I'm not quite sure which ones exactly you feel are ready to go. thanks, greg k-h
On 11/28/2017 02:59 PM, Greg KH wrote: > On Mon, Nov 27, 2017 at 03:32:28PM +0000, Laurentiu Tudor wrote: >> >> >> On 11/03/2017 05:17 PM, Greg KH wrote: >>> On Thu, Aug 31, 2017 at 06:04:30PM +0200, Greg KH wrote: >>>> On Mon, Aug 28, 2017 at 01:54:05PM +0300, laurentiu.tudor@nxp.com wrote: >>>>> From: Stuart Yoder <stuart.yoder@nxp.com> >>>>> >>>>> Move the source files out of staging into their final locations: >>>>> -include files in drivers/staging/fsl-mc/include go to include/linux/fsl >>>>> -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip >>>>> -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc >>>>> -README.txt, providing and overview of DPAA goes to >>>>> Documentation/dpaa2/overview.txt >>>>> >>>>> Update or delete other remaining staging files-- Makefile, Kconfig, TODO. >>>>> Update dpaa2_eth and dpio staging drivers. >>>>> >>>>> Signed-off-by: Stuart Yoder <stuyoder@gmail.com> >>>>> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> >>>>> [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] >>>>> Cc: Thomas Gleixner <tglx@linutronix.de> >>>>> Cc: Jason Cooper <jason@lakedaemon.net> >>>>> Cc: Marc Zyngier <marc.zyngier@arm.com> >>>> >>>> This is going to have to wait until I get a chunk of time to do the >>>> review. Probably after 4.13-final is out. >>> >>> Ok, review comments as I go through the code: >>> mc-sys.c 323 EXPORT_SYMBOL(mc_send_command); >>> >>> should be EXPORT_SYMBOL_GPL(fsl_mc_send_command); to match up with your >>> other exports and global namespace, right? >>> >>> You export a lot of dpcon_* symbols that no one uses, please do not do >>> that. Verify that all of them are actually used right now, if not, >>> remove them. If you think you are going to use them in the future, >>> wonderful, add them in then. >>> >>> Same for your dpaa2_* exported symbols, most are not used from what I >>> can see. >>> >>> struct dpaa2_io { >>> atomic_t refs; >>> >>> That's a kref, please use it instead of trying to roll your own. >>> >>> And even for this, your locking is not correct (i.e. you do not have >>> any), that needs to be fixed so that teardown works correctly. >>> >>> You have a lot of WARN_ON() calls, that's going to be ignored and should >>> all not be needed now that the code is debugged and working properly. >>> Please remove them, or turn them into dev_err() calls with a real if () >>> check instead. >>> >>> You are checking "strings" for the type of device in a lot of places, >>> like this: >>> if (strcmp(obj_desc->type, "dprc") == 0) { >>> why are you not just using the built-in driver model .type field and >>> comparing that to the different type structures? It's much easier, and >>> you don't have to again, "roll your own". See the USB or Greybus code >>> for examples of busses that have different "types" of devices on them at >>> the same time. >>> >>> Ok, that's enough for now, please work on this, and we can go from >>> there... >>> >> >> What would the next steps be, now that the patches are in staging-next? >> Are there plans for a new round of review? > > Send a patch that moves the files you think should be moved at this > point in time, as I'm not quite sure which ones exactly you feel are > ready to go. The initial plan was to strictly move the things needed by this bus driver, thus leaving some source files at a later time. To the point, these files: "drivers/staging/fsl-mc/bus/dpbp*.*" "drivers/staging/fsl-mc/bus/dpcon*.*" and this whole dir: "drivers/staging/fsl-mc/bus/dpio/*". I'll prepare the patch so that it's more visible what files are to be moved. --- Thanks & Best Regards, Laurentiu
diff --git a/drivers/staging/fsl-mc/README.txt b/Documentation/dpaa2/overview.txt similarity index 100% rename from drivers/staging/fsl-mc/README.txt rename to Documentation/dpaa2/overview.txt diff --git a/MAINTAINERS b/MAINTAINERS index 6f7721d..2149eeb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10900,7 +10900,7 @@ M: Stuart Yoder <stuyoder@gmail.com> M: Laurentiu Tudor <laurentiu.tudor@nxp.com> L: linux-kernel@vger.kernel.org S: Maintained -F: drivers/staging/fsl-mc/ +F: drivers/bus/fsl-mc/ F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt QT1010 MEDIA DRIVER diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 2408ea3..23e0279 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -183,4 +183,6 @@ config DA8XX_MSTPRI configuration. Allows to adjust the priorities of all master peripherals. +source "drivers/bus/fsl-mc/Kconfig" + endmenu diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index cc6364b..dee9a84 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -14,6 +14,9 @@ obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o # Interconnect bus driver for OMAP SoCs. obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o +# DPAA2 fsl-mc bus +obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/ + obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o obj-$(CONFIG_QCOM_EBI2) += qcom-ebi2.o obj-$(CONFIG_SUNXI_RSB) += sunxi-rsb.o diff --git a/drivers/bus/fsl-mc/Kconfig b/drivers/bus/fsl-mc/Kconfig new file mode 100644 index 0000000..30b55ac --- /dev/null +++ b/drivers/bus/fsl-mc/Kconfig @@ -0,0 +1,17 @@ +# +# DPAA2 fsl-mc bus +# +# Copyright (C) 2014-2016 Freescale Semiconductor, Inc. +# +# This file is released under the GPLv2 +# + +config FSL_MC_BUS + bool "QorIQ DPAA2 fsl-mc bus driver" + depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC))) + select GENERIC_MSI_IRQ_DOMAIN + help + Driver to enable the bus infrastructure for the QorIQ DPAA2 + architecture. The fsl-mc bus driver handles discovery of + DPAA2 objects (which are represented as Linux devices) and + binding objects to drivers. diff --git a/drivers/bus/fsl-mc/Makefile b/drivers/bus/fsl-mc/Makefile new file mode 100644 index 0000000..1fe40282 --- /dev/null +++ b/drivers/bus/fsl-mc/Makefile @@ -0,0 +1,17 @@ +# +# Freescale Management Complex (MC) bus drivers +# +# Copyright (C) 2014 Freescale Semiconductor, Inc. +# +# This file is released under the GPLv2 +# +obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o + +mc-bus-driver-objs := fsl-mc-bus.o \ + mc-sys.o \ + mc-io.o \ + dprc.o \ + dprc-driver.o \ + fsl-mc-allocator.o \ + fsl-mc-msi.o \ + dpmcp.o diff --git a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h b/drivers/bus/fsl-mc/dpmcp-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpmcp-cmd.h rename to drivers/bus/fsl-mc/dpmcp-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dpmcp.c rename to drivers/bus/fsl-mc/dpmcp.c index eea42f6..e56505f 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.c +++ b/drivers/bus/fsl-mc/dpmcp.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <linux/kernel.h> -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include "dpmcp.h" #include "dpmcp-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/bus/fsl-mc/dpmcp.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpmcp.h rename to drivers/bus/fsl-mc/dpmcp.h diff --git a/drivers/staging/fsl-mc/bus/dpmng-cmd.h b/drivers/bus/fsl-mc/dpmng-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpmng-cmd.h rename to drivers/bus/fsl-mc/dpmng-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/bus/fsl-mc/dprc-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dprc-cmd.h rename to drivers/bus/fsl-mc/dprc-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dprc-driver.c rename to drivers/bus/fsl-mc/dprc-driver.c index 06df528..42a1f6a 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/bus/fsl-mc/dprc-driver.c @@ -13,7 +13,6 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/msi.h> -#include "../include/mc.h" #include "dprc-cmd.h" #include "fsl-mc-private.h" diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/bus/fsl-mc/dprc.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dprc.c rename to drivers/bus/fsl-mc/dprc.c index 6f6c65a..f8d579e 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/bus/fsl-mc/dprc.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <linux/kernel.h> -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include "dprc.h" #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dprc.h b/drivers/bus/fsl-mc/dprc.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dprc.h rename to drivers/bus/fsl-mc/dprc.h diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-allocator.c rename to drivers/bus/fsl-mc/fsl-mc-allocator.c index b37a6f4..4ff5c7b 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c @@ -10,7 +10,6 @@ #include <linux/module.h> #include <linux/msi.h> -#include "../include/mc.h" #include "fsl-mc-private.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c similarity index 100% rename from drivers/staging/fsl-mc/bus/fsl-mc-bus.c rename to drivers/bus/fsl-mc/fsl-mc-bus.c diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c similarity index 100% rename from drivers/staging/fsl-mc/bus/fsl-mc-msi.c rename to drivers/bus/fsl-mc/fsl-mc-msi.c diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-private.h rename to drivers/bus/fsl-mc/fsl-mc-private.h index 62d3989..d8b8281 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/bus/fsl-mc/fsl-mc-private.h @@ -10,7 +10,7 @@ #ifndef _FSL_MC_PRIVATE_H_ #define _FSL_MC_PRIVATE_H_ -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include "dprc.h" #include <linux/mutex.h> diff --git a/drivers/staging/fsl-mc/bus/mc-io.c b/drivers/bus/fsl-mc/mc-io.c similarity index 99% rename from drivers/staging/fsl-mc/bus/mc-io.c rename to drivers/bus/fsl-mc/mc-io.c index f65c23c..1e17ce6 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -31,7 +31,6 @@ */ #include <linux/io.h> -#include "../include/mc.h" #include "fsl-mc-private.h" #include "dpmcp.h" diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/bus/fsl-mc/mc-sys.c similarity index 99% rename from drivers/staging/fsl-mc/bus/mc-sys.c rename to drivers/bus/fsl-mc/mc-sys.c index 7ce105b..def3d3c 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/bus/fsl-mc/mc-sys.c @@ -38,7 +38,7 @@ #include <linux/device.h> #include <linux/io.h> #include <linux/io-64-nonatomic-hi-lo.h> -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include "dpmcp.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index e88d856..1a5b354 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o +obj-$(CONFIG_FSL_MC_BUS) += irq-gic-v3-its-fsl-mc-msi.o obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o obj-$(CONFIG_HISILICON_IRQ_MBIGEN) += irq-mbigen.o obj-$(CONFIG_ARM_NVIC) += irq-nvic.o diff --git a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c b/drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c similarity index 99% rename from drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c rename to drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c index 123e4af..57c6b2a 100644 --- a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c @@ -15,7 +15,7 @@ #include <linux/msi.h> #include <linux/of.h> #include <linux/of_irq.h> -#include "fsl-mc-private.h" +#include <linux/fsl/mc.h> static struct irq_chip its_msi_irq_chip = { .name = "ITS-fMSI", diff --git a/drivers/staging/fsl-dpaa2/ethernet/README b/drivers/staging/fsl-dpaa2/ethernet/README index 410952e..1e825df 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/README +++ b/drivers/staging/fsl-dpaa2/ethernet/README @@ -36,7 +36,7 @@ are treated as internal resources of other objects. For a more detailed description of the DPAA2 architecture and its object abstractions see: - drivers/staging/fsl-mc/README.txt + Documentation/dpaa2/overview.txt Each Linux net device is built on top of a Datapath Network Interface (DPNI) object and uses Buffer Pools (DPBPs), I/O Portals (DPIOs) and Concentrators diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 26017fe..3f50e1a 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -39,7 +39,7 @@ #include <linux/kthread.h> #include <linux/iommu.h> -#include "../../fsl-mc/include/mc.h" +#include <linux/fsl/mc.h> #include "dpaa2-eth.h" /* CREATE_TRACE_POINTS only needs to be defined once. Other dpa files diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c index 04a5b14..67f0623 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpni.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.c @@ -32,7 +32,7 @@ */ #include <linux/kernel.h> #include <linux/errno.h> -#include "../../fsl-mc/include/mc.h" +#include <linux/fsl/mc.h> #include "dpni.h" #include "dpni-cmd.h" diff --git a/drivers/staging/fsl-mc/TODO b/drivers/staging/fsl-mc/TODO deleted file mode 100644 index 54a8bc6..0000000 --- a/drivers/staging/fsl-mc/TODO +++ /dev/null @@ -1,18 +0,0 @@ -* Add at least one device driver for a DPAA2 object (child device of the - fsl-mc bus). Most likely candidate for this is adding DPAA2 Ethernet - driver support, which depends on drivers for several objects: DPNI, - DPIO, DPMAC. Other pre-requisites include: - - * MC firmware uprev. The MC firmware upon which the fsl-mc - bus driver and DPAA2 object drivers are based is continuing - to evolve, so minor updates are needed to keep in sync with binary - interface changes to the MC. - -* Cleanup - -Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org>, -german.rivera@freescale.com, devel@driverdev.osuosl.org, -linux-kernel@vger.kernel.org - -[1] https://lkml.org/lkml/2015/7/9/93 -[2] https://lkml.org/lkml/2015/7/7/712 diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig index 504c987..9700f2c 100644 --- a/drivers/staging/fsl-mc/bus/Kconfig +++ b/drivers/staging/fsl-mc/bus/Kconfig @@ -6,16 +6,6 @@ # This file is released under the GPLv2 # -config FSL_MC_BUS - bool "QorIQ DPAA2 fsl-mc bus driver" - depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC))) - select GENERIC_MSI_IRQ_DOMAIN - help - Driver to enable the bus infrastructure for the QorIQ DPAA2 - architecture. The fsl-mc bus driver handles discovery of - DPAA2 objects (which are represented as Linux devices) and - binding objects to drivers. - config FSL_MC_DPIO tristate "QorIQ DPAA2 DPIO driver" depends on FSL_MC_BUS && ARCH_LAYERSCAPE diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 6df407e..b8f4c4d 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -5,19 +5,8 @@ # # This file is released under the GPLv2 # -obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o - -mc-bus-driver-objs := fsl-mc-bus.o \ - mc-sys.o \ - mc-io.o \ - dprc.o \ - dprc-driver.o \ - fsl-mc-allocator.o \ - fsl-mc-msi.o \ - irq-gic-v3-its-fsl-mc-msi.o \ - dpmcp.o \ - dpbp.o \ - dpcon.o +obj-$(CONFIG_FSL_MC_BUS) += dpbp.o \ + dpcon.o # MC DPIO driver obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/staging/fsl-mc/bus/dpbp.c index 363730a..9f9ff82 100644 --- a/drivers/staging/fsl-mc/bus/dpbp.c +++ b/drivers/staging/fsl-mc/bus/dpbp.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <linux/kernel.h> -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include "../include/dpbp.h" #include "dpbp-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dpcon.c b/drivers/staging/fsl-mc/bus/dpcon.c index ca1da85..aa9ab7b 100644 --- a/drivers/staging/fsl-mc/bus/dpcon.c +++ b/drivers/staging/fsl-mc/bus/dpcon.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <linux/kernel.h> -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include "../include/dpcon.h" #include "dpcon-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c b/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c index e36da20..6170547 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c @@ -38,8 +38,8 @@ #include <linux/msi.h> #include <linux/dma-mapping.h> #include <linux/delay.h> +#include <linux/fsl/mc.h> -#include "../../include/mc.h" #include "../../include/dpaa2-io.h" #include "qbman-portal.h" diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c index f809682..706eeb5 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <linux/types.h> -#include "../../include/mc.h" +#include <linux/fsl/mc.h> #include "../../include/dpaa2-io.h" #include <linux/init.h> #include <linux/module.h> diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.c b/drivers/staging/fsl-mc/bus/dpio/dpio.c index 00eb221..7db0a04 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <linux/kernel.h> -#include "../../include/mc.h" +#include <linux/fsl/mc.h> #include "dpio.h" #include "dpio-cmd.h" diff --git a/drivers/staging/fsl-mc/include/mc.h b/include/linux/fsl/mc.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc.h rename to include/linux/fsl/mc.h