From nobody Mon Dec 15 22:28:08 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C595E238C3D for ; Thu, 8 May 2025 08:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692665; cv=none; b=cdQFNBckyU/ZdsU/1FISQy0X6rhoqW8wqwq8ojzSF0BSGY7jWBvyN4jvC9GJikWjm/pJ6FdB7spB58UCLZopmLXxLjU9n1uWU4y9FoR+cX0/j+46HTZANDXC8KHwGnT6YzAq3eespYRE6der890GZAi2qVEF8l6mGaMtxQxwqQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746692665; c=relaxed/simple; bh=F1Tpw/FDQiobHbn1ogwM1Y/7MZIw2LV9VxrfdFmVGHY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MIl7IS8ghXIlDrTfIKMCy83uhb8MGrFdiN//SzwRCakN7vIqvxqoqRk7ZEHiSg4nECPAbbNh/RrhD5XaWqGaUzUbQbE/9JDG3iV2XxDtW+GzqUBXOiHccDhq8wL+zadYDp8+RuRIKrV5bnNXwoOow7qBo4VYGf/zMzOjyDZzPT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=gfZWW6CM; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="gfZWW6CM" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43cf05f0c3eso4162635e9.0 for ; Thu, 08 May 2025 01:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746692662; x=1747297462; darn=vger.kernel.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=OuPapDRP/OJYb/JxVpYS+I7DwtI999Hhv/OzI9C3VrY=; b=gfZWW6CMpFvS/a6H1xQ4Jxa0qylEN75T7X406mNd+UYmqOxNsQxbQokup2g3q4fgMS SQ1Rgv3s0Po7keqHii9d0KUObi10UQrSwqMHVRYARcb/+r9Ge1o4agyNr29zhrJuX6Jy nC2bl8rqX2BVLT4qwDOU1svJGOtSzlcyfCJJejL/7bm9voHv7BOi/OGqUXqDd8I9+wD0 RHmi5sWc5RjABn+6d5Sj9b4M8blPwd31qeNXy5xvAGGnCFQ0mu6q+pptLuW0jOeK8jro nwU+/EZwFzmAhNTGvv933XWzGmBhARjkCILRN/nfGRe+nEPoEqfLLJnzEnnO2vIpUY4L ldiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746692662; x=1747297462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OuPapDRP/OJYb/JxVpYS+I7DwtI999Hhv/OzI9C3VrY=; b=KpPPx+sB5CXiRknY7G424cGs3w6jIvfINvDHVlRT52lXaH0X0LsJ0FyqP8uoxwYdNs meakPtVeCsDQLsy2s8rzmVptjBEGmX7wDISPGkvkYz8mGiqoewCloghvcK21gPlN7bjc rHJAi6N2zqceZOfp+nNvR75SNxNYEgbZv5anaI8B1ja3GWGPYXpQKqhoeXfmd08Iz54t NR3nh5EJNky8snUV0DZ+LA5497I1OK8Ngz3pWIVlK+7k+Spdo7M0zBj6XfENkYbQfDl6 WP7+4wq4bnOZ4ybxdXf1k0b6cERLNkk/GCgxTdpGW7ngJQkCQtz+1hHfV/p9Ac/f2RMa 9CAQ== X-Forwarded-Encrypted: i=1; AJvYcCXH66ZLgiDp6v+4cXMQUjxwssIvsEBwogIKDm4McAE8nlmT+aBQlj/4OqMiNqJRvr7AFzXOPhN1YsjMo7k=@vger.kernel.org X-Gm-Message-State: AOJu0YzRdcbcRlmeDQOQb7fShmMTWT/hWcOvNDmqvKgMcpc5ExEuUxjs WLEtK93ThniFhGORBE9K9JyATWYlaxE3WTkqMQc4ndNRmSYI3nT3j96oSU1X5Tw= X-Gm-Gg: ASbGncu7VWhYbbo1ag2fFIKII2ok8hDDY/kN4eihWDcFbczgvMOZKxBxwyxjbqg2CkB pQYMjeP3i6a6uPX3iPku0ATkLo3/lss4CRUvkHYrNp2nEIiacWuKIjjqO+9ZqxKuHsatt3Ak00O VCoOgRzyFrlTqjpr2Uxvw3fGiETIwNeRbxIcy2Uv+Urcoai90TOPPNIB88BJRKh9fbQzaWa4y5h uRirXNmbMg+SU/d/gM4Rb8S4HIgcd+XD+OQWdatnup35x7tk+Ic/ZSRHQYGjv4FP8HP9EAXWkC1 TMoTzrouwMycfrfsOLT1uKlAV+xWAdPLabNhHPESLCs90r9PW+U= X-Google-Smtp-Source: AGHT+IEnEvDZVvyjWPKnOAG4dlx+tDzdySwIdn8aIF4iBX0NclzVjAzc6QAKF5pKumGu5cZ4Nhx5mw== X-Received: by 2002:a05:600c:1c93:b0:43c:f70a:2af0 with SMTP id 5b1f17b1804b1-442d02f82d6mr24406445e9.16.1746692661936; Thu, 08 May 2025 01:24:21 -0700 (PDT) Received: from alex-rivos.lan ([2001:861:3382:ef90:e3eb:2939:f761:f7f1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd351327sm28113895e9.24.2025.05.08.01.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 01:24:21 -0700 (PDT) From: Alexandre Ghiti To: Paul Walmsley , Palmer Dabbelt , Alexandre Ghiti , Anup Patel , Atish Patra , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Cc: Alexandre Ghiti Subject: [PATCH v2 2/3] riscv: Strengthen duplicate and inconsistent definition of RV_X() Date: Thu, 8 May 2025 10:22:14 +0200 Message-Id: <20250508082215.88658-3-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250508082215.88658-1-alexghiti@rivosinc.com> References: <20250508082215.88658-1-alexghiti@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" RV_X() macro is defined in two different ways which is error prone. So harmonize its first definition and add another macro RV_X_mask() for the second one. Signed-off-by: Alexandre Ghiti --- arch/riscv/include/asm/insn.h | 39 ++++++++++++++-------------- arch/riscv/kernel/elf_kexec.c | 1 - arch/riscv/kernel/traps_misaligned.c | 1 - arch/riscv/kvm/vcpu_insn.c | 1 - 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/riscv/include/asm/insn.h b/arch/riscv/include/asm/insn.h index 2a589a58b291..ac3e606feca2 100644 --- a/arch/riscv/include/asm/insn.h +++ b/arch/riscv/include/asm/insn.h @@ -288,43 +288,44 @@ static __always_inline bool riscv_insn_is_c_jalr(u32 = code) =20 #define RV_IMM_SIGN(x) (-(((x) >> 31) & 1)) #define RVC_IMM_SIGN(x) (-(((x) >> 12) & 1)) -#define RV_X(X, s, mask) (((X) >> (s)) & (mask)) -#define RVC_X(X, s, mask) RV_X(X, s, mask) +#define RV_X_mask(X, s, mask) (((X) >> (s)) & (mask)) +#define RV_X(X, s, n) RV_X_mask(X, s, ((1 << (n)) - 1)) +#define RVC_X(X, s, mask) RV_X_mask(X, s, mask) =20 #define RV_EXTRACT_RS1_REG(x) \ ({typeof(x) x_ =3D (x); \ - (RV_X(x_, RVG_RS1_OPOFF, RVG_RS1_MASK)); }) + (RV_X_mask(x_, RVG_RS1_OPOFF, RVG_RS1_MASK)); }) =20 #define RV_EXTRACT_RD_REG(x) \ ({typeof(x) x_ =3D (x); \ - (RV_X(x_, RVG_RD_OPOFF, RVG_RD_MASK)); }) + (RV_X_mask(x_, RVG_RD_OPOFF, RVG_RD_MASK)); }) =20 #define RV_EXTRACT_UTYPE_IMM(x) \ ({typeof(x) x_ =3D (x); \ - (RV_X(x_, RV_U_IMM_31_12_OPOFF, RV_U_IMM_31_12_MASK)); }) + (RV_X_mask(x_, RV_U_IMM_31_12_OPOFF, RV_U_IMM_31_12_MASK)); }) =20 #define RV_EXTRACT_JTYPE_IMM(x) \ ({typeof(x) x_ =3D (x); \ - (RV_X(x_, RV_J_IMM_10_1_OPOFF, RV_J_IMM_10_1_MASK) << RV_J_IMM_10_1_OFF) = | \ - (RV_X(x_, RV_J_IMM_11_OPOFF, RV_J_IMM_11_MASK) << RV_J_IMM_11_OFF) | \ - (RV_X(x_, RV_J_IMM_19_12_OPOFF, RV_J_IMM_19_12_MASK) << RV_J_IMM_19_12_OF= F) | \ + (RV_X_mask(x_, RV_J_IMM_10_1_OPOFF, RV_J_IMM_10_1_MASK) << RV_J_IMM_10_1_= OFF) | \ + (RV_X_mask(x_, RV_J_IMM_11_OPOFF, RV_J_IMM_11_MASK) << RV_J_IMM_11_OFF) |= \ + (RV_X_mask(x_, RV_J_IMM_19_12_OPOFF, RV_J_IMM_19_12_MASK) << RV_J_IMM_19_= 12_OFF) | \ (RV_IMM_SIGN(x_) << RV_J_IMM_SIGN_OFF); }) =20 #define RV_EXTRACT_ITYPE_IMM(x) \ ({typeof(x) x_ =3D (x); \ - (RV_X(x_, RV_I_IMM_11_0_OPOFF, RV_I_IMM_11_0_MASK)) | \ + (RV_X_mask(x_, RV_I_IMM_11_0_OPOFF, RV_I_IMM_11_0_MASK)) | \ (RV_IMM_SIGN(x_) << RV_I_IMM_SIGN_OFF); }) =20 #define RV_EXTRACT_BTYPE_IMM(x) \ ({typeof(x) x_ =3D (x); \ - (RV_X(x_, RV_B_IMM_4_1_OPOFF, RV_B_IMM_4_1_MASK) << RV_B_IMM_4_1_OFF) | \ - (RV_X(x_, RV_B_IMM_10_5_OPOFF, RV_B_IMM_10_5_MASK) << RV_B_IMM_10_5_OFF) = | \ - (RV_X(x_, RV_B_IMM_11_OPOFF, RV_B_IMM_11_MASK) << RV_B_IMM_11_OFF) | \ + (RV_X_mask(x_, RV_B_IMM_4_1_OPOFF, RV_B_IMM_4_1_MASK) << RV_B_IMM_4_1_OFF= ) | \ + (RV_X_mask(x_, RV_B_IMM_10_5_OPOFF, RV_B_IMM_10_5_MASK) << RV_B_IMM_10_5_= OFF) | \ + (RV_X_mask(x_, RV_B_IMM_11_OPOFF, RV_B_IMM_11_MASK) << RV_B_IMM_11_OFF) |= \ (RV_IMM_SIGN(x_) << RV_B_IMM_SIGN_OFF); }) =20 #define RVC_EXTRACT_C2_RS1_REG(x) \ ({typeof(x) x_ =3D (x); \ - (RV_X(x_, RVC_C2_RS1_OPOFF, RVC_C2_RS1_MASK)); }) + (RV_X_mask(x_, RVC_C2_RS1_OPOFF, RVC_C2_RS1_MASK)); }) =20 #define RVC_EXTRACT_JTYPE_IMM(x) \ ({typeof(x) x_ =3D (x); \ @@ -346,10 +347,10 @@ static __always_inline bool riscv_insn_is_c_jalr(u32 = code) (RVC_IMM_SIGN(x_) << RVC_B_IMM_SIGN_OFF); }) =20 #define RVG_EXTRACT_SYSTEM_CSR(x) \ - ({typeof(x) x_ =3D (x); RV_X(x_, RVG_SYSTEM_CSR_OFF, RVG_SYSTEM_CSR_MASK)= ; }) + ({typeof(x) x_ =3D (x); RV_X_mask(x_, RVG_SYSTEM_CSR_OFF, RVG_SYSTEM_CSR_= MASK); }) =20 #define RVFDQ_EXTRACT_FL_FS_WIDTH(x) \ - ({typeof(x) x_ =3D (x); RV_X(x_, RVFDQ_FL_FS_WIDTH_OFF, \ + ({typeof(x) x_ =3D (x); RV_X_mask(x_, RVFDQ_FL_FS_WIDTH_OFF, \ RVFDQ_FL_FS_WIDTH_MASK); }) =20 #define RVV_EXTRACT_VL_VS_WIDTH(x) RVFDQ_EXTRACT_FL_FS_WIDTH(x) @@ -375,10 +376,10 @@ static inline void riscv_insn_insert_jtype_imm(u32 *i= nsn, s32 imm) { /* drop the old IMMs, all jal IMM bits sit at 31:12 */ *insn &=3D ~GENMASK(31, 12); - *insn |=3D (RV_X(imm, RV_J_IMM_10_1_OFF, RV_J_IMM_10_1_MASK) << RV_J_IMM_= 10_1_OPOFF) | - (RV_X(imm, RV_J_IMM_11_OFF, RV_J_IMM_11_MASK) << RV_J_IMM_11_OPOFF) | - (RV_X(imm, RV_J_IMM_19_12_OFF, RV_J_IMM_19_12_MASK) << RV_J_IMM_19_12_O= POFF) | - (RV_X(imm, RV_J_IMM_SIGN_OFF, 1) << RV_J_IMM_SIGN_OPOFF); + *insn |=3D (RV_X_mask(imm, RV_J_IMM_10_1_OFF, RV_J_IMM_10_1_MASK) << RV_J= _IMM_10_1_OPOFF) | + (RV_X_mask(imm, RV_J_IMM_11_OFF, RV_J_IMM_11_MASK) << RV_J_IMM_11_OPOFF= ) | + (RV_X_mask(imm, RV_J_IMM_19_12_OFF, RV_J_IMM_19_12_MASK) << RV_J_IMM_19= _12_OPOFF) | + (RV_X_mask(imm, RV_J_IMM_SIGN_OFF, 1) << RV_J_IMM_SIGN_OPOFF); } =20 /* diff --git a/arch/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c index e783a72d051f..15e6a8f3d50b 100644 --- a/arch/riscv/kernel/elf_kexec.c +++ b/arch/riscv/kernel/elf_kexec.c @@ -336,7 +336,6 @@ static void *elf_kexec_load(struct kimage *image, char = *kernel_buf, return ret ? ERR_PTR(ret) : NULL; } =20 -#define RV_X(x, s, n) (((x) >> (s)) & ((1 << (n)) - 1)) #define RISCV_IMM_BITS 12 #define RISCV_IMM_REACH (1LL << RISCV_IMM_BITS) #define RISCV_CONST_HIGH_PART(x) \ diff --git a/arch/riscv/kernel/traps_misaligned.c b/arch/riscv/kernel/traps= _misaligned.c index 4354c87c0376..fb2599d62752 100644 --- a/arch/riscv/kernel/traps_misaligned.c +++ b/arch/riscv/kernel/traps_misaligned.c @@ -105,7 +105,6 @@ #define SH_RS2 20 #define SH_RS2C 2 =20 -#define RV_X(x, s, n) (((x) >> (s)) & ((1 << (n)) - 1)) #define RVC_LW_IMM(x) ((RV_X(x, 6, 1) << 2) | \ (RV_X(x, 10, 3) << 3) | \ (RV_X(x, 5, 1) << 6)) diff --git a/arch/riscv/kvm/vcpu_insn.c b/arch/riscv/kvm/vcpu_insn.c index 97dec18e6989..ba4813673f95 100644 --- a/arch/riscv/kvm/vcpu_insn.c +++ b/arch/riscv/kvm/vcpu_insn.c @@ -91,7 +91,6 @@ #define SH_RS2C 2 #define MASK_RX 0x1f =20 -#define RV_X(x, s, n) (((x) >> (s)) & ((1 << (n)) - 1)) #define RVC_LW_IMM(x) ((RV_X(x, 6, 1) << 2) | \ (RV_X(x, 10, 3) << 3) | \ (RV_X(x, 5, 1) << 6)) --=20 2.39.2