ssb: Make the GPIO API reentrancy safe
PATCH 1/1 ssb: Make the GPIO API reentrancy safe
This fixes the GPIO API to be reentrancy safe.
Signed-off-by Michael Buesch <[email protected]>
---
For 2.6.25
drivers/ssb/driver_chipcommon.c +0 -6
@@ -357,37 +357,31 @@ u32 ssb_chipco_gpio_in(struct ssb_chipco {return chipco_read32 (cc,SSB_CHIPCO_GPIOIN ) & mask; } -EXPORT_SYMBOL (ssb_chipco_gpio_in);u32 ssb_chipco_gpio_out (struct ssb_chipcommon *cc,u32 mask,u32 value) {return chipco_write32_masked (cc,SSB_CHIPCO_GPIOOUT , mask, value); } -EXPORT_SYMBOL (ssb_chipco_gpio_out);u32 ssb_chipco_gpio_outen (struct ssb_chipcommon *cc,u32 mask,u32 value) {return chipco_write32_masked (cc,SSB_CHIPCO_GPIOOUTEN , mask, value); } -EXPORT_SYMBOL (ssb_chipco_gpio_outen);u32 ssb_chipco_gpio_control (struct ssb_chipcommon *cc,u32 mask,u32 value) {return chipco_write32_masked (cc,SSB_CHIPCO_GPIOCTL , mask, value); } -EXPORT_SYMBOL (ssb_chipco_gpio_control);u32 ssb_chipco_gpio_intmask (struct ssb_chipcommon *cc,u32 mask,u32 value) {return chipco_write32_masked (cc,SSB_CHIPCO_GPIOIRQ , mask, value); } -EXPORT_SYMBOL (ssb_chipco_gpio_intmask);u32 ssb_chipco_gpio_polarity (struct ssb_chipcommon *cc,u32 mask,u32 value) {return chipco_write32_masked (cc,SSB_CHIPCO_GPIOPOL , mask, value); } -EXPORT_SYMBOL (ssb_chipco_gpio_polarity);#ifdef CONFIG_SSB_SERIAL int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
drivers/ssb/driver_extif.c +0 -5
@@ -122,30 +122,25 @@ u32 ssb_extif_gpio_in(struct ssb_extif * {return extif_read32 (extif,SSB_EXTIF_GPIO_IN ) & mask; } -EXPORT_SYMBOL (ssb_extif_gpio_in);u32 ssb_extif_gpio_out (struct ssb_extif *extif,u32 mask,u32 value) {return extif_write32_masked (extif,SSB_EXTIF_GPIO_OUT (0 ), mask, value); } -EXPORT_SYMBOL (ssb_extif_gpio_out);u32 ssb_extif_gpio_outen (struct ssb_extif *extif,u32 mask,u32 value) {return extif_write32_masked (extif,SSB_EXTIF_GPIO_OUTEN (0 ), mask, value); } -EXPORT_SYMBOL (ssb_extif_gpio_outen);u32 ssb_extif_gpio_polarity (struct ssb_extif *extif,u32 mask,u32 value) {return extif_write32_masked (extif,SSB_EXTIF_GPIO_INTPOL , mask, value); } -EXPORT_SYMBOL (ssb_extif_gpio_polarity);u32 ssb_extif_gpio_intmask (struct ssb_extif *extif,u32 mask,u32 value) {return extif_write32_masked (extif,SSB_EXTIF_GPIO_INTMASK , mask, value); } -EXPORT_SYMBOL (ssb_extif_gpio_intmask);
drivers/ssb/embedded.c +106 -0
115 lines not on this page · raw message
include/linux/ssb/ssb.h +5 -0
@@ -283,6 +283,11 @@ struct ssb_bus {/* Contents of the SPROM. */ struct ssb_sprom sprom; +#ifdef CONFIG_SSB_EMBEDDED +/* Lock for GPIO register access. */ +spinlock_t gpio_lock; +#endif /* EMBEDDED */ +/* Internal-only stuff follows. Do not touch. */ struct list_head list;#ifdef CONFIG_SSB_DEBUG
include/linux/ssb/ssb_embedded.h +8 -0
@@ -7,4 +7,12 @@extern int ssb_watchdog_timer_set (struct ssb_bus *bus,u32 ticks); +/* Generic GPIO API */ +u32 ssb_gpio_in (struct ssb_bus *bus,u32 mask); +u32 ssb_gpio_out (struct ssb_bus *bus,u32 mask,u32 value); +u32 ssb_gpio_outen (struct ssb_bus *bus,u32 mask,u32 value); +u32 ssb_gpio_control (struct ssb_bus *bus,u32 mask,u32 value); +u32 ssb_gpio_intmask (struct ssb_bus *bus,u32 mask,u32 value); +u32 ssb_gpio_polarity (struct ssb_bus *bus,u32 mask,u32 value); +#endif /* LINUX_SSB_EMBEDDED_H_ */
drivers/ssb/main.c +3 -0
@@ -569,6 +569,9 @@ static int ssb_bus_register(struct ssb_bspin_lock_init (&bus->bar_lock);INIT_LIST_HEAD (&bus->list); +#ifdef CONFIG_SSB_EMBEDDED +spin_lock_init (&bus->gpio_lock); +#endif /* Powerup the bus */ err =ssb_pci_xtal (bus,SSB_GPIO_XTAL |SSB_GPIO_PLL ,1 );
Signature · 1 line
Greetings Michael.