linux-kernel - [tip:timers/urgent] clocksource/drivers/riscv: Fix clocksource mask

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Sat, 23 Mar 2019 04:28:08 -0700
From:   tip-bot for Atish Patra <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     Damien.LeMoal@....com, mingo@...nel.org, aou@...s.berkeley.edu,
        tglx@...utronix.de, atish.patra@....com, daniel.lezcano@...aro.org,
        anup@...infault.org, Anup.Patel@....com,
        linux-kernel@...r.kernel.org, palmer@...ive.com, hpa@...or.com
Subject: [tip:timers/urgent] clocksource/drivers/riscv: Fix clocksource mask

Commit-ID:  32d0be018f6f5ee2d5d19c4795304613560814cf
Gitweb:     https://git.kernel.org/tip/32d0be018f6f5ee2d5d19c4795304613560814cf
Author:     Atish Patra <atish.patra@....com>
AuthorDate: Fri, 22 Mar 2019 14:54:11 -0700
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Sat, 23 Mar 2019 12:25:34 +0100

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 <atish.patra@....com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Anup Patel <anup@...infault.org>
Cc: Albert Ou <aou@...s.berkeley.edu>
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: linux-riscv@...ts.infradead.org
Cc: Palmer Dabbelt <palmer@...ive.com>
Cc: Anup Patel <Anup.Patel@....com>
Cc: Damien Le Moal <Damien.LeMoal@....com>
Cc: stable@...r.kernel.org
Link: https://lkml.kernel.org/r/20190322215411.19362-1-atish.patra@wdc.com

---
 drivers/clocksource/timer-riscv.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c
index e8163693e936..5e6038fbf115 100644
--- a/drivers/clocksource/timer-riscv.c
+++ b/drivers/clocksource/timer-riscv.c
@@ -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",