From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
david@gibson.dropbear.id.au, thuth@redhat.com
Subject: [PATCH v2 2/7] mac_oldworld: move initialisation of grackle before heathrow
Date: Tue, 29 Dec 2020 17:56:14 +0000 [thread overview]
Message-ID: <20201229175619.6051-3-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20201229175619.6051-1-mark.cave-ayland@ilande.co.uk>
In order to move the heathrow PIC to the macio device, the PCI bus needs to be
initialised before the macio device and also before wiring the PIC IRQs.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/ppc/mac_oldworld.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 2ead34bdf1..e58e0525fe 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -227,6 +227,21 @@ static void ppc_heathrow_init(MachineState *machine)
}
}
+ /* Grackle PCI host bridge */
+ dev = qdev_new(TYPE_GRACKLE_PCI_HOST_BRIDGE);
+ qdev_prop_set_uint32(dev, "ofw-addr", 0x80000000);
+ s = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(s, &error_fatal);
+
+ sysbus_mmio_map(s, 0, GRACKLE_BASE);
+ sysbus_mmio_map(s, 1, GRACKLE_BASE + 0x200000);
+ /* PCI hole */
+ memory_region_add_subregion(get_system_memory(), 0x80000000ULL,
+ sysbus_mmio_get_region(s, 2));
+ /* Register 2 MB of ISA IO space */
+ memory_region_add_subregion(get_system_memory(), 0xfe000000,
+ sysbus_mmio_get_region(s, 3));
+
/* XXX: we register only 1 output pin for heathrow PIC */
pic_dev = qdev_new(TYPE_HEATHROW);
sysbus_realize_and_unref(SYS_BUS_DEVICE(pic_dev), &error_fatal);
@@ -251,21 +266,6 @@ static void ppc_heathrow_init(MachineState *machine)
tbfreq = TBFREQ;
}
- /* Grackle PCI host bridge */
- dev = qdev_new(TYPE_GRACKLE_PCI_HOST_BRIDGE);
- qdev_prop_set_uint32(dev, "ofw-addr", 0x80000000);
- s = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(s, &error_fatal);
-
- sysbus_mmio_map(s, 0, GRACKLE_BASE);
- sysbus_mmio_map(s, 1, GRACKLE_BASE + 0x200000);
- /* PCI hole */
- memory_region_add_subregion(get_system_memory(), 0x80000000ULL,
- sysbus_mmio_get_region(s, 2));
- /* Register 2 MB of ISA IO space */
- memory_region_add_subregion(get_system_memory(), 0xfe000000,
- sysbus_mmio_get_region(s, 3));
-
for (i = 0; i < 4; i++) {
qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x15 + i));
}
--
2.20.1
next prev parent reply other threads:[~2020-12-29 17:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-29 17:56 [PATCH v2 0/7] macio: remove PIC object property links Mark Cave-Ayland
2020-12-29 17:56 ` [PATCH v2 1/7] mac_oldworld: remove duplicate bus check for PPC_INPUT(env) Mark Cave-Ayland
2020-12-29 17:56 ` Mark Cave-Ayland [this message]
2020-12-30 1:25 ` [PATCH v2 2/7] mac_oldworld: move initialisation of grackle before heathrow David Gibson
2020-12-29 17:56 ` [PATCH v2 3/7] macio: move heathrow PIC inside macio-oldworld device Mark Cave-Ayland
2020-12-30 1:36 ` David Gibson
2020-12-29 17:56 ` [PATCH v2 4/7] mac_newworld: delay wiring of PCI IRQs in New World machine Mark Cave-Ayland
2020-12-31 6:44 ` David Gibson
2020-12-29 17:56 ` [PATCH v2 5/7] macio: move OpenPIC inside macio-newworld device Mark Cave-Ayland
2020-12-31 6:48 ` David Gibson
2020-12-29 17:56 ` [PATCH v2 6/7] macio: wire macio GPIOs to OpenPIC using sysbus IRQs Mark Cave-Ayland
2020-12-29 17:56 ` [PATCH v2 7/7] macio: don't set user_creatable to false Mark Cave-Ayland
2021-01-07 14:26 ` [PATCH v2 0/7] macio: remove PIC object property links Mark Cave-Ayland
2021-01-07 23:24 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201229175619.6051-3-mark.cave-ayland@ilande.co.uk \
--to=mark.cave-ayland@ilande.co.uk \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).