max_cpus needs to be an upper bound on the number of vCPUs
initialized; otherwise TCG region initialization breaks.
Some boards initialize a hard-coded number of vCPUs, which is not
captured by the global max_cpus and therefore breaks TCG initialization.
Fix it by adding the .min_cpus field to machine_class.
This commit also changes some user-facing behaviour: we now die if
-smp is below this hard-coded vCPU minimum instead of silently
ignoring the passed -smp value (sometimes announcing this by printing
a warning). However, the introduction of .default_cpus lessens the
likelihood that users will notice this: if -smp isn't set, we now
assign the value in .default_cpus to both smp_cpus and max_cpus. IOW,
if a user does not set -smp, they always get a correct number of vCPUs.
This change fixes 3468b59 ("tcg: enable multiple TCG contexts in
softmmu", 2017-10-24), which broke TCG initialization for some
ARM boards.
Fixes: 3468b59e18b179bc63c7ce934de912dfa9596122
Reported-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Message-id: 1510343626-25861-6-git-send-email-cota@braap.org
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
	
			
		
			
				
	
	
		
			176 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			176 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Raspberry Pi emulation (c) 2012 Gregory Estrade
 | 
						|
 * Upstreaming code cleanup [including bcm2835_*] (c) 2013 Jan Petrous
 | 
						|
 *
 | 
						|
 * Rasperry Pi 2 emulation Copyright (c) 2015, Microsoft
 | 
						|
 * Written by Andrew Baumann
 | 
						|
 *
 | 
						|
 * This code is licensed under the GNU GPLv2 and later.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "qemu-common.h"
 | 
						|
#include "cpu.h"
 | 
						|
#include "hw/arm/bcm2836.h"
 | 
						|
#include "qemu/error-report.h"
 | 
						|
#include "hw/boards.h"
 | 
						|
#include "hw/loader.h"
 | 
						|
#include "hw/arm/arm.h"
 | 
						|
#include "sysemu/sysemu.h"
 | 
						|
 | 
						|
#define SMPBOOT_ADDR    0x300 /* this should leave enough space for ATAGS */
 | 
						|
#define MVBAR_ADDR      0x400 /* secure vectors */
 | 
						|
#define BOARDSETUP_ADDR (MVBAR_ADDR + 0x20) /* board setup code */
 | 
						|
#define FIRMWARE_ADDR   0x8000 /* Pi loads kernel.img here by default */
 | 
						|
 | 
						|
/* Table of Linux board IDs for different Pi versions */
 | 
						|
static const int raspi_boardid[] = {[1] = 0xc42, [2] = 0xc43};
 | 
						|
 | 
						|
typedef struct RasPiState {
 | 
						|
    BCM2836State soc;
 | 
						|
    MemoryRegion ram;
 | 
						|
} RasPiState;
 | 
						|
 | 
						|
static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info)
 | 
						|
{
 | 
						|
    static const uint32_t smpboot[] = {
 | 
						|
        0xe1a0e00f, /*    mov     lr, pc */
 | 
						|
        0xe3a0fe00 + (BOARDSETUP_ADDR >> 4), /* mov pc, BOARDSETUP_ADDR */
 | 
						|
        0xee100fb0, /*    mrc     p15, 0, r0, c0, c0, 5;get core ID */
 | 
						|
        0xe7e10050, /*    ubfx    r0, r0, #0, #2       ;extract LSB */
 | 
						|
        0xe59f5014, /*    ldr     r5, =0x400000CC      ;load mbox base */
 | 
						|
        0xe320f001, /* 1: yield */
 | 
						|
        0xe7953200, /*    ldr     r3, [r5, r0, lsl #4] ;read mbox for our core*/
 | 
						|
        0xe3530000, /*    cmp     r3, #0               ;spin while zero */
 | 
						|
        0x0afffffb, /*    beq     1b */
 | 
						|
        0xe7853200, /*    str     r3, [r5, r0, lsl #4] ;clear mbox */
 | 
						|
        0xe12fff13, /*    bx      r3                   ;jump to target */
 | 
						|
        0x400000cc, /* (constant: mailbox 3 read/clear base) */
 | 
						|
    };
 | 
						|
 | 
						|
    /* check that we don't overrun board setup vectors */
 | 
						|
    QEMU_BUILD_BUG_ON(SMPBOOT_ADDR + sizeof(smpboot) > MVBAR_ADDR);
 | 
						|
    /* check that board setup address is correctly relocated */
 | 
						|
    QEMU_BUILD_BUG_ON((BOARDSETUP_ADDR & 0xf) != 0
 | 
						|
                      || (BOARDSETUP_ADDR >> 4) >= 0x100);
 | 
						|
 | 
						|
    rom_add_blob_fixed("raspi_smpboot", smpboot, sizeof(smpboot),
 | 
						|
                       info->smp_loader_start);
 | 
						|
}
 | 
						|
 | 
						|
static void write_board_setup(ARMCPU *cpu, const struct arm_boot_info *info)
 | 
						|
{
 | 
						|
    arm_write_secure_board_setup_dummy_smc(cpu, info, MVBAR_ADDR);
 | 
						|
}
 | 
						|
 | 
						|
static void reset_secondary(ARMCPU *cpu, const struct arm_boot_info *info)
 | 
						|
{
 | 
						|
    CPUState *cs = CPU(cpu);
 | 
						|
    cpu_set_pc(cs, info->smp_loader_start);
 | 
						|
}
 | 
						|
 | 
						|
