mirror of
https://github.com/qemu/qemu.git
synced 2024-11-25 03:43:37 +08:00
microvm/pcie: add 64bit mmio window
Place the 64bit window at the top of the physical address space, assign 25% of the avaiable address space. Force cpu.host-phys-bits=on for microvm machine typs so this actually works reliable. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 20200928104256.9241-7-kraxel@redhat.com
This commit is contained in:
parent
24db877ab6
commit
8c2d9f9a38
@ -198,6 +198,12 @@ static void microvm_devices_init(MicrovmMachineState *mms)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (x86_machine_is_acpi_enabled(x86ms) && mms->pcie == ON_OFF_AUTO_ON) {
|
if (x86_machine_is_acpi_enabled(x86ms) && mms->pcie == ON_OFF_AUTO_ON) {
|
||||||
|
/* use topmost 25% of the address space available */
|
||||||
|
hwaddr phys_size = (hwaddr)1 << X86_CPU(first_cpu)->phys_bits;
|
||||||
|
if (phys_size > 0x1000000ll) {
|
||||||
|
mms->gpex.mmio64.size = phys_size / 4;
|
||||||
|
mms->gpex.mmio64.base = phys_size - mms->gpex.mmio64.size;
|
||||||
|
}
|
||||||
mms->gpex.mmio32.base = PCIE_MMIO_BASE;
|
mms->gpex.mmio32.base = PCIE_MMIO_BASE;
|
||||||
mms->gpex.mmio32.size = PCIE_MMIO_SIZE;
|
mms->gpex.mmio32.size = PCIE_MMIO_SIZE;
|
||||||
mms->gpex.ecam.base = PCIE_ECAM_BASE;
|
mms->gpex.ecam.base = PCIE_ECAM_BASE;
|
||||||
@ -383,6 +389,9 @@ static void microvm_fix_kernel_cmdline(MachineState *machine)
|
|||||||
static void microvm_device_pre_plug_cb(HotplugHandler *hotplug_dev,
|
static void microvm_device_pre_plug_cb(HotplugHandler *hotplug_dev,
|
||||||
DeviceState *dev, Error **errp)
|
DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
|
X86CPU *cpu = X86_CPU(dev);
|
||||||
|
|
||||||
|
cpu->host_phys_bits = true; /* need reliable phys-bits */
|
||||||
x86_cpu_pre_plug(hotplug_dev, dev, errp);
|
x86_cpu_pre_plug(hotplug_dev, dev, errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user