forked from microsoft/WSL2-Linux-Kernel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PATCH] powerpc: Consolidate asm compatibility macros
This patch consolidates macros used to generate assembly for compatibility across different CPUs or configs. A new header, asm-powerpc/asm-compat.h contains the main compatibility macros. It uses some preprocessor magic to make the macros suitable both for use in .S files, and in inline asm in .c files. Headers (bitops.h, uaccess.h, atomic.h, bug.h) which had their own such compatibility macros are changed to use asm-compat.h. ppc_asm.h is now for use in .S files *only*, and a #error enforces that. As such, we're a lot more careless about namespace pollution here than in asm-compat.h. While we're at it, this patch adds a call to the PPC405_ERR77 macro in futex.h which should have had it already, but didn't. Built and booted on pSeries, Maple and iSeries (ARCH=powerpc). Built for 32-bit powermac (ARCH=powerpc) and Walnut (ARCH=ppc). Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
- Loading branch information
1 parent
f6d3577
commit 3ddfbcf
Showing
15 changed files
with
210 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |
|
|
||
| #include <asm/processor.h> | ||
| #include <asm/asm-offsets.h> | ||
| #include <asm/ppc_asm.h> | ||
|
|
||
| .text | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| #ifndef _ASM_POWERPC_ASM_COMPAT_H | ||
| #define _ASM_POWERPC_ASM_COMPAT_H | ||
|
|
||
| #include <linux/config.h> | ||
| #include <asm/types.h> | ||
|
|
||
| #ifdef __ASSEMBLY__ | ||
| # define stringify_in_c(...) __VA_ARGS__ | ||
| # define ASM_CONST(x) x | ||
| #else | ||
| /* This version of stringify will deal with commas... */ | ||
| # define __stringify_in_c(...) #__VA_ARGS__ | ||
| # define stringify_in_c(...) __stringify_in_c(__VA_ARGS__) " " | ||
| # define __ASM_CONST(x) x##UL | ||
| # define ASM_CONST(x) __ASM_CONST(x) | ||
| #endif | ||
|
|
||
| #ifdef __powerpc64__ | ||
|
|
||
| /* operations for longs and pointers */ | ||
| #define PPC_LL stringify_in_c(ld) | ||
| #define PPC_STL stringify_in_c(std) | ||
| #define PPC_LCMPI stringify_in_c(cmpdi) | ||
| #define PPC_LONG stringify_in_c(.llong) | ||
| #define PPC_TLNEI stringify_in_c(tdnei) | ||
| #define PPC_LLARX stringify_in_c(ldarx) | ||
| #define PPC_STLCX stringify_in_c(stdcx.) | ||
| #define PPC_CNTLZL stringify_in_c(cntlzd) | ||
|
|
||
| #else /* 32-bit */ | ||
|
|
||
| /* operations for longs and pointers */ | ||
| #define PPC_LL stringify_in_c(lwz) | ||
| #define PPC_STL stringify_in_c(stw) | ||
| #define PPC_LCMPI stringify_in_c(cmpwi) | ||
| #define PPC_LONG stringify_in_c(.long) | ||
| #define PPC_TLNEI stringify_in_c(twnei) | ||
| #define PPC_LLARX stringify_in_c(lwarx) | ||
| #define PPC_STLCX stringify_in_c(stwcx.) | ||
| #define PPC_CNTLZL stringify_in_c(cntlzw) | ||
|
|
||
| #endif | ||
|
|
||
| #ifdef CONFIG_IBM405_ERR77 | ||
| /* Erratum #77 on the 405 means we need a sync or dcbt before every | ||
| * stwcx. The old ATOMIC_SYNC_FIX covered some but not all of this. | ||
| */ | ||
| #define PPC405_ERR77(ra,rb) stringify_in_c(dcbt ra, rb;) | ||
| #define PPC405_ERR77_SYNC stringify_in_c(sync;) | ||
| #else | ||
| #define PPC405_ERR77(ra,rb) | ||
| #define PPC405_ERR77_SYNC | ||
| #endif | ||
|
|
||
| #endif /* _ASM_POWERPC_ASM_COMPAT_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.