diff options
author | Olof Johansson <olof@lixom.net> | 2013-09-09 17:31:04 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-09-09 17:31:04 -0700 |
commit | 23c43df854b14cf49231e84c0161a4485b5613a2 (patch) | |
tree | 30cf92eed60ef64cf6696b07828f8ce2e0ea2f24 /arch/arm/mach-versatile/include | |
parent | 3a116a5eaa68046646e557b4988a49e18f129ce8 (diff) | |
parent | 99f2b130370b904ca5300079243fdbcafa2c708b (diff) | |
download | op-kernel-dev-23c43df854b14cf49231e84c0161a4485b5613a2.zip op-kernel-dev-23c43df854b14cf49231e84c0161a4485b5613a2.tar.gz |
Merge branch 'versatile/fixes' into fixes
From Peter Maydell:
These patches fix a number of issues with the PCI controller
code for mach-versatile:
(1) The irq mapping matched neither hardware nor QEMU; we correct
it to match the hardware, which means it will also work on recent
(1.5 or later) QEMU.
(2) The code was confused between the PCI I/O window (at 0x43000000)
and the first PCI memory window (at 0x44000000), which meant that
PCI devices using PCI PIO rather than MMIO didn't work. This is
fixed (and some variables/labels are renamed to avoid further
confusion in future).
(3) The SMAP register offsets were all off-by-four, though by
fluke this didn't actually have any ill effects.
All these changes have been tested on real hardware (PB926
plus the PCI backplane), as well as on QEMU. I have confirmed
that IRQs and PCI PIO and MMIO work OK.
PCI bus-master DMA doesn't seem to work on h/w -- as far as I can
tell the device is correctly managing to DMA to the right places
in memory, but every other 32 bit word is corrupt (at least judging
from rtl8139 debug dumps of the frames it's receiving). I'm not
sure what's going on here, but since this is disjoint from
the irq and I/O issues I don't think that applying the
patches that fix those should be stalled on trying to debug
DMA problems. (DMA works fine on QEMU, incidentally.)
* versatile/fixes:
ARM: PCI: versatile: Fix SMAP register offsets
ARM: PCI: versatile: Fix PCI I/O
ARM: PCI: versatile: Fix map_irq function to match hardware
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-versatile/include')
-rw-r--r-- | arch/arm/mach-versatile/include/mach/platform.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/include/mach/platform.h index ec08740..6f938cc 100644 --- a/arch/arm/mach-versatile/include/mach/platform.h +++ b/arch/arm/mach-versatile/include/mach/platform.h @@ -231,12 +231,14 @@ /* PCI space */ #define VERSATILE_PCI_BASE 0x41000000 /* PCI Interface */ #define VERSATILE_PCI_CFG_BASE 0x42000000 +#define VERSATILE_PCI_IO_BASE 0x43000000 #define VERSATILE_PCI_MEM_BASE0 0x44000000 #define VERSATILE_PCI_MEM_BASE1 0x50000000 #define VERSATILE_PCI_MEM_BASE2 0x60000000 /* Sizes of above maps */ #define VERSATILE_PCI_BASE_SIZE 0x01000000 #define VERSATILE_PCI_CFG_BASE_SIZE 0x02000000 +#define VERSATILE_PCI_IO_BASE_SIZE 0x01000000 #define VERSATILE_PCI_MEM_BASE0_SIZE 0x0c000000 /* 32Mb */ #define VERSATILE_PCI_MEM_BASE1_SIZE 0x10000000 /* 256Mb */ #define VERSATILE_PCI_MEM_BASE2_SIZE 0x10000000 /* 256Mb */ |