Skip to contentSkip to conversation

FAILED: patch "[PATCH] clocksource/drivers/riscv: Fix clocksource mask" failed to apply to 4.19-stable tree

PATCH [email protected] 1 participant 1 message Mar 24, 2019

Subsystems (3)
Stable branch RISC-V Clocksource, clockevent drivers
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 32d0be018f6f5ee2d5d19c4795304613560814cf Mon Sep 17 00:00:00 2001
From: Atish Patra <[email protected]>
Date: Fri, 22 Mar 2019 14:54:11 -0700
Subject: [PATCH] clocksource/drivers/riscv: Fix clocksource mask

For all riscv architectures (RV32, RV64 and RV128), the clocksource is a 64 bit incrementing counter.

Fix the clock source mask accordingly.

Tested on both 64bit and 32 bit virt machine in QEMU.

Fixes 62b019436814 ("clocksource: new RISC-V SBI timer driver")
Signed-off-by Atish Patra <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Reviewed-by Anup Patel <[email protected]>
Cc Albert Ou <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc [email protected]
Cc Palmer Dabbelt <[email protected]>
Cc Anup Patel <[email protected]>
Cc Damien Le Moal <[email protected]>
Cc [email protected]
Link https://lkml.kernel.org/r/[email protected] open here
drivers/clocksource/timer-riscv.c +2 -3
index e8163693e936..5e6038fbf115 100644
@@ -58,7 +58,7 @@ static u64 riscv_sched_clock(void)
 static DEFINE_PER_CPU(struct clocksource, riscv_clocksource) = {
 	.name		= "riscv_clocksource",
 	.rating		= 300,
-	.mask		= CLOCKSOURCE_MASK(BITS_PER_LONG),
+	.mask		= CLOCKSOURCE_MASK(64),
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 	.read		= riscv_clocksource_rdtime,
 };

@@ -120,8 +120,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)
 		return error;
 	}
 
-	sched_clock_register(riscv_sched_clock,
-			BITS_PER_LONG, riscv_timebase);
+	sched_clock_register(riscv_sched_clock, 64, riscv_timebase);
 
 	error = cpuhp_setup_state(CPUHP_AP_RISCV_TIMER_STARTING,
 			 "clockevents/riscv/timer:starting",