From: hanjun.guo@linaro.org (Hanjun Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 12/17] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
Date: Wed, 14 Jan 2015 23:05:00 +0800 [thread overview]
Message-ID: <1421247905-3749-13-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1421247905-3749-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.
Originally-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Tested-by: Yijing Wang <wangyijing@huawei.com>
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 0b7c3a6..c3e24c4 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -37,6 +37,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.
*/
@@ -184,6 +190,73 @@ void __init acpi_smp_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-01-14 15:05 UTC|newest]
Thread overview: 156+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 15:04 [PATCH v7 00/17] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2015-01-14 15:04 ` [PATCH v7 01/17] arm64: allow late use of early_ioremap Hanjun Guo
2015-01-15 18:44 ` Mark Langsdorf
2015-01-14 15:04 ` [PATCH v7 02/17] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2015-01-15 18:45 ` Mark Langsdorf
2015-01-14 15:04 ` [PATCH v7 03/17] ARM64 / ACPI: Introduce sleep-arm.c Hanjun Guo
2015-01-15 18:45 ` Mark Langsdorf
2015-01-14 15:04 ` [PATCH v7 04/17] ARM64 / ACPI: Introduce early_param for "acpi" and pass acpi=force to enable ACPI Hanjun Guo
2015-01-15 18:46 ` Mark Langsdorf
2015-01-19 11:42 ` Catalin Marinas
2015-01-19 11:55 ` Ard Biesheuvel
2015-01-19 13:51 ` Catalin Marinas
2015-01-19 14:00 ` Ard Biesheuvel
2015-01-19 14:22 ` Catalin Marinas
2015-01-19 15:13 ` Grant Likely
2015-01-19 16:59 ` Jon Masters
2015-01-19 17:52 ` Catalin Marinas
2015-01-19 18:01 ` Mark Rutland
2015-01-20 9:29 ` Hanjun Guo
2015-01-20 10:56 ` Catalin Marinas
2015-01-20 11:10 ` Mark Rutland
2015-01-20 12:17 ` Hanjun Guo
2015-01-20 12:31 ` Leif Lindholm
2015-01-20 19:20 ` Stefano Stabellini
2015-01-21 9:43 ` Parth Dixit
2015-01-21 15:23 ` Catalin Marinas
2015-01-21 15:29 ` Jon Masters
2015-01-21 15:42 ` Catalin Marinas
2015-01-21 15:56 ` Graeme Gregory
2015-01-21 16:05 ` Jon Masters
2015-01-21 16:16 ` Catalin Marinas
2015-01-21 16:51 ` Parth Dixit
2015-01-21 16:10 ` Stefano Stabellini
2015-01-22 12:29 ` Daniel Kiper
2015-01-28 17:58 ` [Linaro-acpi] " Timur Tabi
2015-01-28 18:08 ` Catalin Marinas
2015-01-28 18:08 ` Timur Tabi
2015-01-28 18:14 ` Catalin Marinas
2015-01-28 18:18 ` Timur Tabi
2015-01-29 15:19 ` Catalin Marinas
2015-01-29 18:20 ` Ard Biesheuvel
2015-01-29 18:21 ` Timur Tabi
2015-01-29 18:28 ` Ard Biesheuvel
2015-01-29 18:34 ` Timur Tabi
2015-01-29 18:44 ` Jon Masters
2015-01-29 23:11 ` Catalin Marinas
2015-01-29 23:16 ` Jon Masters
2015-01-29 23:30 ` Catalin Marinas
2015-01-30 11:13 ` Catalin Marinas
2015-01-30 14:48 ` Timur Tabi
2015-01-30 15:12 ` Ard Biesheuvel
2015-01-14 15:04 ` [PATCH v7 05/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2015-01-15 18:46 ` Mark Langsdorf
2015-01-19 11:45 ` Catalin Marinas
2015-01-14 15:04 ` [PATCH v7 06/17] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2015-01-15 18:46 ` Mark Langsdorf
2015-01-16 9:49 ` Catalin Marinas
2015-01-18 6:25 ` Hanjun Guo
2015-01-18 6:31 ` Jon Masters
2015-01-18 6:46 ` Hanjun Guo
2015-01-18 9:29 ` Graeme Gregory
2015-01-18 12:32 ` Jon Masters
2015-01-19 4:26 ` Hanjun Guo
2015-01-19 10:37 ` Catalin Marinas
2015-01-19 10:42 ` Catalin Marinas
2015-01-20 2:39 ` Hanjun Guo
2015-01-20 11:00 ` Catalin Marinas
2015-01-20 11:56 ` Hanjun Guo
2015-01-20 12:26 ` [Linaro-acpi] " Tomasz Nowicki
2015-01-20 15:10 ` Catalin Marinas
2015-01-14 15:04 ` [PATCH v7 07/17] ARM64 / ACPI: Disable ACPI if FADT revision is less than 5.1 Hanjun Guo
2015-01-15 18:47 ` Mark Langsdorf
2015-01-16 14:33 ` Lorenzo Pieralisi
2015-01-18 5:49 ` Hanjun Guo
2015-01-19 11:50 ` Catalin Marinas
2015-01-20 3:05 ` Hanjun Guo
2015-01-14 15:04 ` [PATCH v7 08/17] ARM64 / ACPI: Get PSCI flags in FADT for PSCI init Hanjun Guo
2015-01-15 18:47 ` Mark Langsdorf
2015-01-14 15:04 ` [PATCH v7 09/17] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2015-01-15 18:47 ` Mark Langsdorf
2015-01-14 15:04 ` [PATCH v7 10/17] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2015-01-15 18:48 ` Mark Langsdorf
2015-01-16 18:18 ` Lorenzo Pieralisi
2015-01-20 13:09 ` Hanjun Guo
2015-01-20 15:16 ` Lorenzo Pieralisi
2015-01-14 15:04 ` [PATCH v7 11/17] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2015-01-15 18:48 ` Mark Langsdorf
2015-01-20 11:17 ` Catalin Marinas
2015-01-20 12:26 ` Hanjun Guo
2015-01-20 16:16 ` Lorenzo Pieralisi
2015-01-14 15:05 ` Hanjun Guo [this message]
2015-01-15 18:48 ` [PATCH v7 12/17] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Mark Langsdorf
2015-01-16 10:45 ` Marc Zyngier
2015-01-14 15:05 ` [PATCH v7 13/17] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2015-01-15 18:50 ` Mark Langsdorf
2015-01-16 11:15 ` Marc Zyngier
2015-01-16 13:54 ` Grant Likely
2015-01-16 14:37 ` Marc Zyngier
2015-01-22 12:46 ` Hanjun Guo
2015-01-22 14:46 ` Marc Zyngier
2015-01-23 9:38 ` Hanjun Guo
2015-01-27 16:12 ` Grant Likely
2015-01-29 15:29 ` Catalin Marinas
2015-01-29 16:06 ` Tomasz Nowicki
2015-01-20 10:40 ` Tomasz Nowicki
2015-01-20 13:05 ` Jon Masters
2015-01-14 15:05 ` [PATCH v7 14/17] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2015-01-15 18:50 ` Mark Langsdorf
2015-01-14 15:05 ` [PATCH v7 15/17] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2015-01-15 18:50 ` Mark Langsdorf
2015-01-14 15:05 ` [PATCH v7 16/17] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2015-01-15 18:50 ` Mark Langsdorf
2015-01-14 15:05 ` [PATCH v7 17/17] Documentation: ACPI for ARM64 Hanjun Guo
2015-01-15 18:54 ` Mark Langsdorf
2015-01-15 16:26 ` [PATCH v7 00/17] Introduce ACPI for ARM64 based on ACPI 5.1 Grant Likely
2015-01-15 18:23 ` Catalin Marinas
2015-01-15 19:02 ` Mark Brown
2015-01-15 20:04 ` Jason Cooper
2015-01-15 20:31 ` Mark Brown
2015-01-15 20:51 ` Jason Cooper
2015-01-16 11:49 ` Mark Brown
2015-01-16 7:24 ` Hanjun Guo
2015-01-16 10:10 ` Catalin Marinas
2015-01-16 12:05 ` Mark Brown
2015-01-16 12:29 ` Will Deacon
2015-01-16 16:54 ` Mark Brown
2015-01-18 6:36 ` Hanjun Guo
2015-01-15 21:31 ` Al Stone
2015-01-15 21:38 ` Jon Masters
2015-01-16 10:20 ` Catalin Marinas
2015-01-16 15:17 ` [Linaro-acpi] " Al Stone
2015-01-16 15:23 ` Al Stone
2015-01-16 15:44 ` Suravee Suthikulpanit
2015-01-16 7:17 ` Hanjun Guo
2015-01-16 10:04 ` Catalin Marinas
2015-01-16 14:45 ` Tom Lendacky
2015-01-16 14:55 ` Will Deacon
2015-01-16 15:14 ` Arnd Bergmann
2015-01-16 15:25 ` Catalin Marinas
2015-01-16 15:33 ` Will Deacon
2015-01-16 15:40 ` Arnd Bergmann
2015-01-16 15:43 ` [Linaro-acpi] " Arnd Bergmann
2015-01-16 15:49 ` Will Deacon
2015-01-16 15:53 ` [Linaro-acpi] " Arnd Bergmann
2015-01-17 17:53 ` Rob Herring
2015-01-16 17:12 ` Tom Lendacky
2015-01-16 15:16 ` Tom Lendacky
2015-01-16 16:29 ` Grant Likely
2015-01-16 17:20 ` [Linaro-acpi] " Arnd Bergmann
2015-01-17 11:52 ` Catalin Marinas
2015-01-15 18:58 ` Jon Masters
2015-01-15 19:49 ` Mark Langsdorf
2015-01-16 8:37 ` Hanjun Guo
2015-01-15 21:33 ` Suravee Suthikulanit
2015-01-27 17:46 ` Timur Tabi
2015-01-28 13:53 ` 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=1421247905-3749-13-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).