Commit 13144781 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf 

* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf:
  PPC: e500: Select MPIC v4.2 on ppce500 platform
  PPC: e500: fix mpic_iack address
  openpic: add basic support for MPIC v4.2
  openpic: fix timer address decoding
  openpic: fix remaining issues from idr-to-destmask conversion
  pseries: Adjust default VIO address allocations to play better with libvirt
  pseries: Improve handling of multiple PCI host bridges
  target-ppc: Give a meaningful error if too many threads are specified
  cuda: Move ADB bus into CUDA state
  adb: QOM'ify ADB devices
  adb: QOM'ify Apple Desktop Bus
  cuda: QOM'ify CUDA
  ide/macio: QOM'ify MacIO IDE
  mac_nvram: QOM'ify MacIO NVRAM
  mac_nvram: Mark as Big Endian
  mac_nvram: Clean up public API
  macio: Split MacIO in two
  macio: Delay qdev init until all fields are initialized
  macio: QOM'ify some more
  ppc: Move Mac machines to hw/ppc/
parents c5cd02ba f5fba9d2

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ New World 
M: Alexander Graf <agraf@suse.de>

L: qemu-ppc@nongnu.org

S: Maintained

F: hw/ppc_newworld.c

F: hw/ppc/mac_newworld.c

F: hw/unin_pci.c

F: hw/dec_pci.[hc]
@@ -388,7 +388,7 @@ Old World 
M: Alexander Graf <agraf@suse.de>

L: qemu-ppc@nongnu.org

S: Maintained

F: hw/ppc_oldworld.c

F: hw/ppc/mac_oldworld.c

F: hw/grackle_pci.c



PReP

hw/adb.c

+189 −63
Original line number Diff line number Diff line
@@ -48,16 +48,21 @@ do { printf("ADB: " fmt , ## __VA_ARGS__); } while (0) 
#define ADB_CMD_CHANGE_ID_AND_ENABLE	0x00



/* ADB default device IDs (upper 4 bits of ADB command byte) */

#define ADB_DONGLE	1

#define ADB_KEYBOARD	2

#define ADB_MOUSE	3

#define ADB_TABLET	4

#define ADB_MODEM	5

#define ADB_MISC	7

#define ADB_DEVID_DONGLE   1

#define ADB_DEVID_KEYBOARD 2

#define ADB_DEVID_MOUSE    3

#define ADB_DEVID_TABLET   4

#define ADB_DEVID_MODEM    5

#define ADB_DEVID_MISC     7



/* error codes */

#define ADB_RET_NOTPRESENT (-2)



static void adb_device_reset(ADBDevice *d)

{

    qdev_reset_all(DEVICE(d));

}



int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)

{

    ADBDevice *d;
@@ -66,18 +71,17 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len) 
    cmd = buf[0] & 0xf;

    if (cmd == ADB_BUSRESET) {

        for(i = 0; i < s->nb_devices; i++) {

            d = &s->devices[i];

            if (d->devreset) {

                d->devreset(d);

            }

            d = s->devices[i];

            adb_device_reset(d);

        }

        return 0;

    }

    devaddr = buf[0] >> 4;

    for(i = 0; i < s->nb_devices; i++) {

        d = &s->devices[i];

        d = s->devices[i];

        if (d->devaddr == devaddr) {

            return d->devreq(d, obuf, buf, len);

            ADBDeviceClass *adc = ADB_DEVICE_GET_CLASS(d);

            return adc->devreq(d, obuf, buf, len);

        }

    }

    return ADB_RET_NOTPRESENT;
@@ -94,7 +98,7 @@ int adb_poll(ADBBusState *s, uint8_t *obuf) 
    for(i = 0; i < s->nb_devices; i++) {

        if (s->poll_index >= s->nb_devices)

            s->poll_index = 0;

        d = &s->devices[s->poll_index];

        d = s->devices[s->poll_index];

        buf[0] = ADB_READREG | (d->devaddr << 4);

        olen = adb_request(s, obuf + 1, buf, 1);

        /* if there is data, we poll again the same device */
@@ -108,32 +112,67 @@ int adb_poll(ADBBusState *s, uint8_t *obuf) 
    return olen;

}



static ADBDevice *adb_register_device(ADBBusState *s, int devaddr,

                                      ADBDeviceRequest *devreq,

                                      ADBDeviceReset *devreset,

                                      void *opaque)

static const TypeInfo adb_bus_type_info = {

    .name = TYPE_ADB_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(ADBBusState),

};



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

{

    ADBDevice *d;

    if (s->nb_devices >= MAX_ADB_DEVICES)

        return NULL;

    d = &s->devices[s->nb_devices++];

    d->bus = s;

    d->devaddr = devaddr;

    d->devreq = devreq;

    d->devreset = devreset;

    d->opaque = opaque;

    qemu_register_reset((QEMUResetHandler *)devreset, d);

    return d;

    ADBDevice *d = ADB_DEVICE(dev);

    ADBBusState *bus = ADB_BUS(qdev_get_parent_bus(dev));



    if (bus->nb_devices >= MAX_ADB_DEVICES) {

        return;

    }



    bus->devices[bus->nb_devices++] = d;

}



static void adb_device_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = adb_device_realizefn;

    dc->bus_type = TYPE_ADB_BUS;

}



