From patchwork Thu Jun 12 18:56:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frattaroli X-Patchwork-Id: 896839 Received: from sender4-op-o12.zoho.com (sender4-op-o12.zoho.com [136.143.188.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7484D2C326E; Thu, 12 Jun 2025 18:57:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749754667; cv=pass; b=FNmpTmSmnRpXZr/qYHM2EXp5tdYLcqEejodTW+vQEn2Qzb235aF4PgGcynaClA5wUSdtrKdjSS/zgGn/tp85+C9Mhky0+d/qO9+/pNAqqCTGgRjpJMuda0HpmMRIYeKfj0rwAzDqwyckmzIx9ybH2nZ5C63uoEjxxWug5TmVtHM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749754667; c=relaxed/simple; bh=GjqLcBib/nO1uY9a2Xsi0ojlm3OCO3xFjcV+GE0tHD8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g8FXkcyNmW7LmPLYPpc5T1eay3zyUSzDDBk9vwF+fA2o9scpWebuZqdX6xP8OomHdE/mxve0cgxes5lYXWdgnURwmSDLUtR0gGtOFbtZlGs6B9ZypJVTeuHsH9IPztcgGlN3coYCl5GVUiFWQMx3vJJpcnh+Tb/XyliLrOLJ8jM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=UZUo86zW; arc=pass smtp.client-ip=136.143.188.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="UZUo86zW" ARC-Seal: i=1; a=rsa-sha256; t=1749754611; cv=none; d=zohomail.com; s=zohoarc; b=V0WkL+xDBUTkj8l5JoD3LEPCljeiKVGyhZ8GcRJ49yRjZGGSBFLv2RAQRdL9T7Zi8kKm74IMX+5B3iX8ljK0yDF7YYTaz86odGJy18gqK33EGnzje0YAmFQ7BdVL8iA4T4eI0rFQTp/evtDANpI+MtHJ7NNo7GvUcI/4J2ID6Bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749754611; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=DarWK7YPJq6pqkvjh7CGHmvB+wvXuAPmewqRywjtBX4=; b=V0zKlVltUdg8N3ut9gm43dWDIYF80MiZAQQTuK8B/s2QiIkbPwtVFBdmUVN/MMJvFB+KeO/jYr/57EHdj+sIAxI6cbt5b+wZqM7pJA/UG7ACxpIKtVQ6lUMcu5+uMn5IikhLPO997VUmFxH3M/BbJ4fonrFCj5wsEhpyS1iuyJ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1749754611; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=DarWK7YPJq6pqkvjh7CGHmvB+wvXuAPmewqRywjtBX4=; b=UZUo86zWHUxCQfBKaHZwcSseZIzCrqJCqp01Yr78vggCBGxruo4LrRzstrsi9R85 YIjfv7lOgtS9Qf2MBixc+6sxpX1tgOw9nnYE0/EKsvCIKtGrcVz56NpMPlcVCGNKFb2 BaxN8FaQ4Nm7/ujuDnpUOM00DhxwmsqNBm3seWKU= Received: by mx.zohomail.com with SMTPS id 1749754609724123.44033815930106; Thu, 12 Jun 2025 11:56:49 -0700 (PDT) From: Nicolas Frattaroli Date: Thu, 12 Jun 2025 20:56:04 +0200 Subject: [PATCH 02/20] mmc: dw_mmc-rockchip: switch to HWORD_UPDATE macro Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250612-byeword-update-v1-2-f4afb8f6313f@collabora.com> References: <20250612-byeword-update-v1-0-f4afb8f6313f@collabora.com> In-Reply-To: <20250612-byeword-update-v1-0-f4afb8f6313f@collabora.com> To: Yury Norov , Rasmus Villemoes , Jaehoon Chung , Ulf Hansson , Heiko Stuebner , Shreeya Patel , Mauro Carvalho Chehab , Sandy Huang , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Vinod Koul , Kishon Vijay Abraham I , Nicolas Frattaroli , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Chanwoo Choi , MyungJoo Ham , Kyungmin Park , Qin Jian , Michael Turquette , Stephen Boyd , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt Cc: kernel@collabora.com, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-phy@lists.infradead.org, linux-sound@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, llvm@lists.linux.dev, Nicolas Frattaroli X-Mailer: b4 0.14.2 The era of hand-rolled HIWORD_UPDATE macros is over, at least for those drivers that use constant masks. Switch to the new HWORD_UPDATE macro in bitfield.h, which has error checking. Instead of redefining the driver's HIWORD_UPDATE macro in this case, replace the two only instances of it with the new macro, as I could test that they result in an equivalent value. Signed-off-by: Nicolas Frattaroli Acked-by: Ulf Hansson --- drivers/mmc/host/dw_mmc-rockchip.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index baa23b51773127b4137f472581259b61649273a5..9e3d17becf65ffb60fe3d32d2cdec341fbd30b1e 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -24,8 +25,6 @@ #define ROCKCHIP_MMC_DELAYNUM_OFFSET 2 #define ROCKCHIP_MMC_DELAYNUM_MASK (0xff << ROCKCHIP_MMC_DELAYNUM_OFFSET) #define ROCKCHIP_MMC_DELAY_ELEMENT_PSEC 60 -#define HIWORD_UPDATE(val, mask, shift) \ - ((val) << (shift) | (mask) << ((shift) + 16)) static const unsigned int freqs[] = { 100000, 200000, 300000, 400000 }; @@ -148,9 +147,9 @@ static int rockchip_mmc_set_internal_phase(struct dw_mci *host, bool sample, int raw_value |= nineties; if (sample) - mci_writel(host, TIMING_CON1, HIWORD_UPDATE(raw_value, 0x07ff, 1)); + mci_writel(host, TIMING_CON1, HWORD_UPDATE(GENMASK(11, 1), raw_value)); else - mci_writel(host, TIMING_CON0, HIWORD_UPDATE(raw_value, 0x07ff, 1)); + mci_writel(host, TIMING_CON0, HWORD_UPDATE(GENMASK(11, 1), raw_value)); dev_dbg(host->dev, "set %s_phase(%d) delay_nums=%u actual_degrees=%d\n", sample ? "sample" : "drv", degrees, delay_num,