Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b01aec9b authored by Borislav Petkov's avatar Borislav Petkov
Browse files

EDAC: Cleanup atomic_scrub mess 



So first of all, this atomic_scrub() function's naming is bad. It looks
like an atomic_t helper. Change it to edac_atomic_scrub().

The bigger problem is that this function is arch-specific and every new
arch which doesn't necessarily need that functionality still needs to
define it, otherwise EDAC doesn't compile.

So instead of doing that and including arch-specific headers, have each
arch define an EDAC_ATOMIC_SCRUB symbol which can be used in edac_mc.c
for ifdeffery. Much cleaner.

And we already are doing this with another symbol - EDAC_SUPPORT. This
is also much cleaner than having CONFIG_EDAC enumerate all the arches
which need/have EDAC support and drivers.

This way I can kill the useless edac.h header in tile too.

Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Acked-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-edac@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: "Maciej W. Rozycki" <macro@codesourcery.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Steven J. Hill" <Steven.Hill@imgtec.com>
Cc: x86@kernel.org
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 30c7469b

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ config ARM 
	select CLONE_BACKWARDS

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS

	select EDAC_SUPPORT

	select EDAC_ATOMIC_SCRUB

	select GENERIC_ALLOCATOR

	select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI)

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

arch/arm/include/asm/edac.h

+3 −2
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ 
#define ASM_EDAC_H

/*

 * ECC atomic, DMA, SMP and interrupt safe scrub function.

 * Implements the per arch atomic_scrub() that EDAC use for software

 * Implements the per arch edac_atomic_scrub() that EDAC use for software

 * ECC scrubbing.  It reads memory and then writes back the original

 * value, allowing the hardware to detect and correct memory errors.

 */

static inline void atomic_scrub(void *va, u32 size)



static inline void edac_atomic_scrub(void *va, u32 size)

{

#if __LINUX_ARM_ARCH__ >= 6

	unsigned int *virt_addr = va;

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -819,6 +819,7 @@ config CAVIUM_OCTEON_SOC 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select EDAC_SUPPORT

	select EDAC_ATOMIC_SCRUB

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_HOTPLUG_CPU if CPU_BIG_ENDIAN

	select SYS_HAS_EARLY_PRINTK

arch/mips/include/asm/edac.h

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


/* ECC atomic, DMA, SMP and interrupt safe scrub function */



static inline void atomic_scrub(void *va, u32 size)

static inline void edac_atomic_scrub(void *va, u32 size)

{

	unsigned long *virt_addr = va;

	unsigned long temp;
@@ -21,7 +21,7 @@ static inline void atomic_scrub(void *va, u32 size) 


		__asm__ __volatile__ (

		"	.set	mips2					\n"

		"1:	ll	%0, %1		# atomic_scrub		\n"

		"1:	ll	%0, %1		# edac_atomic_scrub	\n"

		"	addu	%0, $0					\n"

		"	sc	%0, %1					\n"

		"	beqz	%0, 1b					\n"

arch/powerpc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ config PPC 
	select NO_BOOTMEM

	select HAVE_GENERIC_RCU_GUP

	select HAVE_PERF_EVENTS_NMI if PPC64

	select EDAC_SUPPORT

	select EDAC_ATOMIC_SCRUB



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN