Commit 388defd5 authored by Nathan Lynch's avatar Nathan Lynch Committed by Michael Ellerman
Browse files

powerpc/machdep: warn when machine_is() used too early 



machine_is() can't provide correct results before probe_machine() has
run. Warn when it's used too early in boot, placing the WARN_ON() in a
helper function so the reported file:line indicates exactly what went
wrong.

checkpatch complains about __attribute__((weak)) in the patch, so
change that to __weak, and align the line continuations as well.

Signed-off-by: default avatarNathan Lynch <nathanl@linux.ibm.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230210-warn-on-machine-is-before-probe-machine-v2-1-b57f8243c51c@linux.ibm.com
parent 77e82fa1

arch/powerpc/include/asm/machdep.h

+11 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define _ASM_POWERPC_MACHDEP_H

#ifdef __KERNEL__



#include <linux/compiler.h>

#include <linux/seq_file.h>

#include <linux/init.h>

#include <linux/dma-mapping.h>
@@ -220,11 +221,16 @@ extern struct machdep_calls *machine_id; 
	EXPORT_SYMBOL(mach_##name);				\

	struct machdep_calls mach_##name __machine_desc =



static inline bool __machine_is(const struct machdep_calls *md)

{

	WARN_ON(!machine_id); // complain if used before probe_machine()

	return machine_id == md;

}



#define machine_is(name)                                        \

	({                                                      \

		extern struct machdep_calls mach_##name \

			__attribute__((weak));		 \

		machine_id == &mach_##name; \

		extern struct machdep_calls mach_##name __weak; \

		__machine_is(&mach_##name);                     \

	})



static inline void log_error(char *buf, unsigned int err_type, int fatal)