From patchwork Thu Jun 14 15:27:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Jeanson X-Patchwork-Id: 929712 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 416Gtw3cVxz9s0w for ; Fri, 15 Jun 2018 07:28:08 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=efficios.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=efficios.com header.i=@efficios.com header.b="gwC+1U+1"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 416Gtw1tC9zF0tD for ; Fri, 15 Jun 2018 07:28:08 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=efficios.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=efficios.com header.i=@efficios.com header.b="gwC+1U+1"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=efficios.com (client-ip=167.114.142.138; helo=mail.efficios.com; envelope-from=mjeanson@efficios.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=efficios.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=efficios.com header.i=@efficios.com header.b="gwC+1U+1"; dkim-atps=neutral X-Greylist: delayed 581 seconds by postgrey-1.36 at bilbo; Fri, 15 Jun 2018 01:38:23 AEST Received: from mail.efficios.com (mail.efficios.com [167.114.142.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41677M1kN3zDrnp for ; Fri, 15 Jun 2018 01:38:23 +1000 (AEST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 0EA9522A6AC; Thu, 14 Jun 2018 11:28:32 -0400 (EDT) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id N_3xWb_x2L6c; Thu, 14 Jun 2018 11:28:31 -0400 (EDT) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 9EA0E22A6A8; Thu, 14 Jun 2018 11:28:31 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 9EA0E22A6A8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1528990111; bh=BisWm1fQID4Ru64d20mSYq/lL2qy3S/S7gIbdg1Z0rM=; h=From:To:Date:Message-Id; b=gwC+1U+1/y0z0lhAv1rhrNOZP+E66jA3VaIvU79gm6v6bwX2m2kFjKMqeDTFhqE8g 9ZS4qQdWKHy7xj5cnMTzdibzYXGrmAYp19M+zOLkNN7pG66wqrcwcuHrh53VxqKp2A FlGSA1PDQCkJLrJOoxk91kUR9hj3pR4emvkyQlCPEqMQ43g9wjlqQ999g6ioAwjHiU fqXKkKGiH4g+w3gMhVOUloHkPwNUF0V8YoTiJ4+9ZQ54f3LxWslnFD/NAu6dXwFOFq NEOpEfv3+zANLscWd3R5raoDegn11hPEQ9vyHSDtCrwELd1biCWEsE69H/CqNX/Y44 jP+ODN28xu/Og== X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id 18yAey9-EJYF; Thu, 14 Jun 2018 11:28:31 -0400 (EDT) Received: from laptop-mjeanson.internal.efficios.com (192-222-157-41.qc.cable.ebox.net [192.222.157.41]) by mail.efficios.com (Postfix) with ESMTPSA id 6126022A6A3; Thu, 14 Jun 2018 11:28:31 -0400 (EDT) From: Michael Jeanson To: Subject: [PATCH] powerpc/e500mc: Set assembler machine type to e500mc Date: Thu, 14 Jun 2018 11:27:42 -0400 Message-Id: <20180614152742.21075-1-mjeanson@efficios.com> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Fri, 15 Jun 2018 07:26:16 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable@vger.kernel.org, Michael Jeanson , Paul Mackerras , Mathieu Desnoyers , Vakul Garg , linuxppc-dev@lists.ozlabs.org, Scott Wood , linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 Reviewed-by: Mathieu Desnoyers CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: Michael Ellerman CC: Kumar Gala CC: Vakul Garg CC: Scott Wood CC: Mathieu Desnoyers CC: linuxppc-dev@lists.ozlabs.org CC: linux-kernel@vger.kernel.org CC: stable@vger.kernel.org --- arch/powerpc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 95813df90801..bb2523b4bd8f 100644 --- 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)