From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) (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 1A06441C2F9; Thu, 30 Apr 2026 16:24:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566292; cv=none; b=loe6aPOTQ1uesC+E9skZ7fhaibaW4b+DJs8J63dfGJpQ4uQH9zBfklGR2CyP0qiCsGwq0G8RKBVGakGa3UHiiojBKqlBYWW8tvipvDmgbmbeUo21fpCwPBv9w4Xm01tcELMpXoPbIAtB3DDVj+uMx+3m6/hkEoIC03jVlpGqT9U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566292; c=relaxed/simple; bh=PWQa6kmZuv3zdHViw4antbtQC4IL6oOR4srb64P6UUc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ovqyfZDf6FUB5tXzXFnsfKYVHV1VxyNaz+zZK5+XQf7k1nHC44uTtT6yV5am55zWkNIEtN7iM1ffYTAq8F9gKeA6q0wue5tKUH/Ro9MrWu1XpVN0Yi0OdGuVDsT7r8cgQidw1BOxLu5d6NUVG2b34UFZzjtZwjCmm0xSNykJSYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=POEfnhmA; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="POEfnhmA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Dn +bcvrZaMvrCdXQIg31n1Ub72ehyce3TBLdKzywkAM=; b=POEfnhmA4AMGUZ+cJm fV8fyGpwlHHRiObsq2NGgr21j9FWMQR3GSxUF6IK07djOBbc9tl6dAF3/p9sHwek 5aqyw6tyFcZuKdqMP2VrD3sIWHnR9iAkzSRKzwmJvGrcBIXMssd0eOIK9JvrUD1K m4e1whB9itMXMcDjj0SqoSGZg= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wAHJXM2gvNpY8PXCg--.48992S3; Fri, 01 May 2026 00:24:24 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 01/16] PCI: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:05 +0800 Message-Id: <20260430162420.42839-2-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wAHJXM2gvNpY8PXCg--.48992S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17tw4fAr17Aw4rWF1UGFg_yoW3GFg_ur 1rAr4xCrWjyr17Ca42kw18Jr9YkayxXr4kuFy0yFySyr17J34YgFykXFy8JFW5ur43JryU C3srWryUuryxZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sR_a0P7UUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC7BgGqWnzgjhMdgAA3B Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8f7cfcc00090..942f70f6a441 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5771,8 +5771,7 @@ int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc) if (v > o && (dev->bus->bus_flags & PCI_BUS_FLAGS_NO_MMRBC)) return -EIO; =20 - cmd &=3D ~PCI_X_CMD_MAX_READ; - cmd |=3D FIELD_PREP(PCI_X_CMD_MAX_READ, v); + FIELD_MODIFY(PCI_X_CMD_MAX_READ, &cmd, v); if (pci_write_config_word(dev, cap + PCI_X_CMD, cmd)) return -EIO; } --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (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 E124B466B6E; Thu, 30 Apr 2026 16:24:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566293; cv=none; b=LwsqwVZTyXVvVQ7TyC8HpscUzzZqA6vsVihGph1LRNyEH/iAbOOd+740eK8P0NcH1OcE8h3GVBM+mrIvuS/+0IcaavLVwJ53Wpht+eQk9k0YtQghlUJil04XI7FycDsw6zx3AiHUu10s8zNOpywCLtHDAueVWr0IoL09/4v6Q+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566293; c=relaxed/simple; bh=HG6wMmNzqQr/vAz/9YVXg/XRCGn+6x3TvxKDdZcRqNI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mpGi8W7ZfDVtBbzOfh68SndgbwDJjBYlQPbZk1myjDV8Q11WmVXGbpKBEXwnwM7eHCRUalagsqXcBqAneZKC7XLP2F/vh3ndrQ9zFOW2sj9idaf03aeH72vdR2QKd3/hqZlVjiGdSPBGo+Fv7qzVs+8polWf0VGOumYdBMvc4Lg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=RxOL757R; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="RxOL757R" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=/i SkfsxQrBPqbPvZDhBTwfrh6nYXLR6KjN3mR6Z7XlI=; b=RxOL757R5fu3Ik6Rsh Bs8O0SaG65SjQpDqrwSJ2mwsE85szY+MATI8y2QADWCBft0SnNncx02tp7nwD+wL UUQkbVQKfThbRSNK1u8Jm1vU1S6SkyCAE09Hypv1riAiNzvacLNUXJE1tlhURiBk XBbz0bgaNJy0Zk3TJh341dsAM= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wAHJXM2gvNpY8PXCg--.48992S4; Fri, 01 May 2026 00:24:24 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 02/16] PCI/PTM: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:06 +0800 Message-Id: <20260430162420.42839-3-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wAHJXM2gvNpY8PXCg--.48992S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17tw4fAr17Aw4rJr1fWFg_yoW3Krb_WF 18Zr13Ar1UJrn8Cw45Can7X3s0k3WqgFs7ZFs29F15CFy7Zrn8Wa9Yv34kJr15uF43GryF kasFqrykCFySkjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sR_O6pDUUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC6xgGqWnzgjhChQAA37 Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/pcie/ptm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c index a41ffd1914de..bd3bd39f6372 100644 --- a/drivers/pci/pcie/ptm.c +++ b/drivers/pci/pcie/ptm.c @@ -152,8 +152,7 @@ static int __pci_enable_ptm(struct pci_dev *dev) pci_read_config_dword(dev, ptm + PCI_PTM_CTRL, &ctrl); =20 ctrl |=3D PCI_PTM_CTRL_ENABLE; - ctrl &=3D ~PCI_PTM_GRANULARITY_MASK; - ctrl |=3D FIELD_PREP(PCI_PTM_GRANULARITY_MASK, dev->ptm_granularity); + FIELD_MODIFY(PCI_PTM_GRANULARITY_MASK, &ctrl, dev->ptm_granularity); if (dev->ptm_root) ctrl |=3D PCI_PTM_CTRL_ROOT; =20 --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) (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 3FE8446AF17; Thu, 30 Apr 2026 16:24:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566296; cv=none; b=ofqJzba5n95NoO1dl3OaYhhjrGpbPRCeFSaPsvtrev1laEE3QupUTp1XnzyFzHAVKQtg9cibhqzw18/kNH9J65vi08gFN6O9SguUz80xYlpfuTqo2dmadqmze6jq9umLayEkYAZ9RbWrXVfyET5frFcXxr1du+1wvzx5f1pikkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566296; c=relaxed/simple; bh=//g/gfYin1BYZPPEXv047fnhk6hs7IC+Kacx/LUCRgs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V/JuB6Fr1ngUznAfA9R6eLARHNpjYFewQt/RsZvuotRuT98Yb2G0bOnmZQ+ByJa8EMUhMh+ziKOKZTa0fBVCUjIExdUkTdcPrVKq/9YkUjoJVYRAYObFkSH4t1tWZrDCpFpsRskV5ijoFciAGOahD2y9i7I4KJVy5qdIXygRW8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=gDL7zZpC; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="gDL7zZpC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=lQ fUqpcdUHp737uvF57WjW/GDdEjm5esbQrm+jqJ1Bw=; b=gDL7zZpCH/BB2ZpW1E v3jVwisqq2nODB2VtjU9G33KrWPj1mot3aekZI1aOAiEFOtuHD16J4JpDWlcThd5 lxDYglMFE5AaySEO52LuCB1erJRPdbgswxpCw2j95UFPZxz3l7m1T4PDB8Io1i7h PMUQID+ucose+uUbciZ6tfBlw= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wAHJXM2gvNpY8PXCg--.48992S5; Fri, 01 May 2026 00:24:25 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 03/16] PCI/IDE: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:07 +0800 Message-Id: <20260430162420.42839-4-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wAHJXM2gvNpY8PXCg--.48992S5 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17Kr1rWryUZr47GFWfXwb_yoWkKwc_ur y29r97uFyUAFyxC3Wakr1fJr95uw4qqa1rAa1DtF1Sk343Jwn5WwnYyry8C3y0gFsxZrW5 KrWDXa4rZr1jkjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRyOJ7JUUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC6xkGqWnzgjlCoAAA3e Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/ide.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pci/ide.c b/drivers/pci/ide.c index be74e8f0ae21..beb67b8fb5c5 100644 --- a/drivers/pci/ide.c +++ b/drivers/pci/ide.c @@ -170,8 +170,7 @@ void pci_ide_init(struct pci_dev *pdev) pci_read_config_dword(pdev, pos + PCI_IDE_SEL_CTL, &val); if (val & PCI_IDE_SEL_CTL_EN) continue; - val &=3D ~PCI_IDE_SEL_CTL_ID; - val |=3D FIELD_PREP(PCI_IDE_SEL_CTL_ID, PCI_IDE_RESERVED_STREAM_ID); + FIELD_MODIFY(PCI_IDE_SEL_CTL_ID, &val, PCI_IDE_RESERVED_STREAM_ID); pci_write_config_dword(pdev, pos + PCI_IDE_SEL_CTL, val); } =20 @@ -182,8 +181,7 @@ void pci_ide_init(struct pci_dev *pdev) pci_read_config_dword(pdev, pos, &val); if (val & PCI_IDE_LINK_CTL_EN) continue; - val &=3D ~PCI_IDE_LINK_CTL_ID; - val |=3D FIELD_PREP(PCI_IDE_LINK_CTL_ID, PCI_IDE_RESERVED_STREAM_ID); + FIELD_MODIFY(PCI_IDE_LINK_CTL_ID, &val, PCI_IDE_RESERVED_STREAM_ID); pci_write_config_dword(pdev, pos, val); } =20 --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) (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 DF10746AF2D; Thu, 30 Apr 2026 16:24:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566303; cv=none; b=q1Kschvf9RC4hTb1aQZBH8xeAnCC6pRWyzrJe+HCbMOPspGWLbe1DXbqPb1YZtHn3zkOFDGQ1ks/a99uL3jDmlNYnSoxeC+qaPTy1PoA5Ao85gql2O/JhgDmYtbjxjVhCSOgG5sk7LnHHDTAGtVCMEqeXJpwWeZsTyGyL+T/iPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566303; c=relaxed/simple; bh=BH20/sZFBY5SJOCp+kiWdmJX7w80ygTDJBjP+F2Pzb8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dngBg6g8bCIQOFGkuMKuFhuKoT/Jjr15vnDJfm6Xb9nRuC7r0Wz1rfCSoSNTj1HAJPRPb/2fQ3PJF6K0Z58po4MBzuaT6ZzPgc43tlxAD4PsQSuHOlqZI2/+IzaT3uvnTcGP+VG+6ftoSvZ6wntvkjlZ/zkclJ6qZFWgmzpJNMk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=ZNnwYHNq; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="ZNnwYHNq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=S2 sAL3YnLBb8rVf9/WlGtBa/nywRSHxKsLjvU4T4r2Q=; b=ZNnwYHNq56TEl5fSYS XFIzOw8ApoKpgsNxyynit7WzbHB4DbuTKWYXlnA1bCH4Ujv8zAWQNRx2J5sIev1D uznG//qPUUaGKm9dVZmZopCWT1yq+SlqNskDYlKazt7hHCR7lxTyYCJGu4diFKsb 2hPMPc+Ag0KfVKJ8jqEveTIL0= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wAHJXM2gvNpY8PXCg--.48992S6; Fri, 01 May 2026 00:24:25 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 04/16] PCI/IOV: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:08 +0800 Message-Id: <20260430162420.42839-5-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wAHJXM2gvNpY8PXCg--.48992S6 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17tw47Wr45Gr43Cw4UJwb_yoWfCFb_Wr 18G34xGr1UAr1UGw4Fkr1Svr9Y9ws0qa1v9a40ga45u3s5Xrn8Wryvv3yvkF48uw43CrW3 A3yUXr15u3yIgjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sRiDUUUUUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbCwxoGqWnzgjpN6QAA3w Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/iov.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 91ac4e37ecb9..fdae70abe804 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -946,8 +946,7 @@ static void sriov_restore_vf_rebar_state(struct pci_dev= *dev) pci_read_config_dword(dev, pos + PCI_VF_REBAR_CTRL, &ctrl); bar_idx =3D FIELD_GET(PCI_VF_REBAR_CTRL_BAR_IDX, ctrl); size =3D pci_rebar_bytes_to_size(dev->sriov->barsz[bar_idx]); - ctrl &=3D ~PCI_VF_REBAR_CTRL_BAR_SIZE; - ctrl |=3D FIELD_PREP(PCI_VF_REBAR_CTRL_BAR_SIZE, size); + FIELD_MODIFY(PCI_VF_REBAR_CTRL_BAR_SIZE, &ctrl, size); pci_write_config_dword(dev, pos + PCI_VF_REBAR_CTRL, ctrl); } } --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (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 F317E472798; Thu, 30 Apr 2026 16:24:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566302; cv=none; b=gyIx3V9m7oKN+GToXqfAcqvAp9RxPKMyeCtUQ7bOwLar38/nLIoe082KraVyeFVpxZjM3k4OZ8cbZ5upDcdbH3+saO8x87o2fGXZOF8iC0mGbiN3GcsRdT6u5cY34H4A0XBEkL1OeKA3dKXJ2Vag9QlfQ1d5cZseCoaEb4WZFa0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566302; c=relaxed/simple; bh=mKRbDHHs0pBDmNClLmPUI/k8yIq84PMezI+ZfgY5vhM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R8ScfpRklY42RmYksgmIGbm9LwICbbud6Y6AfF5pya/hWB0IvNCxrPx9OrmJ0YNBDnBIO+xr8j3YwAeaxwgSsadf8vTULaI9gZf18cnOy1r+7aKqSnXVwsEPylGKo9oawbrzvzp5aJ5yb8c1FpN577BweqxCGj5gPYMYlPLbEYs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=kV1/8b8Y; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="kV1/8b8Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=MK 0nueE9kuPh+C6bezt4QBz2BNnFpiu2HHOSbx6DsC8=; b=kV1/8b8Y1kpvxqjJMC auDa+Mx1Q7oM2Vcau9f2AIxoFMicnagkwljriWG3tVNyjcAj75yyB+2cnmVHldP9 VEultCh1EDze/ZbJNpy4fDOtbUrBxqcP8LdJoncP4fLmI8Gb1Hi1pURHyT94KL8S TJxhFqutoVKwEDLZuZXPl9qHw= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wAHJXM2gvNpY8PXCg--.48992S7; Fri, 01 May 2026 00:24:26 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 05/16] PCI/TPH: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:09 +0800 Message-Id: <20260430162420.42839-6-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wAHJXM2gvNpY8PXCg--.48992S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7urW7uF4xGF1fZr48AF1xuFg_yoW8Xr1Upa yrJa4fKF9rtr1jyF4DXa1DXrn0gF9aqF97A34Ut39FgF47AF4xXasYyrnxtr18ZFWvvFWf ua9xtryjgFyUA3JanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRPUUUUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC7BoGqWnzgjpM7QAA3a Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/tph.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/pci/tph.c b/drivers/pci/tph.c index 91145e8d9d95..655ffd60e62f 100644 --- a/drivers/pci/tph.c +++ b/drivers/pci/tph.c @@ -139,8 +139,7 @@ static void set_ctrl_reg_req_en(struct pci_dev *pdev, u= 8 req_type) =20 pci_read_config_dword(pdev, pdev->tph_cap + PCI_TPH_CTRL, ®); =20 - reg &=3D ~PCI_TPH_CTRL_REQ_EN_MASK; - reg |=3D FIELD_PREP(PCI_TPH_CTRL_REQ_EN_MASK, req_type); + FIELD_MODIFY(PCI_TPH_CTRL_REQ_EN_MASK, ®, req_type); =20 pci_write_config_dword(pdev, pdev->tph_cap + PCI_TPH_CTRL, reg); } @@ -427,11 +426,8 @@ int pcie_enable_tph(struct pci_dev *pdev, int mode) /* Write them into TPH control register */ pci_read_config_dword(pdev, pdev->tph_cap + PCI_TPH_CTRL, ®); =20 - reg &=3D ~PCI_TPH_CTRL_MODE_SEL_MASK; - reg |=3D FIELD_PREP(PCI_TPH_CTRL_MODE_SEL_MASK, pdev->tph_mode); - - reg &=3D ~PCI_TPH_CTRL_REQ_EN_MASK; - reg |=3D FIELD_PREP(PCI_TPH_CTRL_REQ_EN_MASK, pdev->tph_req_type); + FIELD_MODIFY(PCI_TPH_CTRL_MODE_SEL_MASK, ®, pdev->tph_mode); + FIELD_MODIFY(PCI_TPH_CTRL_REQ_EN_MASK, ®, pdev->tph_req_type); =20 pci_write_config_dword(pdev, pdev->tph_cap + PCI_TPH_CTRL, reg); =20 --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) (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 DB5EB4611CF; Thu, 30 Apr 2026 16:24:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566297; cv=none; b=QlMhugr/NuB/9SJVlDQxMXYQEmr005qm03eIOwco7fIBaM2uVVqXchp6VVOZ6p/sS3mQ0rgsg4MLymG2hKyVIFUFOFlaX9BpZ2A4nY2Fh/KWwd6kLqvmn5vTh1w/WG3bIWKowKIwZ2P44ricq5aIc9cpByuHFnGTD/xmTewkCvA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566297; c=relaxed/simple; bh=sCsHoa8O9H1cL+Uy+UCJ1dvw/lw4dcrYTpEvOuCWps0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Kg/IBa2BtsGbwUk2Dg5erMBqGqkIex6Xu8s0mUnE8rtWOb4J8IdY7GdeABjS6sqzzSaLbZreRF0BKDX554eh7benDBiqXTxKwcUp1jFJcUg2pOMurwlDmVwmUKkhlMWsYxw2NsN+LLy/YCehIwJa0OFKBtGRukd7a+qWHbVGUCI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=iTpJViCr; arc=none smtp.client-ip=117.135.210.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="iTpJViCr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=f4 uCdZZ0oXhBkkne4HIBGaYPsR9cIC0DI5x1vctw3r8=; b=iTpJViCr8ZkwKKp+wM wNAgc5CHD86tKz0MZTYqJki/hlr3qT2ckcB2pDWLV/ckDQSezlJwCUt2kHC43+Z8 KBZEw/W88eAjmOf1fxyaotTOZR1FMymlw9WIld79O2BBiwFU4sb+kCtJwuuU9r5A q3MkKUO4zc3MSLaN4nYuCaNM0= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wAHJXM2gvNpY8PXCg--.48992S8; Fri, 01 May 2026 00:24:27 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 06/16] PCI/MSI: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:10 +0800 Message-Id: <20260430162420.42839-7-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wAHJXM2gvNpY8PXCg--.48992S8 X-Coremail-Antispam: 1Uf129KBjvJXoW7urW7uF4fKw17Gw1UWF1kAFb_yoW8Zw4UpF WFgFWUKayrta1rXFsxuF1q9F12vFs8tF97GF42kw17uryrZw1qyFy5tF4UKF1fXFW7Zr45 AwnYy3y7Ka98GFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRPUUUUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbCxBsGqWnzgjta9QAA38 Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/msi/msi.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index 81d24a270a79..33c8b5b98684 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -201,8 +201,7 @@ static inline void pci_write_msg_msi(struct pci_dev *de= v, struct msi_desc *desc, u16 msgctl; =20 pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl); - msgctl &=3D ~PCI_MSI_FLAGS_QSIZE; - msgctl |=3D FIELD_PREP(PCI_MSI_FLAGS_QSIZE, desc->pci.msi_attrib.multiple= ); + FIELD_MODIFY(PCI_MSI_FLAGS_QSIZE, &msgctl, desc->pci.msi_attrib.multiple); pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl); =20 pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO, msg->address_lo); @@ -532,9 +531,8 @@ void __pci_restore_msi_state(struct pci_dev *dev) =20 pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control); pci_msi_update_mask(entry, 0, 0); - control &=3D ~PCI_MSI_FLAGS_QSIZE; - control |=3D PCI_MSI_FLAGS_ENABLE | - FIELD_PREP(PCI_MSI_FLAGS_QSIZE, entry->pci.msi_attrib.multiple); + FIELD_MODIFY(PCI_MSI_FLAGS_QSIZE, &control, entry->pci.msi_attrib.multipl= e); + control |=3D PCI_MSI_FLAGS_ENABLE; pci_write_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, control); } =20 @@ -970,8 +968,7 @@ int pci_msix_write_tph_tag(struct pci_dev *pdev, unsign= ed int index, u16 tag) if (!msi_desc || msi_desc->pci.msi_attrib.is_virtual) return -ENXIO; =20 - msi_desc->pci.msix_ctrl &=3D ~PCI_MSIX_ENTRY_CTRL_ST; - msi_desc->pci.msix_ctrl |=3D FIELD_PREP(PCI_MSIX_ENTRY_CTRL_ST, tag); + FIELD_MODIFY(PCI_MSIX_ENTRY_CTRL_ST, &msi_desc->pci.msix_ctrl, tag); pci_msix_write_vector_ctrl(msi_desc, msi_desc->pci.msix_ctrl); /* Flush the write */ readl(pci_msix_desc_addr(msi_desc)); --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) (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 56D9843CEED; Thu, 30 Apr 2026 16:24:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566296; cv=none; b=g+1KtLVAsqUh4hT/me3IyJ5rPQ7AaahWYZMGrqHVd1I5tw+eQU4BxntuVYf7+/n7117yUDhLxJ3ImOpmvwTCNxFfQgd0aXwR67xsOs5evNgIJqBmQ5xhISc6uNuo6rbOReqlEqZcpQ5tIolIEJtzBkKlDvJql0/jEehgJY5eWLE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566296; c=relaxed/simple; bh=nPMKN1Fe1bsfz1xlPQMcwLjyp7UGawQC2SNZYnNmcWo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AIlH+0hmu4qCOcxYNruiJudN1zOuKGk4l7fXD/K4tMTzqa8cU+v++Me5QhEVlTHVUvYhgUbucZIuKW57cDrEb9BD2eZWMxy6qdP6H7PxUoQYkXkokyTtLRVe7AWZjBUfj8n5O62CIevR83JIN4Uag1xqAjekZsl2yYQzFyUDpjo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=XpecQ9vi; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="XpecQ9vi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=0K C3Cmy2ZLsYR50fE71ZJySGEQ83dgNo/ZzhAx1nNYw=; b=XpecQ9viQ8QcokLvA3 8oMyq2YU93fmxuSwbkjNEVcqFccW8zZFXai1XdnRRQU+eQoTTZcpDNdthloKJ8R4 aGtgBs5fAWTWwkxdYyL7Snvu3FJ4UuaaWrU85KFDSaEkvuMIcngx3wJMof2+wEyb l3BssOqUC+/6FMQnLxentGkxE= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wAHJXM2gvNpY8PXCg--.48992S9; Fri, 01 May 2026 00:24:27 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 07/16] PCI/REBAR: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:11 +0800 Message-Id: <20260430162420.42839-8-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wAHJXM2gvNpY8PXCg--.48992S9 X-Coremail-Antispam: 1Uf129KBjvJXoWrur17tw47JFWrXw1rAFWrKrg_yoW8JF1kpr Z5C3ZrGr18JFnrtr1DWa1jkwn0gaykX3srGF9Ik39xZF98twnFv39Ikas5Gr4rJFWkZr45 CFn5try3uF98JaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRPUUUUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbCwxsGqWnzgjtOTgAA3U Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/rebar.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pci/rebar.c b/drivers/pci/rebar.c index 39f8cf3b70d5..e3e0415fc29a 100644 --- a/drivers/pci/rebar.c +++ b/drivers/pci/rebar.c @@ -211,8 +211,7 @@ int pci_rebar_set_size(struct pci_dev *pdev, int bar, i= nt size) return pos; =20 pci_read_config_dword(pdev, pos + PCI_REBAR_CTRL, &ctrl); - ctrl &=3D ~PCI_REBAR_CTRL_BAR_SIZE; - ctrl |=3D FIELD_PREP(PCI_REBAR_CTRL_BAR_SIZE, size); + FIELD_MODIFY(PCI_REBAR_CTRL_BAR_SIZE, &ctrl, size); pci_write_config_dword(pdev, pos + PCI_REBAR_CTRL, ctrl); =20 if (pci_resource_is_iov(bar)) @@ -241,8 +240,7 @@ void pci_restore_rebar_state(struct pci_dev *pdev) bar_idx =3D ctrl & PCI_REBAR_CTRL_BAR_IDX; res =3D pci_resource_n(pdev, bar_idx); size =3D pci_rebar_bytes_to_size(resource_size(res)); - ctrl &=3D ~PCI_REBAR_CTRL_BAR_SIZE; - ctrl |=3D FIELD_PREP(PCI_REBAR_CTRL_BAR_SIZE, size); + FIELD_MODIFY(PCI_REBAR_CTRL_BAR_SIZE, &ctrl, size); pci_write_config_dword(pdev, pos + PCI_REBAR_CTRL, ctrl); } } --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) (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 308C947DD45; Thu, 30 Apr 2026 16:25:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566311; cv=none; b=PHL9bRdLqshWWuHXEipBNmqQilM6C8DJs66sKShvB1twQ4fT88XOsyv1gRnWAYsw4jjttFr6dom9GUBxVgVHUoenJ5NOHDy6aI/Mfutm9gHX56g/WvlU3B9HF9YF+dCaxFZfYPEYMetHn7WOiSFgSdbTjkLigwGLrp4QmsN67Q4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566311; c=relaxed/simple; bh=kWLXzGvNQCyVvpBjxUULMbl2qVzLrafiBrAxhget9ww=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iiQIzxrq5kp5mtrTpWeZTQQpACS6jsa+3NqnhtmKykk0UXfOWIR82Or965+FyQ8AOi07pgGScUpzTcXjviA5wSHxgi+Afp2I+JjBMVaafGSsVKeD9BEycTBAE3R0BvdL9N1L16peVLGV8Ybw0tgrDKf/9r7i7cDVSvuJKJ7v4aw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=LyVVIr7u; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="LyVVIr7u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=yI MCJJEglyEHgy/8KND7/lOemDk9Of90Cg3VIrBcc4k=; b=LyVVIr7u8ejD5/wAER fGUFImA47Q7lSjYgLURK49eKljRsKaSeUSiDRR3PG8/jcgM/moCSVYScW2nc59r0 cz54GRX+CR88hIdkdOooAmJkrmHPWV9p466/bHzV9L+pI3IKL1/CtghAlkgUr3N3 uJCJChTVz2zgHnMRIngsM4el4= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S2; Fri, 01 May 2026 00:24:31 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 08/16] PCI/CARDBUS: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:12 +0800 Message-Id: <20260430162420.42839-9-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17tw4ftFW3KrWktr43KFg_yoWfKwc_Wr n7ZFs7Ar4DAF1vyw45Cr1fA3s09a15Xryv93Z3ta4ayr1vqasY9FZxWrykZFyDuw4ruF9I grZrJr1ruF9FyjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7VUUbAw3UUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC7B8Hqmnzgj9N1QAA3h Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/setup-cardbus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/setup-cardbus.c b/drivers/pci/setup-cardbus.c index 1ebd13a1f730..f7c62054f227 100644 --- a/drivers/pci/setup-cardbus.c +++ b/drivers/pci/setup-cardbus.c @@ -253,8 +253,7 @@ int pci_cardbus_scan_bridge_extend(struct pci_bus *bus,= struct pci_dev *dev, * yenta.c forces a secondary latency timer of 176. * Copy that behaviour here. */ - buses &=3D ~PCI_SEC_LATENCY_TIMER_MASK; - buses |=3D FIELD_PREP(PCI_SEC_LATENCY_TIMER_MASK, CARDBUS_LATENCY_TIMER); + FIELD_MODIFY(PCI_SEC_LATENCY_TIMER_MASK, &buses, CARDBUS_LATENCY_TIMER); =20 /* We need to blast all three values with a single write */ pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses); --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) (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 432E546AF19; Thu, 30 Apr 2026 16:24:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566297; cv=none; b=iMlE6CKvHn07mkb5r/Z92netJa0wvE4ndnxcvUKoI431z+xF12zM7EZVa2NlEOqlMOfFR1w8n2AKp1+byI1llguCqPWJDlAKipaWz9GaXhjJg0V4800Bf+SFAa8UwhqKabsQstvpYAAkiWx/RJzVi886hzIk54EFLf4tZoexnYE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566297; c=relaxed/simple; bh=Lofv0m2TVDTTvL1dhch4RPqqM1I+CGS49Izpi9Bn9Jw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CB9AdpmZffLkSxVdOH46P/d2YzfP9rbK5Ed9+z/hWB9LOEIjWPJAhTsiueK3/cmHWqaamcWhsBVaXOsWoS4Wk1XxggfHCDz+VerAzShxcPBi8cvo4xEDa6SsOr/Nm+RWBGXoP0mr6Df1dqf4ll36z0maqtw7vrDwYlhZO7xZ6BY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=D5tGn28G; arc=none smtp.client-ip=117.135.210.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="D5tGn28G" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=qd 4cKyzmhIsbMqkW+nUXtTuM7vNhmRU2nO8tao3v4TY=; b=D5tGn28GnSH66T3vmg ZiKxqJhWIwnvJrp/3G89ClRaXT80Q7PRsu6mZWaAXuFMBXiEsjBw3s8MB8S9UdKm qQh+w+t5vR01w271sFOIeQyuI32a2kT/2FgiIx+SYyWjlqkBc8DN8EtmyBjiDJ0W K78D+VQbx6Ew1P6BLLso9/Z3U= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S3; Fri, 01 May 2026 00:24:32 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 09/16] PCI: al: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:13 +0800 Message-Id: <20260430162420.42839-10-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7urW7uF43ur13KryDArWUJwb_yoW8Xr47pr W5Ja1xJF18ta1Y9F48K3WkWF1YqFnFvFyDt39xGwna9a1Sy34DW3yFyasYqa47GFW8Zr15 tw4Yv3WxGan3ZFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRn2-8UUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbCxAAIq2nzgkBb9AAA3Q Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/controller/dwc/pcie-al.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-al.c b/drivers/pci/controller/= dwc/pcie-al.c index 345c281c74fe..ef8c8ce7c78c 100644 --- a/drivers/pci/controller/dwc/pcie-al.c +++ b/drivers/pci/controller/dwc/pcie-al.c @@ -253,7 +253,6 @@ static int al_pcie_config_prepare(struct al_pcie *pcie) u8 subordinate_bus; u8 secondary_bus; u32 cfg_control; - u32 reg; =20 ft =3D resource_list_first_type(&pp->bridge->windows, IORESOURCE_BUS); if (!ft) @@ -285,14 +284,9 @@ static int al_pcie_config_prepare(struct al_pcie *pcie) CFG_CONTROL; =20 cfg_control =3D al_pcie_controller_readl(pcie, cfg_control_offset); - - reg =3D cfg_control & - ~(CFG_CONTROL_SEC_BUS_MASK | CFG_CONTROL_SUBBUS_MASK); - - reg |=3D FIELD_PREP(CFG_CONTROL_SUBBUS_MASK, subordinate_bus) | - FIELD_PREP(CFG_CONTROL_SEC_BUS_MASK, secondary_bus); - - al_pcie_controller_writel(pcie, cfg_control_offset, reg); + FIELD_MODIFY(CFG_CONTROL_SUBBUS_MASK, &cfg_control, subordinate_bus); + FIELD_MODIFY(CFG_CONTROL_SEC_BUS_MASK, &cfg_control, secondary_bus); + al_pcie_controller_writel(pcie, cfg_control_offset, cfg_control); =20 return 0; } --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) (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 2DBD6477993; Thu, 30 Apr 2026 16:25:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566305; cv=none; b=HDUY+3wMYw8PoVNrGrAlb/ca4wyzBCnwEkdTi7q3HR0x3pDjd40HPHak18ttq+hCX5c1gy0dKNofDDBxLyH1JbYw+PgWLXNqdK88WnKZwBEe+j/IqyZHqggygsVEYDYs8SNjs2XrqUbmFLT17HNxMqv/MNC19YIOqz7z+iVl7dQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566305; c=relaxed/simple; bh=srG+yZobwtkFs3Ykezmyljr7KjBdK21EgkvzAZGf7oE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=abyv/3zXASgrYkx6pxSYfwN7k0LYpgLRCq+/lyh3gPcVhQLrGNbeL+onTbPyFQD1xLrbB37khRkyRLNxp90j8Fn54Cjt5kWqPHLTastLAKI2KIvBq3V98zu9+uIl9fd983mJU+cQfmiI+jxkbygHudxyNd25GG1a0SA1ufnjdIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=lMatsQ1+; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="lMatsQ1+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=5+ p21yOHzM6HhEIEW/ME4J11uHV07Opa5IXiJKuYTnA=; b=lMatsQ1+P+mAVueFhx ByTEy3KOKqteAnvPjQJ4Z6oAZalw018QcnCu5PD0T88nMiY4+Dz17iV+q/p2lag8 IpWGuxSIOSsuqIoqG3hRRrnYZGKPZ2wQ+vqugO+AmWzUjRzeZ6omWktxwsm+SdfI B5Le9VMAm7sMIWCZDzb8qDFAs= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S4; Fri, 01 May 2026 00:24:32 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 10/16] PCI: eswin: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:14 +0800 Message-Id: <20260430162420.42839-11-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17Kr1UAw15tr13GF4kWFg_yoWDAFbEvr yUCF47Ar4DGrySk340kw1rJr9xA3Z7Xw40gas5tFs3ZF97Kr15WFyvvrZ8tFy3CF1rJFyk tr1vqrWxCFy7JjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sR_O6pDUUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC6wEIq2nzgkFEAQAA3V Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/controller/dwc/pcie-eswin.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-eswin.c b/drivers/pci/controll= er/dwc/pcie-eswin.c index 2845832b3824..ce8d64f8a395 100644 --- a/drivers/pci/controller/dwc/pcie-eswin.c +++ b/drivers/pci/controller/dwc/pcie-eswin.c @@ -211,8 +211,7 @@ static int eswin_pcie_host_init(struct dw_pcie_rp *pp) =20 /* Configure Root Port type */ val =3D readl_relaxed(pci->elbi_base + PCIEELBI_CTRL0_OFFSET); - val &=3D ~PCIEELBI_CTRL0_DEV_TYPE; - val |=3D FIELD_PREP(PCIEELBI_CTRL0_DEV_TYPE, PCI_EXP_TYPE_ROOT_PORT); + FIELD_MODIFY(PCIEELBI_CTRL0_DEV_TYPE, &val, PCI_EXP_TYPE_ROOT_PORT); writel_relaxed(val, pci->elbi_base + PCIEELBI_CTRL0_OFFSET); =20 list_for_each_entry(port, &pcie->ports, list) { --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) (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 7357B47277B; Thu, 30 Apr 2026 16:24:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566302; cv=none; b=BBuglmvj6yH15b8xQj/6kYz19F04ZkefBDUOALa5bPrSX+AXnb8Bj5CxhJOfIF5PzQJuyYSeujVoEj4aDCzv/NyKIFXZ/ENJDuICoeDs83zqAFOj6sMzQqoqtmdc5Go11NNp3AChp/ReWPcoFGrbkOH8U+SWsG1/6x8mBNOdDVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566302; c=relaxed/simple; bh=48RwPttdxZUFq0ycWhKKebZCeIv1wICIT4uEJXvm8oE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bpaXsFYXGrSMeu5JvvZO6LRXJT4X9b4cJ7omRvIYGMlHgksTxSbe1yGndZ3LicJUJwWlJ0LqOcSlJg9KTttBs4PyUxX5f4fzWn0h0FQIqMgHHhhrL5rD4diW+eZ7lYf3Ss+8J7GrnPywY3SmqPP7kHaWsfej2/iOYdR/meonqGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=oahKvQ3L; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="oahKvQ3L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=jA Vlhbb5fwv85oSekzGzmWm4cvS4iOhwz8Eg65D2AxY=; b=oahKvQ3L+z1nKceMKJ AGN8o3pErn/dgD+z3BOml8Up4rTGe9lru7MZr94W+tscNgnVhl5HTwiiLOneMJX4 mRmcrxR3gu+Z2Z12nk7gbzxSNEksFtl513Z+uNp4mWbmPUan6HuUiZJVMv7KgXrH sWODiucDY0LU5M07bIjZQHwTw= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S5; Fri, 01 May 2026 00:24:33 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 11/16] PCI: s32g: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:15 +0800 Message-Id: <20260430162420.42839-12-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S5 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17Kr1UAw15uF18CFWxZwb_yoWfZFXE9F 1DCan7Cr1qkr9rCasYkw1fXrZIya1xXr18Kas5tFsIvF4xGw15ZFZ2va98JF15CF15Ar9a krnFvF1xCFyayjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRgmReUUUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC7AEIq2nzgkFOJQAA38 Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> Reviewed-by: Frank Li --- drivers/pci/controller/dwc/pcie-nxp-s32g.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-nxp-s32g.c b/drivers/pci/contr= oller/dwc/pcie-nxp-s32g.c index b3ec38099fa3..31e1169b8ab6 100644 --- a/drivers/pci/controller/dwc/pcie-nxp-s32g.c +++ b/drivers/pci/controller/dwc/pcie-nxp-s32g.c @@ -139,8 +139,7 @@ static int s32g_init_pcie_controller(struct dw_pcie_rp = *pp) =20 /* Set RP mode */ val =3D s32g_pcie_readl_ctrl(s32g_pp, PCIE_S32G_PE0_GEN_CTRL_1); - val &=3D ~DEVICE_TYPE_MASK; - val |=3D FIELD_PREP(DEVICE_TYPE_MASK, PCI_EXP_TYPE_ROOT_PORT); + FIELD_MODIFY(DEVICE_TYPE_MASK, &val, PCI_EXP_TYPE_ROOT_PORT); =20 /* Use default CRNS */ val &=3D ~SRIS_MODE; --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) (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 559EC4657DA; Thu, 30 Apr 2026 16:24:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566297; cv=none; b=DHBEC3W87rOUCpN8WpMw4WhNkaHhkfoyveG/AyCVujbZWpbb+VsUrNF7qTp5dxlpz/hodCxZC2l0zJT6wKlNt0ZYccVx6TqumpmaF89YZso+CEzZWer1yuQIpkK1ap4pYprN+NbOc+ZNwtLNqYF0w06ebpof3/5l+CYtbmvG8eg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566297; c=relaxed/simple; bh=LyXom0aI8oDNr/p2BhEGgEUfHTYWhiQHz9+4J4UuULk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hJLvd7U2RcAwAq5cCKPbG/XWzrfJiH8px35MjOZiyI8s5za7oxYSEeoh/A5+9lEtifQKfWH+zjxO+SurT+/MnLjwBlv+QxG+OMEUKtDhoAWjkdIeut90e/UjPUD9NYre6trwjozgBIcq+1plQysODGPkKWy6+Bc5sbM04y92fXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=WO4IMcMT; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="WO4IMcMT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=um eHWMzUl4hSLDTxJcBfG2g3uyThkvisFMrecN3+PaA=; b=WO4IMcMTa9WnYBmaTn Cqr8Ie7Y9j2+myzalTATRs2341UlSFTHtDj/tDedR/FQ3pPRvvrT5q9N4gFK4VOz 9tSxX+91qq0ty3NtucJxbBNNNlM9X+wV+xH+nf6nf6DAAaTw/qg9YzHP40yfGhVM fTLejK4e/MRdJ+i7OMFJ0bOI4= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S6; Fri, 01 May 2026 00:24:34 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 12/16] PCI: tegra194: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:16 +0800 Message-Id: <20260430162420.42839-13-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7urW7uF4xJF18JFy7XF1rXrb_yoW8Wry7pa 47tw4FvF1DJF4YvF18Aa4DCr15Kr909ryUCwsxKw1Iva1kCr9Fg395ta4FgFn7AFZrtF45 G3yvya47GF43ZrUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRBpB-UUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC6wIIq2nzgkJELgAA36 Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/controller/dwc/pcie-tegra194.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/contr= oller/dwc/pcie-tegra194.c index 9dcfa194050e..3c831331338e 100644 --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c @@ -872,8 +872,7 @@ static void config_gen3_gen4_eq_presets(struct tegra_pc= ie_dw *pcie) dw_pcie_writel_dbi(pci, GEN3_RELATED_OFF, val); =20 val =3D dw_pcie_readl_dbi(pci, GEN3_EQ_CONTROL_OFF); - val &=3D ~GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC; - val |=3D FIELD_PREP(GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC, 0x3ff); + FIELD_MODIFY(GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC, &val, 0x3ff); val &=3D ~GEN3_EQ_CONTROL_OFF_FB_MODE; dw_pcie_writel_dbi(pci, GEN3_EQ_CONTROL_OFF, val); =20 @@ -883,9 +882,8 @@ static void config_gen3_gen4_eq_presets(struct tegra_pc= ie_dw *pcie) dw_pcie_writel_dbi(pci, GEN3_RELATED_OFF, val); =20 val =3D dw_pcie_readl_dbi(pci, GEN3_EQ_CONTROL_OFF); - val &=3D ~GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC; - val |=3D FIELD_PREP(GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC, - pcie->of_data->gen4_preset_vec); + FIELD_MODIFY(GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC, &val, + pcie->of_data->gen4_preset_vec); val &=3D ~GEN3_EQ_CONTROL_OFF_FB_MODE; dw_pcie_writel_dbi(pci, GEN3_EQ_CONTROL_OFF, val); =20 --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) (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 1C5A947D92B; Thu, 30 Apr 2026 16:25:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566309; cv=none; b=HqtfJ+vQB17nD9EfhUI6b/MCiK0vWjKASo3Ty0iqXv4J31FyWehAvBkATQ1v8JRUF5sd/w6Zklkkv9D5gVWZw/H3UUwBL3vVnKXu7YccHYPV/c4+1/0SW223uWCHAGmNmn7KnUJCEiGnvR4IO0Th89yUtNhh07h6pbt5vsceIy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566309; c=relaxed/simple; bh=vZ4uOzaFRCb9PY8JtFYGG0Um0DEUay7WKzS4t7ZqMa0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jrq4iw3ATbZoMXr1ecTz+vovkH9mt++2a5tWIgGMzwbZD//eft2SyLfQIMwQXI9F+iOCyXuJZZjvTtwxuRoDnaGyYDWx51B7SV/OTgB6LZO0Q4cU9dVzX82ZkdxWn4opti7gOr/OmCxbr/qe+HisVZQfe8IHv5T85pc0i2xexfE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=IFG78m6c; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="IFG78m6c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=cD l2ZCPmDUg/728GazbNRHsswC8Xpvy+YlB6anU9tzI=; b=IFG78m6c6ZXsOK5K31 ZWx43DnN8XMZnab8e32qJ1aoEEloln6QLsZka3BvPQb/7dVJg5s4EwiR9k1MBtpU MXmEN03jG7+e3r50jXpztcbkvotEfpfWn028NDoxrKBbCHFSjPUGo31UufNl/E2I +G0xDWMasjtnzJuZyPa5FoIvg= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S7; Fri, 01 May 2026 00:24:34 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 13/16] PCI: qcom: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:17 +0800 Message-Id: <20260430162420.42839-14-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S7 X-Coremail-Antispam: 1Uf129KBjvJXoWxZr45CFWrXFWDuFy3ury5CFg_yoW7Jw4Upa 48t3Z7JF18tF4UurZIkanrur1F9FsxAw12kanxKanruasFyFZrWa90y3sxtrn7JF4UKFya k348AFW3GFySyrUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRP8nOUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbCxAMIq2nzgkNcVAAA33 Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/controller/dwc/pcie-qcom-common.c | 40 +++++++------------ drivers/pci/controller/dwc/pcie-qcom-ep.c | 6 +-- 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom-common.c b/drivers/pci/co= ntroller/dwc/pcie-qcom-common.c index 5aa73c628737..0da73caf2011 100644 --- a/drivers/pci/controller/dwc/pcie-qcom-common.c +++ b/drivers/pci/controller/dwc/pcie-qcom-common.c @@ -30,20 +30,15 @@ void qcom_pcie_common_set_equalization(struct dw_pcie *= pci) =20 reg =3D dw_pcie_readl_dbi(pci, GEN3_RELATED_OFF); reg &=3D ~GEN3_RELATED_OFF_GEN3_ZRXDC_NONCOMPL; - reg &=3D ~GEN3_RELATED_OFF_RATE_SHADOW_SEL_MASK; - reg |=3D FIELD_PREP(GEN3_RELATED_OFF_RATE_SHADOW_SEL_MASK, - speed - PCIE_SPEED_8_0GT); + FIELD_MODIFY(GEN3_RELATED_OFF_RATE_SHADOW_SEL_MASK, ®, + speed - PCIE_SPEED_8_0GT); dw_pcie_writel_dbi(pci, GEN3_RELATED_OFF, reg); =20 reg =3D dw_pcie_readl_dbi(pci, GEN3_EQ_FB_MODE_DIR_CHANGE_OFF); - reg &=3D ~(GEN3_EQ_FMDC_T_MIN_PHASE23 | - GEN3_EQ_FMDC_N_EVALS | - GEN3_EQ_FMDC_MAX_PRE_CURSOR_DELTA | - GEN3_EQ_FMDC_MAX_POST_CURSOR_DELTA); - reg |=3D FIELD_PREP(GEN3_EQ_FMDC_T_MIN_PHASE23, 0x1) | - FIELD_PREP(GEN3_EQ_FMDC_N_EVALS, 0xd) | - FIELD_PREP(GEN3_EQ_FMDC_MAX_PRE_CURSOR_DELTA, 0x5) | - FIELD_PREP(GEN3_EQ_FMDC_MAX_POST_CURSOR_DELTA, 0x5); + FIELD_MODIFY(GEN3_EQ_FMDC_T_MIN_PHASE23, ®, 0x1); + FIELD_MODIFY(GEN3_EQ_FMDC_N_EVALS, ®, 0xd); + FIELD_MODIFY(GEN3_EQ_FMDC_MAX_PRE_CURSOR_DELTA, ®, 0x5); + FIELD_MODIFY(GEN3_EQ_FMDC_MAX_POST_CURSOR_DELTA, ®, 0x5); dw_pcie_writel_dbi(pci, GEN3_EQ_FB_MODE_DIR_CHANGE_OFF, reg); =20 reg =3D dw_pcie_readl_dbi(pci, GEN3_EQ_CONTROL_OFF); @@ -61,14 +56,10 @@ void qcom_pcie_common_set_16gt_lane_margining(struct dw= _pcie *pci) u32 reg; =20 reg =3D dw_pcie_readl_dbi(pci, GEN4_LANE_MARGINING_1_OFF); - reg &=3D ~(MARGINING_MAX_VOLTAGE_OFFSET | - MARGINING_NUM_VOLTAGE_STEPS | - MARGINING_MAX_TIMING_OFFSET | - MARGINING_NUM_TIMING_STEPS); - reg |=3D FIELD_PREP(MARGINING_MAX_VOLTAGE_OFFSET, 0x24) | - FIELD_PREP(MARGINING_NUM_VOLTAGE_STEPS, 0x78) | - FIELD_PREP(MARGINING_MAX_TIMING_OFFSET, 0x32) | - FIELD_PREP(MARGINING_NUM_TIMING_STEPS, 0x10); + FIELD_MODIFY(MARGINING_MAX_VOLTAGE_OFFSET, ®, 0x24); + FIELD_MODIFY(MARGINING_NUM_VOLTAGE_STEPS, ®, 0x78); + FIELD_MODIFY(MARGINING_MAX_TIMING_OFFSET, ®, 0x32); + FIELD_MODIFY(MARGINING_NUM_TIMING_STEPS, ®, 0x10); dw_pcie_writel_dbi(pci, GEN4_LANE_MARGINING_1_OFF, reg); =20 reg =3D dw_pcie_readl_dbi(pci, GEN4_LANE_MARGINING_2_OFF); @@ -76,13 +67,10 @@ void qcom_pcie_common_set_16gt_lane_margining(struct dw= _pcie *pci) MARGINING_SAMPLE_REPORTING_METHOD | MARGINING_IND_LEFT_RIGHT_TIMING | MARGINING_VOLTAGE_SUPPORTED; - reg &=3D ~(MARGINING_IND_UP_DOWN_VOLTAGE | - MARGINING_MAXLANES | - MARGINING_SAMPLE_RATE_TIMING | - MARGINING_SAMPLE_RATE_VOLTAGE); - reg |=3D FIELD_PREP(MARGINING_MAXLANES, pci->num_lanes) | - FIELD_PREP(MARGINING_SAMPLE_RATE_TIMING, 0x3f) | - FIELD_PREP(MARGINING_SAMPLE_RATE_VOLTAGE, 0x3f); + reg &=3D ~MARGINING_IND_UP_DOWN_VOLTAGE; + FIELD_MODIFY(MARGINING_MAXLANES, ®, pci->num_lanes); + FIELD_MODIFY(MARGINING_SAMPLE_RATE_TIMING, ®, 0x3f); + FIELD_MODIFY(MARGINING_SAMPLE_RATE_VOLTAGE, ®, 0x3f); dw_pcie_writel_dbi(pci, GEN4_LANE_MARGINING_2_OFF, reg); } EXPORT_SYMBOL_GPL(qcom_pcie_common_set_16gt_lane_margining); diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/contro= ller/dwc/pcie-qcom-ep.c index 257c2bcb5f76..56184e6ca6e6 100644 --- a/drivers/pci/controller/dwc/pcie-qcom-ep.c +++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c @@ -494,15 +494,13 @@ static int qcom_pcie_perst_deassert(struct dw_pcie *p= ci) /* Set the L0s Exit Latency to 2us-4us =3D 0x6 */ offset =3D dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); val =3D dw_pcie_readl_dbi(pci, offset + PCI_EXP_LNKCAP); - val &=3D ~PCI_EXP_LNKCAP_L0SEL; - val |=3D FIELD_PREP(PCI_EXP_LNKCAP_L0SEL, 0x6); + FIELD_MODIFY(PCI_EXP_LNKCAP_L0SEL, &val, 0x6); dw_pcie_writel_dbi(pci, offset + PCI_EXP_LNKCAP, val); =20 /* Set the L1 Exit Latency to be 32us-64 us =3D 0x6 */ offset =3D dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); val =3D dw_pcie_readl_dbi(pci, offset + PCI_EXP_LNKCAP); - val &=3D ~PCI_EXP_LNKCAP_L1EL; - val |=3D FIELD_PREP(PCI_EXP_LNKCAP_L1EL, 0x6); + FIELD_MODIFY(PCI_EXP_LNKCAP_L1EL, &val, 0x6); dw_pcie_writel_dbi(pci, offset + PCI_EXP_LNKCAP, val); =20 dw_pcie_dbi_ro_wr_dis(pci); --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) (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 A7BCB47DD60; Thu, 30 Apr 2026 16:25:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566315; cv=none; b=Lfk0BFKvEfD+cKYbL9X4m9s/hqUBKuM38GUWM3S2vnbmAw3EOhKk2B9//EFVU5Bi63aqIdDsdOd2EcWFUXXOKbejEs9ZUDDxnWmBcJPC8U2fSw0Ts0LBsz7U9gvuqBV1au+UHsKytDGpA9g5ZRP20dNXnuHY7KDGFIq4qvXnz7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566315; c=relaxed/simple; bh=yQO3BGRmV2kjV7ZOVBoEhN3HcNfDmDzJd7JphAWGMg4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LnNKk7c0YSynuoWuZT6+QrZPMt0rxi1ojOmIwUVz755wHo3AniKe6QNoedLEj7Q3MQeKxuVW4Hs2ZTfxbWpBa/vFLyQEXJcORq6briFGXzBUt4Go8YJugcCKIWSPpZqHYD4JuID50b5595XmCDm47suAIhewLp2q+zB8qCAz2r8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=keShUSEk; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="keShUSEk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=ab jbWUMg51txoJ4eO3Die4tJLGoUyy9UCj0uefKd21o=; b=keShUSEkoxZscZNARV qXMhl02SxnOu1o+9iHV3NcO4I5q1dapq1OmuY42zPE/uIklMidooLNwh5kKZT6yT qW+wNEdVv3m6dH4gCUK7WQpV3gg5VSW7c81PXiilYLSglDTEETq77k4lZkjAhqd0 GGtc5gBVhquW8cVRf1Dkf6V6A= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S8; Fri, 01 May 2026 00:24:35 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 14/16] PCI: dwc: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:18 +0800 Message-Id: <20260430162420.42839-15-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S8 X-Coremail-Antispam: 1Uf129KBjvJXoWxZr4UKFy7Ar13ZrWrAFy7Wrg_yoWrKF4Upa y5ArySyF1rtr45Z3Z8Za4DuF15X3Z3AFZ7G39ruw1xWFy2vr42qay8Ka4Yyr1fJFW0qry5 Kw4jy347GFs8JaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRP8nOUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbCxAMIq2nzgkNcawAA3I Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- .../controller/dwc/pcie-designware-debugfs.c | 23 +++++++------------ .../pci/controller/dwc/pcie-designware-ep.c | 3 +-- drivers/pci/controller/dwc/pcie-designware.c | 3 +-- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-debugfs.c b/drivers= /pci/controller/dwc/pcie-designware-debugfs.c index d0884253be97..945f8f9b6d0e 100644 --- a/drivers/pci/controller/dwc/pcie-designware-debugfs.c +++ b/drivers/pci/controller/dwc/pcie-designware-debugfs.c @@ -265,8 +265,7 @@ static ssize_t lane_detect_write(struct file *file, con= st char __user *buf, return ret; =20 val =3D dw_pcie_readl_dbi(pci, rinfo->ras_cap_offset + SD_STATUS_L1LANE_R= EG); - val &=3D ~(LANE_SELECT); - val |=3D FIELD_PREP(LANE_SELECT, lane); + FIELD_MODIFY(LANE_SELECT, &val, lane); dw_pcie_writel_dbi(pci, rinfo->ras_cap_offset + SD_STATUS_L1LANE_REG, val= ); =20 return count; @@ -339,14 +338,10 @@ static ssize_t err_inj_write(struct file *file, const= char __user *buf, val |=3D ((err_inj_list[pdata->idx].err_inj_type << EINJ_TYPE_SHIFT) & ty= pe_mask); val |=3D FIELD_PREP(EINJ_COUNT, counter); =20 - if (err_group =3D=3D 1 || err_group =3D=3D 4) { - val &=3D ~(EINJ_VAL_DIFF); - val |=3D FIELD_PREP(EINJ_VAL_DIFF, val_diff); - } - if (err_group =3D=3D 4) { - val &=3D ~(EINJ_VC_NUM); - val |=3D FIELD_PREP(EINJ_VC_NUM, vc_num); - } + if (err_group =3D=3D 1 || err_group =3D=3D 4) + FIELD_MODIFY(EINJ_VAL_DIFF, &val, val_diff); + if (err_group =3D=3D 4) + FIELD_MODIFY(EINJ_VC_NUM, &val, vc_num); =20 dw_pcie_writel_dbi(pci, rinfo->ras_cap_offset + ERR_INJ0_OFF + (0x4 * err= _group), val); dw_pcie_writel_dbi(pci, rinfo->ras_cap_offset + ERR_INJ_ENABLE_REG, (0x1 = << err_group)); @@ -362,9 +357,8 @@ static void set_event_number(struct dwc_pcie_rasdes_pri= v *pdata, =20 val =3D dw_pcie_readl_dbi(pci, rinfo->ras_cap_offset + RAS_DES_EVENT_COUN= TER_CTRL_REG); val &=3D ~EVENT_COUNTER_ENABLE; - val &=3D ~(EVENT_COUNTER_GROUP_SELECT | EVENT_COUNTER_EVENT_SELECT); - val |=3D FIELD_PREP(EVENT_COUNTER_GROUP_SELECT, event_list[pdata->idx].gr= oup_no); - val |=3D FIELD_PREP(EVENT_COUNTER_EVENT_SELECT, event_list[pdata->idx].ev= ent_no); + FIELD_MODIFY(EVENT_COUNTER_GROUP_SELECT, &val, event_list[pdata->idx].gro= up_no); + FIELD_MODIFY(EVENT_COUNTER_EVENT_SELECT, &val, event_list[pdata->idx].eve= nt_no); dw_pcie_writel_dbi(pci, rinfo->ras_cap_offset + RAS_DES_EVENT_COUNTER_CTR= L_REG, val); } =20 @@ -469,8 +463,7 @@ static ssize_t counter_lane_write(struct file *file, co= nst char __user *buf, mutex_lock(&rinfo->reg_event_lock); set_event_number(pdata, pci, rinfo); val =3D dw_pcie_readl_dbi(pci, rinfo->ras_cap_offset + RAS_DES_EVENT_COUN= TER_CTRL_REG); - val &=3D ~(EVENT_COUNTER_LANE_SELECT); - val |=3D FIELD_PREP(EVENT_COUNTER_LANE_SELECT, lane); + FIELD_MODIFY(EVENT_COUNTER_LANE_SELECT, &val, lane); dw_pcie_writel_dbi(pci, rinfo->ras_cap_offset + RAS_DES_EVENT_COUNTER_CTR= L_REG, val); mutex_unlock(&rinfo->reg_event_lock); =20 diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/= controller/dwc/pcie-designware-ep.c index d4dc3b24da60..88e7fc3d5e9d 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c @@ -707,8 +707,7 @@ static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 f= unc_no, u8 vfunc_no, =20 reg =3D ep_func->msi_cap + PCI_MSI_FLAGS; val =3D dw_pcie_ep_readw_dbi(ep, func_no, reg); - val &=3D ~PCI_MSI_FLAGS_QMASK; - val |=3D FIELD_PREP(PCI_MSI_FLAGS_QMASK, mmc); + FIELD_MODIFY(PCI_MSI_FLAGS_QMASK, &val, mmc); dw_pcie_dbi_ro_wr_en(pci); dw_pcie_ep_writew_dbi(ep, func_no, reg, val); dw_pcie_dbi_ro_wr_dis(pci); diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/con= troller/dwc/pcie-designware.c index c11cf61b8319..bcfc7bfcf232 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -938,8 +938,7 @@ static void dw_pcie_link_set_max_link_width(struct dw_p= cie *pci, u32 num_lanes) =20 cap =3D dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); lnkcap =3D dw_pcie_readl_dbi(pci, cap + PCI_EXP_LNKCAP); - lnkcap &=3D ~PCI_EXP_LNKCAP_MLW; - lnkcap |=3D FIELD_PREP(PCI_EXP_LNKCAP_MLW, num_lanes); + FIELD_MODIFY(PCI_EXP_LNKCAP_MLW, &lnkcap, num_lanes); dw_pcie_writel_dbi(pci, cap + PCI_EXP_LNKCAP, lnkcap); } =20 --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) (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 ED1D3472793; Thu, 30 Apr 2026 16:24:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566299; cv=none; b=Iv0lGOod5UySRsEm7NT8c2ZwU166Mzq6Y/y7Wkv/lZk6XU9xC3LUOZ7opup/XY1tU6F9vyZL95HJY2MaSzaYSEjWpL2mqnT8yCe2sZeF7XH3u5y7GLX6/y9o1WTqoXBfMLWwPFOmOmIHilGeq6SvfA3bk9mmRNW6hZ5w4rAJL5k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566299; c=relaxed/simple; bh=Dn8fTsOZ9GOWIt3xVVd8EqvKuV6qq4me2FvrTvXlIio=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g2btZRr+dCQcFK4+nnhkF9Mzp7xxebhJ22oOD8UYq7Eajl/Onk26BrYl08jcxrAsr11HZ496axvcP0heCZnUJ1lq+L/U0+MLBUxxvFF++E9xWHMsubLOQycUu1BR2Z6zGgo3lulY4OH7fCg1wo9auXlZsvgeFmC1boctZWDTy6g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=QgNIAESw; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="QgNIAESw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=TA 2PDtzRtI+kBQoqeedPsIvWorvQfdP/9rl8VrEEZwY=; b=QgNIAESwSwnr0w4I7l Ba5zKXw8xpWzZbCYOOr/0c5vk+GNNptFlBGaL3b4CHWpD0xIAeymuf4cYduZ0XKu cLxr/DS0V+I5lvmFmQkUNOfsvrWNXYVhA0KXolWM3T+qiLgUo0Ir6gADPCYK/gQs 1mW7XmE5SQMbcxmCKZuCDEjM4= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S9; Fri, 01 May 2026 00:24:36 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 15/16] PCI: mvebu: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:19 +0800 Message-Id: <20260430162420.42839-16-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wA3Df0_gvNpcypXCg--.51103S9 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17Kr1UAw15uFyDuw1DAwb_yoWDCrX_ua 4rJanFkrWqgryIkas2ya18AF90ya47Zw4j93WFqF1fZFy8Ar1Fqrn7X398tryDCF43XrnI yr1DCrWFk3sFyjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sRiD73PUUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC7AQJrGnzgkROhwAA3Y Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/controller/pci-mvebu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pc= i-mvebu.c index a72aa57591c0..d6eb65b8cd7f 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -263,8 +263,7 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port = *port) * not set correctly then link with endpoint card is not established. */ lnkcap =3D mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); - lnkcap &=3D ~PCI_EXP_LNKCAP_MLW; - lnkcap |=3D FIELD_PREP(PCI_EXP_LNKCAP_MLW, port->is_x4 ? 4 : 1); + FIELD_MODIFY(PCI_EXP_LNKCAP_MLW, &lnkcap, port->is_x4 ? 4 : 1); mvebu_writel(port, lnkcap, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); =20 /* Disable Root Bridge I/O space, memory space and bus mastering. */ --=20 2.34.1 From nobody Sat Jun 20 14:14:39 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) (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 9411945BD57; Thu, 30 Apr 2026 16:25:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566306; cv=none; b=oQTL+2pmJ0veDRi7Sgp7sbkz87HM2ZLjkIOspm9SsWU74jvupgNsy7hN5lfaqdhztOkP9W3EskeR5eD0HctUpmycpE85eqy305XpVgMFVgMaU0lPQ7ElET0NRTOy8BJK3vV6cX7ZxR/W0yxYnfPMGbIoqeJXir5drvMdh7g9TcM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566306; c=relaxed/simple; bh=zGya12c0o5aRiDVzH50QTYenNbVMFV+ylKxK3Bd8OSs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H9JeCFy+NMsFhiV7Ime8OC4wI1LwzDZvPB43lBVySTmV4Wn1CjLYYLfqudgLDyBil8j8IaRWShusTzPQ3SElusZH1RmoqE9nZDf6KKjUD6wZwWjJ5nn4qo6przXDOYM2r6dzi7+19epkL5pRrQ8ABAxtVY3ANGRjnwyqYPIn3+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=fpuQhOZp; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="fpuQhOZp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=SK nNKCXhsL/SUQcuaVtsiDGDwFzkCFIi96zkjl1hpAY=; b=fpuQhOZpaGB6/bScYo eQZsM/1Lqg0tg6XacRT3Xt5i9rQMIk0fpwYK+pPVCTkb1keV/2VyK+WZlL2MHsUa d17UeYsn9BjkfDpjwcilaJA8fBMeuZ9u6RVeJ9djsRFDss5hGZujoFsy0RGOzwFG +BDAQlrTAnOO4Ig+Iuo8Y1x0k= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-4 (Coremail) with SMTP id _____wBnTp9HgvNpIh98Cg--.30330S2; Fri, 01 May 2026 00:24:40 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 16/16] PCI: mediatek-gen3: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:20 +0800 Message-Id: <20260430162420.42839-17-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.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 X-CM-TRANSID: _____wBnTp9HgvNpIh98Cg--.30330S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17Kr18WF4xtFyrXw1xuFg_yoWDKrXE93 9rJF4fC34DKryfG39YkryrAr9Yka4xWw10y3WrtF1SyayxuF1Fqr9avrWDX3Z8CFsxJF43 t3WDCF18AFyxCjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7VUUb_-PUUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC7AgKrWnzgkhPPgAA3i Content-Type: text/plain; charset="utf-8" Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/controller/pcie-mediatek-gen3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/cont= roller/pcie-mediatek-gen3.c index b0accd828589..f36a616a8b52 100644 --- a/drivers/pci/controller/pcie-mediatek-gen3.c +++ b/drivers/pci/controller/pcie-mediatek-gen3.c @@ -494,8 +494,7 @@ static int mtk_pcie_startup_port(struct mtk_gen3_pcie *= pcie) /* Set Link Control 2 (LNKCTL2) speed restriction, if any */ if (pcie->max_link_speed) { val =3D readl_relaxed(pcie->base + PCIE_CONF_LINK2_CTL_STS); - val &=3D ~PCIE_CONF_LINK2_LCR2_LINK_SPEED; - val |=3D FIELD_PREP(PCIE_CONF_LINK2_LCR2_LINK_SPEED, pcie->max_link_spee= d); + FIELD_MODIFY(PCIE_CONF_LINK2_LCR2_LINK_SPEED, &val, pcie->max_link_speed= ); writel_relaxed(val, pcie->base + PCIE_CONF_LINK2_CTL_STS); } =20 --=20 2.34.1