Commit 645b3026 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pxa/sa1100: move I/O space to PCI_IOBASE 



PXA and StrongARM1100 traditionally map their I/O space 1:1 into virtual
memory, using a per-bus io_offset that matches the base address of the
ioremap mapping.

In order for PXA to work in a multiplatform config, this needs to
change so I/O space starts at PCI_IOBASE (0xfee00000). Since the pcmcia
soc_common support is shared with StrongARM1100, both have to change at
the same time. The affected machines are:

 - Anything with a PCMCIA slot now uses pci_remap_iospace, which
   is made available to PCMCIA configurations as well, rather than
   just PCI. The first PCMCIA slot now starts at port number 0x10000.

 - The Zeus and Viper platforms have PC/104-style ISA buses,
   which have a static mapping for both I/O and memory space at
   0xf1000000, which can no longer work. It does not appear to have
   any in-tree users, so moving it to port number 0 makes them
   behave like a traditional PC.

 - SA1100 does support ISA slots in theory, but all machines that
   originally enabled this appear to have been removed from the tree
   ages ago, and the I/O space is never mapped anywhere.

 - The Nanoengine machine has support for PCI slots, but looks
   like this never included I/O space, the resources only define the
   location for memory and config space.

With this, the definitions of __io() and IO_SPACE_LIMIT can be simplified,
as the only remaining cases are the generic PCI_IOBASE and the custom
inb()/outb() macros on RiscPC.  S3C24xx still has a custom inb()/outb()
in this here, but this is already removed in another branch.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 5414bea9

arch/arm/include/asm/io.h

+4 −23
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static inline void __iomem *__typesafe_io(unsigned long addr) 
#define PCI_IO_VIRT_BASE	0xfee00000

#define PCI_IOBASE		((void __iomem *)PCI_IO_VIRT_BASE)



#if defined(CONFIG_PCI)

#if defined(CONFIG_PCI) || IS_ENABLED(CONFIG_PCMCIA)

void pci_ioremap_set_mem_type(int mem_type);

#else

static inline void pci_ioremap_set_mem_type(int mem_type) {}
@@ -200,32 +200,13 @@ void __iomem *pci_remap_cfgspace(resource_size_t res_cookie, size_t size); 
 */

#ifdef CONFIG_NEED_MACH_IO_H

#include <mach/io.h>

#elif defined(CONFIG_PCI)

#define IO_SPACE_LIMIT	((resource_size_t)0xfffff)

#define __io(a)		__typesafe_io(PCI_IO_VIRT_BASE + ((a) & IO_SPACE_LIMIT))

#else

#define __io(a)		__typesafe_io((a) & IO_SPACE_LIMIT)

#endif



/*

 * This is the limit of PC card/PCI/ISA IO space, which is by default

 * 64K if we have PC card, PCI or ISA support.  Otherwise, default to

 * zero to prevent ISA/PCI drivers claiming IO space (and potentially

 * oopsing.)

 *

 * Only set this larger if you really need inb() et.al. to operate over

 * a larger address space.  Note that SOC_COMMON ioremaps each sockets

 * IO space area, and so inb() et.al. must be defined to operate as per

 * readb() et.al. on such platforms.

 */

#ifndef IO_SPACE_LIMIT

#if defined(CONFIG_PCMCIA_SOC_COMMON) || defined(CONFIG_PCMCIA_SOC_COMMON_MODULE)

#define IO_SPACE_LIMIT ((resource_size_t)0xffffffff)

#elif defined(CONFIG_PCI) || defined(CONFIG_ISA) || defined(CONFIG_PCCARD)

#define IO_SPACE_LIMIT ((resource_size_t)0xffff)

#if IS_ENABLED(CONFIG_PCMCIA) || defined(CONFIG_PCI)

#define IO_SPACE_LIMIT	((resource_size_t)0xfffff)

#else

#define IO_SPACE_LIMIT ((resource_size_t)0)

#endif

#define __io(a)		__typesafe_io(PCI_IO_VIRT_BASE + ((a) & IO_SPACE_LIMIT))

