| Message ID | 20240430092200.2335887-3-rrichter@amd.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | SRAT/CEDT fixes and updates | expand |
On Tue, 30 Apr 2024 11:21:55 +0200 Robert Richter <rrichter@amd.com> wrote: > With the removal of the Itanium architecture [1] the last architecture > dependent functions: > > acpi_numa_slit_init(), acpi_numa_memory_affinity_init() > > were removed. Remove its remainings in the header files too and make > them static. > > [1] commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture") > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > Signed-off-by: Robert Richter <rrichter@amd.com> Trivial comment inline. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/acpi/numa/srat.c | 16 ++-------------- > include/linux/acpi.h | 5 ----- > 2 files changed, 2 insertions(+), 19 deletions(-) > > diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c > index 3b09fd39eeb4..e4d53e3660fd 100644 > --- a/drivers/acpi/numa/srat.c > +++ b/drivers/acpi/numa/srat.c > @@ -213,13 +213,12 @@ __weak int __init numa_fill_memblks(u64 start, u64 end) > return NUMA_NO_MEMBLK; > } > > -#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH) > /* > * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for Doesn't like like a callback to me. It's just a normal function. > * I/O localities since SRAT does not list them. I/O localities are > * not supported at this point. > */ > -void __init acpi_numa_slit_init(struct acpi_table_slit *slit) > +static void __init acpi_numa_slit_init(struct acpi_table_slit *slit) > { > int i, j; > > @@ -241,11 +240,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) > } > } > > -/* > - * Default callback for parsing of the Proximity Domain <-> Memory > - * Area mappings > - */ > -int __init > +static int __init > acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) > { > u64 start, end; > @@ -345,13 +340,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, > (*fake_pxm)++; > return 0; > } > -#else > -static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, > - void *arg, const unsigned long table_end) > -{ > - return 0; > -} > -#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ > > static int __init acpi_parse_slit(struct acpi_table_header *table) > { > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 34829f2c517a..2c227b61a452 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -242,9 +242,6 @@ static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc) > return gicc->flags & ACPI_MADT_ENABLED; > } > > -/* the following numa functions are architecture-dependent */ > -void acpi_numa_slit_init (struct acpi_table_slit *slit); > - > #if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH) > void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); > #else > @@ -267,8 +264,6 @@ static inline void > acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { } > #endif > > -int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); > - > #ifndef PHYS_CPUID_INVALID > typedef u32 phys_cpuid_t; > #define PHYS_CPUID_INVALID (phys_cpuid_t)(-1)
On Tue, Apr 30, 2024 at 11:21:55AM +0200, Robert Richter wrote: > With the removal of the Itanium architecture [1] the last architecture > dependent functions: > > acpi_numa_slit_init(), acpi_numa_memory_affinity_init() > > were removed. Remove its remainings in the header files too and make > them static. > > [1] commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture") Reviewed-by: Alison Schofield <alison.schofield@intel.com> > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > Signed-off-by: Robert Richter <rrichter@amd.com> > --- > drivers/acpi/numa/srat.c | 16 ++-------------- > include/linux/acpi.h | 5 ----- > 2 files changed, 2 insertions(+), 19 deletions(-) > > diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c > index 3b09fd39eeb4..e4d53e3660fd 100644 > --- a/drivers/acpi/numa/srat.c > +++ b/drivers/acpi/numa/srat.c > @@ -213,13 +213,12 @@ __weak int __init numa_fill_memblks(u64 start, u64 end) > return NUMA_NO_MEMBLK; > } > > -#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH) > /* > * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for > * I/O localities since SRAT does not list them. I/O localities are > * not supported at this point. > */ > -void __init acpi_numa_slit_init(struct acpi_table_slit *slit) > +static void __init acpi_numa_slit_init(struct acpi_table_slit *slit) > { > int i, j; > > @@ -241,11 +240,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) > } > } > > -/* > - * Default callback for parsing of the Proximity Domain <-> Memory > - * Area mappings > - */ > -int __init > +static int __init > acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) > { > u64 start, end; > @@ -345,13 +340,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, > (*fake_pxm)++; > return 0; > } > -#else > -static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, > - void *arg, const unsigned long table_end) > -{ > - return 0; > -} > -#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ > > static int __init acpi_parse_slit(struct acpi_table_header *table) > { > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 34829f2c517a..2c227b61a452 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -242,9 +242,6 @@ static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc) > return gicc->flags & ACPI_MADT_ENABLED; > } > > -/* the following numa functions are architecture-dependent */ > -void acpi_numa_slit_init (struct acpi_table_slit *slit); > - > #if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH) > void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); > #else > @@ -267,8 +264,6 @@ static inline void > acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { } > #endif > > -int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); > - > #ifndef PHYS_CPUID_INVALID > typedef u32 phys_cpuid_t; > #define PHYS_CPUID_INVALID (phys_cpuid_t)(-1) > -- > 2.39.2 >
diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 3b09fd39eeb4..e4d53e3660fd 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -213,13 +213,12 @@ __weak int __init numa_fill_memblks(u64 start, u64 end) return NUMA_NO_MEMBLK; } -#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH) /* * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for * I/O localities since SRAT does not list them. I/O localities are * not supported at this point. */ -void __init acpi_numa_slit_init(struct acpi_table_slit *slit) +static void __init acpi_numa_slit_init(struct acpi_table_slit *slit) { int i, j; @@ -241,11 +240,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) } } -/* - * Default callback for parsing of the Proximity Domain <-> Memory - * Area mappings - */ -int __init +static int __init acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { u64 start, end; @@ -345,13 +340,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, (*fake_pxm)++; return 0; } -#else -static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, - void *arg, const unsigned long table_end) -{ - return 0; -} -#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ static int __init acpi_parse_slit(struct acpi_table_header *table) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 34829f2c517a..2c227b61a452 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -242,9 +242,6 @@ static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc) return gicc->flags & ACPI_MADT_ENABLED; } -/* the following numa functions are architecture-dependent */ -void acpi_numa_slit_init (struct acpi_table_slit *slit); - #if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH) void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); #else @@ -267,8 +264,6 @@ static inline void acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { } #endif -int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); - #ifndef PHYS_CPUID_INVALID typedef u32 phys_cpuid_t; #define PHYS_CPUID_INVALID (phys_cpuid_t)(-1)
With the removal of the Itanium architecture [1] the last architecture dependent functions: acpi_numa_slit_init(), acpi_numa_memory_affinity_init() were removed. Remove its remainings in the header files too and make them static. [1] commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture") Reviewed-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Robert Richter <rrichter@amd.com> --- drivers/acpi/numa/srat.c | 16 ++-------------- include/linux/acpi.h | 5 ----- 2 files changed, 2 insertions(+), 19 deletions(-)