[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/2] pnv/psi: Consolidate some duplicated code in pnv_psi_rea
From: |
David Gibson |
Subject: |
Re: [PATCH 2/2] pnv/psi: Consolidate some duplicated code in pnv_psi_realize() |
Date: |
Wed, 8 Jan 2020 11:54:32 +1100 |
On Tue, Jan 07, 2020 at 05:32:46PM +0100, Greg Kurz wrote:
> The proper way to do that would be to use device_class_set_parent_realize(),
> but defining a Pnv8PsiClass and a Pnv9PsiClass types with a parent_realize
> pointer adds a fair amount of code. Calling pnv_psi_realize() explicitely
> is fine for now.
>
> This should probably be achieved with a device realize hook in the
> PSI base class and device_class_set_parent_realize() in the children
> classes.
>
> Signed-off-by: Greg Kurz <address@hidden>
> Signed-off-by: Cédric Le Goater <address@hidden>
Applied to ppc-for-5.0.
> ---
> hw/ppc/pnv_psi.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
> index 6c94781e377d..546232106756 100644
> --- a/hw/ppc/pnv_psi.c
> +++ b/hw/ppc/pnv_psi.c
> @@ -469,6 +469,16 @@ static void pnv_psi_reset_handler(void *dev)
> device_reset(DEVICE(dev));
> }
>
> +static void pnv_psi_realize(DeviceState *dev, Error **errp)
> +{
> + PnvPsi *psi = PNV_PSI(dev);
> +
> + /* Default BAR for MMIO region */
> + pnv_psi_set_bar(psi, psi->bar | PSIHB_BAR_EN);
> +
> + qemu_register_reset(pnv_psi_reset_handler, dev);
> +}
> +
> static void pnv_psi_power8_instance_init(Object *obj)
> {
> Pnv8Psi *psi8 = PNV8_PSI(obj);
> @@ -528,9 +538,6 @@ static void pnv_psi_power8_realize(DeviceState *dev,
> Error **errp)
> memory_region_init_io(&psi->regs_mr, OBJECT(dev), &psi_mmio_ops, psi,
> "psihb", PNV_PSIHB_SIZE);
>
> - /* Default BAR for MMIO region */
> - pnv_psi_set_bar(psi, psi->bar | PSIHB_BAR_EN);
> -
> /* Default sources in XIVR */
> for (i = 0; i < PSI_NUM_INTERRUPTS; i++) {
> uint8_t xivr = irq_to_xivr[i];
> @@ -538,7 +545,7 @@ static void pnv_psi_power8_realize(DeviceState *dev,
> Error **errp)
> ((uint64_t) i << PSIHB_XIVR_SRC_SH);
> }
>
> - qemu_register_reset(pnv_psi_reset_handler, dev);
> + pnv_psi_realize(dev, errp);
> }
>
> static int pnv_psi_dt_xscom(PnvXScomInterface *dev, void *fdt, int
> xscom_offset)
> @@ -873,9 +880,7 @@ static void pnv_psi_power9_realize(DeviceState *dev,
> Error **errp)
> memory_region_init_io(&psi->regs_mr, OBJECT(dev), &pnv_psi_p9_mmio_ops,
> psi,
> "psihb", PNV9_PSIHB_SIZE);
>
> - pnv_psi_set_bar(psi, psi->bar | PSIHB_BAR_EN);
> -
> - qemu_register_reset(pnv_psi_reset_handler, dev);
> + pnv_psi_realize(dev, errp);
> }
>
> static void pnv_psi_power9_class_init(ObjectClass *klass, void *data)
>
--
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