From patchwork Fri Jun 2 06:25:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 102326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp832974vqr; Thu, 1 Jun 2023 23:41:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5r7I5k5107rPq5sHPbXVp0ejteYW9qpqHn8/bwg+bEZOUZS3xqwEnXFDg1wIdektITBRG8 X-Received: by 2002:a9d:4818:0:b0:6a6:23fd:3ed7 with SMTP id c24-20020a9d4818000000b006a623fd3ed7mr1674941otf.34.1685688089651; Thu, 01 Jun 2023 23:41:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685688089; cv=none; d=google.com; s=arc-20160816; b=TSsCwArQktB2G2kkU+4VOorfwvdgGXQSG8XZWEKASF1miXvb0db9zbRYHxHodkB32/ AFIsp7yzK2GwFPRTv52agTrA6bp7YQwWTVS3apAlNbsYbw1cRZeS9JAabf9IvPBF9CgS byq0ro99ZpjatAIJKnkkGI2gZal99+PVwiq6t1YemI0n6cdb4NZ5Jwx10hDGbtnwZlU/ ywXXWso64AjbZ1H2kqGW6yFpXp/WII7mnT/AdC8rF4iKg1vWNhrT5r2nIt4MZmVNingZ SGev31MLp6zfuU/GR3IyFkaxkfUAGm1YOfhoVZVvp/Fm2aaOBAdrpz0d9T955isowIzR LK5g== 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=1pyu6TFvzyw+LE/plo99GQXhaBpomXfhCZ5gmCOPGPc=; b=E9wz6Ynwj79NdJ/E96yFB2MB+gophbbout2mlbub4PiF/qY5Erp7/zixhQ7+SsKIDY NojHhVRdWOd27vD95muTviuhJzh2ZdaE16OnNtj9gSSiNPlYnqAf+yx08HzZaAuMOma1 MX8nzhVdIjORtdWukwksxjAKJqv+I+L6QwICLGuOYqXyNqUnU7yf7akeLPQnaWEFMPKu ZPa78YH+UY07WrMAsGqIN238ZDFUvnM/A2Xpjxak3ReNW1g2fGZEe02e3azuwFjqmrTS YKFatc4PyQpZ6YjSu3v+MBNioSugyShn+vDCkSYdHe2cM+wYzQSZUeHF30cazOsMA8Rc BXjQ== 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 q24-20020a637518000000b005348f85f89fsi535505pgc.226.2023.06.01.23.41.15; Thu, 01 Jun 2023 23:41:29 -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 S233917AbjFBG1j (ORCPT + 99 others); Fri, 2 Jun 2023 02:27:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233784AbjFBG1G (ORCPT ); Fri, 2 Jun 2023 02:27:06 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 13382196 for ; Thu, 1 Jun 2023 23:26:55 -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 45EF212FC; Thu, 1 Jun 2023 23:27:40 -0700 (PDT) Received: from a077893.blr.arm.com (unknown [10.162.41.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1B08D3F67D; Thu, 1 Jun 2023 23:26:50 -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 V2 11/14] arm64/sysreg: Convert TRBSR_EL1 register to automatic generation Date: Fri, 2 Jun 2023 11:55:49 +0530 Message-Id: <20230602062552.565992-12-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230602062552.565992-1-anshuman.khandual@arm.com> References: <20230602062552.565992-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?1767572074188683976?= X-GMAIL-MSGID: =?utf-8?q?1767572074188683976?= This converts TRBSR_EL1 register to automatic generation without causing any functional change. Cc: Catalin Marinas Cc: Will Deacon Cc: Marc Zyngier Cc: Mark Brown Cc: Rob Herring Cc: Suzuki K Poulose Cc: James Morse Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual Reviewed-by: Mark Brown --- arch/arm64/include/asm/sysreg.h | 12 ------------ arch/arm64/tools/sysreg | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 27d89b7ea0fa..768d12fc4834 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -235,24 +235,12 @@ /*** End of Statistical Profiling Extension ***/ -#define SYS_TRBSR_EL1 sys_reg(3, 0, 9, 11, 3) #define SYS_TRBMAR_EL1 sys_reg(3, 0, 9, 11, 4) #define SYS_TRBTRG_EL1 sys_reg(3, 0, 9, 11, 6) #define SYS_TRBIDR_EL1 sys_reg(3, 0, 9, 11, 7) -#define TRBSR_EL1_EC_MASK GENMASK(31, 26) -#define TRBSR_EL1_EC_SHIFT 26 -#define TRBSR_EL1_IRQ BIT(22) -#define TRBSR_EL1_TRG BIT(21) -#define TRBSR_EL1_WRAP BIT(20) -#define TRBSR_EL1_EA BIT(18) -#define TRBSR_EL1_S BIT(17) -#define TRBSR_EL1_MSS_MASK GENMASK(15, 0) -#define TRBSR_EL1_MSS_SHIFT 0 #define TRBSR_EL1_BSC_MASK GENMASK(5, 0) #define TRBSR_EL1_BSC_SHIFT 0 -#define TRBSR_EL1_FSC_MASK GENMASK(5, 0) -#define TRBSR_EL1_FSC_SHIFT 0 #define TRBMAR_EL1_SH_MASK GENMASK(9, 8) #define TRBMAR_EL1_SH_SHIFT 8 #define TRBMAR_EL1_Attr_MASK GENMASK(7, 0) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index c58731f69467..6d12980f01c7 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -2227,3 +2227,19 @@ Sysreg TRBBASER_EL1 3 0 9 11 2 Field 63:12 BASE Res0 11:0 EndSysreg + +Sysreg TRBSR_EL1 3 0 9 11 3 +Res0 63:56 +Field 55:32 MSS2 +Field 31:26 EC +Res0 25:24 +Field 23 DAT +Field 22 IRQ +Field 21 TRG +Field 20 WRAP +Res0 19 +Field 18 EA +Field 17 S +Res0 16 +Field 15:0 MSS +EndSysreg