Skip to content

Commit 4a2c1dc

Browse files
AlisonSchofieldrafaeljw
authored andcommitted
ACPICA: Add the CFMWS structure definition to the CEDT table
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: acpica/acpica@699fc72e Signed-off-by: Alison Schofield <[email protected]> Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Erik Kaneda <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 160c768 commit 4a2c1dc

File tree

1 file changed

+30
-1
lines changed

1 file changed

+30
-1
lines changed

include/acpi/actbl1.h

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,8 @@ struct acpi_cedt_header {
327327

328328
enum acpi_cedt_type {
329329
ACPI_CEDT_TYPE_CHBS = 0,
330-
ACPI_CEDT_TYPE_RESERVED = 1
330+
ACPI_CEDT_TYPE_CFMWS = 1,
331+
ACPI_CEDT_TYPE_RESERVED = 2,
331332
};
332333

333334
/* Values for version field above */
@@ -355,6 +356,34 @@ struct acpi_cedt_chbs {
355356
u64 length;
356357
};
357358

359+
/* 1: CXL Fixed Memory Window Structure */
360+
361+
struct acpi_cedt_cfmws {
362+
struct acpi_cedt_header header;
363+
u32 reserved1;
364+
u64 base_hpa;
365+
u64 window_size;
366+
u8 interleave_ways;
367+
u8 interleave_arithmetic;
368+
u16 reserved2;
369+
u32 granularity;
370+
u16 restrictions;
371+
u16 qtg_id;
372+
u32 interleave_targets[];
373+
};
374+
375+
/* Values for Interleave Arithmetic field above */
376+
377+
#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0)
378+
379+
/* Values for Restrictions field above */
380+
381+
#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1)
382+
#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1)
383+
#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2)
384+
#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3)
385+
#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4)
386+
358387
/*******************************************************************************
359388
*
360389
* CPEP - Corrected Platform Error Polling table (ACPI 4.0)

0 commit comments

Comments
 (0)