mirror of https://github.com/xqemu/xqemu.git
msi_supported -> msi_nonbroken
Rename controller flag to make it clearer what it means. Add some documentation as well. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
75fd6f13af
commit
226419d615
|
@ -186,7 +186,7 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp)
|
||||||
APIC_SPACE_SIZE);
|
APIC_SPACE_SIZE);
|
||||||
|
|
||||||
if (kvm_has_gsi_routing()) {
|
if (kvm_has_gsi_routing()) {
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)
|
||||||
s->vapic_control = 0;
|
s->vapic_control = 0;
|
||||||
memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
|
memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
|
||||||
"xen-apic-msi", APIC_SPACE_SIZE);
|
"xen-apic-msi", APIC_SPACE_SIZE);
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xen_apic_set_base(APICCommonState *s, uint64_t val)
|
static void xen_apic_set_base(APICCommonState *s, uint64_t val)
|
||||||
|
|
|
@ -874,7 +874,7 @@ static void apic_realize(DeviceState *dev, Error **errp)
|
||||||
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, apic_timer, s);
|
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, apic_timer, s);
|
||||||
local_apics[s->idx] = s;
|
local_apics[s->idx] = s;
|
||||||
|
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void apic_class_init(ObjectClass *klass, void *data)
|
static void apic_class_init(ObjectClass *klass, void *data)
|
||||||
|
|
|
@ -148,7 +148,7 @@ static void gicv2m_realize(DeviceState *dev, Error **errp)
|
||||||
sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->spi[i]);
|
sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->spi[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
kvm_gsi_direct_mapping = true;
|
kvm_gsi_direct_mapping = true;
|
||||||
kvm_msi_via_irqfd_allowed = kvm_irqfds_enabled();
|
kvm_msi_via_irqfd_allowed = kvm_irqfds_enabled();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1375,7 +1375,7 @@ static void fsl_common_init(OpenPICState *opp)
|
||||||
|
|
||||||
opp->irq_msi = 224;
|
opp->irq_msi = 224;
|
||||||
|
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
for (i = 0; i < opp->fsl->max_ext; i++) {
|
for (i = 0; i < opp->fsl->max_ext; i++) {
|
||||||
opp->src[i].level = false;
|
opp->src[i].level = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -239,7 +239,7 @@ static void kvm_openpic_realize(DeviceState *dev, Error **errp)
|
||||||
memory_listener_register(&opp->mem_listener, &address_space_memory);
|
memory_listener_register(&opp->mem_listener, &address_space_memory);
|
||||||
|
|
||||||
/* indicate pic capabilities */
|
/* indicate pic capabilities */
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
kvm_kernel_irqchip = true;
|
kvm_kernel_irqchip = true;
|
||||||
kvm_async_interrupts_allowed = true;
|
kvm_async_interrupts_allowed = true;
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ static int pci_bridge_dev_initfn(PCIDevice *dev)
|
||||||
goto slotid_error;
|
goto slotid_error;
|
||||||
}
|
}
|
||||||
if ((bridge_dev->flags & (1 << PCI_BRIDGE_DEV_F_MSI_REQ)) &&
|
if ((bridge_dev->flags & (1 << PCI_BRIDGE_DEV_F_MSI_REQ)) &&
|
||||||
msi_supported) {
|
msi_nonbroken) {
|
||||||
err = msi_init(dev, 0, 1, true, true);
|
err = msi_init(dev, 0, 1, true, true);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
goto msi_error;
|
goto msi_error;
|
||||||
|
|
19
hw/pci/msi.c
19
hw/pci/msi.c
|
@ -34,8 +34,21 @@
|
||||||
|
|
||||||
#define PCI_MSI_VECTORS_MAX 32
|
#define PCI_MSI_VECTORS_MAX 32
|
||||||
|
|
||||||
/* Flag for interrupt controller to declare MSI/MSI-X support */
|
/*
|
||||||
bool msi_supported;
|
* Flag for interrupt controllers to declare broken MSI/MSI-X support.
|
||||||
|
* values: false - broken; true - non-broken.
|
||||||
|
*
|
||||||
|
* Setting this flag to false will remove MSI/MSI-X capability from all devices.
|
||||||
|
*
|
||||||
|
* It is preferrable for controllers to set this to true (non-broken) even if
|
||||||
|
* they do not actually support MSI/MSI-X: guests normally probe the controller
|
||||||
|
* type and do not attempt to enable MSI/MSI-X with interrupt controllers not
|
||||||
|
* supporting such, so removing the capability is not required, and
|
||||||
|
* it seems cleaner to have a given device look the same for all boards.
|
||||||
|
*
|
||||||
|
* TODO: some existing controllers violate the above rule. Identify and fix them.
|
||||||
|
*/
|
||||||
|
bool msi_nonbroken;
|
||||||
|
|
||||||
/* If we get rid of cap allocator, we won't need this. */
|
/* If we get rid of cap allocator, we won't need this. */
|
||||||
static inline uint8_t msi_cap_sizeof(uint16_t flags)
|
static inline uint8_t msi_cap_sizeof(uint16_t flags)
|
||||||
|
@ -160,7 +173,7 @@ int msi_init(struct PCIDevice *dev, uint8_t offset,
|
||||||
uint8_t cap_size;
|
uint8_t cap_size;
|
||||||
int config_offset;
|
int config_offset;
|
||||||
|
|
||||||
if (!msi_supported) {
|
if (!msi_nonbroken) {
|
||||||
return -ENOTSUP;
|
return -ENOTSUP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,7 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries,
|
||||||
uint8_t *config;
|
uint8_t *config;
|
||||||
|
|
||||||
/* Nothing to do if MSI is not supported by interrupt controller */
|
/* Nothing to do if MSI is not supported by interrupt controller */
|
||||||
if (!msi_supported) {
|
if (!msi_nonbroken) {
|
||||||
return -ENOTSUP;
|
return -ENOTSUP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -439,7 +439,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
|
||||||
_FDT((fdt_property_cell(fdt, "rtas-event-scan-rate",
|
_FDT((fdt_property_cell(fdt, "rtas-event-scan-rate",
|
||||||
RTAS_EVENT_SCAN_RATE)));
|
RTAS_EVENT_SCAN_RATE)));
|
||||||
|
|
||||||
if (msi_supported) {
|
if (msi_nonbroken) {
|
||||||
_FDT((fdt_property(fdt, "ibm,change-msix-capable", NULL, 0)));
|
_FDT((fdt_property(fdt, "ibm,change-msix-capable", NULL, 0)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1743,7 +1743,7 @@ static void ppc_spapr_init(MachineState *machine)
|
||||||
bool kernel_le = false;
|
bool kernel_le = false;
|
||||||
char *filename;
|
char *filename;
|
||||||
|
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
|
|
||||||
QLIST_INIT(&spapr->phbs);
|
QLIST_INIT(&spapr->phbs);
|
||||||
|
|
||||||
|
|
|
@ -1790,7 +1790,7 @@ void spapr_pci_rtas_init(void)
|
||||||
rtas_ibm_read_pci_config);
|
rtas_ibm_read_pci_config);
|
||||||
spapr_rtas_register(RTAS_IBM_WRITE_PCI_CONFIG, "ibm,write-pci-config",
|
spapr_rtas_register(RTAS_IBM_WRITE_PCI_CONFIG, "ibm,write-pci-config",
|
||||||
rtas_ibm_write_pci_config);
|
rtas_ibm_write_pci_config);
|
||||||
if (msi_supported) {
|
if (msi_nonbroken) {
|
||||||
spapr_rtas_register(RTAS_IBM_QUERY_INTERRUPT_SOURCE_NUMBER,
|
spapr_rtas_register(RTAS_IBM_QUERY_INTERRUPT_SOURCE_NUMBER,
|
||||||
"ibm,query-interrupt-source-number",
|
"ibm,query-interrupt-source-number",
|
||||||
rtas_ibm_query_interrupt_source_number);
|
rtas_ibm_query_interrupt_source_number);
|
||||||
|
|
|
@ -597,7 +597,7 @@ static void s390_pcihost_class_init(ObjectClass *klass, void *data)
|
||||||
k->init = s390_pcihost_init;
|
k->init = s390_pcihost_init;
|
||||||
hc->plug = s390_pcihost_hot_plug;
|
hc->plug = s390_pcihost_hot_plug;
|
||||||
hc->unplug = s390_pcihost_hot_unplug;
|
hc->unplug = s390_pcihost_hot_unplug;
|
||||||
msi_supported = true;
|
msi_nonbroken = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo s390_pcihost_info = {
|
static const TypeInfo s390_pcihost_info = {
|
||||||
|
|
|
@ -29,7 +29,7 @@ struct MSIMessage {
|
||||||
uint32_t data;
|
uint32_t data;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern bool msi_supported;
|
extern bool msi_nonbroken;
|
||||||
|
|
||||||
void msi_set_message(PCIDevice *dev, MSIMessage msg);
|
void msi_set_message(PCIDevice *dev, MSIMessage msg);
|
||||||
MSIMessage msi_get_message(PCIDevice *dev, unsigned int vector);
|
MSIMessage msi_get_message(PCIDevice *dev, unsigned int vector);
|
||||||
|
|
Loading…
Reference in New Issue