Commit 478e1709 authored by Michael Ellerman's avatar Michael Ellerman Committed by Madhavan Srinivasan
Browse files

powerpc/io: Remove PPC_IO_WORKAROUNDS 



The Cell blade support was the last user of PPC_IO_WORKAROUNDS, so they
can now be removed.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20241218105523.416573-9-mpe@ellerman.id.au
parent f026dffd

arch/powerpc/include/asm/io-workarounds.h

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Support PCI IO workaround

 *

 * (C) Copyright 2007-2008 TOSHIBA CORPORATION

 */



#ifndef _IO_WORKAROUNDS_H

#define _IO_WORKAROUNDS_H



#ifdef CONFIG_PPC_IO_WORKAROUNDS

#include <linux/io.h>

#include <asm/pci-bridge.h>



/* Bus info */

struct iowa_bus {

	struct pci_controller *phb;

	struct ppc_pci_io *ops;

	void   *private;

};



void iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,

		       int (*)(struct iowa_bus *, void *), void *);

struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR);

struct iowa_bus *iowa_pio_find_bus(unsigned long);



extern struct ppc_pci_io spiderpci_ops;

extern int spiderpci_iowa_init(struct iowa_bus *, void *);



#define SPIDER_PCI_REG_BASE		0xd000

#define SPIDER_PCI_REG_SIZE		0x1000

#define SPIDER_PCI_VCI_CNTL_STAT	0x0110

#define SPIDER_PCI_DUMMY_READ		0x0810

#define SPIDER_PCI_DUMMY_READ_BASE	0x0814



#endif



#if defined(CONFIG_PPC_IO_WORKAROUNDS) && defined(CONFIG_PPC_INDIRECT_MMIO)

extern bool io_workaround_inited;



static inline bool iowa_is_active(void)

{

	return unlikely(io_workaround_inited);

}

#else

static inline bool iowa_is_active(void)

{

	return false;

}

#endif



void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,

			   pgprot_t prot, void *caller);



#endif /* _IO_WORKAROUNDS_H */

arch/powerpc/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ obj-$(CONFIG_PCI_MSI) += msi.o 
obj-$(CONFIG_AUDIT)		+= audit.o

obj64-$(CONFIG_AUDIT)		+= compat_audit.o



obj-$(CONFIG_PPC_IO_WORKAROUNDS)	+= io-workarounds.o



obj-y				+= trace/



ifneq ($(CONFIG_PPC_INDIRECT_PIO),y)

arch/powerpc/kernel/io-workarounds.c

deleted100644 → 0
+0 −197
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Support PCI IO workaround

 *

 *  Copyright (C) 2006 Benjamin Herrenschmidt <benh@kernel.crashing.org>

 *		       IBM, Corp.

 *  (C) Copyright 2007-2008 TOSHIBA CORPORATION

 */

#undef DEBUG



#include <linux/kernel.h>

#include <linux/sched/mm.h>	/* for init_mm */

#include <linux/pgtable.h>



#include <asm/io.h>

#include <asm/machdep.h>

#include <asm/ppc-pci.h>

#include <asm/io-workarounds.h>

#include <asm/pte-walk.h>





#define IOWA_MAX_BUS	8



static struct iowa_bus iowa_busses[IOWA_MAX_BUS];

static unsigned int iowa_bus_count;



static struct iowa_bus *iowa_pci_find(unsigned long vaddr, unsigned long paddr)

{

	int i, j;

	struct resource *res;

	unsigned long vstart, vend;



	for (i = 0; i < iowa_bus_count; i++) {

		struct iowa_bus *bus = &iowa_busses[i];

		struct pci_controller *phb = bus->phb;



		if (vaddr) {

			vstart = (unsigned long)phb->io_base_virt;

			vend = vstart + phb->pci_io_size - 1;

			if ((vaddr >= vstart) && (vaddr <= vend))

				return bus;

		}



		if (paddr)

			for (j = 0; j < 3; j++) {

				res = &phb->mem_resources[j];

				if (paddr >= res->start && paddr <= res->end)

					return bus;

			}

	}



	return NULL;

}



#ifdef CONFIG_PPC_INDIRECT_MMIO

struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)

{

	struct iowa_bus *bus;

	int token;



	token = PCI_GET_ADDR_TOKEN(addr);



	if (token && token <= iowa_bus_count)

		bus = &iowa_busses[token - 1];

	else {

		unsigned long vaddr, paddr;



		vaddr = (unsigned long)PCI_FIX_ADDR(addr);

		if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END)

			return NULL;



		paddr = ppc_find_vmap_phys(vaddr);



		bus = iowa_pci_find(vaddr, paddr);



		if (bus == NULL)

			return NULL;

	}



	return bus;

}

#else /* CONFIG_PPC_INDIRECT_MMIO */

struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)

{

	return NULL;

}

#endif /* !CONFIG_PPC_INDIRECT_MMIO */



#ifdef CONFIG_PPC_INDIRECT_PIO

struct iowa_bus *iowa_pio_find_bus(unsigned long port)

{

	unsigned long vaddr = (unsigned long)pci_io_base + port;

	return iowa_pci_find(vaddr, 0);

}

#else

