From patchwork Mon Oct 24 11:31:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp531257wru; Mon, 24 Oct 2022 09:06:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM60WoNCZrwPlMvNZq4Gkp5OvZR52Tc9IMtsdlWL67L+eC8l0IobIVptlKjjz4fTqQtQiXN9 X-Received: by 2002:a17:907:2e01:b0:78d:f24b:7330 with SMTP id ig1-20020a1709072e0100b0078df24b7330mr27931196ejc.604.1666627574346; Mon, 24 Oct 2022 09:06:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627574; cv=none; d=google.com; s=arc-20160816; b=rqUGS0tCv98Kj+sI92V0k0mUAvkh1N8Sl92ztm22DiYq2W89iqaRx2K2I21iUmICq9 ExyikAudaSrf8fYdiD4hq1NZuteiOaID5bi0opotlc4ITyxjqy3O+4c8O3ub2AsrURtP 1QnELaGFz1q8cBuxkR0tAZEJRePr1z+Bbv5kdsLGxD5FyFR053+8ILnK/aBK/YTKSXxr qd4gvZTjSg2dlubuRjavfZ3GjfEmhnKh157boLcP5pTQmviH3mTQ40PQQnrSBU+nTw9o snIlUE1OhGIu8njgR3l/fxv92OPLcpBoqp8aC+be0PZtS78HUGEMyLPesxaWTZbbUlMY wg+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BWCeVcIir4O1Pxs8YY+BK3VMtOJw22vY6gc5r11Bm1k=; b=shqA/8PW/u63HEtxacZ+GGsI8NF5qvhksFLAQ9EYQNhFonLSM2oIPOuEfx/tVyZmR8 QQdqPVgy1+tkbsULCAbxsz3TVJoW0pYrfLCeKxzEyESSrho2Ji5KyDpoh275v9RqyXuQ Z1YU3FDysRdfNqV+Yio8UwSwRJ3W/tQu/WFSKKSEkdzzuOptbaDhx92nnJG8ARrHKTID 5gQ97nCU0CIBwRBJ6Ssub8DYbXJnUtSkeFwvzhVRdKNlCiHwjnW4RX+pdbMLYSoW0/12 s8EGMqfRt9SOAA2xuF8cboEFv/Vo95Anq4s3fJYx2MjYyLw1JyrKxM5KSQlN0NVqz/CG 2zSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mG+oOy4q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ne10-20020a1709077b8a00b007418a1e877dsi132140ejc.580.2022.10.24.09.05.48; Mon, 24 Oct 2022 09:06:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mG+oOy4q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231753AbiJXQFU (ORCPT + 99 others); Mon, 24 Oct 2022 12:05:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232540AbiJXQCi (ORCPT ); Mon, 24 Oct 2022 12:02:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B5B31C5A53; Mon, 24 Oct 2022 07:55:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3A89FB81258; Mon, 24 Oct 2022 12:27:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 961F0C433D6; Mon, 24 Oct 2022 12:27:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614457; bh=TdBw/XZ//KUbb7nc+UiUb1brIjebV2fUdY6YEQ2tcpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mG+oOy4qz7cU5LXDmYAd1aPhTXKsqgvKZExFNtfesgzgP+yepUZenG/Wmmx2hidZj pdcn6Pr3AqtqkyaKcPuVi3FsWRCwnWeLcbDpyUMvIeMeS4ZuSCiXUhiaToQgbWTduf itNVLSExkPqrZch9NcZrek7zHT6HF/dVTJuFTbFc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Piggin , Segher Boessenkool , Michael Ellerman , Sasha Levin Subject: [PATCH 5.10 269/390] powerpc/64s: Fix GENERIC_CPU build flags for PPC970 / G5 Date: Mon, 24 Oct 2022 13:31:06 +0200 Message-Id: <20221024113034.379631829@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747585675366900289?= X-GMAIL-MSGID: =?utf-8?q?1747585675366900289?= From: Nicholas Piggin [ Upstream commit 58ec7f06b74e0d6e76c4110afce367c8b5f0837d ] Big-endian GENERIC_CPU supports 970, but builds with -mcpu=power5. POWER5 is ISA v2.02 whereas 970 is v2.01 plus Altivec. 2.02 added the popcntb instruction which a compiler might use. Use -mcpu=power4. Fixes: 471d7ff8b51b ("powerpc/64s: Remove POWER4 support") Signed-off-by: Nicholas Piggin Reviewed-by: Segher Boessenkool Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220921014103.587954-1-npiggin@gmail.com Signed-off-by: Sasha Levin --- arch/powerpc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 59175651f0b9..612254141296 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -153,7 +153,7 @@ CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power9,-mtune=power8) else CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,$(call cc-option,-mtune=power5)) -CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mcpu=power5,-mcpu=power4) +CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power4 endif else ifdef CONFIG_PPC_BOOK3E_64 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64