2017-06-09 10:09:36

by Gregory CLEMENT

[permalink] [raw]
Subject: [PATCH v2] gpio: mvebu: fix regmap_update_bits usage

In some place in the driver regmap_update_bits was misused. Indeed the
last argument is not the value of the bit (or group of bits) itself but
the mask value inside the register.

So when setting the bit N, then the value must be BIT(N) and not 1.

CC: Chris Packham <[email protected]>
CC: Ralph Sennhauser <[email protected]>
Signed-off-by: Gregory CLEMENT <[email protected]>
---
Hi,

In this second version I fixed the improper changed pointed by Thomas.

Dorry for the noise,

Gregory

drivers/gpio/gpio-mvebu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 3d03740a20e7..877a3edffa47 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -341,7 +341,7 @@ static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned int pin)
return ret;

regmap_update_bits(mvchip->regs, GPIO_IO_CONF_OFF,
- BIT(pin), 1);
+ BIT(pin), BIT(pin));

return 0;
}
@@ -503,7 +503,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)
case IRQ_TYPE_EDGE_FALLING:
case IRQ_TYPE_LEVEL_LOW:
regmap_update_bits(mvchip->regs, GPIO_IN_POL_OFF,
- BIT(pin), 1);
+ BIT(pin), BIT(pin));
break;
case IRQ_TYPE_EDGE_BOTH: {
u32 data_in, in_pol, val;
--
2.11.0


2017-06-09 11:01:29

by Thomas Petazzoni

[permalink] [raw]
Subject: Re: [PATCH v2] gpio: mvebu: fix regmap_update_bits usage

Hello,

On Fri, 9 Jun 2017 12:09:17 +0200, Gregory CLEMENT wrote:
> In some place in the driver regmap_update_bits was misused. Indeed the
> last argument is not the value of the bit (or group of bits) itself but
> the mask value inside the register.
>
> So when setting the bit N, then the value must be BIT(N) and not 1.
>
> CC: Chris Packham <[email protected]>
> CC: Ralph Sennhauser <[email protected]>
> Signed-off-by: Gregory CLEMENT <[email protected]>

Reviewed-by: Thomas Petazzoni <[email protected]>

Thanks for fixing this so quickly!

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

2017-06-09 12:21:50

by Ralph Sennhauser

[permalink] [raw]
Subject: Re: [PATCH v2] gpio: mvebu: fix regmap_update_bits usage

On Fri, 9 Jun 2017 12:09:17 +0200
Gregory CLEMENT <[email protected]> wrote:

> In some place in the driver regmap_update_bits was misused. Indeed the
> last argument is not the value of the bit (or group of bits) itself
> but the mask value inside the register.
>
> So when setting the bit N, then the value must be BIT(N) and not 1.
>
> CC: Chris Packham <[email protected]>
> CC: Ralph Sennhauser <[email protected]>
> Signed-off-by: Gregory CLEMENT <[email protected]>
> ---

Hi Gregory,

Tested-by: Ralph Sennhauser <[email protected]>

Thanks for the prompt fix
Ralph

2017-06-11 21:54:21

by Chris Packham

[permalink] [raw]
Subject: Re: [PATCH v2] gpio: mvebu: fix regmap_update_bits usage

On 10/06/17 00:22, Ralph Sennhauser wrote:
> On Fri, 9 Jun 2017 12:09:17 +0200
> Gregory CLEMENT <[email protected]> wrote:
>
>> In some place in the driver regmap_update_bits was misused. Indeed the
>> last argument is not the value of the bit (or group of bits) itself
>> but the mask value inside the register.
>>
>> So when setting the bit N, then the value must be BIT(N) and not 1.
>>
>> CC: Chris Packham <[email protected]>
>> CC: Ralph Sennhauser <[email protected]>
>> Signed-off-by: Gregory CLEMENT <[email protected]>
>> ---
>
> Hi Gregory,
>
> Tested-by: Ralph Sennhauser <[email protected]>
>
> Thanks for the prompt fix
> Ralph

Also works for me

Tested-by: Chris Packham <[email protected]>

2017-06-16 09:16:36

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH v2] gpio: mvebu: fix regmap_update_bits usage

On Fri, Jun 9, 2017 at 12:09 PM, Gregory CLEMENT
<[email protected]> wrote:

> In some place in the driver regmap_update_bits was misused. Indeed the
> last argument is not the value of the bit (or group of bits) itself but
> the mask value inside the register.
>
> So when setting the bit N, then the value must be BIT(N) and not 1.
>
> CC: Chris Packham <[email protected]>
> CC: Ralph Sennhauser <[email protected]>
> Signed-off-by: Gregory CLEMENT <[email protected]>
> ---
> Hi,
>
> In this second version I fixed the improper changed pointed by Thomas.

This version applied with the tags.

Yours,
Linus Walleij