From patchwork Fri Dec 2 18:55:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 9458965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 939CE60236 for ; Fri, 2 Dec 2016 18:58:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 865B628584 for ; Fri, 2 Dec 2016 18:58:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 794A928590; Fri, 2 Dec 2016 18:58:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0F9CC28584 for ; Fri, 2 Dec 2016 18:58:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCt12-0002m6-Na; Fri, 02 Dec 2016 18:57:00 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCt0R-0002AK-SW for linux-arm-kernel@lists.infradead.org; Fri, 02 Dec 2016 18:56:26 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D6B041597; Fri, 2 Dec 2016 10:56:02 -0800 (PST) Received: from beelzebub.ast.arm.com (unknown [10.118.96.220]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 69C6F3F53A; Fri, 2 Dec 2016 10:56:02 -0800 (PST) From: Jeremy Linton To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v11 1/7] arm64: Rename the common MADT parse routine Date: Fri, 2 Dec 2016 12:55:55 -0600 Message-Id: <1480704961-6910-2-git-send-email-jeremy.linton@arm.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1480704961-6910-1-git-send-email-jeremy.linton@arm.com> References: <1480704961-6910-1-git-send-email-jeremy.linton@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161202_105624_118855_B19E3A33 X-CRM114-Status: UNSURE ( 7.45 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, steve.capper@arm.com, mlangsdorf@redhat.com, punit.agrawal@arm.com, will.deacon@arm.com, linux@armlinux.org.uk, linux-acpi@vger.kernel.org, msalter@redhat.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 8507703..f3f1c90 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -511,13 +511,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; @@ -571,7 +572,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; @@ -582,7 +583,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; } @@ -666,7 +667,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",