From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Ruidong Tian <tianruidong@linux.alibaba.com>
Cc: robert.moore@intel.com, rafael.j.wysocki@intel.com,
lenb@kernel.org, rafael@kernel.org, sudeep.holla@arm.com,
linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/1] ACPICA: AEST: Add support for the AEST V2 table
Date: Tue, 30 Apr 2024 21:21:02 +0200 [thread overview]
Message-ID: <CAJZ5v0i8=oTCXhAMRAckaVrTqCfOPxyYucpEguMF0tH2orY3aA@mail.gmail.com> (raw)
In-Reply-To: <20240425093426.76130-2-tianruidong@linux.alibaba.com>
On Thu, Apr 25, 2024 at 11:34 AM Ruidong Tian
<tianruidong@linux.alibaba.com> wrote:
>
> ACPICA commit ebb49799c78891cbe370f1264844664a3d8b6f35
>
> AEST V2 was published[1], add V2 support based on AEST V1.
>
> [1]: https://developer.arm.com/documentation/den0085/latest/
>
> Link: https://github.com/acpica/acpica/commit/ebb4979
> Signed-off-by: Ruidong Tian <tianruidong@linux.alibaba.com>
> ---
> include/acpi/actbl2.h | 88 ++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 82 insertions(+), 6 deletions(-)
>
> diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
> index 007cfdfd5d29..ae747c89d92c 100644
> --- a/include/acpi/actbl2.h
> +++ b/include/acpi/actbl2.h
> @@ -78,8 +78,8 @@
> *
> * AEST - Arm Error Source Table
> *
> - * Conforms to: ACPI for the Armv8 RAS Extensions 1.1 Platform Design Document
> - * September 2020.
> + * Conforms to: ACPI for the Armv8 RAS Extensions 1.1(Sep 2020) and
> + * 2.0(May 2023) Platform Design Document.
> *
> ******************************************************************************/
>
> @@ -109,7 +109,9 @@ struct acpi_aest_hdr {
> #define ACPI_AEST_SMMU_ERROR_NODE 2
> #define ACPI_AEST_VENDOR_ERROR_NODE 3
> #define ACPI_AEST_GIC_ERROR_NODE 4
> -#define ACPI_AEST_NODE_TYPE_RESERVED 5 /* 5 and above are reserved */
> +#define ACPI_AEST_PCIE_ERROR_NODE 5
> +#define ACPI_AEST_PROXY_ERROR_NODE 6
> +#define ACPI_AEST_NODE_TYPE_RESERVED 7 /* 7 and above are reserved */
>
> /*
> * AEST subtables (Error nodes)
> @@ -188,6 +190,12 @@ typedef struct acpi_aest_vendor {
>
> } acpi_aest_vendor;
>
> +struct acpi_aest_vendor_v2 {
> + char acpi_hid[8];
> + u32 acpi_uid;
> + u8 vendor_specific_data[16];
> +};
> +
> /* 4: Gic Error */
>
> typedef struct acpi_aest_gic {
> @@ -204,6 +212,18 @@ typedef struct acpi_aest_gic {
> #define ACPI_AEST_GIC_ITS 3
> #define ACPI_AEST_GIC_RESERVED 4 /* 4 and above are reserved */
>
> +/* 5: PCIe Error */
> +
> +struct acpi_aest_pcie {
> + u32 iort_node_reference;
> +};
> +
> +/* 6: Proxy Error */
> +
> +struct acpi_aest_proxy {
> + u64 node_address;
> +};
> +
> /* Node Interface Structure */
>
> typedef struct acpi_aest_node_interface {
> @@ -219,11 +239,57 @@ typedef struct acpi_aest_node_interface {
>
> } acpi_aest_node_interface;
>
> +/* Node Interface Structure V2 */
> +
> +struct acpi_aest_node_interface_header {
> + u8 type;
> + u8 group_format;
> + u8 reserved[2];
> + u32 flags;
> + u64 address;
> + u32 error_record_index;
> + u32 error_record_count;
> +};
> +
> +#define ACPI_AEST_NODE_GROUP_FORMAT_4K 0
> +#define ACPI_AEST_NODE_GROUP_FORMAT_16K 1
> +#define ACPI_AEST_NODE_GROUP_FORMAT_64K 2
> +
> +struct acpi_aest_node_interface_common {
> + u32 error_node_device;
> + u32 processor_affinity;
> + u64 error_group_register_base;
> + u64 fault_inject_register_base;
> + u64 interrupt_config_register_base;
> +};
> +
> +struct acpi_aest_node_interface_4k {
> + u64 error_record_implemented;
> + u64 error_status_reporting;
> + u64 addressing_mode;
> + struct acpi_aest_node_interface_common common;
> +};
> +
> +struct acpi_aest_node_interface_16k {
> + u64 error_record_implemented[4];
> + u64 error_status_reporting[4];
> + u64 addressing_mode[4];
> + struct acpi_aest_node_interface_common common;
> +};
> +
> +struct acpi_aest_node_interface_64k {
> + u64 error_record_implemented[14];
> + u64 error_status_reporting[14];
> + u64 addressing_mode[14];
> + struct acpi_aest_node_interface_common common;
> +};
> +
> /* Values for Type field above */
>
> -#define ACPI_AEST_NODE_SYSTEM_REGISTER 0
> -#define ACPI_AEST_NODE_MEMORY_MAPPED 1
> -#define ACPI_AEST_XFACE_RESERVED 2 /* 2 and above are reserved */
> +#define ACPI_AEST_NODE_SYSTEM_REGISTER 0
> +#define ACPI_AEST_NODE_MEMORY_MAPPED 1
> +#define ACPI_AEST_NODE_SINGLE_RECORD_MEMORY_MAPPED 2
> +#define ACPI_AEST_XFACE_RESERVED 3 /* 2 and above are reserved */
>
> /* Node Interrupt Structure */
>
> @@ -237,6 +303,16 @@ typedef struct acpi_aest_node_interrupt {
>
> } acpi_aest_node_interrupt;
>
> +/* Node Interrupt Structure V2 */
> +
> +struct acpi_aest_node_interrupt_v2 {
> + u8 type;
> + u8 reserved[2];
> + u8 flags;
> + u32 gsiv;
> + u8 reserved1[4];
> +};
> +
> /* Values for Type field above */
>
> #define ACPI_AEST_NODE_FAULT_HANDLING 0
> --
Applied as 6.10 material, thanks!
prev parent reply other threads:[~2024-04-30 19:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 9:34 [PATCH v3 0/1] ACPICA: AEST: Support AEST V2 Ruidong Tian
2024-04-25 9:34 ` [PATCH v3 1/1] ACPICA: AEST: Add support for the AEST V2 table Ruidong Tian
2024-04-30 19:21 ` Rafael J. Wysocki [this message]
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='CAJZ5v0i8=oTCXhAMRAckaVrTqCfOPxyYucpEguMF0tH2orY3aA@mail.gmail.com' \
--to=rafael@kernel.org \
--cc=acpica-devel@lists.linux.dev \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
--cc=sudeep.holla@arm.com \
--cc=tianruidong@linux.alibaba.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 read-only IMAP folder(s) and NNTP newsgroup(s).