static const TypeInfo adb_device_type_info = {

    .name = TYPE_ADB_DEVICE,

    .parent = TYPE_DEVICE,

    .instance_size = sizeof(ADBDevice),

    .abstract = true,

    .class_init = adb_device_class_init,

};



/***************************************************************/

/* Keyboard ADB device */



#define ADB_KEYBOARD(obj) OBJECT_CHECK(KBDState, (obj), TYPE_ADB_KEYBOARD)



typedef struct KBDState {

    /*< private >*/

    ADBDevice parent_obj;

    /*< public >*/



    uint8_t data[128];

    int rptr, wptr, count;

} KBDState;



#define ADB_KEYBOARD_CLASS(class) \

    OBJECT_CLASS_CHECK(ADBKeyboardClass, (class), TYPE_ADB_KEYBOARD)

#define ADB_KEYBOARD_GET_CLASS(obj) \

    OBJECT_GET_CLASS(ADBKeyboardClass, (obj), TYPE_ADB_KEYBOARD)



typedef struct ADBKeyboardClass {

    /*< private >*/

    ADBDeviceClass parent_class;

    /*< public >*/



    DeviceRealize parent_realize;

} ADBKeyboardClass;



static const uint8_t pc_to_adb_keycode[256] = {

  0, 53, 18, 19, 20, 21, 23, 22, 26, 28, 25, 29, 27, 24, 51, 48,

 12, 13, 14, 15, 17, 16, 32, 34, 31, 35, 33, 30, 36, 54,  0,  1,
@@ -155,8 +194,7 @@ static const uint8_t pc_to_adb_keycode[256] = { 


static void adb_kbd_put_keycode(void *opaque, int keycode)

{

    ADBDevice *d = opaque;

    KBDState *s = d->opaque;

    KBDState *s = opaque;



    if (s->count < sizeof(s->data)) {

        s->data[s->wptr] = keycode;
@@ -169,7 +207,7 @@ static void adb_kbd_put_keycode(void *opaque, int keycode) 
static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf)

{

    static int ext_keycode;

    KBDState *s = d->opaque;

    KBDState *s = ADB_KEYBOARD(d);

    int adb_keycode, keycode;

    int olen;
@@ -203,7 +241,7 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) 
static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,

                           const uint8_t *buf, int len)

{

    KBDState *s = d->opaque;

    KBDState *s = ADB_KEYBOARD(d);

    int cmd, reg, olen;



    if ((buf[0] & 0x0f) == ADB_FLUSH) {
@@ -275,41 +313,90 @@ static const VMStateDescription vmstate_adb_kbd = { 
    }

};



static int adb_kbd_reset(ADBDevice *d)

static void adb_kbd_reset(DeviceState *dev)

{

    KBDState *s = d->opaque;

    ADBDevice *d = ADB_DEVICE(dev);

    KBDState *s = ADB_KEYBOARD(dev);



    d->handler = 1;

    d->devaddr = ADB_KEYBOARD;

    memset(s, 0, sizeof(KBDState));



    return 0;

    d->devaddr = ADB_DEVID_KEYBOARD;

    memset(s->data, 0, sizeof(s->data));

    s->rptr = 0;

    s->wptr = 0;

    s->count = 0;

}



void adb_kbd_init(ADBBusState *bus)

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

{

    ADBDevice *d;

    KBDState *s;

    s = g_malloc0(sizeof(KBDState));

    d = adb_register_device(bus, ADB_KEYBOARD, adb_kbd_request,

                            adb_kbd_reset, s);

    ADBDevice *d = ADB_DEVICE(dev);

    ADBKeyboardClass *akc = ADB_KEYBOARD_GET_CLASS(dev);



    akc->parent_realize(dev, errp);



    qemu_add_kbd_event_handler(adb_kbd_put_keycode, d);

    vmstate_register(NULL, -1, &vmstate_adb_kbd, s);

}



static void adb_kbd_initfn(Object *obj)

{

    ADBDevice *d = ADB_DEVICE(obj);



    d->devaddr = ADB_DEVID_KEYBOARD;

}



static void adb_kbd_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);

    ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);

    ADBKeyboardClass *akc = ADB_KEYBOARD_CLASS(oc);



    akc->parent_realize = dc->realize;

    dc->realize = adb_kbd_realizefn;



    adc->devreq = adb_kbd_request;

    dc->reset = adb_kbd_reset;

    dc->vmsd = &vmstate_adb_kbd;

}



