clocksource/drivers/npcm: fix GENMASK and timer operation
Subsystems (2)
Avi Fishman
maintainerPATCH v5 1/1 clocksource/drivers/npcm: fix GENMASK and timer operation
NPCM7XX_Tx_OPER GENMASK bits where wrong,
Since NPCM7XX_REG_TICR0 register reset value of those bits was 0, it did not cause an issue.
in npcm7xx_timer_oneshot() the original NPCM7XX_REG_TCSR0 register was read again after masking it with ~NPCM7XX_Tx_OPER so the masking didn't take effect.
npcm7xx_timer_periodic() was not wrong but it wrote to NPCM7XX_REG_TICR0 in a middle of read modify write to NPCM7XX_REG_TCSR0 which is confusing.npcm7xx_timer_oneshot() did wrong calculation
--- drivers/clocksource/timer-npcm7xx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/clocksource/timer-npcm7xx.c +3 -6
@@ -32,7 +32,7 @@#define NPCM7XX_Tx_INTEN BIT(29)#define NPCM7XX_Tx_COUNTEN BIT(30)#define NPCM7XX_Tx_ONESHOT 0x0 -#define NPCM7XX_Tx_OPER GENMASK(27, 3) +#define NPCM7XX_Tx_OPER GENMASK(28, 27)#define NPCM7XX_Tx_MIN_PRESCALE 0x1#define NPCM7XX_Tx_TDR_MASK_BITS 24#define NPCM7XX_Tx_MAX_CNT 0xFFFFFF
@@ -84,8 +84,6 @@ static int npcm7xx_timer_oneshot(struct clock_event_device *evt) val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - - val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val |= NPCM7XX_START_ONESHOT_Tx;writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );
@@ -97,12 +95,11 @@ static int npcm7xx_timer_periodic(struct clock_event_device *evt)struct timer_of *to =to_timer_of (evt);u32 val; +writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 ); + val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - -writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 ); val |= NPCM7XX_START_PERIODIC_Tx; -writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );return 0 ;
Signature · 1 line
2.18.0
Quoted 7 lines · Avi Fishman
NPCM7XX_Tx_OPERGENMASK bits where wrong,
SinceNPCM7XX_REG_TICR0register reset value of those bits was 0, it did not cause an issue.
innpcm7xx_timer_oneshot()the originalNPCM7XX_REG_TCSR0register was read again after masking it with ~NPCM7XX_Tx_OPER so the masking didn't take effect.
Quoted 6 lines
npcm7xx_timer_periodic()was not wrong but it wrote toNPCM7XX_REG_TICR0in a middle of read modify write toNPCM7XX_REG_TCSR0which is confusing.npcm7xx_timer_oneshot()did wrong calculationSigned-off-by Avi Fishman <[email protected]>
I've applied the patch and massaged the changelog [1].
Let me know if you disagree with it.
Please, in the future take care of adding the Fixes tag.
Thanks
-- Daniel
Quoted 42 lines
--- drivers/clocksource/timer-npcm7xx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/clocksource/timer-npcm7xx.c +3
-6@@ -32,7 +32,7 @@#define NPCM7XX_Tx_INTEN BIT(29)#define NPCM7XX_Tx_COUNTEN BIT(30)#define NPCM7XX_Tx_ONESHOT 0x0 -#define NPCM7XX_Tx_OPER GENMASK(27, 3) +#define NPCM7XX_Tx_OPER GENMASK(28, 27)#define NPCM7XX_Tx_MIN_PRESCALE 0x1#define NPCM7XX_Tx_TDR_MASK_BITS 24#define NPCM7XX_Tx_MAX_CNT 0xFFFFFF@@ -84,8 +84,6 @@ static int npcm7xx_timer_oneshot(struct clock_event_device *evt) val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - - val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val |= NPCM7XX_START_ONESHOT_Tx;writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );@@ -97,12 +95,11 @@ static int npcm7xx_timer_periodic(struct clock_event_device *evt)struct timer_of *to =to_timer_of (evt);u32 val; +writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 ); + val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - -writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 ); val |= NPCM7XX_START_PERIODIC_Tx; -writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );return 0 ;
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Avi Fishman
maintainerThanks Daniel,
It seems more clear now :)
Good to know about the need for Fixes tag.
Quoted 80 lines · Daniel Lezcano
Quoted 7 lines · Avi Fishman
NPCM7XX_Tx_OPERGENMASK bits where wrong,
SinceNPCM7XX_REG_TICR0register reset value of those bits was 0, it did not cause an issue.
innpcm7xx_timer_oneshot()the originalNPCM7XX_REG_TCSR0register was read again after masking it with ~NPCM7XX_Tx_OPER so the masking didn't take effect.Quoted 6 lines
npcm7xx_timer_periodic()was not wrong but it wrote toNPCM7XX_REG_TICR0in a middle of read modify write toNPCM7XX_REG_TCSR0which is confusing.npcm7xx_timer_oneshot()did wrong calculationSigned-off-by Avi Fishman <[email protected]>I've applied the patch and massaged the changelog [1].
Let me know if you disagree with it.
Please, in the future take care of adding the Fixes tag.
Thanks
-- Daniel
Quoted 32 lines
--- drivers/clocksource/timer-npcm7xx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/clocksource/timer-npcm7xx.c +2
-3@@ -32,7 +32,7 @@#define NPCM7XX_Tx_INTEN BIT(29)#define NPCM7XX_Tx_COUNTEN BIT(30)#define NPCM7XX_Tx_ONESHOT 0x0 -#define NPCM7XX_Tx_OPER GENMASK(27, 3) +#define NPCM7XX_Tx_OPER GENMASK(28, 27)#define NPCM7XX_Tx_MIN_PRESCALE 0x1#define NPCM7XX_Tx_TDR_MASK_BITS 24#define NPCM7XX_Tx_MAX_CNT 0xFFFFFF@@ -84,8 +84,6 @@ static int npcm7xx_timer_oneshot(struct clock_event_device *evt) val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - - val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val |= NPCM7XX_START_ONESHOT_Tx;writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );@@ -97,12 +95,11 @@ static int npcm7xx_timer_periodic(struct clock_event_device *evt)struct timer_of *to =to_timer_of (evt);u32 val; +writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 );drivers/clocksource/timer-npcm7xx.c static int npcm7xx_timer_periodic(struct clock_event_device *evt) · line 105
Quoted 10 lines
drivers/clocksource/timer-npcm7xx.c +1
-3+ val =readl (timer_of_base (to) +NPCM7XX_REG_TCSR0 ); val &= ~NPCM7XX_Tx_OPER; - -writel (timer_of_period (to),timer_of_base (to) +NPCM7XX_REG_TICR0 ); val |= NPCM7XX_START_PERIODIC_Tx; -writel (val,timer_of_base (to) +NPCM7XX_REG_TCSR0 );return 0 ;--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCsFollow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Signature · 2 lines
Regards, Avi