From patchwork Fri Jun 27 03:49:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 32606 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 161D0201EF for ; Fri, 27 Jun 2014 03:51:35 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id y20sf25704120ier.1 for ; Thu, 26 Jun 2014 20:51:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=iFfCU17bM8C76Y1UDbFuPtnsqXbUW65i7mkctc5oLbg=; b=WCYjmZMArZ1tOYhGHUOhIyGR1vsS+C85C8w0NCFxfonuB2Kr8reTGGOfowim6Zyyra Qcq0rcaLqfaah5eQcew2fvhSmeGlZuu5AwU8f+/Meb0PL9I+444BYI4cjMcvOMdAIqB+ g07pMEFj786nQQWvf3KoA726XHXOOnIiW1TmD4tQyk8TRqA8jHXe3WT/WKjQgJ/za4Tu GrDPq6t7/9FUX8vKNT3NJZlRQBQOayEWECCCGh74wxcJQwP6j5yqL6W1j5FLWTae7jas vOPdEalV5D3etLAGAL9ZFYx2ynZKy2+gfG3moq1WXtKRtzV/8LtIWXvwhKt1u10Ta6X0 u7Qw== X-Gm-Message-State: ALoCoQmzkkUeJtOzlR51+c9ApHN4lt7+7QnhOz9c3kzjQqa2NF+JHl/dqd1rGzveKGzIalB61vZy X-Received: by 10.50.148.1 with SMTP id to1mr4611134igb.0.1403841094659; Thu, 26 Jun 2014 20:51:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.11 with SMTP id n11ls479780qge.11.gmail; Thu, 26 Jun 2014 20:51:34 -0700 (PDT) X-Received: by 10.58.19.10 with SMTP id a10mr17851305vee.1.1403841094564; Thu, 26 Jun 2014 20:51:34 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id q9si5731169vey.41.2014.06.26.20.51.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:51:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id la4so4604446vcb.0 for ; Thu, 26 Jun 2014 20:51:34 -0700 (PDT) X-Received: by 10.220.185.202 with SMTP id cp10mr17470356vcb.15.1403841094463; Thu, 26 Jun 2014 20:51:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp77016vcb; Thu, 26 Jun 2014 20:51:34 -0700 (PDT) X-Received: by 10.68.130.38 with SMTP id ob6mr26692322pbb.141.1403841093657; Thu, 26 Jun 2014 20:51:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id af7si12482156pad.1.2014.06.26.20.51.33; Thu, 26 Jun 2014 20:51:33 -0700 (PDT) Received-SPF: none (google.com: linux-acpi-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752480AbaF0Dv0 (ORCPT + 8 others); Thu, 26 Jun 2014 23:51:26 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:48369 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752555AbaF0DvY (ORCPT ); Thu, 26 Jun 2014 23:51:24 -0400 Received: by mail-pa0-f48.google.com with SMTP id et14so4027603pad.7 for ; Thu, 26 Jun 2014 20:51:23 -0700 (PDT) X-Received: by 10.68.242.135 with SMTP id wq7mr27270278pbc.147.1403841083426; Thu, 26 Jun 2014 20:51:23 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id hk5sm12289196pbb.86.2014.06.26.20.51.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:51:22 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Bjorn Helgaas , rric@kernel.org, Grant Likely , Sudeep Holla , Mark Rutland , Charles.Garcia-Tobin@arm.com, lorenzo.pieralisi@arm.com, linaro-acpi@lists.linaro.org, Al Stone , Graeme Gregory , Tomasz Nowicki , Hanjun Guo Subject: [PATCH v4 05/13] ARM64 / ACPI: Introduce arm-core.c and its related head file Date: Fri, 27 Jun 2014 11:49:28 +0800 Message-Id: <1403840976-7456-6-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> References: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Al Stone ACPI core need lots extern variables and functions which should be provided by arch dependent code to make itself compilable. so introduce arm-core.c and its related header file here, we need: - asm/acenv.h for arch specific ACPICA environments and implementation; - asm/acpi.h for arch specific variables and functions needed by ACPI driver core; - arm-core.c for ARM64 related ACPI implementation for ACPI driver core; acpi_boot_table_init() will be called in setup_arch() before paging_init(), so we should use eary_memremap() mechanism here to get the RSDP and all the table pointers. with this patch, we can get ACPI boot-time tables from firmware on ARM64. Reviewed-by: Grant Likely Signed-off-by: Al Stone Signed-off-by: Graeme Gregory Signed-off-by: Tomasz Nowicki Signed-off-by: Hanjun Guo --- arch/arm64/include/asm/acenv.h | 18 +++++++ arch/arm64/include/asm/acpi.h | 49 ++++++++++++++++++ arch/arm64/kernel/setup.c | 4 ++ drivers/acpi/Makefile | 2 + drivers/acpi/plat/Makefile | 1 + drivers/acpi/plat/arm-core.c | 110 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 184 insertions(+) create mode 100644 arch/arm64/include/asm/acenv.h create mode 100644 arch/arm64/include/asm/acpi.h create mode 100644 drivers/acpi/plat/Makefile create mode 100644 drivers/acpi/plat/arm-core.c diff --git a/arch/arm64/include/asm/acenv.h b/arch/arm64/include/asm/acenv.h new file mode 100644 index 0000000..3899ee6 --- /dev/null +++ b/arch/arm64/include/asm/acenv.h @@ -0,0 +1,18 @@ +/* + * ARM64 specific ACPICA environments and implementation + * + * Copyright (C) 2014, Linaro Ltd. + * Author: Hanjun Guo + * Author: Graeme Gregory + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _ASM_ACENV_H +#define _ASM_ACENV_H + +#define ACPI_FLUSH_CPU_CACHE() WARN_ONCE(1, "Not currently supported on ARM64") + +#endif /* _ASM_ACENV_H */ diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h new file mode 100644 index 0000000..3ea6b84 --- /dev/null +++ b/arch/arm64/include/asm/acpi.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2013-2014, Linaro Ltd. + * Author: Al Stone + * Author: Graeme Gregory + * Author: Hanjun Guo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _ASM_ACPI_H +#define _ASM_ACPI_H + +/* Basic configuration for ACPI */ +#ifdef CONFIG_ACPI +extern int acpi_disabled; +extern int acpi_noirq; +extern int acpi_pci_disabled; +extern int acpi_strict; + +static inline void disable_acpi(void) +{ + acpi_disabled = 1; + acpi_pci_disabled = 1; + acpi_noirq = 1; +} + +/* + * The ACPI processor driver for ACPI core code needs this macro. + * Temporarily define it to -1 so that the ACPI core can compile, + * but update it when we get the hardware ID from the MADT table. + */ +#define cpu_physical_id(cpu) -1 + +static inline bool acpi_arch_is_smp(void) +{ + return 1; +} + +#endif /* CONFIG_ACPI */ + +#endif /*_ASM_ACPI_H*/ diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 46d1125..9dedb0b 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -385,6 +386,9 @@ void __init setup_arch(char **cmdline_p) efi_init(); arm64_memblock_init(); + /* Parse the ACPI tables for possible boot-time configuration */ + acpi_boot_table_init(); + paging_init(); request_standard_resources(); diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index b638e95..c50ea88 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -86,3 +86,5 @@ obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o obj-$(CONFIG_ACPI_APEI) += apei/ obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlog.o + +obj-y += plat/ diff --git a/drivers/acpi/plat/Makefile b/drivers/acpi/plat/Makefile new file mode 100644 index 0000000..46bc65e --- /dev/null +++ b/drivers/acpi/plat/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ARM64) += arm-core.o diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c new file mode 100644 index 0000000..c6c7e03 --- /dev/null +++ b/drivers/acpi/plat/arm-core.c @@ -0,0 +1,110 @@ +/* + * ARM/ARM64 Specific Low-Level ACPI Boot Support + * + * Copyright (C) 2013-2014, Linaro Ltd. + * Author: Al Stone + * Author: Graeme Gregory + * Author: Hanjun Guo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * We never plan to use RSDT on arm/arm64 as its deprecated in spec but this + * variable is still required by the ACPI core + */ +u32 acpi_rsdt_forced; + +int acpi_noirq; /* skip ACPI IRQ initialization */ +int acpi_strict; +int acpi_disabled; +EXPORT_SYMBOL(acpi_disabled); + +int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */ +EXPORT_SYMBOL(acpi_pci_disabled); + +enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; + +/* + * __acpi_map_table() will be called before page_init(), so early_ioremap() + * or early_memremap() should be called here. + */ +char *__init __acpi_map_table(unsigned long phys, unsigned long size) +{ + if (!phys || !size) + return NULL; + + return early_memremap(phys, size); +} + +void __init __acpi_unmap_table(char *map, unsigned long size) +{ + if (!map || !size) + return; + + early_iounmap(map, size); +} + +int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) +{ + *irq = -1; + + return 0; +} +EXPORT_SYMBOL_GPL(acpi_gsi_to_irq); + +/* + * success: return IRQ number (>0) + * failure: return =< 0 + */ +int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) +{ + return -1; +} +EXPORT_SYMBOL_GPL(acpi_register_gsi); + +void acpi_unregister_gsi(u32 gsi) +{ +} +EXPORT_SYMBOL_GPL(acpi_unregister_gsi); + +/* + * acpi_boot_table_init() called from setup_arch(), always. + * 1. find RSDP and get its address, and then find XSDT + * 2. extract all tables and checksums them all + * + * We can parse ACPI boot-time tables such as FADT, MADT after + * this function is called. + */ +void __init acpi_boot_table_init(void) +{ + /* If acpi_disabled, bail out */ + if (acpi_disabled) + return; + + /* Initialize the ACPI boot-time table parser. */ + if (acpi_table_init()) { + disable_acpi(); + return; + } +}