6 files changed, 18 insertions, 6 deletions

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index eae2dc8bc218..9d47f2efa830 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -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
diff --git a/arch/powerpc/boot/opal.c b/arch/powerpc/boot/opal.c
index d7b4fd47eb44..0272570d02de 100644
--- a/arch/powerpc/boot/opal.c
+++ b/arch/powerpc/boot/opal.c
@@ -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 {
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index a62be72da274..5c31369435f2 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -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,
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 8295f51c1a5f..7394b770ae1f 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -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
diff --git a/arch/powerpc/mm/hash64_4k.c b/arch/powerpc/mm/hash64_4k.c
index 42c702b3be1f..6fa450c12d6d 100644
--- a/arch/powerpc/mm/hash64_4k.c
+++ b/arch/powerpc/mm/hash64_4k.c
@@ -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);
 
diff --git a/arch/powerpc/mm/hash64_64k.c b/arch/powerpc/mm/hash64_64k.c
index 3bbbea07378c..1a68cb19b0e3 100644
--- a/arch/powerpc/mm/hash64_64k.c
+++ b/arch/powerpc/mm/hash64_64k.c
@@ -87,7 +87,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
         subpg_pte = new_pte & ~subpg_prot;
         rflags = htab_convert_pte_flags(subpg_pte);
 
-        if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&
+        if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
             !cpu_has_feature(CPU_FTR_COHERENT_ICACHE)) {
 
                 /*
@@ -258,7 +258,7 @@ int __hash_page_64K(unsigned long ea, unsigned long access,
 
         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);