| Message ID | 157118757175.2063440.9248947575330904096.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | EFI Specific Purpose Memory Support | expand |
On Wed, Oct 16, 2019 at 3:13 AM Dan Williams <dan.j.williams@intel.com> wrote: > > Currently hmat.c lives under an "hmat" directory which does not enhance > the description of the file. The initial motivation for giving hmat.c > its own directory was to delineate it as mm functionality in contrast to > ACPI device driver functionality. > > As ACPI continues to play an increasing role in conveying > memory location and performance topology information to the OS take the > opportunity to co-locate these NUMA relevant tables in a combined > directory. > > numa.c is renamed to srat.c and moved to drivers/acpi/numa/ along with > hmat.c. > > Cc: Len Brown <lenb@kernel.org> > Cc: Keith Busch <kbusch@kernel.org> > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Please note that https://patchwork.kernel.org/patch/11078171/ is being pushed to Linus (it is overdue anyway), so if it is pulled, there will be a merge conflict with this patch. Respin maybe?
On Fri, Oct 18, 2019 at 11:25 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Wed, Oct 16, 2019 at 3:13 AM Dan Williams <dan.j.williams@intel.com> wrote: > > > > Currently hmat.c lives under an "hmat" directory which does not enhance > > the description of the file. The initial motivation for giving hmat.c > > its own directory was to delineate it as mm functionality in contrast to > > ACPI device driver functionality. > > > > As ACPI continues to play an increasing role in conveying > > memory location and performance topology information to the OS take the > > opportunity to co-locate these NUMA relevant tables in a combined > > directory. > > > > numa.c is renamed to srat.c and moved to drivers/acpi/numa/ along with > > hmat.c. > > > > Cc: Len Brown <lenb@kernel.org> > > Cc: Keith Busch <kbusch@kernel.org> > > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com> > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > > Please note that https://patchwork.kernel.org/patch/11078171/ is being > pushed to Linus (it is overdue anyway), so if it is pulled, there will > be a merge conflict with this patch. > > Respin maybe? Actually, would you mind it if I took this one into the ACPI tree right away? There's https://patchwork.kernel.org/patch/11198373/ queued up that, again, will clash with it. Also, there is the generic Initiator proximity domains series from Jonathan depending on it and I would like to move forward with that one if there are no objections.
On Tue, Oct 22, 2019 at 3:02 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Fri, Oct 18, 2019 at 11:25 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > > > On Wed, Oct 16, 2019 at 3:13 AM Dan Williams <dan.j.williams@intel.com> wrote: > > > > > > Currently hmat.c lives under an "hmat" directory which does not enhance > > > the description of the file. The initial motivation for giving hmat.c > > > its own directory was to delineate it as mm functionality in contrast to > > > ACPI device driver functionality. > > > > > > As ACPI continues to play an increasing role in conveying > > > memory location and performance topology information to the OS take the > > > opportunity to co-locate these NUMA relevant tables in a combined > > > directory. > > > > > > numa.c is renamed to srat.c and moved to drivers/acpi/numa/ along with > > > hmat.c. > > > > > > Cc: Len Brown <lenb@kernel.org> > > > Cc: Keith Busch <kbusch@kernel.org> > > > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com> > > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > > > > Please note that https://patchwork.kernel.org/patch/11078171/ is being > > pushed to Linus (it is overdue anyway), so if it is pulled, there will > > be a merge conflict with this patch. > > > > Respin maybe? > > Actually, would you mind it if I took this one into the ACPI tree right away? > > There's https://patchwork.kernel.org/patch/11198373/ queued up that, > again, will clash with it. > > Also, there is the generic Initiator proximity domains series from > Jonathan depending on it and I would like to move forward with that > one if there are no objections. Given Ard has acked all the EFI core and ARM changes can we proceed with merging the EFI Specific Purpose Memory series through Rafael's tree? It would need acks from x86 maintainers.
On Tuesday, October 22, 2019 6:48:12 PM CET Dan Williams wrote: > On Tue, Oct 22, 2019 at 3:02 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > > > On Fri, Oct 18, 2019 at 11:25 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > > > > > On Wed, Oct 16, 2019 at 3:13 AM Dan Williams <dan.j.williams@intel.com> wrote: > > > > > > > > Currently hmat.c lives under an "hmat" directory which does not enhance > > > > the description of the file. The initial motivation for giving hmat.c > > > > its own directory was to delineate it as mm functionality in contrast to > > > > ACPI device driver functionality. > > > > > > > > As ACPI continues to play an increasing role in conveying > > > > memory location and performance topology information to the OS take the > > > > opportunity to co-locate these NUMA relevant tables in a combined > > > > directory. > > > > > > > > numa.c is renamed to srat.c and moved to drivers/acpi/numa/ along with > > > > hmat.c. > > > > > > > > Cc: Len Brown <lenb@kernel.org> > > > > Cc: Keith Busch <kbusch@kernel.org> > > > > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com> > > > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > > > > > > Please note that https://patchwork.kernel.org/patch/11078171/ is being > > > pushed to Linus (it is overdue anyway), so if it is pulled, there will > > > be a merge conflict with this patch. > > > > > > Respin maybe? > > > > Actually, would you mind it if I took this one into the ACPI tree right away? > > > > There's https://patchwork.kernel.org/patch/11198373/ queued up that, > > again, will clash with it. > > > > Also, there is the generic Initiator proximity domains series from > > Jonathan depending on it and I would like to move forward with that > > one if there are no objections. > > Given Ard has acked all the EFI core and ARM changes can we proceed > with merging the EFI Specific Purpose Memory series through Rafael's > tree? It would need acks from x86 maintainers. In the face of the lack of responses here, I think I will apply this patch alone and expose a stable branch containing it in case somebody else wants to pull it in. Thanks!
On Mon, Oct 28, 2019 at 8:13 AM Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > > On Tuesday, October 22, 2019 6:48:12 PM CET Dan Williams wrote: > > On Tue, Oct 22, 2019 at 3:02 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > > > > > On Fri, Oct 18, 2019 at 11:25 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > > > > > > > On Wed, Oct 16, 2019 at 3:13 AM Dan Williams <dan.j.williams@intel.com> wrote: > > > > > > > > > > Currently hmat.c lives under an "hmat" directory which does not enhance > > > > > the description of the file. The initial motivation for giving hmat.c > > > > > its own directory was to delineate it as mm functionality in contrast to > > > > > ACPI device driver functionality. > > > > > > > > > > As ACPI continues to play an increasing role in conveying > > > > > memory location and performance topology information to the OS take the > > > > > opportunity to co-locate these NUMA relevant tables in a combined > > > > > directory. > > > > > > > > > > numa.c is renamed to srat.c and moved to drivers/acpi/numa/ along with > > > > > hmat.c. > > > > > > > > > > Cc: Len Brown <lenb@kernel.org> > > > > > Cc: Keith Busch <kbusch@kernel.org> > > > > > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > > Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com> > > > > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > > > > > > > > Please note that https://patchwork.kernel.org/patch/11078171/ is being > > > > pushed to Linus (it is overdue anyway), so if it is pulled, there will > > > > be a merge conflict with this patch. > > > > > > > > Respin maybe? > > > > > > Actually, would you mind it if I took this one into the ACPI tree right away? > > > > > > There's https://patchwork.kernel.org/patch/11198373/ queued up that, > > > again, will clash with it. > > > > > > Also, there is the generic Initiator proximity domains series from > > > Jonathan depending on it and I would like to move forward with that > > > one if there are no objections. > > > > Given Ard has acked all the EFI core and ARM changes can we proceed > > with merging the EFI Specific Purpose Memory series through Rafael's > > tree? It would need acks from x86 maintainers. > > In the face of the lack of responses here, I think I will apply this patch > alone and expose a stable branch containing it in case somebody else wants > to pull it in. Ok. x86 folks, any concerns about Rafael taking the whole lot?
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index ebe1e9e5fd81..8c7c46065e9d 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -319,12 +319,6 @@ config ACPI_THERMAL To compile this driver as a module, choose M here: the module will be called thermal. -config ACPI_NUMA - bool "NUMA support" - depends on NUMA - depends on (X86 || IA64 || ARM64) - default y if IA64 || ARM64 - config ACPI_CUSTOM_DSDT_FILE string "Custom DSDT Table file to include" default "" @@ -473,8 +467,7 @@ config ACPI_REDUCED_HARDWARE_ONLY If you are unsure what to do, do not enable this option. source "drivers/acpi/nfit/Kconfig" -source "drivers/acpi/hmat/Kconfig" - +source "drivers/acpi/numa/Kconfig" source "drivers/acpi/apei/Kconfig" source "drivers/acpi/dptf/Kconfig" diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 5d361e4e3405..f08a661274e8 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -55,7 +55,6 @@ acpi-$(CONFIG_X86) += acpi_cmos_rtc.o acpi-$(CONFIG_X86) += x86/apple.o acpi-$(CONFIG_X86) += x86/utils.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o -acpi-$(CONFIG_ACPI_NUMA) += numa.o acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_LPIT) += acpi_lpit.o @@ -80,7 +79,7 @@ obj-$(CONFIG_ACPI_PROCESSOR) += processor.o obj-$(CONFIG_ACPI) += container.o obj-$(CONFIG_ACPI_THERMAL) += thermal.o obj-$(CONFIG_ACPI_NFIT) += nfit/ -obj-$(CONFIG_ACPI_HMAT) += hmat/ +obj-$(CONFIG_ACPI_NUMA) += numa/ obj-$(CONFIG_ACPI) += acpi_memhotplug.o obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o obj-$(CONFIG_ACPI_BATTERY) += battery.o diff --git a/drivers/acpi/hmat/Makefile b/drivers/acpi/hmat/Makefile deleted file mode 100644 index 1c20ef36a385..000000000000 --- a/drivers/acpi/hmat/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_ACPI_HMAT) := hmat.o diff --git a/drivers/acpi/hmat/Kconfig b/drivers/acpi/numa/Kconfig similarity index 77% rename from drivers/acpi/hmat/Kconfig rename to drivers/acpi/numa/Kconfig index 95a29964dbea..acbd5aa76e40 100644 --- a/drivers/acpi/hmat/Kconfig +++ b/drivers/acpi/numa/Kconfig @@ -1,4 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 +config ACPI_NUMA + bool "NUMA support" + depends on NUMA + depends on (X86 || IA64 || ARM64) + default y if IA64 || ARM64 + config ACPI_HMAT bool "ACPI Heterogeneous Memory Attribute Table Support" depends on ACPI_NUMA diff --git a/drivers/acpi/numa/Makefile b/drivers/acpi/numa/Makefile new file mode 100644 index 000000000000..517a6c689a94 --- /dev/null +++ b/drivers/acpi/numa/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ACPI_NUMA) += srat.o +obj-$(CONFIG_ACPI_HMAT) += hmat.o diff --git a/drivers/acpi/hmat/hmat.c b/drivers/acpi/numa/hmat.c similarity index 100% rename from drivers/acpi/hmat/hmat.c rename to drivers/acpi/numa/hmat.c diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa/srat.c similarity index 100% rename from drivers/acpi/numa.c rename to drivers/acpi/numa/srat.c