Commit c4e42a9c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190701' into staging 



target-arm queue:
 * hw/arm/boot: fix direct kernel boot with initrd
 * hw/arm/msf2-som: Exit when the cpu is not the expected one
 * i.mx7: fix bugs in PCI controller needed to boot recent kernels
 * aspeed: add RTC device
 * aspeed: fix some timer device bugs
 * aspeed: add swift-bmc board
 * aspeed: vic: Add support for legacy register interface
 * aspeed: add aspeed-xdma device
 * Add new sbsa-ref board for aarch64
 * target/arm: code refactoring in preparation for support of
   compilation with TCG disabled

# gpg: Signature made Mon 01 Jul 2019 17:38:10 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20190701: (46 commits)
  target/arm: Declare some M-profile functions publicly
  target/arm: Declare arm_log_exception() function publicly
  target/arm: Restrict PSCI to TCG
  target/arm/vfp_helper: Restrict the SoftFloat use to TCG
  target/arm/vfp_helper: Extract vfp_set_fpscr_from_host()
  target/arm/vfp_helper: Extract vfp_set_fpscr_to_host()
  target/arm/vfp_helper: Move code around
  target/arm: Move TLB related routines to tlb_helper.c
  target/arm: Declare get_phys_addr() function publicly
  target/arm: Move CPU state dumping routines to cpu.c
  target/arm: Move the DC ZVA helper into op_helper
  target/arm: Fix coding style issues
  target/arm: Fix multiline comment syntax
  target/arm/helper: Remove unused include
  target/arm: Add copyright boilerplate
  target/arm: Makefile cleanup (softmmu)
  target/arm: Makefile cleanup (KVM)
  target/arm: Makefile cleanup (ARM)
  target/arm: Makefile cleanup (Aarch64)
  hw/arm: Add arm SBSA reference machine, devices part
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d247c8e7 787a7e76

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -730,6 +730,14 @@ F: include/hw/arm/fsl-imx6.h 
F: include/hw/misc/imx6_*.h

F: include/hw/ssi/imx_spi.h



SBSA-REF

M: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>

M: Peter Maydell <peter.maydell@linaro.org>

R: Leif Lindholm <leif.lindholm@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/sbsa-ref.c



Sharp SL-5500 (Collie) PDA

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

default-configs/aarch64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ include arm-softmmu.mak 


CONFIG_XLNX_ZYNQMP_ARM=y

CONFIG_XLNX_VERSAL=y

CONFIG_SBSA_REF=y

hw/arm/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -184,6 +184,20 @@ config REALVIEW 
    select DS1338 # I2C RTC+NVRAM

    select USB_OHCI



config SBSA_REF

    bool

    imply PCI_DEVICES

    select AHCI

    select ARM_SMMUV3

    select GPIO_KEY

    select PCI_EXPRESS

    select PCI_EXPRESS_GENERIC_BRIDGE

    select PFLASH_CFI01

    select PL011 # UART

    select PL031 # RTC

    select PL061 # GPIO

    select USB_EHCI_SYSBUS



config SABRELITE

    bool

    select FSL_IMX6

hw/arm/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-$(CONFIG_SPITZ) += spitz.o 
obj-$(CONFIG_TOSA) += tosa.o

obj-$(CONFIG_Z2) += z2.o

obj-$(CONFIG_REALVIEW) += realview.o

obj-$(CONFIG_SBSA_REF) += sbsa-ref.o

obj-$(CONFIG_STELLARIS) += stellaris.o

obj-$(CONFIG_COLLIE) += collie.o

obj-$(CONFIG_VERSATILE) += versatilepb.o

hw/arm/aspeed.c

+66 −10
Original line number Diff line number Diff line
@@ -22,17 +22,18 @@ 
#include "hw/misc/tmp105.h"

#include "qemu/log.h"

#include "sysemu/block-backend.h"

#include "sysemu/sysemu.h"

#include "hw/loader.h"

#include "qemu/error-report.h"

#include "qemu/units.h"



static struct arm_boot_info aspeed_board_binfo = {

    .board_id = -1, /* device-tree-only board */

    .nb_cpus = 1,

};



struct AspeedBoardState {

    AspeedSoCState soc;

    MemoryRegion ram_container;

    MemoryRegion ram;

    MemoryRegion max_ram;

};
@@ -72,6 +73,17 @@ struct AspeedBoardState { 
        SCU_AST2500_HW_STRAP_ACPI_ENABLE |                              \

        SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))



/* Swift hardware value: 0xF11AD206 */

#define SWIFT_BMC_HW_STRAP1 (                                           \

        AST2500_HW_STRAP1_DEFAULTS |                                    \

        SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE |                     \

        SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE |                        \

        SCU_AST2500_HW_STRAP_UART_DEBUG |                               \

        SCU_AST2500_HW_STRAP_DDR4_ENABLE |                              \

        SCU_H_PLL_BYPASS_EN |                                           \

        SCU_AST2500_HW_STRAP_ACPI_ENABLE |                              \

        SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))



/* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */

