hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/include/acpi/actbl3.h
....@@ -3,7 +3,7 @@
33 *
44 * Name: actbl3.h - ACPI Table Definitions
55 *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
77 *
88 *****************************************************************************/
99
....@@ -39,7 +39,7 @@
3939 #define ACPI_SIG_WDDT "WDDT" /* Watchdog Timer Description Table */
4040 #define ACPI_SIG_WDRT "WDRT" /* Watchdog Resource Table */
4141 #define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table */
42
-#define ACPI_SIG_WSMT "WSMT" /* Windows SMM Security Migrations Table */
42
+#define ACPI_SIG_WSMT "WSMT" /* Windows SMM Security Mitigations Table */
4343 #define ACPI_SIG_XENV "XENV" /* Xen Environment table */
4444 #define ACPI_SIG_XXXX "XXXX" /* Intermediate AML header for ASL/ASL+ converter */
4545
....@@ -190,7 +190,8 @@
190190 ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY = 2,
191191 ACPI_SRAT_TYPE_GICC_AFFINITY = 3,
192192 ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4, /* ACPI 6.2 */
193
- ACPI_SRAT_TYPE_RESERVED = 5 /* 5 and greater are reserved */
193
+ ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5, /* ACPI 6.3 */
194
+ ACPI_SRAT_TYPE_RESERVED = 6 /* 5 and greater are reserved */
194195 };
195196
196197 /*
....@@ -270,6 +271,22 @@
270271 u16 reserved;
271272 u32 its_id;
272273 };
274
+
275
+/* 5: Generic Initiator Affinity Structure (ACPI 6.3) */
276
+
277
+struct acpi_srat_generic_affinity {
278
+ struct acpi_subtable_header header;
279
+ u8 reserved;
280
+ u8 device_handle_type;
281
+ u32 proximity_domain;
282
+ u8 device_handle[16];
283
+ u32 flags;
284
+ u32 reserved1;
285
+};
286
+
287
+/* Flags for struct acpi_srat_generic_affinity */
288
+
289
+#define ACPI_SRAT_GENERIC_AFFINITY_ENABLED (1) /* 00: Use affinity structure */
273290
274291 /*******************************************************************************
275292 *
....@@ -365,6 +382,29 @@
365382 *
366383 ******************************************************************************/
367384
385
+/* Revision 3 */
386
+
387
+struct acpi_table_tpm23 {
388
+ struct acpi_table_header header; /* Common ACPI table header */
389
+ u32 reserved;
390
+ u64 control_address;
391
+ u32 start_method;
392
+};
393
+
394
+/* Value for start_method above */
395
+
396
+#define ACPI_TPM23_ACPI_START_METHOD 2
397
+
398
+/*
399
+ * Optional trailer for revision 3. If start method is 2, there is a 4 byte
400
+ * reserved area of all zeros.
401
+ */
402
+struct acpi_tmp23_trailer {
403
+ u32 reserved;
404
+};
405
+
406
+/* Revision 4 */
407
+
368408 struct acpi_table_tpm2 {
369409 struct acpi_table_header header; /* Common ACPI table header */
370410 u16 platform_class;
....@@ -373,6 +413,13 @@
373413 u32 start_method;
374414
375415 /* Platform-specific data follows */
416
+};
417
+
418
+/* Optional trailer for revision 4 holding platform-specific data */
419
+struct acpi_tpm2_phy {
420
+ u8 start_method_specific[12];
421
+ u32 log_area_minimum_length;
422
+ u64 log_area_start_address;
376423 };
377424
378425 /* Values for start_method above */
....@@ -633,10 +680,10 @@
633680
634681 /*******************************************************************************
635682 *
636
- * WSMT - Windows SMM Security Migrations Table
683
+ * WSMT - Windows SMM Security Mitigations Table
637684 * Version 1
638685 *
639
- * Conforms to "Windows SMM Security Migrations Table",
686
+ * Conforms to "Windows SMM Security Mitigations Table",
640687 * Version 1.0, April 18, 2016
641688 *
642689 ******************************************************************************/