Re: [Qemu-devel] [Qemu-ppc] [PATCH v2] mac99: Change memory layout to better match PowerMac3, 1

[BALATON Zoltan <balaton@eik.bme.hu>]

Ping again. This patch already missed two pull requests without getting 
any comments. I hope you can look at it now.

Regards,
BALATON Zoltan

On Mon, 9 Jun 2014, BALATON Zoltan wrote:
>
> Ping! <http://patchwork.ozlabs.org/patch/355103/>
>
> On Sat, 12 Apr 2014, BALATON Zoltan wrote:
>> Bring the memory map closer to a PowerMac3,1 model by removing unused
>> areas and adding the VGA and network cards after the macio to let the
>> latter be mapped from 0x80000000 like on real hardware. (On real
>> hardware the graphics and network cards are on separate buses but we
>> don't model that yet.)
>> 
>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>> ---
>> 
>> This patch is intended to bring memory layout closer to what's seen in
>> these dumps:
>> 
>> http://nandra.segv.jp/NetBSD/G4.dump-device-tree.txt
>> http://raveland.org/ports/eeprom.txt
>> http://mail-index.netbsd.org/port-macppc/2007/10/24/0000.html
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604134
>> 
>> v2: Added back unin2_memory region that Darwin seems to like better
>> 
>> ---
>> hw/pci-host/uninorth.c |  2 +-
>> hw/ppc/mac_newworld.c  | 14 +++++++-------
>> 2 files changed, 8 insertions(+), 8 deletions(-)
>> 
>> diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
>> index e72fe2a..21f805f 100644
>> --- a/hw/pci-host/uninorth.c
>> +++ b/hw/pci-host/uninorth.c
>> @@ -230,7 +230,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
>>     d = UNI_NORTH_PCI_HOST_BRIDGE(dev);
>>     memory_region_init(&d->pci_mmio, OBJECT(d), "pci-mmio", 
>> 0x100000000ULL);
>>     memory_region_init_alias(&d->pci_hole, OBJECT(d), "pci-hole", 
>> &d->pci_mmio,
>> -                             0x80000000ULL, 0x70000000ULL);
>> +                             0x80000000ULL, 0x10000000ULL);
>>     memory_region_add_subregion(address_space_mem, 0x80000000ULL,
>>                                 &d->pci_hole);
>> 
>> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
>> index 4bdaa8d..a4e5044 100644
>> --- a/hw/ppc/mac_newworld.c
>> +++ b/hw/ppc/mac_newworld.c
>> @@ -371,18 +371,11 @@ static void ppc_core99_init(MachineState *machine)
>>         machine_arch = ARCH_MAC99;
>>     }
>>     /* init basic PC hardware */
>> -    pci_vga_init(pci_bus);
>> -
>>     escc_mem = escc_init(0, pic[0x25], pic[0x24],
>>                          serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
>>     memory_region_init_alias(escc_bar, NULL, "escc-bar",
>>                              escc_mem, 0, memory_region_size(escc_mem));
>> 
>> -    for(i = 0; i < nb_nics; i++)
>> -        pci_nic_init_nofail(&nd_table[i], pci_bus, "ne2k_pci", NULL);
>> -
>> -    ide_drive_get(hd, MAX_IDE_BUS);
>> -
>>     macio = pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO);
>>     dev = DEVICE(macio);
>>     qdev_connect_gpio_out(dev, 0, pic[0x19]); /* CUDA */
>> @@ -393,6 +386,8 @@ static void ppc_core99_init(MachineState *machine)
>>     macio_init(macio, pic_mem, escc_bar);
>>
>>     /* We only emulate 2 out of 3 IDE controllers for now */
>> +    ide_drive_get(hd, MAX_IDE_BUS);
>> +
>>     macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),
>>                                                         "ide[0]"));
>>     macio_ide_init_drives(macio_ide, hd);
>> @@ -418,9 +413,14 @@ static void ppc_core99_init(MachineState *machine)
>>         }
>>     }
>> 
>> +    pci_vga_init(pci_bus);
>> +
>>     if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
>>         graphic_depth = 15;
>> 
>> +    for(i = 0; i < nb_nics; i++)
>> +        pci_nic_init_nofail(&nd_table[i], pci_bus, "ne2k_pci", NULL);
>> +
>>     /* The NewWorld NVRAM is not located in the MacIO device */
>>     dev = qdev_create(NULL, TYPE_MACIO_NVRAM);
>>     qdev_prop_set_uint32(dev, "size", 0x2000);
>> -- 
>> 1.8.1.5
>> 
>> 
>> 
>
>