On Tue, Nov 05, 2019 at 05:17:23PM -0800, Christoph Hellwig wrote:
> The sifive_l2_cache.c is in no way related to RISC-V architecture
> memory management.  It is a little stub driver working around the fact
> that the EDAC maintainers prefer their drivers to be structured in a
> certain way that doesn't fit the SiFive SOCs.
> 
> Move the file to drivers/soc and add a Kconfig option for it, as well
> as the whole drivers/soc boilerplate for CONFIG_SOC_SIFIVE.
> 
> Fixes: a967a289f169 ("RISC-V: sifive_l2_cache: Add L2 cache controller driver for SiFive SoCs")
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> 
> I'll still need ACKs from the edac maintainers for this according to
> Paul..
> 
>  MAINTAINERS                                            |  1 +
>  arch/riscv/mm/Makefile                                 |  1 -
>  drivers/edac/Kconfig                                   |  2 +-
>  drivers/soc/Kconfig                                    |  1 +
>  drivers/soc/Makefile                                   |  1 +
>  drivers/soc/sifive/Kconfig                             | 10 ++++++++++
>  drivers/soc/sifive/Makefile                            |  4 ++++
>  .../riscv/mm => drivers/soc/sifive}/sifive_l2_cache.c  |  0
>  8 files changed, 18 insertions(+), 2 deletions(-)
>  create mode 100644 drivers/soc/sifive/Kconfig
>  create mode 100644 drivers/soc/sifive/Makefile
>  rename {arch/riscv/mm => drivers/soc/sifive}/sifive_l2_cache.c (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index cba1095547fd..f5a8accb0df3 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5972,6 +5972,7 @@ M:	Yash Shah <yash.shah@sifive.com>
>  L:	linux-edac@vger.kernel.org
>  S:	Supported
>  F:	drivers/edac/sifive_edac.c
> +F:	drivers/soc/sifive/

I'm assuming that file pattern will change once the riscv EDAC driver is
converted to be per functional unit...

> diff --git a/drivers/soc/sifive/Makefile b/drivers/soc/sifive/Makefile
> new file mode 100644
> index 000000000000..9b4a85558347
> --- /dev/null
> +++ b/drivers/soc/sifive/Makefile
> @@ -0,0 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> +
> +obj-$(CONFIG_SIFIVE_L2)	+= sifive_l2_cache.o
> +

Fix that up before applying:

.git/rebase-apply/patch:105: new blank line at EOF.
+

Also, building with a cross-compiler fails here:

drivers/soc/sifive/sifive_l2_cache.c:178:1: warning: data definition has no type or storage class
 device_initcall(sifive_l2_init);
 ^~~~~~~~~~~~~~~
drivers/soc/sifive/sifive_l2_cache.c:178:1: error: type defaults to 'int' in declaration of 'device_initcall' [-Werror=implicit-int]
drivers/soc/sifive/sifive_l2_cache.c:178:1: warning: parameter names (without types) in function declaration
drivers/soc/sifive/sifive_l2_cache.c:145:19: warning: 'sifive_l2_init' defined but not used [-Wunused-function]
 static int __init sifive_l2_init(void)
                   ^~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[3]: *** [scripts/Makefile.build:266: drivers/soc/sifive/sifive_l2_cache.o] Error 1
make[2]: *** [scripts/Makefile.build:509: drivers/soc/sifive] Error 2
make[1]: *** [scripts/Makefile.build:509: drivers/soc] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1649: drivers] Error 2

.config attached.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette