| From 8dac4c40c97b07db9da18446405626d593d4df3e Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 17 Jun 2015 10:38:52 +0200 |
| Subject: [PATCH 331/337] staging: board: Add support for translating hwirq to |
| virq numbers |
| |
| As of commit 9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq |
| domain."), GIC IRQ numbers are virtual, breaking hardcoded hardware IRQ |
| numbers in platform device resources. |
| |
| Add support for translating hardware IRQ numbers to virtual IRQ numbers, |
| and fixing up platform device resources with hardcoded IRQ numbers. |
| |
| Add a copyright header, including the original author. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 72ee8626eeb121587d2e3a57d06611d2e0c3cc1b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/staging/board/board.c | 80 +++++++++++++++++++++++++++++++++++++++++++ |
| drivers/staging/board/board.h | 5 +++ |
| 2 files changed, 85 insertions(+) |
| |
| diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c |
| index d5a6abc84519..8712f566b311 100644 |
| --- a/drivers/staging/board/board.c |
| +++ b/drivers/staging/board/board.c |
| @@ -1,10 +1,27 @@ |
| +/* |
| + * Copyright (C) 2014 Magnus Damm |
| + * Copyright (C) 2015 Glider bvba |
| + * |
| + * This file is subject to the terms and conditions of the GNU General Public |
| + * License. See the file "COPYING" in the main directory of this archive |
| + * for more details. |
| + */ |
| + |
| +#define pr_fmt(fmt) "board_staging: " fmt |
| + |
| #include <linux/init.h> |
| +#include <linux/irq.h> |
| #include <linux/device.h> |
| #include <linux/kernel.h> |
| #include <linux/of.h> |
| #include <linux/of_address.h> |
| +#include <linux/of_irq.h> |
| + |
| #include "board.h" |
| |
| +static struct device_node *irqc_node __initdata; |
| +static unsigned int irqc_base __initdata; |
| + |
| static bool find_by_address(u64 base_address) |
| { |
| struct device_node *dn = of_find_all_nodes(NULL); |
| @@ -38,3 +55,66 @@ bool __init board_staging_dt_node_available(const struct resource *resource, |
| |
| return false; /* Nothing found */ |
| } |
| + |
| +int __init board_staging_gic_setup_xlate(const char *gic_match, |
| + unsigned int base) |
| +{ |
| + WARN_ON(irqc_node); |
| + |
| + irqc_node = of_find_compatible_node(NULL, NULL, gic_match); |
| + |
| + WARN_ON(!irqc_node); |
| + if (!irqc_node) |
| + return -ENOENT; |
| + |
| + irqc_base = base; |
| + return 0; |
| +} |
| + |
| +static void __init gic_fixup_resource(struct resource *res) |
| +{ |
| + struct of_phandle_args irq_data; |
| + unsigned int hwirq = res->start; |
| + unsigned int virq; |
| + |
| + if (resource_type(res) != IORESOURCE_IRQ || !irqc_node) |
| + return; |
| + |
| + irq_data.np = irqc_node; |
| + irq_data.args_count = 3; |
| + irq_data.args[0] = 0; |
| + irq_data.args[1] = hwirq - irqc_base; |
| + switch (res->flags & |
| + (IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE | |
| + IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_HIGHLEVEL)) { |
| + case IORESOURCE_IRQ_LOWEDGE: |
| + irq_data.args[2] = IRQ_TYPE_EDGE_FALLING; |
| + break; |
| + case IORESOURCE_IRQ_HIGHEDGE: |
| + irq_data.args[2] = IRQ_TYPE_EDGE_RISING; |
| + break; |
| + case IORESOURCE_IRQ_LOWLEVEL: |
| + irq_data.args[2] = IRQ_TYPE_LEVEL_LOW; |
| + break; |
| + case IORESOURCE_IRQ_HIGHLEVEL: |
| + default: |
| + irq_data.args[2] = IRQ_TYPE_LEVEL_HIGH; |
| + break; |
| + } |
| + |
| + virq = irq_create_of_mapping(&irq_data); |
| + if (WARN_ON(!virq)) |
| + return; |
| + |
| + pr_debug("hwirq %u -> virq %u\n", hwirq, virq); |
| + res->start = virq; |
| +} |
| + |
| +void __init board_staging_gic_fixup_resources(struct resource *res, |
| + unsigned int nres) |
| +{ |
| + unsigned int i; |
| + |
| + for (i = 0; i < nres; i++) |
| + gic_fixup_resource(&res[i]); |
| +} |
| diff --git a/drivers/staging/board/board.h b/drivers/staging/board/board.h |
| index e9c914985d4a..3af6dbe22f91 100644 |
| --- a/drivers/staging/board/board.h |
| +++ b/drivers/staging/board/board.h |
| @@ -1,10 +1,15 @@ |
| #ifndef __BOARD_H__ |
| #define __BOARD_H__ |
| + |
| #include <linux/init.h> |
| #include <linux/of.h> |
| |
| +struct resource; |
| + |
| bool board_staging_dt_node_available(const struct resource *resource, |
| unsigned int num_resources); |
| +int board_staging_gic_setup_xlate(const char *gic_match, unsigned int base); |
| +void board_staging_gic_fixup_resources(struct resource *res, unsigned int nres); |
| |
| #define board_staging(str, fn) \ |
| static int __init runtime_board_check(void) \ |
| -- |
| 2.6.2 |
| |