Subject: Patch "powerpc/e500mc: Set assembler machine type to e500mc" has been added to the 4.17-stable tree

From: <[email-masked]>
Date: Sun, 01 Jul 2018 12:09:25 +0200

This is a note to let you know that I've just added the patch titled

    powerpc/e500mc: Set assembler machine type to e500mc

to the 4.17-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     powerpc-e500mc-set-assembler-machine-type-to-e500mc.patch
and it can be found in the queue-4.17 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email-masked]> know about it.

>>From 69a8405999aa1c489de4b8d349468f0c2b83f093 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <[email-masked]>
Date: Thu, 14 Jun 2018 11:27:42 -0400
Subject: powerpc/e500mc: Set assembler machine type to e500mc

From: Michael Jeanson <[email-masked]>

commit 69a8405999aa1c489de4b8d349468f0c2b83f093 upstream.

In binutils 2.26 a new opcode for the "wait" instruction was added for the
POWER9 and has precedence over the one specific to the e500mc. Commit
ebf714ff3756 ("powerpc/e500mc: Add support for the wait instruction in
e500_idle") uses this instruction specifically on the e500mc to work around
an erratum.

This results in an invalid instruction in idle_e500 when we build for the
e500mc on bintutils >= 2.26 with the default assembler machine type.

Since multiplatform between e500 and non-e500 is not supported, set the
assembler machine type globaly when CONFIG_PPC_E500MC=y.

Signed-off-by: Michael Jeanson <[email-masked]>
Reviewed-by: Mathieu Desnoyers <[email-masked]>
CC: Benjamin Herrenschmidt <[email-masked]>
CC: Paul Mackerras <[email-masked]>
CC: Michael Ellerman <[email-masked]>
CC: Kumar Gala <[email-masked]>
CC: Vakul Garg <[email-masked]>
CC: Scott Wood <[email-masked]>
CC: Mathieu Desnoyers <[email-masked]>
CC: [email-masked]
CC: [email-masked]
CC: [email-masked]
Signed-off-by: Michael Ellerman <[email-masked]>
Signed-off-by: Greg Kroah-Hartman <[email-masked]>

---
 arch/powerpc/Makefile |    1 +
 1 file changed, 1 insertion(+)

--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -251,6 +251,7 @@ cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
 cpu-as-$(CONFIG_ALTIVEC)	+= $(call as-option,-Wa$(comma)-maltivec)
 cpu-as-$(CONFIG_E200)		+= -Wa,-me200
 cpu-as-$(CONFIG_PPC_BOOK3S_64)	+= -Wa,-mpower4
+cpu-as-$(CONFIG_PPC_E500MC)	+= $(call as-option,-Wa$(comma)-me500mc)
 
 KBUILD_AFLAGS += $(cpu-as-y)
 KBUILD_CFLAGS += $(cpu-as-y)

Patches currently in stable-queue which might be from [email-masked] are

queue-4.17/powerpc-e500mc-set-assembler-machine-type-to-e500mc.patch