Commit 420af155 authored by Will Deacon's avatar Will Deacon
Browse files

powerpc/mmiowb: Hook up mmwiob() implementation to asm-generic code 



In a bid to kill off explicit mmiowb() usage in driver code, hook up
the asm-generic mmiowb() tracking code but provide a definition of
arch_mmiowb_state() so that the tracking data can remain in the paca
as it does at present

This replaces the existing (flawed) implementation.

Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 49ca6462

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ config PPC 
	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_KCOV

	select ARCH_HAS_MMIOWB			if PPC64

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PMEM_API                if PPC64

	select ARCH_HAS_PTE_SPECIAL

arch/powerpc/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ generic-y += export.h 
generic-y += irq_regs.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += mmiowb.h

generic-y += preempt.h

generic-y += rwsem.h

generic-y += vtime.h

arch/powerpc/include/asm/io.h

+3 −30
Original line number Diff line number Diff line
@@ -34,14 +34,11 @@ extern struct pci_dev *isa_bridge_pcidev; 
#include <asm/byteorder.h>

#include <asm/synch.h>

#include <asm/delay.h>

#include <asm/mmiowb.h>

#include <asm/mmu.h>

#include <asm/ppc_asm.h>

#include <asm/pgtable.h>



#ifdef CONFIG_PPC64

#include <asm/paca.h>

#endif



#define SIO_CONFIG_RA	0x398

#define SIO_CONFIG_RD	0x399
@@ -107,12 +104,6 @@ extern bool isa_io_special; 
 *

 */



#ifdef CONFIG_PPC64

#define IO_SET_SYNC_FLAG()	do { local_paca->io_sync = 1; } while(0)

#else

#define IO_SET_SYNC_FLAG()

#endif



#define DEF_MMIO_IN_X(name, size, insn)				\

static inline u##size name(const volatile u##size __iomem *addr)	\

{									\
@@ -127,7 +118,7 @@ static inline void name(volatile u##size __iomem *addr, u##size val) \ 
{									\

	__asm__ __volatile__("sync;"#insn" %1,%y0"			\

		: "=Z" (*addr) : "r" (val) : "memory");			\

	IO_SET_SYNC_FLAG();						\

	mmiowb_set_pending();						\

}



#define DEF_MMIO_IN_D(name, size, insn)				\
@@ -144,7 +135,7 @@ static inline void name(volatile u##size __iomem *addr, u##size val) \ 
{									\

	__asm__ __volatile__("sync;"#insn"%U0%X0 %1,%0"			\

		: "=m" (*addr) : "r" (val) : "memory");			\

	IO_SET_SYNC_FLAG();						\

	mmiowb_set_pending();						\

}



DEF_MMIO_IN_D(in_8,     8, lbz);
@@ -652,24 +643,6 @@ static inline void name at \ 


#include <asm-generic/iomap.h>



#ifdef CONFIG_PPC32

#define mmiowb()

#else

/*

 * Enforce synchronisation of stores vs. spin_unlock

 * (this does it explicitly, though our implementation of spin_unlock

 * does it implicitely too)

 */

static inline void mmiowb(void)

{

	unsigned long tmp;



	__asm__ __volatile__("sync; li %0,0; stb %0,%1(13)"

	: "=&r" (tmp) : "i" (offsetof(struct paca_struct, io_sync))

	: "memory");

}

#endif /* !CONFIG_PPC32 */



static inline void iosync(void)

{

        __asm__ __volatile__ ("sync" : : : "memory");

arch/powerpc/include/asm/mmiowb.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_MMIOWB_H

#define _ASM_POWERPC_MMIOWB_H



#ifdef CONFIG_MMIOWB



#include <linux/compiler.h>

#include <asm/barrier.h>

#include <asm/paca.h>



#define arch_mmiowb_state()	(&local_paca->mmiowb_state)

#define mmiowb()		mb()



#else

#define mmiowb()		do { } while (0)

#endif /* CONFIG_MMIOWB */



#include <asm-generic/mmiowb.h>



#endif	/* _ASM_POWERPC_MMIOWB_H */

arch/powerpc/include/asm/paca.h

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <asm/cpuidle.h>

#include <asm/atomic.h>



#include <asm-generic/mmiowb_types.h>



register struct paca_struct *local_paca asm("r13");



#if defined(CONFIG_DEBUG_PREEMPT) && defined(CONFIG_SMP)
@@ -171,7 +173,6 @@ struct paca_struct { 
	u16 trap_save;			/* Used when bad stack is encountered */

	u8 irq_soft_mask;		/* mask for irq soft masking */

	u8 irq_happened;		/* irq happened while soft-disabled */

	u8 io_sync;			/* writel() needs spin_unlock sync */

	u8 irq_work_pending;		/* IRQ_WORK interrupt while soft-disable */

	u8 nap_state_lost;		/* NV GPR values lost in power7_idle */

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
@@ -264,6 +265,9 @@ struct paca_struct { 
#ifdef CONFIG_STACKPROTECTOR

	unsigned long canary;

#endif

#ifdef CONFIG_MMIOWB

	struct mmiowb_state mmiowb_state;

#endif

} ____cacheline_aligned;



extern void copy_mm_to_paca(struct mm_struct *mm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE