[PATCH v4 2/2] PCI/AER: Use pci_clear/set_config_dword to simplify code
From: Hans Zhang <18255117159@163.com>
Date: 2025-08-18 16:16:06
Also in:
linux-pci, lkml
Subsystem:
pci enhanced error handling (eeh) for powerpc, pci subsystem, the rest · Maintainers:
Mahesh J Salgaonkar, Bjorn Helgaas, Linus Torvalds
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 = dev->aer_cap; - u32 reg32; if (!aer) return -ENODEV; - pci_read_config_dword(dev, aer + PCI_ERR_CAP, ®32); - reg32 &= ~(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); return 0; }
@@ -1102,15 +1100,12 @@ static bool find_source_device(struct pci_dev *parent, static void pci_aer_unmask_internal_errors(struct pci_dev *dev) { int aer = dev->aer_cap; - u32 mask; - pci_read_config_dword(dev, aer + PCI_ERR_UNCOR_MASK, &mask); - mask &= ~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); - pci_read_config_dword(dev, aer + PCI_ERR_COR_MASK, &mask); - mask &= ~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); } 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 = pdev->aer_cap; - u32 reg32; /* Enable Root Port's interrupt in response to error messages */ - pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, ®32); - reg32 |= 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); } static void aer_disable_irq(struct pci_dev *pdev) { int aer = pdev->aer_cap; - u32 reg32; /* Disable Root Port's interrupt in response to error messages */ - pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, ®32); - reg32 &= ~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); } /**
--
2.25.1