Commit d811d61f authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

mac_newworld: add PMU device 



The PMU device supercedes the CUDA device found on older New World Macs and
is supported by a larger number of guest OSs from OS 9 to OS X 10.5.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 84051eb4

default-configs/ppc-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ CONFIG_CUDA=y 
CONFIG_ADB=y

CONFIG_MAC_NVRAM=y

CONFIG_MAC_DBDMA=y

CONFIG_MAC_PMU=y

CONFIG_HEATHROW_PIC=y

CONFIG_GRACKLE_PCI=y

CONFIG_UNIN_PCI=y

hw/misc/macio/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
common-obj-y += macio.o

common-obj-$(CONFIG_CUDA) += cuda.o

common-obj-$(CONFIG_MAC_PMU) += pmu.o

common-obj-$(CONFIG_MAC_DBDMA) += mac_dbdma.o

common-obj-$(CONFIG_MACIO_GPIO) += gpio.o

hw/misc/macio/macio.c

+50 −19
Original line number Diff line number Diff line
@@ -105,17 +105,6 @@ static void macio_common_realize(PCIDevice *d, Error **errp) 
    memory_region_add_subregion(&s->bar, 0x08000,

                                sysbus_mmio_get_region(sysbus_dev, 0));



    qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency",

                         s->frequency);

    object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    sysbus_dev = SYS_BUS_DEVICE(&s->cuda);

    memory_region_add_subregion(&s->bar, 0x16000,

                                sysbus_mmio_get_region(sysbus_dev, 0));



    qdev_prop_set_uint32(DEVICE(&s->escc), "disabled", 0);

    qdev_prop_set_uint32(DEVICE(&s->escc), "frequency", ESCC_CLOCK);

    qdev_prop_set_uint32(DEVICE(&s->escc), "it_shift", 4);
@@ -163,7 +152,16 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp) 
        return;

    }



    qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency",

                         s->frequency);

    object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    sysbus_dev = SYS_BUS_DEVICE(&s->cuda);

    memory_region_add_subregion(&s->bar, 0x16000,

                                sysbus_mmio_get_region(sysbus_dev, 0));

    sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev,

                                                       OLDWORLD_CUDA_IRQ));
@@ -234,6 +232,10 @@ static void macio_oldworld_init(Object *obj) 
                             qdev_prop_allow_set_link_before_realize,

                             0, NULL);



    object_initialize(&s->cuda, sizeof(s->cuda), TYPE_CUDA);

    qdev_set_parent_bus(DEVICE(&s->cuda), sysbus_get_default());

    object_property_add_child(obj, "cuda", OBJECT(&s->cuda), NULL);



    object_initialize(&os->nvram, sizeof(os->nvram), TYPE_MACIO_NVRAM);

    dev = DEVICE(&os->nvram);

    qdev_prop_set_uint32(dev, "size", 0x2000);
@@ -293,10 +295,6 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp) 
        return;

    }



    sysbus_dev = SYS_BUS_DEVICE(&s->cuda);

    sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev,

                                                       NEWWORLD_CUDA_IRQ));



    sysbus_dev = SYS_BUS_DEVICE(&s->escc);

    sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev,

                                                       NEWWORLD_ESCCB_IRQ));
