From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 097E9C4167B for ; Wed, 6 Dec 2023 10:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=nv+8nxWCcw9UiJRolLmLIO7Ly6cRpab35qX6LaqKXrQ=; b=LCGvyUmaayjE+2ByDBu6jTGvCu 4427A503QVyHRsWoqPAdHtg87rqXfhoNtoCF+RhXArUOs/KHGYulSRRRS1Bx2iyz9EDP+c8M7G5VJ jYpkw3kWnSLqu+zC/Zj9Zy18S2x0YOhmmpQp1xpFcBKWN+dDlI7lBXYLxxBtaYnwKCfmHpE+VPhj3 JZ/h4ILFVwzSdxQYl7mb/Iy9QMHwzuBNSVZZJ/iRUKGU0VW0rLl3/lCSIP1001/7KfaXKfWe+Mtlu YExS8S4rypbH7xOhF8Z1SuvbUwEecoB6Tm6jFQ9zjrnLu7GwmNIkFNUiQptRJI07ORKHXBB13jL2H XVKEu4NA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAomd-009dFN-2j; Wed, 06 Dec 2023 10:05:35 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAomZ-009dBb-0t for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2023 10:05:32 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5d42c43d8daso6106947b3.0 for ; Wed, 06 Dec 2023 02:05:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701857130; x=1702461930; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=HW/Vv3mSkSFHB5VAj+6EqxXcgxfeUWtj4k9vDGbRJvc=; b=ILJwYIwPULEsTZCbbOPAFZHuV1FQ1TPrlHqyqfOiKg/IgH3XOtyG5umtncX9tisLQ3 IdS6O9+KayXPkNa+s+9JzbBZ/tMheCMwRouEI0dk/voCG/NouzDNvx1l0iZ34G5yHc6l CfPmWB7dvnbLHtaRBemvJ5Egt0SFGO0hC+L2JTZ6sN4xSI5XWJNZQBAplbqJ1CZY5nMD 2B6dJVhQXMmKqFaJr6Fs8PsjUMQc1kwAuuEHwme9Us8Suvcd7UQVPu/jJdYN/Au6kcCr 3FJLNm4UR8BZXw4dQJ5hzUJ2fDbyfPVP6cXShrU/KpOgZWQkGhE6YP3+zxlGfjo8qSJM hGUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701857130; x=1702461930; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HW/Vv3mSkSFHB5VAj+6EqxXcgxfeUWtj4k9vDGbRJvc=; b=FI+YCEO7WeO95WbuUs7ngKbkLlQidASJUM3J60HiNLPDVTNcTxy6w1QWV0m8Q1A96V nbOmpGLaHxbJnfu1hMGAu0tnHXn1fo19zMC9j4/c3Okqecf8vHFwxtVWMLALfYZT9POS GwXk2u1DiIx5dKsdwsf43GH5xYTlDGkt5MmlvEtUNlE3HnKYifruFB7oMiRmPU9HzXfC qKYbu7U+wmpu/F/h0XLvDfTrlMXIDLg7DGPB3TzxY+616NUJgrBEFbo7iNeQeqRQcBFW /YkOjBKkwsArWZKt3CIKGkzdjRzKR2oxgqZFyA1lgDOx9ADkvjWXGc/xIB6EqGJzy3C0 c31A== X-Gm-Message-State: AOJu0YySfQ8kfixjuK7s8BnP2AyYIyAfUhMoVQOqcF1tMcxa0UxietfH fumqfYt5QM6WFg+SoxuMN05siJTmHg== X-Google-Smtp-Source: AGHT+IEaBmTdiG0NoBlZ9erFMtnEWC6ZNpGw+9oQp6BaW3v1/i3+l76rFQRrsI39CL2HJKdSYnpVd0lpbA== X-Received: from fuad.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1613]) (user=tabba job=sendgmr) by 2002:a05:690c:3382:b0:5d3:985c:800c with SMTP id fl2-20020a05690c338200b005d3985c800cmr103615ywb.3.1701857130088; Wed, 06 Dec 2023 02:05:30 -0800 (PST) Date: Wed, 6 Dec 2023 10:05:00 +0000 In-Reply-To: <20231206100503.564090-1-tabba@google.com> Mime-Version: 1.0 References: <20231206100503.564090-1-tabba@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Message-ID: <20231206100503.564090-11-tabba@google.com> Subject: [PATCH v2 10/12] KVM: arm64: Define FGT NMASK bits relative to other fields From: Fuad Tabba To: kvmarm@lists.linux.dev Cc: maz@kernel.org, oliver.upton@linux.dev, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, eric.auger@redhat.com, jingzhangos@google.com, joey.gouly@arm.com, tabba@google.com, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231206_020531_354868_1EF8F04F X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that RES0 and MASK have full coverage, no speed to manually encode NMASK. Calculate it relative to the other fields. No functional change intended. Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/kvm_arm.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 02442bc90717..cb01dd18f763 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -346,21 +346,21 @@ */ #define __HFGRTR_EL2_RES0 HFGxTR_EL2_RES0 #define __HFGRTR_EL2_MASK GENMASK(49, 0) -#define __HFGRTR_EL2_nMASK (GENMASK(63, 52) | BIT(50)) +#define __HFGRTR_EL2_nMASK ~(__HFGRTR_EL2_RES0 | __HFGRTR_EL2_MASK) #define __HFGWTR_EL2_RES0 (__HFGRTR_EL2_RES0 | HFGWTR_ONLY_EL2_RES0) #define __HFGWTR_EL2_MASK (__HFGRTR_EL2_MASK & ~HFGWTR_ONLY_EL2_RES0) -#define __HFGWTR_EL2_nMASK (__HFGRTR_EL2_nMASK & ~HFGWTR_ONLY_EL2_RES0) +#define __HFGWTR_EL2_nMASK ~(__HFGWTR_EL2_RES0 | __HFGWTR_EL2_MASK) #define __HFGITR_EL2_RES0 HFGITR_EL2_RES0 #define __HFGITR_EL2_MASK (BIT(62) | BIT(60) | GENMASK(54, 0)) -#define __HFGITR_EL2_nMASK GENMASK(59, 55) +#define __HFGITR_EL2_nMASK ~(__HFGITR_EL2_RES0 | __HFGITR_EL2_MASK) #define __HDFGRTR_EL2_RES0 HDFGRTR_EL2_RES0 #define __HDFGRTR_EL2_MASK (BIT(63) | GENMASK(58, 50) | GENMASK(48, 43) | \ GENMASK(41, 40) | GENMASK(37, 22) | \ GENMASK(19, 9) | GENMASK(7, 0)) -#define __HDFGRTR_EL2_nMASK GENMASK(62, 59) +#define __HDFGRTR_EL2_nMASK ~(__HDFGRTR_EL2_RES0 | __HDFGRTR_EL2_MASK) #define __HDFGWTR_EL2_RES0 HDFGWTR_EL2_RES0 #define __HDFGWTR_EL2_MASK (GENMASK(57, 52) | GENMASK(50, 48) | \ @@ -368,16 +368,16 @@ GENMASK(37, 35) | GENMASK(33, 31) | \ GENMASK(29, 23) | GENMASK(21, 10) | \ GENMASK(8, 7) | GENMASK(5, 0)) -#define __HDFGWTR_EL2_nMASK GENMASK(62, 60) +#define __HDFGWTR_EL2_nMASK ~(__HDFGWTR_EL2_RES0 | __HDFGWTR_EL2_MASK) #define __HAFGRTR_EL2_RES0 HAFGRTR_EL2_RES0 #define __HAFGRTR_EL2_MASK (GENMASK(49, 17) | GENMASK(4, 0)) -#define __HAFGRTR_EL2_nMASK 0UL +#define __HAFGRTR_EL2_nMASK ~(__HAFGRTR_EL2_RES0 | __HAFGRTR_EL2_MASK) /* Similar definitions for HCRX_EL2 */ #define __HCRX_EL2_RES0 HCRX_EL2_RES0 #define __HCRX_EL2_MASK (BIT(6)) -#define __HCRX_EL2_nMASK (GENMASK(24, 14) | GENMASK(11, 7) | GENMASK(5, 0)) +#define __HCRX_EL2_nMASK ~(__HCRX_EL2_RES0 | __HCRX_EL2_MASK) /* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */ #define HPFAR_MASK (~UL(0xf)) -- 2.43.0.rc2.451.g8631bc7472-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel