Re: [PATCH AUTOSEL 5.14 03/25] cxl: Move cxl_core to new directory

[Jonathan Cameron]

On Mon, 13 Sep 2021 18:33:17 -0400
Sasha Levin <sashal@xxxxxxxxxx> wrote:

> From: Ben Widawsky <ben.widawsky@xxxxxxxxx>
> 
> [ Upstream commit 5161a55c069f53d88da49274cbef6e3c74eadea9 ]
> 
> CXL core is growing, and it's already arguably unmanageable. To support
> future growth, move core functionality to a new directory and rename the
> file to represent just bus support. Future work will remove non-bus
> functionality.
> 
> Note that mem.h is renamed to cxlmem.h to avoid a namespace collision
> with the global ARCH=um mem.h header.

Not a fix...

I'm guessing this got picked up on the basis of the Reported-by: tag?
I think that was added for a minor tweak as this went through review rather
than referring to the whole patch.

Jonathan


> 
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Signed-off-by: Ben Widawsky <ben.widawsky@xxxxxxxxx>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Link: https://lore.kernel.org/r/162792537866.368511.8915631504621088321.stgit@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
>  Documentation/driver-api/cxl/memory-devices.rst | 2 +-
>  drivers/cxl/Makefile                            | 4 +---
>  drivers/cxl/core/Makefile                       | 5 +++++
>  drivers/cxl/{core.c => core/bus.c}              | 4 ++--
>  drivers/cxl/{mem.h => cxlmem.h}                 | 0
>  drivers/cxl/pci.c                               | 2 +-
>  drivers/cxl/pmem.c                              | 2 +-
>  7 files changed, 11 insertions(+), 8 deletions(-)
>  create mode 100644 drivers/cxl/core/Makefile
>  rename drivers/cxl/{core.c => core/bus.c} (99%)
>  rename drivers/cxl/{mem.h => cxlmem.h} (100%)
> 
> diff --git a/Documentation/driver-api/cxl/memory-devices.rst b/Documentation/driver-api/cxl/memory-devices.rst
> index 487ce4f41d77..a86e2c7c551a 100644
> --- a/Documentation/driver-api/cxl/memory-devices.rst
> +++ b/Documentation/driver-api/cxl/memory-devices.rst
> @@ -36,7 +36,7 @@ CXL Core
>  .. kernel-doc:: drivers/cxl/cxl.h
>     :internal:
>  
> -.. kernel-doc:: drivers/cxl/core.c
> +.. kernel-doc:: drivers/cxl/core/bus.c
>     :doc: cxl core
>  
>  External Interfaces
> diff --git a/drivers/cxl/Makefile b/drivers/cxl/Makefile
> index 32954059b37b..d1aaabc940f3 100644
> --- a/drivers/cxl/Makefile
> +++ b/drivers/cxl/Makefile
> @@ -1,11 +1,9 @@
>  # SPDX-License-Identifier: GPL-2.0
> -obj-$(CONFIG_CXL_BUS) += cxl_core.o
> +obj-$(CONFIG_CXL_BUS) += core/
>  obj-$(CONFIG_CXL_MEM) += cxl_pci.o
>  obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o
>  obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o
>  
> -ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL
> -cxl_core-y := core.o
>  cxl_pci-y := pci.o
>  cxl_acpi-y := acpi.o
>  cxl_pmem-y := pmem.o
> diff --git a/drivers/cxl/core/Makefile b/drivers/cxl/core/Makefile
> new file mode 100644
> index 000000000000..ad137f96e5c8
> --- /dev/null
> +++ b/drivers/cxl/core/Makefile
> @@ -0,0 +1,5 @@
> +# SPDX-License-Identifier: GPL-2.0
> +obj-$(CONFIG_CXL_BUS) += cxl_core.o
> +
> +ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL -I$(srctree)/drivers/cxl
> +cxl_core-y := bus.o
> diff --git a/drivers/cxl/core.c b/drivers/cxl/core/bus.c
> similarity index 99%
> rename from drivers/cxl/core.c
> rename to drivers/cxl/core/bus.c
> index a2e4d54fc7bc..0815eec23944 100644
> --- a/drivers/cxl/core.c
> +++ b/drivers/cxl/core/bus.c
> @@ -6,8 +6,8 @@
>  #include <linux/pci.h>
>  #include <linux/slab.h>
>  #include <linux/idr.h>
> -#include "cxl.h"
> -#include "mem.h"
> +#include <cxlmem.h>
> +#include <cxl.h>
>  
>  /**
>   * DOC: cxl core
> diff --git a/drivers/cxl/mem.h b/drivers/cxl/cxlmem.h
> similarity index 100%
> rename from drivers/cxl/mem.h
> rename to drivers/cxl/cxlmem.h
> diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
> index 4cf351a3cf99..a945c5fda292 100644
> --- a/drivers/cxl/pci.c
> +++ b/drivers/cxl/pci.c
> @@ -12,9 +12,9 @@
>  #include <linux/pci.h>
>  #include <linux/io.h>
>  #include <linux/io-64-nonatomic-lo-hi.h>
> +#include "cxlmem.h"
>  #include "pci.h"
>  #include "cxl.h"
> -#include "mem.h"
>  
>  /**
>   * DOC: cxl pci
> diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c
> index 0088e41dd2f3..9652c3ee41e7 100644
> --- a/drivers/cxl/pmem.c
> +++ b/drivers/cxl/pmem.c
> @@ -6,7 +6,7 @@
>  #include <linux/ndctl.h>
>  #include <linux/async.h>
>  #include <linux/slab.h>
> -#include "mem.h"
> +#include "cxlmem.h"
>  #include "cxl.h"
>  
>  /*