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 C935CCCF9E3 for ; Sat, 25 Oct 2025 16:33:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pQlnwek1lWpij8LeOBWh+sxDT7KmBEOhz8ZE1R1F1kI=; b=KnO71Ju3I7g/gHw013RRW7w2Ra jjqvTA0NhqbAp5WksACQRNGo4L7hyDCTp3zFAbrc6cHTzLRBmjKGY/bzpwCjIvrYridYtHIclF2bU fhV+pOFHVKPKX6EkwDHKqRFCkEgPSNBcw0AcRX77tztjk74JEkD7nQDZTKmabIW6uFIvlxCqg4NFe 79iEmHDI89rN6EZLJ0dX/bxYuTTZZFSEF9bKDy5nhZ+v7VpP1ECaQLat9eSuRQhmS4uqciT9rbg27 kB7fsh3skY1jPLUlmuh15jeqmO807DvWnW0XASLHryOHGlB/XVtLTQPCIsRxJH6lVtevyZL+A1UTr EaZhr7TQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vChCl-0000000BWnH-0HyS; Sat, 25 Oct 2025 16:33:23 +0000 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vChCg-0000000BWkV-3Bza for linux-arm-kernel@lists.infradead.org; Sat, 25 Oct 2025 16:33:19 +0000 Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-4e89ffd95b9so35637071cf.0 for ; Sat, 25 Oct 2025 09:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761409997; x=1762014797; darn=lists.infradead.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=SYrT5YVm+cQd6ZhYVZd9D5ITc6+54Lbcs4Dks1L4rTw1w1UqZHcfcAfEa89TnL56b3 L4IojMFb5LytnChnBz/YQagxmX/5aWu6exDhsVavasMuSsvw6u30BFnNDIBUqUiDX+L5 FZeAeu76dZqfZlsX9arWDliPNfotccqu5Yc7gURPFPNSn+DslFyIrFIYiBNAtjbGeljJ miBTPG9WgdnyHBz7iOazc5iA3vzJhkdYWIoKPfXzouAqYUGfcHtGGiLPnJcgvVKciobV xfojYRCCUpWz/r9gRC74LNB+Cmx/e/cgTYhF+tx0hBxDoehbgI6Ub6uzXoRy9JA3xHZK NdOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761409997; x=1762014797; 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=haF98RsIy3tMhuv5jCXL7Xvvn57ez7tJtR110Pdy+Pw6TXlFAwUIwj0E46GwId3qXt TLemb+8UuYlz94GfWwesC8J9syRF2JNp/Aj8oj+JE/BUyWwWRoattEfY66syWPvmXxnL bCZi5pLsNugAsH6hZgOp0bwri0r8opc2Ae2pfMO29IghfO54pBoWArmusDnlb9vwx+Ec 9vngelROTOlne5CA75y0iqPo2pPLySWxnOCNhbXRmvtbR2AwZLcP7bVEoBL9Tjp99gLd v7rjLbN0vGcd8dGlE8e4hMn8I1dpO328cOZFV6J6RIQSxHzocKVHuoT0+RTgFuq9BXFF 4EAQ== X-Forwarded-Encrypted: i=1; AJvYcCXFx6r7kUvkyMKahLOC2cMPqmC5hjHlx9vZbBKGhSURU5SzXnNFIVnMoZw2XvsvPiIW0Idy2IYhSElxCews3+gO@lists.infradead.org X-Gm-Message-State: AOJu0YyejhhbvRvpagr2UCxr4pyYTZd1tZyxMEvvXMDZsxlv3M4FULza xsguyNbeAFfOQJwRcjit3SoX7ihyoSHcR3ZMqcbSmNjzZxDx1fyo05QDRKoWZA== X-Gm-Gg: ASbGncu+yETJLUSTt1hGprXFTfnZnqI1Uen51kvonl/I4Ho4HPRHk8zZa7ZdvQM9W0P yMFEY/9YmEmP3dWmvPRyRT4rNZt+dkf5sfkk5C4tH/ZzYwuqGSfThKfkhRNsICIRGqs4nC9xOfi 7zXK1xkqq4PUNR4lR1tr2YXhYAm4h49vZGRXKE6Z2XAqmMdoug8QeywbmTROGx/llkDR8PcXsCL gIsVYnsMPY+/FPKDh3KNDsX3qGbXCOWaI7MDgGzR0Bl25MOzWHubvv0Pjbym1NNvj/8X/5/N94J 4Dwjwo8LhWshis2DWBF8VJ6/hGUt2KVJ8wjnOFOC50R+vkfRf+596NcS/TnKjAYM8S66r6SKUpB a95HE842dpUODA2dm5sSo6vHXlpTEMc4IGD4ijiIxXggWDxYFm7W5/VkBJGlSGsJ4Dfm+Fj61 X-Google-Smtp-Source: AGHT+IHyRdZCFKENEK5U2sVSqsYLQGnrThog0TUtBDXhz5Rjdgg8+4ZbO+vQpnHhnn4XFJ14+JpZIQ== X-Received: by 2002:a05:622a:1817:b0:4b5:e8ae:2c4f with SMTP id d75a77b69052e-4eb943824a5mr76637061cf.51.1761409997366; Sat, 25 Oct 2025 09:33:17 -0700 (PDT) Received: from localhost ([12.22.141.131]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4eba37b96d0sm15170181cf.6.2025.10.25.09.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 09:33:16 -0700 (PDT) From: "Yury Norov (NVIDIA)" To: Linus Walleij , Lee Jones , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, 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-rockchip@lists.infradead.org, linux-media@vger.kernel.org, kernel@collabora.com, linux-mmc@vger.kernel.org, linux-sound@vger.kernel.org Cc: Linus Torvalds Subject: [PATCH 11/21] drivers: don't use GENMASK() in FIELD_PREP_WM16() Date: Sat, 25 Oct 2025 12:32:53 -0400 Message-ID: <20251025163305.306787-4-yury.norov@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251025162858.305236-1-yury.norov@gmail.com> References: <20251025162858.305236-1-yury.norov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251025_093318_816676_2F512442 X-CRM114-Status: GOOD ( 14.74 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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-=whoOUsqPKb7OQwhQf9H_3=5sXGPJrDbfQfwLB3Bi13tcQ@mail.gmail.com/ Signed-off-by: Yury Norov (NVIDIA) --- 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/rockchip/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)) #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 = 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 &= ~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 = 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 &= ~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 -#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)) /* SYS_GRF */ #define SYS_GRF_SOC_CON1 0x0304 diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.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 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)); dev_dbg(host->dev, "set %s_phase(%d) delay_nums=%u actual_degrees=%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 = { #define RK3576_SYSGRF_SOC_CON1 0x0004 static const struct rockchip_grf_value rk3576_defaults_sys_grf[] __initconst = { - { "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) }, }; static const struct rockchip_grf_info rk3576_sysgrf __initconst = { diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.h b/sound/soc/rockchip/rockchip_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) -#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))) /* PX30 GRF CONFIGS */ #define PX30_I2S0_CLK_IN_SRC_FROM_TX HIWORD_UPDATE(1, 13, 12) -- 2.43.0