Commit 0d2fa03d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * arm_gicv3_kvm: fix migration of registers corresponding to
   IRQs 992 to 1020 in the KVM GIC
 * aspeed: remove ignore_memory_transaction_failures on all boards
 * aspeed: add support for the witherspoon-bmc board
 * aspeed: add an I2C RTC device and EEPROM I2C devices
 * aspeed: add the pc9552 chips to the witherspoon machine
 * ftgmac100: fix various bugs
 * hw/arm: Remove the deprecated xlnx-ep108 machine
 * hw/i2c: Add trace events
 * add missing '\n' on various qemu_log() logging strings
 * sdcard: clean up spec version support so we report the
   right spec version to the guest and only implement the
   commands that are supposed to be present in that version

# gpg: Signature made Fri 08 Jun 2018 13:36:37 BST
# gpg:                using RSA key 3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20180608: (31 commits)
  sdcard: Disable CMD19/CMD23 for Spec v2
  sdcard: Reflect when the Spec v3 is supported in the Config Register (SCR)
  sdcard: Disable SEND_IF_COND (CMD8) for Spec v1
  sdcard: Add a 'spec_version' property, default to Spec v2.00
  sdcard: Allow commands valid in SPI mode
  sdcard: Update the Configuration Register (SCR) to Spec Version 1.10
  target/xtensa: Add trailing '\n' to qemu_log() calls
  RISC-V: Add trailing '\n' to qemu_log() calls
  target/m68k: Add trailing '\n' to qemu_log() call
  target/arm: Add trailing '\n' to qemu_log() calls
  stellaris: Add trailing '\n' to qemu_log() calls
  hw/mips/boston: Add trailing '\n' to qemu_log() calls
  hw/core/register: Add trailing '\n' to qemu_log() call
  ppc/pnv: Add trailing '\n' to qemu_log() calls
  xilinx-dp: Add trailing '\n' to qemu_log() call
  hw/digic: Add trailing '\n' to qemu_log() calls
  hw/sd/milkymist-memcard: Add trailing '\n' to qemu_log() call
  hw/i2c: Add trace events
  hw/arm: Remove the deprecated xlnx-ep108 machine
  ftgmac100: remove check on runt messages
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ed6b018e 113f31c0

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ trace-events-subdirs += hw/char 
trace-events-subdirs += hw/display

trace-events-subdirs += hw/dma

trace-events-subdirs += hw/hppa

trace-events-subdirs += hw/i2c

trace-events-subdirs += hw/i386

trace-events-subdirs += hw/i386/xen

trace-events-subdirs += hw/ide

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ CONFIG_TSC2005=y 
CONFIG_LM832X=y

CONFIG_TMP105=y

CONFIG_TMP421=y

CONFIG_PCA9552=y

CONFIG_STELLARIS=y

CONFIG_STELLARIS_INPUT=y

CONFIG_STELLARIS_ENET=y

hw/arm/aspeed.c

+85 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "hw/arm/arm.h"

#include "hw/arm/aspeed_soc.h"

#include "hw/boards.h"

#include "hw/i2c/smbus.h"

#include "qemu/log.h"

#include "sysemu/block-backend.h"

#include "hw/loader.h"
@@ -45,6 +46,7 @@ enum { 
    PALMETTO_BMC,

    AST2500_EVB,

    ROMULUS_BMC,

    WITHERSPOON_BMC,

};



/* Palmetto hardware value: 0x120CE416 */
@@ -82,8 +84,13 @@ enum { 
        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



static void palmetto_bmc_i2c_init(AspeedBoardState *bmc);

static void ast2500_evb_i2c_init(AspeedBoardState *bmc);

static void romulus_bmc_i2c_init(AspeedBoardState *bmc);

static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc);



