mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sun4u: expose fw_cfg and NVRAM on ebus PCI IO address space

Browse Source 
To allow future changes to the sun4u PCI topology.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-By: Artyom Tarasenko <atar4qemu@gmail.com>
This commit is contained in:
Mark Cave-Ayland 2017-09-04 18:41:01 +01:00
parent d6acc8a5cf
commit 07c847413b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/sparc64/sun4u.c
View File

@ -450,7 +450,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
&pci_bus3, &pbm_irqs); &pci_bus3, &pbm_irqs);
pci_vga_init(pci_bus); pci_vga_init(pci_bus);
// XXX Should be pci_bus3 /* XXX Should be pci_bus3 */
ebus = pci_create_simple(pci_bus, -1, "ebus"); ebus = pci_create_simple(pci_bus, -1, "ebus");
isa_bus = pci_ebus_init(ebus, pbm_irqs); isa_bus = pci_ebus_init(ebus, pbm_irqs);
@ -492,7 +492,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
/* Map NVRAM into I/O (ebus) space */ /* Map NVRAM into I/O (ebus) space */
nvram = m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59); nvram = m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59);
s = SYS_BUS_DEVICE(nvram); s = SYS_BUS_DEVICE(nvram);
memory_region_add_subregion(get_system_io(), 0x2000, memory_region_add_subregion(pci_address_space_io(ebus), 0x2000,
sysbus_mmio_get_region(s, 0)); sysbus_mmio_get_region(s, 0));
initrd_size = 0; initrd_size = 0;
@ -514,10 +514,9 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
dev = qdev_create(NULL, TYPE_FW_CFG_IO); dev = qdev_create(NULL, TYPE_FW_CFG_IO);
qdev_prop_set_bit(dev, "dma_enabled", false); qdev_prop_set_bit(dev, "dma_enabled", false);
object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG, object_property_add_child(OBJECT(ebus), TYPE_FW_CFG, OBJECT(dev), NULL);
OBJECT(dev), NULL);
qdev_init_nofail(dev); qdev_init_nofail(dev);
memory_region_add_subregion(get_system_io(), BIOS_CFG_IOPORT, memory_region_add_subregion(pci_address_space_io(ebus), BIOS_CFG_IOPORT,
&FW_CFG_IO(dev)->comb_iomem); &FW_CFG_IO(dev)->comb_iomem);
fw_cfg = FW_CFG(dev); fw_cfg = FW_CFG(dev);