Commit 2582cfa0 authored by Blue Swirl's avatar Blue Swirl
Browse files

Sparc32: convert slavio_misc to qdev 



Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 325f2747

hw/slavio_misc.c

+132 −53
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ 
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */

#include "hw.h"



#include "sun4m.h"

#include "sysemu.h"

#include "sysbus.h"



/* debug misc */

//#define DEBUG_MISC
@@ -44,16 +45,21 @@ 
#endif



typedef struct MiscState {

    SysBusDevice busdev;

    qemu_irq irq;

    uint8_t config;

    uint8_t aux1, aux2;

    uint8_t diag, mctrl;

    uint32_t sysctrl;

    uint16_t leds;

    qemu_irq cpu_halt;

    qemu_irq fdc_tc;

} MiscState;



typedef struct APCState {

    SysBusDevice busdev;

    qemu_irq cpu_halt;

} APCState;



#define MISC_SIZE 1

#define SYSCTRL_SIZE 4
@@ -283,7 +289,7 @@ static CPUWriteMemoryFunc *slavio_aux2_mem_write[3] = { 


static void apc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)

{

    MiscState *s = opaque;

    APCState *s = opaque;



    MISC_DPRINTF("Write power management %2.2x\n", val & 0xff);

    qemu_irq_raise(s->cpu_halt);
@@ -434,75 +440,148 @@ static int slavio_misc_load(QEMUFile *f, void *opaque, int version_id) 
    return 0;

}



void *slavio_misc_init(target_phys_addr_t base, target_phys_addr_t power_base,

void *slavio_misc_init(target_phys_addr_t base,

                       target_phys_addr_t aux1_base,

                       target_phys_addr_t aux2_base, qemu_irq irq,

                       qemu_irq cpu_halt, qemu_irq **fdc_tc)

                       qemu_irq fdc_tc)

{

    int io;

    MiscState *s;



    s = qemu_mallocz(sizeof(MiscState));

    DeviceState *dev;

    SysBusDevice *s;

    MiscState *d;



    dev = qdev_create(NULL, "slavio_misc");

    qdev_init(dev);

    s = sysbus_from_qdev(dev);

    if (base) {

        /* 8 bit registers */

        /* Slavio control */

        sysbus_mmio_map(s, 0, base + MISC_CFG);

        /* Diagnostics */

        sysbus_mmio_map(s, 1, base + MISC_DIAG);

        /* Modem control */

        sysbus_mmio_map(s, 2, base + MISC_MDM);

        /* 16 bit registers */

        /* ss600mp diag LEDs */

        sysbus_mmio_map(s, 3, base + MISC_LEDS);

        /* 32 bit registers */

        /* System control */

        sysbus_mmio_map(s, 4, base + MISC_SYS);

    }

    if (aux1_base) {

        /* AUX 1 (Misc System Functions) */

        sysbus_mmio_map(s, 5, aux1_base);

    }

    if (aux2_base) {

        /* AUX 2 (Software Powerdown Control) */

        sysbus_mmio_map(s, 6, aux2_base);

    }

    sysbus_connect_irq(s, 0, irq);

    sysbus_connect_irq(s, 1, fdc_tc);



    d = FROM_SYSBUS(MiscState, s);



    return d;

}



static void apc_init1(SysBusDevice *dev)

{

    APCState *s = FROM_SYSBUS(APCState, dev);

    int io;



    sysbus_init_irq(dev, &s->cpu_halt);



    /* Power management (APC) XXX: not a Slavio device */

    io = cpu_register_io_memory(apc_mem_read, apc_mem_write, s);

    sysbus_init_mmio(dev, MISC_SIZE, io);

}



void apc_init(target_phys_addr_t power_base, qemu_irq cpu_halt)

{

    DeviceState *dev;

    SysBusDevice *s;



        // Slavio control

    dev = qdev_create(NULL, "apc");

    qdev_init(dev);

    s = sysbus_from_qdev(dev);

    /* Power management (APC) XXX: not a Slavio device */

    sysbus_mmio_map(s, 0, power_base);

    sysbus_connect_irq(s, 0, cpu_halt);

}



