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

8250: switch 8250 drivers to use _nocache ioremaps

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alan Cox and committed by
Linus Torvalds
6f441fe9 4ed99a27

+11 -8
+2 -1
drivers/serial/8250.c
··· 2271 2271 } 2272 2272 2273 2273 if (up->port.flags & UPF_IOREMAP) { 2274 - up->port.membase = ioremap(up->port.mapbase, size); 2274 + up->port.membase = ioremap_nocache(up->port.mapbase, 2275 + size); 2275 2276 if (!up->port.membase) { 2276 2277 release_mem_region(up->port.mapbase, size); 2277 2278 ret = -ENOMEM;
+1 -1
drivers/serial/8250_early.c
··· 153 153 (void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE); 154 154 port->membase += port->mapbase & ~PAGE_MASK; 155 155 #else 156 - port->membase = ioremap(port->mapbase, 64); 156 + port->membase = ioremap_nocache(port->mapbase, 64); 157 157 if (!port->membase) { 158 158 printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n", 159 159 __func__,
+8 -6
drivers/serial/8250_pci.c
··· 86 86 len = pci_resource_len(dev, bar); 87 87 88 88 if (!priv->remapped_bar[bar]) 89 - priv->remapped_bar[bar] = ioremap(base, len); 89 + priv->remapped_bar[bar] = ioremap_nocache(base, len); 90 90 if (!priv->remapped_bar[bar]) 91 91 return -ENOMEM; 92 92 ··· 270 270 /* 271 271 * enable/disable interrupts 272 272 */ 273 - p = ioremap(pci_resource_start(dev, 0), 0x80); 273 + p = ioremap_nocache(pci_resource_start(dev, 0), 0x80); 274 274 if (p == NULL) 275 275 return -ENOMEM; 276 276 writel(irq_config, p + 0x4c); ··· 294 294 /* 295 295 * disable interrupts 296 296 */ 297 - p = ioremap(pci_resource_start(dev, 0), 0x80); 297 + p = ioremap_nocache(pci_resource_start(dev, 0), 0x80); 298 298 if (p != NULL) { 299 299 writel(0, p + 0x4c); 300 300 ··· 341 341 { 342 342 u8 __iomem *p; 343 343 344 - p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0)); 344 + p = ioremap_nocache(pci_resource_start(dev, 0), 345 + pci_resource_len(dev, 0)); 345 346 346 347 if (p == NULL) 347 348 return -ENOMEM; ··· 366 365 { 367 366 u8 __iomem *p; 368 367 369 - p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0)); 368 + p = ioremap_nocache(pci_resource_start(dev, 0), 369 + pci_resource_len(dev, 0)); 370 370 /* FIXME: What if resource_len < OCT_REG_CR_OFF */ 371 371 if (p != NULL) 372 372 writeb(0, p + OCT_REG_CR_OFF); ··· 421 419 break; 422 420 } 423 421 424 - p = ioremap(pci_resource_start(dev, 0), 0x80); 422 + p = ioremap_nocache(pci_resource_start(dev, 0), 0x80); 425 423 if (p == NULL) 426 424 return -ENOMEM; 427 425