From patchwork Wed Jun 14 06:59:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 107742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1052389vqr; Wed, 14 Jun 2023 00:13:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40K+VfOiD7pmNMwIAFgC5B+3jpcDj+toDA3xUA2ayd2LWfCJyoXpdwnVLd00547VLqz2oN X-Received: by 2002:a05:6402:6d0:b0:514:8eb7:d587 with SMTP id n16-20020a05640206d000b005148eb7d587mr6914053edy.17.1686726833399; Wed, 14 Jun 2023 00:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686726833; cv=none; d=google.com; s=arc-20160816; b=jUOtpjuU99vxHCohDjZ1NL45S5GW/egveUMPYXGecEJVwbpmOdMcIbOPiwk59OZ9m7 PFaHoHWXOSGyzvXQLlqRou/rtdZQSW5lRZuBCSR7r24aYv0VCn9/Aqrbr06TOCL88Vba 7fAnq38/4oy2TPivVypr58YU29UtthTIKOVC54MyhUdR+AWSiAoeXyReCMk4ANfvaxpg hNpe+bJ1vBuK1GfKCi2lCiAhw+bjnIWzvWTRBznhUYX7CGAyqiP/71IGD+ie2JrijGnz 7tFl2dJmSbn/69Ha/GS+wLvrd9X6rSI+28WZk6Rsun10hRMRjy/y2p6N8tvaqZBboawY M9pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Hp7uE9mEissfU3AQtD+ZkH59GMIdMsQCQPqJrxajts0=; b=WNWwkU9Reu/XwUyFpTiogjCvQ4+2TxDPWRaZhPu492zzYgQOcic7EZ/A0p2fE1sw/Y QXqc45+DnjHLbAzJ0Cbnz62c1fhpwaY3bH6mjzNwsCsQctN1gZQYOdaISNJdjh7nyxIs n6GLAEOByeGSNJytQAdUSAJr+T24JeXGgIGuLPxd2efkMJr+9msWfoIN1Yde9B82RtVk HEqXRBfZzab3IF4MQS1pv4UkspyOFCXBCKb//+d98lkNzErx05UAEe78yka2GHUJs839 HBuUcKaPkEdQbDdqtbN562YZLNSnhANxoH//fLKJnkvCyJY+siwoA5/Q7f/FH2cMuogH gm0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e7-20020a50fb87000000b00514b897d26dsi2435287edq.358.2023.06.14.00.13.28; Wed, 14 Jun 2023 00:13:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242891AbjFNHAy (ORCPT + 99 others); Wed, 14 Jun 2023 03:00:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238569AbjFNHAk (ORCPT ); Wed, 14 Jun 2023 03:00:40 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 367A81FE8 for ; Wed, 14 Jun 2023 00:00:34 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 709781FB; Wed, 14 Jun 2023 00:01:18 -0700 (PDT) Received: from a077893.arm.com (unknown [10.163.46.15]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CAEE23F663; Wed, 14 Jun 2023 00:00:29 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, broonie@kernel.org Cc: Anshuman Khandual , Catalin Marinas , Will Deacon , Marc Zyngier , Rob Herring , Suzuki K Poulose , James Morse , kvmarm@lists.linux.dev, coresight@lists.linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 05/14] arm64/sysreg: Rename TRBMAR_EL1 fields per auto-gen tools format Date: Wed, 14 Jun 2023 12:29:40 +0530 Message-Id: <20230614065949.146187-6-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230614065949.146187-1-anshuman.khandual@arm.com> References: <20230614065949.146187-1-anshuman.khandual@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768661276257183781?= X-GMAIL-MSGID: =?utf-8?q?1768661276257183781?= This renames TRBMAR_EL1 register fields per auto-gen tools format without causing any functional change in the TRBE driver. Cc: Catalin Marinas Cc: Will Deacon Cc: Marc Zyngier Cc: Mark Brown Cc: Rob Herring Cc: Suzuki K Poulose Cc: James Morse Cc: kvmarm@lists.linux.dev Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- arch/arm64/include/asm/sysreg.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 6ee331a52bb2..8080c52d2fff 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -277,12 +277,10 @@ #define TRBSR_EL1_BSC_SHIFT 0 #define TRBSR_EL1_FSC_MASK GENMASK(5, 0) #define TRBSR_EL1_FSC_SHIFT 0 -#define TRBMAR_SHARE_MASK GENMASK(1, 0) -#define TRBMAR_SHARE_SHIFT 8 -#define TRBMAR_OUTER_MASK GENMASK(3, 0) -#define TRBMAR_OUTER_SHIFT 4 -#define TRBMAR_INNER_MASK GENMASK(3, 0) -#define TRBMAR_INNER_SHIFT 0 +#define TRBMAR_EL1_SH_MASK GENMASK(9, 8) +#define TRBMAR_EL1_SH_SHIFT 8 +#define TRBMAR_EL1_Attr_MASK GENMASK(7, 0) +#define TRBMAR_EL1_Attr_SHIFT 0 #define TRBTRG_TRG_MASK GENMASK(31, 0) #define TRBTRG_TRG_SHIFT 0 #define TRBIDR_FLAG BIT(5)