static const TypeInfo adb_kbd_type_info = {

    .name = TYPE_ADB_KEYBOARD,

    .parent = TYPE_ADB_DEVICE,

    .instance_size = sizeof(KBDState),

    .instance_init = adb_kbd_initfn,

    .class_init = adb_kbd_class_init,

    .class_size = sizeof(ADBKeyboardClass),

};



/***************************************************************/

/* Mouse ADB device */



#define ADB_MOUSE(obj) OBJECT_CHECK(MouseState, (obj), TYPE_ADB_MOUSE)



typedef struct MouseState {

    /*< public >*/

    ADBDevice parent_obj;

    /*< private >*/



    int buttons_state, last_buttons_state;

    int dx, dy, dz;

} MouseState;



#define ADB_MOUSE_CLASS(class) \

    OBJECT_CLASS_CHECK(ADBMouseClass, (class), TYPE_ADB_MOUSE)

#define ADB_MOUSE_GET_CLASS(obj) \

    OBJECT_GET_CLASS(ADBMouseClass, (obj), TYPE_ADB_MOUSE)



typedef struct ADBMouseClass {

    /*< public >*/

    ADBDeviceClass parent_class;

    /*< private >*/



    DeviceRealize parent_realize;

} ADBMouseClass;



static void adb_mouse_event(void *opaque,

                            int dx1, int dy1, int dz1, int buttons_state)

{

    ADBDevice *d = opaque;

    MouseState *s = d->opaque;

    MouseState *s = opaque;



    s->dx += dx1;

    s->dy += dy1;
@@ -320,7 +407,7 @@ static void adb_mouse_event(void *opaque, 


static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)

{

    MouseState *s = d->opaque;

    MouseState *s = ADB_MOUSE(d);

    int dx, dy;



    if (s->last_buttons_state == s->buttons_state &&
@@ -359,7 +446,7 @@ static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf) 
static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,

                             const uint8_t *buf, int len)

{

    MouseState *s = d->opaque;

    MouseState *s = ADB_MOUSE(d);

    int cmd, reg, olen;



    if ((buf[0] & 0x0f) == ADB_FLUSH) {
@@ -416,15 +503,15 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf, 
    return olen;

}



static int adb_mouse_reset(ADBDevice *d)

static void adb_mouse_reset(DeviceState *dev)

{

    MouseState *s = d->opaque;

    ADBDevice *d = ADB_DEVICE(dev);

    MouseState *s = ADB_MOUSE(dev);



    d->handler = 2;

    d->devaddr = ADB_MOUSE;

    memset(s, 0, sizeof(MouseState));



    return 0;

    d->devaddr = ADB_DEVID_MOUSE;

    s->last_buttons_state = s->buttons_state = 0;

    s->dx = s->dy = s->dz = 0;

}



static const VMStateDescription vmstate_adb_mouse = {
@@ -442,14 +529,53 @@ static const VMStateDescription vmstate_adb_mouse = { 
    }

};



void adb_mouse_init(ADBBusState *bus)

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

{

    ADBDevice *d;

    MouseState *s;

    MouseState *s = ADB_MOUSE(dev);

    ADBMouseClass *amc = ADB_MOUSE_GET_CLASS(dev);



    amc->parent_realize(dev, errp);



    s = g_malloc0(sizeof(MouseState));

    d = adb_register_device(bus, ADB_MOUSE, adb_mouse_request,

                            adb_mouse_reset, s);

    qemu_add_mouse_event_handler(adb_mouse_event, d, 0, "QEMU ADB Mouse");

    vmstate_register(NULL, -1, &vmstate_adb_mouse, s);

    qemu_add_mouse_event_handler(adb_mouse_event, s, 0, "QEMU ADB Mouse");

}



static void adb_mouse_initfn(Object *obj)

{

    ADBDevice *d = ADB_DEVICE(obj);



    d->devaddr = ADB_DEVID_MOUSE;

}



static void adb_mouse_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);

    ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);

    ADBMouseClass *amc = ADB_MOUSE_CLASS(oc);



    amc->parent_realize = dc->realize;

    dc->realize = adb_mouse_realizefn;



    adc->devreq = adb_mouse_request;

    dc->reset = adb_mouse_reset;

    dc->vmsd = &vmstate_adb_mouse;

}



