diff mbox series

ARM: socfpga: arria10: fix timer3 address

Message ID 20200831104912.28974-1-s.trumtrar@pengutronix.de (mailing list archive)
State New, archived
Headers show
Series ARM: socfpga: arria10: fix timer3 address | expand

Commit Message

Steffen Trumtrar Aug. 31, 2020, 10:49 a.m. UTC
Since commit 6d2e16a3181b ("clocksource: dw_apb_timer_of: Fix missing
clockevent timers") the dw_apb_timer_of code tries to add a clockevent
for timer3. This reveals the wrong register offset that is provided in
the timer3-node in the socfpga_arria10 devicetree which in turn results
in

  Unhandled fault: imprecise external abort (0x406) at 0xbea9fe20

and therefore in a kernel panic.

Set the offset to the correct value.

Cc: stable@vger.kernel.org
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dinh Nguyen Aug. 31, 2020, 1:40 p.m. UTC | #1
Thanks for the patch Steffen, but I have already submitted a patch to
fix this.

The patch is in linux-next and staged for an rc in v5.9.

Dinh


On 8/31/20 5:49 AM, Steffen Trumtrar wrote:
> Since commit 6d2e16a3181b ("clocksource: dw_apb_timer_of: Fix missing
> clockevent timers") the dw_apb_timer_of code tries to add a clockevent
> for timer3. This reveals the wrong register offset that is provided in
> the timer3-node in the socfpga_arria10 devicetree which in turn results
> in
> 
>   Unhandled fault: imprecise external abort (0x406) at 0xbea9fe20
> 
> and therefore in a kernel panic.
> 
> Set the offset to the correct value.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
> index 7b8961794a82..a5bd4537766d 100644
> --- a/arch/arm/boot/dts/socfpga_arria10.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
> @@ -852,7 +852,7 @@
>  		timer3: timer3@ffd00100 {
>  			compatible = "snps,dw-apb-timer";
>  			interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;
> -			reg = <0xffd01000 0x100>;
> +			reg = <0xffd00100 0x100>;
>  			clocks = <&l4_sys_free_clk>;
>  			clock-names = "timer";
>  			resets = <&rst L4SYSTIMER1_RESET>;
>
Steffen Trumtrar Sept. 1, 2020, 5:25 a.m. UTC | #2
Hi Dinh,

Dinh Nguyen <dinguyen@kernel.org> writes:

> Thanks for the patch Steffen, but I have already submitted a 
> patch to
> fix this.
>
> The patch is in linux-next and staged for an rc in v5.9.
>

perfect. Didn't see it yesterday, probably didn't look hard 
enough.


BR,
Steffen

--
Pengutronix e.K.                | Dipl.-Inform. Steffen Trumtrar |
Steuerwalder Str. 21            | https://www.pengutronix.de/    |
31137 Hildesheim, Germany       | Phone: +49-5121-206917-0       |
Amtsgericht Hildesheim, HRA 2686| Fax:   +49-5121-206917-5555    |
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index 7b8961794a82..a5bd4537766d 100644
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -852,7 +852,7 @@ 
 		timer3: timer3@ffd00100 {
 			compatible = "snps,dw-apb-timer";
 			interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;
-			reg = <0xffd01000 0x100>;
+			reg = <0xffd00100 0x100>;
 			clocks = <&l4_sys_free_clk>;
 			clock-names = "timer";
 			resets = <&rst L4SYSTIMER1_RESET>;