MIPS: Loongson64: Switch to generic PCI driver
authorJiaxun Yang <jiaxun.yang@flygoat.com>
Tue, 26 May 2020 09:21:16 +0000 (17:21 +0800)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Wed, 27 May 2020 11:01:56 +0000 (13:01 +0200)
We can now enable generic PCI driver in Kconfig, and remove legacy
PCI driver code.

Radeon vbios quirk is moved to the platform folder to fit the
new structure.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/Kconfig
arch/mips/loongson64/Makefile
arch/mips/loongson64/vbios_quirk.c [new file with mode: 0644]
arch/mips/pci/Makefile
arch/mips/pci/fixup-loongson3.c [deleted file]
arch/mips/pci/ops-loongson3.c [deleted file]

index c5fe30c..c040599 100644 (file)
@@ -464,6 +464,7 @@ config MACH_LOONGSON64
        select IRQ_MIPS_CPU
        select NR_CPUS_DEFAULT_64
        select USE_GENERIC_EARLY_PRINTK_8250
+       select PCI_DRIVERS_GENERIC
        select SYS_HAS_CPU_LOONGSON64
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_SMP
index 61f6add..39c06f5 100644 (file)
@@ -8,6 +8,6 @@ obj-$(CONFIG_MACH_LOONGSON64) += cop2-ex.o platform.o dma.o \
 obj-$(CONFIG_SMP)      += smp.o
 obj-$(CONFIG_NUMA)     += numa.o
 obj-$(CONFIG_RS780_HPET) += hpet.o
-obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_SUSPEND) += pm.o
+obj-$(CONFIG_PCI_QUIRKS) += vbios_quirk.o
 obj-$(CONFIG_CPU_LOONGSON3_CPUCFG_EMULATION) += cpucfg-emul.o
diff --git a/arch/mips/loongson64/vbios_quirk.c b/arch/mips/loongson64/vbios_quirk.c
new file mode 100644 (file)
index 0000000..9a29e94
--- /dev/null
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <linux/pci.h>
+#include <loongson.h>
+
+static void pci_fixup_radeon(struct pci_dev *pdev)
+{
+       struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
+
+       if (res->start)
+               return;
+
+       if (!loongson_sysconf.vgabios_addr)
+               return;
+
+       pci_disable_rom(pdev);
+       if (res->parent)
+               release_resource(res);
+
+       res->start = virt_to_phys((void *) loongson_sysconf.vgabios_addr);
+       res->end   = res->start + 256*1024 - 1;
+       res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |
+                    IORESOURCE_PCI_FIXED;
+
+       dev_info(&pdev->dev, "BAR %d: assigned %pR for Radeon ROM\n",
+                PCI_ROM_RESOURCE, res);
+}
+DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, 0x9615,
+                               PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_radeon);
index f238d7b..0f68d68 100644 (file)
@@ -32,7 +32,6 @@ obj-$(CONFIG_ATH79)           += fixup-ath79.o
 obj-$(CONFIG_MIPS_COBALT)      += fixup-cobalt.o
 obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o
 obj-$(CONFIG_LEMOTE_MACH2F)    += fixup-lemote2f.o ops-loongson2.o
-obj-$(CONFIG_MACH_LOONGSON64)  += fixup-loongson3.o ops-loongson3.o
 obj-$(CONFIG_MIPS_MALTA)       += fixup-malta.o pci-malta.o
 obj-$(CONFIG_SGI_IP27)         += pci-ip27.o
 obj-$(CONFIG_SGI_IP32)         += fixup-ip32.o ops-mace.o pci-ip32.o
