Commit 6a399547 authored by Ben Dooks's avatar Ben Dooks

ARM: S5P6440: Add locking to GPIO calls

Add the new locking calls to ensure that these are always exclusively
accessing the GPIO registers.

Fixes a possible race between two threads modifying the same GPIO bank,
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 1ae35de1
...@@ -46,6 +46,7 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip, ...@@ -46,6 +46,7 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip,
void __iomem *base = ourchip->base; void __iomem *base = ourchip->base;
void __iomem *regcon = base; void __iomem *regcon = base;
unsigned long con; unsigned long con;
unsigned long flags;
switch (offset) { switch (offset) {
case 6: case 6:
...@@ -63,10 +64,14 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip, ...@@ -63,10 +64,14 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip,
break; break;
} }
s3c_gpio_lock(ourchip, flags);
con = __raw_readl(regcon); con = __raw_readl(regcon);
con &= ~(0xf << con_4bit_shift(offset)); con &= ~(0xf << con_4bit_shift(offset));
__raw_writel(con, regcon); __raw_writel(con, regcon);
s3c_gpio_unlock(ourchip, flags);
return 0; return 0;
} }
...@@ -78,6 +83,7 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip, ...@@ -78,6 +83,7 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip,
void __iomem *regcon = base; void __iomem *regcon = base;
unsigned long con; unsigned long con;
unsigned long dat; unsigned long dat;
unsigned long flags;
unsigned con_offset = offset; unsigned con_offset = offset;
switch (con_offset) { switch (con_offset) {
...@@ -96,6 +102,8 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip, ...@@ -96,6 +102,8 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip,
break; break;
} }
s3c_gpio_lock(ourchip, flags);
con = __raw_readl(regcon); con = __raw_readl(regcon);
con &= ~(0xf << con_4bit_shift(con_offset)); con &= ~(0xf << con_4bit_shift(con_offset));
con |= 0x1 << con_4bit_shift(con_offset); con |= 0x1 << con_4bit_shift(con_offset);
...@@ -109,6 +117,8 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip, ...@@ -109,6 +117,8 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip,
__raw_writel(con, regcon); __raw_writel(con, regcon);
__raw_writel(dat, base + GPIODAT_OFF); __raw_writel(dat, base + GPIODAT_OFF);
s3c_gpio_unlock(ourchip, flags);
return 0; return 0;
} }
...@@ -117,6 +127,7 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, ...@@ -117,6 +127,7 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
{ {
void __iomem *reg = chip->base; void __iomem *reg = chip->base;
unsigned int shift; unsigned int shift;
unsigned long flags;
u32 con; u32 con;
switch (off) { switch (off) {
...@@ -142,11 +153,15 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, ...@@ -142,11 +153,15 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
cfg <<= shift; cfg <<= shift;
} }
s3c_gpio_lock(chip, flags);
con = __raw_readl(reg); con = __raw_readl(reg);
con &= ~(0xf << shift); con &= ~(0xf << shift);
con |= cfg; con |= cfg;
__raw_writel(con, reg); __raw_writel(con, reg);
s3c_gpio_unlock(chip, flags);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment