diff options
| author |   Felix Fietkau <nbd@nbd.name> | 2018-02-28 10:56:10 +0100 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2018-02-28 13:55:14 +0100 |
| commit | 5753405e27f8fe4c42c1537d3ddbd9e058e54cdc (patch) | |
| tree | b1319bec974fe4b8274c44fc07b0e4da24607d6b /drivers | |
| parent | clocksource/drivers/fsl_ftm_timer: Fix error return checking (diff) | |
| download | linux-dev-5753405e27f8fe4c42c1537d3ddbd9e058e54cdc.tar.xz linux-dev-5753405e27f8fe4c42c1537d3ddbd9e058e54cdc.zip | |
clocksource/drivers/mips-gic-timer: Use correct shift count to extract data
__gic_clocksource_init() extracts the GIC_CONFIG_COUNTBITS field from
read_gic_config() by right shifting the register value. The shift count is
determined by the most significant bit (__fls) of the bitmask which is
wrong as it shifts out the complete bitfield.
Use the least significant bit (__ffs) instead to shift the bitfield down to
bit 0.
Fixes: e07127a077c7 ("clocksource: mips-gic-timer: Use new GIC accessor functions")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: daniel.lezcano@linaro.org
Cc: paul.burton@imgtec.com
Link: https://lkml.kernel.org/r/20180228095610.50341-1-nbd@nbd.name
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/mips-gic-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index 65e18c86d9b9..986b6796b631 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -166,7 +166,7 @@ static int __init __gic_clocksource_init(void) /* Set clocksource mask. */ count_width = read_gic_config() & GIC_CONFIG_COUNTBITS; - count_width >>= __fls(GIC_CONFIG_COUNTBITS); + count_width >>= __ffs(GIC_CONFIG_COUNTBITS); count_width *= 4; count_width += 32; gic_clocksource.mask = CLOCKSOURCE_MASK(count_width); |