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

Commit c5157e58 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

powerpc: Consolidate CPU and firmware feature fixup macros 



The CPU and firmware feature fixup macros are currently spread across
three files, firmware.h, cputable.h and asm-compat.h.  Consolidate them
into their own file, feature-fixups.h

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 51c52e86

include/asm-powerpc/asm-compat.h

+0 −51
Original line number Diff line number Diff line
@@ -15,57 +15,6 @@ 
#endif





/*

 * Feature section common macros

 *

 * Note that the entries now contain offsets between the table entry

 * and the code rather than absolute code pointers in order to be

 * useable with the vdso shared library. There is also an assumption

 * that values will be negative, that is, the fixup table has to be

 * located after the code it fixes up.

 */

#ifdef CONFIG_PPC64

#ifdef __powerpc64__

/* 64 bits kernel, 64 bits code */

#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)	\

99:							\

	.section sect,"a";				\

	.align 3;					\

98:						       	\

	.llong msk;					\

	.llong val;					\

	.llong label##b-98b;				\

	.llong 99b-98b;		 			\

	.previous

#else /* __powerpc64__ */

/* 64 bits kernel, 32 bits code (ie. vdso32) */

#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)	\

99:							\

	.section sect,"a";				\

	.align 3;					\

98:						       	\

	.llong msk;					\

	.llong val;					\

	.long 0xffffffff;      				\

	.long label##b-98b;				\

	.long 0xffffffff;	       			\

	.long 99b-98b;		 			\

	.previous

#endif /* !__powerpc64__ */

#else /* CONFIG_PPC64 */

/* 32 bits kernel, 32 bits code */

#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)	\

99:						       	\

	.section sect,"a";			       	\

	.align 2;				       	\

98:						       	\

	.long msk;				       	\

	.long val;				       	\

	.long label##b-98b;			       	\

	.long 99b-98b;				       	\

	.previous

#endif /* !CONFIG_PPC64 */



#ifdef __powerpc64__



/* operations for longs and pointers */

include/asm-powerpc/cputable.h

+1 −13
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#ifdef __KERNEL__



#include <asm/asm-compat.h>

#include <asm/feature-fixups.h>



#ifndef __ASSEMBLY__
@@ -489,18 +490,5 @@ static inline int cpu_has_feature(unsigned long feature) 


#endif /* !__ASSEMBLY__ */



#ifdef __ASSEMBLY__



#define BEGIN_FTR_SECTION_NESTED(label)	label:

#define BEGIN_FTR_SECTION		BEGIN_FTR_SECTION_NESTED(97)

#define END_FTR_SECTION_NESTED(msk, val, label) \

	MAKE_FTR_SECTION_ENTRY(msk, val, label, __ftr_fixup)

#define END_FTR_SECTION(msk, val)		\

	END_FTR_SECTION_NESTED(msk, val, 97)



#define END_FTR_SECTION_IFSET(msk)	END_FTR_SECTION((msk), (msk))

#define END_FTR_SECTION_IFCLR(msk)	END_FTR_SECTION((msk), 0)

#endif /* __ASSEMBLY__ */



#endif /* __KERNEL__ */

#endif /* __ASM_POWERPC_CPUTABLE_H */

include/asm-powerpc/feature-fixups.h

0 → 100644
+102 −0
Original line number Diff line number Diff line 
#ifndef __ASM_POWERPC_FEATURE_FIXUPS_H

#define __ASM_POWERPC_FEATURE_FIXUPS_H



/*

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#ifdef __ASSEMBLY__



/*

 * Feature section common macros

 *

 * Note that the entries now contain offsets between the table entry

 * and the code rather than absolute code pointers in order to be

 * useable with the vdso shared library. There is also an assumption

 * that values will be negative, that is, the fixup table has to be

 * located after the code it fixes up.

 */

#ifdef CONFIG_PPC64



#ifdef __powerpc64__



/* 64 bits kernel, 64 bits code */

