From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 2331B1D95B3 for ; Thu, 12 Jun 2025 19:52:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749757934; cv=none; b=MDyYGGwq3FirR9dja1MZ4d3R3QNFeUiclyKpMtDCbeGZm+Hy85KzY/HaFMcOUKLMq1VcW6RPN72vyACVN8oXFa+pqZJtF+M1x280rRQRcSpinoFloyWuL4evnmnf9S+8BZD8PfEqkB/A35yeN98ynkRCJUP6rHSspa3GTdc4H/Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749757934; c=relaxed/simple; bh=O7zV3Lco1nwdNarkpE/eZX7hpR2BG22WPgnzvO4uYgI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LXS2qFUeC8581sbONh7yz7/xBz5nwHDASGXn5wgbhLkw/bwwuDXB8m71zdrrVTq96xgz2zjZpDzVG+u/cNgh1EeXVXiugoXZtg9ouwRAu6Pp3qtoiyPp8F7GemB89cTVHIWLY9gyciFn/l9kiJEN3owbu3HQxGv2OmshkSaonuU= 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=QWRrq7zA; arc=none smtp.client-ip=209.85.210.170 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="QWRrq7zA" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-747fc7506d4so1380948b3a.0 for ; Thu, 12 Jun 2025 12:52:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749757932; x=1750362732; darn=lists.linux.dev; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=z7xi4YJKAUkKxYZRl9SSrq8Evyr8Lkvoed++01daD1s=; b=QWRrq7zA14n9JU7DP9vxesbAidwV9xnyfe29/ac3AakE+vBOmlZwLBPSd1C55W0nnP xzvroTreTMqFvcW+ek2o601+V/MBpALI6aSt+YjD0qVC3V8cf4I4BIYz5lobdGTmlsyU HLMorsXSy/nJpRF3sgEK5F8SlOred7wp1rUp3B7hJJJ76syCE1Le6hHNHYo3u+8Hvwez 3Difrnc/3uZgtKrirUmyu9GBez3I3t7q9nPrRGY1ZQ2/eazNqKoQSLA09+kRgj4szBhI ncReJTcVBXFRklv6ma91miMZPwnzXz49h0vtg826KNyb5Qq34oGTm0iF54jiS/2FJxUM dqCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749757932; x=1750362732; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=z7xi4YJKAUkKxYZRl9SSrq8Evyr8Lkvoed++01daD1s=; b=jysdu2NceQ2VAECKiykColWB/rSMj610/Pp77FSwLddL7Ur/lkNRYtEJ6EVp84kPcb aCsjTeIftb5RHzX5TBMpWeaQdnUvdFk8hR8QZr9KFvxhr+5VTrPk20c0bSKX93Ww++6o H0yHt3EfW1Q2FkL8bJ+cVEzl1TX04m9W5ieOHpzJPj7p6k1J63sqEe3+iqMVlfo8MbVV 3lse3m08pBxhEJ3WjRcBl7UJksvooFk094iR9z5KB9rPRwNxp/1UnLWIA78xhesVaQyO 9UlnQmw+4taBRo9k1MQB16zyP3uPuMi6wk9qpwrpF3kZHv8rzoW1n0HnRvAITdmwICId FM2g== X-Forwarded-Encrypted: i=1; AJvYcCX7ICbJ+cSykYuAbE5y0Pu4ZudOMdwsMLTko/BtR6A7WBx/CdVkQXznO1Nh6DWDUY2QaIIJ@lists.linux.dev X-Gm-Message-State: AOJu0YwzYGSncG6texVh5SI+2K/9J1fM8awPZPTRsn3697FazCO922D5 9dx/4sbRCHFEX01fyXDIL5wORDXdKNHzj1uNeW8nWqR/dl3bEkUisxTy X-Gm-Gg: ASbGncs2w1WjoeNg1/yz2QIUXNV58hR75hAVNpUZeXOQYZpcOAJcPb8GovO0ulSr+jm yZqwJrcPN/q4h6aq3wx2LwYFIq994I3nby/tkmsgyqIIOCLfB6X3sA5Qosid7FvYE49zIjxHbAm fJRPkQKEGA/2v7FxL3hPWvZ2rgvsXlEeaeFBf7Bo4XAGIUz2cuO+gKN0C232gjW+PRotrlrCQBo SD4D48xM72PNMuFFTTP4nsVvdpYUgIAD43RbyKbTUfxKtk75v3WzqSc/Ig1IYWyn/raoKku4kyB ItV5GRcYBptqPVAuAg/XmfevXj3rS7aRUOsva6ubGZaeCXe8KhMQHCBuOL2SyA== X-Google-Smtp-Source: AGHT+IEU8m2F+5mxJ4HQROetGJB4LGA8zrpWrZ/HojR3rTDhNg8kjwUPP475HlXQvhwtX4Onlx73lw== X-Received: by 2002:a05:6a00:b87:b0:736:450c:fa54 with SMTP id d2e1a72fcca58-7488f6c9155mr687345b3a.6.1749757932319; Thu, 12 Jun 2025 12:52:12 -0700 (PDT) Received: from localhost ([216.228.127.129]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7488ffeca70sm123370b3a.21.2025.06.12.12.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 12:52:11 -0700 (PDT) Date: Thu, 12 Jun 2025 15:52:09 -0400 From: Yury Norov To: Bjorn Helgaas Cc: Nicolas Frattaroli , 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 , Krzysztof =?utf-8?Q?Wilczy=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 , 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 Subject: Re: [PATCH 16/20] PCI: rockchip: switch to HWORD_UPDATE* macros Message-ID: References: <20250612-byeword-update-v1-16-f4afb8f6313f@collabora.com> <20250612193728.GA924118@bhelgaas> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250612193728.GA924118@bhelgaas> On Thu, Jun 12, 2025 at 02:37:28PM -0500, Bjorn Helgaas wrote: > On Thu, Jun 12, 2025 at 08:56:18PM +0200, Nicolas Frattaroli wrote: > > The era of hand-rolled HIWORD_UPDATE macros is over, at least for those > > drivers that use constant masks. > > > > The Rockchip PCI driver, like many other Rockchip drivers, has its very > > own definition of HIWORD_UPDATE. > > > > Remove it, and replace its usage with either HWORD_UPDATE, or two new > > header local macros for setting/clearing a bit with the high mask, which > > use HWORD_UPDATE_CONST internally. In the process, ENCODE_LANES needed > > to be adjusted, as HWORD_UPDATE* shifts the value for us. > > > > That this is equivalent was verified by first making all HWORD_UPDATE > > instances HWORD_UPDATE_CONST, then doing a static_assert() comparing it > > to the old macro (and for those with parameters, static_asserting for > > the full range of possible values with the old encode macro). > > > > What we get out of this is compile time error checking to make sure the > > value actually fits in the mask, and that the mask fits in the register, > > and also generally less icky code that writes shifted values when it > > actually just meant to set and clear a handful of bits. > > > > Signed-off-by: Nicolas Frattaroli > > Looks good to me. I assume you want to merge these via a non-PCI tree > since this depends on patch 01/20. PCI subject convention would > capitalize "Switch": Hi, I'd like to take patch #1 and the explicitly acked following patches in my bitmap-for-next.Those who would prefer to move the material in their per-driver branches (like net, as mentioned by Andrew Lunn) can wait till the end of next merge window, and then apply the patches cleanly. Thanks, Yury > PCI: rockchip: Switch to HWORD_UPDATE* macros > > Acked-by: Bjorn Helgaas > > > --- > > drivers/pci/controller/pcie-rockchip.h | 35 +++++++++++++++++----------------- > > 1 file changed, 18 insertions(+), 17 deletions(-) > > > > diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h > > index 5864a20323f21a004bfee4ac6d3a1328c4ab4d8a..5f2e45f062d94cd75983f7ad0c5b708e5b4cfb6f 100644 > > --- a/drivers/pci/controller/pcie-rockchip.h > > +++ b/drivers/pci/controller/pcie-rockchip.h > > @@ -11,6 +11,7 @@ > > #ifndef _PCIE_ROCKCHIP_H > > #define _PCIE_ROCKCHIP_H > > > > +#include > > #include > > #include > > #include > > @@ -21,10 +22,10 @@ > > * The upper 16 bits of PCIE_CLIENT_CONFIG are a write mask for the lower 16 > > * bits. This allows atomic updates of the register without locking. > > */ > > -#define HIWORD_UPDATE(mask, val) (((mask) << 16) | (val)) > > -#define HIWORD_UPDATE_BIT(val) HIWORD_UPDATE(val, val) > > +#define HWORD_SET_BIT(val) (HWORD_UPDATE_CONST((val), 1)) > > +#define HWORD_CLR_BIT(val) (HWORD_UPDATE_CONST((val), 0)) > > > > -#define ENCODE_LANES(x) ((((x) >> 1) & 3) << 4) > > +#define ENCODE_LANES(x) ((((x) >> 1) & 3)) > > #define MAX_LANE_NUM 4 > > #define MAX_REGION_LIMIT 32 > > #define MIN_EP_APERTURE 28 > > @@ -32,21 +33,21 @@ > > > > #define PCIE_CLIENT_BASE 0x0 > > #define PCIE_CLIENT_CONFIG (PCIE_CLIENT_BASE + 0x00) > > -#define PCIE_CLIENT_CONF_ENABLE HIWORD_UPDATE_BIT(0x0001) > > -#define PCIE_CLIENT_CONF_DISABLE HIWORD_UPDATE(0x0001, 0) > > -#define PCIE_CLIENT_LINK_TRAIN_ENABLE HIWORD_UPDATE_BIT(0x0002) > > -#define PCIE_CLIENT_LINK_TRAIN_DISABLE HIWORD_UPDATE(0x0002, 0) > > -#define PCIE_CLIENT_ARI_ENABLE HIWORD_UPDATE_BIT(0x0008) > > -#define PCIE_CLIENT_CONF_LANE_NUM(x) HIWORD_UPDATE(0x0030, ENCODE_LANES(x)) > > -#define PCIE_CLIENT_MODE_RC HIWORD_UPDATE_BIT(0x0040) > > -#define PCIE_CLIENT_MODE_EP HIWORD_UPDATE(0x0040, 0) > > -#define PCIE_CLIENT_GEN_SEL_1 HIWORD_UPDATE(0x0080, 0) > > -#define PCIE_CLIENT_GEN_SEL_2 HIWORD_UPDATE_BIT(0x0080) > > +#define PCIE_CLIENT_CONF_ENABLE HWORD_SET_BIT(0x0001) > > +#define PCIE_CLIENT_CONF_DISABLE HWORD_CLR_BIT(0x0001) > > +#define PCIE_CLIENT_LINK_TRAIN_ENABLE HWORD_SET_BIT(0x0002) > > +#define PCIE_CLIENT_LINK_TRAIN_DISABLE HWORD_CLR_BIT(0x0002) > > +#define PCIE_CLIENT_ARI_ENABLE HWORD_SET_BIT(0x0008) > > +#define PCIE_CLIENT_CONF_LANE_NUM(x) HWORD_UPDATE(0x0030, ENCODE_LANES(x)) > > +#define PCIE_CLIENT_MODE_RC HWORD_SET_BIT(0x0040) > > +#define PCIE_CLIENT_MODE_EP HWORD_CLR_BIT(0x0040) > > +#define PCIE_CLIENT_GEN_SEL_1 HWORD_CLR_BIT(0x0080) > > +#define PCIE_CLIENT_GEN_SEL_2 HWORD_SET_BIT(0x0080) > > #define PCIE_CLIENT_LEGACY_INT_CTRL (PCIE_CLIENT_BASE + 0x0c) > > -#define PCIE_CLIENT_INT_IN_ASSERT HIWORD_UPDATE_BIT(0x0002) > > -#define PCIE_CLIENT_INT_IN_DEASSERT HIWORD_UPDATE(0x0002, 0) > > -#define PCIE_CLIENT_INT_PEND_ST_PEND HIWORD_UPDATE_BIT(0x0001) > > -#define PCIE_CLIENT_INT_PEND_ST_NORMAL HIWORD_UPDATE(0x0001, 0) > > +#define PCIE_CLIENT_INT_IN_ASSERT HWORD_SET_BIT(0x0002) > > +#define PCIE_CLIENT_INT_IN_DEASSERT HWORD_CLR_BIT(0x0002) > > +#define PCIE_CLIENT_INT_PEND_ST_PEND HWORD_SET_BIT(0x0001) > > +#define PCIE_CLIENT_INT_PEND_ST_NORMAL HWORD_CLR_BIT(0x0001) > > #define PCIE_CLIENT_SIDE_BAND_STATUS (PCIE_CLIENT_BASE + 0x20) > > #define PCIE_CLIENT_PHY_ST BIT(12) > > #define PCIE_CLIENT_DEBUG_OUT_0 (PCIE_CLIENT_BASE + 0x3c) > > > > -- > > 2.49.0 > >