static void slavio_misc_init1(SysBusDevice *dev)

{

    MiscState *s = FROM_SYSBUS(MiscState, dev);

    int io;



    sysbus_init_irq(dev, &s->irq);

    sysbus_init_irq(dev, &s->fdc_tc);



    /* 8 bit registers */

    /* Slavio control */

    io = cpu_register_io_memory(slavio_cfg_mem_read,

                                slavio_cfg_mem_write, s);

        cpu_register_physical_memory(base + MISC_CFG, MISC_SIZE, io);

    sysbus_init_mmio(dev, MISC_SIZE, io);



        // Diagnostics

    /* Diagnostics */

    io = cpu_register_io_memory(slavio_diag_mem_read,

                                slavio_diag_mem_write, s);

        cpu_register_physical_memory(base + MISC_DIAG, MISC_SIZE, io);

    sysbus_init_mmio(dev, MISC_SIZE, io);



        // Modem control

    /* Modem control */

    io = cpu_register_io_memory(slavio_mdm_mem_read,

                                slavio_mdm_mem_write, s);

        cpu_register_physical_memory(base + MISC_MDM, MISC_SIZE, io);

    sysbus_init_mmio(dev, MISC_SIZE, io);



    /* 16 bit registers */

    /* ss600mp diag LEDs */

    io = cpu_register_io_memory(slavio_led_mem_read,

                                slavio_led_mem_write, s);

        /* ss600mp diag LEDs */

        cpu_register_physical_memory(base + MISC_LEDS, MISC_SIZE, io);

    sysbus_init_mmio(dev, MISC_SIZE, io);



    /* 32 bit registers */

    /* System control */

    io = cpu_register_io_memory(slavio_sysctrl_mem_read,

                                slavio_sysctrl_mem_write, s);

        // System control

        cpu_register_physical_memory(base + MISC_SYS, SYSCTRL_SIZE, io);

    }

    sysbus_init_mmio(dev, SYSCTRL_SIZE, io);



    // AUX 1 (Misc System Functions)

    if (aux1_base) {

    /* AUX 1 (Misc System Functions) */

    io = cpu_register_io_memory(slavio_aux1_mem_read,

                                slavio_aux1_mem_write, s);

        cpu_register_physical_memory(aux1_base, MISC_SIZE, io);

    }

    sysbus_init_mmio(dev, MISC_SIZE, io);



    // AUX 2 (Software Powerdown Control)

    if (aux2_base) {

    /* AUX 2 (Software Powerdown Control) */

    io = cpu_register_io_memory(slavio_aux2_mem_read,

                                slavio_aux2_mem_write, s);

        cpu_register_physical_memory(aux2_base, MISC_SIZE, io);

    }

    sysbus_init_mmio(dev, MISC_SIZE, io);



    // Power management (APC) XXX: not a Slavio device

    if (power_base) {

        io = cpu_register_io_memory(apc_mem_read, apc_mem_write, s);

        cpu_register_physical_memory(power_base, MISC_SIZE, io);

    }



    s->irq = irq;

    s->cpu_halt = cpu_halt;

    *fdc_tc = &s->fdc_tc;



    register_savevm("slavio_misc", base, 1, slavio_misc_save, slavio_misc_load,

    register_savevm("slavio_misc", -1, 1, slavio_misc_save, slavio_misc_load,

                    s);

    qemu_register_reset(slavio_misc_reset, s);

    slavio_misc_reset(s);

}



    return s;

static SysBusDeviceInfo slavio_misc_info = {

    .init = slavio_misc_init1,

    .qdev.name  = "slavio_misc",

    .qdev.size  = sizeof(MiscState),

    .qdev.props = (DevicePropList[]) {

        {.name = NULL}

    }

};



static SysBusDeviceInfo apc_info = {

    .init = apc_init1,

    .qdev.name  = "apc",

    .qdev.size  = sizeof(MiscState),

    .qdev.props = (DevicePropList[]) {

        {.name = NULL}

    }

};



static void slavio_misc_register_devices(void)

