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

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

Pull powerpc fixes from Michael Ellerman:
 - Re-enable CONFIG_SCSI_DH in our defconfigs
 - Remove unused os_area_db_id_video_mode
 - cxl: fix leak of IRQ names in cxl_free_afu_irqs() from Andrew
 - cxl: fix leak of ctx->irq_bitmap when releasing context via kernel API from Andrew
 - cxl: fix leak of ctx->mapping when releasing kernel API contexts from Andrew
 - cxl: Workaround malformed pcie packets on some cards from Philippe
 - cxl: Fix number of allocated pages in SPA from Christophe Lombard
 - Fix checkstop in native_hpte_clear() with lockdep from Cyril
 - Panic on unhandled Machine Check on powernv from Daniel
 - selftests/powerpc: Fix build failure of load_unaligned_zeropad test

* tag 'powerpc-4.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  selftests/powerpc: Fix build failure of load_unaligned_zeropad test
  powerpc/powernv: Panic on unhandled Machine Check
  powerpc: Fix checkstop in native_hpte_clear() with lockdep
  cxl: Fix number of allocated pages in SPA
  cxl: Workaround malformed pcie packets on some cards
  cxl: fix leak of ctx->mapping when releasing kernel API contexts
  cxl: fix leak of ctx->irq_bitmap when releasing context via kernel API
  cxl: fix leak of IRQ names in cxl_free_afu_irqs()
  powerpc/ps3: Remove unused os_area_db_id_video_mode
  powerpc/configs: Re-enable CONFIG_SCSI_DH
parents 3d875182 abb39bc7

arch/powerpc/configs/ppc64_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ CONFIG_SCSI_QLA_FC=m 
CONFIG_SCSI_QLA_ISCSI=m

CONFIG_SCSI_LPFC=m

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH=y

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_ALUA=m

CONFIG_ATA=y

arch/powerpc/configs/pseries_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ CONFIG_SCSI_QLA_FC=m 
CONFIG_SCSI_QLA_ISCSI=m

CONFIG_SCSI_LPFC=m

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH=y

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_ALUA=m

CONFIG_ATA=y

arch/powerpc/include/asm/machdep.h

+7 −2
Original line number Diff line number Diff line
@@ -61,8 +61,13 @@ struct machdep_calls { 
					       unsigned long addr,

					       unsigned char *hpte_slot_array,

					       int psize, int ssize, int local);

	/* special for kexec, to be called in real mode, linear mapping is

	 * destroyed as well */

	/*

	 * Special for kexec.

	 * To be called in real mode with interrupts disabled. No locks are

	 * taken as such, concurrent access on pre POWER5 hardware could result

	 * in a deadlock.

	 * The linear mapping is destroyed as well.

	 */

	void		(*hpte_clear_all)(void);



	void __iomem *	(*ioremap)(phys_addr_t addr, unsigned long size,

arch/powerpc/mm/hash_native_64.c

+11 −12
Original line number Diff line number Diff line
@@ -582,13 +582,21 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot, 
 * be when they isi), and we are the only one left.  We rely on our kernel

 * mapping being 0xC0's and the hardware ignoring those two real bits.

 *

 * This must be called with interrupts disabled.

 *

 * Taking the native_tlbie_lock is unsafe here due to the possibility of

 * lockdep being on. On pre POWER5 hardware, not taking the lock could

 * cause deadlock. POWER5 and newer not taking the lock is fine. This only

 * gets called during boot before secondary CPUs have come up and during

 * crashdump and all bets are off anyway.

 *

 * TODO: add batching support when enabled.  remember, no dynamic memory here,

 * athough there is the control page available...

 */

static void native_hpte_clear(void)

{

	unsigned long vpn = 0;

	unsigned long slot, slots, flags;

	unsigned long slot, slots;

	struct hash_pte *hptep = htab_address;

	unsigned long hpte_v;

	unsigned long pteg_count;
@@ -596,13 +604,6 @@ static void native_hpte_clear(void) 


	pteg_count = htab_hash_mask + 1;



	local_irq_save(flags);



	/* we take the tlbie lock and hold it.  Some hardware will

	 * deadlock if we try to tlbie from two processors at once.

	 */

	raw_spin_lock(&native_tlbie_lock);



	slots = pteg_count * HPTES_PER_GROUP;



	for (slot = 0; slot < slots; slot++, hptep++) {
@@ -614,8 +615,8 @@ static void native_hpte_clear(void) 
		hpte_v = be64_to_cpu(hptep->v);



		/*

		 * Call __tlbie() here rather than tlbie() since we

		 * already hold the native_tlbie_lock.

		 * Call __tlbie() here rather than tlbie() since we can't take the

		 * native_tlbie_lock.

		 */

		if (hpte_v & HPTE_V_VALID) {

			hpte_decode(hptep, slot, &psize, &apsize, &ssize, &vpn);
@@ -625,8 +626,6 @@ static void native_hpte_clear(void) 
	}



	asm volatile("eieio; tlbsync; ptesync":::"memory");

	raw_spin_unlock(&native_tlbie_lock);

	local_irq_restore(flags);

}



/*

arch/powerpc/platforms/powernv/opal.c

+5 −2
Original line number Diff line number Diff line
@@ -487,9 +487,12 @@ int opal_machine_check(struct pt_regs *regs) 
	 *    PRD component would have already got notified about this

	 *    error through other channels.

	 *

	 * In any case, let us just fall through. We anyway heading

	 * down to panic path.

	 * If hardware marked this as an unrecoverable MCE, we are

	 * going to panic anyway. Even if it didn't, it's not safe to

	 * continue at this point, so we should explicitly panic.

	 */



	panic("PowerNV Unrecovered Machine Check");

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE