From: Terry Bowman <terry.bowman@amd.com> To: <alison.schofield@intel.com>, <vishal.l.verma@intel.com>, <ira.weiny@intel.com>, <bwidawsk@kernel.org>, <dan.j.williams@intel.com>, <dave.jiang@intel.com>, <Jonathan.Cameron@huawei.com>, <linux-cxl@vger.kernel.org> Cc: <terry.bowman@amd.com>, <rrichter@amd.com>, <linux-kernel@vger.kernel.org>, <bhelgaas@google.com>, Oliver O'Halloran <oohall@gmail.com>, Mahesh J Salgaonkar <mahesh@linux.ibm.com>, <linuxppc-dev@lists.ozlabs.org>, <linux-pci@vger.kernel.org> Subject: [PATCH v3 6/6] PCI/AER: Unmask RCEC internal errors to enable RCH downstream port error handling Date: Tue, 11 Apr 2023 13:03:02 -0500 [thread overview] Message-ID: <20230411180302.2678736-7-terry.bowman@amd.com> (raw) In-Reply-To: <20230411180302.2678736-1-terry.bowman@amd.com> From: Robert Richter <rrichter@amd.com> RCEC AER corrected and uncorrectable internal errors (CIE/UIE) are disabled by default. [1][2] Enable them to receive CXL downstream port errors of a Restricted CXL Host (RCH). [1] CXL 3.0 Spec, 12.2.1.1 - RCH Downstream Port Detected Errors [2] PCIe Base Spec 6.0, 7.8.4.3 Uncorrectable Error Mask Register, 7.8.4.6 Correctable Error Mask Register Co-developed-by: Terry Bowman <terry.bowman@amd.com> Signed-off-by: Robert Richter <rrichter@amd.com> Signed-off-by: Terry Bowman <terry.bowman@amd.com> Cc: "Oliver O'Halloran" <oohall@gmail.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Mahesh J Salgaonkar <mahesh@linux.ibm.com> Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-pci@vger.kernel.org --- drivers/pci/pcie/aer.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 171a08fd8ebd..3973c731e11d 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1000,7 +1000,79 @@ static void cxl_handle_error(struct pci_dev *dev, struct aer_err_info *info) pcie_walk_rcec(dev, cxl_handle_error_iter, info); } +static bool cxl_error_is_native(struct pci_dev *dev) +{ + struct pci_host_bridge *host = pci_find_host_bridge(dev->bus); + + if (pcie_ports_native) + return true; + + return host->native_aer && host->native_cxl_error; +} + +static int handles_cxl_error_iter(struct pci_dev *dev, void *data) +{ + int *handles_cxl = data; + + *handles_cxl = is_cxl_mem_dev(dev) && cxl_error_is_native(dev); + + return *handles_cxl; +} + +static bool handles_cxl_errors(struct pci_dev *rcec) +{ + int handles_cxl = 0; + + if (!rcec->aer_cap) + return false; + + if (pci_pcie_type(rcec) == PCI_EXP_TYPE_RC_EC) + pcie_walk_rcec(rcec, handles_cxl_error_iter, &handles_cxl); + + return !!handles_cxl; +} + +static int __cxl_unmask_internal_errors(struct pci_dev *rcec) +{ + int aer, rc; + u32 mask; + + /* + * Internal errors are masked by default, unmask RCEC's here + * PCI6.0 7.8.4.3 Uncorrectable Error Mask Register (Offset 08h) + * PCI6.0 7.8.4.6 Correctable Error Mask Register (Offset 14h) + */ + aer = rcec->aer_cap; + rc = pci_read_config_dword(rcec, aer + PCI_ERR_UNCOR_MASK, &mask); + if (rc) + return rc; + mask &= ~PCI_ERR_UNC_INTN; + rc = pci_write_config_dword(rcec, aer + PCI_ERR_UNCOR_MASK, mask); + if (rc) + return rc; + + rc = pci_read_config_dword(rcec, aer + PCI_ERR_COR_MASK, &mask); + if (rc) + return rc; + mask &= ~PCI_ERR_COR_INTERNAL; + rc = pci_write_config_dword(rcec, aer + PCI_ERR_COR_MASK, mask); + + return rc; +} + +static void cxl_unmask_internal_errors(struct pci_dev *rcec) +{ + if (!handles_cxl_errors(rcec)) + return; + + if (__cxl_unmask_internal_errors(rcec)) + dev_err(&rcec->dev, "cxl: Failed to unmask internal errors"); + else + dev_dbg(&rcec->dev, "cxl: Internal errors unmasked"); +} + #else +static inline void cxl_unmask_internal_errors(struct pci_dev *dev) { } static inline void cxl_handle_error(struct pci_dev *dev, struct aer_err_info *info) { } #endif @@ -1397,6 +1469,7 @@ static int aer_probe(struct pcie_device *dev) return status; } + cxl_unmask_internal_errors(port); aer_enable_rootport(rpc); pci_info(port, "enabled with IRQ %d\n", dev->irq); return 0; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Terry Bowman <terry.bowman@amd.com> To: <alison.schofield@intel.com>, <vishal.l.verma@intel.com>, <ira.weiny@intel.com>, <bwidawsk@kernel.org>, <dan.j.williams@intel.com>, <dave.jiang@intel.com>, <Jonathan.Cameron@huawei.com>, <linux-cxl@vger.kernel.org> Cc: rrichter@amd.com, terry.bowman@amd.com, linux-pci@vger.kernel.org, Mahesh J Salgaonkar <mahesh@linux.ibm.com>, linux-kernel@vger.kernel.org, Oliver O'Halloran <oohall@gmail.com>, bhelgaas@google.com, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 6/6] PCI/AER: Unmask RCEC internal errors to enable RCH downstream port error handling Date: Tue, 11 Apr 2023 13:03:02 -0500 [thread overview] Message-ID: <20230411180302.2678736-7-terry.bowman@amd.com> (raw) In-Reply-To: <20230411180302.2678736-1-terry.bowman@amd.com> From: Robert Richter <rrichter@amd.com> RCEC AER corrected and uncorrectable internal errors (CIE/UIE) are disabled by default. [1][2] Enable them to receive CXL downstream port errors of a Restricted CXL Host (RCH). [1] CXL 3.0 Spec, 12.2.1.1 - RCH Downstream Port Detected Errors [2] PCIe Base Spec 6.0, 7.8.4.3 Uncorrectable Error Mask Register, 7.8.4.6 Correctable Error Mask Register Co-developed-by: Terry Bowman <terry.bowman@amd.com> Signed-off-by: Robert Richter <rrichter@amd.com> Signed-off-by: Terry Bowman <terry.bowman@amd.com> Cc: "Oliver O'Halloran" <oohall@gmail.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Mahesh J Salgaonkar <mahesh@linux.ibm.com> Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-pci@vger.kernel.org --- drivers/pci/pcie/aer.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 171a08fd8ebd..3973c731e11d 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1000,7 +1000,79 @@ static void cxl_handle_error(struct pci_dev *dev, struct aer_err_info *info) pcie_walk_rcec(dev, cxl_handle_error_iter, info); } +static bool cxl_error_is_native(struct pci_dev *dev) +{ + struct pci_host_bridge *host = pci_find_host_bridge(dev->bus); + + if (pcie_ports_native) + return true; + + return host->native_aer && host->native_cxl_error; +} + +static int handles_cxl_error_iter(struct pci_dev *dev, void *data) +{ + int *handles_cxl = data; + + *handles_cxl = is_cxl_mem_dev(dev) && cxl_error_is_native(dev); + + return *handles_cxl; +} + +static bool handles_cxl_errors(struct pci_dev *rcec) +{ + int handles_cxl = 0; + + if (!rcec->aer_cap) + return false; + + if (pci_pcie_type(rcec) == PCI_EXP_TYPE_RC_EC) + pcie_walk_rcec(rcec, handles_cxl_error_iter, &handles_cxl); + + return !!handles_cxl; +} + +static int __cxl_unmask_internal_errors(struct pci_dev *rcec) +{ + int aer, rc; + u32 mask; + + /* + * Internal errors are masked by default, unmask RCEC's here + * PCI6.0 7.8.4.3 Uncorrectable Error Mask Register (Offset 08h) + * PCI6.0 7.8.4.6 Correctable Error Mask Register (Offset 14h) + */ + aer = rcec->aer_cap; + rc = pci_read_config_dword(rcec, aer + PCI_ERR_UNCOR_MASK, &mask); + if (rc) + return rc; + mask &= ~PCI_ERR_UNC_INTN; + rc = pci_write_config_dword(rcec, aer + PCI_ERR_UNCOR_MASK, mask); + if (rc) + return rc; + + rc = pci_read_config_dword(rcec, aer + PCI_ERR_COR_MASK, &mask); + if (rc) + return rc; + mask &= ~PCI_ERR_COR_INTERNAL; + rc = pci_write_config_dword(rcec, aer + PCI_ERR_COR_MASK, mask); + + return rc; +} + +static void cxl_unmask_internal_errors(struct pci_dev *rcec) +{ + if (!handles_cxl_errors(rcec)) + return; + + if (__cxl_unmask_internal_errors(rcec)) + dev_err(&rcec->dev, "cxl: Failed to unmask internal errors"); + else + dev_dbg(&rcec->dev, "cxl: Internal errors unmasked"); +} + #else +static inline void cxl_unmask_internal_errors(struct pci_dev *dev) { } static inline void cxl_handle_error(struct pci_dev *dev, struct aer_err_info *info) { } #endif @@ -1397,6 +1469,7 @@ static int aer_probe(struct pcie_device *dev) return status; } + cxl_unmask_internal_errors(port); aer_enable_rootport(rpc); pci_info(port, "enabled with IRQ %d\n", dev->irq); return 0; -- 2.34.1
next prev parent reply other threads:[~2023-04-11 18:08 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-04-11 18:02 [PATCH v3 0/6] cxl/pci: Add support for RCH RAS error handling Terry Bowman 2023-04-11 18:02 ` [PATCH v3 1/6] cxl/pci: Add RCH downstream port AER and RAS register discovery Terry Bowman 2023-04-13 15:30 ` Jonathan Cameron 2023-04-13 19:13 ` Terry Bowman 2023-04-14 11:47 ` Jonathan Cameron 2023-04-14 11:51 ` Robert Richter 2023-04-17 23:00 ` Dan Williams 2023-04-18 15:59 ` Terry Bowman 2023-04-27 13:52 ` Robert Richter 2023-04-11 18:02 ` [PATCH v3 2/6] efi/cper: Export cper_mem_err_unpack() for use by modules Terry Bowman 2023-04-12 11:04 ` Ard Biesheuvel 2023-04-13 16:08 ` Jonathan Cameron 2023-04-13 19:40 ` Terry Bowman 2023-04-14 11:48 ` Jonathan Cameron 2023-04-14 12:44 ` Robert Richter [not found] ` <aba5d2ee-f451-145c-81c2-72595129483b@amd.com> 2023-04-14 15:17 ` Terry Bowman 2023-04-17 23:08 ` Dan Williams 2023-04-11 18:02 ` [PATCH v3 3/6] PCI/AER: Export cper_print_aer() " Terry Bowman 2023-04-13 16:13 ` Jonathan Cameron 2023-04-17 23:11 ` Dan Williams 2023-04-11 18:03 ` [PATCH v3 4/6] cxl/pci: Add RCH downstream port error logging Terry Bowman 2023-04-12 1:32 ` kernel test robot 2023-04-12 3:04 ` kernel test robot 2023-04-13 16:50 ` Jonathan Cameron 2023-04-14 16:36 ` Terry Bowman 2023-04-17 16:56 ` Jonathan Cameron 2023-04-18 0:06 ` Dan Williams 2023-04-24 18:39 ` Terry Bowman 2023-04-11 18:03 ` [PATCH v3 5/6] PCI/AER: Forward RCH downstream port-detected errors to the CXL.mem dev handler Terry Bowman 2023-04-11 18:03 ` Terry Bowman 2023-04-12 22:02 ` Bjorn Helgaas 2023-04-12 22:02 ` Bjorn Helgaas 2023-04-13 11:40 ` Robert Richter 2023-04-13 11:40 ` Robert Richter 2023-04-14 21:32 ` Bjorn Helgaas 2023-04-14 21:32 ` Bjorn Helgaas 2023-04-17 22:00 ` Robert Richter 2023-04-17 22:00 ` Robert Richter 2023-04-19 14:17 ` Robert Richter 2023-04-19 14:17 ` Robert Richter 2023-04-14 12:19 ` Jonathan Cameron 2023-04-14 12:19 ` Jonathan Cameron 2023-04-14 14:35 ` Robert Richter 2023-04-14 14:35 ` Robert Richter 2023-04-17 16:54 ` Jonathan Cameron 2023-04-17 16:54 ` Jonathan Cameron 2023-04-17 20:36 ` Robert Richter 2023-04-17 20:36 ` Robert Richter 2023-04-18 1:01 ` Dan Williams 2023-04-18 1:01 ` Dan Williams 2023-04-19 13:30 ` Robert Richter 2023-04-19 13:30 ` Robert Richter 2023-04-11 18:03 ` Terry Bowman [this message] 2023-04-11 18:03 ` [PATCH v3 6/6] PCI/AER: Unmask RCEC internal errors to enable RCH downstream port error handling Terry Bowman 2023-04-12 21:29 ` Bjorn Helgaas 2023-04-12 21:29 ` Bjorn Helgaas 2023-04-13 13:38 ` Robert Richter 2023-04-13 13:38 ` Robert Richter 2023-04-13 17:05 ` Jonathan Cameron 2023-04-13 17:05 ` Jonathan Cameron 2023-04-14 11:58 ` Robert Richter 2023-04-14 11:58 ` Robert Richter 2023-04-14 21:49 ` Bjorn Helgaas 2023-04-14 21:49 ` Bjorn Helgaas 2023-04-13 17:01 ` Jonathan Cameron 2023-04-13 17:01 ` Jonathan Cameron 2023-04-13 22:52 ` Ira Weiny 2023-04-13 22:52 ` Ira Weiny 2023-04-14 11:21 ` Robert Richter 2023-04-14 11:21 ` Robert Richter 2023-04-14 11:55 ` Jonathan Cameron 2023-04-14 11:55 ` Jonathan Cameron 2023-04-14 14:47 ` Robert Richter 2023-04-14 14:47 ` Robert Richter 2023-04-18 2:37 ` Dan Williams 2023-04-18 2:37 ` Dan Williams
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=20230411180302.2678736-7-terry.bowman@amd.com \ --to=terry.bowman@amd.com \ --cc=Jonathan.Cameron@huawei.com \ --cc=alison.schofield@intel.com \ --cc=bhelgaas@google.com \ --cc=bwidawsk@kernel.org \ --cc=dan.j.williams@intel.com \ --cc=dave.jiang@intel.com \ --cc=ira.weiny@intel.com \ --cc=linux-cxl@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mahesh@linux.ibm.com \ --cc=oohall@gmail.com \ --cc=rrichter@amd.com \ --cc=vishal.l.verma@intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.