mirror of https://github.com/xqemu/xqemu.git
PPC64: Partial fix to Linux crash: revert to old devfn
Before2e29bd0478
, Uni-North host and AGP bridge were using the same devfn, 11 << 3. The net effect was that only AGP bridge was visible. This was changed in the commit to 13 << 3 for AGP. Some of the later crashes happened due to NULL pointer dereferences generated by07b7d05377
and insufficient return value checks. Disable host device and revert AGP to 11 << 3. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
c364c974d9
commit
603987488c
|
@ -156,7 +156,9 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
|
||||||
pci_unin_set_irq, pci_unin_map_irq,
|
pci_unin_set_irq, pci_unin_map_irq,
|
||||||
pic, 11 << 3, 4);
|
pic, 11 << 3, 4);
|
||||||
|
|
||||||
|
#if 0
|
||||||
pci_create_simple(d->host_state.bus, 11 << 3, "Uni-north main");
|
pci_create_simple(d->host_state.bus, 11 << 3, "Uni-north main");
|
||||||
|
#endif
|
||||||
|
|
||||||
sysbus_mmio_map(s, 0, 0xf2800000);
|
sysbus_mmio_map(s, 0, 0xf2800000);
|
||||||
sysbus_mmio_map(s, 1, 0xf2c00000);
|
sysbus_mmio_map(s, 1, 0xf2c00000);
|
||||||
|
@ -168,7 +170,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Uninorth AGP bus */
|
/* Uninorth AGP bus */
|
||||||
pci_create_simple(d->host_state.bus, 13 << 3, "Uni-north AGP");
|
pci_create_simple(d->host_state.bus, 11 << 3, "Uni-north AGP");
|
||||||
|
|
||||||
/* Uninorth internal bus */
|
/* Uninorth internal bus */
|
||||||
#if 0
|
#if 0
|
||||||
|
|
Loading…
Reference in New Issue