35f029e251
Instead of allocating PCI devices I/O port bus addresses from the 000xxxxx I/O port range as intended, due to a bus versus physical address mixup, the Kirkwood PCIe handling code inadvertently allocated I/O port bus addresses from the f20xxxxx address range (which is the physical address range of the PCIe I/O mapping window), but then direct all I/O port accesses to bus addresses 000xxxxx, which would then not be decoded at all. Fix this by setting the base address of the PCIe I/O space struct resource to KIRKWOOD_PCIE_IO_BUS_BASE instead of the incorrect KIRKWOOD_PCIE_IO_PHYS_BASE, and fix up __io() to expect addresses offsetted by the former instead of the latter. (The suggested fix of directing I/O port accesses from the host to bus addresses f20xxxxx instead has the problem that assigning full 32bit I/O port bus addresses (f20xxxxx) doesn't work on all PCI devices, as not all PCI devices implement full 32 bit BAR registers for I/O ports. We should really try to allocate I/O port bus addresses that fit in 16 bits.) Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
51 lines
1.3 KiB
C
51 lines
1.3 KiB
C
/*
|
|
* arch/arm/mach-kirkwood/include/mach/io.h
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_IO_H
|
|
#define __ASM_ARCH_IO_H
|
|
|
|
#include "kirkwood.h"
|
|
|
|
#define IO_SPACE_LIMIT 0xffffffff
|
|
|
|
static inline void __iomem *__io(unsigned long addr)
|
|
{
|
|
return (void __iomem *)((addr - KIRKWOOD_PCIE_IO_BUS_BASE)
|
|
+ KIRKWOOD_PCIE_IO_VIRT_BASE);
|
|
}
|
|
|
|
static inline void __iomem *
|
|
__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)
|
|
{
|
|
void __iomem *retval;
|
|
unsigned long offs = paddr - KIRKWOOD_REGS_PHYS_BASE;
|
|
if (mtype == MT_DEVICE && size && offs < KIRKWOOD_REGS_SIZE &&
|
|
size <= KIRKWOOD_REGS_SIZE && offs + size <= KIRKWOOD_REGS_SIZE) {
|
|
retval = (void __iomem *)KIRKWOOD_REGS_VIRT_BASE + offs;
|
|
} else {
|
|
retval = __arm_ioremap(paddr, size, mtype);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
static inline void
|
|
__arch_iounmap(void __iomem *addr)
|
|
{
|
|
if (addr < (void __iomem *)KIRKWOOD_REGS_VIRT_BASE ||
|
|
addr >= (void __iomem *)(KIRKWOOD_REGS_VIRT_BASE + KIRKWOOD_REGS_SIZE))
|
|
__iounmap(addr);
|
|
}
|
|
|
|
#define __arch_ioremap(p, s, m) __arch_ioremap(p, s, m)
|
|
#define __arch_iounmap(a) __arch_iounmap(a)
|
|
#define __io(a) __io(a)
|
|
#define __mem_pci(a) (a)
|
|
|
|
|
|
#endif
|