Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sat, 23 Mar 2019 04:28:08 -0700
From:   tip-bot for Atish Patra <tipbot@zytor.com>
Message-ID: <tip-32d0be018f6f5ee2d5d19c4795304613560814cf@git.kernel.org>
Cc:     Damien.LeMoal@wdc.com, mingo@kernel.org, aou@eecs.berkeley.edu,
        tglx@linutronix.de, atish.patra@wdc.com, daniel.lezcano@linaro.org,
        anup@brainfault.org, Anup.Patel@wdc.com,
        linux-kernel@vger.kernel.org, palmer@sifive.com, hpa@zytor.com
Reply-To: mingo@kernel.org, tglx@linutronix.de, aou@eecs.berkeley.edu,
          Damien.LeMoal@wdc.com, palmer@sifive.com, hpa@zytor.com,
          atish.patra@wdc.com, Anup.Patel@wdc.com,
          linux-kernel@vger.kernel.org, anup@brainfault.org,
          daniel.lezcano@linaro.org
In-Reply-To: <20190322215411.19362-1-atish.patra@wdc.com>
References: <20190322215411.19362-1-atish.patra@wdc.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:timers/urgent] clocksource/drivers/riscv: Fix clocksource mask
Git-Commit-ID: 32d0be018f6f5ee2d5d19c4795304613560814cf
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  32d0be018f6f5ee2d5d19c4795304613560814cf
Gitweb:     https://git.kernel.org/tip/32d0be018f6f5ee2d5d19c4795304613560814cf
Author:     Atish Patra <atish.patra@wdc.com>
AuthorDate: Fri, 22 Mar 2019 14:54:11 -0700
Committer:  Thomas Gleixner <tglx@linutronix.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@wdc.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Anup Patel <anup@brainfault.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-riscv@lists.infradead.org
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Anup Patel <Anup.Patel@wdc.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>
Cc: stable@vger.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",