Commit 4645453c authored Dec 14, 2018 by Linus Torvalds

linux

Pull powerpc fixes from Michael Ellerman:
 "One notable fix for our change to split pt_regs between user/kernel,
  we forgot to update BPF to use the user-visible type which was an ABI
  break for BPF programs.

  A slightly ugly but minimal fix to do_syscall_trace_enter() so that we
  use tracehook_report_syscall_entry() properly. We'll rework the code
  in next to avoid the empty if body.

  Seven commits fixing bugs in the new papr_scm (Storage Class Memory)
  driver. The driver was finally able to be tested on the other
  hypervisor which exposed several bugs. The fixes are all fairly
  minimal at least.

  Fix a crash in our MSI code if an MSI-capable device is plugged into a
  non-MSI capable PHB, only seen on older hardware (MPC8378).

  Fix our legacy serial code to look for "stdout-path" since the device
  trees were updated to use that instead of "linux,stdout-path".

  A change to the COFF zImage code to fix booting old powermacs.

  A couple of minor build fixes.

  Thanks to: Benjamin Herrenschmidt, Daniel Axtens, Dmitry V. Levin,
  Elvira Khabirova, Oliver O'Halloran, Paul Mackerras, Radu Rendec, Rob
  Herring, Sandipan Das"

* tag 'powerpc-4.20-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call
  powerpc/mm: Fallback to RAM if the altmap is unusable
  powerpc/papr_scm: Use ibm,unit-guid as the iset cookie
  powerpc/papr_scm: Fix DIMM device registration race
  powerpc/papr_scm: Remove endian conversions
  powerpc/papr_scm: Update DT properties
  powerpc/papr_scm: Fix resource end address
  powerpc/papr_scm: Use depend instead of select
  powerpc/bpf: Fix broken uapi for BPF_PROG_TYPE_PERF_EVENT
  powerpc/boot: Fix build failures with -j 1
  powerpc: Look for "stdout-path" when setting up legacy consoles
  powerpc/msi: Fix NULL pointer access in teardown code
  powerpc/mm: Fix linux page tables build with some configs
  powerpc: Fix COFF zImage booting on old powermacs

parents c19bf74f a225f156

arch/powerpc/boot/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ $(obj)/empty.c:
		$(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S
		$(Q)cp $< $@

		$(obj)/serial.c: $(obj)/autoconf.h
		$(srctree)/$(src)/serial.c: $(obj)/autoconf.h

		$(obj)/autoconf.h: $(obj)/%: $(objtree)/include/generated/%
		$(Q)cp $< $@

arch/powerpc/boot/crt0.S

+3 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		RELA = 7
		RELACOUNT = 0x6ffffff9

		.text
		.data
		/* A procedure descriptor used when booting this as a COFF file.
		* When making COFF, this comes first in the link and we're
		* linked at 0x500000.
		@@ -23,6 +23,8 @@ RELACOUNT = 0x6ffffff9
		.globl _zimage_start_opd
		_zimage_start_opd:
		.long 0x500000, 0, 0, 0
		.text
		b _zimage_start

		#ifdef __powerpc64__
		.balign 8

arch/powerpc/include/asm/perf_event.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@
		#include <asm/ptrace.h>
		#include <asm/reg.h>

		#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs

		/*
		* Overload regs->result to specify whether we should use the MSR (result
		* is zero) or the SIAR (result is non zero).

arch/powerpc/include/uapi/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		# UAPI Header export list
		include include/uapi/asm-generic/Kbuild.asm

		generic-y += bpf_perf_event.h
		generic-y += param.h
		generic-y += poll.h
		generic-y += resource.h

arch/powerpc/include/uapi/asm/bpf_perf_event.h

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
		#define _UAPI__ASM_BPF_PERF_EVENT_H__

		#include <asm/ptrace.h>

		typedef struct user_pt_regs bpf_user_pt_regs_t;

		#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */