| Message ID | 20190507210917.4691-1-tbogendoerfer@suse.de (mailing list archive) |
|---|---|
| Headers | show |
| Series | MIPS: SGI-IP27 rework part2 | expand |
On Tue, May 07, 2019 at 11:09:12PM +0200, Thomas Bogendoerfer wrote: > SGI IP27 (Origin/Onyx2) and SGI IP30 (Octane) have a similair Typo s/similair/similar/ > architecture and share some hardware (ioc3/bridge). To share Isn't much of this also shared by IP35, the next generation Origin/Onyx and and co? A quick web search shows there even is an early port to IP35 here: http://git.linux-mips.org/cgit/nyef/linux-ip35/log/?h=sgi-ip35-v4.2-2015-10-24
On Tue, 7 May 2019 23:16:29 -0700 Christoph Hellwig <hch@infradead.org> wrote: > On Tue, May 07, 2019 at 11:09:12PM +0200, Thomas Bogendoerfer wrote: > > architecture and share some hardware (ioc3/bridge). To share > > Isn't much of this also shared by IP35, the next generation Origin/Onyx > and and co? A quick web search shows there even is an early port to > IP35 here: yes it is, and IP35 is my next target after IP30 is done. Thomas.
SGI IP27 (Origin/Onyx2) and SGI IP30 (Octane) have a similair architecture and share some hardware (ioc3/bridge). To share the software parts this patchset reworks SGI IP27 interrupt and pci bridge code. By using features Linux gained during the many years since SGI IP27 code was integrated this even results in code reduction and IMHO cleaner code. Tests have been done on a two module O200 (4 CPUs) and an Origin 2000 (8 CPUs). My next step in integrating SGI IP30 support is splitting ioc3eth into a MFD and subdevice drivers, which will be submitted soon. Changes in v4: - moved pci-xtalk-bridge.c back to arch/mips/pci Changes in v3: - dropped patches accepted by Paul - moved IP27 specific __phys_to_dma/__dma_to_phys into its own file - moved pcibios_to_node into IP27 specific file - moved PCI bus address resources setup out of pci-xtalk code into IP27 specific code - dropped bit from hub_irq_data and use hwirq from irq_data - introduced intr_addr for setting up bridge interrupts (IP30 preperation) Changes in v2: - replaced HUB_L/HUB_S by __raw_readq/__raw_writeq - removed union bridge_ate - replaced remaing fields in slice_data by per_cpu data - use generic_handle_irq instead of do_IRQ - use hierarchy irq domain for stacking bridge and hub interrupt - moved __dma_to_phys/__phy_to_dma to mach-ip27/dma-direct.h - use dev_to_node() for pcibus_to_node() implementation Thomas Bogendoerfer (3): MIPS: SGI-IP27: move IP27 specific code out of pci-ip27.c into new file MIPS: SGI-IP27: use generic PCI driver MIPS: SGI-IP27: abstract chipset irq from bridge arch/mips/Kconfig | 6 + arch/mips/include/asm/mach-ip27/topology.h | 11 +- arch/mips/include/asm/pci/bridge.h | 14 +- arch/mips/include/asm/sn/irq_alloc.h | 11 + arch/mips/include/asm/xtalk/xtalk.h | 9 - arch/mips/pci/Makefile | 2 +- arch/mips/pci/ops-bridge.c | 302 -------------- arch/mips/pci/pci-ip27.c | 214 ---------- arch/mips/pci/pci-xtalk-bridge.c | 610 +++++++++++++++++++++++++++++ arch/mips/sgi-ip27/Makefile | 4 +- arch/mips/sgi-ip27/ip27-init.c | 2 + arch/mips/sgi-ip27/ip27-irq.c | 190 ++++----- arch/mips/sgi-ip27/ip27-pci.c | 30 ++ arch/mips/sgi-ip27/ip27-xtalk.c | 61 ++- include/linux/platform_data/xtalk-bridge.h | 22 ++ 15 files changed, 822 insertions(+), 666 deletions(-) create mode 100644 arch/mips/include/asm/sn/irq_alloc.h delete mode 100644 arch/mips/pci/ops-bridge.c delete mode 100644 arch/mips/pci/pci-ip27.c create mode 100644 arch/mips/pci/pci-xtalk-bridge.c create mode 100644 arch/mips/sgi-ip27/ip27-pci.c create mode 100644 include/linux/platform_data/xtalk-bridge.h