From: Hans Zhang <18255117159@163.com>
To: mahesh@linux.ibm.com, bhelgaas@google.com
Cc: oohall@gmail.com, linuxppc-dev@lists.ozlabs.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Manivannan Sadhasivam <mani@kernel.org>
Subject: Re: [PATCH v2] PCI/AER: Use pci_clear_and_set_config_dword() to simplify mask updates
Date: Sat, 7 Jun 2025 23:59:24 +0800 [thread overview]
Message-ID: <f2e49d66-ac97-4502-abe7-c02f560637e6@163.com> (raw)
In-Reply-To: <20250607155159.805679-1-18255117159@163.com>
Add Mani's new email address.
On 2025/6/7 23:51, Hans Zhang wrote:
> Replace manual read-modify-write sequences in multiple functions with
> pci_clear_and_set_config_dword() to ensure atomic operations and reduce
> code duplication.
>
> Signed-off-by: Hans Zhang <18255117159@163.com>
> ---
> Changes for v2:
> - The patch commit message were modified.
> - New optimizations for the functions disable_ecrc_checking, aer_enable_irq, and aer_disable_irq have been added.
> ---
> drivers/pci/pcie/aer.c | 30 +++++++++++-------------------
> 1 file changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
> index 70ac66188367..86cbd204a73f 100644
> --- a/drivers/pci/pcie/aer.c
> +++ b/drivers/pci/pcie/aer.c
> @@ -176,14 +176,13 @@ 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_and_set_config_dword(dev, aer + PCI_ERR_CAP,
> + PCI_ERR_CAP_ECRC_GENE |
> + PCI_ERR_CAP_ECRC_CHKE, 0);
>
> return 0;
> }
> @@ -1101,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_and_set_config_dword(dev, aer + PCI_ERR_UNCOR_MASK,
> + PCI_ERR_UNC_INTN, 0);
>
> - 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_and_set_config_dword(dev, aer + PCI_ERR_COR_MASK,
> + PCI_ERR_COR_INTERNAL, 0);
> }
>
> static bool is_cxl_mem_dev(struct pci_dev *dev)
> @@ -1555,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_clear_and_set_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND,
> + 0, 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_and_set_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND,
> + ROOT_PORT_INTR_ON_MESG_MASK, 0);
> }
>
> /**
>
> base-commit: ec7714e4947909190ffb3041a03311a975350fe0
next prev parent reply other threads:[~2025-06-07 15:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-07 15:51 Hans Zhang
2025-06-07 15:59 ` Hans Zhang [this message]
2025-06-19 13:06 ` Manivannan Sadhasivam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f2e49d66-ac97-4502-abe7-c02f560637e6@163.com \
--to=18255117159@163.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mahesh@linux.ibm.com \
--cc=mani@kernel.org \
--cc=oohall@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®