Received: by 10.223.185.116 with SMTP id b49csp4178275wrg; Mon, 26 Feb 2018 12:38:06 -0800 (PST) X-Google-Smtp-Source: AH8x224tHifSSbDyFDtR3ZuQqQyy4Ug1x8RwttFjlK5NCGq7YJ+3Lb60NXqYJhgtzXuCITR8H9um X-Received: by 10.98.219.129 with SMTP id f123mr11918557pfg.195.1519677486178; Mon, 26 Feb 2018 12:38:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677486; cv=none; d=google.com; s=arc-20160816; b=f/LjNDCgPcjMDAC58O2neGPDKvVj0VD6dn/0mfneeP08fBSt4aWJWqhOs4AJ6qBlNL nP15rEPmxZ8/2PZwio0VbPHPCLbIh9YeOyv5t2CsflwXfCkVqwCBaPsV1ObDOPPyXxrN TJTsmP9aLbd3h3n0IxmhqRKQqa54BBUCrRss5bkJWSUMnZ4FdWL3rE6cSXnOIelrxlsx xXvKVNoQkZdmLWW9X6nKF05qb12XYqgTArfdoJKl8AoVfcMXtfmZGQljnXwcOBVJai+7 sRjC5Eo31/Oq3Q/N6d+bMzFAknbsRjBDo85DSh4auxEVPJH2kUSrT2D7zoxmiQALq0Lb sqlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=tn7vayHQhIL0OuTAfA1SkMapSlevpEQl67y6chOzRlw=; b=tw0wOxwpGISnIqGJQuhc1k4VBpCQ37QTbmpIPb4o1QtR9nIRHqj/+PZBL/mO5jPL9j y/TOjNGycWtW22BCv11OrKFdf3IgMK9eG9ImU1LIun4LbZbUlbNxf0uERC25PDgKr6nV pkz2SRdBcF6sogggYgCkjIaVOeaYVviZjQ4BLFSv51IJZVC1y3VNElI+5rPUpF7kRtLU rXGzP3chlunqKRoNxQHzlLlKtN0Cbe1VclEq5lhRlgeEnJoTif0466tnv3/vzubbNZtf uQ5DHJr1dVM10nexEbepwCPnj4JVJPFtS2qdRzerWBJc12cVZI7YfFZdt2m+udaYnq3T C6UA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x62si5931964pgd.611.2018.02.26.12.37.49; Mon, 26 Feb 2018 12:38:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753698AbeBZUfw (ORCPT + 99 others); Mon, 26 Feb 2018 15:35:52 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:36904 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753778AbeBZU1r (ORCPT ); Mon, 26 Feb 2018 15:27:47 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 09BADEB8; Mon, 26 Feb 2018 20:27:45 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shanker Donthineni , Will Deacon , Catalin Marinas Subject: [PATCH 4.15 41/64] arm64: cpufeature: Fix CTR_EL0 field definitions Date: Mon, 26 Feb 2018 21:22:18 +0100 Message-Id: <20180226202155.197126619@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Will Deacon commit be68a8aaf925aaf35574260bf820bb09d2f9e07f upstream. Our field definitions for CTR_EL0 suffer from a number of problems: - The IDC and DIC fields are missing, which causes us to enable CTR trapping on CPUs with either of these returning non-zero values. - The ERG is FTR_LOWER_SAFE, whereas it should be treated like CWG as FTR_HIGHER_SAFE so that applications can use it to avoid false sharing. - [nit] A RES1 field is described as "RAO" This patch updates the CTR_EL0 field definitions to fix these issues. Cc: Cc: Shanker Donthineni Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/cpufeature.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -197,9 +197,11 @@ static const struct arm64_ftr_bits ftr_i }; static const struct arm64_ftr_bits ftr_ctr[] = { - ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1), /* RAO */ + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_EXACT, 31, 1, 1), /* RES1 */ + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 29, 1, 1), /* DIC */ + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 28, 1, 1), /* IDC */ ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_SAFE, 24, 4, 0), /* CWG */ - ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0), /* ERG */ + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_HIGHER_SAFE, 20, 4, 0), /* ERG */ ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, 16, 4, 1), /* DminLine */ /* * Linux can handle differing I-cache policies. Userspace JITs will