ARM: SAMSUNG: Add spinlock locking to GPIO banks
Subsystems (3)
PATCH 1/6 ARM: SAMSUNG: Add spinlock locking to GPIO banks
Add locking to each GPIO bank to allow for SMP capable code to use the gpiolib functions. See the gpio-core.h header file for more information.
--- arch/arm/plat-samsung/gpio-config.c | 12 ++++++------ arch/arm/plat-samsung/gpio.c | 15 +++++++++------ arch/arm/plat-samsung/include/plat/gpio-core.h | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 12 deletions(-)
arch/arm/plat-samsung/gpio-config.c +6 -6
@@ -33,9 +33,9 @@ int s3c_gpio_cfgpin(unsigned int pin, unsigned int config) offset = pin - chip->chip.base; -local_irq_save (flags); +s3c_gpio_lock (chip, flags); ret =s3c_gpio_do_setcfg (chip, offset, config); -local_irq_restore (flags); +s3c_gpio_unlock (chip, flags);return ret; }
@@ -51,9 +51,9 @@ unsigned s3c_gpio_getcfg(unsigned int pin)if (chip) { offset = pin - chip->chip.base; -local_irq_save (flags); +s3c_gpio_lock (chip, flags); ret =s3c_gpio_do_getcfg (chip, offset); -local_irq_restore (flags); +s3c_gpio_unlock (chip, flags); }return ret;
@@ -72,9 +72,9 @@ int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull) offset = pin - chip->chip.base; -local_irq_save (flags); +s3c_gpio_lock (chip, flags); ret =s3c_gpio_do_setpull (chip, offset, pull); -local_irq_restore (flags); +s3c_gpio_unlock (chip, flags);return ret; }
arch/arm/plat-samsung/gpio.c +9 -6
@@ -15,6 +15,7 @@#include <linux/init.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/spinlock.h> #include <plat/gpio-core.h>
@@ -52,14 +53,14 @@ static int s3c_gpiolib_input(struct gpio_chip *chip, unsigned offset)unsigned long flags;unsigned long con; -local_irq_save (flags); +s3c_gpio_lock (ourchip, flags); con =__raw_readl (base +0x00 ); con &= ~(3 << (offset *2 ));__raw_writel (con, base +0x00 ); -local_irq_restore (flags); +s3c_gpio_unlock (ourchip, flags);return 0 ; }
@@ -72,7 +73,7 @@ static int s3c_gpiolib_output(struct gpio_chip *chip,unsigned long dat;unsigned long con; -local_irq_save (flags); +s3c_gpio_lock (ourchip, flags); dat =__raw_readl (base +0x04 ); dat &= ~(1 << offset);
@@ -87,7 +88,7 @@ static int s3c_gpiolib_output(struct gpio_chip *chip,__raw_writel (con, base +0x00 );__raw_writel (dat, base +0x04 ); -local_irq_restore (flags); +s3c_gpio_unlock (ourchip, flags);return 0 ; }
@@ -99,7 +100,7 @@ static void s3c_gpiolib_set(struct gpio_chip *chip,unsigned long flags;unsigned long dat; -local_irq_save (flags); +s3c_gpio_lock (ourchip, flags); dat =__raw_readl (base +0x04 ); dat &= ~(1 << offset);
@@ -107,7 +108,7 @@ static void s3c_gpiolib_set(struct gpio_chip *chip, dat |=1 << offset;__raw_writel (dat, base +0x04 ); -local_irq_restore (flags); +s3c_gpio_unlock (ourchip, flags); }static int s3c_gpiolib_get (struct gpio_chip *chip,unsigned offset)
@@ -131,6 +132,8 @@ __init void s3c_gpiolib_add(struct s3c_gpio_chip *chip)BUG_ON (!gc->label);BUG_ON (!gc->ngpio); +spin_lock_init (&chip->lock); +if (!gc->direction_input) gc->direction_input = s3c_gpiolib_input;if (!gc->direction_output)
arch/arm/plat-samsung/include/plat/gpio-core.h +14 -0
@@ -44,16 +44,26 @@ struct s3c_gpio_cfg;* @chip: The chip structure to be exported via gpiolib. * @base: The base pointer to the gpio configuration registers. * @config: special function and pull-resistor control information. +* @lock: Lock for exclusive access to this gpio bank. * @pm_save: Save information for suspend/resume support. * * This wrapper provides the necessary information for the Samsung * specific gpios being registered with gpiolib. +* +* The lock protects each gpio bank from multiple access of the shared +* configuration registers, or from reading of data whilst another thread +* is writing to the register set. +* +* Each chip has its own lock to avoid any contention between different +* CPU cores trying to get one lock for different GPIO banks, where each +* bank of GPIO has its own register space and configuration registers. */ struct s3c_gpio_chip {struct gpio_chip chip;struct s3c_gpio_cfg *config;struct s3c_gpio_pm *pm;void __iomem *base; +spinlock_t lock;#ifdef CONFIG_PM u32 pm_save[4 ];#endif
@@ -138,3 +148,7 @@ extern struct s3c_gpio_pm s3c_gpio_pm_4bit;#define __gpio_pm (x) NULL#endif /* CONFIG_PM */ + +/* locking wrappers to deal with multiple access to the same gpio bank */ +#define s3c_gpio_lock (_oc, _fl) spin_lock_irqsave(&(_oc)->lock, _fl) +#define s3c_gpio_unlock (_oc, _fl) spin_unlock_irqrestore(&(_oc)->lock, _fl)
Signature · 1 line
1.6.3.3
PATCH 2/6 ARM: S3C244X: fix gpiolib port J support
From: Vasily Khoruzhick <[email protected]>
Increase GPIOs number for S3C244X, and make S3C_GPIO_END point to BANKJ end, otherwise gpiolib refuses to register BANKJ
--- arch/arm/mach-s3c2410/include/mach/gpio-track.h | 2 +- arch/arm/mach-s3c2410/include/mach/gpio.h | 8 ++++++++ arch/arm/plat-samsung/pm-gpio.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/mach-s3c2410/include/mach/gpio-track.h +1 -1
@@ -23,7 +23,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin) {struct s3c_gpio_chip *chip; -if (pin >S3C2410_GPG (10 )) +if (pin >S3C_GPIO_END )return NULL ; chip = &s3c24xx_gpios[pin/32 ];
arch/arm/mach-s3c2410/include/mach/gpio.h +8 -0
@@ -20,10 +20,18 @@* devices that need GPIO. */ +#ifdef CONFIG_CPU_S3C244X +#define ARCH_NR_GPIOS (32 * 9 + CONFIG_S3C24XX_GPIO_EXTRA) +#else #define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA) +#endif #include <asm-generic/gpio.h> #include <mach/gpio-nrs.h> #include <mach/gpio-fns.h> +#ifdef CONFIG_CPU_S3C24XX +#define S3C_GPIO_END (S3C2410_GPIO_BANKJ + 32) +#else #define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32) +#endif
arch/arm/plat-samsung/pm-gpio.c +1 -1
@@ -343,7 +343,7 @@ void s3c_pm_save_gpios(void) ourchip->pm_save[2 ], ourchip->pm_save[3]); - gpio_nr += ourchip->chip.ngpio; + gpio_nr += ourchip->chip.ngpio -1 ; gpio_nr +=CONFIG_S3C_GPIO_SPACE ; } }
Signature · 1 line
1.6.3.3
PATCH 3/6 ARM: S3C24XX: Start cleanup of GPIO numbering
In reply to Ben DooksStart cleaning up the numbering of GPIO banks by removing the old bank start definitions currently being used by some of the header files.
--- arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 5 ----- arch/arm/mach-s3c2412/gpio.c | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-)
arch/arm/mach-s3c2410/include/mach/gpio-nrs.h +0 -5
@@ -16,12 +16,7 @@#define S3C2410_GPIONO (bank,offset) ((bank) + (offset)) -#define S3C2410_GPIO_BANKA (32*0) -#define S3C2410_GPIO_BANKB (32*1)#define S3C2410_GPIO_BANKC (32*2) -#define S3C2410_GPIO_BANKD (32*3) -#define S3C2410_GPIO_BANKE (32*4) -#define S3C2410_GPIO_BANKF (32*5)#define S3C2410_GPIO_BANKG (32*6)#define S3C2410_GPIO_BANKH (32*7)
arch/arm/mach-s3c2412/gpio.c +4 -4
@@ -33,14 +33,14 @@ int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) offs *=2 ; -if (pin <S3C2410_GPIO_BANKB ) +if (pin <S3C2410_GPB (0 ))return -EINVAL ; -if (pin >=S3C2410_GPIO_BANKF && - pin <=S3C2410_GPIO_BANKG ) +if (pin >=S3C2410_GPF (0 ) && + pin <=S3C2410_GPG (16 ))return -EINVAL ; -if (pin > (S3C2410_GPIO_BANKH +32 )) +if (pin >S3C2410_GPH (16 ))return -EINVAL ;local_irq_save (flags);
Signature · 1 line
1.6.3.3
PATCH 4/6 ARM: S3C24XX: Update missed gpio calls to use gpiolib
In reply to Ben DooksUpdate a couple of S3C24XX and S3C2412 files that are still using the GPIO number to register mapping calls to get the s3c_gpio_chip and use the base field from that.
--- arch/arm/mach-s3c2412/gpio.c | 12 +++++++----- arch/arm/plat-s3c24xx/gpio.c | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-)
arch/arm/mach-s3c2412/gpio.c +7 -5
@@ -16,18 +16,20 @@#include <linux/types.h> #include <linux/module.h> #include <linux/interrupt.h> +#include <linux/gpio.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <mach/regs-gpio.h> -#include <mach/hardware.h> +#include <plat/gpio-core.h> +int s3c2412_gpio_set_sleepcfg (unsigned int pin,unsigned int state) { -void __iomem *base =S3C24XX_GPIO_BASE (pin); -unsigned long offs =S3C2410_GPIO_OFFSET (pin); +struct s3c_gpio_chip *chip =s3c_gpiolib_getchip (pin); +unsigned long offs = pin - chip->chip.base;unsigned long flags;unsigned long slpcon;
@@ -45,12 +47,12 @@ int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state)local_irq_save (flags); - slpcon =__raw_readl (base +0x0C ); + slpcon =__raw_readl (chip->base +0x0C ); slpcon &= ~(3 << offs); slpcon |= state << offs; -__raw_writel (slpcon, base +0x0C ); +__raw_writel (slpcon, chip->base +0x0C );local_irq_restore (flags);
arch/arm/plat-s3c24xx/gpio.c +5 -3
@@ -34,6 +34,8 @@#include <mach/regs-gpio.h> +#include <plat/gpio-core.h> +/* gpiolib wrappers until these are totally eliminated */ void s3c2410_gpio_pullup (unsigned int pin,unsigned int to)
@@ -68,10 +70,10 @@ EXPORT_SYMBOL(s3c2410_gpio_setpin);unsigned int s3c2410_gpio_getpin (unsigned int pin) { -void __iomem *base =S3C24XX_GPIO_BASE (pin); -unsigned long offs =S3C2410_GPIO_OFFSET (pin); +struct s3c_gpio_chip *chip =s3c_gpiolib_getchip (pin); +unsigned long offs = pin - chip->chip.base; -return __raw_readl (base +0x04 ) & (1 << offs); +return __raw_readl (chip->base +0x04 ) & (1 << offs); }EXPORT_SYMBOL (s3c2410_gpio_getpin);
Signature · 1 line
1.6.3.3
PATCH 5/6 ARM: S3C24XX: Remove macros mapping GPIO number to base
In reply to Ben DooksAs part of the cleanup, remove the old macros mapping GPIO numbers to the base of the register now we have gpiolib to manage the GPIO mappings for us.
--- arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 1 - arch/arm/mach-s3c2410/include/mach/gpio-track.h | 2 +- arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 22 ++-------------------- 3 files changed, 3 insertions(+), 22 deletions(-)
arch/arm/mach-s3c2410/include/mach/gpio-nrs.h +0 -1
@@ -16,7 +16,6 @@#define S3C2410_GPIONO (bank,offset) ((bank) + (offset)) -#define S3C2410_GPIO_BANKC (32*2)#define S3C2410_GPIO_BANKG (32*6)#define S3C2410_GPIO_BANKH (32*7)
arch/arm/mach-s3c2410/include/mach/gpio-track.h +1 -1
@@ -27,7 +27,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)return NULL ; chip = &s3c24xx_gpios[pin/32 ]; - return (S3C2410_GPIO_OFFSET(pin) < chip->chip.ngpio) ? chip : NULL; + return ((pin - chip->chip.base) < chip->chip.ngpio) ? chip : NULL; }#endif /* __ASM_ARCH_GPIO_CORE_H */
arch/arm/mach-s3c2410/include/mach/regs-gpio.h +2 -20
@@ -17,29 +17,11 @@#include <mach/gpio-nrs.h> #ifdef CONFIG_CPU_S3C2400 -#define S3C24XX_GPIO_BASE (x) S3C2400_GPIO_BASE(x) -#define S3C24XX_MISCCR S3C2400_MISCCR +#define S3C24XX_MISCCR S3C2400_MISCCR#else -#define S3C24XX_GPIO_BASE (x) S3C2410_GPIO_BASE(x) -#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80) +#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)#endif /* CONFIG_CPU_S3C2400 */ - -/* S3C2400 doesn't have a 1:1 mapping to S3C2410 gpio base pins */ - -#define S3C2400_BANKNUM (pin) (((pin) & ~31) / 32) -#define S3C2400_BASEA2B (pin) ((((pin) & ~31) >> 2)) -#define S3C2400_BASEC2H (pin) ((S3C2400_BANKNUM(pin) * 10) + \ - (2 * (S3C2400_BANKNUM(pin)-2))) - -#define S3C2400_GPIO_BASE (pin) (pin < S3C2410_GPIO_BANKC ? \ - S3C2400_BASEA2B(pin)+S3C24XX_VA_GPIO : \ - S3C2400_BASEC2H(pin)+S3C24XX_VA_GPIO) - - -#define S3C2410_GPIO_BASE (pin) ((((pin) & ~31) >> 1) + S3C24XX_VA_GPIO) -#define S3C2410_GPIO_OFFSET (pin) ((pin) & 31) -/* general configuration options */ #define S3C2410_GPIO_LEAVE (0xFFFFFFFF)
Signature · 1 line
1.6.3.3
PATCH 6/6 ARM: S3C24XX: Add note on GPIO bank sizes
In reply to Ben DooksAdd a table for the GPIO bank sizes for each SoC
--- arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-)
arch/arm/mach-s3c2410/include/mach/gpio-nrs.h +19 -0
@@ -19,6 +19,25 @@#define S3C2410_GPIO_BANKG (32*6)#define S3C2410_GPIO_BANKH (32*7) +/* GPIO sizes for various SoCs: +* +* 2442 +* 2410 2412 2440 2443 2416 +* ---- ---- ---- ---- ---- +* A 23 22 25 16 25 +* B 11 11 11 11 9 +* C 16 15 16 16 16 +* D 16 16 16 16 16 +* E 16 16 16 16 16 +* F 8 8 8 8 8 +* G 16 16 16 16 8 +* H 11 11 9 15 15 +* J -- -- 13 16 -- +* K -- -- -- -- 16 +* L -- -- -- 15 7 +* M -- -- -- 2 2 +*/ +/* GPIO bank sizes */ #define S3C2410_GPIO_A_NR (32)#define S3C2410_GPIO_B_NR (32)
Signature · 1 line
1.6.3.3