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

Commit 3cdeb9d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 - opal-prd mmap fix from Vaidy
 - set kernel taint for MCEs from Daniel
 - alignment exception description from Anton
 - ppc4xx_hsta_msi build fix from Daniel
 - opal-elog interrupt fix from Alistair
 - core_idle_state race fix from Shreyas
 - hv-24x7 lockdep fix from Sukadev
 - multiple cxl fixes from Daniel, Ian, Mikey & Maninder
 - update MAINTAINERS to point at shared tree

* tag 'powerpc-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  cxl: Check if afu is not null in cxl_slbia
  powerpc: Update MAINTAINERS to point at shared tree
  powerpc/perf/24x7: Fix lockdep warning
  cxl: Fix off by one error allowing subsequent mmap page to be accessed
  cxl: Fail mmap if requested mapping is larger than assigned problem state area
  cxl: Fix refcounting in kernel API
  powerpc/powernv: Fix race in updating core_idle_state
  powerpc/powernv: Fix opal-elog interrupt handler
  powerpc/ppc4xx_hsta_msi: Include ppc-pci.h to fix reference to hose_list
  powerpc: Add plain English description for alignment exception oopses
  cxl: Test the correct mmio space before unmapping
  powerpc: Set the correct kernel taint on machine check errors
  cxl/vphb.c: Use phb pointer after NULL check
  powerpc/powernv: Fix vma page prot flags in opal-prd driver
parents c4b5fd3f 2c069a11

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6173,7 +6173,7 @@ M: Michael Ellerman <mpe@ellerman.id.au> 
W:	http://www.penguinppc.org/

L:	linuxppc-dev@lists.ozlabs.org

Q:	http://patchwork.ozlabs.org/project/linuxppc-dev/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git

S:	Supported

F:	Documentation/powerpc/

F:	arch/powerpc/

arch/powerpc/kernel/idle_power7.S

+21 −10
Original line number Diff line number Diff line
@@ -51,6 +51,22 @@ 


	.text



/*

 * Used by threads when the lock bit of core_idle_state is set.

 * Threads will spin in HMT_LOW until the lock bit is cleared.

 * r14 - pointer to core_idle_state

 * r15 - used to load contents of core_idle_state

 */



core_idle_lock_held:

	HMT_LOW

3:	lwz	r15,0(r14)

	andi.   r15,r15,PNV_CORE_IDLE_LOCK_BIT

	bne	3b

	HMT_MEDIUM

	lwarx	r15,0,r14

	blr



/*

 * Pass requested state in r3:

 *	r3 - PNV_THREAD_NAP/SLEEP/WINKLE
@@ -150,6 +166,10 @@ power7_enter_nap_mode: 
	ld	r14,PACA_CORE_IDLE_STATE_PTR(r13)

lwarx_loop1:

	lwarx	r15,0,r14



	andi.   r9,r15,PNV_CORE_IDLE_LOCK_BIT

	bnel	core_idle_lock_held



	andc	r15,r15,r7			/* Clear thread bit */



	andi.	r15,r15,PNV_CORE_IDLE_THREAD_BITS
@@ -294,7 +314,7 @@ lwarx_loop2: 
	 * workaround undo code or resyncing timebase or restoring context

	 * In either case loop until the lock bit is cleared.

	 */

	bne	core_idle_lock_held

	bnel	core_idle_lock_held



	cmpwi	cr2,r15,0

	lbz	r4,PACA_SUBCORE_SIBLING_MASK(r13)
@@ -319,15 +339,6 @@ lwarx_loop2: 
	isync

	b	common_exit



core_idle_lock_held:

	HMT_LOW

core_idle_lock_loop:

	lwz	r15,0(14)

	andi.   r9,r15,PNV_CORE_IDLE_LOCK_BIT

	bne	core_idle_lock_loop

	HMT_MEDIUM

	b	lwarx_loop2



first_thread_in_subcore:

	/* First thread in subcore to wakeup */

	ori	r15,r15,PNV_CORE_IDLE_LOCK_BIT

arch/powerpc/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ long machine_check_early(struct pt_regs *regs) 


	__this_cpu_inc(irq_stat.mce_exceptions);



	add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);



	if (cur_cpu_spec && cur_cpu_spec->machine_check_early)

		handled = cur_cpu_spec->machine_check_early(regs);

	return handled;

arch/powerpc/mm/fault.c

+4 −0
Original line number Diff line number Diff line
@@ -529,6 +529,10 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) 
		printk(KERN_ALERT "Unable to handle kernel paging request for "

			"instruction fetch\n");

		break;

	case 0x600:

		printk(KERN_ALERT "Unable to handle kernel paging request for "

			"unaligned access at address 0x%08lx\n", regs->dar);

		break;

	default:

		printk(KERN_ALERT "Unable to handle kernel paging request for "

			"unknown fault\n");

arch/powerpc/perf/hv-24x7.c

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ static struct attribute *device_str_attr_create_(char *name, char *str) 
	if (!attr)

		return NULL;



	sysfs_attr_init(&attr->attr.attr);



	attr->var = str;

	attr->attr.attr.name = name;

	attr->attr.attr.mode = 0444;