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 12/19] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
Date: Thu, 24 Jul 2014 21:00:18 +0800	[thread overview]
Message-ID: <1406206825-15590-13-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1406206825-15590-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 ef06e91..3a078dc 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -48,6 +48,12 @@ int acpi_psci_use_hvc;
 static int enabled_cpus;
 
 /*
+ * 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.
  */
@@ -183,6 +189,73 @@ static int __init acpi_parse_madt_gic_cpu_interface_entries(void)
 	return 0;
 }
 
+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);
+
 /* Protocol to bring up secondary CPUs */
 enum acpi_smp_boot_protocol smp_boot_protocol(void)
 {
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index c5bc8cf..301529c 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 358c01b..ad6c30f 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-07-24 13:00 UTC|newest]

Thread overview: 131+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-24 13:00 [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-07-24 13:00 ` [PATCH 01/19] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-07-28 18:29   ` Sudeep Holla
2014-07-28 22:49     ` Graeme Gregory
2014-07-29  8:49       ` Sudeep Holla
2014-07-29 13:08     ` Hanjun Guo
2014-07-29 13:50       ` Sudeep Holla
2014-07-29 14:07         ` Hanjun Guo
2014-07-28 18:30   ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 02/19] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo
2014-07-28 18:35   ` Sudeep Holla
2014-07-29 13:10     ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 03/19] ARM64 / ACPI: Introduce lowlevel suspend function Hanjun Guo
2014-07-24 15:34   ` Mark Rutland
2014-07-25 10:42     ` Hanjun Guo
2014-07-28 18:28   ` Sudeep Holla
2014-07-29 13:00     ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 04/19] ARM64 / ACPI: Introduce arch_fix_phys_package_id() for cpu topology Hanjun Guo
2014-07-24 14:43   ` Mark Brown
2014-07-25 10:32     ` Hanjun Guo
2014-07-28 18:51   ` Sudeep Holla
2014-08-01  6:35     ` Hanjun Guo
2014-08-01 10:48       ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 05/19] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-07-24 21:57   ` Naresh Bhat
2014-07-29 16:40   ` Sudeep Holla
2014-07-24 13:00 ` [PATCH 06/19] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-07-29 16:40   ` Sudeep Holla
2014-07-31  3:53     ` Hanjun Guo
2014-07-31  4:22   ` Olof Johansson
2014-07-31 10:23     ` Hanjun Guo
2014-08-20 15:02       ` Grant Likely
2014-08-20 15:00   ` Grant Likely
2014-08-20 15:29     ` Catalin Marinas
2014-08-20 15:43       ` graeme.gregory at linaro.org
2014-07-24 13:00 ` [PATCH 07/19] ARM64 / ACPI: Parse MADT to map logical cpu to MPIDR and get cpu_possible/present_map Hanjun Guo
2014-07-24 23:06   ` Naresh Bhat
2014-07-25 11:11     ` Hanjun Guo
2014-07-30 18:20   ` Sudeep Holla
2014-07-31  8:14     ` Hanjun Guo
2014-08-20 15:14   ` Grant Likely
2014-07-24 13:00 ` [PATCH 08/19] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-07-30 18:21   ` Sudeep Holla
2014-07-31  8:15     ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 09/19] ARM64 / ACPI: Move the initialization of cpu_logical_map(0) before acpi_boot_init() Hanjun Guo
2014-07-24 15:21   ` Mark Rutland
2014-07-25 10:39     ` Hanjun Guo
2014-07-25 12:18       ` Mark Rutland
2014-07-24 13:00 ` [PATCH 10/19] ARM64 / ACPI: Get the enable method for SMP initialization in ACPI way Hanjun Guo
2014-07-24 15:47   ` Mark Rutland
2014-07-25 10:51     ` Hanjun Guo
2014-07-25 12:24       ` Mark Rutland
2014-07-29  8:12         ` Hanjun Guo
2014-07-31  6:54   ` Olof Johansson
2014-07-31 10:57     ` Hanjun Guo
2014-08-04  9:56       ` Hanjun Guo
2014-07-31 18:52   ` Geoff Levand
2014-08-01  6:49     ` Hanjun Guo
2014-07-24 13:00 ` [PATCH 11/19] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-07-24 13:00 ` Hanjun Guo [this message]
2014-07-24 13:00 ` [PATCH 13/19] ACPI / table: Add new function to get table entries Hanjun Guo
2014-07-24 13:00 ` [PATCH 14/19] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2014-07-24 13:00 ` [PATCH 15/19] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-07-24 13:00 ` [PATCH 16/19] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-07-24 13:00 ` [PATCH 17/19] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-07-24 13:00 ` [PATCH 18/19] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-07-24 13:00 ` [PATCH 19/19] Documentation: ACPI for ARM64 Hanjun Guo
2014-07-24 20:42   ` Randy Dunlap
2014-07-25 10:55     ` Hanjun Guo
     [not found]   ` <CAFoFrHaWWxRPRYM5+bWj0tGnz05SokqwVGejUCUi+U-KChFBdQ@mail.gmail.com>
2014-07-24 21:19     ` Randy Dunlap
2014-07-29 10:07       ` Christoffer Dall
2014-07-27  2:34   ` Olof Johansson
2014-07-28  8:42     ` Graeme Gregory
2014-07-28 16:23       ` Olof Johansson
2014-07-28 17:44         ` Mark Brown
2014-07-28  9:07     ` Arnd Bergmann
2014-07-28  9:23       ` Graeme Gregory
2014-07-28 10:46         ` Arnd Bergmann
2014-07-28 14:20           ` Andre Przywara
2014-07-28 15:23             ` Arnd Bergmann
2014-07-28 16:14               ` Andre Przywara
2014-07-29  9:17                 ` Graeme Gregory
2014-07-29 10:07                   ` Arnd Bergmann
2014-07-28 10:12       ` Mark Rutland
2014-07-28 16:33         ` Olof Johansson
2014-07-28 18:37           ` Mark Rutland
2014-07-28 18:44             ` Olof Johansson
2014-07-28 16:27       ` Olof Johansson
2014-07-28 17:00         ` Mark Rutland
2014-07-28 18:27           ` Olof Johansson
2014-08-12 18:23             ` Catalin Marinas
2014-08-13 23:41               ` Rafael J. Wysocki
2014-08-14  3:21                 ` Hanjun Guo
2014-08-14 10:27                   ` Catalin Marinas
2014-08-14 20:53                     ` Arnd Bergmann
2014-08-15  1:02                       ` Olof Johansson
2014-08-15 19:49                         ` Arnd Bergmann
2014-08-15 23:19                           ` Mark Brown
2014-08-16 12:51                           ` graeme.gregory at linaro.org
2014-08-15  9:09                     ` Hanjun Guo
2014-08-15 10:01                       ` Catalin Marinas
2014-08-18  9:29                         ` Hanjun Guo
2014-08-18 12:49                           ` Mark Rutland
2014-08-20 22:17                           ` Olof Johansson
2014-08-21  4:00                             ` Hanjun Guo
2014-07-29  9:01       ` Hanjun Guo
2014-07-28 10:06     ` Mark Rutland
2014-07-28 16:44       ` Olof Johansson
2014-07-28 17:36         ` Mark Rutland
2014-07-28 18:34           ` Olof Johansson
2014-07-29 10:29         ` Christoffer Dall
2014-07-29 10:41           ` Arnd Bergmann
2014-07-29 10:55           ` Mark Rutland
2014-07-29 11:28             ` Mark Rutland
2014-07-29 12:37               ` Christoffer Dall
2014-07-29 12:52                 ` Arnd Bergmann
2014-07-29 13:08                   ` Mark Rutland
2014-07-29 13:31                     ` Christoffer Dall
2014-07-29 14:04                       ` Mark Rutland
2014-07-29 14:41                       ` Arnd Bergmann
2014-07-29 15:01                         ` Christoffer Dall
2014-07-30  6:47                       ` Hanjun Guo
2014-07-30  7:14                         ` Christoffer Dall
2014-07-30  9:36                           ` Hanjun Guo
2014-07-29 13:33                   ` Christoffer Dall
2014-07-29  7:58     ` Hanjun Guo
2014-07-29 10:30   ` Christoffer Dall
2014-08-15 22:43   ` Len Brown
2014-08-16 12:45     ` Graeme Gregory
2014-08-20 16:42   ` Grant Likely
2014-07-25  0:46 ` [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 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=1406206825-15590-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).