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 v5 13/18] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
Date: Fri, 17 Oct 2014 21:37:09 +0800	[thread overview]
Message-ID: <1413553034-20956-14-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1413553034-20956-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 e91ec76..8526569 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 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 36d5012..4615eb1 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-10-17 13:37 UTC|newest]

Thread overview: 109+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-17 13:36 [PATCH v5 00/18] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-10-17 13:36 ` [PATCH v5 01/18] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Hanjun Guo
2014-11-18 13:45   ` Hanjun Guo
2014-11-18 16:43     ` Catalin Marinas
2014-11-18 16:57       ` Will Deacon
2014-11-18 17:02         ` Sudeep Holla
2014-11-18 17:03           ` Will Deacon
2014-11-19  0:29             ` Hanjun Guo
2014-10-17 13:36 ` [PATCH v5 02/18] ACPI / table: Add new function to get table entries Hanjun Guo
2014-11-24  1:27   ` Rafael J. Wysocki
2014-11-24 11:03     ` Hanjun Guo
2014-11-24 14:51       ` Rafael J. Wysocki
2014-11-25  3:38         ` Hanjun Guo
2014-11-25 21:20           ` Rafael J. Wysocki
2014-11-26  1:42             ` Hanjun Guo
2014-10-17 13:36 ` [PATCH v5 03/18] ACPI / table: Count matched and successfully parsed entries without specifying max entries Hanjun Guo
2014-11-18 13:51   ` Hanjun Guo
2014-11-18 20:15     ` Rafael J. Wysocki
2014-11-19  0:34       ` Hanjun Guo
2014-11-24  1:45   ` Rafael J. Wysocki
2014-11-24  8:34     ` Tomasz Nowicki
2014-11-24 15:16       ` Rafael J. Wysocki
2014-11-24 15:01         ` Tomasz Nowicki
2014-11-24 15:37           ` Rafael J. Wysocki
2014-11-24 15:18             ` Tomasz Nowicki
2014-10-17 13:37 ` [PATCH v5 04/18] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 05/18] ARM64 / ACPI: Introduce sleep-arm.c Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 06/18] ARM64 / ACPI: Introduce early_param for "acpi" and pass acpi=force to enable ACPI Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 07/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 08/18] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 09/18] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 10/18] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 11/18] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 12/18] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-10-24 17:39   ` Lorenzo Pieralisi
2014-10-27  9:58     ` Hanjun Guo
2014-10-29 10:43       ` Lorenzo Pieralisi
2014-10-30  8:27         ` Hanjun Guo
2014-10-29 21:33       ` Rafael J. Wysocki
2014-10-30  8:30         ` Hanjun Guo
2014-10-17 13:37 ` Hanjun Guo [this message]
2014-10-17 13:37 ` [PATCH v5 14/18] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 15/18] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 16/18] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 17/18] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-10-17 13:37 ` [PATCH v5 18/18] Documentation: ACPI for ARM64 Hanjun Guo
2014-12-18 20:01   ` Suravee Suthikulanit
2014-12-19 13:04     ` Hanjun Guo
2014-12-18 20:04   ` Timur Tabi
2014-12-19 13:53     ` Hanjun Guo
2014-12-24 17:18   ` Catalin Marinas
2014-12-24 19:33     ` Jon Masters
2014-12-26 13:23     ` Mark Brown
2014-12-30 11:23     ` Hanjun Guo
2015-01-05 13:13       ` Catalin Marinas
2015-01-05 20:16         ` Arnd Bergmann
2015-01-06 11:20           ` Catalin Marinas
2015-01-06 13:51             ` G Gregory
2015-01-06 14:03               ` Catalin Marinas
2015-01-06 13:59             ` [Linaro-acpi] " Arnd Bergmann
2015-01-06 14:11               ` Catalin Marinas
2015-01-06 19:30                 ` Arnd Bergmann
2015-01-15 14:10               ` Grant Likely
2015-01-15 15:51                 ` Jon Masters
2015-01-15 16:52                   ` Arnd Bergmann
2015-01-15 17:22                     ` Al Stone
2015-01-16 16:35                       ` Arnd Bergmann
2015-01-15 18:00                     ` Mark Brown
2015-01-06 16:24             ` Jon Masters
2015-01-06 19:21               ` [Linaro-acpi] " Arnd Bergmann
2015-01-06 22:06                 ` Jon Masters
2015-01-07  4:55                   ` Jon Masters
2015-01-07 10:36                     ` Arnd Bergmann
2015-01-07 11:50                       ` Catalin Marinas
2015-01-07 13:06                         ` Arnd Bergmann
2015-01-07 17:27                           ` Mark Brown
2015-01-07 17:44                             ` Jon Masters
2015-01-07 19:48                               ` Arnd Bergmann
2015-01-07 20:05                                 ` Mark Brown
2015-01-07 20:14                                   ` Jon Masters
2015-01-09 10:33                                 ` Catalin Marinas
2015-01-09 10:55                                   ` Arnd Bergmann
2015-01-09 15:13                                     ` Catalin Marinas
2015-01-07 18:41                             ` Jason Cooper
2015-01-07 19:58                               ` Jon Masters
2015-01-07 20:05                                 ` Jon Masters
2015-01-07 22:59                                   ` Jason Cooper
2015-01-08 11:26                                     ` Arnd Bergmann
2015-01-08 19:59                                       ` Kangkang Shen
2015-01-07 21:40                                 ` Jason Cooper
2015-01-07 22:10                                   ` Jon Masters
2015-01-04  9:39     ` Hanjun Guo
2015-01-05 11:05       ` Catalin Marinas
2015-01-06 11:11         ` Hanjun Guo
2015-01-06 11:29           ` Catalin Marinas
2015-01-06 13:50             ` Hanjun Guo
2015-01-06 13:54               ` G Gregory
2015-01-06 13:59                 ` Hanjun Guo
2015-01-06 14:05             ` Arnd Bergmann
2015-01-06 14:16               ` Catalin Marinas
2015-01-06 14:37                 ` Charles Garcia-Tobin
2015-01-06 16:37                 ` Jon Masters
2015-01-09 23:12                   ` Arnd Bergmann
     [not found]   ` <CAJ5Y-eZ5cu9_OhG24yAv+CZq7zKg0vU+eVGekyN+9dDzaz1OhQ@mail.gmail.com>
2014-12-30 20:13     ` ashwinc at codeaurora.org
2014-12-31  8:34       ` Hanjun Guo
2014-12-31 15:08         ` ashwinc at codeaurora.org
2015-01-01 20:04         ` Graeme Gregory
2015-01-02  9:28           ` Hanjun Guo
2015-01-02 16:47             ` Catalin Marinas

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=1413553034-20956-14-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).