[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 09/13] ppc/pnv: Pass XSCOM base address and address size to p
From: |
Cédric Le Goater |
Subject: |
Re: [PATCH 09/13] ppc/pnv: Pass XSCOM base address and address size to pnv_dt_xscom() |
Date: |
Fri, 13 Dec 2019 14:03:14 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 |
On 13/12/2019 13:00, Greg Kurz wrote:
> Since pnv_dt_xscom() is called from chip specific dt_populate() hooks,
> it shouldn't have to guess the chip type in order to populate the "reg"
> property. Just pass the base address and address size as arguments.
Much better,
> Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
> ---
> hw/ppc/pnv.c | 12 +++++++++---
> hw/ppc/pnv_xscom.c | 16 +++-------------
> include/hw/ppc/pnv_xscom.h | 3 ++-
> 3 files changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 88efa755e611..c532e98e752a 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -282,7 +282,9 @@ static void pnv_chip_power8_dt_populate(PnvChip *chip,
> void *fdt)
> {
> int i;
>
> - pnv_dt_xscom(chip, fdt, 0);
> + pnv_dt_xscom(chip, fdt, 0,
> + cpu_to_be64(PNV_XSCOM_BASE(chip)),
> + cpu_to_be64(PNV_XSCOM_SIZE));
>
> for (i = 0; i < chip->nr_cores; i++) {
> PnvCore *pnv_core = chip->cores[i];
> @@ -302,7 +304,9 @@ static void pnv_chip_power9_dt_populate(PnvChip *chip,
> void *fdt)
> {
> int i;
>
> - pnv_dt_xscom(chip, fdt, 0);
> + pnv_dt_xscom(chip, fdt, 0,
> + cpu_to_be64(PNV9_XSCOM_BASE(chip)),
> + cpu_to_be64(PNV9_XSCOM_SIZE));
>
> for (i = 0; i < chip->nr_cores; i++) {
> PnvCore *pnv_core = chip->cores[i];
> @@ -321,7 +325,9 @@ static void pnv_chip_power10_dt_populate(PnvChip *chip,
> void *fdt)
> {
> int i;
>
> - pnv_dt_xscom(chip, fdt, 0);
> + pnv_dt_xscom(chip, fdt, 0,
> + cpu_to_be64(PNV10_XSCOM_BASE(chip)),
> + cpu_to_be64(PNV10_XSCOM_SIZE));
>
> for (i = 0; i < chip->nr_cores; i++) {
> PnvCore *pnv_core = chip->cores[i];
> diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
> index df926003f2ba..8189767eb0bb 100644
> --- a/hw/ppc/pnv_xscom.c
> +++ b/hw/ppc/pnv_xscom.c
> @@ -286,24 +286,14 @@ static const char compat_p8[] =
> "ibm,power8-xscom\0ibm,xscom";
> static const char compat_p9[] = "ibm,power9-xscom\0ibm,xscom";
> static const char compat_p10[] = "ibm,power10-xscom\0ibm,xscom";
>
> -int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset)
> +int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
> + uint64_t xscom_base, uint64_t xscom_size)
> {
> - uint64_t reg[2];
> + uint64_t reg[] = { xscom_base, xscom_size };
> int xscom_offset;
> ForeachPopulateArgs args;
> char *name;
>
> - if (pnv_chip_is_power10(chip)) {
> - reg[0] = cpu_to_be64(PNV10_XSCOM_BASE(chip));
> - reg[1] = cpu_to_be64(PNV10_XSCOM_SIZE);
> - } else if (pnv_chip_is_power9(chip)) {
> - reg[0] = cpu_to_be64(PNV9_XSCOM_BASE(chip));
> - reg[1] = cpu_to_be64(PNV9_XSCOM_SIZE);
> - } else {
> - reg[0] = cpu_to_be64(PNV_XSCOM_BASE(chip));
> - reg[1] = cpu_to_be64(PNV_XSCOM_SIZE);
> - }
> -
> name = g_strdup_printf("xscom@%" PRIx64, be64_to_cpu(reg[0]));
> xscom_offset = fdt_add_subnode(fdt, root_offset, name);
> _FDT(xscom_offset);
> diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h
> index 2bdb7ae84fd3..ad53f788b44c 100644
> --- a/include/hw/ppc/pnv_xscom.h
> +++ b/include/hw/ppc/pnv_xscom.h
> @@ -114,7 +114,8 @@ typedef struct PnvXScomInterfaceClass {
> #define PNV10_XSCOM_PSIHB_SIZE 0x100
>
> void pnv_xscom_realize(PnvChip *chip, uint64_t size, Error **errp);
> -int pnv_dt_xscom(PnvChip *chip, void *fdt, int offset);
> +int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
> + uint64_t xscom_base, uint64_t xscom_size);
>
> void pnv_xscom_add_subregion(PnvChip *chip, hwaddr offset,
> MemoryRegion *mr);
>
- Re: [PATCH 05/13] ppc/pnv: Introduce PnvMachineClass::dt_power_mgt(), (continued)
- [PATCH 08/13] ppc/pnv: Introduce PnvChipClass::xscom_core_base() method, Greg Kurz, 2019/12/13
- [PATCH 09/13] ppc/pnv: Pass XSCOM base address and address size to pnv_dt_xscom(), Greg Kurz, 2019/12/13
- Re: [PATCH 09/13] ppc/pnv: Pass XSCOM base address and address size to pnv_dt_xscom(),
Cédric Le Goater <=
- [PATCH 11/13] ppc/pnv: Drop pnv_chip_is_power9() and pnv_chip_is_power10() helpers, Greg Kurz, 2019/12/13
- [PATCH 10/13] ppc/pnv: Pass content of the "compatible" property to pnv_dt_xscom(), Greg Kurz, 2019/12/13
- [PATCH 12/13] ppc/pnv: Introduce PnvChipClass::xscom_pcba() method, Greg Kurz, 2019/12/13
- [PATCH 13/13] ppc/pnv: Drop PnvChipClass::type, Greg Kurz, 2019/12/13
- Re: [PATCH 00/13] ppc/pnv: Get rid of chip_type attributes, David Gibson, 2019/12/15