On Sat, Oct 22, 2016 at 11:46:46AM +0200, Cédric Le Goater wrote: > We will need this helper to translate the server number of the XIVE > (which is a PIR) into an ICPState index number (which is a cpu index). > > Signed-off-by: Cédric Le Goater <[email protected]>
Looks correct as far as it goes, but I wonder if this would be more
generally useful as a machine level function that searches the cpu
objects by PIR, returning a pointer. From that to the cpu_index is
then trivial.
> ---
> hw/intc/xics_native.c | 19 +++++++++++++++++++
> include/hw/ppc/xics.h | 1 +
> 2 files changed, 20 insertions(+)
>
> diff --git a/hw/intc/xics_native.c b/hw/intc/xics_native.c
> index bbdd786aeb50..6318862f53fc 100644
> --- a/hw/intc/xics_native.c
> +++ b/hw/intc/xics_native.c
> @@ -33,6 +33,25 @@
>
> #include <libfdt.h>
>
> +int xics_get_cpu_index_by_pir(XICSState *xics, int pir)
> +{
> + int i;
> +
> + for (i = 0; i < xics->nr_servers; i++) {
> + ICPState *icp = &xics->ss[i];
> + if (icp->cs) {
> + PowerPCCPU *cpu = POWERPC_CPU(icp->cs);
> + CPUPPCState *env = &cpu->env;
> +
> + if (env->spr_cb[SPR_PIR].default_value == pir) {
> + return i;
> + }
> + }
> + }
> +
> + return -1;
> +}
> +
> static void xics_native_reset(void *opaque)
> {
> device_reset(DEVICE(opaque));
> diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
> index 911cdd5e549f..beb232e616c5 100644
> --- a/include/hw/ppc/xics.h
> +++ b/include/hw/ppc/xics.h
> @@ -214,6 +214,7 @@ void xics_set_nr_servers(XICSState *xics, uint32_t
> nr_servers,
>
> /* Internal XICS interfaces */
> int xics_get_cpu_index_by_dt_id(int cpu_dt_id);
> +int xics_get_cpu_index_by_pir(XICSState *xics, int pir);
>
> void icp_set_cppr(ICPState *icp, uint8_t cppr);
> void icp_set_mfrr(ICPState *icp, uint8_t mfrr);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
