[v2] ppc/pnv: Extend the powernv10 machine

[PATCH v2 02/20] ppc/pnv: Add an assert when calculating the RAM distribution on chips

Posted by Cédric Le Goater 4 years, 5 months ago

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---

 v2: fixed assert value ...

 hw/ppc/pnv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 03c86508d2f7..71e45515f136 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -723,6 +723,8 @@ static uint64_t pnv_chip_get_ram_size(PnvMachineState *pnv, int chip_id)
         return QEMU_ALIGN_DOWN(ram_per_chip, 1 * MiB);
     }
 
+    assert(pnv->num_chips > 1);
+
     ram_per_chip = (machine->ram_size - 1 * GiB) / (pnv->num_chips - 1);
     return chip_id == 0 ? 1 * GiB : QEMU_ALIGN_DOWN(ram_per_chip, 1 * MiB);
 }
-- 
2.31.1

Re: [PATCH v2 02/20] ppc/pnv: Add an assert when calculating the RAM distribution on chips

Posted by Greg Kurz 4 years, 5 months ago

On Thu, 2 Sep 2021 15:09:10 +0200
Cédric Le Goater <clg@kaod.org> wrote:

> Signed-off-by: Cédric Le Goater <clg@kaod.org>
> ---
> 

Reviewed-by: Greg Kurz <groug@kaod.org>

>  v2: fixed assert value ...
> 
>  hw/ppc/pnv.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 03c86508d2f7..71e45515f136 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -723,6 +723,8 @@ static uint64_t pnv_chip_get_ram_size(PnvMachineState *pnv, int chip_id)
>          return QEMU_ALIGN_DOWN(ram_per_chip, 1 * MiB);
>      }
>  
> +    assert(pnv->num_chips > 1);
> +
>      ram_per_chip = (machine->ram_size - 1 * GiB) / (pnv->num_chips - 1);
>      return chip_id == 0 ? 1 * GiB : QEMU_ALIGN_DOWN(ram_per_chip, 1 * MiB);
>  }

Re: [PATCH v2 02/20] ppc/pnv: Add an assert when calculating the RAM distribution on chips

Posted by David Gibson 4 years, 5 months ago

On Thu, Sep 02, 2021 at 03:09:10PM +0200, Cédric Le Goater wrote:
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

Applied to ppc-for-6.2, thanks.

> ---
> 
>  v2: fixed assert value ...
> 
>  hw/ppc/pnv.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 03c86508d2f7..71e45515f136 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -723,6 +723,8 @@ static uint64_t pnv_chip_get_ram_size(PnvMachineState *pnv, int chip_id)
>          return QEMU_ALIGN_DOWN(ram_per_chip, 1 * MiB);
>      }
>  
> +    assert(pnv->num_chips > 1);
> +
>      ram_per_chip = (machine->ram_size - 1 * GiB) / (pnv->num_chips - 1);
>      return chip_id == 0 ? 1 * GiB : QEMU_ALIGN_DOWN(ram_per_chip, 1 * MiB);
>  }

-- 
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