PPC: g3beige: Move secondary IDE bus to mac-io
On a real G3 Beige the secondary IDE bus lives on the mac-io chip, not on some random PCI device. Move it there to become more compatible. While at it, also clean up the IDE channel connection logic. Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
536d8cda4a
commit
14eefd0ec3
|
@ -363,7 +363,7 @@ static void macio_ide_register_types(void)
|
||||||
type_register_static(&macio_ide_type_info);
|
type_register_static(&macio_ide_type_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* hd_table must contain 4 block drivers */
|
/* hd_table must contain 2 block drivers */
|
||||||
void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table)
|
void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
|
@ -52,10 +52,10 @@ typedef struct OldWorldMacIOState {
|
||||||
MacIOState parent_obj;
|
MacIOState parent_obj;
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
|
|
||||||
qemu_irq irqs[3];
|
qemu_irq irqs[5];
|
||||||
|
|
||||||
MacIONVRAMState nvram;
|
MacIONVRAMState nvram;
|
||||||
MACIOIDEState ide;
|
MACIOIDEState ide[2];
|
||||||
} OldWorldMacIOState;
|
} OldWorldMacIOState;
|
||||||
|
|
||||||
#define NEWWORLD_MACIO(obj) \
|
#define NEWWORLD_MACIO(obj) \
|
||||||
|
@ -147,18 +147,32 @@ static int macio_common_initfn(PCIDevice *d)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int macio_initfn_ide(MacIOState *s, MACIOIDEState *ide, qemu_irq irq0,
|
||||||
|
qemu_irq irq1, int dmaid)
|
||||||
|
{
|
||||||
|
SysBusDevice *sysbus_dev;
|
||||||
|
|
||||||
|
sysbus_dev = SYS_BUS_DEVICE(ide);
|
||||||
|
sysbus_connect_irq(sysbus_dev, 0, irq0);
|
||||||
|
sysbus_connect_irq(sysbus_dev, 1, irq1);
|
||||||
|
macio_ide_register_dma(ide, s->dbdma, dmaid);
|
||||||
|
return qdev_init(DEVICE(ide));
|
||||||
|
}
|
||||||
|
|
||||||
static int macio_oldworld_initfn(PCIDevice *d)
|
static int macio_oldworld_initfn(PCIDevice *d)
|
||||||
{
|
{
|
||||||
MacIOState *s = MACIO(d);
|
MacIOState *s = MACIO(d);
|
||||||
OldWorldMacIOState *os = OLDWORLD_MACIO(d);
|
OldWorldMacIOState *os = OLDWORLD_MACIO(d);
|
||||||
SysBusDevice *sysbus_dev;
|
SysBusDevice *sysbus_dev;
|
||||||
|
int i;
|
||||||
|
int cur_irq = 0;
|
||||||
int ret = macio_common_initfn(d);
|
int ret = macio_common_initfn(d);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
sysbus_dev = SYS_BUS_DEVICE(&s->cuda);
|
sysbus_dev = SYS_BUS_DEVICE(&s->cuda);
|
||||||
sysbus_connect_irq(sysbus_dev, 0, os->irqs[0]);
|
sysbus_connect_irq(sysbus_dev, 0, os->irqs[cur_irq++]);
|
||||||
|
|
||||||
ret = qdev_init(DEVICE(&os->nvram));
|
ret = qdev_init(DEVICE(&os->nvram));
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
@ -174,23 +188,39 @@ static int macio_oldworld_initfn(PCIDevice *d)
|
||||||
memory_region_add_subregion(&s->bar, 0x00000, s->pic_mem);
|
memory_region_add_subregion(&s->bar, 0x00000, s->pic_mem);
|
||||||
}
|
}
|
||||||
|
|
||||||
sysbus_dev = SYS_BUS_DEVICE(&os->ide);
|
/* IDE buses */
|
||||||
sysbus_connect_irq(sysbus_dev, 0, os->irqs[1]);
|
for (i = 0; i < ARRAY_SIZE(os->ide); i++) {
|
||||||
sysbus_connect_irq(sysbus_dev, 1, os->irqs[2]);
|
qemu_irq irq0 = os->irqs[cur_irq++];
|
||||||
macio_ide_register_dma(&os->ide, s->dbdma, 0x16);
|
qemu_irq irq1 = os->irqs[cur_irq++];
|
||||||
ret = qdev_init(DEVICE(&os->ide));
|
|
||||||
if (ret < 0) {
|
ret = macio_initfn_ide(s, &os->ide[i], irq0, irq1, 0x16 + (i * 4));
|
||||||
return ret;
|
if (ret < 0) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void macio_init_ide(MacIOState *s, MACIOIDEState *ide, int index)
|
||||||
|
{
|
||||||
|
gchar *name;
|
||||||
|
|
||||||
|
object_initialize(ide, TYPE_MACIO_IDE);
|
||||||
|
qdev_set_parent_bus(DEVICE(ide), sysbus_get_default());
|
||||||
|
memory_region_add_subregion(&s->bar, 0x1f000 + ((index + 1) * 0x1000),
|
||||||
|
&ide->mem);
|
||||||
|
name = g_strdup_printf("ide[%i]", index);
|
||||||
|
object_property_add_child(OBJECT(s), name, OBJECT(ide), NULL);
|
||||||
|
g_free(name);
|
||||||
|
}
|
||||||
|
|
||||||
static void macio_oldworld_init(Object *obj)
|
static void macio_oldworld_init(Object *obj)
|
||||||
{
|
{
|
||||||
MacIOState *s = MACIO(obj);
|
MacIOState *s = MACIO(obj);
|
||||||
OldWorldMacIOState *os = OLDWORLD_MACIO(obj);
|
OldWorldMacIOState *os = OLDWORLD_MACIO(obj);
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
int i;
|
||||||
|
|
||||||
qdev_init_gpio_out(DEVICE(obj), os->irqs, ARRAY_SIZE(os->irqs));
|
qdev_init_gpio_out(DEVICE(obj), os->irqs, ARRAY_SIZE(os->irqs));
|
||||||
|
|
||||||
|
@ -199,10 +229,9 @@ static void macio_oldworld_init(Object *obj)
|
||||||
qdev_prop_set_uint32(dev, "size", 0x2000);
|
qdev_prop_set_uint32(dev, "size", 0x2000);
|
||||||
qdev_prop_set_uint32(dev, "it_shift", 4);
|
qdev_prop_set_uint32(dev, "it_shift", 4);
|
||||||
|
|
||||||
object_initialize(&os->ide, TYPE_MACIO_IDE);
|
for (i = 0; i < 2; i++) {
|
||||||
qdev_set_parent_bus(DEVICE(&os->ide), sysbus_get_default());
|
macio_init_ide(s, &os->ide[i], i);
|
||||||
memory_region_add_subregion(&s->bar, 0x1f000 + (1 * 0x1000), &os->ide.mem);
|
}
|
||||||
object_property_add_child(obj, "ide", OBJECT(&os->ide), NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int macio_newworld_initfn(PCIDevice *d)
|
static int macio_newworld_initfn(PCIDevice *d)
|
||||||
|
@ -210,35 +239,30 @@ static int macio_newworld_initfn(PCIDevice *d)
|
||||||
MacIOState *s = MACIO(d);
|
MacIOState *s = MACIO(d);
|
||||||
NewWorldMacIOState *ns = NEWWORLD_MACIO(d);
|
NewWorldMacIOState *ns = NEWWORLD_MACIO(d);
|
||||||
SysBusDevice *sysbus_dev;
|
SysBusDevice *sysbus_dev;
|
||||||
|
int i;
|
||||||
|
int cur_irq = 0;
|
||||||
int ret = macio_common_initfn(d);
|
int ret = macio_common_initfn(d);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
sysbus_dev = SYS_BUS_DEVICE(&s->cuda);
|
sysbus_dev = SYS_BUS_DEVICE(&s->cuda);
|
||||||
sysbus_connect_irq(sysbus_dev, 0, ns->irqs[0]);
|
sysbus_connect_irq(sysbus_dev, 0, ns->irqs[cur_irq++]);
|
||||||
|
|
||||||
if (s->pic_mem) {
|
if (s->pic_mem) {
|
||||||
/* OpenPIC */
|
/* OpenPIC */
|
||||||
memory_region_add_subregion(&s->bar, 0x40000, s->pic_mem);
|
memory_region_add_subregion(&s->bar, 0x40000, s->pic_mem);
|
||||||
}
|
}
|
||||||
|
|
||||||
sysbus_dev = SYS_BUS_DEVICE(&ns->ide[0]);
|
/* IDE buses */
|
||||||
sysbus_connect_irq(sysbus_dev, 0, ns->irqs[1]);
|
for (i = 0; i < ARRAY_SIZE(ns->ide); i++) {
|
||||||
sysbus_connect_irq(sysbus_dev, 1, ns->irqs[2]);
|
qemu_irq irq0 = ns->irqs[cur_irq++];
|
||||||
macio_ide_register_dma(&ns->ide[0], s->dbdma, 0x16);
|
qemu_irq irq1 = ns->irqs[cur_irq++];
|
||||||
ret = qdev_init(DEVICE(&ns->ide[0]));
|
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
sysbus_dev = SYS_BUS_DEVICE(&ns->ide[1]);
|
ret = macio_initfn_ide(s, &ns->ide[i], irq0, irq1, 0x16 + (i * 4));
|
||||||
sysbus_connect_irq(sysbus_dev, 0, ns->irqs[3]);
|
if (ret < 0) {
|
||||||
sysbus_connect_irq(sysbus_dev, 1, ns->irqs[4]);
|
return ret;
|
||||||
macio_ide_register_dma(&ns->ide[1], s->dbdma, 0x1a);
|
}
|
||||||
ret = qdev_init(DEVICE(&ns->ide[1]));
|
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -249,18 +273,11 @@ static void macio_newworld_init(Object *obj)
|
||||||
MacIOState *s = MACIO(obj);
|
MacIOState *s = MACIO(obj);
|
||||||
NewWorldMacIOState *ns = NEWWORLD_MACIO(obj);
|
NewWorldMacIOState *ns = NEWWORLD_MACIO(obj);
|
||||||
int i;
|
int i;
|
||||||
gchar *name;
|
|
||||||
|
|
||||||
qdev_init_gpio_out(DEVICE(obj), ns->irqs, ARRAY_SIZE(ns->irqs));
|
qdev_init_gpio_out(DEVICE(obj), ns->irqs, ARRAY_SIZE(ns->irqs));
|
||||||
|
|
||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
object_initialize(&ns->ide[i], TYPE_MACIO_IDE);
|
macio_init_ide(s, &ns->ide[i], i);
|
||||||
qdev_set_parent_bus(DEVICE(&ns->ide[i]), sysbus_get_default());
|
|
||||||
memory_region_add_subregion(&s->bar, 0x1f000 + ((i + 1) * 0x1000),
|
|
||||||
&ns->ide[i].mem);
|
|
||||||
name = g_strdup_printf("ide[%i]", i);
|
|
||||||
object_property_add_child(obj, name, OBJECT(&ns->ide[i]), NULL);
|
|
||||||
g_free(name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -268,20 +268,19 @@ static void ppc_heathrow_init(QEMUMachineInitArgs *args)
|
||||||
macio = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO);
|
macio = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO);
|
||||||
dev = DEVICE(macio);
|
dev = DEVICE(macio);
|
||||||
qdev_connect_gpio_out(dev, 0, pic[0x12]); /* CUDA */
|
qdev_connect_gpio_out(dev, 0, pic[0x12]); /* CUDA */
|
||||||
qdev_connect_gpio_out(dev, 1, pic[0x0D]); /* IDE */
|
qdev_connect_gpio_out(dev, 1, pic[0x0D]); /* IDE-0 */
|
||||||
qdev_connect_gpio_out(dev, 2, pic[0x02]); /* IDE DMA */
|
qdev_connect_gpio_out(dev, 2, pic[0x02]); /* IDE-0 DMA */
|
||||||
|
qdev_connect_gpio_out(dev, 3, pic[0x0E]); /* IDE-1 */
|
||||||
|
qdev_connect_gpio_out(dev, 4, pic[0x03]); /* IDE-1 DMA */
|
||||||
macio_init(macio, pic_mem, escc_bar);
|
macio_init(macio, pic_mem, escc_bar);
|
||||||
|
|
||||||
/* First IDE channel is a MAC IDE on the MacIO bus */
|
|
||||||
macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
|
macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
|
||||||
"ide"));
|
"ide[0]"));
|
||||||
macio_ide_init_drives(macio_ide, hd);
|
macio_ide_init_drives(macio_ide, hd);
|
||||||
|
|
||||||
/* Second IDE channel is a CMD646 on the PCI bus */
|
macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
|
||||||
hd[0] = hd[MAX_IDE_DEVS];
|
"ide[1]"));
|
||||||
hd[1] = hd[MAX_IDE_DEVS + 1];
|
macio_ide_init_drives(macio_ide, &hd[MAX_IDE_DEVS]);
|
||||||
hd[3] = hd[2] = NULL;
|
|
||||||
pci_cmd646_ide_init(pci_bus, hd, 0);
|
|
||||||
|
|
||||||
dev = DEVICE(object_resolve_path_component(OBJECT(macio), "cuda"));
|
dev = DEVICE(object_resolve_path_component(OBJECT(macio), "cuda"));
|
||||||
adb_bus = qdev_get_child_bus(dev, "adb.0");
|
adb_bus = qdev_get_child_bus(dev, "adb.0");
|
||||||
|
|
Loading…
Reference in New Issue