struct iowa_bus *iowa_pio_find_bus(unsigned long port)

{

	return NULL;

}

#endif



#define DEF_PCI_AC_RET(name, ret, at, al, space, aa)		\

static ret iowa_##name at					\

{								\

	struct iowa_bus *bus;					\

	bus = iowa_##space##_find_bus(aa);			\

	if (bus && bus->ops && bus->ops->name)			\

		return bus->ops->name al;			\

	return __do_##name al;					\

}



#define DEF_PCI_AC_NORET(name, at, al, space, aa)		\

static void iowa_##name at					\

{								\

	struct iowa_bus *bus;					\

	bus = iowa_##space##_find_bus(aa);			\

	if (bus && bus->ops && bus->ops->name) {		\

		bus->ops->name al;				\

		return;						\

	}							\

	__do_##name al;						\

}



#include <asm/io-defs.h>



#undef DEF_PCI_AC_RET

#undef DEF_PCI_AC_NORET



static const struct ppc_pci_io iowa_pci_io = {



#define DEF_PCI_AC_RET(name, ret, at, al, space, aa)	.name = iowa_##name,

#define DEF_PCI_AC_NORET(name, at, al, space, aa)	.name = iowa_##name,



#include <asm/io-defs.h>



#undef DEF_PCI_AC_RET

#undef DEF_PCI_AC_NORET



};



#ifdef CONFIG_PPC_INDIRECT_MMIO

void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,

			   pgprot_t prot, void *caller)

{

	struct iowa_bus *bus;

	void __iomem *res = __ioremap_caller(addr, size, prot, caller);

	int busno;



	bus = iowa_pci_find(0, (unsigned long)addr);

	if (bus != NULL) {

		busno = bus - iowa_busses;

		PCI_SET_ADDR_TOKEN(res, busno + 1);

	}

	return res;

}

#endif /* !CONFIG_PPC_INDIRECT_MMIO */



bool io_workaround_inited;



/* Enable IO workaround */

static void io_workaround_init(void)

{

	if (io_workaround_inited)

		return;

	ppc_pci_io = iowa_pci_io;

	io_workaround_inited = true;

}



/* Register new bus to support workaround */

void iowa_register_bus(struct pci_controller *phb, struct ppc_pci_io *ops,

		       int (*initfunc)(struct iowa_bus *, void *), void *data)

{

	struct iowa_bus *bus;

	struct device_node *np = phb->dn;



	io_workaround_init();



	if (iowa_bus_count >= IOWA_MAX_BUS) {

		pr_err("IOWA:Too many pci bridges, "

		       "workarounds disabled for %pOF\n", np);

		return;

	}



	bus = &iowa_busses[iowa_bus_count];

	bus->phb = phb;

	bus->ops = ops;

	bus->private = data;



	if (initfunc)

		if ((*initfunc)(bus, data))

			return;



	iowa_bus_count++;



	pr_debug("IOWA:[%d]Add bus, %pOF.\n", iowa_bus_count-1, np);

}

arch/powerpc/mm/ioremap.c

+0 −9
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <linux/slab.h>

#include <linux/mmzone.h>

#include <linux/vmalloc.h>

#include <asm/io-workarounds.h>



unsigned long ioremap_bot;

EXPORT_SYMBOL(ioremap_bot);
@@ -14,8 +13,6 @@ void __iomem *ioremap(phys_addr_t addr, unsigned long size) 
	pgprot_t prot = pgprot_noncached(PAGE_KERNEL);

	void *caller = __builtin_return_address(0);



	if (iowa_is_active())

		return iowa_ioremap(addr, size, prot, caller);

	return __ioremap_caller(addr, size, prot, caller);

}

EXPORT_SYMBOL(ioremap);
@@ -25,8 +22,6 @@ void __iomem *ioremap_wc(phys_addr_t addr, unsigned long size) 
	pgprot_t prot = pgprot_noncached_wc(PAGE_KERNEL);

	void *caller = __builtin_return_address(0);



	if (iowa_is_active())

		return iowa_ioremap(addr, size, prot, caller);

	return __ioremap_caller(addr, size, prot, caller);

}

EXPORT_SYMBOL(ioremap_wc);
@@ -36,8 +31,6 @@ void __iomem *ioremap_coherent(phys_addr_t addr, unsigned long size) 
	pgprot_t prot = pgprot_cached(PAGE_KERNEL);

	void *caller = __builtin_return_address(0);



	if (iowa_is_active())

		return iowa_ioremap(addr, size, prot, caller);

	return __ioremap_caller(addr, size, prot, caller);

}
@@ -50,8 +43,6 @@ void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long flags) 
	if (pte_write(pte))

		pte = pte_mkdirty(pte);



	if (iowa_is_active())

		return iowa_ioremap(addr, size, pte_pgprot(pte), caller);

	return __ioremap_caller(addr, size, pte_pgprot(pte), caller);

}

EXPORT_SYMBOL(ioremap_prot);

arch/powerpc/platforms/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ config PPC_INDIRECT_PIO 
config PPC_INDIRECT_MMIO

	bool



config PPC_IO_WORKAROUNDS

	bool



source "drivers/cpufreq/Kconfig"



menu "CPUIdle driver"