From nobody Sat Oct 4 11:13:49 2025 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 684E225B1CB; Mon, 18 Aug 2025 16:16:06 +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=1755533770; cv=none; b=SeKGnXpF/bSpu1MwHnpdN38aPCThIJamOptdfCfhdzXpuhaGUgOTR9wemgcVHoQgHfRAm9Sx6vf02STA84MaNZ5TXSII+Q8bdDLde91oN4npUTLPE7AZPjsL4TjevdGYaVF+xXu/Dm3GBPi2qFfXDM5qwa3fM1SmNFtlm5sOwR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755533770; c=relaxed/simple; bh=W1Ad/Hpmi05kW+LkYpX9iXeR3vzD1qS/oR7rcvv5ZMM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rd5RpVDzbQTy6u4jYX1Xf4yW54H4yU/jVvxPEwE7ILXWDziyfpC0lLjFaJ5xovHkfauBC6NQeNzhzcNa0cFHQgui3Ggd7oqST1mPcvP59A1yPr06Kf87+hV7Qw4n0ewy3D1O2XW3fw7wAWlCQagD58ZP4JLFEZXT9Td8yCWh4vo= 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=jDtBKNAB; 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="jDtBKNAB" 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=rT eDMOibmlghpQVXp52MOWLYZFEzyWAti7xjOoZt1/I=; b=jDtBKNABYOT2msFHPw lAeE7k2YHDSLf9JKXVrFbFAs+/q93OTWQZBvRB0FncP1gH3xEstZ83IFK/KlcXUQ SeQKB61xvu08Xl3NPjHnyiprRrKOtDOPwTtKEfCtFcMAbNsLqs5CaMglWihuCBtv 5W7p5G8kPzVsPLaq+iV5I6UpI= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g0-0 (Coremail) with SMTP id _____wD3b8FtUaNopYAWCw--.8667S4; Tue, 19 Aug 2025 00:14:42 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: mahesh@linux.ibm.com, bhelgaas@google.com Cc: oohall@gmail.com, mani@kernel.org, lukas@wunner.de, linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [PATCH v4 2/2] PCI/AER: Use pci_clear/set_config_dword to simplify code Date: Tue, 19 Aug 2025 00:14:31 +0800 Message-Id: <20250818161431.372590-3-18255117159@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250818161431.372590-1-18255117159@163.com> References: <20250818161431.372590-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: _____wD3b8FtUaNopYAWCw--.8667S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxZFyDAFy7AF15tw1kJr4ruFg_yoW5Xw1UpF W3AFWfAr4UJF15ZrWDWaykJwn5AF97t34fKr93Kwn5XF48uFZrJ3sav34UJ345KFZ5X34r Jws5Ka1rZF4UJ3JanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zNAp0kUUUUU= X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/1tbiQwSto2ijSoPLJQABsk Content-Type: text/plain; charset="utf-8" Replace manual read-modify-write sequences in multiple functions with pci_clear/set_config_dword helper to reduce code duplication. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/pcie/aer.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index e286c197d716..468d4a726a20 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -176,14 +176,12 @@ static int enable_ecrc_checking(struct pci_dev *dev) static int disable_ecrc_checking(struct pci_dev *dev) { int aer =3D dev->aer_cap; - u32 reg32; =20 if (!aer) return -ENODEV; =20 - pci_read_config_dword(dev, aer + PCI_ERR_CAP, ®32); - reg32 &=3D ~(PCI_ERR_CAP_ECRC_GENE | PCI_ERR_CAP_ECRC_CHKE); - pci_write_config_dword(dev, aer + PCI_ERR_CAP, reg32); + pci_clear_config_dword(dev, aer + PCI_ERR_CAP, + PCI_ERR_CAP_ECRC_GENE | PCI_ERR_CAP_ECRC_CHKE); =20 return 0; } @@ -1102,15 +1100,12 @@ static bool find_source_device(struct pci_dev *pare= nt, static void pci_aer_unmask_internal_errors(struct pci_dev *dev) { int aer =3D dev->aer_cap; - u32 mask; =20 - pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_MASK, &mask); - mask &=3D ~PCI_ERR_UNC_INTN; - pci_write_config_dword(dev, aer + PCI_ERR_UNCOR_MASK, mask); + pci_clear_config_dword(dev, aer + PCI_ERR_UNCOR_MASK, + PCI_ERR_UNC_INTN); =20 - pci_read_config_dword(dev, aer + PCI_ERR_COR_MASK, &mask); - mask &=3D ~PCI_ERR_COR_INTERNAL; - pci_write_config_dword(dev, aer + PCI_ERR_COR_MASK, mask); + pci_clear_config_dword(dev, aer + PCI_ERR_COR_MASK, + PCI_ERR_COR_INTERNAL); } =20 static bool is_cxl_mem_dev(struct pci_dev *dev) @@ -1556,23 +1551,19 @@ static irqreturn_t aer_irq(int irq, void *context) static void aer_enable_irq(struct pci_dev *pdev) { int aer =3D pdev->aer_cap; - u32 reg32; =20 /* Enable Root Port's interrupt in response to error messages */ - pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, ®32); - reg32 |=3D ROOT_PORT_INTR_ON_MESG_MASK; - pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32); + pci_set_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, + ROOT_PORT_INTR_ON_MESG_MASK); } =20 static void aer_disable_irq(struct pci_dev *pdev) { int aer =3D pdev->aer_cap; - u32 reg32; =20 /* Disable Root Port's interrupt in response to error messages */ - pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, ®32); - reg32 &=3D ~ROOT_PORT_INTR_ON_MESG_MASK; - pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32); + pci_clear_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, + ROOT_PORT_INTR_ON_MESG_MASK); } =20 /** --=20 2.25.1