static const AspeedBoardConfig aspeed_boards[] = {

    [PALMETTO_BMC] = {
@@ -108,6 +115,15 @@ static const AspeedBoardConfig aspeed_boards[] = { 
        .fmc_model = "n25q256a",

        .spi_model = "mx66l1g45g",

        .num_cs    = 2,

        .i2c_init  = romulus_bmc_i2c_init,

    },

    [WITHERSPOON_BMC]  = {

        .soc_name  = "ast2500-a1",

        .hw_strap1 = WITHERSPOON_BMC_HW_STRAP1,

        .fmc_model = "mx25l25635e",

        .spi_model = "mx66l1g45g",

        .num_cs    = 2,

        .i2c_init  = witherspoon_bmc_i2c_init,

    },

};
@@ -248,11 +264,15 @@ static void palmetto_bmc_i2c_init(AspeedBoardState *bmc) 
{

    AspeedSoCState *soc = &bmc->soc;

    DeviceState *dev;

    uint8_t *eeprom_buf = g_malloc0(32 * 1024);



    /* The palmetto platform expects a ds3231 RTC but a ds1338 is

     * enough to provide basic RTC features. Alarms will be missing */

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



    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 0), 0x50,

                          eeprom_buf);



    /* add a TMP423 temperature sensor */

    dev = i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2),

                           "tmp423", 0x4c);
@@ -278,7 +298,6 @@ static void palmetto_bmc_class_init(ObjectClass *oc, void *data) 
    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->no_parallel = 1;

    mc->ignore_memory_transaction_failures = true;

}



static const TypeInfo palmetto_bmc_type = {
@@ -290,9 +309,17 @@ static const TypeInfo palmetto_bmc_type = { 
static void ast2500_evb_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;

    uint8_t *eeprom_buf = g_malloc0(8 * 1024);



    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), 0x50,

                          eeprom_buf);



    /* The AST2500 EVB expects a LM75 but a TMP105 is compatible */

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



    /* The AST2500 EVB does not have an RTC. Let's pretend that one is

     * plugged on the I2C bus header */

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

}



static void ast2500_evb_init(MachineState *machine)
@@ -311,7 +338,6 @@ static void ast2500_evb_class_init(ObjectClass *oc, void *data) 
    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->no_parallel = 1;

    mc->ignore_memory_transaction_failures = true;

}



static const TypeInfo ast2500_evb_type = {
@@ -320,6 +346,15 @@ static const TypeInfo ast2500_evb_type = { 
    .class_init = ast2500_evb_class_init,

};



static void romulus_bmc_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;



    /* The romulus board expects Epson RX8900 I2C RTC but a ds1338 is

     * good enough */

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

}



static void romulus_bmc_init(MachineState *machine)

{

    aspeed_board_init(machine, &aspeed_boards[ROMULUS_BMC]);
@@ -336,7 +371,6 @@ static void romulus_bmc_class_init(ObjectClass *oc, void *data) 
    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->no_parallel = 1;

    mc->ignore_memory_transaction_failures = true;

}



static const TypeInfo romulus_bmc_type = {
@@ -345,11 +379,59 @@ static const TypeInfo romulus_bmc_type = { 
    .class_init = romulus_bmc_class_init,

};



static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;

    uint8_t *eeprom_buf = g_malloc0(8 * 1024);



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



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

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



    /* The Witherspoon expects a TMP275 but a TMP105 is compatible */

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



    /* The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is

     * good enough */

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



    smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), 0x51,

                          eeprom_buf);

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

                     0x60);

}



static void witherspoon_bmc_init(MachineState *machine)

{

    aspeed_board_init(machine, &aspeed_boards[WITHERSPOON_BMC]);

}



static void witherspoon_bmc_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)";

    mc->init = witherspoon_bmc_init;

    mc->max_cpus = 1;

    mc->no_sdcard = 1;

    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->no_parallel = 1;

}



static const TypeInfo witherspoon_bmc_type = {

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

    .parent = TYPE_MACHINE,

    .class_init = witherspoon_bmc_class_init,

};



static void aspeed_machine_init(void)

{

    type_register_static(&palmetto_bmc_type);

    type_register_static(&ast2500_evb_type);

    type_register_static(&romulus_bmc_type);

    type_register_static(&witherspoon_bmc_type);

}



type_init(aspeed_machine_init)

hw/arm/stellaris.c

