* [PATCH 01/14] ACPICA: ACPI 6.4: MADT: add Multiprocessor Wakeup Mailbox Structure
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
@ 2021-06-04 21:25 ` Erik Kaneda
2021-06-04 21:25 ` [PATCH 02/14] ACPICA: Add SVKL table headers Erik Kaneda
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:25 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List
Cc: Kuppuswamy Sathyanarayanan, Bob Moore, Erik Kaneda
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
ACPICA commit f1ee04207a212f6c519441e7e25397649ebc4cea
Add Multiprocessor Wakeup Mailbox Structure definition. It is useful
in parsing MADT Wake table.
Link: https://github.com/acpica/acpica/commit/f1ee0420
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl2.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 18cafe3ebddc..3b6f45a2edc8 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -763,6 +763,20 @@ struct acpi_madt_multiproc_wakeup {
u64 base_address;
};
+#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032
+#define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048
+
+struct acpi_madt_multiproc_wakeup_mailbox {
+ u16 command;
+ u16 reserved; /* reserved - must be zero */
+ u32 apic_id;
+ u64 wakeup_vector;
+ u8 reserved_os[ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE]; /* reserved for OS use */
+ u8 reserved_firmware[ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE]; /* reserved for firmware use */
+};
+
+#define ACPI_MP_WAKE_COMMAND_WAKEUP 1
+
/*
* Common flags fields for MADT subtables
*/
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 02/14] ACPICA: Add SVKL table headers
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
2021-06-04 21:25 ` [PATCH 01/14] ACPICA: ACPI 6.4: MADT: add Multiprocessor Wakeup Mailbox Structure Erik Kaneda
@ 2021-06-04 21:25 ` Erik Kaneda
2021-06-04 21:25 ` [PATCH 03/14] ACPICA: Fix memory leak caused by _CID repair function Erik Kaneda
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:25 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List
Cc: Kuppuswamy Sathyanarayanan, Robert Moore, Erik Kaneda,
Rafael J . Wysocki
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
ACPICA commit b5e6bcf69dbb9877481992d5ce86008cfb94f5b8
SVKL (Storage Volume Key Location Table) is used by BIOS/Firmware
to share storage volume encryption key's with OS. It will be used
by userspace to decrypt and mount encrypted drives.
So add SVKL table signature and add it to known signatures array
support SVKL.
You can find details about the SVKL table in TDX specfication
titled "Guest-Host-Communication Interface (GHCI) for Intel
Trust Domain Extensions (Intel® TDX)", sec 4.4 and in ACPI
specification r6.4, sec 5.2.6.
https://software.intel.com/content/dam/develop/external/us/en/documents/intel-tdx-guest-hypervisor-communication-interface.pdf
Cc: Robert Moore <robert.moore@intel.com>
Cc: Erik Kaneda <erik.kaneda@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://github.com/acpica/acpica/commit/b5e6bcf6
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl2.h | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 3b6f45a2edc8..d8fec67e4c8c 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -44,6 +44,7 @@
#define ACPI_SIG_SDEI "SDEI" /* Software Delegated Exception Interface Table */
#define ACPI_SIG_SDEV "SDEV" /* Secure Devices table */
#define ACPI_SIG_NHLT "NHLT" /* Non-HDAudio Link Table */
+#define ACPI_SIG_SVKL "SVKL" /* Storage Volume Key Location Table */
/*
* All tables must be byte-packed to match the ACPI specification, since
@@ -1913,6 +1914,35 @@ struct acpi_sdev_pcie_path {
u8 function;
};
+/*******************************************************************************
+ *
+ * SVKL - Storage Volume Key Location Table (ACPI 6.4)
+ * Version 1
+ *
+ ******************************************************************************/
+
+struct acpi_table_svkl {
+ struct acpi_table_header header; /* Common ACPI table header */
+ u32 count;
+};
+
+struct acpi_svkl_header {
+ u16 type;
+ u16 format;
+ u32 size;
+ u64 address;
+};
+
+enum acpi_svkl_type {
+ ACPI_SVKL_TYPE_MAIN_STORAGE = 0,
+ ACPI_SVKL_TYPE_RESERVED = 1 /* 1 and greater are reserved */
+};
+
+enum acpi_svkl_format {
+ ACPI_SVKL_FORMAT_RAW_BINARY = 0,
+ ACPI_SVKL_FORMAT_RESERVED = 1 /* 1 and greater are reserved */
+};
+
/* Reset to default packing */
#pragma pack()
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 03/14] ACPICA: Fix memory leak caused by _CID repair function
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
2021-06-04 21:25 ` [PATCH 01/14] ACPICA: ACPI 6.4: MADT: add Multiprocessor Wakeup Mailbox Structure Erik Kaneda
2021-06-04 21:25 ` [PATCH 02/14] ACPICA: Add SVKL table headers Erik Kaneda
@ 2021-06-04 21:25 ` Erik Kaneda
2021-06-04 21:25 ` [PATCH 04/14] ACPICA: iASL: Finish support for the IVRS ACPI table Erik Kaneda
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:25 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List
Cc: Erik Kaneda, Shawn Guo, Bob Moore
ACPICA commit 180cb53963aa876c782a6f52cc155d951b26051a
According to the ACPI spec, _CID returns a package containing
hardware ID's. Each element of an ASL package contains a reference
count from the parent package as well as the element itself.
Name (TEST, Package() {
"String object" // this package element has a reference count of 2
})
A memory leak was caused in the _CID repair function because it did
not decrement the reference count created by the package. Fix the
memory leak by calling acpi_ut_remove_reference on _CID package elements
that represent a hardware ID (_HID).
Link: https://github.com/acpica/acpica/commit/180cb539
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
drivers/acpi/acpica/nsrepair2.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 14b71b41e845..38e10ab976e6 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -379,6 +379,13 @@ acpi_ns_repair_CID(struct acpi_evaluate_info *info,
(*element_ptr)->common.reference_count =
original_ref_count;
+
+ /*
+ * The original_element holds a reference from the package object
+ * that represents _HID. Since a new element was created by _HID,
+ * remove the reference from the _CID package.
+ */
+ acpi_ut_remove_reference(original_element);
}
element_ptr++;
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 04/14] ACPICA: iASL: Finish support for the IVRS ACPI table
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (2 preceding siblings ...)
2021-06-04 21:25 ` [PATCH 03/14] ACPICA: Fix memory leak caused by _CID repair function Erik Kaneda
@ 2021-06-04 21:25 ` Erik Kaneda
2021-06-04 21:25 ` [PATCH 05/14] ACPICA: iASL: Add support for the SVKL table Erik Kaneda
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:25 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List; +Cc: Bob Moore, Erik Kaneda
From: Bob Moore <robert.moore@intel.com>
1) Add compiler support for IVRS.
2) Update disassembler support for IVRS.
3) Add a new utility, ut_is_id_integer to determine if a HID/CID is
an integer or a string.
ACPICA commit 7eb0b770cb0efcf089cb217b5f8bafc0c6395a3d
Link: https://github.com/acpica/acpica/commit/7eb0b770
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl2.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index d8fec67e4c8c..42c78fecca7c 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -447,6 +447,12 @@ struct acpi_ivrs_device_hid {
u8 uid_length;
};
+/* Values for uid_type above */
+
+#define ACPI_IVRS_UID_NOT_PRESENT 0
+#define ACPI_IVRS_UID_IS_INTEGER 1
+#define ACPI_IVRS_UID_IS_STRING 2
+
/* 0x20, 0x21, 0x22: I/O Virtualization Memory Definition Block (IVMD) */
struct acpi_ivrs_memory {
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 05/14] ACPICA: iASL: Add support for the SVKL table
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (3 preceding siblings ...)
2021-06-04 21:25 ` [PATCH 04/14] ACPICA: iASL: Finish support for the IVRS ACPI table Erik Kaneda
@ 2021-06-04 21:25 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 06/14] ACPICA: iASL Table Compiler: Add full support for RGRT ACPI table Erik Kaneda
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:25 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List; +Cc: Bob Moore, Erik Kaneda
From: Bob Moore <robert.moore@intel.com>
Includes the table compiler, the disassembler and the template
generator.
ACPICA commit 27a434379e3ecafea5340c0c384789ea2062c4fb
Link: https://github.com/acpica/acpica/commit/27a43437
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl2.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 42c78fecca7c..d042341e8ba9 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -1923,6 +1923,8 @@ struct acpi_sdev_pcie_path {
/*******************************************************************************
*
* SVKL - Storage Volume Key Location Table (ACPI 6.4)
+ * From: "Guest-Host-Communication Interface (GHCI) for Intel
+ * Trust Domain Extensions (Intel TDX)".
* Version 1
*
******************************************************************************/
@@ -1932,7 +1934,7 @@ struct acpi_table_svkl {
u32 count;
};
-struct acpi_svkl_header {
+struct acpi_svkl_key {
u16 type;
u16 format;
u32 size;
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 06/14] ACPICA: iASL Table Compiler: Add full support for RGRT ACPI table
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (4 preceding siblings ...)
2021-06-04 21:25 ` [PATCH 05/14] ACPICA: iASL: Add support for the SVKL table Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 07/14] ACPICA: Use ACPI_FALLTHROUGH Erik Kaneda
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List; +Cc: Bob Moore, Erik Kaneda
From: Bob Moore <robert.moore@intel.com>
ACPICA commit 6949e1dd2d92788a994ce657857fe8809159e71e
Includes compiler, disassembler, and template generator.
Link: https://github.com/acpica/acpica/commit/6949e1dd
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl2.h | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index d042341e8ba9..f1d5e8950527 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -40,6 +40,7 @@
#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table */
#define ACPI_SIG_PPTT "PPTT" /* Processor Properties Topology Table */
#define ACPI_SIG_RASF "RASF" /* RAS Feature table */
+#define ACPI_SIG_RGRT "RGRT" /* Regulatory Graphics Resource Table */
#define ACPI_SIG_SBST "SBST" /* Smart Battery Specification Table */
#define ACPI_SIG_SDEI "SDEI" /* Software Delegated Exception Interface Table */
#define ACPI_SIG_SDEV "SDEV" /* Secure Devices table */
@@ -1790,6 +1791,32 @@ enum acpi_rasf_status {
#define ACPI_RASF_ERROR (1<<2)
#define ACPI_RASF_STATUS (0x1F<<3)
+/*******************************************************************************
+ *
+ * RGRT - Regulatory Graphics Resource Table
+ * Version 1
+ *
+ * Conforms to "ACPI RGRT" available at:
+ * https://microsoft.github.io/mu/dyn/mu_plus/ms_core_pkg/acpi_RGRT/feature_acpi_rgrt/
+ *
+ ******************************************************************************/
+
+struct acpi_table_rgrt {
+ struct acpi_table_header header; /* Common ACPI table header */
+ u16 version;
+ u8 image_type;
+ u8 reserved;
+ u8 image[0];
+};
+
+/* image_type values */
+
+enum acpi_rgrt_image_type {
+ ACPI_RGRT_TYPE_RESERVED0 = 0,
+ ACPI_RGRT_IMAGE_TYPE_PNG = 1,
+ ACPI_RGRT_TYPE_RESERVED = 2 /* 2 and greater are reserved */
+};
+
/*******************************************************************************
*
* SBST - Smart Battery Specification Table
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 07/14] ACPICA: Use ACPI_FALLTHROUGH
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (5 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 06/14] ACPICA: iASL Table Compiler: Add full support for RGRT ACPI table Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 08/14] ACPICA: Add _PLD panel positions Erik Kaneda
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List
Cc: Wei Ming Chen, Bob Moore, Erik Kaneda
From: Wei Ming Chen <jj251510319013@gmail.com>
ACPICA commit 2296edd39b4ce2d2dd691c1f309c4da00843ecc9
Replace /* FALLTHROUGH */ comment with ACPI_FALLTHROUGH
Link: https://github.com/acpica/acpica/commit/2296edd3
Signed-off-by: Wei Ming Chen <jj251510319013@gmail.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
drivers/acpi/acpica/utprint.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c
index e37d612e8db5..05426596d1f4 100644
--- a/drivers/acpi/acpica/utprint.c
+++ b/drivers/acpi/acpica/utprint.c
@@ -475,7 +475,7 @@ int vsnprintf(char *string, acpi_size size, const char *format, va_list args)
case 'X':
type |= ACPI_FORMAT_UPPER;
- /* FALLTHROUGH */
+ ACPI_FALLTHROUGH;
case 'x':
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 08/14] ACPICA: Add _PLD panel positions
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (6 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 07/14] ACPICA: Use ACPI_FALLTHROUGH Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 09/14] ACPICA: iASL: Add support for the BDAT ACPI table Erik Kaneda
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List
Cc: Fabian Wüthrich, Daniel Scally, Andy Shevchenko, Bob Moore,
Erik Kaneda
From: Fabian Wüthrich <me@fabwu.ch>
ACPICA commit 1d36b551fa6749e650da1dfd3e809146e6ac6a2e
The ACPI specification v6.3 defines the panel positions in chapter 6.1.8
"_PLD (Physical Location of Device)"
Link: https://github.com/acpica/acpica/commit/1d36b551
Signed-off-by: Fabian Wüthrich <me@fabwu.ch>
Reviewed-by: Daniel Scally <djrscally@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/acbuffer.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/include/acpi/acbuffer.h b/include/acpi/acbuffer.h
index 18197c16149f..3e8d969b22fe 100644
--- a/include/acpi/acbuffer.h
+++ b/include/acpi/acbuffer.h
@@ -207,4 +207,14 @@ struct acpi_pld_info {
#define ACPI_PLD_GET_HORIZ_OFFSET(dword) ACPI_GET_BITS (dword, 16, ACPI_16BIT_MASK)
#define ACPI_PLD_SET_HORIZ_OFFSET(dword,value) ACPI_SET_BITS (dword, 16, ACPI_16BIT_MASK, value) /* Offset 128+16=144, Len 16 */
+/* Panel position defined in _PLD section of ACPI Specification 6.3 */
+
+#define ACPI_PLD_PANEL_TOP 0
+#define ACPI_PLD_PANEL_BOTTOM 1
+#define ACPI_PLD_PANEL_LEFT 2
+#define ACPI_PLD_PANEL_RIGHT 3
+#define ACPI_PLD_PANEL_FRONT 4
+#define ACPI_PLD_PANEL_BACK 5
+#define ACPI_PLD_PANEL_UNKNOWN 6
+
#endif /* ACBUFFER_H */
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 09/14] ACPICA: iASL: Add support for the BDAT ACPI table
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (7 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 08/14] ACPICA: Add _PLD panel positions Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 10/14] ACPICA: Add defines for the CXL Host Bridge Structure (CHBS) Erik Kaneda
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List; +Cc: Bob Moore, Erik Kaneda
From: Bob Moore <robert.moore@intel.com>
Includes: Table compiler, disassembler, and template generator.
ACPICA commit 81eb9c383e6dee0f1b6620e91e5c3dbb48234831
Link: https://github.com/acpica/acpica/commit/81eb9c38
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl2.h | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index f1d5e8950527..68a607961b2f 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -24,6 +24,7 @@
* file. Useful because they make it more difficult to inadvertently type in
* the wrong signature.
*/
+#define ACPI_SIG_BDAT "BDAT" /* BIOS Data ACPI Table */
#define ACPI_SIG_IORT "IORT" /* IO Remapping Table */
#define ACPI_SIG_IVRS "IVRS" /* I/O Virtualization Reporting Structure */
#define ACPI_SIG_LPIT "LPIT" /* Low Power Idle Table */
@@ -65,6 +66,20 @@
* See http://stackoverflow.com/a/1053662/41661
*/
+/*******************************************************************************
+ *
+ * BDAT - BIOS Data ACPI Table
+ *
+ * Conforms to "BIOS Data ACPI Table", Interface Specification v4.0 Draft 5
+ * Nov 2020
+ *
+ ******************************************************************************/
+
+struct acpi_table_bdat {
+ struct acpi_table_header header;
+ struct acpi_generic_address gas;
+};
+
/*******************************************************************************
*
* IORT - IO Remapping Table
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 10/14] ACPICA: Add defines for the CXL Host Bridge Structure (CHBS)
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (8 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 09/14] ACPICA: iASL: Add support for the BDAT ACPI table Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 11/14] ACPICA: Add the CFMWS structure definition to the CEDT table Erik Kaneda
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List
Cc: Alison Schofield, Bob Moore, Erik Kaneda
From: Alison Schofield <alison.schofield@intel.com>
ACPICA commit 5ace82441a34f8d45725f12f6bd2677e79c186a6
CXL 2.0 defines length and version field values for the CHBS.
Include them in the ACPI CEDT table definition.
Link: https://github.com/acpica/acpica/commit/5ace8244
Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl1.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index ce59903c2695..8532f56a51d6 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -330,6 +330,16 @@ enum acpi_cedt_type {
ACPI_CEDT_TYPE_RESERVED = 1
};
+/* Values for version field above */
+
+#define ACPI_CEDT_CHBS_VERSION_CXL11 (0)
+#define ACPI_CEDT_CHBS_VERSION_CXL20 (1)
+
+/* Values for length field above */
+
+#define ACPI_CEDT_CHBS_LENGTH_CXL11 (0x2000)
+#define ACPI_CEDT_CHBS_LENGTH_CXL20 (0x10000)
+
/*
* CEDT subtables
*/
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 11/14] ACPICA: Add the CFMWS structure definition to the CEDT table
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (9 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 10/14] ACPICA: Add defines for the CXL Host Bridge Structure (CHBS) Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 12/14] ACPICA: iASL: add disassembler support for PRMT Erik Kaneda
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List
Cc: Alison Schofield, Bob Moore, Erik Kaneda
From: Alison Schofield <alison.schofield@intel.com>
ACPICA commit 699fc72e56936bebf3b9ba39b6e91bd957b44452
The CXL Fixed Memory Window Structure (CFMWS) is added to the
CXL Early Discovery Table (CEDT). This new structure is defined
in an ECN to the CXL 2.0 specification.
https://www.computeexpresslink.org/spec-landing
Link: https://github.com/acpica/acpica/commit/699fc72e
Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/actbl1.h | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 8532f56a51d6..ef2872dea01c 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -327,7 +327,8 @@ struct acpi_cedt_header {
enum acpi_cedt_type {
ACPI_CEDT_TYPE_CHBS = 0,
- ACPI_CEDT_TYPE_RESERVED = 1
+ ACPI_CEDT_TYPE_CFMWS = 1,
+ ACPI_CEDT_TYPE_RESERVED = 2,
};
/* Values for version field above */
@@ -355,6 +356,34 @@ struct acpi_cedt_chbs {
u64 length;
};
+/* 1: CXL Fixed Memory Window Structure */
+
+struct acpi_cedt_cfmws {
+ struct acpi_cedt_header header;
+ u32 reserved1;
+ u64 base_hpa;
+ u64 window_size;
+ u8 interleave_ways;
+ u8 interleave_arithmetic;
+ u16 reserved2;
+ u32 granularity;
+ u16 restrictions;
+ u16 qtg_id;
+ u32 interleave_targets[];
+};
+
+/* Values for Interleave Arithmetic field above */
+
+#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0)
+
+/* Values for Restrictions field above */
+
+#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1)
+#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1)
+#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2)
+#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3)
+#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4)
+
/*******************************************************************************
*
* CPEP - Corrected Platform Error Polling table (ACPI 4.0)
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 12/14] ACPICA: iASL: add disassembler support for PRMT
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (10 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 11/14] ACPICA: Add the CFMWS structure definition to the CEDT table Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 13/14] ACPICA: Add support for PlatformRtMechanism OperationRegion handler Erik Kaneda
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List; +Cc: Erik Kaneda, Bob Moore
ACPICA commit f70e7593e37c9e29f19be8ad3ef93f3f34799368
Link: https://github.com/acpica/acpica/commit/f70e7593
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
include/acpi/actbl2.h | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 68a607961b2f..05b086d4d94a 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -40,6 +40,7 @@
#define ACPI_SIG_PHAT "PHAT" /* Platform Health Assessment Table */
#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table */
#define ACPI_SIG_PPTT "PPTT" /* Processor Properties Topology Table */
+#define ACPI_SIG_PRMT "PRMT" /* Platform Runtime Mechanism Table */
#define ACPI_SIG_RASF "RASF" /* RAS Feature table */
#define ACPI_SIG_RGRT "RGRT" /* Regulatory Graphics Resource Table */
#define ACPI_SIG_SBST "SBST" /* Smart Battery Specification Table */
@@ -1710,6 +1711,43 @@ struct acpi_pptt_id {
u16 spin_rev;
};
+/*******************************************************************************
+ *
+ * PRMT - Platform Runtime Mechanism Table
+ * Version 1
+ *
+ ******************************************************************************/
+
+struct acpi_table_prmt {
+ struct acpi_table_header header; /* Common ACPI table header */
+};
+
+struct acpi_table_prmt_header {
+ u8 platform_guid[16];
+ u32 module_info_offset;
+ u32 module_info_count;
+};
+
+struct acpi_prmt_module_info {
+ u16 revision;
+ u16 length;
+ u8 module_guid[16];
+ u16 major_rev;
+ u16 minor_rev;
+ u16 handler_info_count;
+ u32 handler_info_offset;
+ u64 mmio_list_pointer;
+};
+
+struct acpi_prmt_handler_info {
+ u16 revision;
+ u16 length;
+ u8 handler_guid[16];
+ u64 handler_address;
+ u64 static_data_buffer_address;
+ u64 acpi_param_buffer_address;
+};
+
/*******************************************************************************
*
* RASF - RAS Feature Table (ACPI 5.0)
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 13/14] ACPICA: Add support for PlatformRtMechanism OperationRegion handler
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (11 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 12/14] ACPICA: iASL: add disassembler support for PRMT Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-04 21:26 ` [PATCH 14/14] ACPICA: Update version to 20210604 Version 20210604 Erik Kaneda
2021-06-07 12:22 ` [PATCH 00/14] ACPICA version 20210604 Rafael J. Wysocki
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List; +Cc: Erik Kaneda, Bob Moore
ACPICA commit cdf48b141d7da38e47fe4020310033ddd1971f9e
Writing a buffer to a PlatformRtMechanism FieldUnit invokes a
bidirectional transaction. The input buffer contains 26 bytes
containing 9 bytes of status, a command byte and a 16-byte UUID.
This change will will simply pass this incoming buffer to a handler
registered by the OS.
Link: https://github.com/acpica/acpica/commit/cdf48b14
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
drivers/acpi/acpica/acutils.h | 2 ++
drivers/acpi/acpica/exfield.c | 8 +++++--
drivers/acpi/acpica/exserial.c | 12 ++++++++++
drivers/acpi/acpica/utuuid.c | 41 ++++++++++++++++++++++++++++++++++
include/acpi/acconfig.h | 2 ++
5 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index bccae0d3db75..59d6ded01614 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -737,6 +737,8 @@ const char *acpi_ah_match_uuid(u8 *data);
*/
#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_HELP_APP)
void acpi_ut_convert_string_to_uuid(char *in_string, u8 *uuid_buffer);
+
+acpi_status acpi_ut_convert_uuid_to_string(char *uuid_buffer, char *out_string);
#endif
#endif /* _ACUTILS_H */
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index 32f03ee81785..06f3c9df1e22 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -139,7 +139,9 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
|| obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_GSBUS
|| obj_desc->field.region_obj->region.space_id ==
- ACPI_ADR_SPACE_IPMI)) {
+ ACPI_ADR_SPACE_IPMI
+ || obj_desc->field.region_obj->region.space_id ==
+ ACPI_ADR_SPACE_PLATFORM_RT)) {
/* SMBus, GSBus, IPMI serial */
@@ -301,7 +303,9 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
|| obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_GSBUS
|| obj_desc->field.region_obj->region.space_id ==
- ACPI_ADR_SPACE_IPMI)) {
+ ACPI_ADR_SPACE_IPMI
+ || obj_desc->field.region_obj->region.space_id ==
+ ACPI_ADR_SPACE_PLATFORM_RT)) {
/* SMBus, GSBus, IPMI serial */
diff --git a/drivers/acpi/acpica/exserial.c b/drivers/acpi/acpica/exserial.c
index 8e8d95f7947b..10d68a5f76a3 100644
--- a/drivers/acpi/acpica/exserial.c
+++ b/drivers/acpi/acpica/exserial.c
@@ -195,6 +195,12 @@ acpi_ex_read_serial_bus(union acpi_operand_object *obj_desc,
function = ACPI_READ | (accessor_type << 16);
break;
+ case ACPI_ADR_SPACE_PLATFORM_RT:
+
+ buffer_length = ACPI_PRM_INPUT_BUFFER_SIZE;
+ function = ACPI_READ;
+ break;
+
default:
return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
}
@@ -311,6 +317,12 @@ acpi_ex_write_serial_bus(union acpi_operand_object *source_desc,
function = ACPI_WRITE | (accessor_type << 16);
break;
+ case ACPI_ADR_SPACE_PLATFORM_RT:
+
+ buffer_length = ACPI_PRM_INPUT_BUFFER_SIZE;
+ function = ACPI_WRITE;
+ break;
+
default:
return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
}
diff --git a/drivers/acpi/acpica/utuuid.c b/drivers/acpi/acpica/utuuid.c
index 090e44b6b6c7..dca9061518ab 100644
--- a/drivers/acpi/acpica/utuuid.c
+++ b/drivers/acpi/acpica/utuuid.c
@@ -61,4 +61,45 @@ void acpi_ut_convert_string_to_uuid(char *in_string, u8 *uuid_buffer)
1]);
}
}
+
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_ut_convert_uuid_to_string
+ *
+ * PARAMETERS: uuid_buffer - 16-byte UUID buffer
+ * out_string - 36-byte formatted UUID string
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Convert 16-byte UUID buffer to 36-byte formatted UUID string
+ * out_string must be 37 bytes to include null terminator.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ut_convert_uuid_to_string(char *uuid_buffer, char *out_string)
+{
+ u32 i;
+
+ if (!uuid_buffer || !out_string) {
+ return (AE_BAD_PARAMETER);
+ }
+
+ for (i = 0; i < UUID_BUFFER_LENGTH; i++) {
+ out_string[acpi_gbl_map_to_uuid_offset[i]] =
+ acpi_ut_hex_to_ascii_char(uuid_buffer[i], 4);
+
+ out_string[acpi_gbl_map_to_uuid_offset[i] + 1] =
+ acpi_ut_hex_to_ascii_char(uuid_buffer[i], 0);
+ }
+
+ /* Insert required hyphens (dashes) */
+
+ out_string[UUID_HYPHEN1_OFFSET] =
+ out_string[UUID_HYPHEN2_OFFSET] =
+ out_string[UUID_HYPHEN3_OFFSET] =
+ out_string[UUID_HYPHEN4_OFFSET] = '-';
+
+ out_string[UUID_STRING_LENGTH] = 0; /* Null terminate */
+ return (AE_OK);
+}
#endif
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index e92f84fa8c68..0362cbb72359 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -188,6 +188,8 @@
#define ACPI_MAX_GSBUS_DATA_SIZE 255
#define ACPI_MAX_GSBUS_BUFFER_SIZE ACPI_SERIAL_HEADER_SIZE + ACPI_MAX_GSBUS_DATA_SIZE
+#define ACPI_PRM_INPUT_BUFFER_SIZE 26
+
/* _sx_d and _sx_w control methods */
#define ACPI_NUM_sx_d_METHODS 4
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 14/14] ACPICA: Update version to 20210604 Version 20210604.
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (12 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 13/14] ACPICA: Add support for PlatformRtMechanism OperationRegion handler Erik Kaneda
@ 2021-06-04 21:26 ` Erik Kaneda
2021-06-07 12:22 ` [PATCH 00/14] ACPICA version 20210604 Rafael J. Wysocki
14 siblings, 0 replies; 16+ messages in thread
From: Erik Kaneda @ 2021-06-04 21:26 UTC (permalink / raw)
To: Rafael J . Wysocki, ACPI Devel Maling List; +Cc: Bob Moore, Erik Kaneda
From: Bob Moore <robert.moore@intel.com>
ACPICA commit ffceba1df23f8dbbc64a1023314ec179b4f5331e
Link: https://github.com/acpica/acpica/commit/ffceba1d
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/acpixf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index f8d44b06f3e3..a43335961e30 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -12,7 +12,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20210331
+#define ACPI_CA_VERSION 0x20210604
#include <acpi/acconfig.h>
#include <acpi/actypes.h>
--
2.29.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 00/14] ACPICA version 20210604
2021-06-04 21:25 [PATCH 00/14] ACPICA version 20210604 Erik Kaneda
` (13 preceding siblings ...)
2021-06-04 21:26 ` [PATCH 14/14] ACPICA: Update version to 20210604 Version 20210604 Erik Kaneda
@ 2021-06-07 12:22 ` Rafael J. Wysocki
14 siblings, 0 replies; 16+ messages in thread
From: Rafael J. Wysocki @ 2021-06-07 12:22 UTC (permalink / raw)
To: Erik Kaneda; +Cc: Rafael J . Wysocki, ACPI Devel Maling List
On Sat, Jun 5, 2021 at 12:00 AM Erik Kaneda <erik.kaneda@intel.com> wrote:
>
> This series contains the linux-ized patch set of ACPICA version
> 20210604. The patch mostly contains additional structures for ACPI
> tables. In addition, this patch set contains ACPICA support for
> a new OperationRegion subtype called PlatformRtMechanism (for PRM).
> As far as ACPICA is concerned, this subtype will hand off a buffer to a
> handler registered by the OS.
>
> Other than that, I will be leaving Intel and this will be my last
> ACPICA release. With that said, Rafael will take over this role for
> the timebeing. If you have any ACPICA related questions, I will be
> around for a few more days so please feel free to reach out.
Many thanks for the great work you've done on the ACPICA front Erik,
and good luck with your future endeavours!
> Alison Schofield (2):
> ACPICA: Add defines for the CXL Host Bridge Structure (CHBS)
> ACPICA: Add the CFMWS structure definition to the CEDT table
>
> Bob Moore (5):
> ACPICA: iASL: Finish support for the IVRS ACPI table
> ACPICA: iASL: Add support for the SVKL table
> ACPICA: iASL Table Compiler: Add full support for RGRT ACPI table
> ACPICA: iASL: Add support for the BDAT ACPI table
> ACPICA: Update version to 20210604 Version 20210604.
>
> Erik Kaneda (3):
> ACPICA: Fix memory leak caused by _CID repair function
> ACPICA: iASL: add disassembler support for PRMT
> ACPICA: Add support for PlatformRtMechanism OperationRegion handler
>
> Fabian Wüthrich (1):
> ACPICA: Add _PLD panel positions
>
> Kuppuswamy Sathyanarayanan (2):
> ACPICA: ACPI 6.4: MADT: add Multiprocessor Wakeup Mailbox Structure
> ACPICA: Add SVKL table headers
>
> Wei Ming Chen (1):
> ACPICA: Use ACPI_FALLTHROUGH
The entire series has been applied as 5.14 material, thanks!
^ permalink raw reply [flat|nested] 16+ messages in thread