[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH v1 2/5] xlnx-zynqmp: Break out RPU setup into a se
From: |
Peter Maydell |
Subject: |
Re: [Qemu-arm] [PATCH v1 2/5] xlnx-zynqmp: Break out RPU setup into a separate function |
Date: |
Tue, 24 May 2016 17:23:55 +0100 |
On 19 May 2016 at 23:54, Edgar E. Iglesias <address@hidden> wrote:
> From: "Edgar E. Iglesias" <address@hidden>
>
> Break out RPU setup into a separate function. This is in
> preparation for making the RPU optional.
>
> No functional change.
>
> Signed-off-by: Edgar E. Iglesias <address@hidden>
> ---
> hw/arm/xlnx-zynqmp.c | 53
> ++++++++++++++++++++++++++++++----------------------
> 1 file changed, 31 insertions(+), 22 deletions(-)
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index 965a250..250ecc4 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -83,6 +83,36 @@ static inline int arm_gic_ppi_index(int cpu_nr, int
> ppi_index)
> return GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_index;
> }
>
> +static void xlnx_zynqmp_setup_rpu(XlnxZynqMPState *s, const char *boot_cpu,
> + Error **errp)
> +{
> + Error *err = NULL;
> + int i;
> +
> + for (i = 0; i < XLNX_ZYNQMP_NUM_RPU_CPUS; i++) {
> + char *name;
> +
> + name = object_get_canonical_path_component(OBJECT(&s->rpu_cpu[i]));
> + if (strcmp(name, boot_cpu)) {
> + /* Secondary CPUs start in PSCI powered-down state */
> + object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true,
> + "start-powered-off", &error_abort);
> + } else {
> + s->boot_cpu_ptr = &s->rpu_cpu[i];
> + }
> + g_free(name);
> +
> + object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true,
> "reset-hivecs",
> + &error_abort);
> + object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "realized",
> + &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
This used to return from xlnz_zynqmp_init, but now it only returns
from this setup function, and xlnx_zynqmp_init will blithely continue.
> + }
> + }
> +}
thanks
-- PMM
- [Qemu-arm] [PATCH v1 3/5] xlnx-zynqmp: Make the RPU subsystem optional, (continued)
- [Qemu-arm] [PATCH v1 3/5] xlnx-zynqmp: Make the RPU subsystem optional, Edgar E. Iglesias, 2016/05/19
- [Qemu-arm] [PATCH v1 1/5] xlnx-zynqmp: Add a secure prop to en/disable ARM Security Extensions, Edgar E. Iglesias, 2016/05/19
- [Qemu-arm] [PATCH v1 2/5] xlnx-zynqmp: Break out RPU setup into a separate function, Edgar E. Iglesias, 2016/05/19
- [Qemu-arm] [PATCH v1 5/5] xlnx-zynqmp: Use the in kernel GIC model for KVM runs, Edgar E. Iglesias, 2016/05/19
- [Qemu-arm] [PATCH v1 0/5] xlnx-zynqmp: Fix various issues with KVM runs, Edgar E. Iglesias, 2016/05/19
- [Qemu-arm] [PATCH v1 2/5] xlnx-zynqmp: Break out RPU setup into a separate function, Edgar E. Iglesias, 2016/05/19
- Re: [Qemu-arm] [PATCH v1 2/5] xlnx-zynqmp: Break out RPU setup into a separate function,
Peter Maydell <=
- [Qemu-arm] [PATCH v1 4/5] xlnx-zynqmp: Delay realization of GIC until post CPU realization, Edgar E. Iglesias, 2016/05/19
- [Qemu-arm] [PATCH v1 5/5] xlnx-zynqmp: Use the in kernel GIC model for KVM runs, Edgar E. Iglesias, 2016/05/19
- [Qemu-arm] [PATCH v1 3/5] xlnx-zynqmp: Make the RPU subsystem optional, Edgar E. Iglesias, 2016/05/19