Commit 5f49d73c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * hw/arm: Silence xlnx-ep108 deprecation warning during tests
 * hw/arm/aspeed: Unlock SCU when running kernel
 * arm: check regime, not current state, for ATS write PAR format
 * nvic: Fix ARMv7M MPU_RBAR reads
 * target/arm: Report GICv3 sysregs present in ID registers if needed

# gpg: Signature made Mon 20 Nov 2017 17:35:25 GMT
# gpg:                using RSA key 0x3C2525ED14360CDE
# 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-20171120:
  hw/arm: Silence xlnx-ep108 deprecation warning during tests
  hw/arm/aspeed: Unlock SCU when running kernel
  arm: check regime, not current state, for ATS write PAR format
  nvic: Fix ARMv7M MPU_RBAR reads
  target/arm: Report GICv3 sysregs present in ID registers if needed

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3da87f77 b350ae13

hw/arm/aspeed.c

+9 −0
Original line number Diff line number Diff line
@@ -186,6 +186,15 @@ static void aspeed_board_init(MachineState *machine, 
                            &error_abort);

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

                            &error_abort);

    if (machine->kernel_filename) {

        /*

         * When booting with a -kernel command line there is no u-boot

         * that runs to unlock the SCU. In this case set the default to

         * be unlocked as the kernel expects

         */

        object_property_set_int(OBJECT(&bmc->soc), ASPEED_SCU_PROT_KEY,

                                "hw-prot-key", &error_abort);

    }

    object_property_set_bool(OBJECT(&bmc->soc), true, "realized",

                             &error_abort);

hw/arm/aspeed_soc.c

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ static void aspeed_soc_init(Object *obj) 
                              "hw-strap1", &error_abort);

    object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu),

                              "hw-strap2", &error_abort);

    object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu),

                              "hw-prot-key", &error_abort);



    object_initialize(&s->fmc, sizeof(s->fmc), sc->info->fmc_typename);

    object_property_add_child(obj, "fmc", OBJECT(&s->fmc), NULL);

hw/arm/xlnx-zcu102.c

+5 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "qemu/error-report.h"

#include "exec/address-spaces.h"

#include "qemu/log.h"

#include "sysemu/qtest.h"



typedef struct XlnxZCU102 {

    MachineState parent_obj;
@@ -164,8 +165,10 @@ 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 instead. It has the same features supported.");

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

    }



    xlnx_zynqmp_init(s, machine);

}

hw/intc/armv7m_nvic.c

+1 −1
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ static uint32_t nvic_readl(NVICState *s, uint32_t offset, MemTxAttrs attrs) 
        if (region >= cpu->pmsav7_dregion) {

            return 0;

        }

        return (cpu->env.pmsav7.drbar[region] & 0x1f) | (region & 0xf);

        return (cpu->env.pmsav7.drbar[region] & ~0x1f) | (region & 0xf);

    }

    case 0xda0: /* MPU_RASR (v7M), MPU_RLAR (v8M) */

    case 0xda8: /* MPU_RASR_A1 (v7M), MPU_RLAR_A1 (v8M) */

hw/misc/aspeed_scu.c

+3 −2
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
#define BMC_REV              TO_REG(0x19C)

#define BMC_DEV_ID           TO_REG(0x1A4)



#define PROT_KEY_UNLOCK 0x1688A8A8

#define SCU_IO_REGION_SIZE 0x1000



static const uint32_t ast2400_a0_resets[ASPEED_SCU_NR_REGS] = {
@@ -192,7 +191,7 @@ static void aspeed_scu_write(void *opaque, hwaddr offset, uint64_t data, 
    }



    if (reg > PROT_KEY && reg < CPU2_BASE_SEG1 &&

            s->regs[PROT_KEY] != PROT_KEY_UNLOCK) {

            s->regs[PROT_KEY] != ASPEED_SCU_PROT_KEY) {

        qemu_log_mask(LOG_GUEST_ERROR, "%s: SCU is locked!\n", __func__);

        return;

    }
@@ -246,6 +245,7 @@ static void aspeed_scu_reset(DeviceState *dev) 
    s->regs[SILICON_REV] = s->silicon_rev;

    s->regs[HW_STRAP1] = s->hw_strap1;

    s->regs[HW_STRAP2] = s->hw_strap2;

    s->regs[PROT_KEY] = s->hw_prot_key;

}



static uint32_t aspeed_silicon_revs[] = {
@@ -299,6 +299,7 @@ static Property aspeed_scu_properties[] = { 
    DEFINE_PROP_UINT32("silicon-rev", AspeedSCUState, silicon_rev, 0),

    DEFINE_PROP_UINT32("hw-strap1", AspeedSCUState, hw_strap1, 0),

    DEFINE_PROP_UINT32("hw-strap2", AspeedSCUState, hw_strap2, 0),

    DEFINE_PROP_UINT32("hw-prot-key", AspeedSCUState, hw_prot_key, 0),

    DEFINE_PROP_END_OF_LIST(),

};