static const TypeInfo adb_mouse_type_info = {

    .name = TYPE_ADB_MOUSE,

    .parent = TYPE_ADB_DEVICE,

    .instance_size = sizeof(MouseState),

    .instance_init = adb_mouse_initfn,

    .class_init = adb_mouse_class_init,

    .class_size = sizeof(ADBMouseClass),

};





static void adb_register_types(void)

{

    type_register_static(&adb_bus_type_info);

    type_register_static(&adb_device_type_info);

    type_register_static(&adb_kbd_type_info);

    type_register_static(&adb_mouse_type_info);

}



type_init(adb_register_types)

hw/adb.h

+35 −11
Original line number Diff line number Diff line
@@ -26,38 +26,62 @@ 
#if !defined(__ADB_H__)

#define __ADB_H__



#include "qdev.h"



#define MAX_ADB_DEVICES 16



#define ADB_MAX_OUT_LEN 16



typedef struct ADBBusState ADBBusState;

typedef struct ADBDevice ADBDevice;



/* buf = NULL means polling */

typedef int ADBDeviceRequest(ADBDevice *d, uint8_t *buf_out,

                              const uint8_t *buf, int len);

typedef int ADBDeviceReset(ADBDevice *d);



#define TYPE_ADB_DEVICE "adb-device"

#define ADB_DEVICE(obj) OBJECT_CHECK(ADBDevice, (obj), TYPE_ADB_DEVICE)



struct ADBDevice {

    struct ADBBusState *bus;

    /*< private >*/

    DeviceState parent_obj;

    /*< public >*/



    int devaddr;

    int handler;

    ADBDeviceRequest *devreq;

    ADBDeviceReset *devreset;

    void *opaque;

};



typedef struct ADBBusState {

    ADBDevice devices[MAX_ADB_DEVICES];

#define ADB_DEVICE_CLASS(cls) \

    OBJECT_CLASS_CHECK(ADBDeviceClass, (cls), TYPE_ADB_DEVICE)

#define ADB_DEVICE_GET_CLASS(obj) \

    OBJECT_GET_CLASS(ADBDeviceClass, (obj), TYPE_ADB_DEVICE)



typedef struct ADBDeviceClass {

    /*< private >*/

    DeviceClass parent_class;

    /*< public >*/



    ADBDeviceRequest *devreq;

} ADBDeviceClass;



#define TYPE_ADB_BUS "apple-desktop-bus"

#define ADB_BUS(obj) OBJECT_CHECK(ADBBusState, (obj), TYPE_ADB_BUS)



struct ADBBusState {

    /*< private >*/

    BusState parent_obj;

    /*< public >*/



    ADBDevice *devices[MAX_ADB_DEVICES];

    int nb_devices;

    int poll_index;

} ADBBusState;

};



int adb_request(ADBBusState *s, uint8_t *buf_out,

                const uint8_t *buf, int len);

int adb_poll(ADBBusState *s, uint8_t *buf_out);



void adb_kbd_init(ADBBusState *bus);

void adb_mouse_init(ADBBusState *bus);

#define TYPE_ADB_KEYBOARD "adb-keyboard"

#define TYPE_ADB_MOUSE "adb-mouse"



extern ADBBusState adb_bus;

#endif /* !defined(__ADB_H__) */

hw/cuda.c

+47 −59
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 * THE SOFTWARE.

 */

#include "hw.h"

#include "ppc_mac.h"

#include "ppc/mac.h"

#include "adb.h"

#include "qemu/timer.h"

#include "sysemu/sysemu.h"
@@ -108,50 +108,6 @@ 
/* CUDA returns time_t's offset from Jan 1, 1904, not 1970 */

#define RTC_OFFSET                      2082844800



typedef struct CUDATimer {

    int index;

    uint16_t latch;

    uint16_t counter_value; /* counter value at load time */

    int64_t load_time;

    int64_t next_irq_time;

    QEMUTimer *timer;

} CUDATimer;



