Re: [Qemu-ppc] [PATCH v2 10/13] spapr_irq: Expose the phandle of the interrupt controller

[Cédric Le Goater]

On 1/11/19 10:04 PM, Greg Kurz wrote:
> This will be used by PHB hotplug in order to create the "interrupt-map"
> property of the PHB node.
> 
> Signed-off-by: Greg Kurz <address@hidden>
> ---
>  hw/intc/spapr_xive.c        |   34 ++++++++++++++++++++++++++++++++--
>  hw/intc/xics_spapr.c        |   28 +++++++++++++++++++++++++++-
>  hw/ppc/spapr_irq.c          |   13 ++++++++++++-
>  include/hw/ppc/spapr_irq.h  |    1 +
>  include/hw/ppc/spapr_xive.h |    2 ++
>  include/hw/ppc/xics_spapr.h |    2 ++
>  6 files changed, 76 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
> index d391177ab81f..ffae680024d7 100644
> --- a/hw/intc/spapr_xive.c
> +++ b/hw/intc/spapr_xive.c
> @@ -1414,6 +1414,12 @@ void spapr_xive_hcall_init(sPAPRMachineState *spapr)
>      spapr_register_hypercall(H_INT_RESET, h_int_reset);
>  }
>  
> +static gchar *xive_nodename(sPAPRXive *xive)
> +{
> +    return g_strdup_printf("address@hidden" PRIx64,
> +                           xive->tm_base + XIVE_TM_USER_PAGE * (1 << 
> TM_SHIFT));
> +}
> +
>  void spapr_dt_xive(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,
>                     uint32_t phandle)
>  {
> @@ -1450,8 +1456,7 @@ void spapr_dt_xive(sPAPRMachineState *spapr, uint32_t 
> nr_servers, void *fdt,
>                             XIVE_TM_OS_PAGE * (1ull << TM_SHIFT));
>      timas[3] = cpu_to_be64(1ull << TM_SHIFT);
>  
> -    nodename = g_strdup_printf("address@hidden" PRIx64,
> -                           xive->tm_base + XIVE_TM_USER_PAGE * (1 << 
> TM_SHIFT));
> +    nodename = xive_nodename(xive);
>      _FDT(node = fdt_add_subnode(fdt, 0, nodename));
>      g_free(nodename);
>  
> @@ -1479,3 +1484,28 @@ void spapr_dt_xive(sPAPRMachineState *spapr, uint32_t 
> nr_servers, void *fdt,
>      _FDT(fdt_setprop(fdt, 0, "ibm,plat-res-int-priorities",
>                       plat_res_int_priorities, 
> sizeof(plat_res_int_priorities)));
>  }
> +
> +uint32_t spapr_get_phandle_xive(sPAPRMachineState *spapr, void *fdt,
> +                                Error **errp)
> +{
> +    gchar *nodename = xive_nodename(spapr->xive);
> +    int phandle = -1, offset;
> +
> +    offset = fdt_subnode_offset(fdt, 0, nodename);
> +    if (offset < 0) {
> +        error_setg(errp, "Can't find node \"%s\": %s", nodename,
> +                   fdt_strerror(offset));
> +        goto out;
> +    }
> +
> +    phandle = fdt_get_phandle(spapr->fdt_blob, offset);
> +    if (phandle < 0) {
> +        error_setg(errp, "Can't get phandle of node \"%s\": %s",
> +                   nodename, fdt_strerror(phandle));
> +        goto out;
> +    }
> +
> +out:
> +    g_free(nodename);
> +    return phandle;
> +}
> diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
> index de6cc15b6474..7763b81d90dd 100644
> --- a/hw/intc/xics_spapr.c
> +++ b/hw/intc/xics_spapr.c
> @@ -35,6 +35,7 @@
>  #include "hw/ppc/xics_spapr.h"
>  #include "hw/ppc/fdt.h"
>  #include "qapi/visitor.h"
> +#include "qapi/error.h"
>  
>  /*
>   * Guest interfaces
> @@ -245,6 +246,8 @@ void xics_spapr_init(sPAPRMachineState *spapr)
>      spapr_register_hypercall(H_IPOLL, h_ipoll);
>  }
>  
> +#define NODENAME "interrupt-controller"
> +
>  void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,
>                     uint32_t phandle)
>  {
> @@ -253,7 +256,7 @@ void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t 
> nr_servers, void *fdt,
>      };
>      int node;
>  
> -    _FDT(node = fdt_add_subnode(fdt, 0, "interrupt-controller"));
> +    _FDT(node = fdt_add_subnode(fdt, 0, NODENAME));
>  
>      _FDT(fdt_setprop_string(fdt, node, "device_type",
>                              "PowerPC-External-Interrupt-Presentation"));
> @@ -266,3 +269,26 @@ void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t 
> nr_servers, void *fdt,
>      _FDT(fdt_setprop_cell(fdt, node, "linux,phandle", phandle));
>      _FDT(fdt_setprop_cell(fdt, node, "phandle", phandle));
>  }
> +
> +uint32_t spapr_get_phandle_xics(sPAPRMachineState *spapr, void *fdt,
> +                                Error **errp)
> +{

This routine is redundant with the spapr_get_phandle_xive() I think. 

I would remove the (*get_phandle)() method and move the code under a high 
level spapr_irq_get_phandle() routine which would call a method of the 
sPAPR IRQ backend : 

        char* (*get_nodename)(sPAPRMachineState *spapr);

The get_nodename_xics and get_nodename_xive methods could be located 
under the spapr_irq.c file or introduce helpers that could be used
directly as sPAPR IRQ methods. 

Thanks,

C. 

> +    int phandle = -1, offset;
> +
> +    offset = fdt_subnode_offset(fdt, 0, NODENAME);
> +    if (offset < 0) {
> +        error_setg(errp, "Can't find node \"%s\": %s", NODENAME,
> +                   fdt_strerror(offset));
> +        goto out;
> +    }
> +
> +    phandle = fdt_get_phandle(spapr->fdt_blob, offset);
> +    if (phandle < 0) {
> +        error_setg(errp, "Can't get phandle of node \"%s\": %s",
> +                   NODENAME, fdt_strerror(phandle));
> +        goto out;
> +    }
> +
> +out:
> +    return phandle;
> +}
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 1da7a32348fc..ba0df9ae2e1b 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -255,6 +255,7 @@ sPAPRIrq spapr_irq_xics = {
>      .post_load   = spapr_irq_post_load_xics,
>      .reset       = spapr_irq_reset_xics,
>      .set_irq     = spapr_irq_set_irq_xics,
> +    .get_phandle = spapr_get_phandle_xics,
>  };
>  
>  /*
> @@ -411,6 +412,7 @@ sPAPRIrq spapr_irq_xive = {
>      .post_load   = spapr_irq_post_load_xive,
>      .reset       = spapr_irq_reset_xive,
>      .set_irq     = spapr_irq_set_irq_xive,
> +    .get_phandle = spapr_get_phandle_xive,
>  };
>  
>  /*
> @@ -569,6 +571,13 @@ static void spapr_irq_set_irq_dual(void *opaque, int 
> srcno, int val)
>      spapr_irq_current(spapr)->set_irq(spapr, srcno, val);
>  }
>  
> +static uint32_t spapr_irq_get_phandle_dual(sPAPRMachineState *spapr, void 
> *fdt,
> +                                           Error **errp)
> +{
> +    return spapr_irq_current(spapr)->get_phandle(spapr, fdt, errp);
> +}
> +
> +
>  /*
>   * Define values in sync with the XIVE and XICS backend
>   */
> @@ -589,7 +598,8 @@ sPAPRIrq spapr_irq_dual = {
>      .cpu_intc_create = spapr_irq_cpu_intc_create_dual,
>      .post_load   = spapr_irq_post_load_dual,
>      .reset       = spapr_irq_reset_dual,
> -    .set_irq     = spapr_irq_set_irq_dual
> +    .set_irq     = spapr_irq_set_irq_dual,
> +    .get_phandle = spapr_irq_get_phandle_dual,
>  };
>  
>  /*
> @@ -706,4 +716,5 @@ sPAPRIrq spapr_irq_xics_legacy = {
>      .cpu_intc_create = spapr_irq_cpu_intc_create_xics,
>      .post_load   = spapr_irq_post_load_xics,
>      .set_irq     = spapr_irq_set_irq_xics,
> +    .get_phandle = spapr_get_phandle_xics,
>  };
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index 14b02c3aca33..990743a23582 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -47,6 +47,7 @@ typedef struct sPAPRIrq {
>      int (*post_load)(sPAPRMachineState *spapr, int version_id);
>      void (*reset)(sPAPRMachineState *spapr, Error **errp);
>      void (*set_irq)(void *opaque, int srcno, int val);
> +    uint32_t (*get_phandle)(sPAPRMachineState *spapr, void *fdt, Error 
> **errp);
>  } sPAPRIrq;
>  
>  extern sPAPRIrq spapr_irq_xics;
> diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h
> index 7fdc25057420..53a34f14b258 100644
> --- a/include/hw/ppc/spapr_xive.h
> +++ b/include/hw/ppc/spapr_xive.h
> @@ -49,4 +49,6 @@ void spapr_dt_xive(sPAPRMachineState *spapr, uint32_t 
> nr_servers, void *fdt,
>  void spapr_xive_set_tctx_os_cam(XiveTCTX *tctx);
>  void spapr_xive_mmio_set_enabled(sPAPRXive *xive, bool enable);
>  
> +uint32_t spapr_get_phandle_xive(sPAPRMachineState *spapr, void *fdt,
> +                                Error **errp);
>  #endif /* PPC_SPAPR_XIVE_H */
> diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h
> index b1ab27d022cf..8899c5346375 100644
> --- a/include/hw/ppc/xics_spapr.h
> +++ b/include/hw/ppc/xics_spapr.h
> @@ -31,6 +31,8 @@
>  
>  void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,
>                     uint32_t phandle);
> +uint32_t spapr_get_phandle_xics(sPAPRMachineState *spapr, void *fdt,
> +                                Error **errp);
>  int xics_kvm_init(sPAPRMachineState *spapr, Error **errp);
>  void xics_spapr_init(sPAPRMachineState *spapr);
>  
>