From: hanjun.guo@linaro.org (Hanjun Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 15/21] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
Date: Mon, 2 Feb 2015 20:45:43 +0800 [thread overview]
Message-ID: <1422881149-8177-16-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org>
Introduce ACPI_IRQ_MODEL_GIC which is needed for ARM64 as GIC is
used, and then register device's gsi with the core IRQ subsystem.
acpi_register_gsi() is similar to DT based irq_of_parse_and_map(),
since gsi is unique in the system, so use hwirq number directly
for the mapping.
We are going to implement stacked domains when GICv2m, GICv3, ITS
support are added.
CC: Marc Zyngier <marc.zyngier@arm.com>
Originally-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Tested-by: Yijing Wang <wangyijing@huawei.com>
Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
Tested-by: Jon Masters <jcm@redhat.com>
Tested-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
arch/arm64/kernel/acpi.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
drivers/acpi/bus.c | 3 ++
include/linux/acpi.h | 1 +
3 files changed, 77 insertions(+)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index f80caef..f86a982 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -38,6 +38,12 @@ EXPORT_SYMBOL(acpi_pci_disabled);
static int enabled_cpus; /* Processors (GICC) with enabled flag in MADT */
/*
+ * Since we're on ARM, the default interrupt routing model
+ * clearly has to be GIC.
+ */
+enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_GIC;
+
+/*
* __acpi_map_table() will be called before page_init(), so early_ioremap()
* or early_memremap() should be called here to for ACPI table mapping.
*/
@@ -185,6 +191,73 @@ void __init acpi_init_cpus(void)
pr_info("%d CPUs enabled, %d CPUs total\n", enabled_cpus, total_cpus);
}
+int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
+{
+ *irq = irq_find_mapping(NULL, gsi);
+
+ 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)
+{
+ unsigned int irq;
+ unsigned int irq_type;
+
+ /*
+ * ACPI have no bindings to indicate SPI or PPI, so we
+ * use different mappings from DT in ACPI.
+ *
+ * For FDT
+ * PPI interrupt: in the range [0, 15];
+ * SPI interrupt: in the range [0, 987];
+ *
+ * For ACPI, GSI should be unique so using
+ * the hwirq directly for the mapping:
+ * PPI interrupt: in the range [16, 31];
+ * SPI interrupt: in the range [32, 1019];
+ */
+
+ if (trigger == ACPI_EDGE_SENSITIVE &&
+ polarity == ACPI_ACTIVE_LOW)
+ irq_type = IRQ_TYPE_EDGE_FALLING;
+ else if (trigger == ACPI_EDGE_SENSITIVE &&
+ polarity == ACPI_ACTIVE_HIGH)
+ irq_type = IRQ_TYPE_EDGE_RISING;
+ else if (trigger == ACPI_LEVEL_SENSITIVE &&
+ polarity == ACPI_ACTIVE_LOW)
+ irq_type = IRQ_TYPE_LEVEL_LOW;
+ else if (trigger == ACPI_LEVEL_SENSITIVE &&
+ polarity == ACPI_ACTIVE_HIGH)
+ irq_type = IRQ_TYPE_LEVEL_HIGH;
+ else
+ irq_type = IRQ_TYPE_NONE;
+
+ /*
+ * Since only one GIC is supported in ACPI 5.0, we can
+ * create mapping refer to the default domain
+ */
+ irq = irq_create_mapping(NULL, gsi);
+ if (!irq)
+ return irq;
+
+ /* Set irq type if specified and different than the current one */
+ if (irq_type != IRQ_TYPE_NONE &&
+ irq_type != irq_get_trigger_type(irq))
+ irq_set_irq_type(irq, irq_type);
+ return irq;
+}
+EXPORT_SYMBOL_GPL(acpi_register_gsi);
+
+void acpi_unregister_gsi(u32 gsi)
+{
+}
+EXPORT_SYMBOL_GPL(acpi_unregister_gsi);
+
static int __init acpi_parse_fadt(struct acpi_table_header *table)
{
struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table;
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 8b67bd0..c412fdb 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -448,6 +448,9 @@ static int __init acpi_bus_init_irq(void)
case ACPI_IRQ_MODEL_IOSAPIC:
message = "IOSAPIC";
break;
+ case ACPI_IRQ_MODEL_GIC:
+ message = "GIC";
+ break;
case ACPI_IRQ_MODEL_PLATFORM:
message = "platform specific model";
break;
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d459cd1..87f365e 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -72,6 +72,7 @@ enum acpi_irq_model_id {
ACPI_IRQ_MODEL_IOAPIC,
ACPI_IRQ_MODEL_IOSAPIC,
ACPI_IRQ_MODEL_PLATFORM,
+ ACPI_IRQ_MODEL_GIC,
ACPI_IRQ_MODEL_COUNT
};
--
1.9.1
next prev parent reply other threads:[~2015-02-02 12:45 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-02 12:45 [PATCH v8 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 01/21] acpi: add arm64 to the platforms that use ioremap Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 02/21] acpi: fix acpi_os_ioremap for arm64 Hanjun Guo
2015-02-02 22:14 ` Rafael J. Wysocki
2015-02-03 9:08 ` Hanjun Guo
2015-02-03 11:37 ` Catalin Marinas
2015-02-03 11:41 ` Ard Biesheuvel
2015-02-03 17:29 ` Mark Salter
2015-02-03 22:04 ` Rafael J. Wysocki
2015-02-04 10:48 ` Russell King - ARM Linux
2015-02-04 13:22 ` Rafael J. Wysocki
2015-02-04 15:53 ` Bjorn Helgaas
2015-02-04 16:25 ` Russell King - ARM Linux
2015-02-04 16:38 ` David Woodhouse
2015-02-04 16:41 ` Bjorn Helgaas
2015-02-04 11:25 ` Catalin Marinas
2015-02-04 16:08 ` Mark Salter
2015-02-04 16:16 ` Timur Tabi
2015-02-04 17:52 ` Catalin Marinas
2015-02-04 17:57 ` Catalin Marinas
2015-02-04 18:58 ` Mark Salter
2015-02-05 10:41 ` Catalin Marinas
2015-02-05 10:47 ` Ard Biesheuvel
2015-02-05 10:59 ` Catalin Marinas
2015-02-05 11:14 ` Graeme Gregory
2015-02-05 12:07 ` Catalin Marinas
2015-02-05 12:52 ` Graeme Gregory
2015-02-05 14:50 ` Catalin Marinas
2015-02-05 12:55 ` Ard Biesheuvel
2015-02-05 13:54 ` Mark Salter
2015-02-05 16:42 ` [Linaro-acpi] " Al Stone
2015-02-05 17:48 ` Catalin Marinas
2015-02-05 22:16 ` Ard Biesheuvel
2015-02-06 10:36 ` Catalin Marinas
2015-02-06 11:08 ` Ard Biesheuvel
2015-02-06 14:16 ` Catalin Marinas
2015-02-07 1:44 ` Ard Biesheuvel
2015-02-05 1:24 ` Rafael J. Wysocki
2015-02-02 12:45 ` [PATCH v8 03/21] arm64: allow late use of early_ioremap Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 04/21] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 05/21] ACPI / sleep: Introduce sleep_arm.c Hanjun Guo
2015-02-02 22:18 ` Rafael J. Wysocki
2015-02-03 16:18 ` Graeme Gregory
2015-02-02 12:45 ` [PATCH v8 06/21] ARM64 / ACPI: Introduce PCI stub functions for ACPI Hanjun Guo
2015-02-03 12:15 ` Catalin Marinas
2015-02-03 13:30 ` Hanjun Guo
2015-02-03 14:55 ` Rafael J. Wysocki
2015-02-04 9:06 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 07/21] ARM64 / ACPI: Introduce early_param for "acpi" and pass acpi=force to enable ACPI Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 08/21] dt / chosen: Add linux, uefi-stub-generated-dtb property Hanjun Guo
2015-02-02 13:40 ` [PATCH v8 08/21] dt / chosen: Add linux,uefi-stub-generated-dtb property Leif Lindholm
2015-02-02 13:50 ` Graeme Gregory
2015-02-02 16:32 ` Mark Rutland
2015-02-06 10:34 ` [PATCH v8 08/21] dt / chosen: Add linux, uefi-stub-generated-dtb property G Gregory
2015-02-07 3:36 ` [PATCH v8 08/21] dt / chosen: Add linux,uefi-stub-generated-dtb property Hanjun Guo
2015-02-07 5:03 ` [PATCH v8 08/21] dt / chosen: Add linux, uefi-stub-generated-dtb property Ard Biesheuvel
2015-02-07 6:51 ` [PATCH v8 08/21] dt / chosen: Add linux,uefi-stub-generated-dtb property Hanjun Guo
2015-02-09 11:46 ` Mark Rutland
2015-02-11 2:44 ` [PATCH v8 08/21] dt / chosen: Add linux, uefi-stub-generated-dtb property Ard Biesheuvel
2015-02-11 6:33 ` [PATCH v8 08/21] dt / chosen: Add linux,uefi-stub-generated-dtb property Stefano Stabellini
2015-02-11 6:53 ` [PATCH v8 08/21] dt / chosen: Add linux, uefi-stub-generated-dtb property Ard Biesheuvel
2015-02-11 7:07 ` [PATCH v8 08/21] dt / chosen: Add linux,uefi-stub-generated-dtb property Stefano Stabellini
2015-02-02 12:45 ` [PATCH v8 09/21] ARM64 / ACPI: Disable ACPI if FADT revision is less than 5.1 Hanjun Guo
2015-02-03 17:20 ` Catalin Marinas
2015-02-04 9:38 ` Hanjun Guo
2015-02-04 13:06 ` Lorenzo Pieralisi
2015-02-05 9:45 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 11/21] ARM64 / ACPI: Get PSCI flags in FADT for PSCI init Hanjun Guo
2015-02-04 16:43 ` Lorenzo Pieralisi
2015-02-05 9:48 ` Hanjun Guo
2015-02-05 17:11 ` [Linaro-acpi] " Al Stone
2015-02-05 17:49 ` Lorenzo Pieralisi
2015-02-05 19:03 ` Al Stone
2015-02-06 7:56 ` Hanjun Guo
2015-02-06 16:21 ` Lorenzo Pieralisi
2015-02-02 12:45 ` [PATCH v8 12/21] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 13/21] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2015-02-03 13:53 ` Mark Rutland
2015-02-04 9:05 ` Hanjun Guo
2015-02-04 10:30 ` Mark Rutland
2015-02-05 9:20 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 14/21] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2015-02-03 14:17 ` Mark Rutland
2015-02-03 20:09 ` Catalin Marinas
2015-02-04 9:48 ` Hanjun Guo
2015-02-04 11:21 ` Catalin Marinas
2015-02-05 9:27 ` Hanjun Guo
2015-02-05 10:52 ` Catalin Marinas
2015-02-09 6:55 ` Will Deacon
2015-02-09 9:52 ` Catalin Marinas
2015-02-02 12:45 ` Hanjun Guo [this message]
2015-02-09 6:34 ` [PATCH v8 15/21] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Will Deacon
2015-02-09 6:53 ` Hanjun Guo
2015-02-09 7:07 ` Will Deacon
2015-02-02 12:45 ` [PATCH v8 16/21] irqchip: Add GICv2 specific ACPI boot support Hanjun Guo
2015-02-02 22:23 ` Rafael J. Wysocki
2015-02-03 15:38 ` Tomasz Nowicki
2015-02-02 12:45 ` [PATCH v8 17/21] clocksource / arch_timer: Parse GTDT to initialize arch timer Hanjun Guo
2015-02-02 22:23 ` Rafael J. Wysocki
2015-02-03 13:28 ` Hanjun Guo
2015-02-04 18:59 ` Lorenzo Pieralisi
2015-02-05 10:11 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 18/21] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 19/21] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 20/21] Documentation: ACPI for ARM64 Hanjun Guo
2015-02-02 19:01 ` Timur Tabi
2015-02-03 8:44 ` Hanjun Guo
2015-02-02 12:45 ` [PATCH v8 21/21] arm64: ACPI: additions of ACPI documentation for arm64 Hanjun Guo
2015-02-04 0:40 ` Al Stone
2015-02-04 18:12 ` Mark Brown
2015-02-04 19:06 ` Al Stone
2015-02-05 2:02 ` Mark Brown
2015-02-03 16:47 ` [PATCH v8 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Mark Rutland
2015-02-03 17:43 ` [Linaro-acpi] " Al Stone
2015-02-04 9:41 ` Hanjun Guo
2015-02-04 20:29 ` Timur Tabi
2015-02-05 10:16 ` Hanjun Guo
2015-02-12 10:02 ` Robert Richter
2015-02-13 2:48 ` Hanjun Guo
2015-02-19 16:10 ` Robert Richter
[not found] ` <a314cdbbefb349acbb8f47d6e806989f@NASANEXM01D.na.qualcomm.com>
2015-02-13 0:50 ` Jonathan (Zhixiong) Zhang
2015-02-13 7:50 ` Hanjun Guo
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=1422881149-8177-16-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).