Subject: [PATCH v13 1/7] arm64: Rename the common MADT parse routine

From: [email-masked] (Lorenzo Pieralisi)
Date: Fri, 20 Jan 2017 16:22:36 +0000

On Tue, Jan 17, 2017 at 02:50:04PM -0600, Jeremy Linton wrote:
> The MADT parser in smp.c is now being used to parse
> out NUMA, PMU and ACPI parking protocol information as

Nit: It is not used to parse PMU yet at this stage so
either you remove PMU from the list or you move this patch
to the end of the series.

> well as the GIC information for which it was originally
> created. Rename it to avoid a misleading name.

It is funny smp.c never mapped _any_ GIC information :) (even
though it parses the MADT GIC CPU interface entries).

> Signed-off-by: Jeremy Linton <[email-masked]>
> ---
>  arch/arm64/kernel/smp.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
> index cb87234..8ea244c 100644
> --- a/arch/arm64/kernel/smp.c
> +++ b/arch/arm64/kernel/smp.c
> @@ -517,13 +517,14 @@ static unsigned int cpu_count = 1;
>  
>  #ifdef CONFIG_ACPI
>  /*
> - * acpi_map_gic_cpu_interface - parse processor MADT entry
> + * acpi_verify_and_map_madt - parse processor MADT entry
>   *
>   * Carry out sanity checks on MADT processor entry and initialize
> - * cpu_logical_map on success
> + * cpu_logical_map, the ACPI parking protocol, NUMA mapping
> + * and the PMU interrupts on success
>   */
>  static void __init
> -acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
> +acpi_verify_and_map_madt(struct acpi_madt_generic_interrupt *processor)

acpi_map_madt_cpu_entry()

or just drop this patch to avoid useless bikeshedding, your choice.

>  {
>  	u64 hwid = processor->arm_mpidr;
>  
> @@ -577,7 +578,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
>  }
>  
>  static int __init
> -acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,
> +acpi_parse_madt_common(struct acpi_subtable_header *header,
>  			     const unsigned long end)

acpi_madt_parse_cpus()

Acked-by: Lorenzo Pieralisi <[email-masked]>

>  {
>  	struct acpi_madt_generic_interrupt *processor;
> @@ -588,7 +589,7 @@ acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,
>  
>  	acpi_table_print_madt_entry(header);
>  
> -	acpi_map_gic_cpu_interface(processor);
> +	acpi_verify_and_map_madt(processor);
>  
>  	return 0;
>  }
> @@ -672,7 +673,7 @@ void __init smp_init_cpus(void)
>  		 * we need for SMP init
>  		 */
>  		acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,
> -				      acpi_parse_gic_cpu_interface, 0);
> +				      acpi_parse_madt_common, 0);
>  
>  	if (cpu_count > nr_cpu_ids)
>  		pr_warn("Number of cores (%d) exceeds configured maximum of %d - clipping\n",
> -- 
> 2.5.5
>