On Sat, 8 Feb 2020 17:56:45 +0100
Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> The board revision encode the count of ARM cores. Add a helper
s/encode/encodes/
Or better
the count of ARM cores is encoded in ...
> to extract the number of cores, and use it. This will be helpful
> when we add the Raspi0/1 that have a single core.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/arm/raspi.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index bee6ca0a08..90ad9b8115 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -101,6 +101,21 @@ static const char *board_soc_type(uint32_t board_rev)
> return soc_types[proc_id];
> }
>
> +static int cores_count(uint32_t board_rev)
> +{
> + static const int soc_cores_count[] = {
> + 0, BCM283X_NCPUS, BCM283X_NCPUS,
> + };
> + int proc_id = board_processor_id(board_rev);
> +
> + if (proc_id >= ARRAY_SIZE(soc_cores_count) || !soc_cores_count[proc_id])
> {
> + error_report("Unsupported processor id '%d' (board revision: 0x%x)",
> + proc_id, board_rev);
> + exit(1);
> + }
> + return soc_cores_count[proc_id];
> +}
> +
> static const char *board_type(uint32_t board_rev)
> {
> static const char *types[] = {
> @@ -307,9 +322,7 @@ static void raspi_machine_class_init(ObjectClass *oc,
> void *data)
> mc->no_parallel = 1;
> mc->no_floppy = 1;
> mc->no_cdrom = 1;
> - mc->max_cpus = BCM283X_NCPUS;
> - mc->min_cpus = BCM283X_NCPUS;
> - mc->default_cpus = BCM283X_NCPUS;
> + mc->default_cpus = mc->min_cpus = mc->max_cpus = cores_count(board_rev);
> mc->default_ram_size = board_ram_size(board_rev);
> if (board_version(board_rev) == 2) {
> mc->ignore_memory_transaction_failures = true;
