From: Jeremy Linton <jeremy.linton@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, will.deacon@arm.com, punit.agrawal@arm.com,
linux-acpi@vger.kernel.org, mlangsdorf@redhat.com,
steve.capper@arm.com
Subject: [PATCH v8 4/9] arm64: Rename the common MADT parse routine
Date: Mon, 29 Aug 2016 16:48:15 -0500 [thread overview]
Message-ID: <1472507300-9844-5-git-send-email-jeremy.linton@arm.com> (raw)
In-Reply-To: <1472507300-9844-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 d93d433..a6552fe 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -506,13 +506,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;
@@ -565,7 +566,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;
@@ -576,7 +577,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;
}
@@ -659,7 +660,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:[~2016-08-29 21:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 21:48 [PATCH v8 0/9] Enable PMUs in ACPI systems Jeremy Linton
2016-08-29 21:48 ` [PATCH v8 1/9] arm64: pmu: add fallback probe table Jeremy Linton
2016-08-29 21:48 ` [PATCH v8 2/9] arm64: pmu: Probe default hw/cache counters Jeremy Linton
2016-08-29 21:48 ` [PATCH v8 3/9] arm64: pmu: Hoist pmu platform device name Jeremy Linton
2016-08-29 21:48 ` Jeremy Linton [this message]
2016-08-29 21:48 ` [PATCH v8 5/9] arm64: pmu: Cache PMU interrupt numbers from MADT parse Jeremy Linton
2016-08-29 21:48 ` [PATCH v8 6/9] arm: arm64: Add routine to determine cpuid of other cpus Jeremy Linton
2016-08-29 21:48 ` [PATCH v8 7/9] arm: arm64: pmu: Assign platform PMU CPU affinity Jeremy Linton
2016-08-29 21:48 ` [PATCH v8 8/9] arm64: pmu: Detect and enable multiple PMUs in an ACPI system Jeremy Linton
2016-09-09 17:26 ` Will Deacon
2016-08-29 21:48 ` [PATCH v8 9/9] MAINTAINERS: Tweak ARM PMU maintainers Jeremy Linton
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=1472507300-9844-5-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=mark.rutland@arm.com \
--cc=mlangsdorf@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).