diff --git a/arch/mips/pci/fixup-loongson3.c b/arch/mips/pci/fixup-loongson3.c
deleted file mode 100644 (file)
index 8a741c2..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * fixup-loongson3.c
- *
- * Copyright (C) 2012 Lemote, Inc.
- * Author: Xiang Yu, xiangy@lemote.com
- *         Chen Huacai, chenhc@lemote.com
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- * THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- * WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- * NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- * USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <linux/pci.h>
-#include <boot_param.h>
-
-static void print_fixup_info(const struct pci_dev *pdev)
-{
-       dev_info(&pdev->dev, "Device %x:%x, irq %d\n",
-                       pdev->vendor, pdev->device, pdev->irq);
-}
-
-int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-       print_fixup_info(dev);
-       return dev->irq;
-}
-
-static void pci_fixup_radeon(struct pci_dev *pdev)
-{
-       struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
-
-       if (res->start)
-               return;
-
-       if (!loongson_sysconf.vgabios_addr)
-               return;
-
-       pci_disable_rom(pdev);
-       if (res->parent)
-               release_resource(res);
-
-       res->start = virt_to_phys((void *) loongson_sysconf.vgabios_addr);
-       res->end   = res->start + 256*1024 - 1;
-       res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |
-                    IORESOURCE_PCI_FIXED;
-
-       dev_info(&pdev->dev, "BAR %d: assigned %pR for Radeon ROM\n",
-                PCI_ROM_RESOURCE, res);
-}
-
-DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, PCI_ANY_ID,
-                               PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_radeon);
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-       return 0;
-}
diff --git a/arch/mips/pci/ops-loongson3.c b/arch/mips/pci/ops-loongson3.c
deleted file mode 100644 (file)
index 2f6ad36..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-
-#include <asm/mips-boards/bonito64.h>
-
-#include <loongson.h>
-
-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-
-#define HT1LO_PCICFG_BASE      0x1a000000
-#define HT1LO_PCICFG_BASE_TP1  0x1b000000
-
-static int loongson3_pci_config_access(unsigned char access_type,
-               struct pci_bus *bus, unsigned int devfn,
-               int where, u32 *data)
-{
-       unsigned char busnum = bus->number;
-       int function = PCI_FUNC(devfn);
-       int device = PCI_SLOT(devfn);
-       int reg = where & ~3;
-       void *addrp;
-       u64 addr;
-
-       if (where < PCI_CFG_SPACE_SIZE) { /* standard config */
-               addr = (busnum << 16) | (device << 11) | (function << 8) | reg;
-               if (busnum == 0) {
-                       if (device > 31)
-                               return PCIBIOS_DEVICE_NOT_FOUND;
-                       addrp = (void *)TO_UNCAC(HT1LO_PCICFG_BASE | addr);
-               } else {
-                       addrp = (void *)TO_UNCAC(HT1LO_PCICFG_BASE_TP1 | addr);
-               }
-       } else if (where < PCI_CFG_SPACE_EXP_SIZE) {  /* extended config */
-               struct pci_dev *rootdev;
-
-               rootdev = pci_get_domain_bus_and_slot(0, 0, 0);
-               if (!rootdev)
-                       return PCIBIOS_DEVICE_NOT_FOUND;
-
-               addr = pci_resource_start(rootdev, 3);
-               if (!addr)
-                       return PCIBIOS_DEVICE_NOT_FOUND;
-
-               addr |= busnum << 20 | device << 15 | function << 12 | reg;
-               addrp = (void *)TO_UNCAC(addr);
-       } else {
-               return PCIBIOS_DEVICE_NOT_FOUND;
-       }
-
-       if (access_type == PCI_ACCESS_WRITE)
-               writel(*data, addrp);
-       else {
-               *data = readl(addrp);
-               if (*data == 0xffffffff) {
-                       *data = -1;
-                       return PCIBIOS_DEVICE_NOT_FOUND;
-               }
-       }
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int loongson3_pci_pcibios_read(struct pci_bus *bus, unsigned int devfn,
-                                int where, int size, u32 *val)
-{
-       u32 data = 0;
-       int ret = loongson3_pci_config_access(PCI_ACCESS_READ,
-                       bus, devfn, where, &data);
-
-       if (ret != PCIBIOS_SUCCESSFUL)
-               return ret;
-
-       if (size == 1)
-               *val = (data >> ((where & 3) << 3)) & 0xff;
-       else if (size == 2)
-               *val = (data >> ((where & 3) << 3)) & 0xffff;
-       else
-               *val = data;
-
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int loongson3_pci_pcibios_write(struct pci_bus *bus, unsigned int devfn,
-                                 int where, int size, u32 val)
-{
-       u32 data = 0;
-       int ret;
-
-       if (size == 4)
-               data = val;
-       else {
-               ret = loongson3_pci_config_access(PCI_ACCESS_READ,
-                               bus, devfn, where, &data);
-               if (ret != PCIBIOS_SUCCESSFUL)
-                       return ret;
-
-               if (size == 1)
-                       data = (data & ~(0xff << ((where & 3) << 3))) |
-                           (val << ((where & 3) << 3));
-               else if (size == 2)
-                       data = (data & ~(0xffff << ((where & 3) << 3))) |
-                           (val << ((where & 3) << 3));
-       }
-
-       ret = loongson3_pci_config_access(PCI_ACCESS_WRITE,
-                       bus, devfn, where, &data);
-
-       return ret;
-}
-
-struct pci_ops loongson_pci_ops = {
-       .read = loongson3_pci_pcibios_read,
-       .write = loongson3_pci_pcibios_write
-};