+6 −5
Original line number Diff line number Diff line
@@ -203,11 +203,11 @@ static uint64_t gptm_read(void *opaque, hwaddr offset, 
            return s->rtc;

        }

        qemu_log_mask(LOG_UNIMP,

                      "GPTM: read of TAR but timer read not supported");

                      "GPTM: read of TAR but timer read not supported\n");

        return 0;

    case 0x4c: /* TBR */

        qemu_log_mask(LOG_UNIMP,

                      "GPTM: read of TBR but timer read not supported");

                      "GPTM: read of TBR but timer read not supported\n");

        return 0;

    default:

        qemu_log_mask(LOG_GUEST_ERROR,
@@ -836,11 +836,12 @@ static void stellaris_i2c_write(void *opaque, hwaddr offset, 
        break;

    case 0x20: /* MCR */

        if (value & 1) {

            qemu_log_mask(LOG_UNIMP, "stellaris_i2c: Loopback not implemented");

            qemu_log_mask(LOG_UNIMP,

                          "stellaris_i2c: Loopback not implemented\n");

        }

        if (value & 0x20) {

            qemu_log_mask(LOG_UNIMP,

                          "stellaris_i2c: Slave mode not implemented");

                          "stellaris_i2c: Slave mode not implemented\n");

        }

        s->mcr = value & 0x31;

        break;
@@ -1124,7 +1125,7 @@ static void stellaris_adc_write(void *opaque, hwaddr offset, 
        s->sspri = value;

        break;

    case 0x28: /* PSSI */

        qemu_log_mask(LOG_UNIMP, "ADC: sample initiate unimplemented");

        qemu_log_mask(LOG_UNIMP, "ADC: sample initiate unimplemented\n");

        break;

    case 0x30: /* SAC */

        s->sac = value;

hw/arm/xlnx-zcu102.c

+2 −60
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ typedef struct XlnxZCU102 { 
#define ZCU102_MACHINE(obj) \

    OBJECT_CHECK(XlnxZCU102, (obj), TYPE_ZCU102_MACHINE)



#define TYPE_EP108_MACHINE   MACHINE_TYPE_NAME("xlnx-ep108")

#define EP108_MACHINE(obj) \

    OBJECT_CHECK(XlnxZCU102, (obj), TYPE_EP108_MACHINE)



static struct arm_boot_info xlnx_zcu102_binfo;



static bool zcu102_get_secure(Object *obj, Error **errp)
@@ -73,8 +69,9 @@ static void zcu102_set_virt(Object *obj, bool value, Error **errp) 
    s->virt = value;

}



static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine)

static void xlnx_zcu102_init(MachineState *machine)

{

    XlnxZCU102 *s = ZCU102_MACHINE(machine);

    int i;

    uint64_t ram_size = machine->ram_size;
@@ -183,60 +180,6 @@ static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine) 
    arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_zcu102_binfo);

}



static void xlnx_ep108_init(MachineState *machine)

{

    XlnxZCU102 *s = EP108_MACHINE(machine);



    if (!qtest_enabled()) {

        info_report("The Xilinx EP108 machine is deprecated, please use the "

                    "ZCU102 machine (which has the same features) instead.");

    }



    xlnx_zynqmp_init(s, machine);

}



static void xlnx_ep108_machine_instance_init(Object *obj)

{

    XlnxZCU102 *s = EP108_MACHINE(obj);



    /* EP108, we don't support setting secure or virt */

    s->secure = false;

    s->virt = false;

}



static void xlnx_ep108_machine_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);



    mc->desc = "Xilinx ZynqMP EP108 board (Deprecated, please use xlnx-zcu102)";

    mc->init = xlnx_ep108_init;

    mc->block_default_type = IF_IDE;

    mc->units_per_default_bus = 1;

    mc->ignore_memory_transaction_failures = true;

    mc->max_cpus = XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;

    mc->default_cpus = XLNX_ZYNQMP_NUM_APU_CPUS;

}



static const TypeInfo xlnx_ep108_machine_init_typeinfo = {

    .name       = MACHINE_TYPE_NAME("xlnx-ep108"),

    .parent     = TYPE_MACHINE,

    .class_init = xlnx_ep108_machine_class_init,

    .instance_init = xlnx_ep108_machine_instance_init,

    .instance_size = sizeof(XlnxZCU102),

};



static void xlnx_ep108_machine_init_register_types(void)

{

    type_register_static(&xlnx_ep108_machine_init_typeinfo);

}



static void xlnx_zcu102_init(MachineState *machine)

{

    XlnxZCU102 *s = ZCU102_MACHINE(machine);



    xlnx_zynqmp_init(s, machine);

}



static void xlnx_zcu102_machine_instance_init(Object *obj)

{

    XlnxZCU102 *s = ZCU102_MACHINE(obj);
@@ -289,4 +232,3 @@ static void xlnx_zcu102_machine_init_register_types(void) 
}



type_init(xlnx_zcu102_machine_init_register_types)
 
type_init(xlnx_ep108_machine_init_register_types)