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 X-Spam-Level: X-Spam-Status: No, score=-5.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 0D576C54E8D for ; Tue, 12 May 2020 14:44:55 +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 D34FE206A3 for ; Tue, 12 May 2020 14:44:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="piMzWImm"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="tSnjBkTp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D34FE206A3 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+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DZ9EeJdQYyxOUGLJYt0ZiV+3lgMEXBg2yuUxUX+Dnhc=; b=piMzWImmht50Ij Y0OA8s5iCDtF9D379ovigflw9v1TFf9HFcEswb61zR7wwSQocB+zwrO5IOlJRLPnyYL4hESyT9xb8 YrMVPz8Y8+SKdkDQMZ6efscdrqoS+OUERqRDt1xqV+MkxF3WTOulWf7UDwW6PoF5jZL78iyCGz3HP 7nImRCMKWjQU4LkGl+Ppr9aErUdDeIoHLamUF1sAhbTxGbMycFd07h8BexsBlMINrakU6TplCMDQJ gtRTEABt8sOmxAYls5ljWptb5uXvJkoVmpnSeDrJiSXsF+7nBIapnq0EvcAUTsR8VVpHn2VzBSROU t3C9ww+96UwPDS7btLYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jYW9N-0002YS-It; Tue, 12 May 2020 14:44:53 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jYW9K-0002Y6-7a for linux-arm-kernel@lists.infradead.org; Tue, 12 May 2020 14:44:51 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (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 0406B206A3; Tue, 12 May 2020 14:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589294689; bh=5Txyk5jDqYEDq3T12UeygI410GLM53+4ZLa7xxU31Mo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=tSnjBkTpC3wOzSungT0wQnY9tEaY9JAStcEx7QthAi+E2bpavkqPqj5YKrGXxsc4C in5FkG80Yj772KlSsmXXrclibSyvjWbf3mROF2Mj1cSk6kutdJ4gkdhHrxRAwt2eUG 5pNfmceQgPHCVf1TxAENp7sC/2dMCixjnDsMCovA= Date: Tue, 12 May 2020 15:44:45 +0100 From: Will Deacon To: Geert Uytterhoeven Subject: Re: [PATCH] arm64: cpufeature: Add "or" to mitigations for multiple errata Message-ID: <20200512144445.GE3021@willie-the-truck> References: <20200512124238.28792-1-geert+renesas@glider.be> <20200512141200.GD3021@willie-the-truck> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200512_074450_291875_1672700B X-CRM114-Status: GOOD ( 20.95 ) 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: Catalin Marinas , Linux Kernel Mailing List , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, May 12, 2020 at 04:38:19PM +0200, Geert Uytterhoeven wrote: > On Tue, May 12, 2020 at 4:12 PM Will Deacon wrote: > > On Tue, May 12, 2020 at 02:42:38PM +0200, Geert Uytterhoeven wrote: > > > Several actions are not mitigations for a single erratum, but for > > > multiple errata. However, printing a line like > > > > > > CPU features: detected: ARM errata 1165522, 1319367, 1530923 > > > > > > may give the false impression that all three listed errata have been > > > detected. This can confuse the user, who may think his Cortex-A57 is > > > suddenly affected by Cortex-A76 and Cortex-A55 errata. > > > > > > Add "or" to all descriptions for mitigations for multiple errata, to > > > make it clear that only one or more of the errata printed are > > > applicable, and not necessarily all of them. > > > > > > Signed-off-by: Geert Uytterhoeven > > > --- > > > arch/arm64/kernel/cpu_errata.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > This seems to conflict with the other patch you sent to reorder the entries. > > My reordering applied to the Kconfig file. Sorry, you're right. Your patch didn't apply on top of that, so I wrongly assumed that it was the culprit. > > Please can you send another version, based on the arm64 for-next/kconfig > > branch? > > Then it will conflict with commit 02ab1f5018c3ad0b ("arm64: Unify > WORKAROUND_SPECULATIVE_AT_{NVHE,VHE}") from for-next/kvm/errata? Ah, that's ok. I recreate for-next/core so I have flexibility in dropping branches if they cause problems. Please can you send a version against for-next/kconfig, and I'll handle the conflict now that you've pointed it out/ Cheers, Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel