Loading arch/powerpc/include/asm/io.h +7 −13 Original line number Diff line number Diff line Loading @@ -268,19 +268,13 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, * their hooks, a bitfield is reserved for use by the platform near the * top of MMIO addresses (not PIO, those have to cope the hard way). * * This bit field is 12 bits and is at the top of the IO virtual * addresses PCI_IO_INDIRECT_TOKEN_MASK. * The highest address in the kernel virtual space are: * * The kernel virtual space is thus: * d0003fffffffffff # with Hash MMU * c00fffffffffffff # with Radix MMU * * 0xD000000000000000 : vmalloc * 0xD000080000000000 : PCI PHB IO space * 0xD000080080000000 : ioremap * 0xD0000fffffffffff : end of ioremap region * * Since the top 4 bits are reserved as the region ID, we use thus * the next 12 bits and keep 4 bits available for the future if the * virtual address space is ever to be extended. * The top 4 bits are reserved as the region ID on hash, leaving us 8 bits * that can be used for the field. * * The direct IO mapping operations will then mask off those bits * before doing the actual access, though that only happen when Loading @@ -292,8 +286,8 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, */ #ifdef CONFIG_PPC_INDIRECT_MMIO #define PCI_IO_IND_TOKEN_MASK 0x0fff000000000000ul #define PCI_IO_IND_TOKEN_SHIFT 48 #define PCI_IO_IND_TOKEN_SHIFT 52 #define PCI_IO_IND_TOKEN_MASK (0xfful << PCI_IO_IND_TOKEN_SHIFT) #define PCI_FIX_ADDR(addr) \ ((PCI_IO_ADDR)(((unsigned long)(addr)) & ~PCI_IO_IND_TOKEN_MASK)) #define PCI_GET_ADDR_TOKEN(addr) \ Loading arch/powerpc/include/asm/ppc-opcode.h +2 −0 Original line number Diff line number Diff line Loading @@ -493,6 +493,8 @@ __PPC_RS(t) | __PPC_RA0(a) | __PPC_RB(b)) #define PPC_SLBFEE_DOT(t, b) stringify_in_c(.long PPC_INST_SLBFEE | \ __PPC_RT(t) | __PPC_RB(b)) #define __PPC_SLBFEE_DOT(t, b) stringify_in_c(.long PPC_INST_SLBFEE | \ ___PPC_RT(t) | ___PPC_RB(b)) #define PPC_ICBT(c,a,b) stringify_in_c(.long PPC_INST_ICBT | \ __PPC_CT(c) | __PPC_RA0(a) | __PPC_RB(b)) /* PASemi instructions */ Loading arch/powerpc/include/asm/ptrace.h +1 −0 Original line number Diff line number Diff line Loading @@ -54,6 +54,7 @@ struct pt_regs #ifdef CONFIG_PPC64 unsigned long ppr; unsigned long __pad; /* Maintain 16 byte interrupt stack alignment */ #endif }; #endif Loading arch/powerpc/kernel/setup_64.c +2 −0 Original line number Diff line number Diff line Loading @@ -636,6 +636,8 @@ static void *__init alloc_stack(unsigned long limit, int cpu) { unsigned long pa; BUILD_BUG_ON(STACK_INT_FRAME_SIZE % 16); pa = memblock_alloc_base_nid(THREAD_SIZE, THREAD_SIZE, limit, early_cpu_to_node(cpu), MEMBLOCK_NONE); if (!pa) { Loading arch/powerpc/kvm/trace.h +6 −2 Original line number Diff line number Diff line Loading @@ -6,8 +6,6 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM kvm #define TRACE_INCLUDE_PATH . #define TRACE_INCLUDE_FILE trace /* * Tracepoint for guest mode entry. Loading Loading @@ -120,4 +118,10 @@ TRACE_EVENT(kvm_check_requests, #endif /* _TRACE_KVM_H */ /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_PATH . #define TRACE_INCLUDE_FILE trace #include <trace/define_trace.h> Loading
arch/powerpc/include/asm/io.h +7 −13 Original line number Diff line number Diff line Loading @@ -268,19 +268,13 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, * their hooks, a bitfield is reserved for use by the platform near the * top of MMIO addresses (not PIO, those have to cope the hard way). * * This bit field is 12 bits and is at the top of the IO virtual * addresses PCI_IO_INDIRECT_TOKEN_MASK. * The highest address in the kernel virtual space are: * * The kernel virtual space is thus: * d0003fffffffffff # with Hash MMU * c00fffffffffffff # with Radix MMU * * 0xD000000000000000 : vmalloc * 0xD000080000000000 : PCI PHB IO space * 0xD000080080000000 : ioremap * 0xD0000fffffffffff : end of ioremap region * * Since the top 4 bits are reserved as the region ID, we use thus * the next 12 bits and keep 4 bits available for the future if the * virtual address space is ever to be extended. * The top 4 bits are reserved as the region ID on hash, leaving us 8 bits * that can be used for the field. * * The direct IO mapping operations will then mask off those bits * before doing the actual access, though that only happen when Loading @@ -292,8 +286,8 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src, */ #ifdef CONFIG_PPC_INDIRECT_MMIO #define PCI_IO_IND_TOKEN_MASK 0x0fff000000000000ul #define PCI_IO_IND_TOKEN_SHIFT 48 #define PCI_IO_IND_TOKEN_SHIFT 52 #define PCI_IO_IND_TOKEN_MASK (0xfful << PCI_IO_IND_TOKEN_SHIFT) #define PCI_FIX_ADDR(addr) \ ((PCI_IO_ADDR)(((unsigned long)(addr)) & ~PCI_IO_IND_TOKEN_MASK)) #define PCI_GET_ADDR_TOKEN(addr) \ Loading
arch/powerpc/include/asm/ppc-opcode.h +2 −0 Original line number Diff line number Diff line Loading @@ -493,6 +493,8 @@ __PPC_RS(t) | __PPC_RA0(a) | __PPC_RB(b)) #define PPC_SLBFEE_DOT(t, b) stringify_in_c(.long PPC_INST_SLBFEE | \ __PPC_RT(t) | __PPC_RB(b)) #define __PPC_SLBFEE_DOT(t, b) stringify_in_c(.long PPC_INST_SLBFEE | \ ___PPC_RT(t) | ___PPC_RB(b)) #define PPC_ICBT(c,a,b) stringify_in_c(.long PPC_INST_ICBT | \ __PPC_CT(c) | __PPC_RA0(a) | __PPC_RB(b)) /* PASemi instructions */ Loading
arch/powerpc/include/asm/ptrace.h +1 −0 Original line number Diff line number Diff line Loading @@ -54,6 +54,7 @@ struct pt_regs #ifdef CONFIG_PPC64 unsigned long ppr; unsigned long __pad; /* Maintain 16 byte interrupt stack alignment */ #endif }; #endif Loading
arch/powerpc/kernel/setup_64.c +2 −0 Original line number Diff line number Diff line Loading @@ -636,6 +636,8 @@ static void *__init alloc_stack(unsigned long limit, int cpu) { unsigned long pa; BUILD_BUG_ON(STACK_INT_FRAME_SIZE % 16); pa = memblock_alloc_base_nid(THREAD_SIZE, THREAD_SIZE, limit, early_cpu_to_node(cpu), MEMBLOCK_NONE); if (!pa) { Loading
arch/powerpc/kvm/trace.h +6 −2 Original line number Diff line number Diff line Loading @@ -6,8 +6,6 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM kvm #define TRACE_INCLUDE_PATH . #define TRACE_INCLUDE_FILE trace /* * Tracepoint for guest mode entry. Loading Loading @@ -120,4 +118,10 @@ TRACE_EVENT(kvm_check_requests, #endif /* _TRACE_KVM_H */ /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_PATH . #define TRACE_INCLUDE_FILE trace #include <trace/define_trace.h>
