From: LeoLiu-oc <LeoLiu-oc@zhaoxin.com>
To: <rafael@kernel.org>, <lenb@kernel.org>, <james.morse@arm.com>,
<tony.luck@intel.com>, <bp@alien8.de>, <bhelgaas@google.com>,
<robert.moore@intel.com>, <linux-acpi@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<acpica-devel@lists.linux.dev>
Cc: <CobeChen@zhaoxin.com>, <TonyWWang@zhaoxin.com>,
<ErosZhang@zhaoxin.com>, <LeoLiu@zhaoxin.com>,
LeoLiuoc <LeoLiu-oc@zhaoxin.com>
Subject: [PATCH v2 1/3] ACPI/APEI: Add hest_parse_pcie_aer()
Date: Mon, 18 Dec 2023 11:04:28 +0800 [thread overview]
Message-ID: <20231218030430.783495-2-LeoLiu-oc@zhaoxin.com> (raw)
In-Reply-To: <20231218030430.783495-1-LeoLiu-oc@zhaoxin.com>
From: LeoLiuoc <LeoLiu-oc@zhaoxin.com>
The purpose of the function apei_hest_parse_aer() is used to parse and
extract register value from HEST PCIe AER structures.
Signed-off-by: LeoLiuoc <LeoLiu-oc@zhaoxin.com>
---
drivers/acpi/apei/hest.c | 69 ++++++++++++++++++++++++++++++++++++++--
include/acpi/apei.h | 17 ++++++++++
2 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 6aef1ee5e1bd..7e7026c0001b 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -22,6 +22,7 @@
#include <linux/kdebug.h>
#include <linux/highmem.h>
#include <linux/io.h>
+#include <linux/pci.h>
#include <linux/platform_device.h>
#include <acpi/apei.h>
#include <acpi/ghes.h>
@@ -86,9 +87,73 @@ static int hest_esrc_len(struct acpi_hest_header *hest_hdr)
return len;
};
-typedef int (*apei_hest_func_t)(struct acpi_hest_header *hest_hdr, void *data);
+#ifdef CONFIG_ACPI_APEI
+static bool hest_match_pci_devfn(struct acpi_hest_aer_common *p, struct pci_dev *dev)
+{
+ return ACPI_HEST_SEGMENT(p->bus) == pci_domain_nr(dev->bus) &&
+ ACPI_HEST_BUS(p->bus) == dev->bus->number &&
+ p->device == PCI_SLOT(dev->devfn) &&
+ p->function == PCI_FUNC(dev->devfn);
+}
+
+static bool hest_source_is_pcie_aer(struct acpi_hest_header *hest_hdr, struct pci_dev *dev)
+{
+ u16 hest_type = hest_hdr->type;
+ u8 pcie_type = pci_pcie_type(dev);
+ struct acpi_hest_aer_common *common;
+
+ switch (hest_type) {
+ case ACPI_HEST_TYPE_AER_ROOT_PORT:
+ if (pcie_type != PCI_EXP_TYPE_ROOT_PORT)
+ return false;
+ break;
+ case ACPI_HEST_TYPE_AER_ENDPOINT:
+ if (pcie_type != PCI_EXP_TYPE_ENDPOINT)
+ return false;
+ break;
+ case ACPI_HEST_TYPE_AER_BRIDGE:
+ if (pcie_type != PCI_EXP_TYPE_PCI_BRIDGE &&
+ pcie_type != PCI_EXP_TYPE_PCIE_BRIDGE)
+ return false;
+ break;
+ default:
+ return false;
+ }
+
+ common = (struct acpi_hest_aer_common *)(hest_hdr + 1);
+ if (common->flags & ACPI_HEST_GLOBAL)
+ return true;
+
+ if (hest_match_pci_devfn(common, dev))
+ return true;
+
+ return false;
+}
+
+int hest_parse_pcie_aer(struct acpi_hest_header *hest_hdr, void *data)
+{
+ struct hest_parse_aer_info *info = data;
+
+ if (!hest_source_is_pcie_aer(hest_hdr, info->pci_dev))
+ return 0;
+
+ switch (hest_hdr->type) {
+ case ACPI_HEST_TYPE_AER_ROOT_PORT:
+ info->hest_aer_root_port = (struct acpi_hest_aer_root *)hest_hdr;
+ return 1;
+ case ACPI_HEST_TYPE_AER_ENDPOINT:
+ info->hest_aer_endpoint = (struct acpi_hest_aer *)hest_hdr;
+ return 1;
+ case ACPI_HEST_TYPE_AER_BRIDGE:
+ info->hest_aer_bridge = (struct acpi_hest_aer_bridge *)hest_hdr;
+ return 1;
+ default:
+ return 0;
+ }
+}
+#endif
-static int apei_hest_parse(apei_hest_func_t func, void *data)
+int apei_hest_parse(apei_hest_func_t func, void *data)
{
struct acpi_hest_header *hest_hdr;
int i, rc, len;
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index dc60f7db5524..82d3cdf53e22 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -23,6 +23,15 @@ enum hest_status {
HEST_NOT_FOUND,
};
+#ifdef CONFIG_ACPI_APEI
+struct hest_parse_aer_info {
+ struct pci_dev *pci_dev;
+ struct acpi_hest_aer *hest_aer_endpoint;
+ struct acpi_hest_aer_root *hest_aer_root_port;
+ struct acpi_hest_aer_bridge *hest_aer_bridge;
+};
+#endif
+
extern int hest_disable;
extern int erst_disable;
#ifdef CONFIG_ACPI_APEI_GHES
@@ -33,10 +42,18 @@ void __init acpi_ghes_init(void);
static inline void acpi_ghes_init(void) { }
#endif
+typedef int (*apei_hest_func_t)(struct acpi_hest_header *hest_hdr, void *data);
+int apei_hest_parse(apei_hest_func_t func, void *data);
+
#ifdef CONFIG_ACPI_APEI
void __init acpi_hest_init(void);
+int hest_parse_pcie_aer(struct acpi_hest_header *hest_hdr, void *data);
#else
static inline void acpi_hest_init(void) { }
+static inline int hest_parse_pcie_aer(struct acpi_hest_header *hest_hdr, void *data)
+{
+ return 0;
+}
#endif
int erst_write(const struct cper_record_header *record);
--
2.34.1
next prev parent reply other threads:[~2023-12-18 3:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 9:16 [PATCH 0/3] Parse the HEST PCIe AER and set to relevant registers LeoLiu-oc
2023-11-15 9:16 ` [PATCH 1/3] ACPI/APEI: Add hest_parse_pcie_aer() LeoLiu-oc
2023-12-06 16:35 ` Rafael J. Wysocki
2023-12-14 2:57 ` LeoLiu-oc
2023-11-15 9:16 ` [PATCH 2/3] PCI: Add AER bits #defines for PCIe to PCI/PCI-X Bridge LeoLiu-oc
2023-11-15 9:16 ` [PATCH 3/3] PCI/ACPI: Add pci_acpi_program_hest_aer_params() LeoLiu-oc
2023-12-06 23:08 ` Bjorn Helgaas
2023-12-14 2:54 ` LeoLiu-oc
2023-12-18 3:04 ` [PATCH v2 0/3] Parse the HEST PCIe AER and set to relevant registers LeoLiu-oc
2023-12-18 3:04 ` LeoLiu-oc [this message]
2023-12-18 3:04 ` [PATCH v2 2/3] PCI: Add AER bits #defines for PCIe to PCI/PCI-X Bridge LeoLiu-oc
2024-05-08 22:10 ` Bjorn Helgaas
2024-05-09 8:42 ` LeoLiu-oc
2023-12-18 3:04 ` [PATCH v2 3/3] PCI/ACPI: Add pci_acpi_program_hest_aer_params() LeoLiu-oc
2024-05-08 22:24 ` Bjorn Helgaas
2024-05-09 9:06 ` LeoLiu-oc
2024-05-08 22:04 ` [PATCH v2 0/3] Parse the HEST PCIe AER and set to relevant registers Bjorn Helgaas
2024-05-09 8:39 ` LeoLiu-oc
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=20231218030430.783495-2-LeoLiu-oc@zhaoxin.com \
--to=leoliu-oc@zhaoxin.com \
--cc=CobeChen@zhaoxin.com \
--cc=ErosZhang@zhaoxin.com \
--cc=LeoLiu@zhaoxin.com \
--cc=TonyWWang@zhaoxin.com \
--cc=acpica-devel@lists.linux.dev \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=james.morse@arm.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=robert.moore@intel.com \
--cc=tony.luck@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: 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;
as well as URLs for NNTP newsgroup(s).