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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B3AD7C5321D for ; Mon, 26 Aug 2024 23:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kYoiM2+oKDznhGzZ2yDoe45LcbdzyY4rjG+L8U4M2t8=; b=fCzL0KmEr0L38JoLIkWeObpqum kcWKmaauFMixy5Rgca1PRGtz7MS0Q81mRpcSJqcCmyUbNZ5DG7SaWL0b4fPPD9lZVmQ/KGDbRmsOA 6+f0wgRfZ50WXsE+hnG3Tp3F2pS2f8tL8Rntfoht05gdtlzcVQzLnDwB2JEN4QLCBDW96KTExpObh O42RG7jnecBS9dZ2EXkbVp43jZgcRr3ncT2SNNF62+zLYyzU3Ze+JD5B7aDeaQ/5aIpZGWexyK7GU TOKcw5cx7CjxSXIvorMbLPQocc++G+3cLcREg7dIoRxipMQRcvzlYCRKOP02re+HNd3SVk6RKz6om uffdUIhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sij9U-000000099Ii-0i0X; Mon, 26 Aug 2024 23:29:36 +0000 Received: from out-173.mta1.migadu.com ([2001:41d0:203:375::ad]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sij8g-0000000998i-14O7 for linux-arm-kernel@lists.infradead.org; Mon, 26 Aug 2024 23:28:47 +0000 Date: Mon, 26 Aug 2024 16:28:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1724714923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kYoiM2+oKDznhGzZ2yDoe45LcbdzyY4rjG+L8U4M2t8=; b=KF71LULhcLYQTiE1bOPB2HEKHHYd2gUX8rB7gGh1j5gU86xW5IEJYgo9nj5H56uKiUeeKS s6xOglzusORskKbhcz2aMmT2FksFV/5uiEnDyV3nsWgyvaa9u3XESoxBSCN69BZ3jtbzKI EEdjpRO4foJUmLLwLtq5hi+Y38co2ng= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: D Scott Phillips Cc: Catalin Marinas , Will Deacon , Jonathan Corbet , Mark Rutland , Anshuman Khandual , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, Besar Wicaksono , Easwar Hariharan , Rob Herring , Andre Przywara , linux-kernel@vger.kernel.org, patches@amperecomputing.com, Marc Zyngier , kvmarm@lists.linux.dev, James Morse , Suzuki K Poulose , Zenghui Yu Subject: Re: [PATCH] arm64: errata: Enable the AC03_CPU_38 workaround for ampere1a Message-ID: References: <20240826215933.1263453-1-scott@os.amperecomputing.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240826_162846_461905_E6753DAE X-CRM114-Status: GOOD ( 23.18 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Also, +cc Marc + the rest of the KVM folks. checkpatch doesn't help in this situation, but it'd be good to keep everyone in the loop since this is an erratum that affects KVM. On Mon, Aug 26, 2024 at 04:24:00PM -0700, Oliver Upton wrote: > Hi D Scott, > > On Mon, Aug 26, 2024 at 02:59:33PM -0700, D Scott Phillips wrote: > > The ampere1a cpu is affected by erratum AC04_CPU_10 which is the same > > bug as AC03_CPU38. Add ampere1a to the AC03_CPU_38 workaround midr list. > > > > Signed-off-by: D Scott Phillips > > --- > > Documentation/arch/arm64/silicon-errata.rst | 2 ++ > > arch/arm64/Kconfig | 2 +- > > arch/arm64/include/asm/cputype.h | 2 ++ > > arch/arm64/kernel/cpu_errata.c | 1 + > > 4 files changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst > > index 50327c05be8d1..39c52385f11fb 100644 > > --- a/Documentation/arch/arm64/silicon-errata.rst > > +++ b/Documentation/arch/arm64/silicon-errata.rst > > @@ -55,6 +55,8 @@ stable kernels. > > +----------------+-----------------+-----------------+-----------------------------+ > > | Ampere | AmpereOne | AC03_CPU_38 | AMPERE_ERRATUM_AC03_CPU_38 | > > +----------------+-----------------+-----------------+-----------------------------+ > > +| Ampere | AmpereOne AC04 | AC04_CPU_10 | AMPERE_ERRATUM_AC03_CPU_38 | > > ++----------------+-----------------+-----------------+-----------------------------+ > > We tend to stick the marketing term for a part in the second column so > it is more recognizable for the user. Is this a placeholder for something > different from "ampere1a"? > > > diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c > > index f6b6b45073571..748aa536446ae 100644 > > --- a/arch/arm64/kernel/cpu_errata.c > > +++ b/arch/arm64/kernel/cpu_errata.c > > @@ -773,6 +773,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { > > .desc = "AmpereOne erratum AC03_CPU_38", > > .capability = ARM64_WORKAROUND_AMPERE_AC03_CPU_38, > > ERRATA_MIDR_ALL_VERSIONS(MIDR_AMPERE1), > > + ERRATA_MIDR_ALL_VERSIONS(MIDR_AMPERE1A), > > This will break the workaround on AC03, since the second macro reassigns > ::midr_range. > > You'll want to use ERRATA_MIDR_RANGE_LIST() instead w/ an array of > affected MIDRs. > > -- > Thanks, > Oliver