hw/pci: add QEMU-specific PCI capability to the Generic PCI Express Root Port
To enable hotplugging of a newly created pcie-pci-bridge, we need to tell firmware (e.g. SeaBIOS) to reserve additional buses or IO/MEM/PREF space for pcie-root-port. Additional bus reservation allows us to hotplug pcie-pci-bridge into this root port. The number of buses and IO/MEM/PREF space to reserve are provided to the device via a corresponding property, and to the firmware via new PCI capability. The properties' default values are -1 to keep default behavior unchanged. Signed-off-by: Aleksandr Bezzubikov <zuban32s@gmail.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Tested-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
70e1ee59bb
commit
226263fb5c
@ -16,6 +16,8 @@
|
|||||||
#include "hw/pci/pcie_port.h"
|
#include "hw/pci/pcie_port.h"
|
||||||
|
|
||||||
#define TYPE_GEN_PCIE_ROOT_PORT "pcie-root-port"
|
#define TYPE_GEN_PCIE_ROOT_PORT "pcie-root-port"
|
||||||
|
#define GEN_PCIE_ROOT_PORT(obj) \
|
||||||
|
OBJECT_CHECK(GenPCIERootPort, (obj), TYPE_GEN_PCIE_ROOT_PORT)
|
||||||
|
|
||||||
#define GEN_PCIE_ROOT_PORT_AER_OFFSET 0x100
|
#define GEN_PCIE_ROOT_PORT_AER_OFFSET 0x100
|
||||||
#define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR 1
|
#define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR 1
|
||||||
@ -26,6 +28,13 @@ typedef struct GenPCIERootPort {
|
|||||||
/*< public >*/
|
/*< public >*/
|
||||||
|
|
||||||
bool migrate_msix;
|
bool migrate_msix;
|
||||||
|
|
||||||
|
/* additional resources to reserve on firmware init */
|
||||||
|
uint32_t bus_reserve;
|
||||||
|
uint64_t io_reserve;
|
||||||
|
uint64_t mem_reserve;
|
||||||
|
uint64_t pref32_reserve;
|
||||||
|
uint64_t pref64_reserve;
|
||||||
} GenPCIERootPort;
|
} GenPCIERootPort;
|
||||||
|
|
||||||
static uint8_t gen_rp_aer_vector(const PCIDevice *d)
|
static uint8_t gen_rp_aer_vector(const PCIDevice *d)
|
||||||
@ -60,6 +69,24 @@ static bool gen_rp_test_migrate_msix(void *opaque, int version_id)
|
|||||||
return rp->migrate_msix;
|
return rp->migrate_msix;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void gen_rp_realize(DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
PCIDevice *d = PCI_DEVICE(dev);
|
||||||
|
GenPCIERootPort *grp = GEN_PCIE_ROOT_PORT(d);
|
||||||
|
PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(d);
|
||||||
|
|
||||||
|
rpc->parent_realize(dev, errp);
|
||||||
|
|
||||||
|
int rc = pci_bridge_qemu_reserve_cap_init(d, 0, grp->bus_reserve,
|
||||||
|
grp->io_reserve, grp->mem_reserve, grp->pref32_reserve,
|
||||||
|
grp->pref64_reserve, errp);
|
||||||
|
|
||||||
|
if (rc < 0) {
|
||||||
|
rpc->parent_class.exit(d);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static const VMStateDescription vmstate_rp_dev = {
|
static const VMStateDescription vmstate_rp_dev = {
|
||||||
.name = "pcie-root-port",
|
.name = "pcie-root-port",
|
||||||
.version_id = 1,
|
.version_id = 1,
|
||||||
@ -78,6 +105,11 @@ static const VMStateDescription vmstate_rp_dev = {
|
|||||||
|
|
||||||
static Property gen_rp_props[] = {
|
static Property gen_rp_props[] = {
|
||||||
DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort, migrate_msix, true),
|
DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort, migrate_msix, true),
|
||||||
|
DEFINE_PROP_UINT32("bus-reserve", GenPCIERootPort, bus_reserve, -1),
|
||||||
|
DEFINE_PROP_SIZE("io-reserve", GenPCIERootPort, io_reserve, -1),
|
||||||
|
DEFINE_PROP_SIZE("mem-reserve", GenPCIERootPort, mem_reserve, -1),
|
||||||
|
DEFINE_PROP_SIZE("pref32-reserve", GenPCIERootPort, pref32_reserve, -1),
|
||||||
|
DEFINE_PROP_SIZE("pref64-reserve", GenPCIERootPort, pref64_reserve, -1),
|
||||||
DEFINE_PROP_END_OF_LIST()
|
DEFINE_PROP_END_OF_LIST()
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -92,6 +124,10 @@ static void gen_rp_dev_class_init(ObjectClass *klass, void *data)
|
|||||||
dc->desc = "PCI Express Root Port";
|
dc->desc = "PCI Express Root Port";
|
||||||
dc->vmsd = &vmstate_rp_dev;
|
dc->vmsd = &vmstate_rp_dev;
|
||||||
dc->props = gen_rp_props;
|
dc->props = gen_rp_props;
|
||||||
|
|
||||||
|
rpc->parent_realize = dc->realize;
|
||||||
|
dc->realize = gen_rp_realize;
|
||||||
|
|
||||||
rpc->aer_vector = gen_rp_aer_vector;
|
rpc->aer_vector = gen_rp_aer_vector;
|
||||||
rpc->interrupts_init = gen_rp_interrupts_init;
|
rpc->interrupts_init = gen_rp_interrupts_init;
|
||||||
rpc->interrupts_uninit = gen_rp_interrupts_uninit;
|
rpc->interrupts_uninit = gen_rp_interrupts_uninit;
|
||||||
|
@ -65,6 +65,7 @@ void pcie_chassis_del_slot(PCIESlot *s);
|
|||||||
|
|
||||||
typedef struct PCIERootPortClass {
|
typedef struct PCIERootPortClass {
|
||||||
PCIDeviceClass parent_class;
|
PCIDeviceClass parent_class;
|
||||||
|
DeviceRealize parent_realize;
|
||||||
|
|
||||||
uint8_t (*aer_vector)(const PCIDevice *dev);
|
uint8_t (*aer_vector)(const PCIDevice *dev);
|
||||||
int (*interrupts_init)(PCIDevice *dev, Error **errp);
|
int (*interrupts_init)(PCIDevice *dev, Error **errp);
|
||||||
|
Loading…
Reference in New Issue
Block a user