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

Merge tag 'powerpc-5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Some more powerpc fixes for 5.6. This is two weeks worth as I was out
  sick last week:

   - Three fixes for the recently added VMAP_STACK on 32-bit.

   - Three fixes related to hugepages on 8xx (32-bit).

   - A fix for a bug in our transactional memory handling that could
     lead to a kernel crash if we saw a page fault during signal
     delivery.

   - A fix for a deadlock in our PCI EEH (Enhanced Error Handling) code.

   - A couple of other minor fixes.

  Thanks to: Christophe Leroy, Erhard F, Frederic Barrat, Gustavo Luiz
  Duarte, Larry Finger, Leonardo Bras, Oliver O'Halloran, Sam Bobroff"

* tag 'powerpc-5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S
  powerpc/xmon: Fix whitespace handling in getstring()
  powerpc/6xx: Fix power_save_ppc32_restore() with CONFIG_VMAP_STACK
  powerpc/chrp: Fix enter_rtas() with CONFIG_VMAP_STACK
  powerpc/32s: Fix DSI and ISI exceptions for CONFIG_VMAP_STACK
  powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery
  powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
  powerpc/hugetlb: Fix 8M hugepages on 8xx
  powerpc/hugetlb: Fix 512k hugepages on 8xx with 16k page size
  powerpc/eeh: Fix deadlock handling dead PHB
parents 0c0ddd6a 9eb425b2

arch/powerpc/include/asm/page.h

+5 −0
Original line number Diff line number Diff line
@@ -295,8 +295,13 @@ static inline bool pfn_valid(unsigned long pfn) 
/*

 * Some number of bits at the level of the page table that points to

 * a hugepte are used to encode the size.  This masks those bits.

 * On 8xx, HW assistance requires 4k alignment for the hugepte.

 */

#ifdef CONFIG_PPC_8xx

#define HUGEPD_SHIFT_MASK     0xfff

#else

#define HUGEPD_SHIFT_MASK     0x3f

#endif



#ifndef __ASSEMBLY__

arch/powerpc/include/asm/processor.h

+4 −0
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ struct thread_struct { 
	unsigned long	srr1;

	unsigned long	dar;

	unsigned long	dsisr;

#ifdef CONFIG_PPC_BOOK3S_32

	unsigned long	r0, r3, r4, r5, r6, r8, r9, r11;

	unsigned long	lr, ctr;

#endif

#endif

	/* Debug Registers */

	struct debug_reg debug;

arch/powerpc/kernel/asm-offsets.c

+12 −0
Original line number Diff line number Diff line
@@ -132,6 +132,18 @@ int main(void) 
	OFFSET(SRR1, thread_struct, srr1);

	OFFSET(DAR, thread_struct, dar);

	OFFSET(DSISR, thread_struct, dsisr);

#ifdef CONFIG_PPC_BOOK3S_32

	OFFSET(THR0, thread_struct, r0);

	OFFSET(THR3, thread_struct, r3);

	OFFSET(THR4, thread_struct, r4);

	OFFSET(THR5, thread_struct, r5);

	OFFSET(THR6, thread_struct, r6);

	OFFSET(THR8, thread_struct, r8);

	OFFSET(THR9, thread_struct, r9);

	OFFSET(THR11, thread_struct, r11);

	OFFSET(THLR, thread_struct, lr);

	OFFSET(THCTR, thread_struct, ctr);

#endif

#endif

#ifdef CONFIG_SPE

	OFFSET(THREAD_EVR0, thread_struct, evr[0]);

arch/powerpc/kernel/eeh_driver.c

+11 −10
Original line number Diff line number Diff line
@@ -1184,14 +1184,6 @@ void eeh_handle_special_event(void) 
			eeh_pe_state_mark(pe, EEH_PE_RECOVERING);

			eeh_handle_normal_event(pe);

		} else {

			pci_lock_rescan_remove();

			list_for_each_entry(hose, &hose_list, list_node) {

				phb_pe = eeh_phb_pe_get(hose);

				if (!phb_pe ||

				    !(phb_pe->state & EEH_PE_ISOLATED) ||

				    (phb_pe->state & EEH_PE_RECOVERING))

					continue;



			eeh_for_each_pe(pe, tmp_pe)

				eeh_pe_for_each_dev(tmp_pe, edev, tmp_edev)

					edev->mode &= ~EEH_DEV_NO_HANDLER;
@@ -1202,6 +1194,15 @@ void eeh_handle_special_event(void) 
			eeh_pe_report(

				"error_detected(permanent failure)", pe,

				eeh_report_failure, NULL);



			pci_lock_rescan_remove();

			list_for_each_entry(hose, &hose_list, list_node) {

				phb_pe = eeh_phb_pe_get(hose);

				if (!phb_pe ||

				    !(phb_pe->state & EEH_PE_ISOLATED) ||

				    (phb_pe->state & EEH_PE_RECOVERING))

					continue;



				bus = eeh_pe_bus_get(phb_pe);

				if (!bus) {

					pr_err("%s: Cannot find PCI bus for "

arch/powerpc/kernel/entry_32.S

+9 −4
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ fast_exception_return: 
1:	lis	r3,exc_exit_restart_end@ha

	addi	r3,r3,exc_exit_restart_end@l

	cmplw	r12,r3

#if CONFIG_PPC_BOOK3S_601

#ifdef CONFIG_PPC_BOOK3S_601

	bge	2b

#else

	bge	3f
@@ -791,7 +791,7 @@ fast_exception_return: 
	lis	r4,exc_exit_restart@ha

	addi	r4,r4,exc_exit_restart@l

	cmplw	r12,r4

#if CONFIG_PPC_BOOK3S_601

#ifdef CONFIG_PPC_BOOK3S_601

	blt	2b

#else

	blt	3f
@@ -1354,12 +1354,17 @@ _GLOBAL(enter_rtas) 
	mtspr	SPRN_SRR0,r8

	mtspr	SPRN_SRR1,r9

	RFI

1:	tophys(r9,r1)

1:	tophys_novmstack r9, r1

#ifdef CONFIG_VMAP_STACK

	li	r0, MSR_KERNEL & ~MSR_IR	/* can take DTLB miss */

	mtmsr	r0

	isync

#endif

	lwz	r8,INT_FRAME_SIZE+4(r9)	/* get return address */

	lwz	r9,8(r9)	/* original msr value */

	addi	r1,r1,INT_FRAME_SIZE

	li	r0,0

	tophys(r7, r2)

	tophys_novmstack r7, r2

	stw	r0, THREAD + RTAS_SP(r7)

	mtspr	SPRN_SRR0,r8

	mtspr	SPRN_SRR1,r9

CRA Git | Maintained and supported by SUSTech CRA and CCSE