From patchwork Tue Feb 19 15:57:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Bogendoerfer X-Patchwork-Id: 10820113 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6AD886CB for ; Tue, 19 Feb 2019 15:58:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B5912C621 for ; Tue, 19 Feb 2019 15:58:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F9CB2C634; Tue, 19 Feb 2019 15:58:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E60452C621 for ; Tue, 19 Feb 2019 15:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726397AbfBSP5h (ORCPT ); Tue, 19 Feb 2019 10:57:37 -0500 Received: from mx2.suse.de ([195.135.220.15]:51840 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725911AbfBSP5h (ORCPT ); Tue, 19 Feb 2019 10:57:37 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 04B86ACE8; Tue, 19 Feb 2019 15:57:34 +0000 (UTC) From: Thomas Bogendoerfer To: Ralf Baechle , Paul Burton , James Hogan , Lorenzo Pieralisi , Bjorn Helgaas , Marc Zyngier , Thomas Gleixner , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v2 00/10] MIPS: SGI-IP27 rework Date: Tue, 19 Feb 2019 16:57:14 +0100 Message-Id: <20190219155728.19163-1-tbogendoerfer@suse.de> X-Mailer: git-send-email 2.13.7 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Prototype is working, but needs still more clean ups. 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 (10): MIPS: SGI-IP27: get rid of volatile and hubreg_t MIPS: SGI-IP27: clean up bridge access and header files MIPS: SGI-IP27: use pr_info/pr_emerg and pr_cont to fix output MIPS: SGI-IP27: do xtalk scanning later MIPS: SGI-IP27: do boot CPU init later MIPS: SGI-IP27: rework HUB interrupts PCI: call add_bus method also for root bus MIPS: SGI-IP27: use generic PCI driver genirq/irqdomain: fall back to default domain when creating hierarchy domain MIPS: SGI-IP27: abstract chipset irq from bridge arch/mips/Kconfig | 4 + arch/mips/include/asm/dma-direct.h | 2 + arch/mips/include/asm/mach-generic/dma-direct.h | 7 + arch/mips/include/asm/mach-ip27/dma-direct.h | 20 + arch/mips/include/asm/mach-ip27/irq.h | 12 +- arch/mips/include/asm/mach-ip27/mmzone.h | 9 - arch/mips/include/asm/mach-ip27/topology.h | 13 +- arch/mips/include/asm/pci.h | 8 + arch/mips/include/asm/pci/bridge.h | 211 ++++---- arch/mips/include/asm/smp-ops.h | 1 + arch/mips/include/asm/sn/addrs.h | 72 +-- arch/mips/include/asm/sn/arch.h | 2 - arch/mips/include/asm/sn/intr.h | 6 + arch/mips/include/asm/sn/io.h | 2 +- arch/mips/include/asm/sn/sn0/addrs.h | 5 - arch/mips/include/asm/xtalk/xtalk.h | 9 - arch/mips/kernel/smp.c | 2 + arch/mips/pci/Makefile | 1 - arch/mips/pci/ops-bridge.c | 322 ------------ arch/mips/pci/pci-ip27.c | 233 --------- arch/mips/sgi-ip27/Makefile | 3 +- arch/mips/sgi-ip27/ip27-hubio.c | 4 +- arch/mips/sgi-ip27/ip27-init.c | 41 +- arch/mips/sgi-ip27/ip27-irq-pci.c | 266 ---------- arch/mips/sgi-ip27/ip27-irq.c | 331 ++++++++----- arch/mips/sgi-ip27/ip27-irqno.c | 48 -- arch/mips/sgi-ip27/ip27-memory.c | 34 +- arch/mips/sgi-ip27/ip27-nmi.c | 64 +-- arch/mips/sgi-ip27/ip27-smp.c | 5 +- arch/mips/sgi-ip27/ip27-timer.c | 42 +- arch/mips/sgi-ip27/ip27-xtalk.c | 44 +- drivers/pci/controller/Kconfig | 3 + drivers/pci/controller/Makefile | 1 + drivers/pci/controller/pci-xtalk-bridge.c | 623 ++++++++++++++++++++++++ drivers/pci/probe.c | 6 + include/linux/platform_data/xtalk-bridge.h | 17 + kernel/irq/irqdomain.c | 5 +- 37 files changed, 1126 insertions(+), 1352 deletions(-) create mode 100644 arch/mips/include/asm/mach-generic/dma-direct.h create mode 100644 arch/mips/include/asm/mach-ip27/dma-direct.h delete mode 100644 arch/mips/pci/ops-bridge.c delete mode 100644 arch/mips/pci/pci-ip27.c delete mode 100644 arch/mips/sgi-ip27/ip27-irq-pci.c delete mode 100644 arch/mips/sgi-ip27/ip27-irqno.c create mode 100644 drivers/pci/controller/pci-xtalk-bridge.c create mode 100644 include/linux/platform_data/xtalk-bridge.h