* [PATCH 0/5][v5] staging: fsl-mc: move bus driver out of staging
@ 2017-05-22 12:09 ` laurentiu.tudor
0 siblings, 0 replies; 20+ messages in thread
From: laurentiu.tudor at nxp.com @ 2017-05-22 12:09 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Now that there is a functional ethernet driver probed on the
mc bus this patch series requests that the fsl-mc bus driver
be moved out of staging.
The proposed destination for the bus driver is drivers/bus.
Proposed location for global header files for fsl-mc and dpaa2
is the already existing include/linux/fsl.
First couple of patches fix several checkpatch.pl and README issues
and the last patch moves the bus out of staging, updating all
the users (e.g. #include paths).
Based on:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git, staging-next
Link to previous version:
https://lkml.org/lkml/2017/5/19/417
Link to last round of driver model fixes & cleanups:
https://lkml.org/lkml/2017/2/1/235
version 5 changes
- drop restool utility reference from README (Marc Zyngier)
- add binding path in README (Marc Zyngier)
version 4 changes
- rebased on latest staging-next
- dpio was submitted separately so dropped from the series
- several checkpatch.pl --strict fixes (first 2 patches)
- update existing dpaa2 drivers to match the new fsl-mc bus location
version 3 changes
-zero memory allocated for a dpio store
-replace hardcoded dequeue token with a #define and look for
that token when checking for a new result
version 2 changes (mostly feedback from Ioana Radulescu)
-removed unused structs and defines in dpio command definitions
-added setter/getter for the FD ctrl field
-corrected comment for SG format_offset field description
-added support for short length field in FD
-fix bug in buffer release command, by setting bpid field
-handle error (NULL) return value from qbman_swp_mc_complete()
-fix bug in sending management commands where the verb was
properly initialized
-use service_select_by_cpu() for re-arming DPIO interrupts
-replace use of NR_CPUS with num_possible_cpus()
-handle error case where number of DPIOs exceeds number of possible
CPUs
-error message cleanup
-updated MAINTAINERS file with proper location for both fsl-mc bus
driver and dpio driver
Laurentiu Tudor (4):
staging: fsl-mc: fix several checkpath.pl warnings
staging: fsl-mc: add binding path to MAINTAINERS
staging: fsl-mc: drop reference to restool
staging: fsl-mc: add reference to mc-bus DT binding
Stuart Yoder (1):
staging: fsl-mc: move bus driver out of staging
.../README.txt => Documentation/dpaa2/overview.txt | 6 +++---
MAINTAINERS | 3 ++-
drivers/bus/Kconfig | 2 ++
drivers/bus/Makefile | 3 +++
drivers/bus/fsl-mc/Kconfig | 17 +++++++++++++++++
drivers/bus/fsl-mc/Makefile | 19 +++++++++++++++++++
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h | 2 +-
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c | 6 +++---
.../{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h | 2 +-
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 4 ++--
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h | 0
.../{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h | 2 +-
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c | 6 +++---
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h | 2 +-
.../{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 14 +++++++++-----
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 6 +++---
.../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 17 ++++++++++-------
.../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 18 ++++++------------
.../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 4 +++-
.../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 3 +--
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 5 +++--
drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 6 +++---
drivers/irqchip/Makefile | 1 +
.../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 3 +--
drivers/staging/fsl-dpaa2/ethernet/README | 2 +-
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++--
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 2 +-
drivers/staging/fsl-dpaa2/ethernet/dpni.c | 4 ++--
drivers/staging/fsl-mc/TODO | 18 ------------------
drivers/staging/fsl-mc/bus/Kconfig | 10 ----------
drivers/staging/fsl-mc/bus/Makefile | 15 +--------------
drivers/staging/fsl-mc/bus/dpcon.c | 8 ++++----
drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 2 +-
drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 2 +-
drivers/staging/fsl-mc/bus/dpio/dpio.c | 4 ++--
.../fsl-mc/include => include/linux/fsl}/dpbp.h | 0
.../fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h | 0
.../fsl-mc/include => include/linux/fsl}/dpmng.h | 0
.../fsl-mc/include => include/linux/fsl}/dprc.h | 4 ----
.../fsl-mc/include => include/linux/fsl}/mc-bus.h | 2 +-
.../fsl-mc/include => include/linux/fsl}/mc-cmd.h | 0
.../fsl-mc/include => include/linux/fsl}/mc-sys.h | 1 -
.../staging/fsl-mc/include => include/linux/fsl}/mc.h | 2 +-
43 files changed, 115 insertions(+), 116 deletions(-)
rename drivers/staging/fsl-mc/README.txt => Documentation/dpaa2/overview.txt (99%)
create mode 100644 drivers/bus/fsl-mc/Kconfig
create mode 100644 drivers/bus/fsl-mc/Makefile
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h (97%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c (98%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h (96%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (98%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h (100%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h (96%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c (96%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h (99%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (98%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (99%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c (98%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c (98%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (99%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (96%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c (99%)
rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c (99%)
rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (98%)
delete mode 100644 drivers/staging/fsl-mc/TODO
rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpbp.h (100%)
rename {drivers/staging/fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h (100%)
rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpmng.h (100%)
rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dprc.h (99%)
rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-bus.h (99%)
rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-cmd.h (100%)
rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-sys.h (99%)
rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (99%)
--
2.9.4
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 0/5][v5] staging: fsl-mc: move bus driver out of staging @ 2017-05-22 12:09 ` laurentiu.tudor 0 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor @ 2017-05-22 12:09 UTC (permalink / raw) To: gregkh, stuyoder Cc: devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel, Laurentiu Tudor From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Now that there is a functional ethernet driver probed on the mc bus this patch series requests that the fsl-mc bus driver be moved out of staging. The proposed destination for the bus driver is drivers/bus. Proposed location for global header files for fsl-mc and dpaa2 is the already existing include/linux/fsl. First couple of patches fix several checkpatch.pl and README issues and the last patch moves the bus out of staging, updating all the users (e.g. #include paths). Based on: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git, staging-next Link to previous version: https://lkml.org/lkml/2017/5/19/417 Link to last round of driver model fixes & cleanups: https://lkml.org/lkml/2017/2/1/235 version 5 changes - drop restool utility reference from README (Marc Zyngier) - add binding path in README (Marc Zyngier) version 4 changes - rebased on latest staging-next - dpio was submitted separately so dropped from the series - several checkpatch.pl --strict fixes (first 2 patches) - update existing dpaa2 drivers to match the new fsl-mc bus location version 3 changes -zero memory allocated for a dpio store -replace hardcoded dequeue token with a #define and look for that token when checking for a new result version 2 changes (mostly feedback from Ioana Radulescu) -removed unused structs and defines in dpio command definitions -added setter/getter for the FD ctrl field -corrected comment for SG format_offset field description -added support for short length field in FD -fix bug in buffer release command, by setting bpid field -handle error (NULL) return value from qbman_swp_mc_complete() -fix bug in sending management commands where the verb was properly initialized -use service_select_by_cpu() for re-arming DPIO interrupts -replace use of NR_CPUS with num_possible_cpus() -handle error case where number of DPIOs exceeds number of possible CPUs -error message cleanup -updated MAINTAINERS file with proper location for both fsl-mc bus driver and dpio driver Laurentiu Tudor (4): staging: fsl-mc: fix several checkpath.pl warnings staging: fsl-mc: add binding path to MAINTAINERS staging: fsl-mc: drop reference to restool staging: fsl-mc: add reference to mc-bus DT binding Stuart Yoder (1): staging: fsl-mc: move bus driver out of staging .../README.txt => Documentation/dpaa2/overview.txt | 6 +++--- MAINTAINERS | 3 ++- drivers/bus/Kconfig | 2 ++ drivers/bus/Makefile | 3 +++ drivers/bus/fsl-mc/Kconfig | 17 +++++++++++++++++ drivers/bus/fsl-mc/Makefile | 19 +++++++++++++++++++ drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 4 ++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c | 6 +++--- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h | 2 +- .../{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 14 +++++++++----- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 6 +++--- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 17 ++++++++++------- .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 18 ++++++------------ .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 4 +++- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 3 +-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 5 +++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 6 +++--- drivers/irqchip/Makefile | 1 + .../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 3 +-- drivers/staging/fsl-dpaa2/ethernet/README | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++-- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpni.c | 4 ++-- drivers/staging/fsl-mc/TODO | 18 ------------------ drivers/staging/fsl-mc/bus/Kconfig | 10 ---------- drivers/staging/fsl-mc/bus/Makefile | 15 +-------------- drivers/staging/fsl-mc/bus/dpcon.c | 8 ++++---- drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio.c | 4 ++-- .../fsl-mc/include => include/linux/fsl}/dpbp.h | 0 .../fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/dpmng.h | 0 .../fsl-mc/include => include/linux/fsl}/dprc.h | 4 ---- .../fsl-mc/include => include/linux/fsl}/mc-bus.h | 2 +- .../fsl-mc/include => include/linux/fsl}/mc-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/mc-sys.h | 1 - .../staging/fsl-mc/include => include/linux/fsl}/mc.h | 2 +- 43 files changed, 115 insertions(+), 116 deletions(-) rename drivers/staging/fsl-mc/README.txt => Documentation/dpaa2/overview.txt (99%) create mode 100644 drivers/bus/fsl-mc/Kconfig create mode 100644 drivers/bus/fsl-mc/Makefile rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h (97%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h (96%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h (96%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c (96%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (96%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c (99%) rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (98%) delete mode 100644 drivers/staging/fsl-mc/TODO rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpbp.h (100%) rename {drivers/staging/fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpmng.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dprc.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-bus.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-sys.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (99%) -- 2.9.4 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-22 12:09 ` laurentiu.tudor -1 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor at nxp.com @ 2017-05-22 12:09 UTC (permalink / raw) To: linux-arm-kernel From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Remove several unneeded #includes, forward declarations and fix several issues reported by checkpatch.pl --strict, such as: - kfree(NULL) is safe and check is not required - macro argument reuse may cause possible side effects - enclose macro params in parens to avoid precedence issues - coding style Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- Notes: -v2 -no changes drivers/staging/fsl-mc/bus/dpbp-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dpmng-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dprc-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dprc-driver.c | 10 +++++++--- drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 11 +++++++---- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 12 +++--------- drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 1 + drivers/staging/fsl-mc/bus/fsl-mc-private.h | 1 - drivers/staging/fsl-mc/include/dprc.h | 3 --- drivers/staging/fsl-mc/include/mc-sys.h | 1 - 11 files changed, 22 insertions(+), 25 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/staging/fsl-mc/bus/dpbp-cmd.h index 8aa6545..5904836 100644 --- a/drivers/staging/fsl-mc/bus/dpbp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpbp-cmd.h @@ -40,7 +40,7 @@ #define DPBP_CMD_BASE_VERSION 1 #define DPBP_CMD_ID_OFFSET 4 -#define DPBP_CMD(id) ((id << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION) +#define DPBP_CMD(id) (((id) << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION) /* Command IDs */ #define DPBP_CMDID_CLOSE DPBP_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h index 384a13d..861b2a7 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h @@ -40,7 +40,7 @@ #define DPMCP_CMD_BASE_VERSION 1 #define DPMCP_CMD_ID_OFFSET 4 -#define DPMCP_CMD(id) ((id << DPMCP_CMD_ID_OFFSET) | DPMCP_CMD_BASE_VERSION) +#define DPMCP_CMD(id) (((id) << DPMCP_CMD_ID_OFFSET) | DPMCP_CMD_BASE_VERSION) /* Command IDs */ #define DPMCP_CMDID_CLOSE DPMCP_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dpmng-cmd.h b/drivers/staging/fsl-mc/bus/dpmng-cmd.h index cdddfb8..d1f04ac 100644 --- a/drivers/staging/fsl-mc/bus/dpmng-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmng-cmd.h @@ -44,7 +44,7 @@ #define DPMNG_CMD_BASE_VERSION 1 #define DPMNG_CMD_ID_OFFSET 4 -#define DPMNG_CMD(id) ((id << DPMNG_CMD_ID_OFFSET) | DPMNG_CMD_BASE_VERSION) +#define DPMNG_CMD(id) (((id) << DPMNG_CMD_ID_OFFSET) | DPMNG_CMD_BASE_VERSION) /* Command IDs */ #define DPMNG_CMDID_GET_VERSION DPMNG_CMD(0x831) diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/staging/fsl-mc/bus/dprc-cmd.h index e9fdca4..d9b2dcd 100644 --- a/drivers/staging/fsl-mc/bus/dprc-cmd.h +++ b/drivers/staging/fsl-mc/bus/dprc-cmd.h @@ -48,7 +48,7 @@ #define DPRC_CMD_BASE_VERSION 1 #define DPRC_CMD_ID_OFFSET 4 -#define DPRC_CMD(id) ((id << DPRC_CMD_ID_OFFSET) | DPRC_CMD_BASE_VERSION) +#define DPRC_CMD(id) (((id) << DPRC_CMD_ID_OFFSET) | DPRC_CMD_BASE_VERSION) /* Command IDs */ #define DPRC_CMDID_CLOSE DPRC_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index d723c69..39c9a3b 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -21,9 +21,13 @@ #define FSL_MC_DPRC_DRIVER_NAME "fsl_mc_dprc" -#define FSL_MC_DEVICE_MATCH(_mc_dev, _obj_desc) \ - (strcmp((_mc_dev)->obj_desc.type, (_obj_desc)->type) == 0 && \ - (_mc_dev)->obj_desc.id == (_obj_desc)->id) +#define FSL_MC_DEVICE_MATCH(_mc_dev, _obj_desc) \ +({ \ + struct fsl_mc_device *__mc_dev = _mc_dev; \ + struct dprc_obj_desc *__obj_desc = _obj_desc; \ + (strcmp(__mc_dev->obj_desc.type, __obj_desc->type) == 0 && \ + __mc_dev->obj_desc.id == __obj_desc->id); \ +}) struct dprc_child_objs { int child_count; diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c index ce07096..d3def40 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c @@ -17,10 +17,13 @@ #include "dpcon-cmd.h" #include "fsl-mc-private.h" -#define FSL_MC_IS_ALLOCATABLE(_obj_type) \ - (strcmp(_obj_type, "dpbp") == 0 || \ - strcmp(_obj_type, "dpmcp") == 0 || \ - strcmp(_obj_type, "dpcon") == 0) +#define FSL_MC_IS_ALLOCATABLE(_obj_type) \ +({ \ + const char *__obj_type = _obj_type; \ + (strcmp(__obj_type, "dpbp") == 0 || \ + strcmp(__obj_type, "dpmcp") == 0 || \ + strcmp(__obj_type, "dpcon") == 0); \ +}) /** * fsl_mc_resource_pool_add_device - add allocatable object to a resource diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 50eb415..7b48ade 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -420,15 +420,11 @@ bool fsl_mc_is_root_dprc(struct device *dev) static void fsl_mc_device_release(struct device *dev) { struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); - struct fsl_mc_bus *mc_bus = NULL; kfree(mc_dev->regions); if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) - mc_bus = to_fsl_mc_bus(mc_dev); - - if (mc_bus) - kfree(mc_bus); + kfree(to_fsl_mc_bus(mc_dev)); else kfree(mc_dev); } @@ -559,10 +555,8 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, error_cleanup_dev: kfree(mc_dev->regions); - if (mc_bus) - kfree(mc_bus); - else - kfree(mc_dev); + kfree(mc_bus); + kfree(mc_dev); return error; } diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c index b8b2c86..a92fa5a 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c @@ -17,6 +17,7 @@ #include <linux/irqdomain.h> #include <linux/msi.h> #include "../include/mc-bus.h" +#include "../include/mc-cmd.h" #include "fsl-mc-private.h" /* diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h index 5c49c9d..01ef9329 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -11,7 +11,6 @@ #define _FSL_MC_PRIVATE_H_ #include "../include/mc.h" -#include "../include/mc-bus.h" int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index dc985cc..2f4a7a7 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h @@ -33,8 +33,6 @@ #ifndef _FSL_DPRC_H #define _FSL_DPRC_H -#include "mc-cmd.h" - /* * Data Path Resource Container API * Contains DPRC API for managing and querying DPAA resources @@ -51,7 +49,6 @@ int dprc_close(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token); - /* IRQ */ /* IRQ index */ diff --git a/drivers/staging/fsl-mc/include/mc-sys.h b/drivers/staging/fsl-mc/include/mc-sys.h index dca7f90..b520370 100644 --- a/drivers/staging/fsl-mc/include/mc-sys.h +++ b/drivers/staging/fsl-mc/include/mc-sys.h @@ -46,7 +46,6 @@ */ #define FSL_MC_IO_ATOMIC_CONTEXT_PORTAL 0x0001 -struct fsl_mc_resource; struct mc_command; /** -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings @ 2017-05-22 12:09 ` laurentiu.tudor 0 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor @ 2017-05-22 12:09 UTC (permalink / raw) To: gregkh, stuyoder Cc: devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel, Laurentiu Tudor From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Remove several unneeded #includes, forward declarations and fix several issues reported by checkpatch.pl --strict, such as: - kfree(NULL) is safe and check is not required - macro argument reuse may cause possible side effects - enclose macro params in parens to avoid precedence issues - coding style Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- Notes: -v2 -no changes drivers/staging/fsl-mc/bus/dpbp-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dpmng-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dprc-cmd.h | 2 +- drivers/staging/fsl-mc/bus/dprc-driver.c | 10 +++++++--- drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 11 +++++++---- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 12 +++--------- drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 1 + drivers/staging/fsl-mc/bus/fsl-mc-private.h | 1 - drivers/staging/fsl-mc/include/dprc.h | 3 --- drivers/staging/fsl-mc/include/mc-sys.h | 1 - 11 files changed, 22 insertions(+), 25 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/staging/fsl-mc/bus/dpbp-cmd.h index 8aa6545..5904836 100644 --- a/drivers/staging/fsl-mc/bus/dpbp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpbp-cmd.h @@ -40,7 +40,7 @@ #define DPBP_CMD_BASE_VERSION 1 #define DPBP_CMD_ID_OFFSET 4 -#define DPBP_CMD(id) ((id << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION) +#define DPBP_CMD(id) (((id) << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION) /* Command IDs */ #define DPBP_CMDID_CLOSE DPBP_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h index 384a13d..861b2a7 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h @@ -40,7 +40,7 @@ #define DPMCP_CMD_BASE_VERSION 1 #define DPMCP_CMD_ID_OFFSET 4 -#define DPMCP_CMD(id) ((id << DPMCP_CMD_ID_OFFSET) | DPMCP_CMD_BASE_VERSION) +#define DPMCP_CMD(id) (((id) << DPMCP_CMD_ID_OFFSET) | DPMCP_CMD_BASE_VERSION) /* Command IDs */ #define DPMCP_CMDID_CLOSE DPMCP_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dpmng-cmd.h b/drivers/staging/fsl-mc/bus/dpmng-cmd.h index cdddfb8..d1f04ac 100644 --- a/drivers/staging/fsl-mc/bus/dpmng-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmng-cmd.h @@ -44,7 +44,7 @@ #define DPMNG_CMD_BASE_VERSION 1 #define DPMNG_CMD_ID_OFFSET 4 -#define DPMNG_CMD(id) ((id << DPMNG_CMD_ID_OFFSET) | DPMNG_CMD_BASE_VERSION) +#define DPMNG_CMD(id) (((id) << DPMNG_CMD_ID_OFFSET) | DPMNG_CMD_BASE_VERSION) /* Command IDs */ #define DPMNG_CMDID_GET_VERSION DPMNG_CMD(0x831) diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/staging/fsl-mc/bus/dprc-cmd.h index e9fdca4..d9b2dcd 100644 --- a/drivers/staging/fsl-mc/bus/dprc-cmd.h +++ b/drivers/staging/fsl-mc/bus/dprc-cmd.h @@ -48,7 +48,7 @@ #define DPRC_CMD_BASE_VERSION 1 #define DPRC_CMD_ID_OFFSET 4 -#define DPRC_CMD(id) ((id << DPRC_CMD_ID_OFFSET) | DPRC_CMD_BASE_VERSION) +#define DPRC_CMD(id) (((id) << DPRC_CMD_ID_OFFSET) | DPRC_CMD_BASE_VERSION) /* Command IDs */ #define DPRC_CMDID_CLOSE DPRC_CMD(0x800) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index d723c69..39c9a3b 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -21,9 +21,13 @@ #define FSL_MC_DPRC_DRIVER_NAME "fsl_mc_dprc" -#define FSL_MC_DEVICE_MATCH(_mc_dev, _obj_desc) \ - (strcmp((_mc_dev)->obj_desc.type, (_obj_desc)->type) == 0 && \ - (_mc_dev)->obj_desc.id == (_obj_desc)->id) +#define FSL_MC_DEVICE_MATCH(_mc_dev, _obj_desc) \ +({ \ + struct fsl_mc_device *__mc_dev = _mc_dev; \ + struct dprc_obj_desc *__obj_desc = _obj_desc; \ + (strcmp(__mc_dev->obj_desc.type, __obj_desc->type) == 0 && \ + __mc_dev->obj_desc.id == __obj_desc->id); \ +}) struct dprc_child_objs { int child_count; diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c index ce07096..d3def40 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c @@ -17,10 +17,13 @@ #include "dpcon-cmd.h" #include "fsl-mc-private.h" -#define FSL_MC_IS_ALLOCATABLE(_obj_type) \ - (strcmp(_obj_type, "dpbp") == 0 || \ - strcmp(_obj_type, "dpmcp") == 0 || \ - strcmp(_obj_type, "dpcon") == 0) +#define FSL_MC_IS_ALLOCATABLE(_obj_type) \ +({ \ + const char *__obj_type = _obj_type; \ + (strcmp(__obj_type, "dpbp") == 0 || \ + strcmp(__obj_type, "dpmcp") == 0 || \ + strcmp(__obj_type, "dpcon") == 0); \ +}) /** * fsl_mc_resource_pool_add_device - add allocatable object to a resource diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 50eb415..7b48ade 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -420,15 +420,11 @@ bool fsl_mc_is_root_dprc(struct device *dev) static void fsl_mc_device_release(struct device *dev) { struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); - struct fsl_mc_bus *mc_bus = NULL; kfree(mc_dev->regions); if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) - mc_bus = to_fsl_mc_bus(mc_dev); - - if (mc_bus) - kfree(mc_bus); + kfree(to_fsl_mc_bus(mc_dev)); else kfree(mc_dev); } @@ -559,10 +555,8 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, error_cleanup_dev: kfree(mc_dev->regions); - if (mc_bus) - kfree(mc_bus); - else - kfree(mc_dev); + kfree(mc_bus); + kfree(mc_dev); return error; } diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c index b8b2c86..a92fa5a 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c @@ -17,6 +17,7 @@ #include <linux/irqdomain.h> #include <linux/msi.h> #include "../include/mc-bus.h" +#include "../include/mc-cmd.h" #include "fsl-mc-private.h" /* diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h index 5c49c9d..01ef9329 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -11,7 +11,6 @@ #define _FSL_MC_PRIVATE_H_ #include "../include/mc.h" -#include "../include/mc-bus.h" int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index dc985cc..2f4a7a7 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h @@ -33,8 +33,6 @@ #ifndef _FSL_DPRC_H #define _FSL_DPRC_H -#include "mc-cmd.h" - /* * Data Path Resource Container API * Contains DPRC API for managing and querying DPAA resources @@ -51,7 +49,6 @@ int dprc_close(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token); - /* IRQ */ /* IRQ index */ diff --git a/drivers/staging/fsl-mc/include/mc-sys.h b/drivers/staging/fsl-mc/include/mc-sys.h index dca7f90..b520370 100644 --- a/drivers/staging/fsl-mc/include/mc-sys.h +++ b/drivers/staging/fsl-mc/include/mc-sys.h @@ -46,7 +46,6 @@ */ #define FSL_MC_IO_ATOMIC_CONTEXT_PORTAL 0x0001 -struct fsl_mc_resource; struct mc_command; /** -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-25 16:58 ` Greg KH -1 siblings, 0 replies; 20+ messages in thread From: Greg KH @ 2017-05-25 16:58 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 22, 2017 at 03:09:31PM +0300, laurentiu.tudor at nxp.com wrote: > From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Your subject line is very odd, please use the 'v2' marking properly... > > Remove several unneeded #includes, forward > declarations and fix several issues reported > by checkpatch.pl --strict, such as: > - kfree(NULL) is safe and check is not required > - macro argument reuse may cause possible side effects > - enclose macro params in parens to avoid precedence issues > - coding style These, as always, need to be broken up into one-patch-per-type-of-thing, you have been in the staging tree long enough to know this :( Please do this first, then we can consider the rest of the series... thanks, greg k-h ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings @ 2017-05-25 16:58 ` Greg KH 0 siblings, 0 replies; 20+ messages in thread From: Greg KH @ 2017-05-25 16:58 UTC (permalink / raw) To: laurentiu.tudor Cc: stuyoder, devel, arnd, roy.pledge, linux-kernel, agraf, catalin.horghidan, ioana.ciornei, leoyang.li, bharat.bhushan, linux-arm-kernel On Mon, May 22, 2017 at 03:09:31PM +0300, laurentiu.tudor@nxp.com wrote: > From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Your subject line is very odd, please use the 'v2' marking properly... > > Remove several unneeded #includes, forward > declarations and fix several issues reported > by checkpatch.pl --strict, such as: > - kfree(NULL) is safe and check is not required > - macro argument reuse may cause possible side effects > - enclose macro params in parens to avoid precedence issues > - coding style These, as always, need to be broken up into one-patch-per-type-of-thing, you have been in the staging tree long enough to know this :( Please do this first, then we can consider the rest of the series... thanks, greg k-h ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings 2017-05-25 16:58 ` Greg KH @ 2017-05-26 13:19 ` Laurentiu Tudor -1 siblings, 0 replies; 20+ messages in thread From: Laurentiu Tudor @ 2017-05-26 13:19 UTC (permalink / raw) To: linux-arm-kernel Hi Greg, On 05/25/2017 07:58 PM, Greg KH wrote: > On Mon, May 22, 2017 at 03:09:31PM +0300, laurentiu.tudor at nxp.com wrote: >> From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > Your subject line is very odd, please use the 'v2' marking properly... > >> >> Remove several unneeded #includes, forward >> declarations and fix several issues reported >> by checkpatch.pl --strict, such as: >> - kfree(NULL) is safe and check is not required >> - macro argument reuse may cause possible side effects >> - enclose macro params in parens to avoid precedence issues >> - coding style > > These, as always, need to be broken up into one-patch-per-type-of-thing, > you have been in the staging tree long enough to know this :( Sorry about that. Will take care of all your comments in the next respin. --- Thanks & Best Regards, Laurentiu ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings @ 2017-05-26 13:19 ` Laurentiu Tudor 0 siblings, 0 replies; 20+ messages in thread From: Laurentiu Tudor @ 2017-05-26 13:19 UTC (permalink / raw) To: Greg KH Cc: stuyoder@gmail.com, devel@driverdev.osuosl.org, arnd@arndb.de, Roy Pledge, linux-kernel@vger.kernel.org, agraf@suse.de, Catalin Horghidan, Ioana Ciornei, Leo Li, Bharat Bhushan, linux-arm-kernel@lists.infradead.org Hi Greg, On 05/25/2017 07:58 PM, Greg KH wrote: > On Mon, May 22, 2017 at 03:09:31PM +0300, laurentiu.tudor@nxp.com wrote: >> From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > Your subject line is very odd, please use the 'v2' marking properly... > >> >> Remove several unneeded #includes, forward >> declarations and fix several issues reported >> by checkpatch.pl --strict, such as: >> - kfree(NULL) is safe and check is not required >> - macro argument reuse may cause possible side effects >> - enclose macro params in parens to avoid precedence issues >> - coding style > > These, as always, need to be broken up into one-patch-per-type-of-thing, > you have been in the staging tree long enough to know this :( Sorry about that. Will take care of all your comments in the next respin. --- Thanks & Best Regards, Laurentiu ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 2/5][v2] staging: fsl-mc: add binding path to MAINTAINERS 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-22 12:09 ` laurentiu.tudor -1 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor at nxp.com @ 2017-05-22 12:09 UTC (permalink / raw) To: linux-arm-kernel From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- Notes: -v2 -no changes MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9e98464..ffac090 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10545,6 +10545,7 @@ M: Laurentiu Tudor <laurentiu.tudor@nxp.com> L: linux-kernel at vger.kernel.org S: Maintained F: drivers/staging/fsl-mc/ +F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt QT1010 MEDIA DRIVER M: Antti Palosaari <crope@iki.fi> -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/5][v2] staging: fsl-mc: add binding path to MAINTAINERS @ 2017-05-22 12:09 ` laurentiu.tudor 0 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor @ 2017-05-22 12:09 UTC (permalink / raw) To: gregkh, stuyoder Cc: devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel, Laurentiu Tudor From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- Notes: -v2 -no changes MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9e98464..ffac090 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10545,6 +10545,7 @@ M: Laurentiu Tudor <laurentiu.tudor@nxp.com> L: linux-kernel@vger.kernel.org S: Maintained F: drivers/staging/fsl-mc/ +F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt QT1010 MEDIA DRIVER M: Antti Palosaari <crope@iki.fi> -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/5][v2] staging: fsl-mc: add binding path to MAINTAINERS 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-25 16:59 ` Greg KH -1 siblings, 0 replies; 20+ messages in thread From: Greg KH @ 2017-05-25 16:59 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 22, 2017 at 03:09:32PM +0300, laurentiu.tudor at nxp.com wrote: > From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> I don't take patches without any changelog text :( ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5][v2] staging: fsl-mc: add binding path to MAINTAINERS @ 2017-05-25 16:59 ` Greg KH 0 siblings, 0 replies; 20+ messages in thread From: Greg KH @ 2017-05-25 16:59 UTC (permalink / raw) To: laurentiu.tudor Cc: stuyoder, devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel On Mon, May 22, 2017 at 03:09:32PM +0300, laurentiu.tudor@nxp.com wrote: > From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> I don't take patches without any changelog text :( ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 2/5][v2] staging: fsl-mc: add binding path to MAINTAINERS 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-25 16:59 ` Greg KH -1 siblings, 0 replies; 20+ messages in thread From: Greg KH @ 2017-05-25 16:59 UTC (permalink / raw) To: linux-arm-kernel On Mon, May 22, 2017 at 03:09:32PM +0300, laurentiu.tudor at nxp.com wrote: > From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > --- > > Notes: > -v2 > -no changes then why is it "v2"? ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/5][v2] staging: fsl-mc: add binding path to MAINTAINERS @ 2017-05-25 16:59 ` Greg KH 0 siblings, 0 replies; 20+ messages in thread From: Greg KH @ 2017-05-25 16:59 UTC (permalink / raw) To: laurentiu.tudor Cc: stuyoder, devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel On Mon, May 22, 2017 at 03:09:32PM +0300, laurentiu.tudor@nxp.com wrote: > From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > --- > > Notes: > -v2 > -no changes then why is it "v2"? ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 3/5] staging: fsl-mc: drop reference to restool 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-22 12:09 ` laurentiu.tudor -1 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor at nxp.com @ 2017-05-22 12:09 UTC (permalink / raw) To: linux-arm-kernel From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Drop reference to user space restool utility from the README. It will be added back together with the actual support in the bus driver. Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- drivers/staging/fsl-mc/README.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/fsl-mc/README.txt b/drivers/staging/fsl-mc/README.txt index 179536a..d7cd70a 100644 --- a/drivers/staging/fsl-mc/README.txt +++ b/drivers/staging/fsl-mc/README.txt @@ -131,9 +131,7 @@ in creating a network interfaces. DPRCs can be defined statically and populated with objects via a config file passed to the MC when firmware starts - it. There is also a Linux user space tool called "restool" - that can be used to create/destroy containers and objects - dynamically. + it. -DPAA2 Objects for an Ethernet Network Interface -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/5] staging: fsl-mc: drop reference to restool @ 2017-05-22 12:09 ` laurentiu.tudor 0 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor @ 2017-05-22 12:09 UTC (permalink / raw) To: gregkh, stuyoder Cc: devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel, Laurentiu Tudor From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Drop reference to user space restool utility from the README. It will be added back together with the actual support in the bus driver. Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- drivers/staging/fsl-mc/README.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/fsl-mc/README.txt b/drivers/staging/fsl-mc/README.txt index 179536a..d7cd70a 100644 --- a/drivers/staging/fsl-mc/README.txt +++ b/drivers/staging/fsl-mc/README.txt @@ -131,9 +131,7 @@ in creating a network interfaces. DPRCs can be defined statically and populated with objects via a config file passed to the MC when firmware starts - it. There is also a Linux user space tool called "restool" - that can be used to create/destroy containers and objects - dynamically. + it. -DPAA2 Objects for an Ethernet Network Interface -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/5] staging: fsl-mc: add reference to mc-bus DT binding 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-22 12:09 ` laurentiu.tudor -1 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor at nxp.com @ 2017-05-22 12:09 UTC (permalink / raw) To: linux-arm-kernel From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Update README to reference the mc-bus device tree node binding. Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- drivers/staging/fsl-mc/README.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/fsl-mc/README.txt b/drivers/staging/fsl-mc/README.txt index d7cd70a..524eda1 100644 --- a/drivers/staging/fsl-mc/README.txt +++ b/drivers/staging/fsl-mc/README.txt @@ -320,6 +320,8 @@ A brief description of each driver is provided below. -creates an MSI IRQ domain -doing a 'device add' to expose the 'root' DPRC, in turn triggering a bind of the root DPRC to the DPRC driver + The binding for the MC-bus device-tree node can be consulted here: + Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt DPRC driver ----------- -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/5] staging: fsl-mc: add reference to mc-bus DT binding @ 2017-05-22 12:09 ` laurentiu.tudor 0 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor @ 2017-05-22 12:09 UTC (permalink / raw) To: gregkh, stuyoder Cc: devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel, Laurentiu Tudor From: Laurentiu Tudor <laurentiu.tudor@nxp.com> Update README to reference the mc-bus device tree node binding. Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- drivers/staging/fsl-mc/README.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/fsl-mc/README.txt b/drivers/staging/fsl-mc/README.txt index d7cd70a..524eda1 100644 --- a/drivers/staging/fsl-mc/README.txt +++ b/drivers/staging/fsl-mc/README.txt @@ -320,6 +320,8 @@ A brief description of each driver is provided below. -creates an MSI IRQ domain -doing a 'device add' to expose the 'root' DPRC, in turn triggering a bind of the root DPRC to the DPRC driver + The binding for the MC-bus device-tree node can be consulted here: + Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt DPRC driver ----------- -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 5/5][v5] staging: fsl-mc: move bus driver out of staging 2017-05-22 12:09 ` laurentiu.tudor @ 2017-05-22 12:09 ` laurentiu.tudor -1 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor at nxp.com @ 2017-05-22 12:09 UTC (permalink / raw) To: linux-arm-kernel 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> --- Notes: -v5 -no changes -v4 -rebased -update existing dpaa2 drivers to work with the bus out of staging -v3 -no changes -v2 -updated MAINTAINERS with new location .../README.txt => Documentation/dpaa2/overview.txt | 0 MAINTAINERS | 2 +- drivers/bus/Kconfig | 2 ++ drivers/bus/Makefile | 3 +++ drivers/bus/fsl-mc/Kconfig | 17 +++++++++++++++++ drivers/bus/fsl-mc/Makefile | 19 +++++++++++++++++++ drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 4 ++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c | 6 +++--- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 4 ++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 6 +++--- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 5 +++-- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 5 +++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 6 +++--- drivers/irqchip/Makefile | 1 + .../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 3 +-- drivers/staging/fsl-dpaa2/ethernet/README | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++-- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpni.c | 4 ++-- drivers/staging/fsl-mc/TODO | 18 ------------------ drivers/staging/fsl-mc/bus/Kconfig | 10 ---------- drivers/staging/fsl-mc/bus/Makefile | 15 +-------------- drivers/staging/fsl-mc/bus/dpcon.c | 8 ++++---- drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio.c | 4 ++-- .../fsl-mc/include => include/linux/fsl}/dpbp.h | 0 .../fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/dpmng.h | 0 .../fsl-mc/include => include/linux/fsl}/dprc.h | 1 - .../fsl-mc/include => include/linux/fsl}/mc-bus.h | 2 +- .../fsl-mc/include => include/linux/fsl}/mc-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/mc-sys.h | 0 .../staging/fsl-mc/include => include/linux/fsl}/mc.h | 2 +- 43 files changed, 90 insertions(+), 89 deletions(-) rename drivers/staging/fsl-mc/README.txt => Documentation/dpaa2/overview.txt (100%) create mode 100644 drivers/bus/fsl-mc/Kconfig create mode 100644 drivers/bus/fsl-mc/Makefile rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c (96%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c (99%) rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (98%) delete mode 100644 drivers/staging/fsl-mc/TODO rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpbp.h (100%) rename {drivers/staging/fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpmng.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dprc.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-bus.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-sys.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (99%) 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 ffac090..4bc71be 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10544,7 +10544,7 @@ M: Stuart Yoder <stuyoder@gmail.com> M: Laurentiu Tudor <laurentiu.tudor@nxp.com> L: linux-kernel at 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 0a52da4..dbb1f44 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -184,4 +184,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..5c009ab --- /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 + 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..d56afee --- /dev/null +++ b/drivers/bus/fsl-mc/Makefile @@ -0,0 +1,19 @@ +# +# 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 \ + dpmng.o \ + dprc-driver.o \ + fsl-mc-allocator.o \ + fsl-mc-msi.o \ + dpmcp.o \ + dpbp.o diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/bus/fsl-mc/dpbp-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpbp-cmd.h rename to drivers/bus/fsl-mc/dpbp-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/bus/fsl-mc/dpbp.c similarity index 98% rename from drivers/staging/fsl-mc/bus/dpbp.c rename to drivers/bus/fsl-mc/dpbp.c index d9e450a..3a7bc3d 100644 --- a/drivers/staging/fsl-mc/bus/dpbp.c +++ b/drivers/bus/fsl-mc/dpbp.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpbp.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dpbp.h> #include "dpbp-cmd.h" 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 98% rename from drivers/staging/fsl-mc/bus/dpmcp.c rename to drivers/bus/fsl-mc/dpmcp.c index ad4c8b4..5c5c2aa 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.c +++ b/drivers/bus/fsl-mc/dpmcp.c @@ -29,8 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.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/dpmng.c b/drivers/bus/fsl-mc/dpmng.c similarity index 96% rename from drivers/staging/fsl-mc/bus/dpmng.c rename to drivers/bus/fsl-mc/dpmng.c index ad5d5bb..312fa0ee 100644 --- a/drivers/staging/fsl-mc/bus/dpmng.c +++ b/drivers/bus/fsl-mc/dpmng.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpmng.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dpmng.h> #include "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 39c9a3b..2a392fd 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/bus/fsl-mc/dprc-driver.c @@ -13,8 +13,8 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/msi.h> -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-sys.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 fcf7b47..069e4dd 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/bus/fsl-mc/dprc.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dprc.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dprc.h> #include "dprc-cmd.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 d3def40..5ea3b26 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c @@ -10,11 +10,11 @@ #include <linux/module.h> #include <linux/msi.h> -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/dpcon-cmd.h> #include "dpbp-cmd.h" -#include "dpcon-cmd.h" #include "fsl-mc-private.h" #define FSL_MC_IS_ALLOCATABLE(_obj_type) \ diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-bus.c rename to drivers/bus/fsl-mc/fsl-mc-bus.c index 7b48ade..f59aa9f 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -20,9 +20,9 @@ #include <linux/bitops.h> #include <linux/msi.h> #include <linux/dma-mapping.h> -#include "../include/mc-bus.h" -#include "../include/dpmng.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/dpmng.h> +#include <linux/fsl/mc-sys.h> #include "fsl-mc-private.h" #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-msi.c rename to drivers/bus/fsl-mc/fsl-mc-msi.c index a92fa5a..42314b3 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c +++ b/drivers/bus/fsl-mc/fsl-mc-msi.c @@ -16,8 +16,9 @@ #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/msi.h> -#include "../include/mc-bus.h" -#include "../include/mc-cmd.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-cmd.h> + #include "fsl-mc-private.h" /* diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h similarity index 98% rename from drivers/staging/fsl-mc/bus/fsl-mc-private.h rename to drivers/bus/fsl-mc/fsl-mc-private.h index 01ef9329..8912d19 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> int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, 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 d66b87f..a24c11d 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -31,8 +31,9 @@ */ #include <linux/io.h> -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.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 4d82802..ac86226 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/bus/fsl-mc/mc-sys.c @@ -37,9 +37,9 @@ #include <linux/ioport.h> #include <linux/device.h> #include <linux/io.h> -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/mc.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/mc.h> #include "dpmcp.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index b64c59b..6cc4c26 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -76,3 +76,4 @@ obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o +obj-$(CONFIG_FSL_MC_BUS) += irq-gic-v3-its-fsl-mc-msi.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 98% 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 49127ac..63cdd63 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 @@ -16,8 +16,7 @@ #include <linux/msi.h> #include <linux/of.h> #include <linux/of_irq.h> -#include "../include/mc-bus.h" -#include "fsl-mc-private.h" +#include <linux/fsl/mc-bus.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 6f9eed6..97a64d2 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -38,8 +38,8 @@ #include <linux/msi.h> #include <linux/kthread.h> -#include "../../fsl-mc/include/mc.h" -#include "../../fsl-mc/include/mc-sys.h" +#include <linux/fsl/mc.h> +#include <linux/fsl/mc-sys.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/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index c67cced..0a07b41 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -38,7 +38,7 @@ #include "../../fsl-mc/include/dpaa2-io.h" #include "../../fsl-mc/include/dpaa2-fd.h" -#include "../../fsl-mc/include/dpbp.h" +#include <linux/fsl/dpbp.h> #include "../../fsl-mc/include/dpcon.h" #include "dpni.h" #include "dpni-cmd.h" diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c index cea46ed..4f758a9 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpni.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.c @@ -30,8 +30,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../../fsl-mc/include/mc-sys.h" -#include "../../fsl-mc/include/mc-cmd.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.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 at freescale.com, devel at driverdev.osuosl.org, -linux-kernel at 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 a10aaf0..0f75b56 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 - 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 diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 659eccf..e86ad44 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -5,20 +5,7 @@ # # 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 \ - dpmng.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) += dpcon.o # MC DPIO driver obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/bus/dpcon.c b/drivers/staging/fsl-mc/bus/dpcon.c index eb71357..abbc3c2 100644 --- a/drivers/staging/fsl-mc/bus/dpcon.c +++ b/drivers/staging/fsl-mc/bus/dpcon.c @@ -29,11 +29,11 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpcon.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dpcon-cmd.h> -#include "dpcon-cmd.h" +#include "../include/dpcon.h" /** * dpcon_open() - Open a control session for the specified object 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 e5d6674..bb4a99f 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 d81e023..b16a990 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio.c @@ -30,8 +30,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../../include/mc-sys.h" -#include "../../include/mc-cmd.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> #include "dpio.h" #include "dpio-cmd.h" diff --git a/drivers/staging/fsl-mc/include/dpbp.h b/include/linux/fsl/dpbp.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpbp.h rename to include/linux/fsl/dpbp.h diff --git a/drivers/staging/fsl-mc/bus/dpcon-cmd.h b/include/linux/fsl/dpcon-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpcon-cmd.h rename to include/linux/fsl/dpcon-cmd.h diff --git a/drivers/staging/fsl-mc/include/dpmng.h b/include/linux/fsl/dpmng.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpmng.h rename to include/linux/fsl/dpmng.h diff --git a/drivers/staging/fsl-mc/include/dprc.h b/include/linux/fsl/dprc.h similarity index 99% rename from drivers/staging/fsl-mc/include/dprc.h rename to include/linux/fsl/dprc.h index 2f4a7a7..135c87b 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/include/linux/fsl/dprc.h @@ -305,4 +305,3 @@ int dprc_get_container_id(struct fsl_mc_io *mc_io, int *container_id); #endif /* _FSL_DPRC_H */ - diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/include/linux/fsl/mc-bus.h similarity index 99% rename from drivers/staging/fsl-mc/include/mc-bus.h rename to include/linux/fsl/mc-bus.h index 42700de..23c06e1 100644 --- a/drivers/staging/fsl-mc/include/mc-bus.h +++ b/include/linux/fsl/mc-bus.h @@ -11,7 +11,7 @@ #ifndef _FSL_MC_MCBUS_H_ #define _FSL_MC_MCBUS_H_ -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include <linux/mutex.h> struct irq_domain; diff --git a/drivers/staging/fsl-mc/include/mc-cmd.h b/include/linux/fsl/mc-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc-cmd.h rename to include/linux/fsl/mc-cmd.h diff --git a/drivers/staging/fsl-mc/include/mc-sys.h b/include/linux/fsl/mc-sys.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc-sys.h rename to include/linux/fsl/mc-sys.h diff --git a/drivers/staging/fsl-mc/include/mc.h b/include/linux/fsl/mc.h similarity index 99% rename from drivers/staging/fsl-mc/include/mc.h rename to include/linux/fsl/mc.h index 1c46c0c..929bfdb 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/include/linux/fsl/mc.h @@ -14,7 +14,7 @@ #include <linux/device.h> #include <linux/mod_devicetable.h> #include <linux/interrupt.h> -#include "../include/dprc.h" +#include <linux/fsl/dprc.h> #define FSL_MC_VENDOR_FREESCALE 0x1957 -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 5/5][v5] staging: fsl-mc: move bus driver out of staging @ 2017-05-22 12:09 ` laurentiu.tudor 0 siblings, 0 replies; 20+ messages in thread From: laurentiu.tudor @ 2017-05-22 12:09 UTC (permalink / raw) To: gregkh, stuyoder Cc: devel, linux-kernel, agraf, arnd, ioana.ciornei, ruxandra.radulescu, bharat.bhushan, catalin.horghidan, leoyang.li, roy.pledge, linux-arm-kernel, Stuart Yoder, Laurentiu Tudor, Thomas Gleixner, Jason Cooper, Marc Zyngier 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> --- Notes: -v5 -no changes -v4 -rebased -update existing dpaa2 drivers to work with the bus out of staging -v3 -no changes -v2 -updated MAINTAINERS with new location .../README.txt => Documentation/dpaa2/overview.txt | 0 MAINTAINERS | 2 +- drivers/bus/Kconfig | 2 ++ drivers/bus/Makefile | 3 +++ drivers/bus/fsl-mc/Kconfig | 17 +++++++++++++++++ drivers/bus/fsl-mc/Makefile | 19 +++++++++++++++++++ drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 4 ++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c | 6 +++--- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 4 ++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 6 +++--- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 5 +++-- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 5 +++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 6 +++--- drivers/irqchip/Makefile | 1 + .../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 3 +-- drivers/staging/fsl-dpaa2/ethernet/README | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++-- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpni.c | 4 ++-- drivers/staging/fsl-mc/TODO | 18 ------------------ drivers/staging/fsl-mc/bus/Kconfig | 10 ---------- drivers/staging/fsl-mc/bus/Makefile | 15 +-------------- drivers/staging/fsl-mc/bus/dpcon.c | 8 ++++---- drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio.c | 4 ++-- .../fsl-mc/include => include/linux/fsl}/dpbp.h | 0 .../fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/dpmng.h | 0 .../fsl-mc/include => include/linux/fsl}/dprc.h | 1 - .../fsl-mc/include => include/linux/fsl}/mc-bus.h | 2 +- .../fsl-mc/include => include/linux/fsl}/mc-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/mc-sys.h | 0 .../staging/fsl-mc/include => include/linux/fsl}/mc.h | 2 +- 43 files changed, 90 insertions(+), 89 deletions(-) rename drivers/staging/fsl-mc/README.txt => Documentation/dpaa2/overview.txt (100%) create mode 100644 drivers/bus/fsl-mc/Kconfig create mode 100644 drivers/bus/fsl-mc/Makefile rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c (96%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c (99%) rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (98%) delete mode 100644 drivers/staging/fsl-mc/TODO rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpbp.h (100%) rename {drivers/staging/fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpmng.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dprc.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-bus.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-sys.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (99%) 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 ffac090..4bc71be 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10544,7 +10544,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 0a52da4..dbb1f44 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -184,4 +184,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..5c009ab --- /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 + 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..d56afee --- /dev/null +++ b/drivers/bus/fsl-mc/Makefile @@ -0,0 +1,19 @@ +# +# 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 \ + dpmng.o \ + dprc-driver.o \ + fsl-mc-allocator.o \ + fsl-mc-msi.o \ + dpmcp.o \ + dpbp.o diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/bus/fsl-mc/dpbp-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpbp-cmd.h rename to drivers/bus/fsl-mc/dpbp-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/bus/fsl-mc/dpbp.c similarity index 98% rename from drivers/staging/fsl-mc/bus/dpbp.c rename to drivers/bus/fsl-mc/dpbp.c index d9e450a..3a7bc3d 100644 --- a/drivers/staging/fsl-mc/bus/dpbp.c +++ b/drivers/bus/fsl-mc/dpbp.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpbp.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dpbp.h> #include "dpbp-cmd.h" 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 98% rename from drivers/staging/fsl-mc/bus/dpmcp.c rename to drivers/bus/fsl-mc/dpmcp.c index ad4c8b4..5c5c2aa 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.c +++ b/drivers/bus/fsl-mc/dpmcp.c @@ -29,8 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.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/dpmng.c b/drivers/bus/fsl-mc/dpmng.c similarity index 96% rename from drivers/staging/fsl-mc/bus/dpmng.c rename to drivers/bus/fsl-mc/dpmng.c index ad5d5bb..312fa0ee 100644 --- a/drivers/staging/fsl-mc/bus/dpmng.c +++ b/drivers/bus/fsl-mc/dpmng.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpmng.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dpmng.h> #include "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 39c9a3b..2a392fd 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/bus/fsl-mc/dprc-driver.c @@ -13,8 +13,8 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/msi.h> -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-sys.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 fcf7b47..069e4dd 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/bus/fsl-mc/dprc.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dprc.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dprc.h> #include "dprc-cmd.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 d3def40..5ea3b26 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c @@ -10,11 +10,11 @@ #include <linux/module.h> #include <linux/msi.h> -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/dpcon-cmd.h> #include "dpbp-cmd.h" -#include "dpcon-cmd.h" #include "fsl-mc-private.h" #define FSL_MC_IS_ALLOCATABLE(_obj_type) \ diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-bus.c rename to drivers/bus/fsl-mc/fsl-mc-bus.c index 7b48ade..f59aa9f 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -20,9 +20,9 @@ #include <linux/bitops.h> #include <linux/msi.h> #include <linux/dma-mapping.h> -#include "../include/mc-bus.h" -#include "../include/dpmng.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/dpmng.h> +#include <linux/fsl/mc-sys.h> #include "fsl-mc-private.h" #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-msi.c rename to drivers/bus/fsl-mc/fsl-mc-msi.c index a92fa5a..42314b3 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c +++ b/drivers/bus/fsl-mc/fsl-mc-msi.c @@ -16,8 +16,9 @@ #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/msi.h> -#include "../include/mc-bus.h" -#include "../include/mc-cmd.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-cmd.h> + #include "fsl-mc-private.h" /* diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h similarity index 98% rename from drivers/staging/fsl-mc/bus/fsl-mc-private.h rename to drivers/bus/fsl-mc/fsl-mc-private.h index 01ef9329..8912d19 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> int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, 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 d66b87f..a24c11d 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -31,8 +31,9 @@ */ #include <linux/io.h> -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include <linux/fsl/mc-bus.h> +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.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 4d82802..ac86226 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/bus/fsl-mc/mc-sys.c @@ -37,9 +37,9 @@ #include <linux/ioport.h> #include <linux/device.h> #include <linux/io.h> -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/mc.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/mc.h> #include "dpmcp.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index b64c59b..6cc4c26 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -76,3 +76,4 @@ obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o +obj-$(CONFIG_FSL_MC_BUS) += irq-gic-v3-its-fsl-mc-msi.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 98% 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 49127ac..63cdd63 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 @@ -16,8 +16,7 @@ #include <linux/msi.h> #include <linux/of.h> #include <linux/of_irq.h> -#include "../include/mc-bus.h" -#include "fsl-mc-private.h" +#include <linux/fsl/mc-bus.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 6f9eed6..97a64d2 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -38,8 +38,8 @@ #include <linux/msi.h> #include <linux/kthread.h> -#include "../../fsl-mc/include/mc.h" -#include "../../fsl-mc/include/mc-sys.h" +#include <linux/fsl/mc.h> +#include <linux/fsl/mc-sys.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/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index c67cced..0a07b41 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -38,7 +38,7 @@ #include "../../fsl-mc/include/dpaa2-io.h" #include "../../fsl-mc/include/dpaa2-fd.h" -#include "../../fsl-mc/include/dpbp.h" +#include <linux/fsl/dpbp.h> #include "../../fsl-mc/include/dpcon.h" #include "dpni.h" #include "dpni-cmd.h" diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c index cea46ed..4f758a9 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpni.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.c @@ -30,8 +30,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../../fsl-mc/include/mc-sys.h" -#include "../../fsl-mc/include/mc-cmd.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.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 a10aaf0..0f75b56 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 - 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 diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 659eccf..e86ad44 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -5,20 +5,7 @@ # # 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 \ - dpmng.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) += dpcon.o # MC DPIO driver obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/bus/dpcon.c b/drivers/staging/fsl-mc/bus/dpcon.c index eb71357..abbc3c2 100644 --- a/drivers/staging/fsl-mc/bus/dpcon.c +++ b/drivers/staging/fsl-mc/bus/dpcon.c @@ -29,11 +29,11 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpcon.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> +#include <linux/fsl/dpcon-cmd.h> -#include "dpcon-cmd.h" +#include "../include/dpcon.h" /** * dpcon_open() - Open a control session for the specified object 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 e5d6674..bb4a99f 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 d81e023..b16a990 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio.c @@ -30,8 +30,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../../include/mc-sys.h" -#include "../../include/mc-cmd.h" +#include <linux/fsl/mc-sys.h> +#include <linux/fsl/mc-cmd.h> #include "dpio.h" #include "dpio-cmd.h" diff --git a/drivers/staging/fsl-mc/include/dpbp.h b/include/linux/fsl/dpbp.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpbp.h rename to include/linux/fsl/dpbp.h diff --git a/drivers/staging/fsl-mc/bus/dpcon-cmd.h b/include/linux/fsl/dpcon-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpcon-cmd.h rename to include/linux/fsl/dpcon-cmd.h diff --git a/drivers/staging/fsl-mc/include/dpmng.h b/include/linux/fsl/dpmng.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpmng.h rename to include/linux/fsl/dpmng.h diff --git a/drivers/staging/fsl-mc/include/dprc.h b/include/linux/fsl/dprc.h similarity index 99% rename from drivers/staging/fsl-mc/include/dprc.h rename to include/linux/fsl/dprc.h index 2f4a7a7..135c87b 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/include/linux/fsl/dprc.h @@ -305,4 +305,3 @@ int dprc_get_container_id(struct fsl_mc_io *mc_io, int *container_id); #endif /* _FSL_DPRC_H */ - diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/include/linux/fsl/mc-bus.h similarity index 99% rename from drivers/staging/fsl-mc/include/mc-bus.h rename to include/linux/fsl/mc-bus.h index 42700de..23c06e1 100644 --- a/drivers/staging/fsl-mc/include/mc-bus.h +++ b/include/linux/fsl/mc-bus.h @@ -11,7 +11,7 @@ #ifndef _FSL_MC_MCBUS_H_ #define _FSL_MC_MCBUS_H_ -#include "../include/mc.h" +#include <linux/fsl/mc.h> #include <linux/mutex.h> struct irq_domain; diff --git a/drivers/staging/fsl-mc/include/mc-cmd.h b/include/linux/fsl/mc-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc-cmd.h rename to include/linux/fsl/mc-cmd.h diff --git a/drivers/staging/fsl-mc/include/mc-sys.h b/include/linux/fsl/mc-sys.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc-sys.h rename to include/linux/fsl/mc-sys.h diff --git a/drivers/staging/fsl-mc/include/mc.h b/include/linux/fsl/mc.h similarity index 99% rename from drivers/staging/fsl-mc/include/mc.h rename to include/linux/fsl/mc.h index 1c46c0c..929bfdb 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/include/linux/fsl/mc.h @@ -14,7 +14,7 @@ #include <linux/device.h> #include <linux/mod_devicetable.h> #include <linux/interrupt.h> -#include "../include/dprc.h" +#include <linux/fsl/dprc.h> #define FSL_MC_VENDOR_FREESCALE 0x1957 -- 2.9.4 ^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2017-05-26 13:20 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-05-22 12:09 [PATCH 0/5][v5] staging: fsl-mc: move bus driver out of staging laurentiu.tudor at nxp.com 2017-05-22 12:09 ` laurentiu.tudor 2017-05-22 12:09 ` [PATCH 1/5][v2] staging: fsl-mc: fix several checkpath.pl warnings laurentiu.tudor at nxp.com 2017-05-22 12:09 ` laurentiu.tudor 2017-05-25 16:58 ` Greg KH 2017-05-25 16:58 ` Greg KH 2017-05-26 13:19 ` Laurentiu Tudor 2017-05-26 13:19 ` Laurentiu Tudor 2017-05-22 12:09 ` [PATCH 2/5][v2] staging: fsl-mc: add binding path to MAINTAINERS laurentiu.tudor at nxp.com 2017-05-22 12:09 ` laurentiu.tudor 2017-05-25 16:59 ` Greg KH 2017-05-25 16:59 ` Greg KH 2017-05-25 16:59 ` Greg KH 2017-05-25 16:59 ` Greg KH 2017-05-22 12:09 ` [PATCH 3/5] staging: fsl-mc: drop reference to restool laurentiu.tudor at nxp.com 2017-05-22 12:09 ` laurentiu.tudor 2017-05-22 12:09 ` [PATCH 4/5] staging: fsl-mc: add reference to mc-bus DT binding laurentiu.tudor at nxp.com 2017-05-22 12:09 ` laurentiu.tudor 2017-05-22 12:09 ` [PATCH 5/5][v5] staging: fsl-mc: move bus driver out of staging laurentiu.tudor at nxp.com 2017-05-22 12:09 ` laurentiu.tudor
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.