linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: hanjun.guo@linaro.org (Hanjun Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 11/17] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
Date: Mon,  1 Sep 2014 22:57:49 +0800	[thread overview]
Message-ID: <1409583475-6978-12-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1409583475-6978-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>
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 35dff11..354b912 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.
  */
@@ -194,6 +200,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 8581f5b..d132c1b 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -458,6 +458,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 807cbc4..ed1c2d1 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -71,6 +71,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.7.9.5

  parent reply	other threads:[~2014-09-01 14:57 UTC|newest]

Thread overview: 117+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-01 14:57 [PATCH v3 00/17] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 01/17] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 02/17] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-09-09 16:26   ` Catalin Marinas
2014-09-09 16:41     ` Jon Masters
2014-09-09 16:44       ` Jon Masters
2014-09-09 17:15       ` Mark Rutland
2014-09-09 17:33         ` Jon Masters
2014-09-09 17:50         ` Lorenzo Pieralisi
2014-09-09 18:05           ` Sudeep Holla
2014-09-09 19:06             ` Jon Masters
2014-09-10 11:13               ` Hanjun Guo
2014-09-10 12:33                 ` Catalin Marinas
2014-09-10 21:51                   ` Grant Likely
2014-09-11 11:01                     ` Catalin Marinas
2014-09-14 15:40                       ` Grant Likely
2014-09-14 21:59                         ` Catalin Marinas
2014-09-15  3:53                           ` Grant Likely
2014-09-16  5:29                     ` Zheng, Lv
2014-09-10 21:41                 ` Grant Likely
2014-09-09 16:54     ` Mark Rutland
2014-09-10  7:30     ` Hanjun Guo
2014-09-10 21:37     ` Grant Likely
2014-09-01 14:57 ` [PATCH v3 03/17] ARM64 / ACPI: Introduce lowlevel suspend function Hanjun Guo
2014-09-09 16:35   ` Catalin Marinas
2014-09-09 22:04     ` Graeme Gregory
2014-09-01 14:57 ` [PATCH v3 04/17] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo
2014-09-09 16:37   ` Catalin Marinas
2014-09-09 17:17   ` Bjorn Helgaas
2014-09-09 22:14     ` Jon Masters
2014-09-10 13:04       ` Will Deacon
2014-09-10 13:21         ` Bjorn Helgaas
2014-09-10 18:30           ` Will Deacon
2014-09-10 21:58           ` Grant Likely
2014-09-01 14:57 ` [PATCH v3 05/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 06/17] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 07/17] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 08/17] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 09/17] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2014-09-03 17:21   ` Lorenzo Pieralisi
2014-09-04 15:29     ` Hanjun Guo
2014-09-09  4:29       ` Jon Masters
2014-09-09  5:11         ` Hanjun Guo
2014-09-09  5:34           ` Jon Masters
2014-09-09 16:52       ` Lorenzo Pieralisi
2014-09-09 17:00         ` Jon Masters
2014-09-09 17:02         ` Jon Masters
2014-09-09  4:23   ` Jon Masters
2014-09-09  4:57     ` Hanjun Guo
2014-09-09  5:44       ` Jon Masters
2014-09-09 16:00         ` Hanjun Guo
2014-09-09 16:04           ` Jon Masters
2014-09-09 16:14             ` Hanjun Guo
2014-09-11 14:15             ` Will Deacon
2014-09-12 21:30               ` Jon Masters
2014-09-11 10:24   ` Grant Likely
2014-09-01 14:57 ` [PATCH v3 10/17] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-09-03 16:27   ` Lorenzo Pieralisi
2014-09-08 13:10     ` Hanjun Guo
2014-09-01 14:57 ` Hanjun Guo [this message]
2014-09-11 11:08   ` [PATCH v3 11/17] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Grant Likely
2014-09-11 11:34     ` Grant Likely
2014-09-12  9:42     ` Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 12/17] ACPI / table: Add new function to get table entries Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 13/17] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2014-09-01 17:35   ` Marc Zyngier
2014-09-02  8:28     ` [Linaro-acpi] " Alexander Spyridakis
2014-09-02 11:48     ` Tomasz Nowicki
2014-09-02 13:02       ` Marc Zyngier
2014-09-02 15:45         ` Hanjun Guo
2014-09-02 15:59           ` Marc Zyngier
2014-09-02 16:11           ` Sudeep Holla
2014-09-03 10:30           ` Marc Zyngier
2014-09-03 11:17             ` Hanjun Guo
2014-09-04 14:03               ` Hanjun Guo
2014-09-09  6:21             ` Jon Masters
2014-09-03  9:26         ` Tomasz Nowicki
2014-09-03 14:57           ` Arnd Bergmann
2014-09-05  8:52             ` Tomasz Nowicki
2014-09-05  9:47             ` Marc Zyngier
2014-09-05 10:13               ` [Linaro-acpi] " Arnd Bergmann
2014-09-05 10:36                 ` Tomasz Nowicki
2014-09-05 10:39                 ` Marc Zyngier
2014-09-05 10:49                   ` Tomasz Nowicki
2014-09-09  6:27             ` Jon Masters
2014-09-11 13:43         ` Grant Likely
2014-09-02 16:34       ` Catalin Marinas
2014-09-11 11:48       ` Grant Likely
2014-09-11 12:01         ` Marc Zyngier
2014-09-09  6:14     ` Jon Masters
2014-09-03 18:42   ` Arnd Bergmann
2014-09-04 10:10     ` Tomasz Nowicki
2014-09-04 10:14       ` Arnd Bergmann
2014-09-04 10:39         ` Tomasz Nowicki
2014-09-09  6:35     ` Jon Masters
2014-09-01 14:57 ` [PATCH v3 14/17] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 15/17] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-09-01 14:57 ` [PATCH v3 16/17] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-09-11 15:18   ` Lorenzo Pieralisi
2014-09-01 14:57 ` [PATCH v3 17/17] Documentation: ACPI for ARM64 Hanjun Guo
2014-09-11 13:29 ` [PATCH v3 00/17] Introduce ACPI for ARM64 based on ACPI 5.1 Grant Likely
2014-09-11 13:49   ` Will Deacon
2014-09-12 21:38     ` Jon Masters
2014-09-12 21:43       ` Jon Masters
2014-09-15  4:21     ` Grant Likely
2014-09-11 14:23   ` Rafael J. Wysocki
2014-09-11 14:04     ` Grant Likely
2014-09-11 15:37   ` Catalin Marinas
2014-09-11 15:57     ` Sudeep Holla
2014-09-11 16:06       ` Graeme Gregory
2014-09-11 16:14         ` Sudeep Holla
2014-09-15  4:31     ` Grant Likely
2014-09-15  9:15       ` Catalin Marinas
2014-09-15 22:48         ` Grant Likely
2014-09-16 10:12           ` Catalin Marinas
2014-09-11 16:05   ` Olof Johansson
2014-09-15  4:37     ` Grant Likely

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=1409583475-6978-12-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).