You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc updates from Benjamin Herrenschmidt:
"Here are the powerpc goodies for 3.5. Main highlights are:
- Support for the NX crypto engine in Power7+
- A bunch of Anton goodness, including some micro optimization of our
syscall entry on Power7
- I converted a pile of our thermal control drivers to the new i2c
APIs (essentially turning the old therm_pm72 into a proper set of
windfarm drivers). That's one more step toward removing the
deprecated i2c APIs, there's still a few drivers to fix, but we are
getting close
- kexec/kdump support for 47x embedded cores
The big missing thing here is no updates from Freescale. Not sure
what's up here, but with Kumar not working for them anymore things are
a bit in a state of flux in that area."
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)
powerpc: Fix irq distribution
Revert "powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags"
powerpc: Fixing a cputhread code documentation
powerpc/crypto: Enable the PFO-based encryption device
powerpc/crypto: Build files for the nx device driver
powerpc/crypto: debugfs routines and docs for the nx device driver
powerpc/crypto: SHA512 hash routines for nx encryption
powerpc/crypto: SHA256 hash routines for nx encryption
powerpc/crypto: AES-XCBC mode routines for nx encryption
powerpc/crypto: AES-GCM mode routines for nx encryption
powerpc/crypto: AES-ECB mode routines for nx encryption
powerpc/crypto: AES-CTR mode routines for nx encryption
powerpc/crypto: AES-CCM mode routines for nx encryption
powerpc/crypto: AES-CBC mode routines for nx encryption
powerpc/crypto: nx driver code supporting nx encryption
powerpc/pseries: Enable the PFO-based RNG accelerator
powerpc/pseries/hwrng: PFO-based hwrng driver
powerpc/pseries: Add PFO support to the VIO bus
powerpc/pseries: Add pseries update notifier for OFDT prop changes
powerpc/pseries: Add new hvcall constants to support PFO
...
This commit is contained in:
Linus Torvalds
@@ -350,7 +350,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
|
||||
|
||||
config KEXEC
|
||||
bool "kexec system call (EXPERIMENTAL)"
|
||||
depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !PPC_47x)) && EXPERIMENTAL
|
||||
depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) && EXPERIMENTAL
|
||||
help
|
||||
kexec is a system call that implements the ability to shutdown your
|
||||
current kernel, and to start another kernel. It is like a reboot
|
||||
@@ -367,7 +367,7 @@ config KEXEC
|
||||
|
||||
config CRASH_DUMP
|
||||
bool "Build a kdump crash kernel"
|
||||
depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP && !PPC_47x)
|
||||
depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
|
||||
select RELOCATABLE if PPC64 || 44x
|
||||
select DYNAMIC_MEMSTART if FSL_BOOKE
|
||||
help
|
||||
|
||||
+23
-26
@@ -69,6 +69,16 @@ LDFLAGS_vmlinux := $(LDFLAGS_vmlinux-y)
|
||||
|
||||
CFLAGS-$(CONFIG_PPC64) := -mminimal-toc -mtraceback=no -mcall-aixdesc
|
||||
CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 -mmultiple
|
||||
|
||||
CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4)
|
||||
CFLAGS-$(CONFIG_CELL_CPU) += $(call cc-option,-mcpu=cell)
|
||||
CFLAGS-$(CONFIG_POWER4_CPU) += $(call cc-option,-mcpu=power4)
|
||||
CFLAGS-$(CONFIG_POWER5_CPU) += $(call cc-option,-mcpu=power5)
|
||||
CFLAGS-$(CONFIG_POWER6_CPU) += $(call cc-option,-mcpu=power6)
|
||||
CFLAGS-$(CONFIG_POWER7_CPU) += $(call cc-option,-mcpu=power7)
|
||||
|
||||
CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)
|
||||
|
||||
KBUILD_CPPFLAGS += -Iarch/$(ARCH)
|
||||
KBUILD_AFLAGS += -Iarch/$(ARCH)
|
||||
KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
|
||||
@@ -76,32 +86,11 @@ CPP = $(CC) -E $(KBUILD_CFLAGS)
|
||||
|
||||
CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
|
||||
|
||||
ifeq ($(CONFIG_PPC64),y)
|
||||
GCC_BROKEN_VEC := $(call cc-ifversion, -lt, 0400, y)
|
||||
|
||||
ifeq ($(CONFIG_POWER4_ONLY),y)
|
||||
ifeq ($(CONFIG_ALTIVEC),y)
|
||||
ifeq ($(GCC_BROKEN_VEC),y)
|
||||
KBUILD_CFLAGS += $(call cc-option,-mcpu=970)
|
||||
else
|
||||
KBUILD_CFLAGS += $(call cc-option,-mcpu=power4)
|
||||
endif
|
||||
else
|
||||
KBUILD_CFLAGS += $(call cc-option,-mcpu=power4)
|
||||
endif
|
||||
else
|
||||
KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
|
||||
endif
|
||||
endif
|
||||
|
||||
KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
|
||||
|
||||
ifeq ($(CONFIG_TUNE_CELL),y)
|
||||
KBUILD_CFLAGS += $(call cc-option,-mtune=cell)
|
||||
endif
|
||||
|
||||
# No AltiVec instruction when building kernel
|
||||
# No AltiVec or VSX instructions when building kernel
|
||||
KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
|
||||
KBUILD_CFLAGS += $(call cc-option,-mno-vsx)
|
||||
|
||||
# No SPE instruction when building kernel
|
||||
# (We use all available options to help semi-broken compilers)
|
||||
@@ -160,6 +149,7 @@ core-$(CONFIG_KVM) += arch/powerpc/kvm/
|
||||
core-$(CONFIG_PERF_EVENTS) += arch/powerpc/perf/
|
||||
|
||||
drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
|
||||
drivers-$(CONFIG_CRYPTO_DEV_NX) += drivers/crypto/nx/
|
||||
|
||||
# Default to zImage, override when needed
|
||||
all: zImage
|
||||
@@ -234,10 +224,11 @@ archprepare: checkbin
|
||||
# Use the file '.tmp_gas_check' for binutils tests, as gas won't output
|
||||
# to stdout and these checks are run even on install targets.
|
||||
TOUT := .tmp_gas_check
|
||||
# Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec
|
||||
# instructions.
|
||||
# gcc-3.4 and binutils-2.14 are a fatal combination.
|
||||
|
||||
# Check gcc and binutils versions:
|
||||
# - gcc-3.4 and binutils-2.14 are a fatal combination
|
||||
# - Require gcc 4.0 or above on 64-bit
|
||||
# - gcc-4.2.0 has issues compiling modules on 64-bit
|
||||
checkbin:
|
||||
@if test "$(call cc-version)" = "0304" ; then \
|
||||
if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \
|
||||
@@ -247,6 +238,12 @@ checkbin:
|
||||
false; \
|
||||
fi ; \
|
||||
fi
|
||||
@if test "$(call cc-version)" -lt "0400" \
|
||||
&& test "x${CONFIG_PPC64}" = "xy" ; then \
|
||||
echo -n "Sorry, GCC v4.0 or above is required to build " ; \
|
||||
echo "the 64-bit powerpc kernel." ; \
|
||||
false ; \
|
||||
fi
|
||||
@if test "$(call cc-fullversion)" = "040200" \
|
||||
&& test "x${CONFIG_MODULES}${CONFIG_PPC64}" = "xyy" ; then \
|
||||
echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \
|
||||
|
||||
@@ -373,5 +373,30 @@
|
||||
0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */
|
||||
0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
|
||||
};
|
||||
|
||||
MSI: ppc4xx-msi@C10000000 {
|
||||
compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
|
||||
reg = < 0xC 0x10000000 0x100
|
||||
0xC 0x10000000 0x100>;
|
||||
sdr-base = <0x36C>;
|
||||
msi-data = <0x00004440>;
|
||||
msi-mask = <0x0000ffe0>;
|
||||
interrupts =<0 1 2 3 4 5 6 7>;
|
||||
interrupt-parent = <&MSI>;
|
||||
#interrupt-cells = <1>;
|
||||
#address-cells = <0>;
|
||||
#size-cells = <0>;
|
||||
msi-available-ranges = <0x0 0x100>;
|
||||
interrupt-map = <
|
||||
0 &UIC3 0x18 1
|
||||
1 &UIC3 0x19 1
|
||||
2 &UIC3 0x1A 1
|
||||
3 &UIC3 0x1B 1
|
||||
4 &UIC3 0x1C 1
|
||||
5 &UIC3 0x1D 1
|
||||
6 &UIC3 0x1E 1
|
||||
7 &UIC3 0x1F 1
|
||||
>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
CONFIG_PPC64=y
|
||||
CONFIG_POWER4_ONLY=y
|
||||
CONFIG_ALTIVEC=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=4
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
CONFIG_PPC64=y
|
||||
CONFIG_POWER4_ONLY=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=4
|
||||
CONFIG_EXPERIMENTAL=y
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
CONFIG_PPC64=y
|
||||
CONFIG_POWER4_ONLY=y
|
||||
CONFIG_ALTIVEC=y
|
||||
# CONFIG_VIRT_CPU_ACCOUNTING is not set
|
||||
CONFIG_SMP=y
|
||||
|
||||
@@ -6,7 +6,6 @@ CONFIG_NR_CPUS=2
|
||||
CONFIG_EXPERIMENTAL=y
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_SPARSE_IRQ=y
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
CONFIG_EMBEDDED=y
|
||||
@@ -25,7 +24,6 @@ CONFIG_PS3_DISK=y
|
||||
CONFIG_PS3_ROM=y
|
||||
CONFIG_PS3_FLASH=y
|
||||
CONFIG_PS3_VRAM=m
|
||||
CONFIG_PS3_LPM=m
|
||||
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
||||
@@ -53,8 +51,6 @@ CONFIG_IP_PNP_DHCP=y
|
||||
# CONFIG_INET_DIAG is not set
|
||||
CONFIG_IPV6=y
|
||||
CONFIG_BT=m
|
||||
CONFIG_BT_L2CAP=y
|
||||
CONFIG_BT_SCO=y
|
||||
CONFIG_BT_RFCOMM=m
|
||||
CONFIG_BT_RFCOMM_TTY=y
|
||||
CONFIG_BT_BNEP=m
|
||||
@@ -63,7 +59,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
|
||||
CONFIG_BT_HIDP=m
|
||||
CONFIG_BT_HCIBTUSB=m
|
||||
CONFIG_CFG80211=m
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
CONFIG_MAC80211=m
|
||||
CONFIG_MAC80211_RC_PID=y
|
||||
# CONFIG_MAC80211_RC_MINSTREL is not set
|
||||
@@ -181,7 +176,6 @@ CONFIG_DEBUG_INFO=y
|
||||
CONFIG_DEBUG_WRITECOUNT=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_DEBUG_LIST=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_FTRACE is not set
|
||||
CONFIG_DEBUG_STACKOVERFLOW=y
|
||||
CONFIG_CRYPTO_CCM=m
|
||||
|
||||
@@ -29,18 +29,9 @@
|
||||
#define PPC_LLARX(t, a, b, eh) PPC_LDARX(t, a, b, eh)
|
||||
#define PPC_STLCX stringify_in_c(stdcx.)
|
||||
#define PPC_CNTLZL stringify_in_c(cntlzd)
|
||||
#define PPC_MTOCRF(FXM, RS) MTOCRF((FXM), (RS))
|
||||
#define PPC_LR_STKOFF 16
|
||||
#define PPC_MIN_STKFRM 112
|
||||
|
||||
/* Move to CR, single-entry optimized version. Only available
|
||||
* on POWER4 and later.
|
||||
*/
|
||||
#ifdef CONFIG_POWER4_ONLY
|
||||
#define PPC_MTOCRF stringify_in_c(mtocrf)
|
||||
#else
|
||||
#define PPC_MTOCRF stringify_in_c(mtcrf)
|
||||
#endif
|
||||
|
||||
#else /* 32-bit */
|
||||
|
||||
/* operations for longs and pointers */
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* Note: This implementation is limited to a power of 2 number of
|
||||
* threads per core and the same number for each core in the system
|
||||
* (though it would work if some processors had less threads as long
|
||||
* as the CPU numbers are still allocated, just not brought offline).
|
||||
* as the CPU numbers are still allocated, just not brought online).
|
||||
*
|
||||
* However, the API allows for a different implementation in the future
|
||||
* if needed, as long as you only use the functions and not the variables
|
||||
|
||||
@@ -77,8 +77,27 @@
|
||||
#define H_MR_CONDITION -43
|
||||
#define H_NOT_ENOUGH_RESOURCES -44
|
||||
#define H_R_STATE -45
|
||||
#define H_RESCINDEND -46
|
||||
#define H_MULTI_THREADS_ACTIVE -9005
|
||||
#define H_RESCINDED -46
|
||||
#define H_P2 -55
|
||||
#define H_P3 -56
|
||||
#define H_P4 -57
|
||||
#define H_P5 -58
|
||||
#define H_P6 -59
|
||||
#define H_P7 -60
|
||||
#define H_P8 -61
|
||||
#define H_P9 -62
|
||||
#define H_TOO_BIG -64
|
||||
#define H_OVERLAP -68
|
||||
#define H_INTERRUPT -69
|
||||
#define H_BAD_DATA -70
|
||||
#define H_NOT_ACTIVE -71
|
||||
#define H_SG_LIST -72
|
||||
#define H_OP_MODE -73
|
||||
#define H_COP_HW -74
|
||||
#define H_UNSUPPORTED_FLAG_START -256
|
||||
#define H_UNSUPPORTED_FLAG_END -511
|
||||
#define H_MULTI_THREADS_ACTIVE -9005
|
||||
#define H_OUTSTANDING_COP_OPS -9006
|
||||
|
||||
|
||||
/* Long Busy is a condition that can be returned by the firmware
|
||||
@@ -240,6 +259,8 @@
|
||||
#define H_GET_MPP 0x2D4
|
||||
#define H_HOME_NODE_ASSOCIATIVITY 0x2EC
|
||||
#define H_BEST_ENERGY 0x2F4
|
||||
#define H_RANDOM 0x300
|
||||
#define H_COP 0x304
|
||||
#define H_GET_MPP_X 0x314
|
||||
#define MAX_HCALL_OPCODE H_GET_MPP_X
|
||||
|
||||
|
||||
@@ -20,18 +20,16 @@
|
||||
#define _ASM_POWERPC_LPPACA_H
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/* These definitions relate to hypervisors that only exist when using
|
||||
/*
|
||||
* These definitions relate to hypervisors that only exist when using
|
||||
* a server type processor
|
||||
*/
|
||||
#ifdef CONFIG_PPC_BOOK3S
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
// This control block contains the data that is shared between the
|
||||
// hypervisor (PLIC) and the OS.
|
||||
//
|
||||
//
|
||||
//----------------------------------------------------------------------------
|
||||
/*
|
||||
* This control block contains the data that is shared between the
|
||||
* hypervisor and the OS.
|
||||
*/
|
||||
#include <linux/cache.h>
|
||||
#include <linux/threads.h>
|
||||
#include <asm/types.h>
|
||||
@@ -43,123 +41,65 @@
|
||||
*/
|
||||
#define NR_LPPACAS 1
|
||||
|
||||
|
||||
/* The Hypervisor barfs if the lppaca crosses a page boundary. A 1k
|
||||
* alignment is sufficient to prevent this */
|
||||
/*
|
||||
* The Hypervisor barfs if the lppaca crosses a page boundary. A 1k
|
||||
* alignment is sufficient to prevent this
|
||||
*/
|
||||
struct lppaca {
|
||||
//=============================================================================
|
||||
// CACHE_LINE_1 0x0000 - 0x007F Contains read-only data
|
||||
// NOTE: The xDynXyz fields are fields that will be dynamically changed by
|
||||
// PLIC when preparing to bring a processor online or when dispatching a
|
||||
// virtual processor!
|
||||
//=============================================================================
|
||||
u32 desc; // Eye catcher 0xD397D781 x00-x03
|
||||
u16 size; // Size of this struct x04-x05
|
||||
u16 reserved1; // Reserved x06-x07
|
||||
u16 reserved2:14; // Reserved x08-x09
|
||||
u8 shared_proc:1; // Shared processor indicator ...
|
||||
u8 secondary_thread:1; // Secondary thread indicator ...
|
||||
volatile u8 dyn_proc_status:8; // Dynamic Status of this proc x0A-x0A
|
||||
u8 secondary_thread_count; // Secondary thread count x0B-x0B
|
||||
volatile u16 dyn_hv_phys_proc_index;// Dynamic HV Physical Proc Index0C-x0D
|
||||
volatile u16 dyn_hv_log_proc_index;// Dynamic HV Logical Proc Indexx0E-x0F
|
||||
u32 decr_val; // Value for Decr programming x10-x13
|
||||
u32 pmc_val; // Value for PMC regs x14-x17
|
||||
volatile u32 dyn_hw_node_id; // Dynamic Hardware Node id x18-x1B
|
||||
volatile u32 dyn_hw_proc_id; // Dynamic Hardware Proc Id x1C-x1F
|
||||
volatile u32 dyn_pir; // Dynamic ProcIdReg value x20-x23
|
||||
u32 dsei_data; // DSEI data x24-x27
|
||||
u64 sprg3; // SPRG3 value x28-x2F
|
||||
u8 reserved3[40]; // Reserved x30-x57
|
||||
volatile u8 vphn_assoc_counts[8]; // Virtual processor home node
|
||||
// associativity change counters x58-x5F
|
||||
u8 reserved4[32]; // Reserved x60-x7F
|
||||
/* cacheline 1 contains read-only data */
|
||||
|
||||
//=============================================================================
|
||||
// CACHE_LINE_2 0x0080 - 0x00FF Contains local read-write data
|
||||
//=============================================================================
|
||||
// This Dword contains a byte for each type of interrupt that can occur.
|
||||
// The IPI is a count while the others are just a binary 1 or 0.
|
||||
union {
|
||||
u64 any_int;
|
||||
struct {
|
||||
u16 reserved; // Reserved - cleared by #mpasmbl
|
||||
u8 xirr_int; // Indicates xXirrValue is valid or Immed IO
|
||||
u8 ipi_cnt; // IPI Count
|
||||
u8 decr_int; // DECR interrupt occurred
|
||||
u8 pdc_int; // PDC interrupt occurred
|
||||
u8 quantum_int; // Interrupt quantum reached
|
||||
u8 old_plic_deferred_ext_int; // Old PLIC has a deferred XIRR pending
|
||||
} fields;
|
||||
} int_dword;
|
||||
u32 desc; /* Eye catcher 0xD397D781 */
|
||||
u16 size; /* Size of this struct */
|
||||
u16 reserved1;
|
||||
u16 reserved2:14;
|
||||
u8 shared_proc:1; /* Shared processor indicator */
|
||||
u8 secondary_thread:1; /* Secondary thread indicator */
|
||||
u8 reserved3[14];
|
||||
volatile u32 dyn_hw_node_id; /* Dynamic hardware node id */
|
||||
volatile u32 dyn_hw_proc_id; /* Dynamic hardware proc id */
|
||||
u8 reserved4[56];
|
||||
volatile u8 vphn_assoc_counts[8]; /* Virtual processor home node */
|
||||
/* associativity change counters */
|
||||
u8 reserved5[32];
|
||||
|
||||
// Whenever any fields in this Dword are set then PLIC will defer the
|
||||
// processing of external interrupts. Note that PLIC will store the
|
||||
// XIRR directly into the xXirrValue field so that another XIRR will
|
||||
// not be presented until this one clears. The layout of the low
|
||||
// 4-bytes of this Dword is up to SLIC - PLIC just checks whether the
|
||||
// entire Dword is zero or not. A non-zero value in the low order
|
||||
// 2-bytes will result in SLIC being granted the highest thread
|
||||
// priority upon return. A 0 will return to SLIC as medium priority.
|
||||
u64 plic_defer_ints_area; // Entire Dword
|
||||
/* cacheline 2 contains local read-write data */
|
||||
|
||||
// Used to pass the real SRR0/1 from PLIC to SLIC as well as to
|
||||
// pass the target SRR0/1 from SLIC to PLIC on a SetAsrAndRfid.
|
||||
u64 saved_srr0; // Saved SRR0 x10-x17
|
||||
u64 saved_srr1; // Saved SRR1 x18-x1F
|
||||
u8 reserved6[48];
|
||||
u8 cede_latency_hint;
|
||||
u8 reserved7[7];
|
||||
u8 dtl_enable_mask; /* Dispatch Trace Log mask */
|
||||
u8 donate_dedicated_cpu; /* Donate dedicated CPU cycles */
|
||||
u8 fpregs_in_use;
|
||||
u8 pmcregs_in_use;
|
||||
u8 reserved8[28];
|
||||
u64 wait_state_cycles; /* Wait cycles for this proc */
|
||||
u8 reserved9[28];
|
||||
u16 slb_count; /* # of SLBs to maintain */
|
||||
u8 idle; /* Indicate OS is idle */
|
||||
u8 vmxregs_in_use;
|
||||
|
||||
// Used to pass parms from the OS to PLIC for SetAsrAndRfid
|
||||
u64 saved_gpr3; // Saved GPR3 x20-x27
|
||||
u64 saved_gpr4; // Saved GPR4 x28-x2F
|
||||
union {
|
||||
u64 saved_gpr5; /* Saved GPR5 x30-x37 */
|
||||
struct {
|
||||
u8 cede_latency_hint; /* x30 */
|
||||
u8 reserved[7]; /* x31-x36 */
|
||||
} fields;
|
||||
} gpr5_dword;
|
||||
/* cacheline 3 is shared with other processors */
|
||||
|
||||
/*
|
||||
* This is the yield_count. An "odd" value (low bit on) means that
|
||||
* the processor is yielded (either because of an OS yield or a
|
||||
* hypervisor preempt). An even value implies that the processor is
|
||||
* currently executing.
|
||||
* NOTE: This value will ALWAYS be zero for dedicated processors and
|
||||
* will NEVER be zero for shared processors (ie, initialized to a 1).
|
||||
*/
|
||||
volatile u32 yield_count;
|
||||
volatile u32 dispersion_count; /* dispatch changed physical cpu */
|
||||
volatile u64 cmo_faults; /* CMO page fault count */
|
||||
volatile u64 cmo_fault_time; /* CMO page fault time */
|
||||
u8 reserved10[104];
|
||||
|
||||
u8 dtl_enable_mask; // Dispatch Trace Log mask x38-x38
|
||||
u8 donate_dedicated_cpu; // Donate dedicated CPU cycles x39-x39
|
||||
u8 fpregs_in_use; // FP regs in use x3A-x3A
|
||||
u8 pmcregs_in_use; // PMC regs in use x3B-x3B
|
||||
volatile u32 saved_decr; // Saved Decr Value x3C-x3F
|
||||
volatile u64 emulated_time_base;// Emulated TB for this thread x40-x47
|
||||
volatile u64 cur_plic_latency; // Unaccounted PLIC latency x48-x4F
|
||||
u64 tot_plic_latency; // Accumulated PLIC latency x50-x57
|
||||
u64 wait_state_cycles; // Wait cycles for this proc x58-x5F
|
||||
u64 end_of_quantum; // TB at end of quantum x60-x67
|
||||
u64 pdc_saved_sprg1; // Saved SPRG1 for PMC int x68-x6F
|
||||
u64 pdc_saved_srr0; // Saved SRR0 for PMC int x70-x77
|
||||
volatile u32 virtual_decr; // Virtual DECR for shared procsx78-x7B
|
||||
u16 slb_count; // # of SLBs to maintain x7C-x7D
|
||||
u8 idle; // Indicate OS is idle x7E
|
||||
u8 vmxregs_in_use; // VMX registers in use x7F
|
||||
/* cacheline 4-5 */
|
||||
|
||||
|
||||
//=============================================================================
|
||||
// CACHE_LINE_3 0x0100 - 0x017F: This line is shared with other processors
|
||||
//=============================================================================
|
||||
// This is the yield_count. An "odd" value (low bit on) means that
|
||||
// the processor is yielded (either because of an OS yield or a PLIC
|
||||
// preempt). An even value implies that the processor is currently
|
||||
// executing.
|
||||
// NOTE: This value will ALWAYS be zero for dedicated processors and
|
||||
// will NEVER be zero for shared processors (ie, initialized to a 1).
|
||||
volatile u32 yield_count; // PLIC increments each dispatchx00-x03
|
||||
volatile u32 dispersion_count; // dispatch changed phys cpu x04-x07
|
||||
volatile u64 cmo_faults; // CMO page fault count x08-x0F
|
||||
volatile u64 cmo_fault_time; // CMO page fault time x10-x17
|
||||
u8 reserved7[104]; // Reserved x18-x7F
|
||||
|
||||
//=============================================================================
|
||||
// CACHE_LINE_4-5 0x0180 - 0x027F Contains PMC interrupt data
|
||||
//=============================================================================
|
||||
u32 page_ins; // CMO Hint - # page ins by OS x00-x03
|
||||
u8 reserved8[148]; // Reserved x04-x97
|
||||
volatile u64 dtl_idx; // Dispatch Trace Log head idx x98-x9F
|
||||
u8 reserved9[96]; // Reserved xA0-xFF
|
||||
u32 page_ins; /* CMO Hint - # page ins by OS */
|
||||
u8 reserved11[148];
|
||||
volatile u64 dtl_idx; /* Dispatch Trace Log head index */
|
||||
u8 reserved12[96];
|
||||
} __attribute__((__aligned__(0x400)));
|
||||
|
||||
extern struct lppaca lppaca[];
|
||||
@@ -172,13 +112,13 @@ extern struct lppaca lppaca[];
|
||||
* ESID is stored in the lower 64bits, then the VSID.
|
||||
*/
|
||||
struct slb_shadow {
|
||||
u32 persistent; // Number of persistent SLBs x00-x03
|
||||
u32 buffer_length; // Total shadow buffer length x04-x07
|
||||
u64 reserved; // Alignment x08-x0f
|
||||
u32 persistent; /* Number of persistent SLBs */
|
||||
u32 buffer_length; /* Total shadow buffer length */
|
||||
u64 reserved;
|
||||
struct {
|
||||
u64 esid;
|
||||
u64 vsid;
|
||||
} save_area[SLB_NUM_BOLTED]; // x10-x40
|
||||
} save_area[SLB_NUM_BOLTED];
|
||||
} ____cacheline_aligned;
|
||||
|
||||
extern struct slb_shadow slb_shadow[];
|
||||
|
||||
@@ -265,8 +265,8 @@ LV1_CALL(get_spe_irq_outlet, 2, 1, 78 )
|
||||
LV1_CALL(set_spe_privilege_state_area_1_register, 3, 0, 79 )
|
||||
LV1_CALL(create_repository_node, 6, 0, 90 )
|
||||
LV1_CALL(read_repository_node, 5, 2, 91 )
|
||||
LV1_CALL(modify_repository_node_value, 6, 0, 92 )
|
||||
LV1_CALL(remove_repository_node, 4, 0, 93 )
|
||||
LV1_CALL(write_repository_node, 6, 0, 92 )
|
||||
LV1_CALL(delete_repository_node, 4, 0, 93 )
|
||||
LV1_CALL(read_htab_entries, 2, 5, 95 )
|
||||
LV1_CALL(set_dabr, 2, 0, 96 )
|
||||
LV1_CALL(get_total_execution_time, 2, 1, 103 )
|
||||
|
||||
@@ -13,6 +13,18 @@
|
||||
#define PSERIES_RECONFIG_REMOVE 0x0002
|
||||
#define PSERIES_DRCONF_MEM_ADD 0x0003
|
||||
#define PSERIES_DRCONF_MEM_REMOVE 0x0004
|
||||
#define PSERIES_UPDATE_PROPERTY 0x0005
|
||||
|
||||
/**
|
||||
* pSeries_reconfig_notify - Notifier value structure for OFDT property updates
|
||||
*
|
||||
* @node: Device tree node which owns the property being updated
|
||||
* @property: Updated property
|
||||
*/
|
||||
struct pSeries_reconfig_prop_update {
|
||||
struct device_node *node;
|
||||
struct property *property;
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
extern int pSeries_reconfig_notifier_register(struct notifier_block *);
|
||||
|
||||
@@ -369,7 +369,15 @@ BEGIN_FTR_SECTION \
|
||||
END_FTR_SECTION_IFCLR(CPU_FTR_601)
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef CONFIG_PPC64
|
||||
#define MTOCRF(FXM, RS) \
|
||||
BEGIN_FTR_SECTION_NESTED(848); \
|
||||
mtcrf (FXM), (RS); \
|
||||
FTR_SECTION_ELSE_NESTED(848); \
|
||||
mtocrf (FXM), (RS); \
|
||||
ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_NOEXECUTE, 848)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This instruction is not implemented on the PPC 603 or 601; however, on
|
||||
* the 403GCX and 405GP tlbia IS defined and tlbie is not.
|
||||
|
||||
@@ -354,12 +354,6 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,
|
||||
#define PTRACE_GETREGS64 22
|
||||
#define PTRACE_SETREGS64 23
|
||||
|
||||
/* (old) PTRACE requests with inverted arguments */
|
||||
#define PPC_PTRACE_GETREGS 0x99 /* Get GPRs 0 - 31 */
|
||||
#define PPC_PTRACE_SETREGS 0x98 /* Set GPRs 0 - 31 */
|
||||
#define PPC_PTRACE_GETFPREGS 0x97 /* Get FPRs 0 - 31 */
|
||||
#define PPC_PTRACE_SETFPREGS 0x96 /* Set FPRs 0 - 31 */
|
||||
|
||||
/* Calls to trace a 64bit program from a 32bit program */
|
||||
#define PPC_PTRACE_PEEKTEXT_3264 0x95
|
||||
#define PPC_PTRACE_PEEKDATA_3264 0x94
|
||||
|
||||
@@ -21,7 +21,6 @@ extern void disable_kernel_fp(void);
|
||||
extern void enable_kernel_fp(void);
|
||||
extern void flush_fp_to_thread(struct task_struct *);
|
||||
extern void enable_kernel_altivec(void);
|
||||
extern void giveup_altivec(struct task_struct *);
|
||||
extern void load_up_altivec(struct task_struct *);
|
||||
extern int emulate_altivec(struct pt_regs *);
|
||||
extern void __giveup_vsx(struct task_struct *);
|
||||
@@ -40,10 +39,15 @@ static inline void discard_lazy_cpu_state(void)
|
||||
|
||||
#ifdef CONFIG_ALTIVEC
|
||||
extern void flush_altivec_to_thread(struct task_struct *);
|
||||
extern void giveup_altivec(struct task_struct *);
|
||||
extern void giveup_altivec_notask(void);
|
||||
#else
|
||||
static inline void flush_altivec_to_thread(struct task_struct *t)
|
||||
{
|
||||
}
|
||||
static inline void giveup_altivec(struct task_struct *t)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_VSX
|
||||
|
||||
@@ -113,7 +113,6 @@ static inline struct thread_info *current_thread_info(void)
|
||||
#define _TIF_NOERROR (1<<TIF_NOERROR)
|
||||
#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
|
||||
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
|
||||
#define _TIF_RUNLATCH (1<<TIF_RUNLATCH)
|
||||
#define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
|
||||
_TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT)
|
||||
|
||||
|
||||
@@ -46,6 +46,48 @@
|
||||
|
||||
struct iommu_table;
|
||||
|
||||
/*
|
||||
* Platform Facilities Option (PFO)-specific data
|
||||
*/
|
||||
|
||||
/* Starting unit address for PFO devices on the VIO BUS */
|
||||
#define VIO_BASE_PFO_UA 0x50000000
|
||||
|
||||
/**
|
||||
* vio_pfo_op - PFO operation parameters
|
||||
*
|
||||
* @flags: h_call subfunctions and modifiers
|
||||
* @in: Input data block logical real address
|
||||
* @inlen: If non-negative, the length of the input data block. If negative,
|
||||
* the length of the input data descriptor list in bytes.
|
||||
* @out: Output data block logical real address
|
||||
* @outlen: If non-negative, the length of the input data block. If negative,
|
||||
* the length of the input data descriptor list in bytes.
|
||||
* @csbcpb: Logical real address of the 4k naturally-aligned storage block
|
||||
* containing the CSB & optional FC field specific CPB
|
||||
* @timeout: # of milliseconds to retry h_call, 0 for no timeout.
|
||||
* @hcall_err: pointer to return the h_call return value, else NULL
|
||||
*/
|
||||
struct vio_pfo_op {
|
||||
u64 flags;
|
||||
s64 in;
|
||||
s64 inlen;
|
||||
s64 out;
|
||||
s64 outlen;
|
||||
u64 csbcpb;
|
||||
void *done;
|
||||
unsigned long handle;
|
||||
unsigned int timeout;
|
||||
long hcall_err;
|
||||
};
|
||||
|
||||
/* End PFO specific data */
|
||||
|
||||
enum vio_dev_family {
|
||||
VDEVICE, /* The OF node is a child of /vdevice */
|
||||
PFO, /* The OF node is a child of /ibm,platform-facilities */
|
||||
};
|
||||
|
||||
/**
|
||||
* vio_dev - This structure is used to describe virtual I/O devices.
|
||||
*
|
||||
@@ -58,6 +100,7 @@ struct vio_dev {
|
||||
const char *name;
|
||||
const char *type;
|
||||
uint32_t unit_address;
|
||||
uint32_t resource_id;
|
||||
unsigned int irq;
|
||||
struct {
|
||||
size_t desired;
|
||||
@@ -65,6 +108,7 @@ struct vio_dev {
|
||||
size_t allocated;
|
||||
atomic_t allocs_failed;
|
||||
} cmo;
|
||||
enum vio_dev_family family;
|
||||
struct device dev;
|
||||
};
|
||||
|
||||
@@ -95,6 +139,8 @@ extern void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired);
|
||||
|
||||
extern void __devinit vio_unregister_device(struct vio_dev *dev);
|
||||
|
||||
extern int vio_h_cop_sync(struct vio_dev *vdev, struct vio_pfo_op *op);
|
||||
|
||||
struct device_node;
|
||||
|
||||
extern struct vio_dev *vio_register_device_node(
|
||||
|
||||
@@ -188,10 +188,6 @@ int main(void)
|
||||
DEFINE(SLBSHADOW_STACKESID,
|
||||
offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid));
|
||||
DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));
|
||||
DEFINE(LPPACASRR0, offsetof(struct lppaca, saved_srr0));
|
||||
DEFINE(LPPACASRR1, offsetof(struct lppaca, saved_srr1));
|
||||
DEFINE(LPPACAANYINT, offsetof(struct lppaca, int_dword.any_int));
|
||||
DEFINE(LPPACADECRINT, offsetof(struct lppaca, int_dword.fields.decr_int));
|
||||
DEFINE(LPPACA_PMCINUSE, offsetof(struct lppaca, pmcregs_in_use));
|
||||
DEFINE(LPPACA_DTLIDX, offsetof(struct lppaca, dtl_idx));
|
||||
DEFINE(LPPACA_YIELDCOUNT, offsetof(struct lppaca, yield_count));
|
||||
|
||||
@@ -63,15 +63,9 @@ system_call_common:
|
||||
std r0,GPR0(r1)
|
||||
std r10,GPR1(r1)
|
||||
ACCOUNT_CPU_USER_ENTRY(r10, r11)
|
||||
/*
|
||||
* This "crclr so" clears CR0.SO, which is the error indication on
|
||||
* return from this system call. There must be no cmp instruction
|
||||
* between it and the "mfcr r9" below, otherwise if XER.SO is set,
|
||||
* CR0.SO will get set, causing all system calls to appear to fail.
|
||||
*/
|
||||
crclr so
|
||||
std r2,GPR2(r1)
|
||||
std r3,GPR3(r1)
|
||||
mfcr r2
|
||||
std r4,GPR4(r1)
|
||||
std r5,GPR5(r1)
|
||||
std r6,GPR6(r1)
|
||||
@@ -82,18 +76,20 @@ system_call_common:
|
||||
std r11,GPR10(r1)
|
||||
std r11,GPR11(r1)
|
||||
std r11,GPR12(r1)
|
||||
std r11,_XER(r1)
|
||||
std r11,_CTR(r1)
|
||||
std r9,GPR13(r1)
|
||||
mfcr r9
|
||||
mflr r10
|
||||
/*
|
||||
* This clears CR0.SO (bit 28), which is the error indication on
|
||||
* return from this system call.
|
||||
*/
|
||||
rldimi r2,r11,28,(63-28)
|
||||
li r11,0xc01
|
||||
std r9,_CCR(r1)
|
||||
std r10,_LINK(r1)
|
||||
std r11,_TRAP(r1)
|
||||
mfxer r9
|
||||
mfctr r10
|
||||
std r9,_XER(r1)
|
||||
std r10,_CTR(r1)
|
||||
std r3,ORIG_GPR3(r1)
|
||||
std r2,_CCR(r1)
|
||||
ld r2,PACATOC(r13)
|
||||
addi r9,r1,STACK_FRAME_OVERHEAD
|
||||
ld r11,exception_marker@toc(r2)
|
||||
@@ -154,7 +150,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
|
||||
ld r10,TI_FLAGS(r11)
|
||||
andi. r11,r10,_TIF_SYSCALL_T_OR_A
|
||||
bne- syscall_dotrace
|
||||
syscall_dotrace_cont:
|
||||
.Lsyscall_dotrace_cont:
|
||||
cmpldi 0,r0,NR_syscalls
|
||||
bge- syscall_enosys
|
||||
|
||||
@@ -211,7 +207,7 @@ syscall_exit:
|
||||
cmpld r3,r11
|
||||
ld r5,_CCR(r1)
|
||||
bge- syscall_error
|
||||
syscall_error_cont:
|
||||
.Lsyscall_error_cont:
|
||||
ld r7,_NIP(r1)
|
||||
BEGIN_FTR_SECTION
|
||||
stdcx. r0,0,r1 /* to clear the reservation */
|
||||
@@ -246,7 +242,7 @@ syscall_error:
|
||||
oris r5,r5,0x1000 /* Set SO bit in CR */
|
||||
neg r3,r3
|
||||
std r5,_CCR(r1)
|
||||
b syscall_error_cont
|
||||
b .Lsyscall_error_cont
|
||||
|
||||
/* Traced system call support */
|
||||
syscall_dotrace:
|
||||
@@ -268,7 +264,7 @@ syscall_dotrace:
|
||||
addi r9,r1,STACK_FRAME_OVERHEAD
|
||||
clrrdi r10,r1,THREAD_SHIFT
|
||||
ld r10,TI_FLAGS(r10)
|
||||
b syscall_dotrace_cont
|
||||
b .Lsyscall_dotrace_cont
|
||||
|
||||
syscall_enosys:
|
||||
li r3,-ENOSYS
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user