From nobody Mon Mar 23 21:25:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773420318; cv=none; d=zohomail.com; s=zohoarc; b=PcZmOxfpJX+GwKuYq+wJYrjwtOxSHzjHl0TUP3r72i8ztM9KFZh2lkzit+dA/awC7h7Zuw+jsIU3MAhezGfnIs8NzasRL96ivmA+W5I5o8qTdju9MPN7C+2cfe8NtmAoj2hB2l/0JtSjI5QA90RjJmmn79HUK2q+c3LX29PE+O0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773420318; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WC9Q7UDifDEqfqwQFhunvL4KaBDnJAUUS0hjUL4t6mI=; b=SAuz3ew8cYM3lSko7eF8Lq4OWxNZZFIWw4RMmpZMxCGIS9MlW1vaD3YhbIPZfTZfsbUpxd5U5s1bhZVUxlIqqI+hkhBpU7RDgJOojKdZcMlmuQPlaCZHG/ueoKLXhjlLofQkZ9Tts6nEGwVWVJwyfyVqWuHS5ywI/MM28nu/JA4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1773420318099455.70081478342536; Fri, 13 Mar 2026 09:45:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1254120.1550126 (Exim 4.92) (envelope-from ) id 1w15dC-000579-86; Fri, 13 Mar 2026 16:44:58 +0000 Received: by outflank-mailman (output) from mailman id 1254120.1550126; Fri, 13 Mar 2026 16:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15dC-000570-3y; Fri, 13 Mar 2026 16:44:58 +0000 Received: by outflank-mailman (input) for mailman id 1254120; Fri, 13 Mar 2026 16:44:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w15dB-0004GG-4W for xen-devel@lists.xenproject.org; Fri, 13 Mar 2026 16:44:57 +0000 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [2a00:1450:4864:20::536]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f5170cf2-1efb-11f1-9ccf-f158ae23cfc8; Fri, 13 Mar 2026 17:44:52 +0100 (CET) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-66391baf250so2038238a12.1 for ; Fri, 13 Mar 2026 09:44:52 -0700 (PDT) Received: from fedora (user-109-243-67-101.play-internet.pl. [109.243.67.101]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-66350b86008sm1394733a12.28.2026.03.13.09.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 09:44:50 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f5170cf2-1efb-11f1-9ccf-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773420292; x=1774025092; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WC9Q7UDifDEqfqwQFhunvL4KaBDnJAUUS0hjUL4t6mI=; b=ZP0kBdpNmwu+l6bfZZVSXm8+/xwfs5sdGlQZuz7GNKQGcT1FGN98IVpCFDn4h6IXLe NL2tcUsknjW8bv32fm/RvWD1N0ZEVFaTmcz+a4Wca/xHFVeAZpNldW/VNoQsVdLAahYH YIHWNuA3ddBNb04Jmn/IpeIjDp0TIYVZD3HP69ZypXotLmOtIyCUAhyauLVJIbTGtats S/NqkyhW/bijXWpCOiUzJpCUNPR8OMngEj2fasTCzAL5VGrecMhzn9SwBhgJfrTocIFZ 3EB0XWyR33QgLPuldGIb2gEsgLRQ+ZLwYsIHal1hYBGytv5gfTNXD1AO/l+Jc8OrMXyG h3Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773420292; x=1774025092; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WC9Q7UDifDEqfqwQFhunvL4KaBDnJAUUS0hjUL4t6mI=; b=iYYO95Imr3qq6V+Wp4AKKYUhYQ/Am/JPH6FoQ9Ig8CkjIM89Zc9t9PgwXaQf48BEUW 2O8V9s6LFpG1+d5i7D9KPOi9jfS5KD1g74JUbcWP7l1heoRg/6OGVDl+buTtsiyPcuaq ev8QI8QNE2H1YCd5Kpz4wbxwAYW5AxBf40uS9jjPk23GBo7X+Bp3OXaVY15ZDV66muim UD+QYaa28sadRl7iUpj4xNBl4efVAcSs35Elhgpl666Qku+htwLKczqV/2Dbb7PS1az6 Bj8InvYumc0kqneNzR6IjQYjejkMOa0Ejw/AoEisRq/6VtVcKKFx3KfgZMPz6IdIKFhJ zKMg== X-Gm-Message-State: AOJu0Yw1XS7ovVLrROzkamAH/WwtbHW4XZUDBudLXdoJ2vZ4/zUt2CDs gQ7VCACm/75tuq5x1fXg2HppIpCmkYoTGk+VPg5PdbVV/9eF74SNHNXbBYQEeg== X-Gm-Gg: ATEYQzzTtXyXTWq/x7BS497pHq/j/oUxx8BPE75RstKFy+Qc5HV/Y8tSh4ILFOmd/9V Q157VX7q/Wn35CpD+Pub0g78vBIhVvAcfIWx/7A62mF8z2fuODA/5bTywPtOl+OfbMps7yH+mEX 5fKkuzJJg9Qty881my4fZ86cZkPuvsi43VE0bpg/mGCc7ecPwTF2cyYQABBn9YfAVFupn21FT36 s/JCgAkyO1aEwvOuPzeW7vP989W8HhqCa2cIKcid0dU+72YVieqWOjPoaIE2Wv7PTxYXS2GHyzB LOUX9wW1O/1YsJhW93H5HHDYa7L+0Bdt+t4j9DYIhaNpwA27ms+NYUVv91ArlZ0dVNLC5qBvsOL TchZ+4KNsrYapoVmAzRbdTwHL87H9JgexGx89voGpdc2WjwS4/RQJwlIW9W3r4yk7hbtRR4z0Fo GnQlixKqAJbQDkF6WNwwHDrdoBvepAfkwEM6QxVvvmFtkYJPYn00tAzhJ+729pMAL5jg== X-Received: by 2002:a05:6402:254f:b0:661:d0a4:ad45 with SMTP id 4fb4d7f45d1cf-663babb8965mr2319469a12.10.1773420291271; Fri, 13 Mar 2026 09:44:51 -0700 (PDT) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Romain Caritey , Oleksii Kurochko , Alistair Francis , Connor Davis , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 4/4] xen/riscv: init_csr_masks()-related improvements Date: Fri, 13 Mar 2026 17:44:38 +0100 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1773420319371158500 Content-Type: text/plain; charset="utf-8" There is no reason to use _UL() in define-s sitting in C file hence use UL prefix instead. Drop 3d argument of INIT_CSR_MASK() and INIT_RO_ONE_MASK() to reduce risk of incomplete editing after copy-and-paste, or other typo-ing. Suggested-by: Jan Beulich Signed-off-by: Oleksii Kurochko --- xen/arch/riscv/domain.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 5f15dda88c8e..70d0e55ed1bc 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -42,10 +42,10 @@ struct csr_masks { =20 static struct csr_masks __ro_after_init csr_masks; =20 -#define HEDELEG_AVAIL_MASK ULONG_MAX -#define HIDELEG_AVAIL_MASK ULONG_MAX -#define HENVCFG_AVAIL_MASK _UL(0xE0000003000000FF) -#define HSTATEEN0_AVAIL_MASK _UL(0xDE00000000000007) +#define HEDELEG_VALID_MASK ULONG_MAX +#define HIDELEG_VALID_MASK ULONG_MAX +#define HENVCFG_VALID_MASK (0xE0000003000000FFUL) +#define HSTATEEN0_VALID_MASK (0xDE00000000000007UL) =20 void __init init_csr_masks(void) { @@ -57,25 +57,26 @@ void __init init_csr_masks(void) * fields that must be preserved. Any write to the full register must * therefore retain the original values of those fields. */ -#define INIT_CSR_MASK(csr, field, mask) do { \ - register_t old =3D csr_read_set(CSR_ ## csr, mask); \ +#define INIT_CSR_MASK(csr, field) do { \ + register_t old =3D csr_read_set(CSR_ ## csr, csr ## _VALID_MASK); \ csr_masks.field =3D csr_swap(CSR_ ## csr, old); \ } while (0) =20 -#define INIT_RO_ONE_MASK(csr, field, mask) do { \ - register_t old =3D csr_read_clear(CSR_ ## csr, mask); \ - csr_masks.ro_one.field =3D csr_swap(CSR_ ## csr, old) & mask; \ +#define INIT_RO_ONE_MASK(csr, field) do { \ + register_t old =3D csr_read_clear(CSR_ ## csr, csr ## _VALID_MASK)= ; \ + csr_masks.ro_one.field =3D csr_swap(CSR_ ## csr, old) & \ + csr ## _VALID_MASK; \ } while (0) =20 - INIT_CSR_MASK(HEDELEG, hedeleg, HEDELEG_AVAIL_MASK); - INIT_CSR_MASK(HIDELEG, hideleg, HIDELEG_AVAIL_MASK); + INIT_CSR_MASK(HEDELEG, hedeleg); + INIT_CSR_MASK(HIDELEG, hideleg); =20 - INIT_CSR_MASK(HENVCFG, henvcfg, HENVCFG_AVAIL_MASK); + INIT_CSR_MASK(HENVCFG, henvcfg); =20 if ( riscv_isa_extension_available(NULL, RISCV_ISA_EXT_smstateen) ) { - INIT_CSR_MASK(HSTATEEN0, hstateen0, HSTATEEN0_AVAIL_MASK); - INIT_RO_ONE_MASK(HSTATEEN0, hstateen0, HSTATEEN0_AVAIL_MASK); + INIT_CSR_MASK(HSTATEEN0, hstateen0); + INIT_RO_ONE_MASK(HSTATEEN0, hstateen0); } =20 #undef INIT_CSR_MASK --=20 2.53.0