Commit 0d95cfa9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc fixes from Michael Ellerman:
 "A bunch of fixes, mostly for existing code and going to stable.

  Our memory hot-unplug path wasn't flushing the cache before removing
  memory. That is a problem now that we are doing memory hotplug on bare
  metal.

  Three fixes for the NPU code that supports devices connected via
  NVLink (ie. GPUs). The main one tweaks the TLB flush algorithm to
  avoid soft lockups for large flushes.

  A fix for our memory error handling where we would loop infinitely,
  returning back to the bad access and hard lockup the CPU.

  Fixes for the OPAL RTC driver, which wasn't handling some error cases
  correctly.

  A fix for a hardlockup in the powernv cpufreq driver.

  And finally two fixes to our smp_send_stop(), required due to a recent
  change to use it on shutdown.

  Thanks to: Alistair Popple, Balbir Singh, Laurentiu Tudor, Mahesh
  Salgaonkar, Mark Hairgrove, Nicholas Piggin, Rashmica Gupta, Shilpasri
  G Bhat"

* tag 'powerpc-4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/kvm/booke: Fix altivec related build break
  powerpc: Fix deadlock with multiple calls to smp_send_stop
  cpufreq: powernv: Fix hardlockup due to synchronous smp_call in timer interrupt
  powerpc: Fix smp_send_stop NMI IPI handling
  rtc: opal: Fix OPAL RTC driver OPAL_BUSY loops
  powerpc/mce: Fix a bug where mce loops on memory UE.
  powerpc/powernv/npu: Do a PID GPU TLB flush when invalidating a large address range
  powerpc/powernv/npu: Prevent overwriting of pnv_npu2_init_contex() callback parameters
  powerpc/powernv/npu: Add lock to prevent race in concurrent context init/destroy
  powerpc/powernv/memtrace: Let the arch hotunplug code flush cache
  powerpc/mm: Flush cache on memory hot(un)plug
parents 46dc111d b2d7ecbe

arch/powerpc/include/asm/powernv.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
extern void powernv_set_nmmu_ptcr(unsigned long ptcr);

extern struct npu_context *pnv_npu2_init_context(struct pci_dev *gpdev,

			unsigned long flags,

			struct npu_context *(*cb)(struct npu_context *, void *),

			void (*cb)(struct npu_context *, void *),

			void *priv);

extern void pnv_npu2_destroy_context(struct npu_context *context,

				struct pci_dev *gpdev);

arch/powerpc/kernel/mce_power.c

+2 −5
Original line number Diff line number Diff line
@@ -441,7 +441,6 @@ static int mce_handle_ierror(struct pt_regs *regs, 
					if (pfn != ULONG_MAX) {

						*phys_addr =

							(pfn << PAGE_SHIFT);

						handled = 1;

					}

				}

			}
@@ -532,9 +531,7 @@ static int mce_handle_derror(struct pt_regs *regs, 
			 * kernel/exception-64s.h

			 */

			if (get_paca()->in_mce < MAX_MCE_DEPTH)

				if (!mce_find_instr_ea_and_pfn(regs, addr,

								phys_addr))

					handled = 1;

				mce_find_instr_ea_and_pfn(regs, addr, phys_addr);

		}

		found = 1;

	}
@@ -572,7 +569,7 @@ static long mce_handle_error(struct pt_regs *regs, 
		const struct mce_ierror_table itable[])

{

	struct mce_error_info mce_err = { 0 };

	uint64_t addr, phys_addr;

	uint64_t addr, phys_addr = ULONG_MAX;

	uint64_t srr1 = regs->msr;

	long handled;

arch/powerpc/kernel/smp.c

+42 −7
Original line number Diff line number Diff line
@@ -566,10 +566,35 @@ void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *)) 
#endif



#ifdef CONFIG_NMI_IPI

static void stop_this_cpu(struct pt_regs *regs)

#else

static void nmi_stop_this_cpu(struct pt_regs *regs)

{

	/*

	 * This is a special case because it never returns, so the NMI IPI

	 * handling would never mark it as done, which makes any later

	 * smp_send_nmi_ipi() call spin forever. Mark it done now.

	 *

	 * IRQs are already hard disabled by the smp_handle_nmi_ipi.

	 */

	nmi_ipi_lock();

	nmi_ipi_busy_count--;

	nmi_ipi_unlock();



	/* Remove this CPU */

	set_cpu_online(smp_processor_id(), false);



	spin_begin();

	while (1)

		spin_cpu_relax();

}



void smp_send_stop(void)

{

	smp_send_nmi_ipi(NMI_IPI_ALL_OTHERS, nmi_stop_this_cpu, 1000000);

}



#else /* CONFIG_NMI_IPI */



static void stop_this_cpu(void *dummy)

#endif

{

	/* Remove this CPU */

	set_cpu_online(smp_processor_id(), false);
@@ -582,12 +607,22 @@ static void stop_this_cpu(void *dummy) 


void smp_send_stop(void)

{

#ifdef CONFIG_NMI_IPI

	smp_send_nmi_ipi(NMI_IPI_ALL_OTHERS, stop_this_cpu, 1000000);

#else

	static bool stopped = false;



	/*

	 * Prevent waiting on csd lock from a previous smp_send_stop.

	 * This is racy, but in general callers try to do the right

	 * thing and only fire off one smp_send_stop (e.g., see

	 * kernel/panic.c)

	 */

	if (stopped)

		return;



	stopped = true;



	smp_call_function(stop_this_cpu, NULL, 0);

#endif

}

#endif /* CONFIG_NMI_IPI */



struct thread_info *current_set[NR_CPUS];

arch/powerpc/kvm/booke.c

+7 −0
Original line number Diff line number Diff line
@@ -305,6 +305,13 @@ void kvmppc_core_queue_fpunavail(struct kvm_vcpu *vcpu) 
	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_FP_UNAVAIL);

}



#ifdef CONFIG_ALTIVEC

void kvmppc_core_queue_vec_unavail(struct kvm_vcpu *vcpu)

{

	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ALTIVEC_UNAVAIL);

}

#endif



void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu)

{

	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DECREMENTER);

arch/powerpc/mm/mem.c

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ int __meminit arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap * 
			start, start + size, rc);

		return -EFAULT;

	}

	flush_inval_dcache_range(start, start + size);



	return __add_pages(nid, start_pfn, nr_pages, altmap, want_memblock);

}
@@ -159,6 +160,7 @@ int __meminit arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap 


	/* Remove htab bolted mappings for this section of memory */

	start = (unsigned long)__va(start);

	flush_inval_dcache_range(start, start + size);

	ret = remove_section_mapping(start, start + size);



	/* Ensure all vmalloc mappings are flushed in case they also

CRA Git | Maintained and supported by SUSTech CRA and CCSE