From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3438C433FE for ; Tue, 14 Sep 2021 08:56:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABCE160FD7 for ; Tue, 14 Sep 2021 08:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231178AbhINI5q (ORCPT ); Tue, 14 Sep 2021 04:57:46 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3788 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbhINI5q (ORCPT ); Tue, 14 Sep 2021 04:57:46 -0400 Received: from fraeml735-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4H7xwq1S5Mz67Y1y; Tue, 14 Sep 2021 16:54:19 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml735-chm.china.huawei.com (10.206.15.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Tue, 14 Sep 2021 10:56:27 +0200 Received: from localhost (10.52.120.164) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Tue, 14 Sep 2021 09:56:26 +0100 Date: Tue, 14 Sep 2021 09:56:23 +0100 From: Jonathan Cameron To: Sasha Levin CC: , , Ben Widawsky , kernel test robot , Dan Williams , , Subject: Re: [PATCH AUTOSEL 5.14 03/25] cxl: Move cxl_core to new directory Message-ID: <20210914095623.00005306@Huawei.com> In-Reply-To: <20210913223339.435347-3-sashal@kernel.org> References: <20210913223339.435347-1-sashal@kernel.org> <20210913223339.435347-3-sashal@kernel.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.52.120.164] X-ClientProxiedBy: lhreml726-chm.china.huawei.com (10.201.108.77) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, 13 Sep 2021 18:33:17 -0400 Sasha Levin wrote: > From: Ben Widawsky > > [ 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 > Signed-off-by: Ben Widawsky > Reviewed-by: Jonathan Cameron > Link: https://lore.kernel.org/r/162792537866.368511.8915631504621088321.stgit@dwillia2-desk3.amr.corp.intel.com > Signed-off-by: Dan Williams > Signed-off-by: Sasha Levin > --- > 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 > #include > #include > -#include "cxl.h" > -#include "mem.h" > +#include > +#include > > /** > * 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 > #include > #include > +#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 > #include > #include > -#include "mem.h" > +#include "cxlmem.h" > #include "cxl.h" > > /*