From: hanjun.guo@linaro.org (Hanjun Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 14/18] ARM64 / ACPI: Add GICv2 specific ACPI boot support
Date: Fri, 12 Sep 2014 22:00:12 +0800 [thread overview]
Message-ID: <1410530416-30200-15-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org>
From: Tomasz Nowicki <tomasz.nowicki@linaro.org>
ACPI kernel uses MADT table for proper GIC initialization. It needs to
parse GIC related subtables, collect CPU interface and distributor
addresses and call driver initialization function (which is hardware
abstraction agnostic). In a similar way, FDT initialize GICv1/2.
NOTE: This commit allow to initialize GICv1/2 basic functionality.
GICv2 vitalization extension, GICv3/4 and ITS are considered as next
steps.
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
arch/arm64/kernel/acpi.c | 23 ++++++++
drivers/irqchip/irq-gic.c | 106 ++++++++++++++++++++++++++++++++++
drivers/irqchip/irqchip.c | 3 +
include/linux/irqchip/arm-gic-acpi.h | 31 ++++++++++
4 files changed, 163 insertions(+)
create mode 100644 include/linux/irqchip/arm-gic-acpi.h
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 5b3546b..9869377 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -23,6 +23,7 @@
#include <linux/irqdomain.h>
#include <linux/bootmem.h>
#include <linux/smp.h>
+#include <linux/irqchip/arm-gic-acpi.h>
#include <asm/cputype.h>
#include <asm/cpu_ops.h>
@@ -312,6 +313,28 @@ void __init acpi_boot_table_init(void)
pr_err("Can't find FADT or error happened during parsing FADT\n");
}
+void __init acpi_gic_init(void)
+{
+ struct acpi_table_header *table;
+ acpi_status status;
+ acpi_size tbl_size;
+ int err;
+
+ status = acpi_get_table_with_size(ACPI_SIG_MADT, 0, &table, &tbl_size);
+ if (ACPI_FAILURE(status)) {
+ const char *msg = acpi_format_exception(status);
+
+ pr_err("Failed to get MADT table, %s\n", msg);
+ return;
+ }
+
+ err = gic_v2_acpi_init(table);
+ if (err)
+ pr_err("Failed to initialize GIC IRQ controller");
+
+ early_acpi_os_unmap_memory((char *)table, tbl_size);
+}
+
static int __init parse_acpi(char *arg)
{
if (!arg)
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 4b959e6..8aba096 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -33,12 +33,14 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
+#include <linux/acpi.h>
#include <linux/irqdomain.h>
#include <linux/interrupt.h>
#include <linux/percpu.h>
#include <linux/slab.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/irqchip/arm-gic.h>
+#include <linux/irqchip/arm-gic-acpi.h>
#include <asm/cputype.h>
#include <asm/irq.h>
@@ -1029,3 +1031,107 @@ IRQCHIP_DECLARE(msm_8660_qgic, "qcom,msm-8660-qgic", gic_of_init);
IRQCHIP_DECLARE(msm_qgic2, "qcom,msm-qgic2", gic_of_init);
#endif
+
+#ifdef CONFIG_ACPI
+static phys_addr_t dist_phy_base, cpu_phy_base;
+static int cpu_base_assigned;
+
+static int __init
+gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
+ const unsigned long end)
+{
+ struct acpi_madt_generic_interrupt *processor;
+ phys_addr_t gic_cpu_base;
+
+ processor = (struct acpi_madt_generic_interrupt *)header;
+
+ if (BAD_MADT_ENTRY(processor, end))
+ return -EINVAL;
+
+ /*
+ * There is no support for non-banked GICv1/2 register in ACPI spec.
+ * All CPU interface addresses have to be the same.
+ */
+ gic_cpu_base = processor->base_address;
+ if (cpu_base_assigned && gic_cpu_base != cpu_phy_base)
+ return -EFAULT;
+
+ cpu_phy_base = gic_cpu_base;
+ cpu_base_assigned = 1;
+ return 0;
+}
+
+static int __init
+gic_acpi_parse_madt_distributor(struct acpi_subtable_header *header,
+ const unsigned long end)
+{
+ struct acpi_madt_generic_distributor *dist;
+
+ dist = (struct acpi_madt_generic_distributor *)header;
+
+ if (BAD_MADT_ENTRY(dist, end))
+ return -EINVAL;
+
+ dist_phy_base = dist->base_address;
+ return 0;
+}
+
+int __init
+gic_v2_acpi_init(struct acpi_table_header *table)
+{
+ void __iomem *cpu_base, *dist_base;
+ int count;
+
+ /* Collect CPU base addresses */
+ count = acpi_parse_entries(sizeof(struct acpi_table_madt),
+ gic_acpi_parse_madt_cpu, table,
+ ACPI_MADT_TYPE_GENERIC_INTERRUPT, 0);
+ if (count < 0) {
+ pr_err("Error during GICC entries parsing\n");
+ return -EFAULT;
+ } else if (!count) {
+ pr_err("No valid GICC entries exist\n");
+ return -EINVAL;
+ }
+
+ /*
+ * Find distributor base address. We expect one distributor entry since
+ * ACPI 5.1 spec neither support multi-GIC instances nor GIC cascade.
+ */
+ count = acpi_parse_entries(sizeof(struct acpi_table_madt),
+ gic_acpi_parse_madt_distributor, table,
+ ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR, 0);
+ if (count <= 0) {
+ pr_err("Error during GICD entries parsing\n");
+ return -EFAULT;
+ } else if (!count) {
+ pr_err("No valid GICD entries exist\n");
+ return -EINVAL;
+ } else if (count > 1) {
+ pr_err("More than one GICD entry detected\n");
+ return -EINVAL;
+ }
+
+ cpu_base = ioremap(cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
+ if (!cpu_base) {
+ pr_err("Unable to map GICC registers\n");
+ return -ENOMEM;
+ }
+
+ dist_base = ioremap(dist_phy_base, ACPI_GICV2_DIST_MEM_SIZE);
+ if (!dist_base) {
+ pr_err("Unable to map GICD registers\n");
+ iounmap(cpu_base);
+ return -ENOMEM;
+ }
+
+ /*
+ * Initialize zero GIC instance (no multi-GIC support). Also, set GIC
+ * as default IRQ domain to allow for GSI registration and GSI to IRQ
+ * number translation (see acpi_register_gsi() and acpi_gsi_to_irq()).
+ */
+ gic_init_bases(0, -1, dist_base, cpu_base, 0, NULL);
+ irq_set_default_host(gic_data[0].domain);
+ return 0;
+}
+#endif
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index 0fe2f71..9106c6d 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/of_irq.h>
#include <linux/irqchip.h>
+#include <linux/irqchip/arm-gic-acpi.h>
/*
* This special of_device_id is the sentinel at the end of the
@@ -26,4 +27,6 @@ extern struct of_device_id __irqchip_of_table[];
void __init irqchip_init(void)
{
of_irq_init(__irqchip_of_table);
+
+ acpi_gic_init();
}
diff --git a/include/linux/irqchip/arm-gic-acpi.h b/include/linux/irqchip/arm-gic-acpi.h
new file mode 100644
index 0000000..ad5b577
--- /dev/null
+++ b/include/linux/irqchip/arm-gic-acpi.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014, Linaro Ltd.
+ * Author: Tomasz Nowicki <tomasz.nowicki@linaro.org>
+ *
+ * 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 ARM_GIC_ACPI_H_
+#define ARM_GIC_ACPI_H_
+
+#ifdef CONFIG_ACPI
+
+/*
+ * Hard code here, we can not get memory size from MADT (but FDT does),
+ * Actually no need to do that, because this size can be inferred
+ * from GIC spec.
+ */
+#define ACPI_GICV2_DIST_MEM_SIZE (SZ_4K)
+#define ACPI_GIC_CPU_IF_MEM_SIZE (SZ_8K)
+
+struct acpi_table_header;
+
+void acpi_gic_init(void);
+int gic_v2_acpi_init(struct acpi_table_header *table);
+#else
+static inline void acpi_gic_init(void) { }
+#endif
+
+#endif /* ARM_GIC_ACPI_H_ */
--
1.7.9.5
next prev parent reply other threads:[~2014-09-12 14:00 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 13:59 [PATCH v4 00/18] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-09-12 13:59 ` [PATCH v4 01/18] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Hanjun Guo
2014-09-12 19:34 ` Jon Masters
2014-09-15 6:16 ` Olof Johansson
2014-09-17 16:48 ` Mark Rutland
2014-09-12 14:00 ` [PATCH v4 02/18] ACPI / table: Add new function to get table entries Hanjun Guo
2014-09-15 16:48 ` Grant Likely
2014-09-12 14:00 ` [PATCH v4 03/18] ACPI / table: Count matched and successfully parsed entries without specifying max entries Hanjun Guo
2014-09-15 16:48 ` Grant Likely
2014-09-12 14:00 ` [PATCH v4 04/18] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 05/18] ARM64 / ACPI: Introduce sleep-arm.c Hanjun Guo
2014-09-12 14:51 ` Catalin Marinas
2014-09-12 15:18 ` Graeme Gregory
2014-09-12 15:49 ` Catalin Marinas
2014-09-12 16:32 ` Graeme Gregory
2014-09-17 1:31 ` Matthew Garrett
2014-09-12 19:43 ` Jon Masters
2014-09-12 20:03 ` Graeme Gregory
2014-09-12 21:10 ` Jon Masters
2014-09-12 14:00 ` [PATCH v4 06/18] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo
2014-09-15 6:28 ` Olof Johansson
2014-09-15 14:51 ` Catalin Marinas
2014-09-15 16:09 ` Olof Johansson
2014-09-15 16:31 ` Jon Masters
2014-09-15 22:55 ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 07/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 08/18] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 09/18] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-09-15 6:38 ` Olof Johansson
2014-09-15 14:54 ` Catalin Marinas
2014-09-15 23:24 ` Jon Masters
2014-09-15 23:34 ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 10/18] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-09-15 6:40 ` Olof Johansson
2014-09-15 14:11 ` Jon Masters
2014-09-15 17:52 ` Grant Likely
2014-09-15 18:01 ` Olof Johansson
2014-09-15 21:55 ` Jon Masters
2014-09-12 14:00 ` [PATCH v4 11/18] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2014-09-12 19:47 ` Jon Masters
2014-09-15 14:56 ` Catalin Marinas
2014-09-15 23:19 ` Jon Masters
2014-09-15 7:00 ` Olof Johansson
2014-09-16 0:01 ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 12/18] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-09-15 7:05 ` Olof Johansson
2014-09-16 0:11 ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 13/18] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2014-09-12 14:00 ` Hanjun Guo [this message]
2014-09-12 19:48 ` [PATCH v4 14/18] ARM64 / ACPI: Add GICv2 specific ACPI boot support Jon Masters
2014-09-15 15:01 ` Catalin Marinas
2014-09-15 16:16 ` Jon Masters
2014-09-15 16:42 ` Catalin Marinas
2014-09-17 7:40 ` Tomasz Nowicki
2014-09-17 15:14 ` Catalin Marinas
2014-09-18 2:25 ` Arnd Bergmann
2014-09-18 16:00 ` Catalin Marinas
2014-09-12 14:00 ` [PATCH v4 15/18] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-09-15 7:13 ` Olof Johansson
2014-09-12 14:00 ` [PATCH v4 16/18] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 17/18] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 18/18] Documentation: ACPI for ARM64 Hanjun Guo
2014-09-15 7:33 ` Olof Johansson
2014-09-17 1:44 ` Matthew Garrett
2014-09-17 1:57 ` Matthew Garrett
2014-09-17 8:58 ` Jon Masters
2014-09-17 17:02 ` Mark Brown
2014-09-17 16:05 ` Graeme Gregory
2014-09-17 23:22 ` Arnd Bergmann
2014-09-17 23:40 ` Graeme Gregory
2014-09-18 15:54 ` Catalin Marinas
2014-09-18 23:20 ` Rafael J. Wysocki
2014-09-18 23:59 ` Jon Masters
2014-09-17 19:37 ` Rafael J. Wysocki
2014-09-17 19:22 ` Matthew Garrett
2014-09-17 19:29 ` Jon Masters
2014-09-17 20:11 ` Rafael J. Wysocki
2014-09-17 19:59 ` Matthew Garrett
2014-09-17 23:06 ` Hanjun Guo
2014-09-22 19:48 ` Pavel Machek
2014-09-22 20:31 ` Matthew Garrett
2014-09-22 22:46 ` Rafael J. Wysocki
2014-09-22 22:28 ` Matthew Garrett
2014-09-22 22:34 ` Hanjun Guo
2014-09-22 22:38 ` Matthew Garrett
2014-09-22 23:22 ` Rafael J. Wysocki
2014-09-22 22:55 ` Al Stone
2014-09-22 23:07 ` Matthew Garrett
2014-09-22 22:40 ` Al Stone
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=1410530416-30200-15-git-send-email-hanjun.guo@linaro.org \
--to=hanjun.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).