From nobody Mon Feb 9 17:35:46 2026 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (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 11E8B31194C for ; Sat, 25 Oct 2025 16:40:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761410454; cv=none; b=V/M1+CXudZ4/ZUk8ESLEm/m+1/Etgbm6HQdmygWwsEmniNQuLbPCSdVZqmt1L4pigx5OxFbWTZUNmIdgMAL2F1wfQtY4e3AOCo01idxK2+M9KgXSB1ZxI1TrrYjqyTqxkcVH9UmEHPomVu+XHl7O6403FgGzzfWogs3t8V1Mz48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761410454; c=relaxed/simple; bh=iv3iCCSDVeRbyipC1ke5q3yTI1qFQp4/PoyLN2PjHKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oEW/fA+VrXeJ9cxMSAzOMcjvvBD1Hyd2++/XOL11OpNevkzt1WlovSvrcUpRynDJ7yEuTzfVkiX67p7KLWojobwg/vyDAziR0Bsd771d9/j1Fhn2aecgMgR+I+EysJHOaCbSLJHLZPUNtFVjWER4MM6phq604zhGcHIOB0BR45Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CH5Pt97D; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CH5Pt97D" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-87c11268b97so33359806d6.3 for ; Sat, 25 Oct 2025 09:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761410452; x=1762015252; 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=pQlnwek1lWpij8LeOBWh+sxDT7KmBEOhz8ZE1R1F1kI=; b=CH5Pt97DrMy2adK69ctT5bhrxVunqRAx0H+/jUSxxs0fBx9mXoxCN+96EnjVPD78Dj JX/gpwFnMB7lEXqbIDA9nBFJ4gKX810Oo0mpidTm+41TLfVhK/Ll+X2r9G5t6mDNjpNK SJWbZy+7wPvojWR9OGaCq3Hkw5avHHe0s7ig8hhBWR3ykmS+kWFktI+Sboa2cc1aim3O NATH6Canhs0gTSJLSwAUZU/orkyOVDGhCHrukY4UmxtqkxcxlN1QBbDbmO54GJvJdYvn tdy2Lk9A8BEW/y7tEaLkHKogkn0+c78bvtgMJmThPgkRKOvw8d2AEy+IZl2gMxnBTrWU fbLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761410452; x=1762015252; 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=pQlnwek1lWpij8LeOBWh+sxDT7KmBEOhz8ZE1R1F1kI=; b=v9DRaKThSamDu2LmiPmvYFXN3Z2sm2L7byhPVj+IbZuiPo8ZsSlXZq99Pod/PAEqej LoKYucWpsLFYIJ8zMqcBWjSQzFwHQ9ILdhNmEBhfbSGRRy15vAl2HYYsNsbMfZUXTc3c Hi5sIR7DmXlpHtM1n20vi1s20GSaL69SCq3tj4ezDlju9ZdLS/oOpJgn/eapsxnRmHDp iajSQRHhQEWYV9yGrV4s43qUI7eSH0GAct20cKz1mar5VH4TeYUPfREVrGRwA7ED7zkE yWgEkP/X7vvrofQDR7sUIscuieBWamj7la6e/GGvuweMQS5dHZ11q07CMBACXN4MoAIw g65A== X-Forwarded-Encrypted: i=1; AJvYcCXculmcZmSIaKdUTI/sU5J1fEAxahuKRaNiqU5Ax+WCvNBmNk5VKtSluC/tDocheLs/qnfIqNIk39pD1KQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx//uiX6GWsQ1PacuoQNEN1cSCLsZsEpjObGxKs3MrEfD9TsUmM sJgb/aB6txESjZ4Np9deOly28Sn6B14qwnEcoqNTIY/mOMVYdxGw8oYz X-Gm-Gg: ASbGnct3J8dXIPbqK0ggCi11X6qyvUYve5jtaDHsNuzZOPyjNk9ziw7KO18BRuI0lZU iIDM3vxYcn5Q1P80AQGpKTXQG2mE/eHyhSyR0+sRdUkfeuM8/JXG02DTQGsFxpV0uKbWIeeisbd 7y1ENhLdVfH/2fWPB+bZGT7v2D4rzdKAh3BpEBdjKmRwx6JwEujVDMoV+/BxEw8Xk8HbYKzRnt6 gNtz4Dzq84YJr5Dd1dlGCLKsV2T0hfnCldoct2Qyfcp5l02Thafe5inltigfmLmk4QInCEbH0t4 GPbfOVtOddD+KZkkCQ0GQvcvLmGho0+xkrslfxkGr6T1LMQ+p1wm+X9SLmivICqiWX5sNnY/qB4 uBoQyiS6mtfHjW8ELyU59PAPFHyltqc9Nps9b6cIWT8IoLxO8uc/d0cIDwEfeGaipLnGRRO5vtC lMBLzP4BU= X-Google-Smtp-Source: AGHT+IHlyjol8Bie8F99hAjP80rz8ZMg2F2ufGY62yGvqxUFdDm1aK3+hSTgiT9hRW2DHU1QiGn1gA== X-Received: by 2002:ad4:5aae:0:b0:787:8e43:5761 with SMTP id 6a1803df08f44-87fb6473b5fmr66116636d6.56.1761410451896; Sat, 25 Oct 2025 09:40:51 -0700 (PDT) Received: from localhost ([12.22.141.131]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-87fc49b98b0sm16464616d6.54.2025.10.25.09.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 09:40:51 -0700 (PDT) From: "Yury Norov (NVIDIA)" To: Linus Torvalds , Linus Walleij , Nicolas Frattaroli , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Shreeya Patel , Mauro Carvalho Chehab , Jaehoon Chung , Ulf Hansson , Nicolas Frattaroli , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , "Yury Norov (NVIDIA)" , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, kernel@collabora.com, linux-mmc@vger.kernel.org, linux-sound@vger.kernel.org Cc: Rasmus Villemoes Subject: [PATCH 11/21] drivers: don't use GENMASK() in FIELD_PREP_WM16() Date: Sat, 25 Oct 2025 12:40:10 -0400 Message-ID: <20251025164023.308884-12-yury.norov@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251025164023.308884-1-yury.norov@gmail.com> References: <20251025164023.308884-1-yury.norov@gmail.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" Recently added FIELD_PREP_WM16() in a few places uses GENMASK. It's confusing and may mislead readers. Switch to BITS() or FIRST_BITS() as appropriate. Suggested-by: Linus Torvalds Link: https://lore.kernel.org/all/CAHk-=3DwhoOUsqPKb7OQwhQf9H_3=3D5sXGPJrDb= fQfwLB3Bi13tcQ@mail.gmail.com/ Signed-off-by: Yury Norov (NVIDIA) Reviewed-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_lvds.h | 2 +- drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 4 ++-- drivers/media/platform/synopsys/hdmirx/snps_hdmirx.h | 4 ++-- drivers/mmc/host/dw_mmc-rockchip.c | 4 ++-- drivers/soc/rockchip/grf.c | 4 ++-- sound/soc/rockchip/rockchip_i2s_tdm.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h b/drivers/gpu/drm/roc= kchip/rockchip_lvds.h index 2d92447d819b..e79e6031be59 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.h +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h @@ -115,7 +115,7 @@ #define PX30_LVDS_INVERT_DCLK(val) FIELD_PREP_WM16(BIT(5), (val)) =20 #define PX30_LVDS_GRF_PD_VO_CON1 0x438 -#define PX30_LVDS_FORMAT(val) FIELD_PREP_WM16(GENMASK(14, 13), (val)) +#define PX30_LVDS_FORMAT(val) FIELD_PREP_WM16(BITS(13, 14), (val)) #define PX30_LVDS_MODE_EN(val) FIELD_PREP_WM16(BIT(12), (val)) #define PX30_LVDS_MSBSEL(val) FIELD_PREP_WM16(BIT(11), (val)) #define PX30_LVDS_P2S_EN(val) FIELD_PREP_WM16(BIT(6), (val)) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm= /rockchip/rockchip_vop2_reg.c index 38c49030c7ab..438fea5f6f6d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -1698,7 +1698,7 @@ static unsigned long rk3588_set_intf_mux(struct vop2_= video_port *vp, int id, u32 val =3D rk3588_get_hdmi_pol(polflags); regmap_write(vop2->vop_grf, RK3588_GRF_VOP_CON2, FIELD_PREP_WM16(BIT(1),= 1)); regmap_write(vop2->vo1_grf, RK3588_GRF_VO1_CON0, - FIELD_PREP_WM16(GENMASK(6, 5), val)); + FIELD_PREP_WM16(BITS(5, 6), val)); break; case ROCKCHIP_VOP2_EP_HDMI1: div &=3D ~RK3588_DSP_IF_EDP_HDMI1_DCLK_DIV; @@ -1711,7 +1711,7 @@ static unsigned long rk3588_set_intf_mux(struct vop2_= video_port *vp, int id, u32 val =3D rk3588_get_hdmi_pol(polflags); regmap_write(vop2->vop_grf, RK3588_GRF_VOP_CON2, FIELD_PREP_WM16(BIT(4),= 1)); regmap_write(vop2->vo1_grf, RK3588_GRF_VO1_CON0, - FIELD_PREP_WM16(GENMASK(8, 7), val)); + FIELD_PREP_WM16(BITS(7, 8), val)); break; case ROCKCHIP_VOP2_EP_EDP0: div &=3D ~RK3588_DSP_IF_EDP_HDMI0_DCLK_DIV; diff --git a/drivers/media/platform/synopsys/hdmirx/snps_hdmirx.h b/drivers= /media/platform/synopsys/hdmirx/snps_hdmirx.h index b13f58e31944..14df3f53ff8f 100644 --- a/drivers/media/platform/synopsys/hdmirx/snps_hdmirx.h +++ b/drivers/media/platform/synopsys/hdmirx/snps_hdmirx.h @@ -12,8 +12,8 @@ #include #include =20 -#define UPDATE(x, h, l) FIELD_PREP(GENMASK((h), (l)), (x)) -#define HIWORD_UPDATE(v, h, l) FIELD_PREP_WM16(GENMASK((h), (l)), (v)) +#define UPDATE(x, h, l) FIELD_PREP(BITS((l), (h)), (x)) +#define HIWORD_UPDATE(v, h, l) FIELD_PREP_WM16(BITS((l), (h)), (v)) =20 /* SYS_GRF */ #define SYS_GRF_SOC_CON1 0x0304 diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-r= ockchip.c index 82dd906bb002..7fac1a7281bf 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -148,10 +148,10 @@ static int rockchip_mmc_set_internal_phase(struct dw_= mci *host, bool sample, int =20 if (sample) mci_writel(host, TIMING_CON1, - FIELD_PREP_WM16(GENMASK(11, 1), raw_value)); + FIELD_PREP_WM16(BITS(1, 11), raw_value)); else mci_writel(host, TIMING_CON0, - FIELD_PREP_WM16(GENMASK(11, 1), raw_value)); + FIELD_PREP_WM16(BITS(1, 11), raw_value)); =20 dev_dbg(host->dev, "set %s_phase(%d) delay_nums=3D%u actual_degrees=3D%d\= n", sample ? "sample" : "drv", degrees, delay_num, diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c index 344870da7675..89fd4a4c69eb 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -125,8 +125,8 @@ static const struct rockchip_grf_info rk3566_pipegrf __= initconst =3D { #define RK3576_SYSGRF_SOC_CON1 0x0004 =20 static const struct rockchip_grf_value rk3576_defaults_sys_grf[] __initcon= st =3D { - { "i3c0 weakpull", RK3576_SYSGRF_SOC_CON1, FIELD_PREP_WM16_CONST(GENMASK(= 7, 6), 3) }, - { "i3c1 weakpull", RK3576_SYSGRF_SOC_CON1, FIELD_PREP_WM16_CONST(GENMASK(= 9, 8), 3) }, + { "i3c0 weakpull", RK3576_SYSGRF_SOC_CON1, FIELD_PREP_WM16_CONST(BITS(6, = 7), 3) }, + { "i3c1 weakpull", RK3576_SYSGRF_SOC_CON1, FIELD_PREP_WM16_CONST(BITS(8, = 9), 3) }, }; =20 static const struct rockchip_grf_info rk3576_sysgrf __initconst =3D { diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.h b/sound/soc/rockchip/roc= kchip_i2s_tdm.h index 0171e05ee886..eee6db372ee7 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.h +++ b/sound/soc/rockchip/rockchip_i2s_tdm.h @@ -287,7 +287,7 @@ enum { #define I2S_TDM_RXCR (0x0034) #define I2S_CLKDIV (0x0038) =20 -#define HIWORD_UPDATE(v, h, l) (FIELD_PREP_WM16_CONST(GENMASK((h), (l)), (= v))) +#define HIWORD_UPDATE(v, h, l) (FIELD_PREP_WM16_CONST(BITS((l), (h)), (v))) =20 /* PX30 GRF CONFIGS */ #define PX30_I2S0_CLK_IN_SRC_FROM_TX HIWORD_UPDATE(1, 13, 12) --=20 2.43.0