MIPS: Loongson64: Switch to generic PCI driver (6423e59a) · Commits · 戴 / test

arch/mips/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/mips/loongson64/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/mips/loongson64/vbios_quirk.c

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		// 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);

arch/mips/pci/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/mips/pci/fixup-loongson3.c

deleted100644 → 0

+0 −71

Original line number	Diff line number	Diff line
		/*
		* 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;
		}

Admin message