| Message ID | 1390431915-5115-2-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Russell, On Wed, Jan 22, 2014 at 08:04:58PM -0300, Ezequiel Garcia wrote: > Some SoC have MMIO regions that are shared across orthogonal > subsystems. This commit implements a possible solution for the > thread-safe access of such regions through a spinlock-protected API. > > Concurrent access is protected with a single spinlock for the > entire MMIO address space. While this protects shared-registers, > it also serializes access to unrelated/unshared registers. > > We add relaxed and non-relaxed variants, by using writel_relaxed and writel, > respectively. The rationale for this is that some users may not require > register write completion but only thread-safe access to a register. > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > --- > arch/arm/include/asm/io.h | 6 ++++++ > arch/arm/kernel/io.c | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 41 insertions(+) This has been in your patch tracker for a while: http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7930/1 When you requested Acks, we sent them: http://www.spinics.net/lists/arm-kernel/msg300250.html Is there anything more you need from us? The rest of this series depends on this patch. Could you place it in a topic branch so we can base the rest of the series off of it? Or, if you prefer, Ack it and drop it from your patch tracker? I'm fine either way. thx, Jason. > > diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h > index fbeb39c..8aa4cca 100644 > --- a/arch/arm/include/asm/io.h > +++ b/arch/arm/include/asm/io.h > @@ -38,6 +38,12 @@ > #define isa_bus_to_virt phys_to_virt > > /* > + * Atomic MMIO-wide IO modify > + */ > +extern void atomic_io_modify(void __iomem *reg, u32 mask, u32 set); > +extern void atomic_io_modify_relaxed(void __iomem *reg, u32 mask, u32 set); > + > +/* > * Generic IO read/write. These perform native-endian accesses. Note > * that some architectures will want to re-define __raw_{read,write}w. > */ > diff --git a/arch/arm/kernel/io.c b/arch/arm/kernel/io.c > index dcd5b4d..9203cf8 100644 > --- a/arch/arm/kernel/io.c > +++ b/arch/arm/kernel/io.c > @@ -1,6 +1,41 @@ > #include <linux/export.h> > #include <linux/types.h> > #include <linux/io.h> > +#include <linux/spinlock.h> > + > +static DEFINE_RAW_SPINLOCK(__io_lock); > + > +/* > + * Generic atomic MMIO modify. > + * > + * Allows thread-safe access to registers shared by unrelated subsystems. > + * The access is protected by a single MMIO-wide lock. > + */ > +void atomic_io_modify_relaxed(void __iomem *reg, u32 mask, u32 set) > +{ > + unsigned long flags; > + u32 value; > + > + raw_spin_lock_irqsave(&__io_lock, flags); > + value = readl_relaxed(reg) & ~mask; > + value |= (set & mask); > + writel_relaxed(value, reg); > + raw_spin_unlock_irqrestore(&__io_lock, flags); > +} > +EXPORT_SYMBOL(atomic_io_modify_relaxed); > + > +void atomic_io_modify(void __iomem *reg, u32 mask, u32 set) > +{ > + unsigned long flags; > + u32 value; > + > + raw_spin_lock_irqsave(&__io_lock, flags); > + value = readl_relaxed(reg) & ~mask; > + value |= (set & mask); > + writel(value, reg); > + raw_spin_unlock_irqrestore(&__io_lock, flags); > +} > +EXPORT_SYMBOL(atomic_io_modify); > > /* > * Copy data from IO memory space to "real" memory space. > -- > 1.8.1.5 >
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index fbeb39c..8aa4cca 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -38,6 +38,12 @@ #define isa_bus_to_virt phys_to_virt /* + * Atomic MMIO-wide IO modify + */ +extern void atomic_io_modify(void __iomem *reg, u32 mask, u32 set); +extern void atomic_io_modify_relaxed(void __iomem *reg, u32 mask, u32 set); + +/* * Generic IO read/write. These perform native-endian accesses. Note * that some architectures will want to re-define __raw_{read,write}w. */ diff --git a/arch/arm/kernel/io.c b/arch/arm/kernel/io.c index dcd5b4d..9203cf8 100644 --- a/arch/arm/kernel/io.c +++ b/arch/arm/kernel/io.c @@ -1,6 +1,41 @@ #include <linux/export.h> #include <linux/types.h> #include <linux/io.h> +#include <linux/spinlock.h> + +static DEFINE_RAW_SPINLOCK(__io_lock); + +/* + * Generic atomic MMIO modify. + * + * Allows thread-safe access to registers shared by unrelated subsystems. + * The access is protected by a single MMIO-wide lock. + */ +void atomic_io_modify_relaxed(void __iomem *reg, u32 mask, u32 set) +{ + unsigned long flags; + u32 value; + + raw_spin_lock_irqsave(&__io_lock, flags); + value = readl_relaxed(reg) & ~mask; + value |= (set & mask); + writel_relaxed(value, reg); + raw_spin_unlock_irqrestore(&__io_lock, flags); +} +EXPORT_SYMBOL(atomic_io_modify_relaxed); + +void atomic_io_modify(void __iomem *reg, u32 mask, u32 set) +{ + unsigned long flags; + u32 value; + + raw_spin_lock_irqsave(&__io_lock, flags); + value = readl_relaxed(reg) & ~mask; + value |= (set & mask); + writel(value, reg); + raw_spin_unlock_irqrestore(&__io_lock, flags); +} +EXPORT_SYMBOL(atomic_io_modify); /* * Copy data from IO memory space to "real" memory space.
Some SoC have MMIO regions that are shared across orthogonal subsystems. This commit implements a possible solution for the thread-safe access of such regions through a spinlock-protected API. Concurrent access is protected with a single spinlock for the entire MMIO address space. While this protects shared-registers, it also serializes access to unrelated/unshared registers. We add relaxed and non-relaxed variants, by using writel_relaxed and writel, respectively. The rationale for this is that some users may not require register write completion but only thread-safe access to a register. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- arch/arm/include/asm/io.h | 6 ++++++ arch/arm/kernel/io.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+)