From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Thomas Huth <thuth@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Radoslaw Biernacki <rad@semihalf.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
qemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Leif Lindholm <leif@nuviainc.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PULL 06/12] microvm/pcie: add 64bit mmio window
Date: Wed, 30 Sep 2020 19:48:49 +0200 [thread overview]
Message-ID: <20200930174856.11296-7-kraxel@redhat.com> (raw)
In-Reply-To: <20200930174856.11296-1-kraxel@redhat.com>
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
---
hw/i386/microvm.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 273abe28c9c1..17e3f2f15265 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -198,6 +198,12 @@ static void microvm_devices_init(MicrovmMachineState *mms)
}
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.size = PCIE_MMIO_SIZE;
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,
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);
}
--
2.27.0
next prev parent reply other threads:[~2020-09-30 18:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 17:48 [PULL 00/12] Microvm 20200930 patches Gerd Hoffmann
2020-09-30 17:48 ` [PULL 01/12] move MemMapEntry Gerd Hoffmann
2020-09-30 17:48 ` [PULL 02/12] acpi: add acpi_dsdt_add_gpex Gerd Hoffmann
2020-09-30 17:48 ` [PULL 03/12] arm: use acpi_dsdt_add_gpex Gerd Hoffmann
2020-09-30 17:48 ` [PULL 04/12] microvm: add irq table Gerd Hoffmann
2020-09-30 17:48 ` [PULL 05/12] microvm: add pcie support Gerd Hoffmann
2020-09-30 17:48 ` Gerd Hoffmann [this message]
2020-09-30 17:48 ` [PULL 07/12] tests/acpi: allow updates for expected data files Gerd Hoffmann
2020-09-30 17:48 ` [PULL 08/12] tests/acpi: add empty tests/data/acpi/microvm/DSDT.pcie file Gerd Hoffmann
2020-09-30 17:48 ` [PULL 09/12] tests/acpi: factor out common microvm test setup Gerd Hoffmann
2020-09-30 17:48 ` [PULL 10/12] tests/acpi: add microvm pcie test Gerd Hoffmann
2020-09-30 17:48 ` [PULL 11/12] acpi/gpex: no reason to use a method for _CRS Gerd Hoffmann
2020-09-30 17:48 ` [PULL 12/12] tests/acpi: update expected data files Gerd Hoffmann
2020-10-01 15:40 ` [PULL 00/12] Microvm 20200930 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200930174856.11296-7-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=leif@nuviainc.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rad@semihalf.com \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=slp@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).