mirror of
https://github.com/torvalds/linux.git
synced 2026-09-19 20:21:51 -04:00
Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work
This commit is contained in:
@@ -14,34 +14,36 @@
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#include <asm/asm-compat.h>
|
||||
|
||||
/* firmware feature bitmask values */
|
||||
#define FIRMWARE_MAX_FEATURES 63
|
||||
|
||||
#define FW_FEATURE_PFT (1UL<<0)
|
||||
#define FW_FEATURE_TCE (1UL<<1)
|
||||
#define FW_FEATURE_SPRG0 (1UL<<2)
|
||||
#define FW_FEATURE_DABR (1UL<<3)
|
||||
#define FW_FEATURE_COPY (1UL<<4)
|
||||
#define FW_FEATURE_ASR (1UL<<5)
|
||||
#define FW_FEATURE_DEBUG (1UL<<6)
|
||||
#define FW_FEATURE_TERM (1UL<<7)
|
||||
#define FW_FEATURE_PERF (1UL<<8)
|
||||
#define FW_FEATURE_DUMP (1UL<<9)
|
||||
#define FW_FEATURE_INTERRUPT (1UL<<10)
|
||||
#define FW_FEATURE_MIGRATE (1UL<<11)
|
||||
#define FW_FEATURE_PERFMON (1UL<<12)
|
||||
#define FW_FEATURE_CRQ (1UL<<13)
|
||||
#define FW_FEATURE_VIO (1UL<<14)
|
||||
#define FW_FEATURE_RDMA (1UL<<15)
|
||||
#define FW_FEATURE_LLAN (1UL<<16)
|
||||
#define FW_FEATURE_BULK (1UL<<17)
|
||||
#define FW_FEATURE_XDABR (1UL<<18)
|
||||
#define FW_FEATURE_MULTITCE (1UL<<19)
|
||||
#define FW_FEATURE_SPLPAR (1UL<<20)
|
||||
#define FW_FEATURE_ISERIES (1UL<<21)
|
||||
#define FW_FEATURE_LPAR (1UL<<22)
|
||||
#define FW_FEATURE_PFT ASM_CONST(0x0000000000000001)
|
||||
#define FW_FEATURE_TCE ASM_CONST(0x0000000000000002)
|
||||
#define FW_FEATURE_SPRG0 ASM_CONST(0x0000000000000004)
|
||||
#define FW_FEATURE_DABR ASM_CONST(0x0000000000000008)
|
||||
#define FW_FEATURE_COPY ASM_CONST(0x0000000000000010)
|
||||
#define FW_FEATURE_ASR ASM_CONST(0x0000000000000020)
|
||||
#define FW_FEATURE_DEBUG ASM_CONST(0x0000000000000040)
|
||||
#define FW_FEATURE_TERM ASM_CONST(0x0000000000000080)
|
||||
#define FW_FEATURE_PERF ASM_CONST(0x0000000000000100)
|
||||
#define FW_FEATURE_DUMP ASM_CONST(0x0000000000000200)
|
||||
#define FW_FEATURE_INTERRUPT ASM_CONST(0x0000000000000400)
|
||||
#define FW_FEATURE_MIGRATE ASM_CONST(0x0000000000000800)
|
||||
#define FW_FEATURE_PERFMON ASM_CONST(0x0000000000001000)
|
||||
#define FW_FEATURE_CRQ ASM_CONST(0x0000000000002000)
|
||||
#define FW_FEATURE_VIO ASM_CONST(0x0000000000004000)
|
||||
#define FW_FEATURE_RDMA ASM_CONST(0x0000000000008000)
|
||||
#define FW_FEATURE_LLAN ASM_CONST(0x0000000000010000)
|
||||
#define FW_FEATURE_BULK ASM_CONST(0x0000000000020000)
|
||||
#define FW_FEATURE_XDABR ASM_CONST(0x0000000000040000)
|
||||
#define FW_FEATURE_MULTITCE ASM_CONST(0x0000000000080000)
|
||||
#define FW_FEATURE_SPLPAR ASM_CONST(0x0000000000100000)
|
||||
#define FW_FEATURE_ISERIES ASM_CONST(0x0000000000200000)
|
||||
#define FW_FEATURE_LPAR ASM_CONST(0x0000000000400000)
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
enum {
|
||||
#ifdef CONFIG_PPC64
|
||||
@@ -94,6 +96,23 @@ extern void machine_check_fwnmi(void);
|
||||
/* This is true if we are using the firmware NMI handler (typically LPAR) */
|
||||
extern int fwnmi_active;
|
||||
|
||||
#else /* __ASSEMBLY__ */
|
||||
|
||||
#define BEGIN_FW_FTR_SECTION 96:
|
||||
|
||||
#define END_FW_FTR_SECTION(msk, val) \
|
||||
97: \
|
||||
.section __fw_ftr_fixup,"a"; \
|
||||
.align 3; \
|
||||
.llong msk; \
|
||||
.llong val; \
|
||||
.llong 96b; \
|
||||
.llong 97b; \
|
||||
.previous
|
||||
|
||||
#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 */
|
||||
|
||||
Reference in New Issue
Block a user