adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

8250: switch 8250 drivers to use _nocache ioremaps

Browse source 
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>
This commit is contained in:
Alan Cox 2008-05-01 04:34:59 -07:00 committed by Linus Torvalds
parent 4ed99a27d1
commit 6f441fe998
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/serial/8250.c
View file

@ -2271,7 +2271,8 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
} }
if (up->port.flags & UPF_IOREMAP) { if (up->port.flags & UPF_IOREMAP) {
up->port.membase = ioremap(up->port.mapbase, size); up->port.membase = ioremap_nocache(up->port.mapbase,
size);
if (!up->port.membase) { if (!up->port.membase) {
release_mem_region(up->port.mapbase, size); release_mem_region(up->port.mapbase, size);
ret = -ENOMEM; ret = -ENOMEM;

2
drivers/serial/8250_early.c
View file

@ -153,7 +153,7 @@ static int __init parse_options(struct early_serial8250_device *device,
(void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE); (void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE);
port->membase += port->mapbase & ~PAGE_MASK; port->membase += port->mapbase & ~PAGE_MASK;
#else #else
port->membase = ioremap(port->mapbase, 64); port->membase = ioremap_nocache(port->mapbase, 64);
if (!port->membase) { if (!port->membase) {
printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n", printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n",
__func__, __func__,

14
drivers/serial/8250_pci.c
View file

@ -86,7 +86,7 @@ setup_port(struct serial_private *priv, struct uart_port *port,
len = pci_resource_len(dev, bar); len = pci_resource_len(dev, bar);
if (!priv->remapped_bar[bar]) if (!priv->remapped_bar[bar])
priv->remapped_bar[bar] = ioremap(base, len); priv->remapped_bar[bar] = ioremap_nocache(base, len);
if (!priv->remapped_bar[bar]) if (!priv->remapped_bar[bar])
return -ENOMEM; return -ENOMEM;
@ -270,7 +270,7 @@ static int pci_plx9050_init(struct pci_dev *dev)
/* /*
* enable/disable interrupts * enable/disable interrupts
*/ */
p = ioremap(pci_resource_start(dev, 0), 0x80); p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
if (p == NULL) if (p == NULL)
return -ENOMEM; return -ENOMEM;
writel(irq_config, p + 0x4c); writel(irq_config, p + 0x4c);
@ -294,7 +294,7 @@ static void __devexit pci_plx9050_exit(struct pci_dev *dev)
/* /*
* disable interrupts * disable interrupts
*/ */
p = ioremap(pci_resource_start(dev, 0), 0x80); p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
if (p != NULL) { if (p != NULL) {
writel(0, p + 0x4c); writel(0, p + 0x4c);
@ -341,7 +341,8 @@ static int sbs_init(struct pci_dev *dev)
{ {
u8 __iomem *p; u8 __iomem *p;
p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0)); p = ioremap_nocache(pci_resource_start(dev, 0),
pci_resource_len(dev, 0));
if (p == NULL) if (p == NULL)
return -ENOMEM; return -ENOMEM;
@ -365,7 +366,8 @@ static void __devexit sbs_exit(struct pci_dev *dev)
{ {
u8 __iomem *p; u8 __iomem *p;
p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0)); p = ioremap_nocache(pci_resource_start(dev, 0),
pci_resource_len(dev, 0));
/* FIXME: What if resource_len < OCT_REG_CR_OFF */ /* FIXME: What if resource_len < OCT_REG_CR_OFF */
if (p != NULL) if (p != NULL)
writeb(0, p + OCT_REG_CR_OFF); writeb(0, p + OCT_REG_CR_OFF);
@ -419,7 +421,7 @@ static int pci_siig10x_init(struct pci_dev *dev)
break; break;
} }
p = ioremap(pci_resource_start(dev, 0), 0x80); p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);
if (p == NULL) if (p == NULL)
return -ENOMEM; return -ENOMEM;