Commit 38b02bd8 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by David Gibson
Browse files

spapr: Use QEMU limit for maximum CPUs number 



sPAPR uses hard coded limit of maximum 255 supported CPUs which is
exactly the same as QEMU-wide limit which is MAX_CPUMASK_BITS and also
defined as 255.

This makes use of a global CPU number limit for the "pseries" machine.

In order to anticipate future increase of the MAX_CPUMASK_BITS
(or to help debugging large systems), this also bumps the FDT_MAX_SIZE
limit from 256K to 1M assuming that 1 CPU core needs roughly 512 bytes
in the device tree so the new limit can cover up to 2048 CPU cores.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 94649d42

hw/ppc/spapr.c

+2 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
 *

 * We load our kernel at 4M, leaving space for SLOF initial image

 */

#define FDT_MAX_SIZE            0x40000

#define FDT_MAX_SIZE            0x100000

#define RTAS_MAX_SIZE           0x10000

#define RTAS_MAX_ADDR           0x80000000 /* RTAS must stay below that */

#define FW_MAX_SIZE             0x400000
@@ -86,8 +86,6 @@ 


#define TIMEBASE_FREQ           512000000ULL



#define MAX_CPUS                255



#define PHANDLE_XICP            0x00001111



#define HTAB_SIZE(spapr)        (1ULL << ((spapr)->htab_shift))
@@ -1859,7 +1857,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
    mc->init = ppc_spapr_init;

    mc->reset = ppc_spapr_reset;

    mc->block_default_type = IF_SCSI;

    mc->max_cpus = MAX_CPUS;

    mc->max_cpus = MAX_CPUMASK_BITS;

    mc->no_parallel = 1;

    mc->default_boot_order = "";

    mc->default_ram_size = 512 * M_BYTE;