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

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

Merge tag 'powerpc-4.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 "One notable fix for kexec on Power9, where we were not clearing MMU
  PID properly which sometimes leads to hangs. Finally debugged to a
  root cause by Nick.

  A revert of a patch which tried to rework our panic handling to get
  more output on the console, but inadvertently broke reporting the
  panic to the hypervisor, which apparently people care about.

  Then a fix for an oops in the PMU code, and finally some s/%p/%px/ in
  xmon.

  Thanks to: David Gibson, Nicholas Piggin, Ravi Bangoria"

* tag 'powerpc-4.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/xmon: Don't print hashed pointers in xmon
  powerpc/64s: Initialize ISAv3 MMU registers before setting partition table
  Revert "powerpc: Do not call ppc_md.panic in fadump panic notifier"
  powerpc/perf: Fix oops when grouping different pmu events
parents c6b3e969 d8104182

arch/powerpc/include/asm/machdep.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct machdep_calls { 


	void __noreturn	(*restart)(char *cmd);

	void __noreturn (*halt)(void);

	void		(*panic)(char *str);

	void		(*cpu_die)(void);



	long		(*time_init)(void); /* Optional, may be NULL */

arch/powerpc/include/asm/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ extern void reloc_got2(unsigned long); 


void check_for_initrd(void);

void initmem_init(void);

void setup_panic(void);

#define ARCH_PANIC_TIMEOUT 180



#ifdef CONFIG_PPC_PSERIES

arch/powerpc/kernel/cpu_setup_power.S

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ _GLOBAL(__setup_cpu_power9) 
	li	r0,0

	mtspr	SPRN_PSSCR,r0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PID,r0

	mfspr	r3,SPRN_LPCR

	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE  | LPCR_HEIC)

	or	r3, r3, r4
@@ -126,6 +127,7 @@ _GLOBAL(__restore_cpu_power9) 
	li	r0,0

	mtspr	SPRN_PSSCR,r0

	mtspr	SPRN_LPID,r0

	mtspr	SPRN_PID,r0

	mfspr   r3,SPRN_LPCR

	LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE | LPCR_HEIC)

	or	r3, r3, r4

arch/powerpc/kernel/fadump.c

+0 −22
Original line number Diff line number Diff line
@@ -1462,25 +1462,6 @@ static void fadump_init_files(void) 
	return;

}



static int fadump_panic_event(struct notifier_block *this,

			      unsigned long event, void *ptr)

{

	/*

	 * If firmware-assisted dump has been registered then trigger

	 * firmware-assisted dump and let firmware handle everything

	 * else. If this returns, then fadump was not registered, so

	 * go through the rest of the panic path.

	 */

	crash_fadump(NULL, ptr);



	return NOTIFY_DONE;

}



static struct notifier_block fadump_panic_block = {

	.notifier_call = fadump_panic_event,

	.priority = INT_MIN /* may not return; must be done last */

};



/*

 * Prepare for firmware-assisted dump.

 */
@@ -1513,9 +1494,6 @@ int __init setup_fadump(void) 
		init_fadump_mem_struct(&fdm, fw_dump.reserve_dump_area_start);

	fadump_init_files();



	atomic_notifier_chain_register(&panic_notifier_list,

					&fadump_panic_block);



	return 1;

}

subsys_initcall(setup_fadump);

arch/powerpc/kernel/setup-common.c

+27 −0
Original line number Diff line number Diff line
@@ -704,6 +704,30 @@ int check_legacy_ioport(unsigned long base_port) 
}

EXPORT_SYMBOL(check_legacy_ioport);



static int ppc_panic_event(struct notifier_block *this,

                             unsigned long event, void *ptr)

{

	/*

	 * If firmware-assisted dump has been registered then trigger

	 * firmware-assisted dump and let firmware handle everything else.

	 */

	crash_fadump(NULL, ptr);

	ppc_md.panic(ptr);  /* May not return */

	return NOTIFY_DONE;

}



static struct notifier_block ppc_panic_block = {

	.notifier_call = ppc_panic_event,

	.priority = INT_MIN /* may not return; must be done last */

};



void __init setup_panic(void)

{

	if (!ppc_md.panic)

		return;

	atomic_notifier_chain_register(&panic_notifier_list, &ppc_panic_block);

}



#ifdef CONFIG_CHECK_CACHE_COHERENCY

/*

 * For platforms that have configurable cache-coherency.  This function
@@ -848,6 +872,9 @@ void __init setup_arch(char **cmdline_p) 
	/* Probe the machine type, establish ppc_md. */

	probe_machine();



	/* Setup panic notifier if requested by the platform. */

	setup_panic();



	/*

	 * Configure ppc_md.power_save (ppc32 only, 64-bit machines do

	 * it from their respective probe() function.