microblaze/PCI: Moving PCI iounmap and dependent code

Moving PCI iounmap function and et all dependent code
to iomap.c.

Signed-off-by: Thippeswamy Havalige <thippeswamy.havalige@amd.com>
Link: https://lore.kernel.org/r/20221025065214.4663-14-thippeswamy.havalige@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/arch/microblaze/pci/Makefile b/arch/microblaze/pci/Makefile
index 293b416c3d8e9d0d66afad36a1f7c08f8ba4daca..f8267d20e06735d22321d4f22b9718ce5baa986c 100644 (file)
--- a/arch/microblaze/pci/Makefile
+++ b/arch/microblaze/pci/Makefile
@@ -3,4 +3,4 @@
 # Makefile
 #
 
-obj-$(CONFIG_PCI)              += pci-common.o iomap.o
+obj-$(CONFIG_PCI)              += iomap.o

diff --git a/arch/microblaze/pci/iomap.c b/arch/microblaze/pci/iomap.c
index bde74af4c1cd8dc93e61db61d9b475ede03d0c2e..b2ee8ace9b6efe2c625fd2c40cdd735696486fa0 100644 (file)
--- a/arch/microblaze/pci/iomap.c
+++ b/arch/microblaze/pci/iomap.c
@@ -11,6 +11,42 @@
 #include <linux/io.h>
 #include <asm/pci-bridge.h>
 
+static DEFINE_SPINLOCK(hose_spinlock);
+LIST_HEAD(hose_list);
+
+unsigned long isa_io_base;
+EXPORT_SYMBOL(isa_io_base);
+
+static resource_size_t pcibios_io_size(const struct pci_controller *hose)
+{
+       return resource_size(&hose->io_resource);
+}
+
+int pcibios_vaddr_is_ioport(void __iomem *address)
+{
+       int ret = 0;
+       struct pci_controller *hose;
+       resource_size_t size;
+
+       spin_lock(&hose_spinlock);
+       list_for_each_entry(hose, &hose_list, list_node) {
+               size = pcibios_io_size(hose);
+               if (address >= hose->io_base_virt &&
+                   address < (hose->io_base_virt + size)) {
+                       ret = 1;
+                       break;
+               }
+       }
+       spin_unlock(&hose_spinlock);
+       return ret;
+}
+
+/* Display the domain number in /proc */
+int pci_proc_domain(struct pci_bus *bus)
+{
+       return pci_domain_nr(bus);
+}
+
 void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
 {
        if (isa_vaddr_is_ioport(addr))

diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
deleted file mode 100644 (file)
index e5c2051..0000000
--- a/arch/microblaze/pci/pci-common.c
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Contains common pci routines for ALL ppc platform
- * (based on pci_32.c and pci_64.c)
- *
- * Port for PPC64 David Engebretsen, IBM Corp.
- * Contains common pci routines for ppc64 platform, pSeries and iSeries brands.
- *
- * Copyright (C) 2003 Anton Blanchard <anton@au.ibm.com>, IBM
- *   Rework, based on alpha PCI code.
- *
- * Common pmac/prep/chrp pci routines. -- Cort
- */
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/memblock.h>
-#include <linux/mm.h>
-#include <linux/shmem_fs.h>
-#include <linux/list.h>
-#include <linux/syscalls.h>
-#include <linux/irq.h>
-#include <linux/vmalloc.h>
-#include <linux/slab.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
-#include <linux/of_pci.h>
-#include <linux/export.h>
-
-#include <asm/processor.h>
-#include <linux/io.h>
-#include <asm/pci-bridge.h>
-#include <asm/byteorder.h>
-
-static DEFINE_SPINLOCK(hose_spinlock);
-LIST_HEAD(hose_list);
-
-unsigned long isa_io_base;
-EXPORT_SYMBOL(isa_io_base);
-
-static resource_size_t pcibios_io_size(const struct pci_controller *hose)
-{
-       return resource_size(&hose->io_resource);
-}
-
-int pcibios_vaddr_is_ioport(void __iomem *address)
-{
-       int ret = 0;
-       struct pci_controller *hose;
-       resource_size_t size;
-
-       spin_lock(&hose_spinlock);
-       list_for_each_entry(hose, &hose_list, list_node) {
-               size = pcibios_io_size(hose);
-               if (address >= hose->io_base_virt &&
-                   address < (hose->io_base_virt + size)) {
-                       ret = 1;
-                       break;
-               }
-       }
-       spin_unlock(&hose_spinlock);
-       return ret;
-}
-
-/* Display the domain number in /proc */
-int pci_proc_domain(struct pci_bus *bus)
-{
-       return pci_domain_nr(bus);
-}