From patchwork Mon May 22 16:22:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 97531 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1574296vqo; Mon, 22 May 2023 09:30:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ44aOD0QmvzpdOFQxyIQjBGHldvxNzmoRL6l+XS2fTttOii+3SAluDJMwT7gZhm0pZX/hcq X-Received: by 2002:a05:6a20:4289:b0:103:9d9b:1ec6 with SMTP id o9-20020a056a20428900b001039d9b1ec6mr13271456pzj.28.1684773045818; Mon, 22 May 2023 09:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684773045; cv=none; d=google.com; s=arc-20160816; b=hkZ3CG81xISA/ejrGVkS3j/ieSm3QTnygWCCdrN0Y3lpnUPpGiD3QzbOSelGUsbgDB n6iQP0B56IIolx8j3v7f/yvQ+sfdj2m05eepKWdb6SP+vQWO9esmILkg6/s3TwA/WbtN tRoCWeAzThNk5yVQfEJB8jHK6zdMTfO7YW2BvrjseffNNwvkWiC6KOzxRl5LsuTTeGC8 e58eclI7f3bwrfzG08k5pYcuBZlKtA7LRHWv2Rcm52+7wBVmZ4wQR0HQfCcO3/3Tf+OZ GolsSnEiXu4MWfhKxJkqdusimLvS0qOcLIchUOsEqFfTJ6BBy/dUdrQT/uvtu69U7xXS sAeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Gjk6LXf233i1NFuUCXYPXX/UFExuyrky0XCUfMEcKYs=; b=qrp241quQEQ9HlY4ab4MGBjoqBuZi5LEp3eBCYrf+OZMx0/b5OMBKM41uwgCk9RMnv yROXu/sQyIXVebkMFW5+D826lZh+Eknlw8zCFX1YKnGEedLv8xPXEriOSbMOmkbE1ONH 5u9Rke0prGf0S5517Oib3raPrbiT30qylomw7Bw1GQph2Gu26f58vmQxlc0XsvAUy6VZ LeBrm1rLlZ9MQq5+F2mU9xVfy3z3DPHkkPbQQKs/yAXC0jvu8tJ/F2U7NM6JM270XBnu omJZSNwhGP/zvQUDf7Hwr+kD8v5uZyNy2xQCUuAb4ruNHVCz1NPz8DUs5MMQJ6ydMOkk QwTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cc3Z97YK; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s12-20020a63b40c000000b00535bf852410si4911356pgf.313.2023.05.22.09.30.33; Mon, 22 May 2023 09:30:45 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cc3Z97YK; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231263AbjEVQW6 (ORCPT + 99 others); Mon, 22 May 2023 12:22:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230237AbjEVQWy (ORCPT ); Mon, 22 May 2023 12:22:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 570CBBF for ; Mon, 22 May 2023 09:22:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E3047620C9 for ; Mon, 22 May 2023 16:22:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EA37C433A0; Mon, 22 May 2023 16:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772572; bh=FzovtixhHyDID3RroFvdlMrjlo2vz33VqdnD5NENejY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cc3Z97YKNg9nXngLP2sbbY40prIgld1TqJJLJJQ1h5FJxvhRKtbX2YpDmhus3lI// ej5d0Mub4gRxJLqJUKU8Q1TW35JxK/o48MT+xZniufv4QEZ2EGJ1jsDDdQwPges5XD ObUGMVPsl6D0p8oTuzWWKukDLOs22Ds06nvDnJydnxo4vxqXJgy+K+sfgkwBkxDNaV O+YrIPpycJ7fuEvivUrcWqWiNWQyEfeYoRIzjBEsteqaXkJZYHL/qeoVGL1hMqNnZ1 A2tS/gcN52SjgwBkFmVqHEq+XIL18G56tBzKMsMbAFl1SShpj5o2129CBNxRggfujG f3k7ZKWKHM01w== From: Mark Brown Date: Mon, 22 May 2023 17:22:40 +0100 Subject: [PATCH 1/5] arm64/sysreg: Remove some unused sysreg definitions MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v1-1-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1048; i=broonie@kernel.org; h=from:subject:message-id; bh=FzovtixhHyDID3RroFvdlMrjlo2vz33VqdnD5NENejY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bTOQmh6YBm5GAIe6KOw4KLzrietdti5W4movm2 oPdkxQ6JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW0wAKCRAk1otyXVSH0Fp4B/ 96RE12Zk9Ru9IsJVSTKjxckaPNIMmsFnTa+lIHqkiha1EUClzNtahah2XEkhufQX8RQrPe/eWGmiD/ nhs1vN3pgP55NpP1J4DKCrCYYdRbLpdDru4wwi365uuW/6qBLeCFkzDisv5d45d9XlgUs+fO1FTtSv BUdtR1c0NFUgKuAhW2MgB4tJmTPLxGGx/uG19rktS5b55Z83NZdWHapOSyxX3TONlRnVli42DP4iIn cs2gGPnER3qGV479EeN25lyzdvtinRZJQbRjSVpM3zaThBwb4yd9SPTo4doldIk12z6XejKACVLN3v cAPK4grUJseHoNSo1E/KurhTWZVHlL X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,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?1766612581505199905?= X-GMAIL-MSGID: =?utf-8?q?1766612581505199905?= Since there are no references to OSDTRRX_EL1 or OSECCR_EL1 in the code just remove the definitions rather than converting to automatic generation. Signed-off-by: Mark Brown Reviewed-by: Anshuman Khandual Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 9e3ecba3c4e6..6505665624d4 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -134,11 +134,8 @@ #define SYS_SVCR_SMSTART_SM_EL0 sys_reg(0, 3, 4, 3, 3) #define SYS_SVCR_SMSTOP_SMZA_EL0 sys_reg(0, 3, 4, 6, 3) -#define SYS_OSDTRRX_EL1 sys_reg(2, 0, 0, 0, 2) #define SYS_MDCCINT_EL1 sys_reg(2, 0, 0, 2, 0) #define SYS_MDSCR_EL1 sys_reg(2, 0, 0, 2, 2) -#define SYS_OSDTRTX_EL1 sys_reg(2, 0, 0, 3, 2) -#define SYS_OSECCR_EL1 sys_reg(2, 0, 0, 6, 2) #define SYS_DBGBVRn_EL1(n) sys_reg(2, 0, 0, n, 4) #define SYS_DBGBCRn_EL1(n) sys_reg(2, 0, 0, n, 5) #define SYS_DBGWVRn_EL1(n) sys_reg(2, 0, 0, n, 6) From patchwork Mon May 22 16:22:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 97532 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1575282vqo; Mon, 22 May 2023 09:32:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ54xfMBtcmfFZcswO21wkfPKm/hCK2nXCnaW7b/1KT2GDepH5OI4QM8vihXw9eWiOwAN3BK X-Received: by 2002:a17:902:ce8f:b0:1af:b91c:bddc with SMTP id f15-20020a170902ce8f00b001afb91cbddcmr3154064plg.68.1684773126399; Mon, 22 May 2023 09:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684773126; cv=none; d=google.com; s=arc-20160816; b=xqS7TAXFLdCiX6liIPAml7j6cVQI506sG8I9crbu4+xjuiYAWI//3GrIrnWxlWBb3J i7+z0YhDIWTN6UDsqoo3yU/qkgCRoHW0qAHwxCqGkM2ZFY172FG6zCzacXDn0NaSn5GY H404IyWcdBso0LfdQcGMF7a6MLffQ+XVuW+cccIA82XyrUW90fV+UNhy1KVs7VHGoVsQ uMFTZ/8bSP5VQqkqs2C2Hdu3MpIsJPXuXLNa7J3hrSFxe8PdaMRvCUAbLq64x3B6Yx7c Q7j8ooYMEPnnD4wZwWFiuOtlxnie16/P4dUgPtKk3MEpZuIDXeFGBF7zQ01PYr91CtyS W1Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=gHo8P7mYiHYYQQy6479J+JcxFRqAkSvfjzB9XLxn2LA=; b=pGTVRBJ81altd4U3OlgLv2Kwl+rfqEElH6GXPgEebnJSrzMtfsbivdlE4+Q/FxApCI 0GQu82xTSmcTCUFRR0cFpesfRqIEJoDLATBtwzfqi3IF/5lB5EGRSCvISsUJpf77MjNq ZHCrri7GtZGDgwWb+wdAURQ5N4UdiSk3NbgleZzsxeIugNdNYk9kzB1iS5oi3z917fZE HRNdu8cDSC08RkQcsN0eWlRg60QtOuKN7/QFV4255lTf0S1YXCjzpXvXGCkBNMXfYJlf 3uWn1vVuoFkqKKkXxT+MmTGArVaeh+ZPpLnXUWmGMoQHDU5fKth5J1LFW1LttsQSnvFH PQXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qKM79+nZ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s12-20020a170902ea0c00b001aade54f986si296290plg.249.2023.05.22.09.31.54; Mon, 22 May 2023 09:32:06 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qKM79+nZ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbjEVQXA (ORCPT + 99 others); Mon, 22 May 2023 12:23:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231266AbjEVQW4 (ORCPT ); Mon, 22 May 2023 12:22:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAC68F1 for ; Mon, 22 May 2023 09:22:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4355760C67 for ; Mon, 22 May 2023 16:22:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBEACC433EF; Mon, 22 May 2023 16:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772574; bh=G/fe6roSUXDmM2/KNg6p2UkocZaL5qbzAOdEZ818tv0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qKM79+nZdmX7gHlPPtIfSPENp3MVLRrLVU0VHDxtxdnnzTYDSNY1rtyL1w9es3oF2 5+sNrvULuU2S5n/rXS8al1M2hRKCMF56QE51q+toooVFjAhYl6R6g9qrGXZw/Lz1oF LSN54S71OVuK3rjsILEPVI1mrMbAgO0F4ITHMqUMWeQz+yaMr+AoHRJKJYXMfWd52O Zuqiv2K4MWmQ3aH9LjE8pxd3DNET5YVWZHoErU5/murnd50g9GybMi+eRWAK4ePa2A Xul1nlgcMiRmBgR6JOBRw1ilKTDQz0/pjyGu2Pp1+iluW2MrTSCWcbGyPuWT2HMze3 H5+mwEVZxuXsQ== From: Mark Brown Date: Mon, 22 May 2023 17:22:41 +0100 Subject: [PATCH 2/5] arm64/sysreg: Convert MDCCINT_EL1 to automatic register generation MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v1-2-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1361; i=broonie@kernel.org; h=from:subject:message-id; bh=G/fe6roSUXDmM2/KNg6p2UkocZaL5qbzAOdEZ818tv0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bUO+I3Gj34AOYEKcMicgGKQTnFUZWH7GfRFe+U UjbRnwWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1AAKCRAk1otyXVSH0AiYB/ 0TrUSU8JZfIsTuOruidRVPHGcPEuHeophKStHYETANcwfKYqxw19PiYdFbWpIy1FMx78ezCXSZjhzh ucOKh/QkmTRpdbV9pJo5ruJEzrvoBwPEzsLWEq1G+Fc6wkBbtHGGIM9dsOMIZ1Ry9Ql6oC9UmvKaAK UPSwJ4hYZ7bRbkWFbQtDp6GPqJ913SPR8Nei1sAZ50dpSyZ+JtV3l/KdJujWInQTtyaII54GQeNd6b ZHmevprX3hbgv5z9q/dDVkHpNA6xK1TaogrTyeK78LdkXBgcnInqtY7IYVy+6mYDk9eeyStmm3Bzl/ JhoAHv8rPDhz472V6SwUB+/BnCXt2P X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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?1766612665974415260?= X-GMAIL-MSGID: =?utf-8?q?1766612665974415260?= Convert MDCCINT_EL1 to automatic register generation as per DDI0616 2023-03. No functional change. Signed-off-by: Mark Brown Reviewed-by: Anshuman Khandual Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 6505665624d4..4e48bb4dca6a 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -134,7 +134,6 @@ #define SYS_SVCR_SMSTART_SM_EL0 sys_reg(0, 3, 4, 3, 3) #define SYS_SVCR_SMSTOP_SMZA_EL0 sys_reg(0, 3, 4, 6, 3) -#define SYS_MDCCINT_EL1 sys_reg(2, 0, 0, 2, 0) #define SYS_MDSCR_EL1 sys_reg(2, 0, 0, 2, 2) #define SYS_DBGBVRn_EL1(n) sys_reg(2, 0, 0, n, 4) #define SYS_DBGBCRn_EL1(n) sys_reg(2, 0, 0, n, 5) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index dd5a9c7e310f..1699e87bc0b4 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -48,6 +48,13 @@ # feature that introduces them (eg, FEAT_LS64_ACCDATA introduces enumeration # item ACCDATA) though it may be more taseful to do something else. +Sysreg MDCCINT_EL1 2 0 0 2 0 +Res0 63:31 +Field 30 RX +Field 29 TX +Res0 28:0 +EndSysreg + Sysreg ID_PFR0_EL1 3 0 0 1 0 Res0 63:32 UnsignedEnum 31:28 RAS From patchwork Mon May 22 16:22:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 97536 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1587087vqo; Mon, 22 May 2023 09:53:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6H+VIIk2lbUqD8/5VC9PObzkM3lz4aoip0EkHw3wLTOH32yPQ7PB9ZM4OmueTbI+tgPjwy X-Received: by 2002:a17:902:db07:b0:1ac:8dae:d842 with SMTP id m7-20020a170902db0700b001ac8daed842mr13770531plx.46.1684774386218; Mon, 22 May 2023 09:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684774386; cv=none; d=google.com; s=arc-20160816; b=LNT92n3qOI3O47+OOGb0z2Z4FOfTnLIE6FK60CEj88VTHj16JnxLMooKh0DPXATNhY CkWX/T+ZGGbLxcgWZngYPbW/EGjw2MZIYiOG90jfUOK7qn4v6Jtfq/ts7UMJFvgxiFYg HuLr6dPtxwOyTwxSUFF/bi4bbb0l+NVix3J4G9cwuRf8TgyG82Day04L03lmWbEPbN2X VsXkgzbKglG73hRuTqReR5wVdVyQRPhZNJsu9MmuSokKQoEjw6RKSmFDDFirZtRajdeS CvqmjzZ4OZFvxBNEMilREsVDxRlcAV8cRWEz5pc1E/a2qIQ0oKL+iuXneFZRGmmYW1u7 KFMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=A62nOLrWUNwYiM9oY2zl3bmH2oLlyfs5+qHmZolWRRk=; b=w82MgWJO7pJxnbBgsENYjqr6TTdAT9uJ0AMoL88F1rbN9V+PdcwF6czAAQEnY7mzPv h3x4quretq/ObKVRMYh3UuExgXdl+BjxMp7KmelIavrN8fQ6O9JHTSlbQWsrwHG3pOnV LGj2fhPCIGp3P6CFuiEwm9IrPofSQEWDywK0o5Fh/bqFmRk+XE7qIT7v+TKTYLdS0E4T 9ds6hKA+FLSecHh2pwU6UP+mH6XCIqIhVOyuFD/U+vPuUZlEGLVhwfo/c1TGI3IHN/vA HE1SROPEsSa91AVoDJJe+9cmwCMFkCtqjsMtSua2htslPeFOoPYeFj5udCIG9ZGh7102 AZGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P0oRwEQg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j1-20020a170902da8100b001a216fddd03si656467plx.649.2023.05.22.09.52.50; Mon, 22 May 2023 09:53:06 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P0oRwEQg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231441AbjEVQXD (ORCPT + 99 others); Mon, 22 May 2023 12:23:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231397AbjEVQW7 (ORCPT ); Mon, 22 May 2023 12:22:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25E22E9 for ; Mon, 22 May 2023 09:22:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A77F660C67 for ; Mon, 22 May 2023 16:22:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22169C4339E; Mon, 22 May 2023 16:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772577; bh=69OmJkjw4vz6UuLeKe32At8mP5D9dT1Jr6f+G95j73U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=P0oRwEQgpRkPdhBxHeu7agzbs74NOm5xgfmcQuhrQ6W4Iw2JMQAEdXxvApnhT2rfr 6clQw4CzU34F3feic7LgFg8TOtm9yco78HkqnIeM6UHiWrr9PI/Aw4IpgGZuWmoYHS dl/Up09B9J5wxDZxmEeDGtnMdnJM10kq3UiecQAJdf+/oCl7GjcaesXfMVyjtHOyVo ryzvYxJpnFVdAVPBDQduNefFDoCAWLvcExKicHhex8fxH3fHGK9mShJiYqAhNd8VSh /KyF4fiWG54fFSEbYAWbnU1iynqA56rnQ5n8Vb/Tj5aKgmuQgvbBzEU77OfLeVswxj zBtpshvPYU+lg== From: Mark Brown Date: Mon, 22 May 2023 17:22:42 +0100 Subject: [PATCH 3/5] arm64/sysreg: Convert MDSCR_EL1 to automatic register generation MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v1-3-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1585; i=broonie@kernel.org; h=from:subject:message-id; bh=69OmJkjw4vz6UuLeKe32At8mP5D9dT1Jr6f+G95j73U=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bVL7ffvgZ5ePbP2LQRm/DpBM5HR4e0vEsXs6NJ Yu3gJ8CJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1QAKCRAk1otyXVSH0CtMB/ 40R9+nP6xmrfk5WVeaHV8vDixBon2zV1jf6yvfeZ8vy6iK2bTeIh635o0cvT6cw7TAU+A39yem3PU8 advcTbZL5hUL2frw9DLpla4ccORKZkDea8BxjDzjIy75yXzJttgqM6TI13qq5XpNuvtDsAqJ91Gcfu fG5S+KG2mM2/MrfRGBmlb+ReqOY53AVShGH7OGHepGqbwBaosvsRXciodx9NMHbQZYA82gfxskLJ4u Px3PeFek0SCY9epF4euSZk6/l1A/KYkrjLZW7QvVxG+cHuQZhoDn4GqwEhbD/JyYoTaRtXKXW06Oxu ozL4j526nmNm6ii9nx0cWnpiFJDQ8v X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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?1766613987213060943?= X-GMAIL-MSGID: =?utf-8?q?1766613987213060943?= Convert MDSCR_EL1 to automatic register generation as per DDI0616 2023-03. No functional change. Signed-off-by: Mark Brown Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 1 - arch/arm64/tools/sysreg | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 4e48bb4dca6a..4ecae92b56b5 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -134,7 +134,6 @@ #define SYS_SVCR_SMSTART_SM_EL0 sys_reg(0, 3, 4, 3, 3) #define SYS_SVCR_SMSTOP_SMZA_EL0 sys_reg(0, 3, 4, 6, 3) -#define SYS_MDSCR_EL1 sys_reg(2, 0, 0, 2, 2) #define SYS_DBGBVRn_EL1(n) sys_reg(2, 0, 0, n, 4) #define SYS_DBGBCRn_EL1(n) sys_reg(2, 0, 0, n, 5) #define SYS_DBGWVRn_EL1(n) sys_reg(2, 0, 0, n, 6) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 1699e87bc0b4..a5ae0e19fc9f 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -55,6 +55,34 @@ Field 29 TX Res0 28:0 EndSysreg +Sysreg MDSCR_EL1 2 0 0 2 2 +Res0 63:36 +Field 35 EHBWE +Field 34 EnSPM +Field 33 TTA +Field 32 EMBWE +Field 31 TFO +Field 30 RXfull +Field 29 TXfull +Res0 28 +Field 27 RXO +Field 26 TXU +Res0 25:24 +Field 23:22 INTdis +Field 21 TDA +Res0 20 +Field 19 SC2 +Res0 18:16 +Field 15 MDE +Field 14 HDE +Field 13 KDE +Field 12 TDCC +Res0 11:7 +Field 6 ERR +Res0 5:1 +Field 0 SS +EndSysreg + Sysreg ID_PFR0_EL1 3 0 0 1 0 Res0 63:32 UnsignedEnum 31:28 RAS From patchwork Mon May 22 16:22:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 97530 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1574226vqo; Mon, 22 May 2023 09:30:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Fq2NCT3RPQHBXgEEqSSsgl6MDIP9nsnTJL7Uc7k2B1jLHUdt7Vyu9FzxJgtcLSwcacVZ6 X-Received: by 2002:a17:90b:3146:b0:255:8063:c8dd with SMTP id ip6-20020a17090b314600b002558063c8ddmr1963957pjb.18.1684773039302; Mon, 22 May 2023 09:30:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684773039; cv=none; d=google.com; s=arc-20160816; b=JG9gA4EywE1CL4v7IYqBiDbIN9NmLnj6MAiDeg9XPDGiylmbwiATdMC9UoiDWUPWU7 Dws279bEq2nbySyhiGPLClB5Oy/BRUvPRnIcQE4uBXpVxNMJ0LMvuVLsrCrvh1A87/3C zLGVGFMevrnLFz374i0elU1oP2jkri5D5azR7+Jvzb8h10j0wSKm4D+k2twb/jcU9xHo AlyA6bclFC7C281y9ahHVxHOYCGxe7wZr79TsqS9uR058fH9vqC907dgoCm2TM7S3XsM Q+SJq6WpxBpbxKQUoLOJLm1Arj36t5fzBi7/XxLL+9oBUJhm2CPxeIjIf0u5PiE/m282 yogQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=/7pVRqif5u3rwxU6zTq//mJ9Ci1pZ+RgrrfjkKjAdCU=; b=WsK6YqzplwZKDVSwQ36/YfZLfho37hDIZA+Fr3dA84elDCo1B5nzooWiihECBU9irP 701KHl9LnxsbW1wrq8XIm70UrjmzFYPLNsXSF6bZSJKh0QRGx1iSVizgugXWRHIJDd30 649cCXlrXYuQ3w1i2cVekDs8+3+3xvjo8Dhw3vbC4q/n4AQNKx3jthQjqKO4KTLCuhl5 nQ/vti00WFqvoMDp3Tt7F8eXTs2bMG0xp+M3Z+4oNxCHT3xSiiUP1Qy+4w54Ms97BwGi ZalAZEwTLoFUFCcA6OJOLpMbYhQfGweNf70UP0Xe8pyIS4jrDEn9ge9H3jVAH2R1YF+Y p1BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bToiEcu0; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g26-20020a63375a000000b005349286fcc0si5144779pgn.302.2023.05.22.09.30.26; Mon, 22 May 2023 09:30:39 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bToiEcu0; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231548AbjEVQXF (ORCPT + 99 others); Mon, 22 May 2023 12:23:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231448AbjEVQXB (ORCPT ); Mon, 22 May 2023 12:23:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84A96F4 for ; Mon, 22 May 2023 09:23:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0BD1462018 for ; Mon, 22 May 2023 16:23:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FE98C433A1; Mon, 22 May 2023 16:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772579; bh=CbUz/yoL9PyMSTqsbEC82EZry/1wdlsepwx6fDSgjrY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bToiEcu0XHJRGSZDIG9qg2M0S+uaKB7rLa6MAcB9huIBJf0mtmUlJ5xUcRW0cV1HO EP7cIAMwNiCRtYB+O/cd0yOrgfsuj9AvH6srqd4Lga0xdgoojtmCLcRf8m+siFhn3O DTa0gF+ZAFc0j2Rve5Al6elICn3sJKz3lTZUc4X+4ePlxquBkxbFARhfpRruqglYow dd0WrAztZd373eMd5mnhUlzAihvzh1d2ysU3s5Kizr+v59PTifjE05KQ2k7M1rwQ3e xIpB+Amyx8tNlbKmxbIyHOm7UAG2WLOKmiKAz+YKtr0qsalgV9wtfZFl0H6rHJ++8P RcWpiYxxmIpOg== From: Mark Brown Date: Mon, 22 May 2023 17:22:43 +0100 Subject: [PATCH 4/5] arm64/sysreg: Standardise naming of bitfield constants in OSL[AS]R_EL1 MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v1-4-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=3462; i=broonie@kernel.org; h=from:subject:message-id; bh=CbUz/yoL9PyMSTqsbEC82EZry/1wdlsepwx6fDSgjrY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bWSbm537iErZkk8Xr8ZgULfL2Xb94AV4jb1wRM zEBp0XKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1gAKCRAk1otyXVSH0HyhB/ 9Bo7sZXLklp6xHD7EhcM1apRk517eVTUbCt4PPAb5ng28+IiHaLcmt2Dsx8JOpYT7iS9xvtiM2qLKz 7yEEUh4uNXOb3ooFqdubs1dzLBvNy/3jQTZzwzqm+BwMkUMQTtmQg81B99j61lkyJHETRfEPiPmDAL 7fTrLW43BoRCbUJe4hp+6D4K3ZO/qta6SdBVfTU2Hz3CAl5OexaF+MMw1WgQCkYDaqfGxuhP0oVXUy cKNbABwcFjQ/YQ80g2CK7gMwFL0mWVwpo2wde+di9YxbluhMLIIKmwlNMJ4PsVHB2Uq4j45zIHQVJK jWPvX07eAvb2BfuV5MBTV9a2e1EcsI X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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?1766612574631465268?= X-GMAIL-MSGID: =?utf-8?q?1766612574631465268?= Our standard scheme for naming the constants for bitfields in system registers includes _ELx in the name but not the SYS_, update the constants for OSL[AS]R_EL1 to follow this convention. Signed-off-by: Mark Brown Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/include/asm/sysreg.h | 10 +++++----- arch/arm64/kvm/sys_regs.c | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index bcd774d74f34..cde4ad590f8c 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -996,7 +996,7 @@ void kvm_arm_clear_debug(struct kvm_vcpu *vcpu); void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu); #define kvm_vcpu_os_lock_enabled(vcpu) \ - (!!(__vcpu_sys_reg(vcpu, OSLSR_EL1) & SYS_OSLSR_OSLK)) + (!!(__vcpu_sys_reg(vcpu, OSLSR_EL1) & OSLSR_EL1_OSLK)) int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 4ecae92b56b5..09de958e79ed 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -141,13 +141,13 @@ #define SYS_MDRAR_EL1 sys_reg(2, 0, 1, 0, 0) #define SYS_OSLAR_EL1 sys_reg(2, 0, 1, 0, 4) -#define SYS_OSLAR_OSLK BIT(0) +#define OSLAR_EL1_OSLK BIT(0) #define SYS_OSLSR_EL1 sys_reg(2, 0, 1, 1, 4) -#define SYS_OSLSR_OSLM_MASK (BIT(3) | BIT(0)) -#define SYS_OSLSR_OSLM_NI 0 -#define SYS_OSLSR_OSLM_IMPLEMENTED BIT(3) -#define SYS_OSLSR_OSLK BIT(1) +#define OSLSR_EL1_OSLM_MASK (BIT(3) | BIT(0)) +#define OSLSR_EL1_OSLM_NI 0 +#define OSLSR_EL1_OSLM_IMPLEMENTED BIT(3) +#define OSLSR_EL1_OSLK BIT(1) #define SYS_OSDLR_EL1 sys_reg(2, 0, 1, 3, 4) #define SYS_DBGPRCR_EL1 sys_reg(2, 0, 1, 4, 4) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 53749d3a0996..8a5160a90d3c 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -388,9 +388,9 @@ static bool trap_oslar_el1(struct kvm_vcpu *vcpu, return read_from_write_only(vcpu, p, r); /* Forward the OSLK bit to OSLSR */ - oslsr = __vcpu_sys_reg(vcpu, OSLSR_EL1) & ~SYS_OSLSR_OSLK; - if (p->regval & SYS_OSLAR_OSLK) - oslsr |= SYS_OSLSR_OSLK; + oslsr = __vcpu_sys_reg(vcpu, OSLSR_EL1) & ~OSLSR_EL1_OSLK; + if (p->regval & OSLAR_EL1_OSLK) + oslsr |= OSLSR_EL1_OSLK; __vcpu_sys_reg(vcpu, OSLSR_EL1) = oslsr; return true; @@ -414,7 +414,7 @@ static int set_oslsr_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, * The only modifiable bit is the OSLK bit. Refuse the write if * userspace attempts to change any other bit in the register. */ - if ((val ^ rd->val) & ~SYS_OSLSR_OSLK) + if ((val ^ rd->val) & ~OSLSR_EL1_OSLK) return -EINVAL; __vcpu_sys_reg(vcpu, rd->reg) = val; @@ -1760,7 +1760,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_MDRAR_EL1), trap_raz_wi }, { SYS_DESC(SYS_OSLAR_EL1), trap_oslar_el1 }, { SYS_DESC(SYS_OSLSR_EL1), trap_oslsr_el1, reset_val, OSLSR_EL1, - SYS_OSLSR_OSLM_IMPLEMENTED, .set_user = set_oslsr_el1, }, + OSLSR_EL1_OSLM_IMPLEMENTED, .set_user = set_oslsr_el1, }, { SYS_DESC(SYS_OSDLR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGPRCR_EL1), trap_raz_wi }, { SYS_DESC(SYS_DBGCLAIMSET_EL1), trap_raz_wi }, From patchwork Mon May 22 16:22:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 97533 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1575290vqo; Mon, 22 May 2023 09:32:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6tP+1u1sv2C5Q4yWPBww94S44o3M4L+PwDBeOi1fPbbO9xKeZ6GtCXPdI+Fxipb7mi9Fc0 X-Received: by 2002:a17:902:ef94:b0:1ab:1241:f671 with SMTP id iz20-20020a170902ef9400b001ab1241f671mr10396266plb.29.1684773127146; Mon, 22 May 2023 09:32:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684773127; cv=none; d=google.com; s=arc-20160816; b=ZInb+NIPl0ObL4QMo0T8PbFhTK+6Uqu+sOcQNcEGLyj4zBnP7v/UAxUHRWHV7uhXrf AzOpJBfvlqNUt+y3QQ8oJUgAr1Lwqm58cGILBiLVji5N0VnEdfBOJAJUAr1xwajwOip7 3lxLrLSOclsNyGvmo3WLNlGPWubwfLzWnXj3bjSv3qiovvVO+E8plRFS3GEJySCIKp9H wDvFvX6kHF/o8JEe5XaMltoNZ4tVx8YIwMXRI/icZ+6PEhovx1epH2KDggrUy+oMAqpP K6W3twjVdLREzToh0tJEWmX0217mpn1GT0LRHe0Qaqz3TVTCUrwZsbXxP+gPFijZ74vC 788g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Eob8nJiXEKGs9l3FLi4U5aThtJuInTONmOD12CZuJq0=; b=eLjEGd1gK4K8h1dmguNbYAHbSYx4SFU/jltWUeXAkAKhQYSUgY4mBA6/LB/Cf+mOrh ASkrL7k6ktHUEnFBMEzv7HEbiwvkGJM2fLFh3Zl6xHyyxQfp4J49PKgDLDxY0PDph91V saFMeZeMdSEhmJdseqKe6hSM32XgdqA01Z++vw0ifyOGnOn/puFJTlWfhi1lEcauZz1k quE6Beadv2aJDuyn0MOHWX96vzO5G+veXMcOKNIDUAXqu5WPnz6jz8QJieOtaHO6SDxV 9F7JMFtIjaJS/2RYxE7AogZBx7gAtl2/ok5c6xuIDRsLAttFQpqHKy6BHqv8AwsdWCfB yWFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="R7TlZ/sw"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg1-20020a17090326c100b001a987371830si4661709plb.120.2023.05.22.09.31.54; Mon, 22 May 2023 09:32:07 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="R7TlZ/sw"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231683AbjEVQXL (ORCPT + 99 others); Mon, 22 May 2023 12:23:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231538AbjEVQXF (ORCPT ); Mon, 22 May 2023 12:23:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBD3CE9 for ; Mon, 22 May 2023 09:23:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6B51E60C67 for ; Mon, 22 May 2023 16:23:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD2F3C4339B; Mon, 22 May 2023 16:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684772581; bh=8nGdHG41Sq+2pYzY75ll3lCjhbxICW46NC3itOTILLg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=R7TlZ/swN6n9ZdujR7/eUkEGWnPXfR/m/fUSJnjfMkjNX/d3U8JJpVB3QG9UQ+18b 3ChwfHMDcb8My8rVJ8qPc540VZ5I6CluEX2qZY7i7YDRZWdpP9BCHG9aEysn2br4W0 pNQbXsJgg65YokDFndYFNZWBtcVaQd6suT2aqrHroiLUfFclM6JYPd/QMuIbff8/UD u5li13IJZknuBpczlaQBQUT+h5ubO2XVRZhU/ZzFDxtpw2OPLBnzGiN0jXqYVMjuS1 MBB7WM/MQvIrIxRKWLjTHF0q6Ovt8lLWjeUsN0qvDHW/JsKuLDv4biFXOT/VC5rEwH HoH5B+n7e7M5Q== From: Mark Brown Date: Mon, 22 May 2023 17:22:44 +0100 Subject: [PATCH 5/5] arm64/sysreg: Convert OSLAR_EL1 to automatic generation MIME-Version: 1.0 Message-Id: <20230419-arm64-syreg-gen-v1-5-936cd769cb9e@kernel.org> References: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> In-Reply-To: <20230419-arm64-syreg-gen-v1-0-936cd769cb9e@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, Mark Brown X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1203; i=broonie@kernel.org; h=from:subject:message-id; bh=8nGdHG41Sq+2pYzY75ll3lCjhbxICW46NC3itOTILLg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBka5bWlBIlzvv8r7RXpM0eD5xKcfN7tXnKCuoI4k4T HPI1ahOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZGuW1gAKCRAk1otyXVSH0NhaB/ 9bdRaqARex0WH59AXvDsCZC9s+erjBaqknoy800EVrUq6jyDkxJnG8NPir0O99TAJk7pXmDX/sjD73 tQ7eOF0pbUEWTlS/qnLeOXqvoOOpAb1aWnDACpAIujz+TDao8NnngqH5qgyPm1Xv7uBKGJ7+3hEoid /uCgcmtDO1KXNWH9hx2gb3nlEppBon/Fq321i9iU5xQicecw1a8yC5VyIKC+gprcPPH512TYXTM2wO 6vajE1NAtcvXxkyUwIAnPAaRxsQxuq2EMNuIucHwI0HzN6hIWTOJo/sTe5Cfu1G0ATadTMiNSrNwbf 3Qk0aJDyBXy27TnWbPPeJdbyIl9w7V X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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?1766612666515203582?= X-GMAIL-MSGID: =?utf-8?q?1766612666515203582?= Convert OSLAR_EL1 to automatic generation as per DDI0601 2023-03. No functional change. Signed-off-by: Mark Brown Reviewed-by: Shaoqin Huang --- arch/arm64/include/asm/sysreg.h | 3 --- arch/arm64/tools/sysreg | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 09de958e79ed..3b51e532caa9 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -140,9 +140,6 @@ #define SYS_DBGWCRn_EL1(n) sys_reg(2, 0, 0, n, 7) #define SYS_MDRAR_EL1 sys_reg(2, 0, 1, 0, 0) -#define SYS_OSLAR_EL1 sys_reg(2, 0, 1, 0, 4) -#define OSLAR_EL1_OSLK BIT(0) - #define SYS_OSLSR_EL1 sys_reg(2, 0, 1, 1, 4) #define OSLSR_EL1_OSLM_MASK (BIT(3) | BIT(0)) #define OSLSR_EL1_OSLM_NI 0 diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index a5ae0e19fc9f..84df0b7feb45 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -83,6 +83,11 @@ Res0 5:1 Field 0 SS EndSysreg +Sysreg OSLAR_EL1 2 0 1 0 4 +Res0 63:1 +Field 0 OSLK +EndSysreg + Sysreg ID_PFR0_EL1 3 0 0 1 0 Res0 63:32 UnsignedEnum 31:28 RAS