Commit 93c86fff authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * monitor: fix query-cpu-model-expansion crash when using machine type none
 * Support emulation of the ARMv8.1-VHE architecture feature
 * bcm2835_dma: fix bugs in TD mode handling
 * docs/arm-cpu-features: Make kvm-no-adjvtime comment clearer
 * stellaris, stm32f2xx_timer, armv7m_systick: fix minor memory leaks

# gpg: Signature made Fri 07 Feb 2020 14:32:28 GMT
# 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-20200207: (48 commits)
  stellaris: delay timer_new to avoid memleaks
  stm32f2xx_timer: delay timer_new to avoid memleaks
  armv7m_systick: delay timer_new to avoid memleaks
  docs/arm-cpu-features: Make kvm-no-adjvtime comment clearer
  bcm2835_dma: Re-initialize xlen in TD mode
  bcm2835_dma: Fix the ylen loop in TD mode
  target/arm: Raise only one interrupt in arm_cpu_exec_interrupt
  target/arm: Use bool for unmasked in arm_excp_unmasked
  target/arm: Pass more cpu state to arm_excp_unmasked
  target/arm: Move arm_excp_unmasked to cpu.c
  target/arm: Enable ARMv8.1-VHE in -cpu max
  target/arm: Update arm_cpu_do_interrupt_aarch64 for VHE
  target/arm: Update get_a64_user_mem_index for VHE
  target/arm: check TGE and E2H flags for EL0 pauth traps
  target/arm: Update {fp,sve}_exception_el for VHE
  target/arm: Update arm_phys_excp_target_el for TGE
  target/arm: Flush tlbs for E2&0 translation regime
  target/arm: Flush tlb for ASID changes in EL2&0 translation regime
  target/arm: Add VHE timer register redirection and aliasing
  target/arm: Add VHE system register redirection and aliasing
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 42ccca1b af6c91b4

docs/arm-cpu-features.rst

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ the list of KVM VCPU features and their descriptions. 


  kvm-no-adjvtime          By default kvm-no-adjvtime is disabled.  This

                           means that by default the virtual time

                           adjustment is enabled (vtime is *not not*

                           adjustment is enabled (vtime is not *not*

                           adjusted).



                           When virtual time adjustment is enabled each

hw/arm/stellaris.c

+6 −1
Original line number Diff line number Diff line
@@ -347,11 +347,15 @@ static void stellaris_gptm_init(Object *obj) 
    sysbus_init_mmio(sbd, &s->iomem);



    s->opaque[0] = s->opaque[1] = s;

}



static void stellaris_gptm_realize(DeviceState *dev, Error **errp)

{

    gptm_state *s = STELLARIS_GPTM(dev);

    s->timer[0] = timer_new_ns(QEMU_CLOCK_VIRTUAL, gptm_tick, &s->opaque[0]);

    s->timer[1] = timer_new_ns(QEMU_CLOCK_VIRTUAL, gptm_tick, &s->opaque[1]);

}





/* System controller.  */



typedef struct {
@@ -1536,6 +1540,7 @@ static void stellaris_gptm_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->vmsd = &vmstate_stellaris_gptm;

    dc->realize = stellaris_gptm_realize;

}



static const TypeInfo stellaris_gptm_info = {

hw/dma/bcm2835_dma.c

+5 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
static void bcm2835_dma_update(BCM2835DMAState *s, unsigned c)

{

    BCM2835DMAChan *ch = &s->chan[c];

    uint32_t data, xlen, ylen;

    uint32_t data, xlen, xlen_td, ylen;

    int16_t dst_stride, src_stride;



    if (!(s->enable & (1 << c))) {
@@ -70,18 +70,19 @@ static void bcm2835_dma_update(BCM2835DMAState *s, unsigned c) 
        ch->stride = ldl_le_phys(&s->dma_as, ch->conblk_ad + 16);

        ch->nextconbk = ldl_le_phys(&s->dma_as, ch->conblk_ad + 20);



        ylen = 1;

        if (ch->ti & BCM2708_DMA_TDMODE) {

            /* 2D transfer mode */

            ylen = (ch->txfr_len >> 16) & 0x3fff;

            ylen += (ch->txfr_len >> 16) & 0x3fff;

            xlen = ch->txfr_len & 0xffff;

            dst_stride = ch->stride >> 16;

            src_stride = ch->stride & 0xffff;

        } else {

            ylen = 1;

            xlen = ch->txfr_len;

            dst_stride = 0;

            src_stride = 0;

        }

        xlen_td = xlen;



        while (ylen != 0) {

            /* Normal transfer mode */
@@ -117,6 +118,7 @@ static void bcm2835_dma_update(BCM2835DMAState *s, unsigned c) 
            if (--ylen != 0) {

                ch->source_ad += src_stride;

                ch->dest_ad += dst_stride;

                xlen = xlen_td;

            }

        }

        ch->cs |= BCM2708_DMA_END;

hw/timer/armv7m_systick.c

+6 −0
Original line number Diff line number Diff line
@@ -216,6 +216,11 @@ static void systick_instance_init(Object *obj) 
    memory_region_init_io(&s->iomem, obj, &systick_ops, s, "systick", 0xe0);

    sysbus_init_mmio(sbd, &s->iomem);

    sysbus_init_irq(sbd, &s->irq);

}



static void systick_realize(DeviceState *dev, Error **errp)

{

    SysTickState *s = SYSTICK(dev);

    s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, systick_timer_tick, s);

}
@@ -238,6 +243,7 @@ static void systick_class_init(ObjectClass *klass, void *data) 


    dc->vmsd = &vmstate_systick;

    dc->reset = systick_reset;

    dc->realize = systick_realize;

}



static const TypeInfo armv7m_systick_info = {

hw/timer/stm32f2xx_timer.c

+5 −0
Original line number Diff line number Diff line
@@ -314,7 +314,11 @@ static void stm32f2xx_timer_init(Object *obj) 
    memory_region_init_io(&s->iomem, obj, &stm32f2xx_timer_ops, s,

                          "stm32f2xx_timer", 0x400);

    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);

}



static void stm32f2xx_timer_realize(DeviceState *dev, Error **errp)

{

    STM32F2XXTimerState *s = STM32F2XXTIMER(dev);

    s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, stm32f2xx_timer_interrupt, s);

}
@@ -325,6 +329,7 @@ static void stm32f2xx_timer_class_init(ObjectClass *klass, void *data) 
    dc->reset = stm32f2xx_timer_reset;

    device_class_set_props(dc, stm32f2xx_timer_properties);

    dc->vmsd = &vmstate_stm32f2xx_timer;

    dc->realize = stm32f2xx_timer_realize;

}



static const TypeInfo stm32f2xx_timer_info = {