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

Commit b0b1d60a authored by Dan Williams's avatar Dan Williams Committed by Russell King
Browse files

[ARM] 4077/1: iop13xx: fix __io() macro 



Since iop13xx defines the PCI I/O spaces with physical resource addresses
the __io macro needs to perform the physical to virtual conversion.  I
incorrectly assumed that this would be handled by ioremap, but drivers
(like e1000) directly dereference the address returned from __io.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4cc2f7a8

arch/arm/mach-iop13xx/io.c

+19 −0
Original line number Diff line number Diff line
@@ -21,6 +21,25 @@ 
#include <asm/hardware.h>

#include <asm/io.h>



void * __iomem __iop13xx_io(unsigned long io_addr)

{

	void __iomem * io_virt;



	switch (io_addr) {

	case IOP13XX_PCIE_LOWER_IO_PA ... IOP13XX_PCIE_UPPER_IO_PA:

		io_virt = (void *) IOP13XX_PCIE_IO_PHYS_TO_VIRT(io_addr);

		break;

	case IOP13XX_PCIX_LOWER_IO_PA ... IOP13XX_PCIX_UPPER_IO_PA:

		io_virt = (void *) IOP13XX_PCIX_IO_PHYS_TO_VIRT(io_addr);

		break;

	default:

		BUG();

	}



	return io_virt;

}

EXPORT_SYMBOL(__iop13xx_io);



void * __iomem __iop13xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags)

{

include/asm-arm/arch-iop13xx/io.h

+2 −1
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ 


#define IO_SPACE_LIMIT 0xffffffff



#define __io(a)      (a)

#define __io(a) __iop13xx_io(a)

#define __mem_pci(a) (a)

#define __mem_isa(a) (a)



extern void __iomem * __iop13xx_io(unsigned long io_addr);

extern void __iomem * __ioremap(unsigned long, size_t, unsigned long);

extern void __iomem *__iop13xx_ioremap(unsigned long cookie, size_t size,

	unsigned long flags);