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

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

Merge tag 'powerpc-4.9-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Four fixes, the first for code we merged this cycle and three that are
  also going to stable:

   - On 64-bit Book3E we were not placing the .text section where we
     said we would in the asm.

   - We broke building the boot wrapper on some 32-bit toolchains.

   - Lazy icache flushing was broken on pre-POWER5 machines.

   - One of the error paths in our EEH code would lead to a deadlock.

  Thanks to: Andrew Donnellan, Ben Hutchings, Benjamin Herrenschmidt,
  Nicholas Piggin"

* tag 'powerpc-4.9-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64: Fix placement of .text to be immediately following .head.text
  powerpc/eeh: Fix deadlock when PE frozen state can't be cleared
  powerpc/mm: Fix lazy icache flush on pre-POWER5
  powerpc/boot: Fix build failure in 32-bit boot wrapper
parents ef3263e3 dadc4a1b

arch/powerpc/boot/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ src-wlib-y := string.S crt0.S crtsavres.S stdio.c decompress.c main.c \ 
		ns16550.c serial.c simple_alloc.c div64.S util.S \

		elf_util.c $(zlib-y) devtree.c stdlib.c \

		oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \

		uartlite.c mpc52xx-psc.c opal.c opal-calls.S

		uartlite.c mpc52xx-psc.c opal.c

src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) +=  opal-calls.S

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

arch/powerpc/boot/opal.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <libfdt.h>

#include "../include/asm/opal-api.h"



#ifdef __powerpc64__

#ifdef CONFIG_PPC64_BOOT_WRAPPER



/* Global OPAL struct used by opal-call.S */

struct opal {

arch/powerpc/kernel/eeh_driver.c

+3 −1
Original line number Diff line number Diff line
@@ -671,8 +671,10 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, 


	/* Clear frozen state */

	rc = eeh_clear_pe_frozen_state(pe, false);

	if (rc)

	if (rc) {

		pci_unlock_rescan_remove();

		return rc;

	}



	/* Give the system 5 seconds to finish running the user-space

	 * hotplug shutdown scripts, e.g. ifdown for ethernet.  Yes,

arch/powerpc/kernel/vmlinux.lds.S

+9 −0
Original line number Diff line number Diff line
@@ -94,8 +94,17 @@ SECTIONS 
	 * detected, and will result in a crash at boot due to offsets being

	 * wrong.

	 */

#ifdef CONFIG_PPC64

	/*

	 * BLOCK(0) overrides the default output section alignment because

	 * this needs to start right after .head.text in order for fixed

	 * section placement to work.

	 */

	.text BLOCK(0) : AT(ADDR(.text) - LOAD_OFFSET) {

#else

	.text : AT(ADDR(.text) - LOAD_OFFSET) {

		ALIGN_FUNCTION();

#endif

		/* careful! __ftr_alt_* sections need to be close to .text */

		*(.text .fixup __ftr_alt_* .ref.text)

		SCHED_TEXT

arch/powerpc/mm/hash64_4k.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid, 
	 */

	rflags = htab_convert_pte_flags(new_pte);



	if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&

	if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&

	    !cpu_has_feature(CPU_FTR_COHERENT_ICACHE))

		rflags = hash_page_do_lazy_icache(rflags, __pte(old_pte), trap);