#endif



/*

arch/arm/mach-pxa/viper.c

+12 −0
Original line number Diff line number Diff line
@@ -998,6 +998,18 @@ static struct map_desc viper_io_desc[] __initdata = { 
		.length  = 0x00800000,

		.type    = MT_DEVICE,

	},

	{

		/*

		 * ISA I/O space mapping:

		 * -  ports 0x0000-0x0fff are PC/104

		 * -  ports 0x10000-0x10fff are PCMCIA slot 1

		 * -  ports 0x11000-0x11fff are PC/104

		 */

		.virtual = PCI_IO_VIRT_BASE,

		.pfn     = __phys_to_pfn(0x30000000),

		.length  = 0x1000,

		.type    = MT_DEVICE,

	},

};



static void __init viper_map_io(void)

arch/arm/mach-pxa/zeus.c

+12 −0
Original line number Diff line number Diff line
@@ -929,6 +929,18 @@ static struct map_desc zeus_io_desc[] __initdata = { 
		.length  = 0x00800000,

		.type    = MT_DEVICE,

	},

	{

		/*

		 * ISA I/O space mapping:

		 * -  ports 0x0000-0x0fff are PC/104

		 * -  ports 0x10000-0x10fff are PCMCIA slot 1

		 * -  ports 0x11000-0x11fff are PC/104

		 */

		.virtual = PCI_IO_VIRT_BASE,

		.pfn     = __phys_to_pfn(ZEUS_PC104IO_PHYS),

		.length  = 0x1000,

		.type    = MT_DEVICE,

	},

};



static void __init zeus_map_io(void)

arch/arm/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ void iounmap(volatile void __iomem *cookie) 
}

EXPORT_SYMBOL(iounmap);



#ifdef CONFIG_PCI

#if defined(CONFIG_PCI) || IS_ENABLED(CONFIG_PCMCIA)

static int pci_ioremap_mem_type = MT_DEVICE;



void pci_ioremap_set_mem_type(int mem_type)

drivers/pcmcia/soc_common.c

+9 −8
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/regulator/consumer.h>

#include <linux/spinlock.h>

#include <linux/timer.h>

#include <linux/pci.h>



#include "soc_common.h"
@@ -782,8 +783,7 @@ void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt) 
	/* should not be required; violates some lowlevel drivers */

	soc_common_pcmcia_config_skt(skt, &dead_socket);



	iounmap(skt->virt_io);

	skt->virt_io = NULL;

	iounmap(PCI_IOBASE + skt->res_io_io.start);

	release_resource(&skt->res_attr);

	release_resource(&skt->res_mem);

	release_resource(&skt->res_io);
@@ -816,11 +816,12 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) 
	if (ret)

		goto out_err_4;



	skt->virt_io = ioremap(skt->res_io.start, 0x10000);

	if (skt->virt_io == NULL) {

		ret = -ENOMEM;

	skt->res_io_io = (struct resource)

		 DEFINE_RES_IO_NAMED(skt->nr * 0x1000 + 0x10000, 0x1000,

				     "PCMCIA I/O");

	ret = pci_remap_iospace(&skt->res_io_io, skt->res_io.start);

	if (ret)

		goto out_err_5;

	}



	/*

	 * We initialize default socket timing here, because
@@ -838,7 +839,7 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) 
	skt->socket.resource_ops = &pccard_static_ops;

	skt->socket.irq_mask = 0;

	skt->socket.map_size = PAGE_SIZE;

	skt->socket.io_offset = (unsigned long)skt->virt_io;

	skt->socket.io_offset = (unsigned long)skt->res_io_io.start;



	skt->status = soc_common_pcmcia_skt_state(skt);
@@ -872,7 +873,7 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) 
 out_err_7:

	soc_pcmcia_hw_shutdown(skt);

 out_err_6:

	iounmap(skt->virt_io);

	iounmap(PCI_IOBASE + skt->res_io_io.start);

 out_err_5:

	release_resource(&skt->res_attr);

 out_err_4: