D17361.id48838.diff
No OneTemporary
Actions

Size

878 B

Referenced Files

None

Subscribers

None

D17361.id48838.diff
View Options

	Index: head/sys/powerpc/pseries/xics.c
	===================================================================
	--- head/sys/powerpc/pseries/xics.c
	+++ head/sys/powerpc/pseries/xics.c
	@@ -381,17 +381,9 @@
	}
	xirr &= 0x00ffffff;

	- if (xirr == 0) { /* No more pending interrupts? */
	- if (regs)
	- bus_write_1(regs, 4, 0xff);
	-#ifdef POWERNV
	- else if (sc->xics_emu)
	- opal_call(OPAL_INT_SET_CPPR, 0xff);
	-#endif
	- else
	- phyp_hcall(H_CPPR, (uint64_t)0xff);
	+ if (xirr == 0) /* No more pending interrupts? */
	break;
	- }
	+
	if (xirr == XICP_IPI) { /* Magic number for IPIs */
	xirr = MAX_XICP_IRQS; /* Map to FreeBSD magic */

	@@ -471,7 +463,7 @@

	if (irq == MAX_XICP_IRQS) /* Remap IPI interrupt to internal value */
	irq = XICP_IPI;
	- xirr = irq \| (XICP_PRIORITY << 24);
	+ xirr = irq \| (0xff << 24);

	#ifdef POWERNV
	if (mfmsr() & PSL_HV) {