@@ -66,6 +66,7 @@ enum {
typedef struct AcpiGhesState {
uint64_t ghes_addr_le;
bool present; /* True if GHES is present at all on this board */
+ uint64_t pci_osc_addr_le;
} AcpiGhesState;
void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker);
@@ -82,4 +83,6 @@ int acpi_ghes_record_errors(uint8_t notify, uint64_t error_physical_addr);
* safe to call acpi_ghes_record_errors() to record a memory error.
*/
bool acpi_ghes_present(void);
+bool acpi_fw_first_pci(void);
+bool acpi_fw_first_cxl_mem(void);
#endif
@@ -228,11 +228,27 @@ static Aml *__build_cxl_osc_method(bool fw_first)
Aml *method, *if_uuid, *else_uuid, *if_arg1_not_1, *if_cxl, *if_caps_masked;
Aml *a_ctrl = aml_local(0);
Aml *a_cdw1 = aml_name("CDW1");
+ Aml *cxl_osc_mem = aml_local(1);
Aml *cxl_ctrl = aml_local(2);
+ Aml *field;
+
method = aml_method("_OSC", 4, AML_NOTSERIALIZED);
/* CDW1 is used for the return value so is present whether or not a match occurs */
aml_append(method, aml_create_dword_field(aml_arg(3), aml_int(0), "CDW1"));
+ if (acpi_ghes_present()) {
+ aml_append(method, aml_store(aml_name("COSC"), cxl_osc_mem));
+ aml_append(method, aml_operation_region("CXLA", AML_SYSTEM_MEMORY,
+ cxl_osc_mem, 64));
+
+ field = aml_field("CXLA", AML_DWORD_ACC, AML_NOLOCK, AML_PRESERVE);
+ aml_append(field, aml_named_field("ODW1", 32));
+ aml_append(field, aml_named_field("ODW2", 32));
+ aml_append(method, field);
+ /* Store the value for querying later */
+ aml_append(method, aml_store(aml_name("CTRL"), aml_name("ODW1")));
+ aml_append(method, aml_store(aml_name("CTRC"), aml_name("ODW2")));
+ }
/*
* Generate shared section between:
@@ -20,3 +20,13 @@ bool acpi_ghes_present(void)
{
return false;
}
+
+bool acpi_fw_first_pci(void)
+{
+ return false;
+}
+
+bool acpi_fw_first_cxl_mem(void)
+{
+ return false;
+}
@@ -462,3 +462,47 @@ bool acpi_ghes_present(void)
ags = &acpi_ged_state->ghes_state;
return ags->present;
}
+
+bool acpi_fw_first_pci(void)
+{
+ if (acpi_ghes_present()) {
+ AcpiGhesState *ags =
+ &ACPI_GED(object_resolve_path_type("", TYPE_ACPI_GED,
+ NULL))->ghes_state;
+ uint32_t pci_osc;
+
+ cpu_physical_memory_read(le64_to_cpu(ags->pci_osc_addr_le),
+ &pci_osc, sizeof(pci_osc));
+ if (pci_osc == 0) {
+ printf("OSC not called yet\n");
+ return true; /* OSC not run yet */
+ }
+ printf("OSC has been called %x\n", pci_osc);
+ return !(pci_osc & (1 << 3));
+ }
+ return false;
+}
+
+bool acpi_fw_first_cxl_mem(void)
+{
+ if (!acpi_fw_first_pci()) {
+ return false;
+ }
+ if (acpi_ghes_present()) {
+ AcpiGhesState *ags =
+ &ACPI_GED(object_resolve_path_type("", TYPE_ACPI_GED,
+ NULL))->ghes_state;
+ uint32_t cxl_osc;
+
+ cpu_physical_memory_read(le64_to_cpu(ags->pci_osc_addr_le) +
+ sizeof(uint32_t),
+ &cxl_osc, sizeof(cxl_osc));
+ if (cxl_osc == 0) {
+ printf("CXL OSC not called yet or memory error not requested\n");
+ return true; /* OSC not run yet */
+ }
+ printf("OSC has been called %x\n", cxl_osc);
+ return !(cxl_osc & (1 << 0));
+ }
+ return false;
+}
@@ -916,6 +916,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
const int *irqmap = vms->irqmap;
AcpiTable table = { .sig = "DSDT", .rev = 2, .oem_id = vms->oem_id,
.oem_table_id = vms->oem_table_id };
+ int mem_addr_offset;
acpi_table_begin(&table, table_data);
dsdt = init_aml_allocator();
@@ -972,6 +973,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
/* copy AML table into ACPI tables blob */
g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
+ /* Outside of the DSDT creation because we need the final address */
+ mem_addr_offset = build_append_named_dword(table_data, "COSC");
+ /* Patch COSC to point to the cxl-osc FW_CFG file */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
+ mem_addr_offset, sizeof(uint32_t),
+ "etc/acpi/cxl-osc", 0);
+ /* Store address of cxl-osc FW_CFG file in cxl-osc-addr FW_CFG file */
+ bios_linker_loader_write_pointer(linker, "etc/acpi/cxl-osc-addr", 0,
+ sizeof(uint64_t), "etc/acpi/cxl-osc", 0);
+
acpi_table_end(linker, &table);
free_aml_allocator();
}
@@ -995,6 +1006,8 @@ static void acpi_align_size(GArray *blob, unsigned align)
g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align));
}
+static GArray *test;
+
static
void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
{
@@ -1004,6 +1017,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
GArray *tables_blob = tables->table_data;
MachineState *ms = MACHINE(vms);
+ /* Load the cxl-osc FW_CFG file into guest memory */
+ bios_linker_loader_alloc(tables->linker, "etc/acpi/cxl-osc",
+ test, 64, false);
+
table_offsets = g_array_new(false, true /* clear */,
sizeof(uint32_t));
@@ -1202,6 +1219,10 @@ void virt_acpi_setup(VirtMachineState *vms)
build_state = g_malloc0(sizeof *build_state);
+ test = g_array_new(false, true, 4);
+ acpi_data_push(test, sizeof(uint64_t));
+ *((uint64_t *)test->data) = 0xdeadbeefdeadbeef;
+
acpi_build_tables_init(&tables);
virt_acpi_build(vms, &tables);
@@ -1234,7 +1255,25 @@ void virt_acpi_setup(VirtMachineState *vms)
virt_acpi_build_reset(build_state);
vmstate_register(NULL, 0, &vmstate_virt_acpi_build, build_state);
- /* Cleanup tables but don't free the memory: we track it
+ if (acpi_ghes_present()) {
+ AcpiGhesState *ags =
+ &ACPI_GED(object_resolve_path_type("", TYPE_ACPI_GED,
+ NULL))->ghes_state;
+
+ /* Add a cxl-osc FW_CFG file that will be used to stash osc outcomes */
+ fw_cfg_add_file(vms->fw_cfg, "etc/acpi/cxl-osc",
+ test->data, test->len);
+ /*
+ * Add a cxl-osc-addr FW_CFG file that will be used to get to the
+ * address of cxl-osc FW_CFG file. Can be written by FW.
+ */
+ fw_cfg_add_file_callback(vms->fw_cfg, "etc/acpi/cxl-osc-addr",
+ NULL, NULL, NULL,
+ &ags->pci_osc_addr_le, sizeof(uint64_t),
+ false);
+ }
+ /*
+ * Cleanup tables but don't free the memory: we track it
* in build_state.
*/
acpi_build_tables_cleanup(&tables, false);
Allow QEMU to know what was successfully requested by the OS via _OSC. Note this handling is very minimal and assumes last written Control parameters were accepted (which they should be if the OS is obeying the rules for negotiating this stuff). Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- include/hw/acpi/ghes.h | 3 +++ hw/acpi/cxl.c | 16 +++++++++++++++ hw/acpi/ghes-stub.c | 10 +++++++++ hw/acpi/ghes.c | 44 ++++++++++++++++++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 41 ++++++++++++++++++++++++++++++++++++- 5 files changed, 113 insertions(+), 1 deletion(-)