Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b92b3612134faff171981fad4f0adb33f485e02e

Authored by Russell King
1 parent 79f64dbf68
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ARM: Add barriers to io{read,write}{8,16,32} accessors as well 

The ioread/iowrite accessors also need barriers as they're used in
place of readl/writel et.al. in portable drivers.  Create __iormb()
and __iowmb() which are conditionally defined to be barriers dependent
on ARM_DMA_MEM_BUFFERABLE, and always use these macros in the accessors.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 18 additions and 20 deletions Side-by-side Diff

arch/arm/include/asm/io.h
Diff comments   View file @ b92b361
... ... @@ -193,23 +193,21 @@
193 193 cpu_to_le32(v),__mem_pci(c)))
194 194  
195 195 #ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE
196   -#define readb(c) ({ u8 __v = readb_relaxed(c); rmb(); __v; })
197   -#define readw(c) ({ u16 __v = readw_relaxed(c); rmb(); __v; })
198   -#define readl(c) ({ u32 __v = readl_relaxed(c); rmb(); __v; })
199   -
200   -#define writeb(v,c) ({ wmb(); writeb_relaxed(v,c); })
201   -#define writew(v,c) ({ wmb(); writew_relaxed(v,c); })
202   -#define writel(v,c) ({ wmb(); writel_relaxed(v,c); })
  196 +#define __iormb() rmb()
  197 +#define __iowmb() wmb()
203 198 #else
204   -#define readb(c) readb_relaxed(c)
205   -#define readw(c) readw_relaxed(c)
206   -#define readl(c) readl_relaxed(c)
207   -
208   -#define writeb(v,c) writeb_relaxed(v,c)
209   -#define writew(v,c) writew_relaxed(v,c)
210   -#define writel(v,c) writel_relaxed(v,c)
  199 +#define __iormb() do { } while (0)
  200 +#define __iowmb() do { } while (0)
211 201 #endif
212 202  
  203 +#define readb(c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; })
  204 +#define readw(c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; })
  205 +#define readl(c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; })
  206 +
  207 +#define writeb(v,c) ({ __iowmb(); writeb_relaxed(v,c); })
  208 +#define writew(v,c) ({ __iowmb(); writew_relaxed(v,c); })
  209 +#define writel(v,c) ({ __iowmb(); writel_relaxed(v,c); })
  210 +
213 211 #define readsb(p,d,l) __raw_readsb(__mem_pci(p),d,l)
214 212 #define readsw(p,d,l) __raw_readsw(__mem_pci(p),d,l)
215 213 #define readsl(p,d,l) __raw_readsl(__mem_pci(p),d,l)
216 214  
... ... @@ -260,13 +258,13 @@
260 258 * io{read,write}{8,16,32} macros
261 259 */
262 260 #ifndef ioread8
263   -#define ioread8(p) ({ unsigned int __v = __raw_readb(p); __v; })
264   -#define ioread16(p) ({ unsigned int __v = le16_to_cpu((__force __le16)__raw_readw(p)); __v; })
265   -#define ioread32(p) ({ unsigned int __v = le32_to_cpu((__force __le32)__raw_readl(p)); __v; })
  261 +#define ioread8(p) ({ unsigned int __v = __raw_readb(p); __iormb(); __v; })
  262 +#define ioread16(p) ({ unsigned int __v = le16_to_cpu((__force __le16)__raw_readw(p)); __iormb(); __v; })
  263 +#define ioread32(p) ({ unsigned int __v = le32_to_cpu((__force __le32)__raw_readl(p)); __iormb(); __v; })
266 264  
267   -#define iowrite8(v,p) __raw_writeb(v, p)
268   -#define iowrite16(v,p) __raw_writew((__force __u16)cpu_to_le16(v), p)
269   -#define iowrite32(v,p) __raw_writel((__force __u32)cpu_to_le32(v), p)
  265 +#define iowrite8(v,p) ({ __iowmb(); (void)__raw_writeb(v, p); })
  266 +#define iowrite16(v,p) ({ __iowmb(); (void)__raw_writew((__force __u16)cpu_to_le16(v), p); })
  267 +#define iowrite32(v,p) ({ __iowmb(); (void)__raw_writel((__force __u32)cpu_to_le32(v), p); })
270 268  
271 269 #define ioread8_rep(p,d,c) __raw_readsb(p,d,c)
272 270 #define ioread16_rep(p,d,c) __raw_readsw(p,d,c)