1
0
Fork 0
alistair23-linux/arch/arm/mach-versatile
Olof Johansson 23c43df854 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>
2013-09-09 17:31:04 -07:00
..
include/mach Merge branch 'versatile/fixes' into fixes 2013-09-09 17:31:04 -07:00
Kconfig ARM: pick Versatile by default for !MMU 2013-02-14 15:04:38 +01:00
Makefile arm/versatile: Add device tree support 2011-07-28 01:32:04 -06:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
core.c reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00
core.h reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00
pci.c ARM: PCI: versatile: Fix SMAP register offsets 2013-09-04 14:53:33 -07:00
versatile_ab.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
versatile_dt.c ARM: versatile: use OF init for sp804 timer 2013-04-11 15:11:21 -05:00
versatile_pb.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00