#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)	\

99:							\

	.section sect,"a";				\

	.align 3;					\

98:						       	\

	.llong msk;					\

	.llong val;					\

	.llong label##b-98b;				\

	.llong 99b-98b;		 			\

	.previous



#else /* __powerpc64__ */



/* 64 bits kernel, 32 bits code (ie. vdso32) */

#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)	\

99:							\

	.section sect,"a";				\

	.align 3;					\

98:						       	\

	.llong msk;					\

	.llong val;					\

	.long 0xffffffff;      				\

	.long label##b-98b;				\

	.long 0xffffffff;	       			\

	.long 99b-98b;		 			\

	.previous



#endif /* !__powerpc64__ */



#else /* CONFIG_PPC64 */



/* 32 bits kernel, 32 bits code */

#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect)	\

99:						       	\

	.section sect,"a";			       	\

	.align 2;				       	\

98:						       	\

	.long msk;				       	\

	.long val;				       	\

	.long label##b-98b;			       	\

	.long 99b-98b;				       	\

	.previous



#endif /* !CONFIG_PPC64 */





/* CPU feature dependent sections */

#define BEGIN_FTR_SECTION_NESTED(label)	label:

#define BEGIN_FTR_SECTION		BEGIN_FTR_SECTION_NESTED(97)



#define END_FTR_SECTION_NESTED(msk, val, label) \

	MAKE_FTR_SECTION_ENTRY(msk, val, label, __ftr_fixup)



#define END_FTR_SECTION(msk, val)		\

	END_FTR_SECTION_NESTED(msk, val, 97)



#define END_FTR_SECTION_IFSET(msk)	END_FTR_SECTION((msk), (msk))

#define END_FTR_SECTION_IFCLR(msk)	END_FTR_SECTION((msk), 0)





/* Firmware feature dependent sections */

#define BEGIN_FW_FTR_SECTION_NESTED(label)	label:

#define BEGIN_FW_FTR_SECTION			BEGIN_FW_FTR_SECTION_NESTED(97)



#define END_FW_FTR_SECTION_NESTED(msk, val, label) \

	MAKE_FTR_SECTION_ENTRY(msk, val, label, __fw_ftr_fixup)



#define END_FW_FTR_SECTION(msk, val)		\

	END_FW_FTR_SECTION_NESTED(msk, val, 97)



#define END_FW_FTR_SECTION_IFSET(msk)	END_FW_FTR_SECTION((msk), (msk))

#define END_FW_FTR_SECTION_IFCLR(msk)	END_FW_FTR_SECTION((msk), 0)



#endif /* __ASSEMBLY__ */



#endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */

include/asm-powerpc/firmware.h

+1 −12
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#ifdef __KERNEL__



#include <asm/asm-compat.h>

#include <asm/feature-fixups.h>



/* firmware feature bitmask values */

#define FIRMWARE_MAX_FEATURES 63
@@ -125,18 +126,6 @@ extern int fwnmi_active; 


extern unsigned int __start___fw_ftr_fixup, __stop___fw_ftr_fixup;



#else /* __ASSEMBLY__ */



#define BEGIN_FW_FTR_SECTION_NESTED(label)	label:

#define BEGIN_FW_FTR_SECTION			BEGIN_FW_FTR_SECTION_NESTED(97)

#define END_FW_FTR_SECTION_NESTED(msk, val, label) \

	MAKE_FTR_SECTION_ENTRY(msk, val, label, __fw_ftr_fixup)

#define END_FW_FTR_SECTION(msk, val)		\

	END_FW_FTR_SECTION_NESTED(msk, val, 97)



#define END_FW_FTR_SECTION_IFSET(msk)	END_FW_FTR_SECTION((msk), (msk))

#define END_FW_FTR_SECTION_IFCLR(msk)	END_FW_FTR_SECTION((msk), 0)



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* __ASM_POWERPC_FIRMWARE_H */