Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f441fe9 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

8250: switch 8250 drivers to use _nocache ioremaps 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4ed99a27

drivers/serial/8250.c

+2 −1
Original line number Diff line number Diff line
@@ -2271,7 +2271,8 @@ static int serial8250_request_std_resource(struct uart_8250_port *up) 
		}



		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) {

				release_mem_region(up->port.mapbase, size);

				ret = -ENOMEM;

drivers/serial/8250_early.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int __init parse_options(struct early_serial8250_device *device, 
			(void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE);

		port->membase += port->mapbase & ~PAGE_MASK;

#else

		port->membase = ioremap(port->mapbase, 64);

		port->membase = ioremap_nocache(port->mapbase, 64);

		if (!port->membase) {

			printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n",

				__func__,

drivers/serial/8250_pci.c

+8 −6
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ setup_port(struct serial_private *priv, struct uart_port *port, 
		len =  pci_resource_len(dev, 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])

			return -ENOMEM;
@@ -270,7 +270,7 @@ static int pci_plx9050_init(struct pci_dev *dev) 
	/*

	 * enable/disable interrupts

	 */

	p = ioremap(pci_resource_start(dev, 0), 0x80);

	p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);

	if (p == NULL)

		return -ENOMEM;

	writel(irq_config, p + 0x4c);
@@ -294,7 +294,7 @@ static void __devexit pci_plx9050_exit(struct pci_dev *dev) 
	/*

	 * disable interrupts

	 */

	p = ioremap(pci_resource_start(dev, 0), 0x80);

	p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);

	if (p != NULL) {

		writel(0, p + 0x4c);
@@ -341,7 +341,8 @@ static int sbs_init(struct pci_dev *dev) 
{

	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)

		return -ENOMEM;
@@ -365,7 +366,8 @@ static void __devexit sbs_exit(struct pci_dev *dev) 
{

	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 */

	if (p != NULL)

		writeb(0, p + OCT_REG_CR_OFF);
@@ -419,7 +421,7 @@ static int pci_siig10x_init(struct pci_dev *dev) 
		break;

	}



	p = ioremap(pci_resource_start(dev, 0), 0x80);

	p = ioremap_nocache(pci_resource_start(dev, 0), 0x80);

	if (p == NULL)

		return -ENOMEM;