{

    sysbus_register_withprop(&slavio_misc_info);

    sysbus_register_withprop(&apc_info);

}



device_init(slavio_misc_register_devices)

hw/sun4m.c

+11 −9
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, 
    qemu_irq *cpu_irqs[MAX_CPUS], *slavio_irq, *slavio_cpu_irq,

        *espdma_irq, *ledma_irq;

    qemu_irq *esp_reset, *le_reset;

    qemu_irq *fdc_tc;

    qemu_irq fdc_tc;

    qemu_irq *cpu_halt;

    ram_addr_t ram_offset, prom_offset;

    unsigned long kernel_size;
@@ -553,10 +553,12 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, 
              serial_hds[0], serial_hds[1], ESCC_CLOCK, 1);



    cpu_halt = qemu_allocate_irqs(cpu_halt_signal, NULL, 1);

    slavio_misc = slavio_misc_init(hwdef->slavio_base, hwdef->apc_base,

    slavio_misc = slavio_misc_init(hwdef->slavio_base,

                                   hwdef->aux1_base, hwdef->aux2_base,

                                   slavio_irq[hwdef->me_irq], cpu_halt[0],

                                   &fdc_tc);

                                   slavio_irq[hwdef->me_irq], fdc_tc);

    if (hwdef->apc_base) {

        apc_init(hwdef->apc_base, cpu_halt[0]);

    }



    if (hwdef->fd_base) {

        /* there is zero or one floppy drive */
@@ -566,7 +568,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, 
            fd[0] = drives_table[drive_index].bdrv;



        sun4m_fdctrl_init(slavio_irq[hwdef->fd_irq], hwdef->fd_base, fd,

                          fdc_tc);

                          &fdc_tc);

    }



    if (drive_get_max_bus(IF_SCSI) > 0) {
@@ -1443,7 +1445,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, 
    void *iommu, *espdma, *ledma, *nvram;

    qemu_irq *cpu_irqs, *slavio_irq, *espdma_irq, *ledma_irq;

    qemu_irq *esp_reset, *le_reset;

    qemu_irq *fdc_tc;

    qemu_irq fdc_tc;

    ram_addr_t ram_offset, prom_offset;

    unsigned long kernel_size;

    int ret;
@@ -1539,8 +1541,8 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, 
              slavio_irq[hwdef->ser_irq], serial_hds[0], serial_hds[1],

              ESCC_CLOCK, 1);



    slavio_misc = slavio_misc_init(0, 0, hwdef->aux1_base, 0,

                                   slavio_irq[hwdef->me_irq], NULL, &fdc_tc);

    slavio_misc = slavio_misc_init(0, hwdef->aux1_base, 0,

                                   slavio_irq[hwdef->me_irq], fdc_tc);



    if (hwdef->fd_base != (target_phys_addr_t)-1) {

        /* there is zero or one floppy drive */
@@ -1550,7 +1552,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, 
            fd[0] = drives_table[drive_index].bdrv;



        sun4m_fdctrl_init(slavio_irq[hwdef->fd_irq], hwdef->fd_base, fd,

                          fdc_tc);

                          &fdc_tc);

    }



    if (drive_get_max_bus(IF_SCSI) > 0) {

hw/sun4m.h

+3 −2
Original line number Diff line number Diff line
@@ -50,11 +50,12 @@ void slavio_timer_init_all(target_phys_addr_t base, qemu_irq master_irq, 
                           qemu_irq *cpu_irqs, unsigned int num_cpus);



/* slavio_misc.c */

void *slavio_misc_init(target_phys_addr_t base, target_phys_addr_t power_base,

void *slavio_misc_init(target_phys_addr_t base,

                       target_phys_addr_t aux1_base,

                       target_phys_addr_t aux2_base, qemu_irq irq,

                       qemu_irq cpu_halt, qemu_irq **fdc_tc);

                       qemu_irq fdc_tc);

void slavio_set_power_fail(void *opaque, int power_failing);

void apc_init(target_phys_addr_t power_base, qemu_irq cpu_halt);



/* cs4231.c */

void cs_init(target_phys_addr_t base, int irq, void *intctl);