From patchwork Fri Apr 3 12:42:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 6156281 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0583BBF4A6 for ; Fri, 3 Apr 2015 12:42:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DEE4203DA for ; Fri, 3 Apr 2015 12:42:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F34B203F3 for ; Fri, 3 Apr 2015 12:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753017AbbDCMmf (ORCPT ); Fri, 3 Apr 2015 08:42:35 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:38212 "EHLO baptiste.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752929AbbDCMmM (ORCPT ); Fri, 3 Apr 2015 08:42:12 -0400 Received: from ayla.of.borg ([84.193.93.87]) by baptiste.telenet-ops.be with bizsmtp id BQi11q00e1t5w8s01Qi1G8; Fri, 03 Apr 2015 14:42:10 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1Ye0vB-0006AR-Gx; Fri, 03 Apr 2015 14:42:01 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1Ye0vH-0006VL-0p; Fri, 03 Apr 2015 14:42:07 +0200 From: Geert Uytterhoeven To: Greg Kroah-Hartman , Magnus Damm , Arnd Bergmann , Simon Horman , Laurent Pinchart , Kuninori Morimoto Cc: Marc Zyngier , devel@driverdev.osuosl.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH/RFC 3/6] staging: board: Add support for translating hwirq to virq numbers Date: Fri, 3 Apr 2015 14:42:00 +0200 Message-Id: <1428064923-24950-4-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428064923-24950-1-git-send-email-geert+renesas@glider.be> References: <1428064923-24950-1-git-send-email-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/staging/board/board.c | 66 +++++++++++++++++++++++++++++++++++++++++++ drivers/staging/board/board.h | 5 ++++ 2 files changed, 71 insertions(+) diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c index d5a6abc845191c93..b84ac2837a20bf06 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 +#include #include #include #include #include +#include + #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,52 @@ bool __init board_staging_dt_node_available(const struct resource *resource, return false; /* Nothing found */ } + +int __init board_staging_setup_hwirq_xlate(const char *irqc_match, + unsigned int base) +{ + irqc_node = of_find_compatible_node(NULL, NULL, irqc_match); + + WARN_ON(!irqc_node); + if (!irqc_node) + return -ENOENT; + + irqc_base = base; + return 0; +} + +static unsigned int __init xlate_hwirq(unsigned int hwirq) +{ + struct of_phandle_args irq_data; + unsigned int irq; + + if (!irqc_node) + return hwirq; + + irq_data.np = irqc_node; + irq_data.args_count = 3; + irq_data.args[0] = 0; + irq_data.args[1] = hwirq - irqc_base; + irq_data.args[2] = IRQ_TYPE_LEVEL_HIGH; + + irq = irq_create_of_mapping(&irq_data); + if (WARN_ON(!irq)) + irq = hwirq; + + return irq; +} + +void __init board_staging_fixup_irq_resources(struct resource *res, + unsigned int nres) +{ + unsigned int i; + + for (i = 0; i < nres; i++) + if (res[i].flags == IORESOURCE_IRQ) { + unsigned int hwirq = res[i].start; + unsigned int virq = xlate_hwirq(hwirq); + + pr_debug("hwirq %u -> virq %u\n", hwirq, virq); + res[i].start = virq; + } +} diff --git a/drivers/staging/board/board.h b/drivers/staging/board/board.h index e9c914985d4acb36..4cedc3c46e287eb7 100644 --- a/drivers/staging/board/board.h +++ b/drivers/staging/board/board.h @@ -1,10 +1,15 @@ #ifndef __BOARD_H__ #define __BOARD_H__ + #include #include +struct resource; + bool board_staging_dt_node_available(const struct resource *resource, unsigned int num_resources); +int board_staging_setup_hwirq_xlate(const char *irqc_match, unsigned int base); +void board_staging_fixup_irq_resources(struct resource *res, unsigned int nres); #define board_staging(str, fn) \ static int __init runtime_board_check(void) \