From patchwork Wed Feb 2 21:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 12733499 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2A7E7C433EF for ; Wed, 2 Feb 2022 21:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=DU/RSUq1KRVsH3hR2KDXXsL+vQgmA1V58NC1EjRfn1g=; b=OQvYjN8nGrZwj8 1ywc9mEyqgGT9QCn2MQDh7BOa0LnVLpxwBDO2OK/1h+IINypnGeCiSsjygHU9ZvsaTJeHjql37Ma/ AwzefPoEpYGUtHosVJiE9Io6oDW/uRxTrw3EklgMVLFYBcbAPWRLlypJR7DHKF1HXt+KlNbh/lUto 7kxM0fckSdCisOe2354fnB58DgWdJinD3jgsXnEAk233C73s1U+voIo0lnU3Lf+qwHGD6nJvIERaW w1dQvamF9a2ktrJjdrwjKeeUbAuwlO3kFoIvNgMczP5GgszIF+6jh10450GceW+k692pbCMQxwQwt 6PPC1D5qXgorGUArA3aw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nFN9o-00Guom-Lj; Wed, 02 Feb 2022 21:27:16 +0000 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nFN9k-00GuoG-5x for linux-arm-kernel@lists.infradead.org; Wed, 02 Feb 2022 21:27:14 +0000 Received: by mail-pj1-x102a.google.com with SMTP id q63so548912pja.1 for ; Wed, 02 Feb 2022 13:27:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+MX3D9q8d3LzKE4FBcDvQ2a3FDyu2HVNWGmSJadrBn8=; b=4sTFPyi53OOLG+HQ5SejHODLgQ+qUrtD9GZxSJ7ShYrvsFG4QhoWkdAIPReC6G1p0J UHYQCyxOIYt36ZxoKfizbwTzGNEIeaHQKrSchgJZBHkcwOWbI5BgNN2wBStCbBwvH7sB 1CmW1G7IXVOHIMTv2TMgULJaHzW0qCFO1gWe26y5STKIUcfsmC5xB9y06BD3zT5/9yCF ywzNX1MaXh13XVPrU6Umz52Ygzw4/iaJ9B1qXyS85YfwrDBUmoKjLRBnN5q3/apX8yaQ HMfoHYU5Okv216E6Gsglt60xd9ICAkbh7CMRQxNvBHBke6RUZUOk9cN2UjzQdYhKhNJC 4uzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+MX3D9q8d3LzKE4FBcDvQ2a3FDyu2HVNWGmSJadrBn8=; b=kfwKfqXSswocFqAscXvF+3SO2wO1XGaMmEx97FK6LuIOPwh8j3M/XV3HrLwkis8+Kt DMYOQLZgotYG46GZ3tqvkJSuuLZB5eUq7JJUe1A6oAfR1vcMOGhXiNC0R+TeEBUhEqxh JZo7jsbjEu/wRv/uxSq6TFhQp/XqJZQn4jiU+hrvEQW3dczst9uaa3uTt+QK6NJ3FRVP paq3VOqPYJ0YWROloCcM//OmNVYZnID3v1boN9P1oxvFX+q2AjrPhFt/n6oE+wpPbmFY gPjgfgySrdtH0iAh063p1OTm5ZS+EBbKidRJt9YM/Lk8aV8dB+rvOu4CJ6kfUptk59wb jvGw== X-Gm-Message-State: AOAM532YC9mn2JjKuqLGF7V5AkGBuQvN2ovuOnzMWxkPxqaBX6g+OsD8 GllgdlYftC4DHeCWD1XVeB/i7w== X-Google-Smtp-Source: ABdhPJzKzue1OErPgU/Ol0OyFasfeCXXO8paAjP9TLPGwHbmhBypSxEY8Nsey15YsuIy5WiTLfvPYA== X-Received: by 2002:a17:902:ea0f:: with SMTP id s15mr31734177plg.118.1643837230684; Wed, 02 Feb 2022 13:27:10 -0800 (PST) Received: from x1.hsd1.or.comcast.net ([2601:1c2:1001:7090:9646:73e6:2457:2f0f]) by smtp.gmail.com with ESMTPSA id mi11sm7579087pjb.37.2022.02.02.13.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 13:27:10 -0800 (PST) From: Drew Fustini To: Tony Lindgren , Daniel Lezcano , Keerthy , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tero Kristo , khilman@baylibre.com, s-anna@ti.com Cc: Drew Fustini Subject: [PATCH] clocksource/drivers/timer-ti-dm: fix regression from errata i940 fix Date: Wed, 2 Feb 2022 13:25:55 -0800 Message-Id: <20220202212554.1316032-1-dfustini@baylibre.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220202_132712_295207_A5CAB05E X-CRM114-Status: GOOD ( 16.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The existing fix for errata i940 causes a conflict for IPU2 which is using timer 3 and 4. From arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi: &ipu2 { mboxes = <&mailbox6 &mbox_ipu2_ipc3x>; ti,timers = <&timer3>; ti,watchdog-timers = <&timer4>, <&timer9>; }; I discovered the timer conflict from when booting mainline on a BeagleBoard X15 (AM5728): remoteproc remoteproc1: 55020000.ipu is available remoteproc remoteproc1: powering up 55020000.ipu remoteproc remoteproc1: Booting fw image dra7-ipu2-fw.xem4 omap-rproc 55020000.ipu: could not get timer platform device omap-rproc 55020000.ipu: omap_rproc_enable_timers failed: -19 remoteproc remoteproc1: can't start rproc 55020000.ipu: -19 I modified the errata fix to use timer 15 and 16 instead which resolves the timer conflict. Fixes: 25de4ce5ed02 ("clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940") Link: https://lore.kernel.org/linux-omap/YfWsG0p6to3IJuvE@x1/ Signed-off-by: Drew Fustini Reviewed-by: Tony Lindgren --- Note: I am keeping the device tree and driver change together in one patch as that is how the original errata fix commit was structured. arch/arm/boot/dts/dra7-l4.dtsi | 5 ++--- arch/arm/boot/dts/dra7.dtsi | 8 ++++---- drivers/clocksource/timer-ti-dm-systimer.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi index 956a26d52a4c..0a11bacffc1f 100644 --- a/arch/arm/boot/dts/dra7-l4.dtsi +++ b/arch/arm/boot/dts/dra7-l4.dtsi @@ -3482,8 +3482,7 @@ timer14: timer@0 { ti,timer-pwm; }; }; - - target-module@2c000 { /* 0x4882c000, ap 17 02.0 */ + timer15_target: target-module@2c000 { /* 0x4882c000, ap 17 02.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; reg = <0x2c000 0x4>, <0x2c010 0x4>; @@ -3511,7 +3510,7 @@ timer15: timer@0 { }; }; - target-module@2e000 { /* 0x4882e000, ap 19 14.0 */ + timer16_target: target-module@2e000 { /* 0x4882e000, ap 19 14.0 */ compatible = "ti,sysc-omap4-timer", "ti,sysc"; reg = <0x2e000 0x4>, <0x2e010 0x4>; diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 6b485cbed8d5..8f7ffe2f66e9 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1339,20 +1339,20 @@ timer@0 { }; /* Local timers, see ARM architected timer wrap erratum i940 */ -&timer3_target { +&timer15_target { ti,no-reset-on-init; ti,no-idle; timer@0 { - assigned-clocks = <&l4per_clkctrl DRA7_L4PER_TIMER3_CLKCTRL 24>; + assigned-clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER15_CLKCTRL 24>; assigned-clock-parents = <&timer_sys_clk_div>; }; }; -&timer4_target { +&timer16_target { ti,no-reset-on-init; ti,no-idle; timer@0 { - assigned-clocks = <&l4per_clkctrl DRA7_L4PER_TIMER4_CLKCTRL 24>; + assigned-clocks = <&l4per3_clkctrl DRA7_L4PER3_TIMER16_CLKCTRL 24>; assigned-clock-parents = <&timer_sys_clk_div>; }; }; diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c index b6f97960d8ee..c706d63e9f5c 100644 --- a/drivers/clocksource/timer-ti-dm-systimer.c +++ b/drivers/clocksource/timer-ti-dm-systimer.c @@ -695,9 +695,9 @@ static int __init dmtimer_percpu_quirk_init(struct device_node *np, u32 pa) return 0; } - if (pa == 0x48034000) /* dra7 dmtimer3 */ + if (pa == 0x4882C000) /* dra7 dmtimer15 */ return dmtimer_percpu_timer_init(np, 0); - else if (pa == 0x48036000) /* dra7 dmtimer4 */ + else if (pa == 0x4882E000) /* dra7 dmtimer16 */ return dmtimer_percpu_timer_init(np, 1); return 0;