Commit 14fccfa9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160513' into staging 



MIPS patches 2016-05-13

Changes:
* fix zeroing CP0.WatchLo registers in soft reset
* QOMify Jazz led

# gpg: Signature made Fri 13 May 2016 11:04:04 BST using RSA key ID 0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"

* remotes/lalrae/tags/mips-20160513:
  hw/display: QOM'ify jazz_led.c
  target-mips: fix call to memset in soft reset code

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 20c20318 7fe91a5b

hw/display/jazz_led.c

+11 −7
Original line number Diff line number Diff line
@@ -267,16 +267,20 @@ static const GraphicHwOps jazz_led_ops = { 
    .text_update = jazz_led_text_update,

};



static int jazz_led_init(SysBusDevice *dev)

static void jazz_led_init(Object *obj)

{

    LedState *s = JAZZ_LED(dev);

    LedState *s = JAZZ_LED(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1);

    memory_region_init_io(&s->iomem, obj, &led_ops, s, "led", 1);

    sysbus_init_mmio(dev, &s->iomem);

}



    s->con = graphic_console_init(DEVICE(dev), 0, &jazz_led_ops, s);

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

{

    LedState *s = JAZZ_LED(dev);



    return 0;

    s->con = graphic_console_init(dev, 0, &jazz_led_ops, s);

}



static void jazz_led_reset(DeviceState *d)
@@ -291,18 +295,18 @@ static void jazz_led_reset(DeviceState *d) 
static void jazz_led_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = jazz_led_init;

    dc->desc = "Jazz LED display",

    dc->vmsd = &vmstate_jazz_led;

    dc->reset = jazz_led_reset;

    dc->realize = jazz_led_realize;

}



static const TypeInfo jazz_led_info = {

    .name          = TYPE_JAZZ_LED,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(LedState),

    .instance_init = jazz_led_init,

    .class_init    = jazz_led_class_init,

};

target-mips/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ void mips_cpu_do_interrupt(CPUState *cs) 
        break;

    case EXCP_SRESET:

        env->CP0_Status |= (1 << CP0St_SR);

        memset(env->CP0_WatchLo, 0, sizeof(*env->CP0_WatchLo));

        memset(env->CP0_WatchLo, 0, sizeof(env->CP0_WatchLo));

        goto set_error_EPC;

    case EXCP_NMI:

        env->CP0_Status |= (1 << CP0St_NMI);