From: Jeremy Linton <jeremy.linton@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-acpi@vger.kernel.org, will.deacon@arm.com, mark.rutland@arm.com, punit.agrawal@arm.com, steve.capper@arm.com, msalter@redhat.com, mlangsdorf@redhat.com, linux@armlinux.org.uk Subject: [PATCH v12 1/7] arm64: Rename the common MADT parse routine Date: Tue, 10 Jan 2017 11:17:46 -0600 [thread overview] Message-ID: <1484068672-15852-2-git-send-email-jeremy.linton@arm.com> (raw) In-Reply-To: <1484068672-15852-1-git-send-email-jeremy.linton@arm.com> The MADT parser in smp.c is now being used to parse out NUMA, PMU and ACPI parking protocol information as well as the GIC information for which it was originally created. Rename it to avoid a misleading name. Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> --- 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) { 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) { 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
WARNING: multiple messages have this Message-ID (diff)
From: jeremy.linton@arm.com (Jeremy Linton) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v12 1/7] arm64: Rename the common MADT parse routine Date: Tue, 10 Jan 2017 11:17:46 -0600 [thread overview] Message-ID: <1484068672-15852-2-git-send-email-jeremy.linton@arm.com> (raw) In-Reply-To: <1484068672-15852-1-git-send-email-jeremy.linton@arm.com> The MADT parser in smp.c is now being used to parse out NUMA, PMU and ACPI parking protocol information as well as the GIC information for which it was originally created. Rename it to avoid a misleading name. Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> --- 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) { 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) { 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
next prev parent reply other threads:[~2017-01-10 17:17 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-10 17:17 [PATCH v12 0/7] Enable PMUs in ACPI systems Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton [this message] 2017-01-10 17:17 ` [PATCH v12 1/7] arm64: Rename the common MADT parse routine Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 2/7] arm: arm64: Add routine to determine cpuid of other cpus Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 3/7] arm64: pmu: Cache PMU interrupt numbers from MADT parse Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 4/7] arm: arm64: pmu: Assign platform PMU CPU affinity Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 5/7] arm64: pmu: Detect multiple generic PMUs and append counter Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 6/7] arm64: pmu: Detect and enable multiple PMUs in an ACPI system Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-16 18:28 ` Lorenzo Pieralisi 2017-01-16 18:28 ` Lorenzo Pieralisi 2017-01-17 19:57 ` Jeremy Linton 2017-01-17 19:57 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 7/7] arm: pmu: Add PMU definitions for cores not initially online Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-14 9:00 ` [PATCH v12 0/7] Enable PMUs in ACPI systems Bamvor Zhang 2017-01-14 9:00 ` Bamvor Zhang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1484068672-15852-2-git-send-email-jeremy.linton@arm.com \ --to=jeremy.linton@arm.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=mlangsdorf@redhat.com \ --cc=msalter@redhat.com \ --cc=punit.agrawal@arm.com \ --cc=steve.capper@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.