From patchwork Fri Mar 18 10:19:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 8617951 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-renesas-soc@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 7F10DC0553 for ; Fri, 18 Mar 2016 10:19:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB9B42034B for ; Fri, 18 Mar 2016 10:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B889920173 for ; Fri, 18 Mar 2016 10:19:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753820AbcCRKT3 (ORCPT ); Fri, 18 Mar 2016 06:19:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:36068 "EHLO andre.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751423AbcCRKT2 (ORCPT ); Fri, 18 Mar 2016 06:19:28 -0400 Received: from ayla.of.borg ([84.195.106.123]) by andre.telenet-ops.be with bizsmtp id XNKS1s00b2fm56U01NKS6N; Fri, 18 Mar 2016 11:19:26 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1agrV8-0004Nj-L9; Fri, 18 Mar 2016 11:19:26 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1agrVB-0001vs-Fm; Fri, 18 Mar 2016 11:19:29 +0100 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm , Jon Hunter Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven Subject: [PATCH 2/2] ARM: dts: r8a7779: Correct interrupt type for ARM TWD Date: Fri, 18 Mar 2016 11:19:21 +0100 Message-Id: <1458296361-4468-3-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458296361-4468-1-git-send-email-geert+renesas@glider.be> References: <1458296361-4468-1-git-send-email-geert+renesas@glider.be> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The ARM TWD interrupt is a private peripheral interrupt (PPI), and per the ARM GIC documentation, whether the type for PPIs can be set is IMPLEMENTATION DEFINED. For R-Car H1 devices the PPI type cannot be set, and so when we attempt to set the type for the ARM TWD interrupt it fails. This has gone unnoticed because it fails silently, and because we cannot re-configure the type it has had no impact. Nevertheless fix the type for the TWD interrupt so that it matches the hardware configuration. Based on patches by Jon Hunter for Tegra20/30 and OMAP4. Signed-off-by: Geert Uytterhoeven --- Exposed by Jon Hunter's "[PATCH 04/15] irqchip/gic: WARN if setting the interrupt type fails": WARNING: CPU: 0 PID: 0 at drivers/irqchip/irq-gic-common.c:61 gic_configure_irq+0x64/0x7c() Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.5.0-marzen-00426-g226dd0f378de2fe5-dirty #87 Hardware name: Generic R8A7779 (Flattened Device Tree) [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0xa4/0xdc) [] (dump_stack) from [] (warn_slowpath_common+0x84/0xb0) [] (warn_slowpath_common) from [] (warn_slowpath_null+0x18/0x20) [] (warn_slowpath_null) from [] (gic_configure_irq+0x64/0x7c) [] (gic_configure_irq) from [] (gic_set_type+0x48/0x60) [] (gic_set_type) from [] (__irq_set_trigger+0xac/0x17c) [] (__irq_set_trigger) from [] (__setup_irq+0x344/0x5d8) [] (__setup_irq) from [] (request_percpu_irq+0x98/0xe0) [] (request_percpu_irq) from [] (twd_local_timer_common_register+0x38/0x1ac) [] (twd_local_timer_common_register) from [] (twd_local_timer_of_register+0x48/0x70) [] (twd_local_timer_of_register) from [] (clocksource_probe+0x48/0x88) [] (clocksource_probe) from [] (start_kernel+0x24c/0x3cc) [] (start_kernel) from [<6000807c>] (0x6000807c) --- arch/arm/boot/dts/r8a7779.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi index 540f3c57a7b32356..2581363879d9dfff 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -71,7 +71,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0xf0000600 0x20>; interrupts = ; + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; clocks = <&cpg_clocks R8A7779_CLK_ZS>; };