From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5171C433F5 for ; Wed, 17 Nov 2021 09:26:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 776756321A for ; Wed, 17 Nov 2021 09:26:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 776756321A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mYzZl/DHdPGWUvW8PJzYwLPmpVZ72dD6MUx0lG+/qpY=; b=xJKv6oF93tuotz Em9FPswgzqwoGDER3YWBNG3LLKtCJ9JOreF27vt1Xlrjfyhm4edfWmEYEK8bIbUL/FKdeVGSMHV7s 9EFgknVWVey2c60uI2bVCLdZ6f98JZDWcykg3SkWk4555/nbv9N6fVQEI+Wx5HnAjTN7eU8eyvEa6 LMnbE4fvFaekvo0ozpWlELYZ76vrjP2jUqL7BfQOBFkJP901WSdT04Cg8LNRwlAFQhypX2ose2U/J c277iomV3yX9okL+AD/p2a1aF5uZyE/sYdAufNBUrmCd7zX+15Qx7weulnijuei3R0ik7tL52U5W7 Rti0km3w27c+zczjZ8qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnHBm-004DiF-Nm; Wed, 17 Nov 2021 09:25:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mnH0V-0048cr-Ij for linux-arm-kernel@lists.infradead.org; Wed, 17 Nov 2021 09:13:33 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 32E2563214; Wed, 17 Nov 2021 09:13:31 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mnH0T-00624e-5Z; Wed, 17 Nov 2021 09:13:29 +0000 Date: Wed, 17 Nov 2021 09:13:28 +0000 Message-ID: <871r3f87rb.wl-maz@kernel.org> From: Marc Zyngier To: Dmitry Baryshkov Cc: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: Re: [PATCH] arm64: cpufeature: fix CPU features mismatch message In-Reply-To: <20211116215922.2021550-1-dmitry.baryshkov@linaro.org> References: <20211116215922.2021550-1-dmitry.baryshkov@linaro.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: dmitry.baryshkov@linaro.org, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211117_011331_692110_91F3717C X-CRM114-Status: GOOD ( 21.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 16 Nov 2021 21:59:22 +0000, Dmitry Baryshkov wrote: > > Fix cpp magic involved in ARM64_FTR_REG/ARM64_FTR_REG_OVERRIDE macros. > Currently ARM64_FTR_REG parameters are expanded early, resulting in > cryptic debug messages: > > [ 0.071123] CPU features: SANITY CHECK: Unexpected variation in (((3) << 19) | ((0) << 16) | ((0) << 12) | ((7) << 8) | ((0) << 5)). Boot CPU: 0x00022200101022, CPU4: 0x00022200101122 > > Make ARM64_FTR_REG to be expanded before parameters, resulting in proper > debug log: > > [ 0.071163] CPU features: SANITY CHECK: Unexpected variation in SYS_ID_AA64MMFR0_EL1. Boot CPU: 0x00022200101022, CPU4: 0x00022200101122 > > Fixes: 8f266a5d878a ("arm64: cpufeature: Add global feature override facility") > Signed-off-by: Dmitry Baryshkov > --- > arch/arm64/kernel/cpufeature.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c > index 6ec7036ef7e1..72e3e3819eb4 100644 > --- a/arch/arm64/kernel/cpufeature.c > +++ b/arch/arm64/kernel/cpufeature.c > @@ -573,15 +573,17 @@ static const struct arm64_ftr_bits ftr_raz[] = { > ARM64_FTR_END, > }; > > -#define ARM64_FTR_REG_OVERRIDE(id, table, ovr) { \ > +#define __ARM64_FTR_REG(id, _name, table, ovr) { \ > .sys_id = id, \ > .reg = &(struct arm64_ftr_reg){ \ > - .name = #id, \ > + .name = _name, \ > .override = (ovr), \ > .ftr_bits = &((table)[0]), \ > }} > > -#define ARM64_FTR_REG(id, table) ARM64_FTR_REG_OVERRIDE(id, table, &no_override) > +#define ARM64_FTR_REG_OVERRIDE(id, table, ovr) __ARM64_FTR_REG(id, #id, table, ovr) > + > +#define ARM64_FTR_REG(id, table) __ARM64_FTR_REG(id, #id, table, &no_override) > > struct arm64_ftr_override __ro_after_init id_aa64mmfr1_override; > struct arm64_ftr_override __ro_after_init id_aa64pfr1_override; Please see commit 9dc232a8ab18 ("arm64: arm64_ftr_reg->name may not be a human-readable string"). M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel