From patchwork Tue May 24 22:35:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 9134357 X-Patchwork-Delegate: rjw@sisk.pl 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 4D015607D3 for ; Tue, 24 May 2016 22:37:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40264281E3 for ; Tue, 24 May 2016 22:37:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34D3B2822B; Tue, 24 May 2016 22:37:28 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CE54281E3 for ; Tue, 24 May 2016 22:37:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753821AbcEXWgj (ORCPT ); Tue, 24 May 2016 18:36:39 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34509 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753677AbcEXWgS (ORCPT ); Tue, 24 May 2016 18:36:18 -0400 Received: by mail-pf0-f194.google.com with SMTP id 145so3422375pfz.1; Tue, 24 May 2016 15:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PgmbBv+jO+oqOGVwQc94qjfjaJDqkNBeRK3S8v6lZL4=; b=hU7XS+nTMYfUKADLeaTirdf7nAeXTmPoG7DNWioBePZsifZmfiVTjwNL05S9weuDSW c4gu0hOWI2NXtixad02t0JznYcn31e5b0RtTaXxX7UtKscntIXI4gctU6Aybe/TeNW2N TBpZqNdgUmT3vNogPtBJSo/c1Le9fss1J1pL2sYHt7CcPh5oy8RWSYj6p/F6/rhrM5yE gGfx40ZeHDekD9i7OHh0oGIWfixTLTWbTHWHlLI1kqzOGqvak0QWAk3cKagr9sIlENjO D1lBw6YS9XCe/RjY5Vr/X9kwv0yA0fKk2K/2/gGAdC9h9NYB+RNYCMng1teMM2Hj4O86 P6NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PgmbBv+jO+oqOGVwQc94qjfjaJDqkNBeRK3S8v6lZL4=; b=lqbX2QDQWXC2tb+IDmnxEj85L28WK+bO8CQmVH90av6bAkZ1r9pMfoXSuPxCE6wprL 5v+/mxa1tKZ4TZPrJJcHj5bDNfwwXIIF6tj0Ovn8vJwfjvTP/WUoXhL4XFhQeon2yOfw kIGYhX/1IMXg+0gM8Ja4pTQFDIu8IbMmbokQ6AL2WXJim0luu9GTHfvuxwKI5PF20BEh UmIFaDzB5pjgh58XtwYqGa2wmH8B3BL29G59/KJuLeXoaArW2Qd6nnjIeUtXa8BxZoAp ZKAPXPwuNdiu0FlaHuval+1b5s7YgLvHUentXtg7jgOvQMGyvlYbB6xGIcmwogx741Gv kXGA== X-Gm-Message-State: ALyK8tIvMlikWATV668kJYx2WDBHGwxktJatW28Cqkahb+R+66QgdE0UaUeHq4Jt9Rx/FQ== X-Received: by 10.98.94.194 with SMTP id s185mr799097pfb.135.1464129377537; Tue, 24 May 2016 15:36:17 -0700 (PDT) Received: from dl.caveonetworks.com ([50.233.148.158]) by smtp.gmail.com with ESMTPSA id x123sm56695980pfb.54.2016.05.24.15.36.04 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 May 2016 15:36:09 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u4OMa3GL019088; Tue, 24 May 2016 15:36:03 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u4OMa3d8019087; Tue, 24 May 2016 15:36:03 -0700 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Hanjun Guo , Marc Zyngier , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney Subject: [PATCH v7 13/15] ACPI / processor: Add acpi_map_madt_entry(). Date: Tue, 24 May 2016 15:35:43 -0700 Message-Id: <1464129345-18985-14-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com> References: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Daney Follow-on arm64 ACPI/NUMA patches need to map MADT entries very early (before kmalloc is usable). Add acpi_map_madt_entry() which, indirectly, uses early_memremap()/early_memunmap() to access the table and parse out the mpidr. The existing implementation of map_madt_entry() is modified to take a pointer to the MADT as a parameter and the callers adjusted. Signed-off-by: David Daney Acked-by: Catalin Marinas --- drivers/acpi/processor_core.c | 26 ++++++++++++++++++++++---- include/acpi/processor.h | 1 + 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 33a38d6..9125d7d 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -108,13 +108,12 @@ static int map_gicc_mpidr(struct acpi_subtable_header *entry, return -EINVAL; } -static phys_cpuid_t map_madt_entry(int type, u32 acpi_id) +static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, + int type, u32 acpi_id) { unsigned long madt_end, entry; phys_cpuid_t phys_id = PHYS_CPUID_INVALID; /* CPU hardware ID */ - struct acpi_table_madt *madt; - madt = get_madt_table(); if (!madt) return phys_id; @@ -145,6 +144,25 @@ static phys_cpuid_t map_madt_entry(int type, u32 acpi_id) return phys_id; } +phys_cpuid_t __init acpi_map_madt_entry(u32 acpi_id) +{ + struct acpi_table_madt *madt = NULL; + acpi_size tbl_size; + phys_cpuid_t rv; + + acpi_get_table_with_size(ACPI_SIG_MADT, 0, + (struct acpi_table_header **)&madt, + &tbl_size); + if (!madt) + return PHYS_CPUID_INVALID; + + rv = map_madt_entry(madt, 1, acpi_id); + + early_acpi_os_unmap_memory(madt, tbl_size); + + return rv; +} + static phys_cpuid_t map_mat_entry(acpi_handle handle, int type, u32 acpi_id) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; @@ -185,7 +203,7 @@ phys_cpuid_t acpi_get_phys_id(acpi_handle handle, int type, u32 acpi_id) phys_id = map_mat_entry(handle, type, acpi_id); if (invalid_phys_cpuid(phys_id)) - phys_id = map_madt_entry(type, acpi_id); + phys_id = map_madt_entry(get_madt_table(), type, acpi_id); return phys_id; } diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 6f1805d..f473e66 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -309,6 +309,7 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit) /* in processor_core.c */ phys_cpuid_t acpi_get_phys_id(acpi_handle, int type, u32 acpi_id); +phys_cpuid_t acpi_map_madt_entry(u32 acpi_id); int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id); int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);