typedef struct CUDAState {

    MemoryRegion mem;

    /* cuda registers */

    uint8_t b;      /* B-side data */

    uint8_t a;      /* A-side data */

    uint8_t dirb;   /* B-side direction (1=output) */

    uint8_t dira;   /* A-side direction (1=output) */

    uint8_t sr;     /* Shift register */

    uint8_t acr;    /* Auxiliary control register */

    uint8_t pcr;    /* Peripheral control register */

    uint8_t ifr;    /* Interrupt flag register */

    uint8_t ier;    /* Interrupt enable register */

    uint8_t anh;    /* A-side data, no handshake */



    CUDATimer timers[2];



    uint32_t tick_offset;



    uint8_t last_b; /* last value of B register */

    uint8_t last_acr; /* last value of B register */



    int data_in_size;

    int data_in_index;

    int data_out_index;



    qemu_irq irq;

    uint8_t autopoll;

    uint8_t data_in[128];

    uint8_t data_out[16];

    QEMUTimer *adb_poll_timer;

} CUDAState;



static CUDAState cuda_state;

ADBBusState adb_bus;



static void cuda_update(CUDAState *s);

static void cuda_receive_packet_from_host(CUDAState *s,

                                          const uint8_t *data, int len);
@@ -501,7 +457,7 @@ static void cuda_adb_poll(void *opaque) 
    uint8_t obuf[ADB_MAX_OUT_LEN + 2];

    int olen;



    olen = adb_poll(&adb_bus, obuf + 2);

    olen = adb_poll(&s->adb_bus, obuf + 2);

    if (olen > 0) {

        obuf[0] = ADB_PACKET;

        obuf[1] = 0x40; /* polled data */
@@ -597,7 +553,7 @@ static void cuda_receive_packet_from_host(CUDAState *s, 
        {

            uint8_t obuf[ADB_MAX_OUT_LEN + 2];

            int olen;

            olen = adb_request(&adb_bus, obuf + 2, data + 1, len - 1);

            olen = adb_request(&s->adb_bus, obuf + 2, data + 1, len - 1);

            if (olen > 0) {

                obuf[0] = ADB_PACKET;

                obuf[1] = 0x00;
@@ -701,9 +657,9 @@ static const VMStateDescription vmstate_cuda = { 
    }

};



static void cuda_reset(void *opaque)

static void cuda_reset(DeviceState *dev)

{

    CUDAState *s = opaque;

    CUDAState *s = CUDA(dev);



    s->b = 0;

    s->a = 0;
@@ -728,25 +684,57 @@ static void cuda_reset(void *opaque) 
    set_counter(s, &s->timers[1], 0xffff);

}



void cuda_init (MemoryRegion **cuda_mem, qemu_irq irq)

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

{

    CUDAState *s = CUDA(dev);

    struct tm tm;

    CUDAState *s = &cuda_state;



    s->irq = irq;



    s->timers[0].index = 0;

    s->timers[0].timer = qemu_new_timer_ns(vm_clock, cuda_timer1, s);



    s->timers[1].index = 1;



    qemu_get_timedate(&tm, 0);

    s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;



    s->adb_poll_timer = qemu_new_timer_ns(vm_clock, cuda_adb_poll, s);

}



static void cuda_initfn(Object *obj)

{

    SysBusDevice *d = SYS_BUS_DEVICE(obj);

    CUDAState *s = CUDA(obj);

    int i;



    memory_region_init_io(&s->mem, &cuda_ops, s, "cuda", 0x2000);

    sysbus_init_mmio(d, &s->mem);

    sysbus_init_irq(d, &s->irq);



    for (i = 0; i < ARRAY_SIZE(s->timers); i++) {

        s->timers[i].index = i;

    }



    *cuda_mem = &s->mem;

    vmstate_register(NULL, -1, &vmstate_cuda, s);

    qemu_register_reset(cuda_reset, s);

    qbus_create_inplace((BusState *)&s->adb_bus, TYPE_ADB_BUS, DEVICE(obj),

                        "adb.0");

}



static void cuda_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = cuda_realizefn;

    dc->reset = cuda_reset;

    dc->vmsd = &vmstate_cuda;

}



static const TypeInfo cuda_type_info = {

    .name = TYPE_CUDA,

    .parent = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(CUDAState),

    .instance_init = cuda_initfn,

    .class_init = cuda_class_init,

};



static void cuda_register_types(void)

{

    type_register_static(&cuda_type_info);

}



type_init(cuda_register_types)

hw/grackle_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 */



#include "pci/pci_host.h"

#include "ppc_mac.h"

#include "ppc/mac.h"

#include "pci/pci.h"



/* debug Grackle */