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

Commit f94def76 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Ben Herrenschmidt:
 "Here are a few more powerpc fixes for 3.14.

  Most of these are also CC'ed to stable and fix bugs in new
  functionality introduced in the last 2 or 3 versions"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/powernv: Fix indirect XSCOM unmangling
  powerpc/powernv: Fix opal_xscom_{read,write} prototype
  powerpc/powernv: Refactor PHB diag-data dump
  powerpc/powernv: Dump PHB diag-data immediately
  powerpc: Increase stack redzone for 64-bit userspace to 512 bytes
  powerpc/ftrace: bugfix for test_24bit_addr
  powerpc/crashdump : Fix page frame number check in copy_oldmem_page
  powerpc/le: Ensure that the 'stop-self' RTAS token is handled correctly
parents 86c7654f e0cf9576

arch/powerpc/include/asm/compat.h

+3 −2
Original line number Diff line number Diff line
@@ -200,10 +200,11 @@ static inline void __user *arch_compat_alloc_user_space(long len) 


	/*

	 * We can't access below the stack pointer in the 32bit ABI and

	 * can access 288 bytes in the 64bit ABI

	 * can access 288 bytes in the 64bit big-endian ABI,

	 * or 512 bytes with the new ELFv2 little-endian ABI.

	 */

	if (!is_32bit_task())

		usp -= 288;

		usp -= USER_REDZONE_SIZE;



	return (void __user *) (usp - len);

}

arch/powerpc/include/asm/opal.h

+2 −2
Original line number Diff line number Diff line
@@ -816,8 +816,8 @@ int64_t opal_pci_next_error(uint64_t phb_id, uint64_t *first_frozen_pe, 
int64_t opal_pci_poll(uint64_t phb_id);

int64_t opal_return_cpu(void);



int64_t opal_xscom_read(uint32_t gcid, uint32_t pcb_addr, __be64 *val);

int64_t opal_xscom_write(uint32_t gcid, uint32_t pcb_addr, uint64_t val);

int64_t opal_xscom_read(uint32_t gcid, uint64_t pcb_addr, __be64 *val);

int64_t opal_xscom_write(uint32_t gcid, uint64_t pcb_addr, uint64_t val);



int64_t opal_lpc_write(uint32_t chip_id, enum OpalLPCAddressType addr_type,

		       uint32_t addr, uint32_t data, uint32_t sz);

arch/powerpc/include/asm/ptrace.h

+15 −1
Original line number Diff line number Diff line
@@ -28,11 +28,23 @@ 


#ifdef __powerpc64__



/*

 * Size of redzone that userspace is allowed to use below the stack

 * pointer.  This is 288 in the 64-bit big-endian ELF ABI, and 512 in

 * the new ELFv2 little-endian ABI, so we allow the larger amount.

 *

 * For kernel code we allow a 288-byte redzone, in order to conserve

 * kernel stack space; gcc currently only uses 288 bytes, and will

 * hopefully allow explicit control of the redzone size in future.

 */

#define USER_REDZONE_SIZE	512

#define KERNEL_REDZONE_SIZE	288



#define STACK_FRAME_OVERHEAD	112	/* size of minimum stack frame */

#define STACK_FRAME_LR_SAVE	2	/* Location of LR in stack frame */

#define STACK_FRAME_REGS_MARKER	ASM_CONST(0x7265677368657265)

#define STACK_INT_FRAME_SIZE	(sizeof(struct pt_regs) + \

					STACK_FRAME_OVERHEAD + 288)

				 STACK_FRAME_OVERHEAD + KERNEL_REDZONE_SIZE)

#define STACK_FRAME_MARKER	12



/* Size of dummy stack frame allocated when calling signal handler. */
@@ -41,6 +53,8 @@ 


#else /* __powerpc64__ */



#define USER_REDZONE_SIZE	0

#define KERNEL_REDZONE_SIZE	0

#define STACK_FRAME_OVERHEAD	16	/* size of minimum stack frame */

#define STACK_FRAME_LR_SAVE	1	/* Location of LR in stack frame */

#define STACK_FRAME_REGS_MARKER	ASM_CONST(0x72656773)

arch/powerpc/kernel/crash_dump.c

+5 −3
Original line number Diff line number Diff line
@@ -98,17 +98,19 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, 
			size_t csize, unsigned long offset, int userbuf)

{

	void  *vaddr;

	phys_addr_t paddr;



	if (!csize)

		return 0;



	csize = min_t(size_t, csize, PAGE_SIZE);

	paddr = pfn << PAGE_SHIFT;



	if ((min_low_pfn < pfn) && (pfn < max_pfn)) {

		vaddr = __va(pfn << PAGE_SHIFT);

	if (memblock_is_region_memory(paddr, csize)) {

		vaddr = __va(paddr);

		csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);

	} else {

		vaddr = __ioremap(pfn << PAGE_SHIFT, PAGE_SIZE, 0);

		vaddr = __ioremap(paddr, PAGE_SIZE, 0);

		csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);

		iounmap(vaddr);

	}

arch/powerpc/kernel/ftrace.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ ftrace_modify_code(unsigned long ip, unsigned int old, unsigned int new) 
 */

static int test_24bit_addr(unsigned long ip, unsigned long addr)

{

	addr = ppc_function_entry((void *)addr);



	/* use the create_branch to verify that this offset can be branched */

	return create_branch((unsigned int *)ip, addr, 0);