ARM: S5P6440: Add locking to GPIO calls
Subsystems (3)
PATCH 1/4 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,
--- arch/arm/mach-s5p6440/gpio.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
arch/arm/mach-s5p6440/gpio.c +15 -0
@@ -46,6 +46,7 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip,void __iomem *base = ourchip->base;void __iomem *regcon = base;unsigned long con; +unsigned long flags;switch (offset) {case 6 :
@@ -63,10 +64,14 @@ static int s5p6440_gpiolib_rbank_4bit2_input(struct gpio_chip *chip,break ; } +s3c_gpio_lock (ourchip, flags); + con =__raw_readl (regcon); con &= ~(0xf <<con_4bit_shift (offset));__raw_writel (con, regcon); +s3c_gpio_unlock (ourchip, flags); +return 0 ; }
@@ -78,6 +83,7 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip,void __iomem *regcon = base;unsigned long con;unsigned long dat; +unsigned long flags;unsigned con_offset = offset;switch (con_offset) {
@@ -96,6 +102,8 @@ static int s5p6440_gpiolib_rbank_4bit2_output(struct gpio_chip *chip,break ; } +s3c_gpio_lock (ourchip, flags); + con =__raw_readl (regcon); con &= ~(0xf <<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,__raw_writel (con, regcon);__raw_writel (dat, base +GPIODAT_OFF ); +s3c_gpio_unlock (ourchip, flags); +return 0 ; }
@@ -117,6 +127,7 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, {void __iomem *reg = chip->base;unsigned int shift; +unsigned long flags;u32 con;switch (off) {
@@ -142,11 +153,15 @@ int s5p6440_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, cfg <<= shift; } +s3c_gpio_lock (chip, flags); + con =__raw_readl (reg); con &= ~(0xf << shift); con |= cfg;__raw_writel (con, reg); +s3c_gpio_unlock (chip, flags); +return 0 ; }
Signature · 1 line
1.6.3.3
PATCH 2/4 ARM: SAMSUNG: Make ADC client SMP safe
Change local_irq disable calls to use spinlocks to ensure that the ADC driver data is protected against multiple access..
Note, this does not protect the client's data, and the client should ensure it does not make multiple calls to the ADC driver.
--- arch/arm/plat-samsung/adc.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-)
arch/arm/plat-samsung/adc.c +20 -6
@@ -66,6 +66,7 @@ struct adc_device {struct s3c_adc_client *cur;struct s3c_adc_client *ts_pend;void __iomem *regs; +spinlock_t lock;unsigned int prescale;
@@ -74,7 +75,7 @@ struct adc_device {static struct adc_device *adc_dev; -static LIST_HEAD (adc_pending); +static LIST_HEAD (adc_pending);/* protected by adc_device.lock */ #define adc_dbg(_adc, msg...) dev_dbg(&(_adc)->pdev->dev, msg)
@@ -145,7 +146,7 @@ int s3c_adc_start(struct s3c_adc_client *client,if (client->is_ts && adc->ts_pend)return -EAGAIN ; -local_irq_save (flags); +spin_lock_irqsave (&adc->lock, flags); client->channel = channel; client->nr_samples = nr_samples;
@@ -157,7 +158,8 @@ int s3c_adc_start(struct s3c_adc_client *client,if (!adc->cur)s3c_adc_try (adc); -local_irq_restore (flags); + +spin_unlock_irqrestore (&adc->lock, flags);return 0 ; }
@@ -237,6 +239,10 @@ EXPORT_SYMBOL_GPL(s3c_adc_register);void s3c_adc_release (struct s3c_adc_client *client) { +unsigned long flags; + +spin_lock_irqsave (&adc_dev->lock, flags); +/* We should really check that nothing is in progress. */ if (adc_dev->cur == client) adc_dev->cur =NULL ;
@@ -255,6 +261,8 @@ void s3c_adc_release(struct s3c_adc_client *client)if (adc_dev->cur ==NULL )s3c_adc_try (adc_dev); + +spin_unlock_irqrestore (&adc_dev->lock, flags);kfree (client); }EXPORT_SYMBOL_GPL (s3c_adc_release);
@@ -264,7 +272,6 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)struct adc_device *adc = pw;struct s3c_adc_client *client = adc->cur;enum s3c_cpu_type cpu =platform_get_device_id (adc->pdev)->driver_data; -unsigned long flags;unsigned data0, data1;if (!client) {
@@ -296,12 +303,12 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw) client->select_cb (client,1 );s3c_adc_convert (adc); }else { -local_irq_save (flags); +spin_lock (&adc->lock); (client->select_cb)(client,0 ); adc->cur =NULL ;s3c_adc_try (adc); -local_irq_restore (flags); +spin_unlock (&adc->lock); } exit:
@@ -326,6 +333,8 @@ static int s3c_adc_probe(struct platform_device *pdev)return -ENOMEM ; } +spin_lock_init (&adc->lock); + adc->pdev = pdev; adc->prescale =S3C2410_ADCCON_PRSCVL (49 );
@@ -407,13 +416,17 @@ static int __devexit s3c_adc_remove(struct platform_device *pdev)static int s3c_adc_suspend (struct platform_device *pdev,pm_message_t state) {struct adc_device *adc =platform_get_drvdata (pdev); +unsigned long flags;u32 con; +spin_lock_irqsave (&adc->lock, flags); + con =readl (adc->regs +S3C2410_ADCCON ); con |=S3C2410_ADCCON_STDBM ;writel (con, adc->regs +S3C2410_ADCCON );disable_irq (adc->irq); +spin_unlock_irqrestore (&adc->lock, flags);clk_disable (adc->clk);return 0 ;
@@ -422,6 +435,7 @@ static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state)static int s3c_adc_resume (struct platform_device *pdev) {struct adc_device *adc =platform_get_drvdata (pdev); +unsigned long flags;clk_enable (adc->clk);enable_irq (adc->irq);
Signature · 1 line
1.6.3.3
PATCH 3/4 ARM: SAMSUNG: Add support for interrupt wakeup-sources
In reply to Ben DooksAdd support for wakeup-mask style interrupts that share a single mask register for various different interrupts. This registers a set of interrupt->bit mappings and the register they belong to.
--- arch/arm/plat-samsung/Kconfig | 8 ++++ arch/arm/plat-samsung/Makefile | 2 + arch/arm/plat-samsung/include/plat/wakeup-mask.h | 44 ++++++++++++++++++++ arch/arm/plat-samsung/wakeup-mask.c | 47 ++++++++++++++++++++++ 4 files changed, 101 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-samsung/include/plat/wakeup-mask.h create mode 100644 arch/arm/plat-samsung/wakeup-mask.c
arch/arm/plat-samsung/Kconfig +8 -0
@@ -269,4 +269,12 @@ config SAMSUNG_PM_CHECK_CHUNKSIZE See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> +config SAMSUNG_WAKEMASK + bool "Support for wakeup mask to irq mapping" + depends on PM + help + Compile support for wakeup-mask controls found on the S3C6400 + and above. This code allows a set of interrupt to wakeup-mask + mappings. See <plat/wakeup-mask.h> + endif
arch/arm/plat-samsung/Makefile +2 -0
@@ -58,6 +58,8 @@ obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM) += pm-gpio.o obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o +obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o + # PWM support obj-$(CONFIG_HAVE_PWM) += pwm.o
arch/arm/plat-samsung/include/plat/wakeup-mask.h new file +44 -0
44 lines not on this page · raw message
arch/arm/plat-samsung/wakeup-mask.c new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 4/4 ARM: S3C64XX: PM: Synchronise wakeup mask on suspend
In reply to Ben DooksUse the new wakeup mask synchronisation code to set the relevant wakeup mask bits.
--- arch/arm/mach-s3c64xx/Kconfig | 1 + arch/arm/mach-s3c64xx/pm.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/Kconfig +1 -0
@@ -7,6 +7,7 @@ config PLAT_S3C64XX bool depends on ARCH_S3C64XX + select SAMSUNG_WAKEMASK default y help Base platform code for any Samsung S3C64XX device
arch/arm/mach-s3c64xx/pm.c +20 -0
@@ -18,8 +18,11 @@#include <linux/io.h> #include <mach/map.h> +#include <mach/irqs.h> #include <plat/pm.h> +#include <plat/wakeup-mask.h> +#include <mach/regs-sys.h> #include <mach/regs-gpio.h> #include <mach/regs-clock.h>
@@ -153,8 +156,25 @@ static void s3c64xx_cpu_suspend(void)panic ("sleep resumed to originator?" ); } +/* mapping of interrupts to parts of the wakeup mask */ +static struct samsung_wakeup_mask wake_irqs[] = { + { .irq =IRQ_RTC_ALARM , .bit =S3C64XX_PWRCFG_RTC_ALARM_DISABLE , }, + { .irq =IRQ_RTC_TIC , .bit =S3C64XX_PWRCFG_RTC_TICK_DISABLE , }, + { .irq =IRQ_PENDN , .bit =S3C64XX_PWRCFG_TS_DISABLE , }, + { .irq =IRQ_HSMMC0 , .bit =S3C64XX_PWRCFG_MMC0_DISABLE , }, + { .irq =IRQ_HSMMC1 , .bit =S3C64XX_PWRCFG_MMC1_DISABLE , }, + { .irq =IRQ_HSMMC2 , .bit =S3C64XX_PWRCFG_MMC2_DISABLE , }, + { .irq =NO_WAKEUP_IRQ , .bit =S3C64XX_PWRCFG_BATF_DISABLE }, + { .irq =NO_WAKEUP_IRQ , .bit =S3C64XX_PWRCFG_MSM_DISABLE }, + { .irq =NO_WAKEUP_IRQ , .bit =S3C64XX_PWRCFG_HSI_DISABLE }, + { .irq =NO_WAKEUP_IRQ , .bit =S3C64XX_PWRCFG_MSM_DISABLE }, +}; +static void s3c64xx_pm_prepare (void ) { +samsung_sync_wakemask (S3C64XX_PWR_CFG , + wake_irqs,ARRAY_SIZE (wake_irqs)); +/* store address of resume. */ __raw_writel (virt_to_phys (s3c_cpu_resume),S3C64XX_INFORM0 );
Signature · 1 line
1.6.3.3