#define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1
@@ -159,6 +171,10 @@ static void aspeed_board_init(MachineState *machine, 
    ram_addr_t max_ram_size;



    bmc = g_new0(AspeedBoardState, 1);



    memory_region_init(&bmc->ram_container, NULL, "aspeed-ram-container",

                       UINT32_MAX);



    object_initialize_child(OBJECT(machine), "soc", &bmc->soc,

                            (sizeof(bmc->soc)), cfg->soc_name, &error_abort,

                            NULL);
@@ -171,6 +187,8 @@ static void aspeed_board_init(MachineState *machine, 
                            &error_abort);

    object_property_set_int(OBJECT(&bmc->soc), cfg->num_cs, "num-cs",

                            &error_abort);

    object_property_set_int(OBJECT(&bmc->soc), smp_cpus, "num-cpus",

                            &error_abort);

    if (machine->kernel_filename) {

        /*

         * When booting with a -kernel command line there is no u-boot
@@ -191,18 +209,16 @@ static void aspeed_board_init(MachineState *machine, 
                                        &error_abort);



    memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_size);

    memory_region_add_subregion(get_system_memory(), sc->info->sdram_base,

                                &bmc->ram);

    object_property_add_const_link(OBJECT(&bmc->soc), "ram", OBJECT(&bmc->ram),

                                   &error_abort);

    memory_region_add_subregion(&bmc->ram_container, 0, &bmc->ram);

    memory_region_add_subregion(get_system_memory(),

                                sc->info->memmap[ASPEED_SDRAM],

                                &bmc->ram_container);



    max_ram_size = object_property_get_uint(OBJECT(&bmc->soc), "max-ram-size",

                                            &error_abort);

    memory_region_init_io(&bmc->max_ram, NULL, &max_ram_ops, NULL,

                          "max_ram", max_ram_size  - ram_size);

    memory_region_add_subregion(get_system_memory(),

                                sc->info->sdram_base + ram_size,

                                &bmc->max_ram);

    memory_region_add_subregion(&bmc->ram_container, ram_size, &bmc->max_ram);



    aspeed_board_init_flashes(&bmc->soc.fmc, cfg->fmc_model, &error_abort);

    aspeed_board_init_flashes(&bmc->soc.spi[0], cfg->spi_model, &error_abort);
@@ -229,7 +245,8 @@ static void aspeed_board_init(MachineState *machine, 
    aspeed_board_binfo.initrd_filename = machine->initrd_filename;

    aspeed_board_binfo.kernel_cmdline = machine->kernel_cmdline;

    aspeed_board_binfo.ram_size = ram_size;

    aspeed_board_binfo.loader_start = sc->info->sdram_base;

    aspeed_board_binfo.loader_start = sc->info->memmap[ASPEED_SDRAM];

    aspeed_board_binfo.nb_cpus = bmc->soc.num_cpus;



    if (cfg->i2c_init) {

        cfg->i2c_init(bmc);
@@ -286,6 +303,35 @@ static void romulus_bmc_i2c_init(AspeedBoardState *bmc) 
    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), "ds1338", 0x32);

}



static void swift_bmc_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), "pca9552", 0x60);



    /* The swift board expects a TMP275 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7), "tmp105", 0x48);

    /* The swift board expects a pca9551 but a pca9552 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7), "pca9552", 0x60);



    /* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "ds1338", 0x32);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "pca9552", 0x60);



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), "tmp423", 0x4c);

    /* The swift board expects a pca9539 but a pca9552 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), "pca9552", 0x74);



    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 10), "tmp423", 0x4c);

    /* The swift board expects a pca9539 but a pca9552 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 10), "pca9552",

                     0x74);



    /* The swift board expects a TMP275 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", 0x48);

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", 0x4a);

}



static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;
@@ -326,7 +372,7 @@ static void aspeed_machine_class_init(ObjectClass *oc, void *data) 


    mc->desc = board->desc;

    mc->init = aspeed_machine_init;

    mc->max_cpus = 1;

    mc->max_cpus = ASPEED_CPUS_NUM;

    mc->no_sdcard = 1;

    mc->no_floppy = 1;

    mc->no_cdrom = 1;
@@ -376,6 +422,16 @@ static const AspeedBoardConfig aspeed_boards[] = { 
        .num_cs    = 2,

        .i2c_init  = romulus_bmc_i2c_init,

        .ram       = 512 * MiB,

    }, {

        .name      = MACHINE_TYPE_NAME("swift-bmc"),

        .desc      = "OpenPOWER Swift BMC (ARM1176)",

        .soc_name  = "ast2500-a1",

        .hw_strap1 = SWIFT_BMC_HW_STRAP1,

        .fmc_model = "mx66l1g45g",

        .spi_model = "mx66l1g45g",

        .num_cs    = 2,

        .i2c_init  = swift_bmc_i2c_init,

        .ram       = 512 * MiB,

    }, {

        .name      = MACHINE_TYPE_NAME("witherspoon-bmc"),

        .desc      = "OpenPOWER Witherspoon BMC (ARM1176)",