e2a6290aab
Q35 has now ACPI hotplug enabled by default for PCI(e) devices. As opposed to native PCIe hotplug, guests like Fedora 34 will not assign IO range to pcie-root-ports not supporting native hotplug, resulting into a regression. Reproduce by: qemu-bin -M q35 -device pcie-root-port,id=p1 -monitor stdio device_add e1000,bus=p1 In the Guest OS the respective pcie-root-port will have the IO range disabled. Fix it by setting the "reserve-io" hint capability of the pcie-root-ports so the firmware will allocate the IO range instead. Acked-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> Message-Id: <20210802090057.1709775-1-marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
179 lines
5.2 KiB
C
179 lines
5.2 KiB
C
/*
|
|
* Generic PCI Express Root Port emulation
|
|
*
|
|
* Copyright (C) 2017 Red Hat Inc
|
|
*
|
|
* Authors:
|
|
* Marcel Apfelbaum <marcel@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/pci/msix.h"
|
|
#include "hw/pci/pcie_port.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/qdev-properties-system.h"
|
|
#include "migration/vmstate.h"
|
|
#include "qom/object.h"
|
|
|
|
#define TYPE_GEN_PCIE_ROOT_PORT "pcie-root-port"
|
|
OBJECT_DECLARE_SIMPLE_TYPE(GenPCIERootPort, GEN_PCIE_ROOT_PORT)
|
|
|
|
#define GEN_PCIE_ROOT_PORT_AER_OFFSET 0x100
|
|
#define GEN_PCIE_ROOT_PORT_ACS_OFFSET \
|
|
(GEN_PCIE_ROOT_PORT_AER_OFFSET + PCI_ERR_SIZEOF)
|
|
|
|
#define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR 1
|
|
#define GEN_PCIE_ROOT_DEFAULT_IO_RANGE 4096
|
|
|
|
struct GenPCIERootPort {
|
|
/*< private >*/
|
|
PCIESlot parent_obj;
|
|
/*< public >*/
|
|
|
|
bool migrate_msix;
|
|
|
|
/* additional resources to reserve */
|
|
PCIResReserve res_reserve;
|
|
};
|
|
|
|
static uint8_t gen_rp_aer_vector(const PCIDevice *d)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int gen_rp_interrupts_init(PCIDevice *d, Error **errp)
|
|
{
|
|
int rc;
|
|
|
|
rc = msix_init_exclusive_bar(d, GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR, 0, errp);
|
|
|
|
if (rc < 0) {
|
|
assert(rc == -ENOTSUP);
|
|
} else {
|
|
msix_vector_use(d, 0);
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
static void gen_rp_interrupts_uninit(PCIDevice *d)
|
|
{
|
|
msix_uninit_exclusive_bar(d);
|
|
}
|
|
|
|
static bool gen_rp_test_migrate_msix(void *opaque, int version_id)
|
|
{
|
|
GenPCIERootPort *rp = opaque;
|
|
|
|
return rp->migrate_msix;
|
|
}
|
|
|
|
static void gen_rp_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
PCIDevice *d = PCI_DEVICE(dev);
|
|
PCIESlot *s = PCIE_SLOT(d);
|
|
GenPCIERootPort *grp = GEN_PCIE_ROOT_PORT(d);
|
|
PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(d);
|
|
Error *local_err = NULL;
|
|
|
|
rpc->parent_realize(dev, &local_err);
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
return;
|
|
}
|
|
|
|
if (grp->res_reserve.io == -1 && s->hotplug && !s->native_hotplug) {
|
|
grp->res_reserve.io = GEN_PCIE_ROOT_DEFAULT_IO_RANGE;
|
|
}
|
|
int rc = pci_bridge_qemu_reserve_cap_init(d, 0,
|
|
grp->res_reserve, errp);
|
|
|
|
if (rc < 0) {
|
|
rpc->parent_class.exit(d);
|
|
return;
|
|
}
|
|
|
|
if (!grp->res_reserve.io) {
|
|
pci_word_test_and_clear_mask(d->wmask + PCI_COMMAND,
|
|
PCI_COMMAND_IO);
|
|
d->wmask[PCI_IO_BASE] = 0;
|
|
d->wmask[PCI_IO_LIMIT] = 0;
|
|
}
|
|
}
|
|
|
|
static const VMStateDescription vmstate_rp_dev = {
|
|
.name = "pcie-root-port",
|
|
.priority = MIG_PRI_PCI_BUS,
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.post_load = pcie_cap_slot_post_load,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot),
|
|
VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log,
|
|
PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog),
|
|
VMSTATE_MSIX_TEST(parent_obj.parent_obj.parent_obj.parent_obj,
|
|
GenPCIERootPort,
|
|
gen_rp_test_migrate_msix),
|
|
VMSTATE_END_OF_LIST()
|
|
}
|
|
};
|
|
|
|
static Property gen_rp_props[] = {
|
|
DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort,
|
|
migrate_msix, true),
|
|
DEFINE_PROP_UINT32("bus-reserve", GenPCIERootPort,
|
|
res_reserve.bus, -1),
|
|
DEFINE_PROP_SIZE("io-reserve", GenPCIERootPort,
|
|
res_reserve.io, -1),
|
|
DEFINE_PROP_SIZE("mem-reserve", GenPCIERootPort,
|
|
res_reserve.mem_non_pref, -1),
|
|
DEFINE_PROP_SIZE("pref32-reserve", GenPCIERootPort,
|
|
res_reserve.mem_pref_32, -1),
|
|
DEFINE_PROP_SIZE("pref64-reserve", GenPCIERootPort,
|
|
res_reserve.mem_pref_64, -1),
|
|
DEFINE_PROP_PCIE_LINK_SPEED("x-speed", PCIESlot,
|
|
speed, PCIE_LINK_SPEED_16),
|
|
DEFINE_PROP_PCIE_LINK_WIDTH("x-width", PCIESlot,
|
|
width, PCIE_LINK_WIDTH_32),
|
|
DEFINE_PROP_END_OF_LIST()
|
|
};
|
|
|
|
static void gen_rp_dev_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
PCIERootPortClass *rpc = PCIE_ROOT_PORT_CLASS(klass);
|
|
|
|
k->vendor_id = PCI_VENDOR_ID_REDHAT;
|
|
k->device_id = PCI_DEVICE_ID_REDHAT_PCIE_RP;
|
|
dc->desc = "PCI Express Root Port";
|
|
dc->vmsd = &vmstate_rp_dev;
|
|
device_class_set_props(dc, gen_rp_props);
|
|
|
|
device_class_set_parent_realize(dc, gen_rp_realize, &rpc->parent_realize);
|
|
|
|
rpc->aer_vector = gen_rp_aer_vector;
|
|
rpc->interrupts_init = gen_rp_interrupts_init;
|
|
rpc->interrupts_uninit = gen_rp_interrupts_uninit;
|
|
rpc->aer_offset = GEN_PCIE_ROOT_PORT_AER_OFFSET;
|
|
rpc->acs_offset = GEN_PCIE_ROOT_PORT_ACS_OFFSET;
|
|
}
|
|
|
|
static const TypeInfo gen_rp_dev_info = {
|
|
.name = TYPE_GEN_PCIE_ROOT_PORT,
|
|
.parent = TYPE_PCIE_ROOT_PORT,
|
|
.instance_size = sizeof(GenPCIERootPort),
|
|
.class_init = gen_rp_dev_class_init,
|
|
};
|
|
|
|
static void gen_rp_register_types(void)
|
|
{
|
|
type_register_static(&gen_rp_dev_info);
|
|
}
|
|
type_init(gen_rp_register_types)
|