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

Commit 68a64357 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[POWERPC] Merge 32 and 64 bits asm-powerpc/io.h 



powerpc: Merge 32 and 64 bits asm-powerpc/io.h

The rework on io.h done for the new hookable accessors made it easier,
so I just finished the work and merged 32 and 64 bits io.h for arch/powerpc.

arch/ppc still uses the old version in asm-ppc, there is just too much gunk
in there that I really can't be bothered trying to cleanup.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3d1ea8e8

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ obj-$(CONFIG_AUDIT) += audit.o 
obj64-$(CONFIG_AUDIT)		+= compat_audit.o



ifneq ($(CONFIG_PPC_INDIRECT_IO),y)

pci64-$(CONFIG_PPC64)		+= iomap.o

obj-y				+= iomap.o

endif



ifeq ($(CONFIG_PPC_ISERIES),y)

arch/powerpc/kernel/io.c

+87 −0
Original line number Diff line number Diff line
@@ -117,3 +117,90 @@ void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count) 
	asm volatile("sync");

}

EXPORT_SYMBOL(_outsl_ns);



#define IO_CHECK_ALIGN(v,a) ((((unsigned long)(v)) & ((a) - 1)) == 0)



void _memset_io(volatile void __iomem *addr, int c, unsigned long n)

{

	void *p = (void __force *)addr;

	u32 lc = c;

	lc |= lc << 8;

	lc |= lc << 16;



	__asm__ __volatile__ ("sync" : : : "memory");

	while(n && !IO_CHECK_ALIGN(p, 4)) {

		*((volatile u8 *)p) = c;

		p++;

		n--;

	}

	while(n >= 4) {

		*((volatile u32 *)p) = lc;

		p += 4;

		n -= 4;

	}

	while(n) {

		*((volatile u8 *)p) = c;

		p++;

		n--;

	}

	__asm__ __volatile__ ("sync" : : : "memory");

}

EXPORT_SYMBOL(_memset_io);



void _memcpy_fromio(void *dest, const volatile void __iomem *src,

		    unsigned long n)

{

	void *vsrc = (void __force *) src;



	__asm__ __volatile__ ("sync" : : : "memory");

	while(n && (!IO_CHECK_ALIGN(vsrc, 4) || !IO_CHECK_ALIGN(dest, 4))) {

		*((u8 *)dest) = *((volatile u8 *)vsrc);

		__asm__ __volatile__ ("eieio" : : : "memory");

		vsrc++;

		dest++;

		n--;

	}

	while(n > 4) {

		*((u32 *)dest) = *((volatile u32 *)vsrc);

		__asm__ __volatile__ ("eieio" : : : "memory");

		vsrc += 4;

		dest += 4;

		n -= 4;

	}

	while(n) {

		*((u8 *)dest) = *((volatile u8 *)vsrc);

		__asm__ __volatile__ ("eieio" : : : "memory");

		vsrc++;

		dest++;

		n--;

	}

	__asm__ __volatile__ ("sync" : : : "memory");

}

EXPORT_SYMBOL(_memcpy_fromio);



void _memcpy_toio(volatile void __iomem *dest, const void *src, unsigned long n)

{

	void *vdest = (void __force *) dest;



	__asm__ __volatile__ ("sync" : : : "memory");

	while(n && (!IO_CHECK_ALIGN(vdest, 4) || !IO_CHECK_ALIGN(src, 4))) {

		*((volatile u8 *)vdest) = *((u8 *)src);

		src++;

		vdest++;

		n--;

	}

	while(n > 4) {

		*((volatile u32 *)vdest) = *((volatile u32 *)src);

		src += 4;

		vdest += 4;

		n-=4;

	}

	while(n) {

		*((volatile u8 *)vdest) = *((u8 *)src);

		src++;

		vdest++;

		n--;

	}

	__asm__ __volatile__ ("sync" : : : "memory");

}

EXPORT_SYMBOL(_memcpy_toio);

arch/powerpc/kernel/iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ EXPORT_SYMBOL(iowrite32_rep); 


void __iomem *ioport_map(unsigned long port, unsigned int len)

{

	return (void __iomem *) (port+pci_io_base);

	return (void __iomem *) (port + _IO_BASE);

}



void ioport_unmap(void __iomem *addr)

arch/powerpc/kernel/pci_32.c

+3 −31
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, 
		*offset += hose->pci_mem_offset;

		res_bit = IORESOURCE_MEM;

	} else {

		io_offset = hose->io_base_virt - ___IO_BASE;

		io_offset = hose->io_base_virt - (void __iomem *)_IO_BASE;

		*offset += io_offset;

		res_bit = IORESOURCE_IO;

	}
@@ -1816,7 +1816,8 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, 
		return;



	if (rsrc->flags & IORESOURCE_IO)

		offset = ___IO_BASE - hose->io_base_virt + hose->io_base_phys;

		offset = (void __iomem *)_IO_BASE - hose->io_base_virt

			+ hose->io_base_phys;



	*start = rsrc->start + offset;

	*end = rsrc->end + offset;
@@ -1835,35 +1836,6 @@ pci_init_resource(struct resource *res, unsigned long start, unsigned long end, 
	res->child = NULL;

}



void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)

{

	unsigned long start = pci_resource_start(dev, bar);

	unsigned long len = pci_resource_len(dev, bar);

	unsigned long flags = pci_resource_flags(dev, bar);



	if (!len)

		return NULL;

	if (max && len > max)

		len = max;

	if (flags & IORESOURCE_IO)

		return ioport_map(start, len);

	if (flags & IORESOURCE_MEM)

		/* Not checking IORESOURCE_CACHEABLE because PPC does

		 * not currently distinguish between ioremap and

		 * ioremap_nocache.

		 */

		return ioremap(start, len);

	/* What? */

	return NULL;

}



void pci_iounmap(struct pci_dev *dev, void __iomem *addr)

{

	/* Nothing to do */

}

EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);



unsigned long pci_address_to_pio(phys_addr_t address)

{

	struct pci_controller* hose = hose_head;

arch/powerpc/kernel/rtas_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <asm/rtas.h>

#include <asm/mpic.h>

#include <asm/ppc-pci.h>

#include <asm/eeh.h>



/* RTAS tokens */

static int read_pci_config;