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 4/7] mac_newworld: delay wiring of PCI IRQs in New World machine
Date: Sat, 19 Dec 2020 10:42:26 +0000 [thread overview]
Message-ID: <20201219104229.1964-5-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20201219104229.1964-1-mark.cave-ayland@ilande.co.uk>
This is to prepare for moving the OpenPIC device into the macio-newworld
device.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/ppc/mac_newworld.c | 46 ++++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index c0accda592..708bb2f1ab 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -139,6 +139,7 @@ static void ppc_core99_init(MachineState *machine)
int machine_arch;
SysBusDevice *s;
DeviceState *dev, *pic_dev;
+ DeviceState *uninorth_internal_dev = NULL, *uninorth_agp_dev = NULL;
hwaddr nvram_addr = 0xFFF04000;
uint64_t tbfreq;
unsigned int smp_cpus = machine->smp.cpus;
@@ -320,35 +321,24 @@ static void ppc_core99_init(MachineState *machine)
sysbus_mmio_map(s, 0, 0xf0800000);
sysbus_mmio_map(s, 1, 0xf0c00000);
- for (i = 0; i < 4; i++) {
- qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
- }
-
machine_arch = ARCH_MAC99_U3;
} else {
/* Use values found on a real PowerMac */
/* Uninorth AGP bus */
- dev = qdev_new(TYPE_UNI_NORTH_AGP_HOST_BRIDGE);
- s = SYS_BUS_DEVICE(dev);
+ uninorth_agp_dev = qdev_new(TYPE_UNI_NORTH_AGP_HOST_BRIDGE);
+ s = SYS_BUS_DEVICE(uninorth_agp_dev);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, 0xf0800000);
sysbus_mmio_map(s, 1, 0xf0c00000);
- for (i = 0; i < 4; i++) {
- qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
- }
-
/* Uninorth internal bus */
- dev = qdev_new(TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE);
- s = SYS_BUS_DEVICE(dev);
+ uninorth_internal_dev = qdev_new(
+ TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE);
+ s = SYS_BUS_DEVICE(uninorth_internal_dev);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, 0xf4800000);
sysbus_mmio_map(s, 1, 0xf4c00000);
- for (i = 0; i < 4; i++) {
- qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
- }
-
/* Uninorth main bus */
dev = qdev_new(TYPE_UNI_NORTH_PCI_HOST_BRIDGE);
qdev_prop_set_uint32(dev, "ofw-addr", 0xf2000000);
@@ -364,10 +354,6 @@ static void ppc_core99_init(MachineState *machine)
sysbus_mmio_map(s, 0, 0xf2800000);
sysbus_mmio_map(s, 1, 0xf2c00000);
- for (i = 0; i < 4; i++) {
- qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(pic_dev, 0x1b + i));
- }
-
machine_arch = ARCH_MAC99;
}
@@ -401,6 +387,26 @@ static void ppc_core99_init(MachineState *machine)
pci_realize_and_unref(macio, pci_bus, &error_fatal);
+ for (i = 0; i < 4; i++) {
+ qdev_connect_gpio_out(DEVICE(uninorth_pci), i,
+ qdev_get_gpio_in(pic_dev, 0x1b + i));
+ }
+
+ /* TODO: additional PCI buses only wired up for 32-bit machines */
+ if (PPC_INPUT(env) != PPC_FLAGS_INPUT_970) {
+ /* Uninorth AGP bus */
+ for (i = 0; i < 4; i++) {
+ qdev_connect_gpio_out(uninorth_agp_dev, i,
+ qdev_get_gpio_in(pic_dev, 0x1b + i));
+ }
+
+ /* Uninorth internal bus */
+ for (i = 0; i < 4; i++) {
+ qdev_connect_gpio_out(uninorth_internal_dev, i,
+ qdev_get_gpio_in(pic_dev, 0x1b + i));
+ }
+ }
+
/* We only emulate 2 out of 3 IDE controllers for now */
ide_drive_get(hd, ARRAY_SIZE(hd));
--
2.20.1
next prev parent reply other threads:[~2020-12-19 10:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 10:42 [PATCH 0/7] macio: remove PIC object property links Mark Cave-Ayland
2020-12-19 10:42 ` [PATCH 1/7] mac_oldworld: remove duplicate bus check for PPC_INPUT(env) Mark Cave-Ayland
2020-12-28 7:06 ` David Gibson
2020-12-19 10:42 ` [PATCH 2/7] mac_oldworld: move initialisation of grackle before heathrow Mark Cave-Ayland
2020-12-28 7:07 ` David Gibson
2020-12-29 14:07 ` Mark Cave-Ayland
2020-12-19 10:42 ` [PATCH 3/7] macio: move heathrow PIC inside macio-oldworld device Mark Cave-Ayland
2020-12-28 7:08 ` David Gibson
2020-12-29 14:12 ` Mark Cave-Ayland
2020-12-19 10:42 ` Mark Cave-Ayland [this message]
2020-12-19 10:42 ` [PATCH 5/7] macio: move OpenPIC inside macio-newworld device Mark Cave-Ayland
2020-12-19 10:42 ` [PATCH 6/7] macio: wire macio GPIOs to OpenPIC using sysbus IRQs Mark Cave-Ayland
2020-12-19 10:42 ` [PATCH 7/7] macio: don't set user_creatable to false Mark Cave-Ayland
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=20201219104229.1964-5-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).