arch/microblaze fixes for 2.6.34-rc2

Hi Linus,

Please pull Microblaze changes to your tree. There is support for PCI and new DMA interface.

Thanks,
Michal

The following changes since commit 522dba7134d6b2e5821d3457f7941ec34f668e6d:
Linus Torvalds (1):
Merge branch 'for-linus' of
git://git.kernel.org/.../jbarnes/pci-2.6

are available in the git repository at:

git://git.monstr.eu/linux-2.6-microblaze.git for-linus

Frans Pop (1):
microblaze: remove trailing space in messages

Michal Simek (26):
microblaze: Support DMA
microblaze: Implement __dma_sync_page
microblaze: Add {z,}alloc_maybe_bootmem functions
microblaze: Add irq_create_{of_,}mapping functions
microblaze: io.h include asm-generic/iomap.h
microblaze: Add pci.h
microblaze: Add pci-bridge.h
microblaze: Add core PCI files
microblaze: Enable PCI, missing files
microblaze: Add support for Xilinx PCI host bridge
microblaze: Add support from PREEMPT
microblaze: Move cache function to cache.c
microblaze: Preliminary support for dma drivers
microblaze: Change temp register for cmdline
microblaze: Use generic show_mem()
microblaze: Preliminary support for dma drivers
microblaze: Add define for ASM_LOOP
microblaze: Remove VMALLOC_VMADDR
microblaze: Remove ancient Kconfig option for consistent mapping
microblaze: pgtable.h: move consistent functions
microblaze: Add consistent code
microblaze: Fix dma alloc and free coherent dma functions
microblaze: PCI early support for noMMU system
microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap
microblaze: Save current task directly
microblaze: entry.S use delay slot for return handlers

 arch/microblaze/Kconfig                   |   64 +-
 arch/microblaze/Makefile                  |    1 +
 arch/microblaze/include/asm/device.h      |    4 +
 arch/microblaze/include/asm/dma-mapping.h |  154 +++-
 arch/microblaze/include/asm/io.h          |   31 +-
 arch/microblaze/include/asm/irq.h         |   37 +-
 arch/microblaze/include/asm/page.h        |   12 +-
 arch/microblaze/include/asm/pci-bridge.h  |  195 ++++
 arch/microblaze/include/asm/pci.h         |  178 ++++-
 arch/microblaze/include/asm/pgalloc.h     |    2 +-
 arch/microblaze/include/asm/pgtable.h     |   40 +-
 arch/microblaze/include/asm/prom.h        |   15 +
 arch/microblaze/include/asm/system.h      |    3 +
 arch/microblaze/include/asm/tlbflush.h    |    2 +-
 arch/microblaze/kernel/Makefile           |    2 +-
 arch/microblaze/kernel/asm-offsets.c      |    1 +
 arch/microblaze/kernel/cpu/cache.c        |  211 +++-
 arch/microblaze/kernel/dma.c              |  156 +++
 arch/microblaze/kernel/entry.S            |  116 +-
 arch/microblaze/kernel/head.S             |   13 +-
 arch/microblaze/kernel/irq.c              |   15 +
 arch/microblaze/kernel/setup.c            |   45 +-
 arch/microblaze/mm/Makefile               |    2 +-
 arch/microblaze/mm/consistent.c           |  246 +++++
 arch/microblaze/mm/init.c                 |   39 +-
 arch/microblaze/mm/pgtable.c              |    2 +-
 arch/microblaze/pci/Makefile              |    6 +
 arch/microblaze/pci/indirect_pci.c        |  163 +++
 arch/microblaze/pci/iomap.c               |   39 +
 arch/microblaze/pci/pci-common.c          | 1642 
+++++++++++++++++++++++++++++
 arch/microblaze/pci/pci_32.c              |  430 ++++++++
 arch/microblaze/pci/xilinx_pci.c          |  168 +++
 drivers/pci/Makefile                      |    1 +
 33 files changed, 3840 insertions(+), 195 deletions(-)
 create mode 100644 arch/microblaze/kernel/dma.c
 create mode 100644 arch/microblaze/mm/consistent.c
 create mode 100644 arch/microblaze/pci/Makefile
 create mode 100644 arch/microblaze/pci/indirect_pci.c
 create mode 100644 arch/microblaze/pci/iomap.c
 create mode 100644 arch/microblaze/pci/pci-common.c
 create mode 100644 arch/microblaze/pci/pci_32.c
 create mode 100644 arch/microblaze/pci/xilinx_pci.c

Hi Linus,

Please pull Microblaze changes to your tree. There is support for PCI and new DMA interface.

Thanks,
Michal

Quoted 7 lines · Michal Simek

Hi Linus,

Please pull Microblaze changes to your tree. There is support for PCI and new DMA interface.

Thanks,
Michal

Hi Michal.

I'm really unimpressed that you've merged the cloned PCI support code when we talked about merging the common powerpc & microblaze bits /before/ pushing it up to mainline.  At the very least I would have expected a reply back from you telling me that you disagree and that you wanted to merge anyway.  I didn't even get a reply back form you when I asked about why the PCI bits were in your linux-next branch.

Now it needs to be merged in-place which is a lot more work.

Grant,

Quoted 18 lines · Grant Likely

Quoted 7 lines · Michal Simek

Hi Linus,

Please pull Microblaze changes to your tree. There is support for PCI and new DMA interface.

Thanks,
Michal

Hi Michal.

I'm really unimpressed that you've merged the cloned PCI support code when we talked about merging the common powerpc & microblaze bits /before/ pushing it up to mainline.  At the very least I would have expected a reply back from you telling me that you disagree and that you wanted to merge anyway.  I didn't even get a reply back form you when I asked about why the PCI bits were in your linux-next branch.

Quoted 1 line

Now it needs to be merged in-place which is a lot more work.

You should blame me for this one.  There was nothing deliberate about it - I've been hassling Michal to get the DMA API upstream because there's other work that depends on it, and with everything else going on I plain forgot that his patchset included the PCI stuff that we were still discussing with you.

Let me buy you a beer at ELC and you can berate me for it then!