From: "Cédric Le Goater" <clg@kaod.org>
To: Greg Kurz <groug@kaod.org>, David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH 02/13] ppc/pnv: Introduce PnvPsiClass::compat
Date: Fri, 13 Dec 2019 13:42:31 +0100 [thread overview]
Message-ID: <a4240408-f53f-36b5-786a-f7f915027a58@kaod.org> (raw)
In-Reply-To: <157623837974.360005.14706607446188964477.stgit@bahia.lan>
On 13/12/2019 12:59, Greg Kurz wrote:
> The Processor Service Interface (PSI) model has a chip_type class level
> attribute, which is used to generate the content of the "compatible" DT
> property according to the CPU type.
>
> Since the PSI model already has specialized classes for each supported
> CPU type, it seems cleaner to achieve this with QOM. Provide the content
> of the "compatible" property with a new class level attribute.
>
> Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> ---
> hw/ppc/pnv_psi.c | 25 +++++++++++--------------
> include/hw/ppc/pnv_psi.h | 2 ++
> 2 files changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
> index 572924388b3c..98a82b25e01f 100644
> --- a/hw/ppc/pnv_psi.c
> +++ b/hw/ppc/pnv_psi.c
> @@ -536,10 +536,6 @@ static void pnv_psi_power8_realize(DeviceState *dev, Error **errp)
> qemu_register_reset(pnv_psi_reset, dev);
> }
>
> -static const char compat_p8[] = "ibm,power8-psihb-x\0ibm,psihb-x";
> -static const char compat_p9[] = "ibm,power9-psihb-x\0ibm,psihb-x";
> -static const char compat_p10[] = "ibm,power10-psihb-x\0ibm,psihb-x";
> -
> static int pnv_psi_dt_xscom(PnvXScomInterface *dev, void *fdt, int xscom_offset)
> {
> PnvPsiClass *ppc = PNV_PSI_GET_CLASS(dev);
> @@ -558,16 +554,8 @@ static int pnv_psi_dt_xscom(PnvXScomInterface *dev, void *fdt, int xscom_offset)
> _FDT(fdt_setprop(fdt, offset, "reg", reg, sizeof(reg)));
> _FDT(fdt_setprop_cell(fdt, offset, "#address-cells", 2));
> _FDT(fdt_setprop_cell(fdt, offset, "#size-cells", 1));
> - if (ppc->chip_type == PNV_CHIP_POWER10) {
> - _FDT(fdt_setprop(fdt, offset, "compatible", compat_p10,
> - sizeof(compat_p10)));
> - } else if (ppc->chip_type == PNV_CHIP_POWER9) {
> - _FDT(fdt_setprop(fdt, offset, "compatible", compat_p9,
> - sizeof(compat_p9)));
> - } else {
> - _FDT(fdt_setprop(fdt, offset, "compatible", compat_p8,
> - sizeof(compat_p8)));
> - }
> + _FDT(fdt_setprop(fdt, offset, "compatible", ppc->compat,
> + ppc->compat_size));
> return 0;
> }
>
> @@ -581,6 +569,7 @@ static void pnv_psi_power8_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> PnvPsiClass *ppc = PNV_PSI_CLASS(klass);
> + static const char compat[] = "ibm,power8-psihb-x\0ibm,psihb-x";
>
> dc->desc = "PowerNV PSI Controller POWER8";
> dc->realize = pnv_psi_power8_realize;
> @@ -590,6 +579,8 @@ static void pnv_psi_power8_class_init(ObjectClass *klass, void *data)
> ppc->xscom_size = PNV_XSCOM_PSIHB_SIZE;
> ppc->bar_mask = PSIHB_BAR_MASK;
> ppc->irq_set = pnv_psi_power8_irq_set;
> + ppc->compat = compat;
> + ppc->compat_size = sizeof(compat);
> }
>
> static const TypeInfo pnv_psi_power8_info = {
> @@ -888,6 +879,7 @@ static void pnv_psi_power9_class_init(ObjectClass *klass, void *data)
> DeviceClass *dc = DEVICE_CLASS(klass);
> PnvPsiClass *ppc = PNV_PSI_CLASS(klass);
> XiveNotifierClass *xfc = XIVE_NOTIFIER_CLASS(klass);
> + static const char compat[] = "ibm,power9-psihb-x\0ibm,psihb-x";
>
> dc->desc = "PowerNV PSI Controller POWER9";
> dc->realize = pnv_psi_power9_realize;
> @@ -897,6 +889,8 @@ static void pnv_psi_power9_class_init(ObjectClass *klass, void *data)
> ppc->xscom_size = PNV9_XSCOM_PSIHB_SIZE;
> ppc->bar_mask = PSIHB9_BAR_MASK;
> ppc->irq_set = pnv_psi_power9_irq_set;
> + ppc->compat = compat;
> + ppc->compat_size = sizeof(compat);
>
> xfc->notify = pnv_psi_notify;
> }
> @@ -917,12 +911,15 @@ static void pnv_psi_power10_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> PnvPsiClass *ppc = PNV_PSI_CLASS(klass);
> + static const char compat[] = "ibm,power10-psihb-x\0ibm,psihb-x";
>
> dc->desc = "PowerNV PSI Controller POWER10";
>
> ppc->chip_type = PNV_CHIP_POWER10;
> ppc->xscom_pcba = PNV10_XSCOM_PSIHB_BASE;
> ppc->xscom_size = PNV10_XSCOM_PSIHB_SIZE;
> + ppc->compat = compat;
> + ppc->compat_size = sizeof(compat);
> }
>
> static const TypeInfo pnv_psi_power10_info = {
> diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h
> index a044aab304ae..fc068c95e543 100644
> --- a/include/hw/ppc/pnv_psi.h
> +++ b/include/hw/ppc/pnv_psi.h
> @@ -83,6 +83,8 @@ typedef struct PnvPsiClass {
> uint32_t xscom_pcba;
> uint32_t xscom_size;
> uint64_t bar_mask;
> + const char *compat;
> + int compat_size;
>
> void (*irq_set)(PnvPsi *psi, int, bool state);
> } PnvPsiClass;
>
next prev parent reply other threads:[~2019-12-13 21:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 11:59 [PATCH 00/13] ppc/pnv: Get rid of chip_type attributes Greg Kurz
2019-12-13 11:59 ` [PATCH 01/13] ppc: Drop useless extern annotation for functions Greg Kurz
2019-12-13 11:59 ` [PATCH 02/13] ppc/pnv: Introduce PnvPsiClass::compat Greg Kurz
2019-12-13 12:42 ` Cédric Le Goater [this message]
2019-12-13 11:59 ` [PATCH 03/13] ppc/pnv: Drop PnvPsiClass::chip_type Greg Kurz
2019-12-13 12:43 ` Cédric Le Goater
2019-12-13 11:59 ` [PATCH 04/13] ppc/pnv: Introduce PnvMachineClass and PnvMachineClass::compat Greg Kurz
2019-12-13 12:44 ` Cédric Le Goater
2019-12-16 18:07 ` Greg Kurz
2019-12-17 0:00 ` David Gibson
2019-12-13 11:59 ` [PATCH 05/13] ppc/pnv: Introduce PnvMachineClass::dt_power_mgt() Greg Kurz
2019-12-13 12:44 ` Cédric Le Goater
2019-12-13 12:00 ` [PATCH 06/13] ppc/pnv: Drop pnv_is_power9() and pnv_is_power10() helpers Greg Kurz
2019-12-13 12:59 ` Cédric Le Goater
2019-12-13 12:00 ` [PATCH 07/13] ppc/pnv: Introduce PnvChipClass::intc_print_info() method Greg Kurz
2019-12-13 13:00 ` Cédric Le Goater
2019-12-16 1:28 ` David Gibson
2019-12-16 7:54 ` Cédric Le Goater
2019-12-13 12:00 ` [PATCH 08/13] ppc/pnv: Introduce PnvChipClass::xscom_core_base() method Greg Kurz
2019-12-13 13:01 ` Cédric Le Goater
2019-12-13 12:00 ` [PATCH 09/13] ppc/pnv: Pass XSCOM base address and address size to pnv_dt_xscom() Greg Kurz
2019-12-13 13:03 ` Cédric Le Goater
2019-12-13 12:00 ` [PATCH 10/13] ppc/pnv: Pass content of the "compatible" property " Greg Kurz
2019-12-13 13:03 ` Cédric Le Goater
2019-12-13 12:00 ` [PATCH 11/13] ppc/pnv: Drop pnv_chip_is_power9() and pnv_chip_is_power10() helpers Greg Kurz
2019-12-13 13:05 ` Cédric Le Goater
2019-12-13 12:00 ` [PATCH 12/13] ppc/pnv: Introduce PnvChipClass::xscom_pcba() method Greg Kurz
2019-12-13 13:06 ` Cédric Le Goater
2019-12-16 1:32 ` David Gibson
2019-12-13 12:00 ` [PATCH 13/13] ppc/pnv: Drop PnvChipClass::type Greg Kurz
2019-12-13 13:06 ` Cédric Le Goater
2019-12-16 1:34 ` [PATCH 00/13] ppc/pnv: Get rid of chip_type attributes David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a4240408-f53f-36b5-786a-f7f915027a58@kaod.org \
--to=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).