From patchwork Fri Apr 5 08:22:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 2397761 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 34F6BDF2E5 for ; Fri, 5 Apr 2013 11:31:29 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UO4rg-0000Fb-AI for patchwork-linux-arm@patchwork.kernel.org; Fri, 05 Apr 2013 11:31:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UO1uk-0002GX-6W; Fri, 05 Apr 2013 08:22:26 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UO1ug-0002G6-P1 for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2013 08:22:23 +0000 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r358MKre003538; Fri, 5 Apr 2013 03:22:20 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r358MK6e012965; Fri, 5 Apr 2013 03:22:20 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Fri, 5 Apr 2013 03:22:20 -0500 Received: from [137.167.125.90] (una0919096.emea.dhcp.ti.com [137.167.125.90]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r358MJC1014422; Fri, 5 Apr 2013 03:22:19 -0500 Message-ID: <515E89BA.9010709@ti.com> Date: Fri, 5 Apr 2013 10:22:18 +0200 From: Benoit Cousson Organization: Texas Instruments User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Santosh Shilimkar , Jon Hunter Subject: Re: [PATCH] ARM: dts: OMAP4+: Correct L3 interrupts References: <1365098790-9078-1-git-send-email-jon-hunter@ti.com> <515E6EAE.9000107@ti.com> <515E8677.40404@ti.com> In-Reply-To: <515E8677.40404@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130405_042222_920439_B6C7024A X-CRM114-Status: GOOD ( 17.08 ) X-Spam-Score: -9.3 (---------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-9.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -2.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tony Lindgren , device-tree , linux-omap , linux-arm X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Santosh and Jon, On 04/05/2013 10:08 AM, Benoit Cousson wrote: > On 04/05/2013 08:26 AM, Santosh Shilimkar wrote: >> On Thursday 04 April 2013 11:36 PM, Jon Hunter wrote: >>> The L3 interrupt numbers are incorrect for OMAP4+ and are conflicting >>> with some of the timer interrupts causing the allocation of timer >>> interrupts to fail. >>> >>> The problem is caused by adding 32 to the interrupt number for the L3 >>> interrupts to account for per processor interrupts (PPI) and software >>> generated interrupts (SGI) which typically are mapped to the first 32 >>> interrupts in the ARM GIC. This is not necessary because the first >>> parameter of the ARM GIC interrupt property specifies the GIC interrupt >>> type (ie. SGI, PPI, etc). Hence, fix the interrupt number fo the L3 >>> interrupts by substracting 32. >>> >>> Cc: Santosh Shilimkar >>> Signed-off-by: Jon Hunter >>> --- >>> >>> Please note that this problem is observed in Benoit's for_3.10/dts branch [1]. >>> >>> [1] http://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git >>> >> Thats correct. I overlooked the 32 addition part. This patch should >> also be pulled into Benoit's 3.10 tree. > > Done. I've just applied it. But I will probably merge it with the > original patch, because having a broken patch and the fix in the same > pull request does not look right. Please find below the fixed version. Regards, Benoit From 90c2d172ef86d6c3283df43358d4425f9016be48 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Tue, 26 Feb 2013 17:36:14 +0530 Subject: [PATCH] ARM: dts: OMAP4/5: Update l3-noc DT nodes Add l3-noc node for OMAP4 and OMAP5 devices. Signed-off-by: Santosh Shilimkar [jon-hunter@ti.com: Fix the problem caused by adding 32 to the interrupt number for the L3 interrupts to account for per processor interrupts (PPI) and software generated interrupts (SGI) which typically are mapped to the first 32 interrupts in the ARM GIC. This is not necessary because the first parameter of the ARM GIC interrupt property specifies the GIC interrupt type (ie. SGI, PPI, etc). Hence, fix the interrupt number for the L3 interrupts by substracting 32] Signed-off-by: Jon Hunter Signed-off-by: Benoit Cousson --- arch/arm/boot/dts/omap4.dtsi | 5 +++++ arch/arm/boot/dts/omap5.dtsi | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index ddfc54a..3ae6a3f 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -94,6 +94,11 @@ #size-cells = <1>; ranges; ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; + reg = <0x44000000 0x1000>, + <0x44800000 0x2000>, + <0x45000000 0x1000>; + interrupts = <0 9 0x4>, + <0 10 0x4>; counter32k: counter@4a304000 { compatible = "ti,omap-counter32k"; diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index e539258..94b5ec9 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -87,6 +87,11 @@ #size-cells = <1>; ranges; ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; + reg = <0x44000000 0x2000>, + <0x44800000 0x3000>, + <0x45000000 0x4000>; + interrupts = <0 9 0x4>, + <0 10 0x4>; counter32k: counter@4ae04000 { compatible = "ti,omap-counter32k";