On 12/10/18 7:39 AM, David Gibson wrote:
> On Sun, Dec 09, 2018 at 08:46:00PM +0100, Cédric Le Goater wrote:
>> The XIVE interface for the guest is described in the device tree under
>> the "interrupt-controller" node. A couple of new properties are
>> specific to XIVE :
>>
>> - "reg"
>>
>> contains the base address and size of the thread interrupt
>> managnement areas (TIMA), for the User level and for the Guest OS
>> level. Only the Guest OS level is taken into account today.
>>
>> - "ibm,xive-eq-sizes"
>>
>> the size of the event queues. One cell per size supported, contains
>> log2 of size, in ascending order.
>>
>> - "ibm,xive-lisn-ranges"
>>
>> the IRQ interrupt number ranges assigned to the guest for the IPIs.
>>
>> and also under the root node :
>>
>> - "ibm,plat-res-int-priorities"
>>
>> contains a list of priorities that the hypervisor has reserved for
>> its own use. OPAL uses the priority 7 queue to automatically
>> escalate interrupts for all other queues (DD2.X POWER9). So only
>> priorities [0..6] are allowed for the guest.
>>
>> Extend the sPAPR IRQ backend with a new handler to populate the DT
>> with the appropriate "interrupt-controller" node.
>>
>> Signed-off-by: Cédric Le Goater <c...@kaod.org>
>> ---
>> include/hw/ppc/spapr_irq.h | 2 ++
>> include/hw/ppc/spapr_xive.h | 2 ++
>> include/hw/ppc/xics.h | 4 +--
>> hw/intc/spapr_xive.c | 64 +++++++++++++++++++++++++++++++++++++
>> hw/intc/xics_spapr.c | 3 +-
>> hw/ppc/spapr.c | 3 +-
>> hw/ppc/spapr_irq.c | 3 ++
>> 7 files changed, 77 insertions(+), 4 deletions(-)
>>
>> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
>> index 23cdb51b879e..e51e9f052f63 100644
>> --- a/include/hw/ppc/spapr_irq.h
>> +++ b/include/hw/ppc/spapr_irq.h
>> @@ -39,6 +39,8 @@ typedef struct sPAPRIrq {
>> void (*free)(sPAPRMachineState *spapr, int irq, int num);
>> qemu_irq (*qirq)(sPAPRMachineState *spapr, int irq);
>> void (*print_info)(sPAPRMachineState *spapr, Monitor *mon);
>> + void (*dt_populate)(sPAPRMachineState *spapr, uint32_t nr_servers,
>> + void *fdt, uint32_t phandle);
>> } sPAPRIrq;
>>
>> extern sPAPRIrq spapr_irq_xics;
>> diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h
>> index 9506a8f4d10a..728a5e8dc163 100644
>> --- a/include/hw/ppc/spapr_xive.h
>> +++ b/include/hw/ppc/spapr_xive.h
>> @@ -45,5 +45,7 @@ qemu_irq spapr_xive_qirq(sPAPRXive *xive, uint32_t lisn);
>> typedef struct sPAPRMachineState sPAPRMachineState;
>>
>> void spapr_xive_hcall_init(sPAPRMachineState *spapr);
>> +void spapr_dt_xive(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,
>> + uint32_t phandle);
>>
>> #endif /* PPC_SPAPR_XIVE_H */
>> diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
>> index 9958443d1984..14afda198cdb 100644
>> --- a/include/hw/ppc/xics.h
>> +++ b/include/hw/ppc/xics.h
>> @@ -181,8 +181,6 @@ typedef struct XICSFabricClass {
>> ICPState *(*icp_get)(XICSFabric *xi, int server);
>> } XICSFabricClass;
>>
>> -void spapr_dt_xics(int nr_servers, void *fdt, uint32_t phandle);
>> -
>> ICPState *xics_icp_get(XICSFabric *xi, int server);
>>
>> /* Internal XICS interfaces */
>> @@ -204,6 +202,8 @@ void icp_resend(ICPState *ss);
>>
>> typedef struct sPAPRMachineState sPAPRMachineState;
>>
>> +void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,
>> + uint32_t phandle);
>> int xics_kvm_init(sPAPRMachineState *spapr, Error **errp);
>> void xics_spapr_init(sPAPRMachineState *spapr);
>>
>> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
>> index 982ac6e17051..a6d854b07690 100644
>> --- a/hw/intc/spapr_xive.c
>> +++ b/hw/intc/spapr_xive.c
>> @@ -14,6 +14,7 @@
>> #include "target/ppc/cpu.h"
>> #include "sysemu/cpus.h"
>> #include "monitor/monitor.h"
>> +#include "hw/ppc/fdt.h"
>> #include "hw/ppc/spapr.h"
>> #include "hw/ppc/spapr_xive.h"
>> #include "hw/ppc/xive.h"
>> @@ -1381,3 +1382,66 @@ void spapr_xive_hcall_init(sPAPRMachineState *spapr)
>> spapr_register_hypercall(H_INT_SYNC, h_int_sync);
>> spapr_register_hypercall(H_INT_RESET, h_int_reset);
>> }
>> +
>> +void spapr_dt_xive(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,
>> + uint32_t phandle)
>> +{
>> + sPAPRXive *xive = spapr->xive;
>> + int node;
>> + uint64_t timas[2 * 2];
>> + /* Interrupt number ranges for the IPIs */
>> + uint32_t lisn_ranges[] = {
>> + cpu_to_be32(0),
>> + cpu_to_be32(nr_servers),
>> + };
>> + uint32_t eq_sizes[] = {
>> + cpu_to_be32(12), /* 4K */
>> + cpu_to_be32(16), /* 64K */
>> + cpu_to_be32(21), /* 2M */
>> + cpu_to_be32(24), /* 16M */
>
> For KVM, are we going to need to clamp this list based on the
> pagesizes the guest can use?
I would say so. Is there a KVM service for that ?
Today, the OS scans the list and picks the size fitting its current
PAGE_SIZE/SHIFT. But I suppose it would be better to advertise
only the page sizes that QEMU/KVM supports. Or should we play safe
and only export : 4K, 64K ?
>> + };
>> + /* The following array is in sync with the reserved priorities
>> + * defined by the 'spapr_xive_priority_is_reserved' routine.
>> + */
>> + uint32_t plat_res_int_priorities[] = {
>> + cpu_to_be32(7), /* start */
>> + cpu_to_be32(0xf8), /* count */
>> + };
>> + gchar *nodename;
>> +
>> + /* Thread Interrupt Management Area : User (ring 3) and OS (ring 2) */
>> + timas[0] = cpu_to_be64(xive->tm_base +
>> + XIVE_TM_USER_PAGE * (1ull << TM_SHIFT));
>> + timas[1] = cpu_to_be64(1ull << TM_SHIFT);
>> + timas[2] = cpu_to_be64(xive->tm_base +
>> + XIVE_TM_OS_PAGE * (1ull << TM_SHIFT));
>> + timas[3] = cpu_to_be64(1ull << TM_SHIFT);
>
> So this gives the MMIO address of the TIMA.
Yes. It is considered to be a fixed "address"
> Where does the guest get the MMIO address for the ESB pages from?
with the hcall H_INT_GET_SOURCE_INFO.
C.
>> + nodename = g_strdup_printf("interrupt-controller@%" PRIx64,
>> + xive->tm_base + XIVE_TM_USER_PAGE * (1 <<
>> TM_SHIFT));
>> + _FDT(node = fdt_add_subnode(fdt, 0, nodename));
>> + g_free(nodename);
>> +
>> + _FDT(fdt_setprop_string(fdt, node, "device_type", "power-ivpe"));
>> + _FDT(fdt_setprop(fdt, node, "reg", timas, sizeof(timas)));
>> +
>> + _FDT(fdt_setprop_string(fdt, node, "compatible", "ibm,power-ivpe"));
>> + _FDT(fdt_setprop(fdt, node, "ibm,xive-eq-sizes", eq_sizes,
>> + sizeof(eq_sizes)));
>> + _FDT(fdt_setprop(fdt, node, "ibm,xive-lisn-ranges", lisn_ranges,
>> + sizeof(lisn_ranges)));
>> +
>> + /* For Linux to link the LSIs to the interrupt controller. */
>> + _FDT(fdt_setprop(fdt, node, "interrupt-controller", NULL, 0));
>> + _FDT(fdt_setprop_cell(fdt, node, "#interrupt-cells", 2));
>> +
>> + /* For SLOF */
>> + _FDT(fdt_setprop_cell(fdt, node, "linux,phandle", phandle));
>> + _FDT(fdt_setprop_cell(fdt, node, "phandle", phandle));
>> +
>> + /* The "ibm,plat-res-int-priorities" property defines the priority
>> + * ranges reserved by the hypervisor
>> + */
>> + _FDT(fdt_setprop(fdt, 0, "ibm,plat-res-int-priorities",
>> + plat_res_int_priorities,
>> sizeof(plat_res_int_priorities)));
>> +}
>> diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
>> index 2e27b92b871a..f67d3c80bf3a 100644
>> --- a/hw/intc/xics_spapr.c
>> +++ b/hw/intc/xics_spapr.c
>> @@ -244,7 +244,8 @@ void xics_spapr_init(sPAPRMachineState *spapr)
>> spapr_register_hypercall(H_IPOLL, h_ipoll);
>> }
>>
>> -void spapr_dt_xics(int nr_servers, void *fdt, uint32_t phandle)
>> +void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,
>> + uint32_t phandle)
>> {
>> uint32_t interrupt_server_ranges_prop[] = {
>> 0, cpu_to_be32(nr_servers),
>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>> index 3f9fc73f7f59..8ff22cdb79d8 100644
>> --- a/hw/ppc/spapr.c
>> +++ b/hw/ppc/spapr.c
>> @@ -1268,7 +1268,8 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
>> _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2));
>>
>> /* /interrupt controller */
>> - spapr_dt_xics(spapr_max_server_number(spapr), fdt, PHANDLE_XICP);
>> + smc->irq->dt_populate(spapr, spapr_max_server_number(spapr), fdt,
>> + PHANDLE_XICP);
>>
>> ret = spapr_populate_memory(spapr, fdt);
>> if (ret < 0) {
>> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
>> index d6768d0936f9..38ea2da7a094 100644
>> --- a/hw/ppc/spapr_irq.c
>> +++ b/hw/ppc/spapr_irq.c
>> @@ -204,6 +204,7 @@ sPAPRIrq spapr_irq_xics = {
>> .free = spapr_irq_free_xics,
>> .qirq = spapr_qirq_xics,
>> .print_info = spapr_irq_print_info_xics,
>> + .dt_populate = spapr_dt_xics,
>> };
>>
>> /*
>> @@ -318,6 +319,7 @@ sPAPRIrq spapr_irq_xive = {
>> .free = spapr_irq_free_xive,
>> .qirq = spapr_qirq_xive,
>> .print_info = spapr_irq_print_info_xive,
>> + .dt_populate = spapr_dt_xive,
>> };
>>
>> /*
>> @@ -422,4 +424,5 @@ sPAPRIrq spapr_irq_xics_legacy = {
>> .free = spapr_irq_free_xics,
>> .qirq = spapr_qirq_xics,
>> .print_info = spapr_irq_print_info_xics,
>> + .dt_populate = spapr_dt_xics,
>> };
>
