Commit 0e1cd657 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by Paolo Bonzini
Browse files

sun4m: fix slavio sysctrl and led register sizes 



These were being incorrectly declared as MISC_SIZE (1 byte) rather than
4 bytes and 2 bytes respectively. As a result accesses clamped to the
real register size would unexpectedly fail.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1427987370-15897-1-git-send-email-mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 339240b5

hw/misc/slavio_misc.c

+3 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ typedef struct APCState { 
} APCState;



#define MISC_SIZE 1

#define LED_SIZE 2

#define SYSCTRL_SIZE 4



#define AUX1_TC        0x02
@@ -452,13 +453,13 @@ static int slavio_misc_init1(SysBusDevice *sbd) 
    /* 16 bit registers */

    /* ss600mp diag LEDs */

    memory_region_init_io(&s->led_iomem, OBJECT(s), &slavio_led_mem_ops, s,

                          "leds", MISC_SIZE);

                          "leds", LED_SIZE);

    sysbus_init_mmio(sbd, &s->led_iomem);



    /* 32 bit registers */

    /* System control */

    memory_region_init_io(&s->sysctrl_iomem, OBJECT(s), &slavio_sysctrl_mem_ops, s,

                          "system-control", MISC_SIZE);

                          "system-control", SYSCTRL_SIZE);

    sysbus_init_mmio(sbd, &s->sysctrl_iomem);



    /* AUX 1 (Misc System Functions) */