@@ -341,6 +339,43 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp) 
        memory_region_add_subregion(&s->bar, 0x50,

                                    sysbus_mmio_get_region(sysbus_dev, 0));

        object_property_set_bool(OBJECT(&ns->gpio), true, "realized", &err);



        /* PMU */

        object_initialize(&s->pmu, sizeof(s->pmu), TYPE_VIA_PMU);

        object_property_set_link(OBJECT(&s->pmu), OBJECT(sysbus_dev), "gpio",

                                 &error_abort);

        qdev_prop_set_bit(DEVICE(&s->pmu), "has-adb", ns->has_adb);

        qdev_set_parent_bus(DEVICE(&s->pmu), sysbus_get_default());

        object_property_add_child(OBJECT(s), "pmu", OBJECT(&s->pmu), NULL);



        object_property_set_bool(OBJECT(&s->pmu), true, "realized", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

        sysbus_dev = SYS_BUS_DEVICE(&s->pmu);

        sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev,

                                                           NEWWORLD_PMU_IRQ));

        memory_region_add_subregion(&s->bar, 0x16000,

                                    sysbus_mmio_get_region(sysbus_dev, 0));

    } else {

        /* CUDA */

        object_initialize(&s->cuda, sizeof(s->cuda), TYPE_CUDA);

        qdev_set_parent_bus(DEVICE(&s->cuda), sysbus_get_default());

        object_property_add_child(OBJECT(s), "cuda", OBJECT(&s->cuda), NULL);

        qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency",

                             s->frequency);



        object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err);

        if (err) {

            error_propagate(errp, err);

            return;

        }

        sysbus_dev = SYS_BUS_DEVICE(&s->cuda);

        sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev,

                                                           NEWWORLD_CUDA_IRQ));

        memory_region_add_subregion(&s->bar, 0x16000,

                                    sysbus_mmio_get_region(sysbus_dev, 0));

    }

}
@@ -369,10 +404,6 @@ static void macio_instance_init(Object *obj) 


    memory_region_init(&s->bar, obj, "macio", 0x80000);



    object_initialize(&s->cuda, sizeof(s->cuda), TYPE_CUDA);

    qdev_set_parent_bus(DEVICE(&s->cuda), sysbus_get_default());

    object_property_add_child(obj, "cuda", OBJECT(&s->cuda), NULL);



    object_initialize(&s->dbdma, sizeof(s->dbdma), TYPE_MAC_DBDMA);

    qdev_set_parent_bus(DEVICE(&s->dbdma), sysbus_get_default());

    object_property_add_child(obj, "dbdma", OBJECT(&s->dbdma), NULL);

hw/misc/macio/pmu.c

0 → 100644
+871 −0

File added.

Preview size limit exceeded, changes collapsed.

hw/misc/macio/trace-events

+21 −0
Original line number Diff line number Diff line
@@ -20,3 +20,24 @@ macio_gpio_irq_assert(int gpio) "asserting GPIO %d" 
macio_gpio_irq_deassert(int gpio) "deasserting GPIO %d"

macio_gpio_write(uint64_t addr, uint64_t val) "addr: 0x%"PRIx64" value: 0x%"PRIx64

macio_gpio_read(uint64_t addr, uint64_t val) "addr: 0x%"PRIx64" value: 0x%"PRIx64



# hw/misc/macio/pmu.c

pmu_adb_poll(int olen) "ADB autopoll, olen=%d"

pmu_one_sec_timer(void) "PMU one sec..."

pmu_cmd_set_int_mask(int intmask) "Setting PMU int mask to 0x%02x"

pmu_cmd_set_adb_autopoll(int mask) "ADB set autopoll, mask=0x%04x"

pmu_cmd_adb_nobus(void) "ADB PACKET with no ADB bus!"

pmu_cmd_adb_request(int inlen, int indata0, int indata1, int indata2, int indata3, int indata4) "ADB request: len=%d, cmd=0x%02x, pflags=0x%02x, adblen=%d: 0x%02x 0x%02x..."

pmu_cmd_adb_reply(int len) "ADB reply is %d bytes"

pmu_dispatch_cmd(const char *name) "handling command %s"

pmu_dispatch_unknown_cmd(int cmd) "Unknown PMU command 0x%02x"

pmu_debug_protocol_string(const char *str) "%s"

pmu_debug_protocol_resp_size(int size) "sending %d resp bytes"

pmu_debug_protocol_error(int portB) "protocol error! portB=0x%02x"

pmu_debug_protocol_clear_treq(int state) "TREQ cleared, clearing TACK, state: %d"

pmu_debug_protocol_cmd(int cmd, int cmdlen, int rsplen) "Got command byte 0x%02x, clen=%d, rlen=%d"

pmu_debug_protocol_cmdlen(int len) "got cmd length byte: %d"

pmu_debug_protocol_cmd_toobig(int len) "command too big (%d bytes)"

pmu_debug_protocol_cmd_send_resp_size(int len) "sending length byte: %d"

pmu_debug_protocol_cmd_send_resp(int pos, int len) "sending byte: %d/%d"

pmu_debug_protocol_cmd_resp_complete(int ier) "Response send complete. IER=0x%02x"