Commit 6584845b authored by Michael Ellerman's avatar Michael Ellerman Committed by Madhavan Srinivasan
Browse files

powerpc/io: Remove PPC_INDIRECT_MMIO 



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

PPC_INDIRECT_PIO is still used by Power8 powernv, so it needs to remain.

Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
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-10-mpe@ellerman.id.au
parent 478e1709

arch/powerpc/include/asm/io.h

+5 −53
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ extern resource_size_t isa_mem_base; 
extern bool isa_io_special;



#ifdef CONFIG_PPC32

#if defined(CONFIG_PPC_INDIRECT_PIO) || defined(CONFIG_PPC_INDIRECT_MMIO)

#error CONFIG_PPC_INDIRECT_{PIO,MMIO} are not yet supported on 32 bits

#ifdef CONFIG_PPC_INDIRECT_PIO

#error CONFIG_PPC_INDIRECT_PIO is not yet supported on 32 bits

#endif

#endif
@@ -261,9 +261,9 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, 
 * for PowerPC is as close as possible to the x86 version of these, and thus

 * provides fairly heavy weight barriers for the non-raw versions

 *

 * In addition, they support a hook mechanism when CONFIG_PPC_INDIRECT_MMIO

 * or CONFIG_PPC_INDIRECT_PIO are set allowing the platform to provide its

 * own implementation of some or all of the accessors.

 * In addition, they support a hook mechanism when CONFIG_PPC_INDIRECT_PIO

 * is set allowing the platform to provide its own implementation of some

 * of the accessors.

 */



/*
@@ -277,51 +277,7 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, 
/* Shortcut to the MMIO argument pointer */

#define PCI_IO_ADDR	volatile void __iomem *



/* Indirect IO address tokens:

 *

 * When CONFIG_PPC_INDIRECT_MMIO is set, the platform can provide hooks

 * on all MMIOs. (Note that this is all 64 bits only for now)

 *

 * To help platforms who may need to differentiate MMIO addresses in

 * their hooks, a bitfield is reserved for use by the platform near the

 * top of MMIO addresses (not PIO, those have to cope the hard way).

 *

 * The highest address in the kernel virtual space are:

 *

 *  d0003fffffffffff	# with Hash MMU

 *  c00fffffffffffff	# with Radix MMU

 *

 * The top 4 bits are reserved as the region ID on hash, leaving us 8 bits

 * that can be used for the field.

 *

 * The direct IO mapping operations will then mask off those bits

 * before doing the actual access, though that only happen when

 * CONFIG_PPC_INDIRECT_MMIO is set, thus be careful when you use that

 * mechanism

 *

 * For PIO, there is a separate CONFIG_PPC_INDIRECT_PIO which makes

 * all PIO functions call through a hook.

 */



#ifdef CONFIG_PPC_INDIRECT_MMIO

#define PCI_IO_IND_TOKEN_SHIFT	52

#define PCI_IO_IND_TOKEN_MASK	(0xfful << PCI_IO_IND_TOKEN_SHIFT)

#define PCI_FIX_ADDR(addr)						\

	((PCI_IO_ADDR)(((unsigned long)(addr)) & ~PCI_IO_IND_TOKEN_MASK))

#define PCI_GET_ADDR_TOKEN(addr)					\

	(((unsigned long)(addr) & PCI_IO_IND_TOKEN_MASK) >> 		\

		PCI_IO_IND_TOKEN_SHIFT)

#define PCI_SET_ADDR_TOKEN(addr, token) 				\

do {									\

	unsigned long __a = (unsigned long)(addr);			\

	__a &= ~PCI_IO_IND_TOKEN_MASK;					\

	__a |= ((unsigned long)(token)) << PCI_IO_IND_TOKEN_SHIFT;	\

	(addr) = (void __iomem *)__a;					\

} while(0)

#else

#define PCI_FIX_ADDR(addr) (addr)

#endif





/*

 * Non ordered and non-swapping "raw" accessors
@@ -632,11 +588,7 @@ __do_out_asm(_rec_outl, "stwbrx") 
#define DEF_PCI_HOOK_pio(x)	NULL

#endif



#ifdef CONFIG_PPC_INDIRECT_MMIO

#define DEF_PCI_HOOK_mem(x)	x

#else

#define DEF_PCI_HOOK_mem(x)	NULL

#endif



/* Structure containing all the hooks */

extern struct ppc_pci_io {

arch/powerpc/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ unsigned long memory_block_size_bytes(void) 
}

#endif



#if defined(CONFIG_PPC_INDIRECT_PIO) || defined(CONFIG_PPC_INDIRECT_MMIO)

#ifdef CONFIG_PPC_INDIRECT_PIO

struct ppc_pci_io ppc_pci_io;

EXPORT_SYMBOL(ppc_pci_io);

#endif

arch/powerpc/platforms/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ config PPC_INDIRECT_PIO 
	bool

	select GENERIC_IOMAP



config PPC_INDIRECT_MMIO

	bool



source "drivers/cpufreq/Kconfig"



menu "CPUIdle driver"