Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

parisc: iomap: introduce io{read|write}64

Add support for io{read|write}64() functions in parisc architecture.
These are pretty straightforward copies of similar functions which
make use of readq and writeq.

Also, indicate that the lo_hi and hi_lo variants of these functions
are not provided by this architecture.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Logan Gunthorpe and committed by
Greg Kroah-Hartman
7d1689a2 aecc787c

+73
+9
arch/parisc/include/asm/io.h
··· 311 311 * value for either 32 or 64 bit mode */ 312 312 #define F_EXTEND(x) ((unsigned long)((x) | (0xffffffff00000000ULL))) 313 313 314 + #define ioread64 ioread64 315 + #define ioread64be ioread64be 316 + #define iowrite64 iowrite64 317 + #define iowrite64be iowrite64be 318 + extern u64 ioread64(void __iomem *addr); 319 + extern u64 ioread64be(void __iomem *addr); 320 + extern void iowrite64(u64 val, void __iomem *addr); 321 + extern void iowrite64be(u64 val, void __iomem *addr); 322 + 314 323 #include <asm-generic/iomap.h> 315 324 316 325 /*
+64
arch/parisc/lib/iomap.c
··· 48 48 unsigned int (*read16be)(void __iomem *); 49 49 unsigned int (*read32)(void __iomem *); 50 50 unsigned int (*read32be)(void __iomem *); 51 + u64 (*read64)(void __iomem *); 52 + u64 (*read64be)(void __iomem *); 51 53 void (*write8)(u8, void __iomem *); 52 54 void (*write16)(u16, void __iomem *); 53 55 void (*write16be)(u16, void __iomem *); 54 56 void (*write32)(u32, void __iomem *); 55 57 void (*write32be)(u32, void __iomem *); 58 + void (*write64)(u64, void __iomem *); 59 + void (*write64be)(u64, void __iomem *); 56 60 void (*read8r)(void __iomem *, void *, unsigned long); 57 61 void (*read16r)(void __iomem *, void *, unsigned long); 58 62 void (*read32r)(void __iomem *, void *, unsigned long); ··· 175 171 return __raw_readl(addr); 176 172 } 177 173 174 + static u64 iomem_read64(void __iomem *addr) 175 + { 176 + return readq(addr); 177 + } 178 + 179 + static u64 iomem_read64be(void __iomem *addr) 180 + { 181 + return __raw_readq(addr); 182 + } 183 + 178 184 static void iomem_write8(u8 datum, void __iomem *addr) 179 185 { 180 186 writeb(datum, addr); ··· 206 192 } 207 193 208 194 static void iomem_write32be(u32 datum, void __iomem *addr) 195 + { 196 + __raw_writel(datum, addr); 197 + } 198 + 199 + static void iomem_write64(u64 datum, void __iomem *addr) 200 + { 201 + writel(datum, addr); 202 + } 203 + 204 + static void iomem_write64be(u64 datum, void __iomem *addr) 209 205 { 210 206 __raw_writel(datum, addr); 211 207 } ··· 274 250 .read16be = iomem_read16be, 275 251 .read32 = iomem_read32, 276 252 .read32be = iomem_read32be, 253 + .read64 = iomem_read64, 254 + .read64be = iomem_read64be, 277 255 .write8 = iomem_write8, 278 256 .write16 = iomem_write16, 279 257 .write16be = iomem_write16be, 280 258 .write32 = iomem_write32, 281 259 .write32be = iomem_write32be, 260 + .write64 = iomem_write64, 261 + .write64be = iomem_write64be, 282 262 .read8r = iomem_read8r, 283 263 .read16r = iomem_read16r, 284 264 .read32r = iomem_read32r, ··· 332 304 return *((u32 *)addr); 333 305 } 334 306 307 + u64 ioread64(void __iomem *addr) 308 + { 309 + if (unlikely(INDIRECT_ADDR(addr))) 310 + return iomap_ops[ADDR_TO_REGION(addr)]->read64(addr); 311 + return le64_to_cpup((u64 *)addr); 312 + } 313 + 314 + u64 ioread64be(void __iomem *addr) 315 + { 316 + if (unlikely(INDIRECT_ADDR(addr))) 317 + return iomap_ops[ADDR_TO_REGION(addr)]->read64be(addr); 318 + return *((u64 *)addr); 319 + } 320 + 335 321 void iowrite8(u8 datum, void __iomem *addr) 336 322 { 337 323 if (unlikely(INDIRECT_ADDR(addr))) { ··· 388 346 iomap_ops[ADDR_TO_REGION(addr)]->write32be(datum, addr); 389 347 } else { 390 348 *((u32 *)addr) = datum; 349 + } 350 + } 351 + 352 + void iowrite64(u64 datum, void __iomem *addr) 353 + { 354 + if (unlikely(INDIRECT_ADDR(addr))) { 355 + iomap_ops[ADDR_TO_REGION(addr)]->write64(datum, addr); 356 + } else { 357 + *((u64 *)addr) = cpu_to_le64(datum); 358 + } 359 + } 360 + 361 + void iowrite64be(u64 datum, void __iomem *addr) 362 + { 363 + if (unlikely(INDIRECT_ADDR(addr))) { 364 + iomap_ops[ADDR_TO_REGION(addr)]->write64be(datum, addr); 365 + } else { 366 + *((u64 *)addr) = datum; 391 367 } 392 368 } 393 369 ··· 509 449 EXPORT_SYMBOL(ioread16be); 510 450 EXPORT_SYMBOL(ioread32); 511 451 EXPORT_SYMBOL(ioread32be); 452 + EXPORT_SYMBOL(ioread64); 453 + EXPORT_SYMBOL(ioread64be); 512 454 EXPORT_SYMBOL(iowrite8); 513 455 EXPORT_SYMBOL(iowrite16); 514 456 EXPORT_SYMBOL(iowrite16be); 515 457 EXPORT_SYMBOL(iowrite32); 516 458 EXPORT_SYMBOL(iowrite32be); 459 + EXPORT_SYMBOL(iowrite64); 460 + EXPORT_SYMBOL(iowrite64be); 517 461 EXPORT_SYMBOL(ioread8_rep); 518 462 EXPORT_SYMBOL(ioread16_rep); 519 463 EXPORT_SYMBOL(ioread32_rep);