@@ -54,13 +54,14 @@ typedef struct PCMachineState {
hwaddr memhp_io_base;
SGXEPCState sgx_epc;
- CXLState cxl_devices_state;
} PCMachineState;
typedef struct PcPciMachineState {
PCMachineState parent_obj;
Notifier machine_done;
+
+ CXLState cxl_devices_state;
} PcPciMachineState;
#define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device"
@@ -1554,6 +1554,11 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
crs_range_set_init(&crs_range_set);
bus = PC_MACHINE(machine)->pcibus;
if (bus) {
+ PcPciMachineState *ppms;
+
+ assert(pc_machine_is_pci_enabled(pcms));
+ ppms = PC_PCI_MACHINE(machine);
+
QLIST_FOREACH(bus, &bus->child, sibling) {
uint8_t bus_num = pci_bus_num(bus);
uint8_t numa_node = pci_bus_numa_node(bus);
@@ -1607,7 +1612,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
/* Handle the ranges for the PXB expanders */
if (pci_bus_is_cxl(bus)) {
- MemoryRegion *mr = &pcms->cxl_devices_state.host_mr;
+ MemoryRegion *mr = &ppms->cxl_devices_state.host_mr;
uint64_t base = mr->addr;
cxl_present = true;
@@ -2513,6 +2518,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
Object *vmgenid_dev;
char *oem_id;
char *oem_table_id;
+ bool pci_enabled = pc_machine_is_pci_enabled(pcms);
+ PcPciMachineState *ppms = pci_enabled ? PC_PCI_MACHINE(pcms) : NULL;
acpi_get_pm_info(machine, &pm);
acpi_get_misc_info(&misc);
@@ -2640,9 +2647,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
machine->nvdimms_state, machine->ram_slots,
x86ms->oem_id, x86ms->oem_table_id);
}
- if (pcms->cxl_devices_state.is_enabled) {
+ if (ppms && ppms->cxl_devices_state.is_enabled) {
cxl_build_cedt(table_offsets, tables_blob, tables->linker,
- x86ms->oem_id, x86ms->oem_table_id, &pcms->cxl_devices_state);
+ x86ms->oem_id, x86ms->oem_table_id,
+ &ppms->cxl_devices_state);
}
acpi_add_table(table_offsets, tables_blob);
@@ -598,13 +598,6 @@ void pc_machine_done(Notifier *notifier, void *data)
PCMachineState, machine_done);
X86MachineState *x86ms = X86_MACHINE(pcms);
- cxl_hook_up_pxb_registers(pcms->pcibus, &pcms->cxl_devices_state,
- &error_fatal);
-
- if (pcms->cxl_devices_state.is_enabled) {
- cxl_fmws_link_targets(&pcms->cxl_devices_state, &error_fatal);
- }
-
/* set the number of CPUs */
x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
@@ -626,6 +619,13 @@ static void pc_pci_machine_done(Notifier *notifier, void *data)
PCMachineState *pcms = PC_MACHINE(ppms);
X86MachineState *x86ms = X86_MACHINE(pcms);
+ cxl_hook_up_pxb_registers(pcms->pcibus, &ppms->cxl_devices_state,
+ &error_fatal);
+
+ if (ppms->cxl_devices_state.is_enabled) {
+ cxl_fmws_link_targets(&ppms->cxl_devices_state, &error_fatal);
+ }
+
fw_cfg_add_extra_pci_roots(pcms->pcibus, x86ms->fw_cfg);
}
@@ -719,13 +719,14 @@ static uint64_t pc_get_cxl_range_start(PCMachineState *pcms)
static uint64_t pc_get_cxl_range_end(PCMachineState *pcms)
{
+ PcPciMachineState *ppms = PC_PCI_MACHINE(pcms);
uint64_t start = pc_get_cxl_range_start(pcms) + MiB;
- if (pcms->cxl_devices_state.fixed_windows) {
+ if (ppms->cxl_devices_state.fixed_windows) {
GList *it;
start = ROUND_UP(start, 256 * MiB);
- for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) {
+ for (it = ppms->cxl_devices_state.fixed_windows; it; it = it->next) {
CXLFixedWindow *fw = it->data;
start += fw->size;
}
@@ -823,6 +824,7 @@ void pc_memory_init(PCMachineState *pcms,
hwaddr cxl_base, cxl_resv_end = 0;
X86CPU *cpu = X86_CPU(first_cpu);
bool pci_enabled = pc_machine_is_pci_enabled(pcms);
+ PcPciMachineState *ppms = pci_enabled ? PC_PCI_MACHINE(pcms) : NULL;
assert(machine->ram_size == x86ms->below_4g_mem_size +
x86ms->above_4g_mem_size);
@@ -926,20 +928,20 @@ void pc_memory_init(PCMachineState *pcms,
machine_memory_devices_init(machine, device_mem_base, device_mem_size);
}
- if (pcms->cxl_devices_state.is_enabled) {
- MemoryRegion *mr = &pcms->cxl_devices_state.host_mr;
+ if (ppms && ppms->cxl_devices_state.is_enabled) {
+ MemoryRegion *mr = &ppms->cxl_devices_state.host_mr;
hwaddr cxl_size = MiB;
cxl_base = pc_get_cxl_range_start(pcms);
memory_region_init(mr, OBJECT(machine), "cxl_host_reg", cxl_size);
memory_region_add_subregion(system_memory, cxl_base, mr);
cxl_resv_end = cxl_base + cxl_size;
- if (pcms->cxl_devices_state.fixed_windows) {
+ if (ppms->cxl_devices_state.fixed_windows) {
hwaddr cxl_fmw_base;
GList *it;
cxl_fmw_base = ROUND_UP(cxl_base + cxl_size, 256 * MiB);
- for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) {
+ for (it = ppms->cxl_devices_state.fixed_windows; it; it = it->next) {
CXLFixedWindow *fw = it->data;
fw->base = cxl_fmw_base;
@@ -979,7 +981,7 @@ void pc_memory_init(PCMachineState *pcms,
res_mem_end += memory_region_size(&machine->device_memory->mr);
}
- if (pcms->cxl_devices_state.is_enabled) {
+ if (ppms->cxl_devices_state.is_enabled) {
res_mem_end = cxl_resv_end;
}
*val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB));
@@ -1010,11 +1012,12 @@ uint64_t pc_pci_hole64_start(void)
{
PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
+ PcPciMachineState *ppms = PC_PCI_MACHINE(pcms);
MachineState *ms = MACHINE(pcms);
uint64_t hole64_start = 0;
ram_addr_t size = 0;
- if (pcms->cxl_devices_state.is_enabled) {
+ if (ppms->cxl_devices_state.is_enabled) {
hole64_start = pc_get_cxl_range_end(pcms);
} else if (pcmc->has_reserved_memory && (ms->ram_size < ms->maxram_size)) {
pc_get_device_memory_range(pcms, &hole64_start, &size);
@@ -1651,7 +1654,6 @@ static void pc_machine_initfn(Object *obj)
{
PCMachineState *pcms = PC_MACHINE(obj);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
- bool pci_enabled = pc_machine_is_pci_enabled(pcms);
#ifdef CONFIG_VMPORT
pcms->vmport = ON_OFF_AUTO_AUTO;
@@ -1678,9 +1680,6 @@ static void pc_machine_initfn(Object *obj)
pcms->pcspk = isa_new(TYPE_PC_SPEAKER);
object_property_add_alias(OBJECT(pcms), "pcspk-audiodev",
OBJECT(pcms->pcspk), "audiodev");
- if (pci_enabled) {
- cxl_machine_init(obj, &pcms->cxl_devices_state);
- }
pcms->machine_done.notify = pc_machine_done;
qemu_add_machine_init_done_notifier(&pcms->machine_done);
@@ -1690,6 +1689,8 @@ static void pc_pci_machine_initfn(Object *obj)
{
PcPciMachineState *ppms = PC_PCI_MACHINE(obj);
+ cxl_machine_init(obj, &ppms->cxl_devices_state);
+
ppms->machine_done.notify = pc_pci_machine_done;
qemu_add_machine_init_done_notifier(&ppms->machine_done);
}
CXL depends on PCIe, which isn't available on non-PCI machines such the ISA-only PC one. Move CXLState to PcPciMachineState, and move the CXL specific calls to pc_pci_machine_initfn() and pc_pci_machine_done(). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/i386/pc.h | 3 ++- hw/i386/acpi-build.c | 14 +++++++++++--- hw/i386/pc.c | 39 ++++++++++++++++++++------------------- 3 files changed, 33 insertions(+), 23 deletions(-)