From patchwork Mon Oct 26 16:03:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11857685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCCC5C4363A for ; Mon, 26 Oct 2020 16:05:18 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5753322404 for ; Mon, 26 Oct 2020 16:05:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZkZaYC8c"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="aNA7OSHi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5753322404 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=3dOiNjE7PitIt7itORxTGZ5R7FiUX85SDNxQZRfUYJk=; b=ZkZaYC8ce/AbopBtTncbPwSs30 7r77Oy1XCJaqXctvUE+Rc4S/qJyXa75sOUHhkmXKcYzMgzTo1eq/cHcwR2zbPYoX6hHW2E5/QLkSI 9B5bj+BgdpokCrPFUUNc00y+FZAcPe4rU1hBpcs9a1nng9Ln774QIt0HvLXsfQQbmp4NMwn+ZVMv/ rNU2CwVmnMj2oDc09JOU1yEgyExd34Keg3TvCtb5EzNqvQ2rK5l6zWR3y0Nxoft+lMEriZlow34As tXOOY16oSIcdvuu+oCnkoZeutBkdW+jG9SO/+ukTzMP0woMKIlA01HFu3gnMD44f5NdTtKSUMRSpu GtD1YFnQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX4yO-00030K-IB; Mon, 26 Oct 2020 16:03:52 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX4yM-0002zP-89 for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 16:03:51 +0000 Received: from localhost.localdomain (unknown [192.30.34.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1800722404; Mon, 26 Oct 2020 16:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603728229; bh=h5o3KPrk9jciKwrxsOK8xD5GWwug93Z9pyZ535cbSrE=; h=From:To:Cc:Subject:Date:From; b=aNA7OSHiRYPuMjVVMjUdSIVv6a1NrDK92k47wbUdSPoQOvkIlKpPsX1BnQg7JjVLE aQTX2P85AAeknQA5/AXXy54ddpRIOs7+5ZbrdHoAuMjGUPQ/3Wzn8ijVUQoYOz4URS UwFP3cBGkMFDwhhJELdCopkeTSErByPu/zp9lZvA= From: Arnd Bergmann To: Catalin Marinas , Will Deacon Subject: [PATCH 1/4] arm64: cpu_errata: fix override-init warnings Date: Mon, 26 Oct 2020 17:03:28 +0100 Message-Id: <20201026160342.3705327-1-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_120350_430452_0532566F X-CRM114-Status: GOOD ( 17.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sai Prakash Ranjan , Florian Fainelli , Arnd Bergmann , Suzuki K Poulose , Marc Zyngier , Marc Zyngier , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Stephen Boyd , Steven Price , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The CPU table causes a handful of warnings because of fields that have more than one initializer, e.g. arch/arm64/kernel/cpu_errata.c:127:13: warning: initialized field overwritten [-Woverride-init] 127 | .matches = is_affected_midr_range, \ | ^~~~~~~~~~~~~~~~~~~~~~ arch/arm64/kernel/cpu_errata.c:139:2: note: in expansion of macro 'CAP_MIDR_RANGE' 139 | CAP_MIDR_RANGE(model, v_min, r_min, v_max, r_max) | ^~~~~~~~~~~~~~ arch/arm64/kernel/cpu_errata.c:151:2: note: in expansion of macro 'ERRATA_MIDR_RANGE' 151 | ERRATA_MIDR_RANGE(model, var, rev, var, rev) | ^~~~~~~~~~~~~~~~~ arch/arm64/kernel/cpu_errata.c:317:3: note: in expansion of macro 'ERRATA_MIDR_REV' 317 | ERRATA_MIDR_REV(MIDR_BRAHMA_B53, 0, 0), | ^~~~~~~~~~~~~~~ Address all of these by removing the extra initializer that has no effect on the output. Fixes: 1cf45b8fdbb8 ("arm64: apply ARM64_ERRATUM_843419 workaround for Brahma-B53 core") Fixes: bf87bb0881d0 ("arm64: Allow booting of late CPUs affected by erratum 1418040") Fixes: 93916beb7014 ("arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT") Signed-off-by: Arnd Bergmann --- arch/arm64/kernel/cpu_errata.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 24d75af344b1..2321f52e396f 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -307,13 +307,11 @@ static const struct midr_range erratum_845719_list[] = { static const struct arm64_cpu_capabilities erratum_843419_list[] = { { /* Cortex-A53 r0p[01234] */ - .matches = is_affected_midr_range, ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4), MIDR_FIXED(0x4, BIT(8)), }, { /* Brahma-B53 r0p[0] */ - .matches = is_affected_midr_range, ERRATA_MIDR_REV(MIDR_BRAHMA_B53, 0, 0), }, {}, @@ -475,7 +473,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "ARM erratum 1418040", .capability = ARM64_WORKAROUND_1418040, - ERRATA_MIDR_RANGE_LIST(erratum_1418040_list), + CAP_MIDR_RANGE_LIST(erratum_1418040_list), /* * We need to allow affected CPUs to come in late, but * also need the non-affected CPUs to be able to come @@ -504,8 +502,8 @@ const struct arm64_cpu_capabilities arm64_errata[] = { { .desc = "Cavium ThunderX2 erratum 219 (KVM guest sysreg trapping)", .capability = ARM64_WORKAROUND_CAVIUM_TX2_219_TVM, - ERRATA_MIDR_RANGE_LIST(tx2_family_cpus), .matches = needs_tx2_tvm_workaround, + .midr_range_list = tx2_family_cpus, }, { .desc = "Cavium ThunderX2 erratum 219 (PRFM removal)",