static void setup_boot(MachineState *machine, int version, size_t ram_size)
 | 
						|
{
 | 
						|
    static struct arm_boot_info binfo;
 | 
						|
    int r;
 | 
						|
 | 
						|
    binfo.board_id = raspi_boardid[version];
 | 
						|
    binfo.ram_size = ram_size;
 | 
						|
    binfo.nb_cpus = smp_cpus;
 | 
						|
    binfo.board_setup_addr = BOARDSETUP_ADDR;
 | 
						|
    binfo.write_board_setup = write_board_setup;
 | 
						|
    binfo.secure_board_setup = true;
 | 
						|
    binfo.secure_boot = true;
 | 
						|
 | 
						|
    /* Pi2 requires SMP setup */
 | 
						|
    if (version == 2) {
 | 
						|
        binfo.smp_loader_start = SMPBOOT_ADDR;
 | 
						|
        binfo.write_secondary_boot = write_smpboot;
 | 
						|
        binfo.secondary_cpu_reset_hook = reset_secondary;
 | 
						|
    }
 | 
						|
 | 
						|
    /* If the user specified a "firmware" image (e.g. UEFI), we bypass
 | 
						|
     * the normal Linux boot process
 | 
						|
     */
 | 
						|
    if (machine->firmware) {
 | 
						|
        /* load the firmware image (typically kernel.img) */
 | 
						|
        r = load_image_targphys(machine->firmware, FIRMWARE_ADDR,
 | 
						|
                                ram_size - FIRMWARE_ADDR);
 | 
						|
        if (r < 0) {
 | 
						|
            error_report("Failed to load firmware from %s", machine->firmware);
 | 
						|
            exit(1);
 | 
						|
        }
 | 
						|
 | 
						|
        binfo.entry = FIRMWARE_ADDR;
 | 
						|
        binfo.firmware_loaded = true;
 | 
						|
    } else {
 | 
						|
        binfo.kernel_filename = machine->kernel_filename;
 | 
						|
        binfo.kernel_cmdline = machine->kernel_cmdline;
 | 
						|
        binfo.initrd_filename = machine->initrd_filename;
 | 
						|
    }
 | 
						|
 | 
						|
    arm_load_kernel(ARM_CPU(first_cpu), &binfo);
 | 
						|
}
 | 
						|
 | 
						|
static void raspi2_init(MachineState *machine)
 | 
						|
{
 | 
						|
    RasPiState *s = g_new0(RasPiState, 1);
 | 
						|
    uint32_t vcram_size;
 | 
						|
    DriveInfo *di;
 | 
						|
    BlockBackend *blk;
 | 
						|
    BusState *bus;
 | 
						|
    DeviceState *carddev;
 | 
						|
 | 
						|
    object_initialize(&s->soc, sizeof(s->soc), TYPE_BCM2836);
 | 
						|
    object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),
 | 
						|
                              &error_abort);
 | 
						|
 | 
						|
    /* Allocate and map RAM */
 | 
						|
    memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram",
 | 
						|
                                         machine->ram_size);
 | 
						|
    /* FIXME: Remove when we have custom CPU address space support */
 | 
						|
    memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0);
 | 
						|
 | 
						|
    /* Setup the SOC */
 | 
						|
    object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),
 | 
						|
                                   &error_abort);
 | 
						|
    object_property_set_int(OBJECT(&s->soc), smp_cpus, "enabled-cpus",
 | 
						|
                            &error_abort);
 | 
						|
    object_property_set_int(OBJECT(&s->soc), 0xa21041, "board-rev",
 | 
						|
                            &error_abort);
 | 
						|
    object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort);
 | 
						|
 | 
						|
    /* Create and plug in the SD cards */
 | 
						|
    di = drive_get_next(IF_SD);
 | 
						|
    blk = di ? blk_by_legacy_dinfo(di) : NULL;
 | 
						|
    bus = qdev_get_child_bus(DEVICE(&s->soc), "sd-bus");
 | 
						|
    if (bus == NULL) {
 | 
						|
        error_report("No SD bus found in SOC object");
 | 
						|
        exit(1);
 | 
						|
    }
 | 
						|
    carddev = qdev_create(bus, TYPE_SD_CARD);
 | 
						|
    qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);
 | 
						|
    object_property_set_bool(OBJECT(carddev), true, "realized", &error_fatal);
 | 
						|
 | 
						|
    vcram_size = object_property_get_uint(OBJECT(&s->soc), "vcram-size",
 | 
						|
                                          &error_abort);
 | 
						|
    setup_boot(machine, 2, machine->ram_size - vcram_size);
 | 
						|
}
 | 
						|
 | 
						|
static void raspi2_machine_init(MachineClass *mc)
 | 
						|
{
 | 
						|
    mc->desc = "Raspberry Pi 2";
 | 
						|
    mc->init = raspi2_init;
 | 
						|
    mc->block_default_type = IF_SD;
 | 
						|
    mc->no_parallel = 1;
 | 
						|
    mc->no_floppy = 1;
 | 
						|
    mc->no_cdrom = 1;
 | 
						|
    mc->max_cpus = BCM2836_NCPUS;
 | 
						|
    mc->min_cpus = BCM2836_NCPUS;
 | 
						|
    mc->default_cpus = BCM2836_NCPUS;
 | 
						|
    mc->default_ram_size = 1024 * 1024 * 1024;
 | 
						|
    mc->ignore_memory_transaction_failures = true;
 | 
						|
};
 | 
						|
DEFINE_MACHINE("raspi2", raspi2_machine_init)
 |