From patchwork Mon Feb 26 08:20:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 129581 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp3357539lja; Mon, 26 Feb 2018 00:24:32 -0800 (PST) X-Google-Smtp-Source: AH8x227r0sjGv2YsPknBc9iNgiWs1SU2A+f2slpiqphKnAHmlUf5uTk+XX41ivvsUyInD64tAxLP X-Received: by 10.98.200.131 with SMTP id i3mr9886392pfk.40.1519633472418; Mon, 26 Feb 2018 00:24:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519633472; cv=none; d=google.com; s=arc-20160816; b=Dqm0GQZxxg0atDI/inA0KefnW5r18K263gvyZhku2MP/Ff2FjEnYw6c9Kn5cOJljB7 qb4eKw6s5CQr5e1KzAeMOdwkpMo4wmutqrHYryeNsF9gbwdzNhlE1/p5mGulO49i6SVn ixnAj5eM4s2EHJvgrKlFqyqct9jWzUJ6ylaLY4tvE6vxyIA9YGic9SQgQ8NpSgixYjB2 rHW9Mt9fp0mye7t1j6QHpypI76jfla5xeKgvQB7d0d+xEeBXFTbejf230xcJyCN6Z14a JthUFTTfcACeFVxCGkfbcz7uVobAvF0ZN7SupMAGzUsi1n22k4XIB5yEesB9qf/XNU2+ smKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:arc-authentication-results; bh=AHr70MZkEOaKFey+eCDJheezhRWSsRAnZ4+h4S16qZs=; b=Gmb2m4Uqzjbga87bmpi4UZdpHL4rH4WTC6Q4GGnqLCdQnGOIWsMqE6H3RBYPUk3dcq sV2ybe8AZDeYmQLk9WyM8LdWudkIohgeukgIW8iS40mrj+Kk0j/yJdJzMI7aQRGylU1Y rzDYRuX2RNqWZAGheldzM5S4zS/cCc1BM180EhjaFmcLH9v+bcv6UZhQbQA9Kzg8py/C l2StcrssGtFu7pYzj71O/I65lxgJSr+ReYxVuxglF/VuCOW1CkrzvFAns7poRkFozG79 KjkZFec2tZSY7ftO8pSPYR8qUBSNFJIe77g+yMh/3q3pBx/8pd7ZnirFGiGF5onVwWFz ZMSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZM7Kt5Bd; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o74si6465353pfj.75.2018.02.26.00.24.32; Mon, 26 Feb 2018 00:24:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZM7Kt5Bd; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752205AbeBZIYa (ORCPT + 10 others); Mon, 26 Feb 2018 03:24:30 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33334 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752240AbeBZIY2 (ORCPT ); Mon, 26 Feb 2018 03:24:28 -0500 Received: by mail-pf0-f194.google.com with SMTP id q13so6223863pff.0 for ; Mon, 26 Feb 2018 00:24:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=AHr70MZkEOaKFey+eCDJheezhRWSsRAnZ4+h4S16qZs=; b=ZM7Kt5Bdvj8NELsICBVQ7nDKwMYi9ZlNKaAv3EikznM6+/ePrsOr/ROVS4++oqb/Xy wY+HNXQr0tbktWrC/H+mg79kvyW8KwA3J4MBFmnt00xA53ZKpraeQFlm6zTSeiFsWTPX O/uvJt/QWPc5RsqdAqavPX/SWAPPM4Edzi4QI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=AHr70MZkEOaKFey+eCDJheezhRWSsRAnZ4+h4S16qZs=; b=ietcv2gcsCQXtEMKGzNzd/S/ILjt22sE9wAzzPun707uyBXC1L993Qi17wnUt9B7eT kKi+DYOz5/rHgmBMy2r+Xvuo4GVIignie4c8/WRQHtAbveeNPAMjwbRRCaHw31yWdjwR dDg6rB73c/r7VS4fuTZ6qjicdcGRBayImM5UrLC5l01EGYS5DKr+j28bSW5ZpUeo5fiM jssi38kK7ZuOb8/7vW0+StLioGEQldnWKhFbZAXmET8LCumJp9MmVc+0ScQpdjmkiRa/ +8/Scy0SRWK/tE54FPbGpOziob8xPEK1Ta7dAi07Sz3RgT1oX/TaowWcpUtCOrSCu251 DPXg== X-Gm-Message-State: APf1xPDFOeJY5+meqDHsKyC5uYGJpay/peiAMMy44lR3ww1h39lNajXp oCMgQihikbilM7F/wmDiLNjnzmdK65o= X-Received: by 10.98.217.76 with SMTP id s73mr9761914pfg.209.1519633467434; Mon, 26 Feb 2018 00:24:27 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id o86sm1422706pfi.87.2018.02.26.00.24.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Feb 2018 00:24:26 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org (moderated list:ARM64 PORT (AARCH64 ARCHITECTURE)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 28/52] arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 Date: Mon, 26 Feb 2018 16:20:02 +0800 Message-Id: <1519633227-29832-29-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519633227-29832-1-git-send-email-alex.shi@linaro.org> References: <1519633227-29832-1-git-send-email-alex.shi@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit a65d219fe5dc upstream. Hook up MIDR values for the Cortex-A72 and Cortex-A75 CPUs, since they will soon need MIDR matches for hardening the branch predictor. Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Alex Shi Conflicts: pick A73 too in arch/arm64/include/asm/cputype.h --- arch/arm64/include/asm/cputype.h | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.7.4 diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index 26a68dd..0843b3f 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -75,7 +75,10 @@ #define ARM_CPU_PART_AEM_V8 0xD0F #define ARM_CPU_PART_FOUNDATION 0xD00 #define ARM_CPU_PART_CORTEX_A57 0xD07 +#define ARM_CPU_PART_CORTEX_A72 0xD08 #define ARM_CPU_PART_CORTEX_A53 0xD03 +#define ARM_CPU_PART_CORTEX_A73 0xD09 +#define ARM_CPU_PART_CORTEX_A75 0xD0A #define APM_CPU_PART_POTENZA 0x000 @@ -86,6 +89,9 @@ #define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53) #define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57) +#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72) +#define MIDR_CORTEX_A73 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A73) +#define MIDR_CORTEX_A75 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A75) #define MIDR_THUNDERX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX) #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)