Commit 9dbae977 authored by Badari Pulavarty's avatar Badari Pulavarty Committed by Alexander Graf
Browse files

spapr_pci: Advertise MSI quota 



Hotplug of multiple disks fails due to MSI vector quota check.
Number of MSI vectors default to 8 allowing only 4 devices.
This happens on RHEL6.5 guest. RHEL7 and SLES11 guests fallback
to INTX.

One way to workaround the issue is to increase total MSIs,
so that MSI quota check allows us to hotplug multiple disks.

This sets the quota to the maximum number of interupts XICS has
which is 1024 now (XICS_IRQS). This moves XICS_IRQS from spapr.c
to xics.h for wider visibility.

Signed-off-by: default avatarBadari Pulavarty <pbadari@us.ibm.com>
[aik: put XICS_IRQS=1024 instead of 64i, fixed endianness and size]
Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent d13fc32e

hw/ppc/spapr.c

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ 
#define TIMEBASE_FREQ           512000000ULL



#define MAX_CPUS                256

#define XICS_IRQS               1024



#define PHANDLE_XICP            0x00001111

hw/ppc/spapr_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, 
    _FDT(fdt_setprop(fdt, bus_off, "ranges", &ranges, sizeof(ranges)));

    _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg)));

    _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1));

    _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", XICS_IRQS));



    /* Build the interrupt-map, this must matches what is done

     * in pci_spapr_map_irq

include/hw/ppc/xics.h

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ struct ICSIRQState { 
    uint8_t status;

};



#define XICS_IRQS               1024



qemu_irq xics_get_qirq(XICSState *icp, int irq);

void xics_set_irq_type(XICSState *icp, int irq, bool lsi);