Path: csiph.com!news.redatomik.org!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod From: Florian Fainelli Newsgroups: linux.kernel Subject: Re: [PATCH v3 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT Date: Sat, 18 Mar 2017 17:50:01 +0100 Message-ID: References: Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=DrzFvHuzZyWDrJsXHZGzlLe/DbjZJO3zSxJex5Fu1Sk=; b=qe65vwhsl8VQS4znMUFvPjuIXUQxVi6AeNIpj8XGaHDv/91BnzuVyFBP7vTj27YVOI xD/VyiH8t6PFD+ya5VNzj2tUxqTu1HNZaIiEE4i4tuSqiYoV5rPILw4dBBRC+ymLYRzv /481tKJs/3pIouw9vKbBA+kB6Vk7dmyM6u4F7UJajN+CRj7Z4lziGaNqVtH54vg6lLAL 7mRYO7BeWzOPrnikqm8uuseH28KSKp2e6pe+iyyn0X32rSaQOlQCz0TFG7WILaYbu9Sm MrYb34KpDFA3gL6SSxb7mJ2ICo9isGzfc+grbJd07XOP2c75og2fxdscMcpJ++Zf/U2G fR9A== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=DrzFvHuzZyWDrJsXHZGzlLe/DbjZJO3zSxJex5Fu1Sk=; b=PLcpATWpSm8W9pzFsB2GgNc5b4LsmY0JKxoVNZ2uY8EWj5czwxZUl95E6f+cKT/D68 dh7R9nvuINUEpI6xvOhZu1Hg6DNBaRH2KLijttr1F3ISSf/DXBxul+rUefcNZ4+kI+XP XvBFdKqKNr1+L4MwloTuKAuJMrhVAXKAMI3MW7BzUXlI+jlsCWNXR+mMS9hxdbKDaW7U q6dk7KubED17b69OLpU3OfG2WTij1AsEMNalpmKbqCEzBoQWTc/HtU+9Dr6ExgIt8s59 Yf2/FXSB9PXjNAFGIRUHreUNv0Nx7TUZm4ZiM5TnQl8ajpl+8d3NJjPmweZDoYdNjAg5 4zqw== X-Gm-Message-State: AFeK/H3SPv9D3cSpexU+1UQUhamUezmd9wpuWFWfnta4Hn0PCiGcVeoMqOsadPIihgZacg== X-Received: by 10.223.160.101 with SMTP id l34mr16958465wrl.73.1489855324990; Sat, 18 Mar 2017 09:42:04 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 74 Organization: linux.* mail to news gateway X-Original-Cc: Rob Herring , Mark Rutland , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Jon Mason X-Original-Date: Sat, 18 Mar 2017 09:41:56 -0700 X-Original-Message-ID: <171eeda6-76d7-a241-b8cf-19c7e4283ca2@gmail.com> X-Original-References: <1488817485-7503-1-git-send-email-jon.mason@broadcom.com> <1488817485-7503-2-git-send-email-jon.mason@broadcom.com> <03eb99e1-f18c-d4a3-32bf-d90640b14ab1@gmail.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1603812 On 03/18/2017 03:36 AM, Rafał Miłecki wrote: > On 03/15/2017 10:53 PM, Florian Fainelli wrote: >> On 03/06/2017 08:24 AM, Jon Mason wrote: >>> From: Jon Mason >>> >>> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The >>> ARM TWD timer allocated the register space for the WDT, so this patch >>> necessitated shrinking that. Also, the GIC masks were added for these. >>> >>> Signed-off-by: Jon Mason >> >> There were some minor conflicts that have been resolved, applied, thanks! > > Solving conflict by removing a reg property? ;) > timer@20600 { > compatible = "arm,cortex-a9-twd-timer"; > interrupts = IRQ_TYPE_EDGE_RISING)>; > clocks = <&periph_clk>; > }; Sorry about that, the new commit is pushed to the same branch: https://github.com/Broadcom/stblinux/commit/f22c635e585471d01a38b829c0753c1467b5058e and it now incorporates: ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags which was applied to devicetree/fixes and not devicetree/next. > > This may be a bad idea :P > [ 0.020330] ------------[ cut here ]------------ > [ 0.025280] WARNING: CPU: 0 PID: 0 at arch/arm/kernel/smp_twd.c:412 > twd_local_timer_of_register+0x6c/0x80() > [ 0.035653] twd_local_timer_of_register failed (-12) > [ 0.040924] Modules linked in: > [ 0.044171] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.4.53 #0 > [ 0.050462] Hardware name: BCM5301X > [ 0.054161] Backtrace: > [ 0.056781] [] (dump_backtrace) from [] > (show_stack+0x18/0x1c) > [ 0.064831] r7:0000019c r6:c03ea15e r5:600000d3 r4:00000000 > [ 0.070992] [] (show_stack) from [] > (dump_stack+0x84/0xa4) > [ 0.078688] [] (dump_stack) from [] > (warn_slowpath_common+0x8c/0xb8) > [ 0.087294] r5:00000009 r4:c0497f48 > [ 0.091188] [] (warn_slowpath_common) from [] > (warn_slowpath_fmt+0x38/0x40) > [ 0.100444] r8:c7ffe700 r7:c04b0a14 r6:c04983c0 r5:00000002 r4:c6de78f0 > [ 0.107721] [] (warn_slowpath_fmt) from [] > (twd_local_timer_of_register+0x6c/0x80) > [ 0.117629] r3:fffffff4 r2:c03ea135 > [ 0.121512] [] (twd_local_timer_of_register) from > [] (clocksource_probe+0x54/0x94) > [ 0.131410] r5:00000002 r4:c6de78f0 > [ 0.135299] [] (clocksource_probe) from [] > (time_init+0x30/0x38) > [ 0.143532] r5:ffffffff r4:00000000 > [ 0.147412] [] (time_init) from [] > (start_kernel+0x274/0x3f4) > [ 0.155376] [] (start_kernel) from [<0000807c>] (0x807c) > [ 0.161944] r10:00000000 r9:413fc090 r8:0000406a r7:c049acd4 > r6:c0488a24 r5:c0498444 > [ 0.170454] r4:c04b0b20 > [ 0.173213] ---[ end trace f24b6c88ae00fa9a ]--- > -- Florian