From: David Gibson <david@gibson.dropbear.id.au>
To: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 03/19] uninorth: QOMify PCI and AGP host bridges
Date: Fri, 9 Mar 2018 11:32:38 +1100 [thread overview]
Message-ID: <20180309003238.GR3083@umbus.fritz.box> (raw)
In-Reply-To: <20180306203103.25563-4-mark.cave-ayland@ilande.co.uk>
[-- Attachment #1: Type: text/plain, Size: 7217 bytes --]
On Tue, Mar 06, 2018 at 08:30:47PM +0000, Mark Cave-Ayland wrote:
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Applied, thanks.
> ---
> hw/pci-host/uninorth.c | 79 ++++++++++++++++++++------------------------------
> 1 file changed, 32 insertions(+), 47 deletions(-)
>
> diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
> index 710818e355..1d4d3f5705 100644
> --- a/hw/pci-host/uninorth.c
> +++ b/hw/pci-host/uninorth.c
> @@ -129,72 +129,61 @@ static const MemoryRegionOps unin_data_ops = {
> .endianness = DEVICE_LITTLE_ENDIAN,
> };
>
> -static int pci_unin_main_init_device(SysBusDevice *dev)
> +static void pci_unin_main_init(Object *obj)
> {
> - PCIHostState *h;
> + SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> + PCIHostState *h = PCI_HOST_BRIDGE(obj);
>
> /* Use values found on a real PowerMac */
> /* Uninorth main bus */
> - h = PCI_HOST_BRIDGE(dev);
> -
> memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_le_ops,
> - dev, "pci-conf-idx", 0x1000);
> - memory_region_init_io(&h->data_mem, OBJECT(h), &unin_data_ops, dev,
> + obj, "pci-conf-idx", 0x1000);
> + memory_region_init_io(&h->data_mem, OBJECT(h), &unin_data_ops, obj,
> "pci-conf-data", 0x1000);
> - sysbus_init_mmio(dev, &h->conf_mem);
> - sysbus_init_mmio(dev, &h->data_mem);
> -
> - return 0;
> + sysbus_init_mmio(sbd, &h->conf_mem);
> + sysbus_init_mmio(sbd, &h->data_mem);
> }
>
> -
> -static int pci_u3_agp_init_device(SysBusDevice *dev)
> +static void pci_u3_agp_init(Object *obj)
> {
> - PCIHostState *h;
> + SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> + PCIHostState *h = PCI_HOST_BRIDGE(obj);
>
> /* Uninorth U3 AGP bus */
> - h = PCI_HOST_BRIDGE(dev);
> -
> memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_le_ops,
> - dev, "pci-conf-idx", 0x1000);
> - memory_region_init_io(&h->data_mem, OBJECT(h), &unin_data_ops, dev,
> + obj, "pci-conf-idx", 0x1000);
> + memory_region_init_io(&h->data_mem, OBJECT(h), &unin_data_ops, obj,
> "pci-conf-data", 0x1000);
> - sysbus_init_mmio(dev, &h->conf_mem);
> - sysbus_init_mmio(dev, &h->data_mem);
> -
> - return 0;
> + sysbus_init_mmio(sbd, &h->conf_mem);
> + sysbus_init_mmio(sbd, &h->data_mem);
> }
>
> -static int pci_unin_agp_init_device(SysBusDevice *dev)
> +static void pci_unin_agp_init(Object *obj)
> {
> - PCIHostState *h;
> + SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> + PCIHostState *h = PCI_HOST_BRIDGE(obj);
>
> /* Uninorth AGP bus */
> - h = PCI_HOST_BRIDGE(dev);
> -
> memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_le_ops,
> - dev, "pci-conf-idx", 0x1000);
> + obj, "pci-conf-idx", 0x1000);
> memory_region_init_io(&h->data_mem, OBJECT(h), &pci_host_data_le_ops,
> - dev, "pci-conf-data", 0x1000);
> - sysbus_init_mmio(dev, &h->conf_mem);
> - sysbus_init_mmio(dev, &h->data_mem);
> - return 0;
> + obj, "pci-conf-data", 0x1000);
> + sysbus_init_mmio(sbd, &h->conf_mem);
> + sysbus_init_mmio(sbd, &h->data_mem);
> }
>
> -static int pci_unin_internal_init_device(SysBusDevice *dev)
> +static void pci_unin_internal_init(Object *obj)
> {
> - PCIHostState *h;
> + SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> + PCIHostState *h = PCI_HOST_BRIDGE(obj);
>
> /* Uninorth internal bus */
> - h = PCI_HOST_BRIDGE(dev);
> -
> memory_region_init_io(&h->conf_mem, OBJECT(h), &pci_host_conf_le_ops,
> - dev, "pci-conf-idx", 0x1000);
> + obj, "pci-conf-idx", 0x1000);
> memory_region_init_io(&h->data_mem, OBJECT(h), &pci_host_data_le_ops,
> - dev, "pci-conf-data", 0x1000);
> - sysbus_init_mmio(dev, &h->conf_mem);
> - sysbus_init_mmio(dev, &h->data_mem);
> - return 0;
> + obj, "pci-conf-data", 0x1000);
> + sysbus_init_mmio(sbd, &h->conf_mem);
> + sysbus_init_mmio(sbd, &h->data_mem);
> }
>
> PCIBus *pci_pmac_init(qemu_irq *pic,
> @@ -461,10 +450,8 @@ static const TypeInfo unin_internal_pci_host_info = {
>
> static void pci_unin_main_class_init(ObjectClass *klass, void *data)
> {
> - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> DeviceClass *dc = DEVICE_CLASS(klass);
>
> - sbc->init = pci_unin_main_init_device;
> set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> }
>
> @@ -472,15 +459,14 @@ static const TypeInfo pci_unin_main_info = {
> .name = TYPE_UNI_NORTH_PCI_HOST_BRIDGE,
> .parent = TYPE_PCI_HOST_BRIDGE,
> .instance_size = sizeof(UNINState),
> + .instance_init = pci_unin_main_init,
> .class_init = pci_unin_main_class_init,
> };
>
> static void pci_u3_agp_class_init(ObjectClass *klass, void *data)
> {
> - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> DeviceClass *dc = DEVICE_CLASS(klass);
>
> - sbc->init = pci_u3_agp_init_device;
> set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> }
>
> @@ -488,15 +474,14 @@ static const TypeInfo pci_u3_agp_info = {
> .name = TYPE_U3_AGP_HOST_BRIDGE,
> .parent = TYPE_PCI_HOST_BRIDGE,
> .instance_size = sizeof(UNINState),
> + .instance_init = pci_u3_agp_init,
> .class_init = pci_u3_agp_class_init,
> };
>
> static void pci_unin_agp_class_init(ObjectClass *klass, void *data)
> {
> - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> DeviceClass *dc = DEVICE_CLASS(klass);
>
> - sbc->init = pci_unin_agp_init_device;
> set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> }
>
> @@ -504,15 +489,14 @@ static const TypeInfo pci_unin_agp_info = {
> .name = TYPE_UNI_NORTH_AGP_HOST_BRIDGE,
> .parent = TYPE_PCI_HOST_BRIDGE,
> .instance_size = sizeof(UNINState),
> + .instance_init = pci_unin_agp_init,
> .class_init = pci_unin_agp_class_init,
> };
>
> static void pci_unin_internal_class_init(ObjectClass *klass, void *data)
> {
> - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
> DeviceClass *dc = DEVICE_CLASS(klass);
>
> - sbc->init = pci_unin_internal_init_device;
> set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> }
>
> @@ -520,6 +504,7 @@ static const TypeInfo pci_unin_internal_info = {
> .name = TYPE_UNI_NORTH_INTERNAL_PCI_HOST_BRIDGE,
> .parent = TYPE_PCI_HOST_BRIDGE,
> .instance_size = sizeof(UNINState),
> + .instance_init = pci_unin_internal_init,
> .class_init = pci_unin_internal_class_init,
> };
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2018-03-09 0:46 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 20:30 [Qemu-devel] [PATCH 00/19] uninorth fixes/mac_newworld board wiring improvements Mark Cave-Ayland
2018-03-06 20:30 ` [Qemu-devel] [PATCH 01/19] uninorth: trivial style fixups Mark Cave-Ayland
2018-03-06 22:49 ` Philippe Mathieu-Daudé
2018-03-07 2:25 ` David Gibson
2018-03-06 20:30 ` [Qemu-devel] [PATCH 02/19] uninorth: remove second set of uninorth token registers Mark Cave-Ayland
2018-03-07 4:11 ` David Gibson
2018-03-06 20:30 ` [Qemu-devel] [PATCH 03/19] uninorth: QOMify PCI and AGP host bridges Mark Cave-Ayland
2018-03-09 0:32 ` David Gibson [this message]
2018-03-06 20:30 ` [Qemu-devel] [PATCH 04/19] uninorth: remove stray PCIBus realize from mac_newworld.c Mark Cave-Ayland
2018-03-09 0:35 ` David Gibson
2018-03-06 20:30 ` [Qemu-devel] [PATCH 05/19] uninorth: move uninorth definitions into uninorth.h Mark Cave-Ayland
2018-03-06 22:50 ` Philippe Mathieu-Daudé
2018-03-14 5:43 ` David Gibson
2018-03-06 20:30 ` [Qemu-devel] [PATCH 06/19] uninorth: alter pci_pmac_init() and pci_pmac_u3_init() to return uninorth device Mark Cave-Ayland
2018-03-12 10:59 ` Philippe Mathieu-Daudé
2018-03-14 5:44 ` David Gibson
2018-03-06 20:30 ` [Qemu-devel] [PATCH 07/19] uninorth: move PCI mmio memory region initialisation into init function Mark Cave-Ayland
2018-03-06 23:44 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
2018-03-07 7:02 ` Mark Cave-Ayland
2018-03-07 7:23 ` Mark Cave-Ayland
2018-03-06 20:30 ` [Qemu-devel] [PATCH 08/19] uninorth: introduce temporary pic_irqs device property Mark Cave-Ayland
2018-03-14 6:20 ` David Gibson
2018-03-06 20:30 ` [Qemu-devel] [PATCH 09/19] uninorth: move PCI host bridge bus initialisation into device realize Mark Cave-Ayland
2018-03-12 11:04 ` Philippe Mathieu-Daudé
2018-03-06 20:30 ` [Qemu-devel] [PATCH 10/19] uninorth: fix PCI and AGP bus mixup Mark Cave-Ayland
2018-03-06 20:30 ` [Qemu-devel] [PATCH 11/19] uninorth: enable internal PCI host bridge Mark Cave-Ayland
2018-03-06 20:30 ` [Qemu-devel] [PATCH 12/19] uninorth: remove obsolete pci_pmac_init() function Mark Cave-Ayland
2018-03-06 20:30 ` [Qemu-devel] [PATCH 13/19] uninorth: remove obsolete pci_pmac_u3_init() function Mark Cave-Ayland
2018-03-06 20:30 ` [Qemu-devel] [PATCH 14/19] uninorth: use object link to pass OpenPIC object to uninorth Mark Cave-Ayland
2018-03-06 20:30 ` [Qemu-devel] [PATCH 15/19] uninorth: move PCI IO (ISA) memory region into the uninorth device Mark Cave-Ayland
2018-03-12 11:01 ` Philippe Mathieu-Daudé
2018-03-06 20:31 ` [Qemu-devel] [PATCH 16/19] uninorth: rename UNINState to UNINHostState Mark Cave-Ayland
2018-03-06 22:52 ` Philippe Mathieu-Daudé
2018-03-06 20:31 ` [Qemu-devel] [PATCH 17/19] uninorth: create new uninorth device Mark Cave-Ayland
2018-03-21 3:29 ` David Gibson
2018-03-22 9:00 ` Philippe Mathieu-Daudé
2018-03-25 21:11 ` Mark Cave-Ayland
2018-04-06 5:33 ` Mark Cave-Ayland
2018-04-25 6:06 ` Mark Cave-Ayland
2018-04-25 6:34 ` David Gibson
2018-04-25 6:58 ` Mark Cave-Ayland
2018-04-25 14:35 ` Philippe Mathieu-Daudé
2018-04-26 3:06 ` David Gibson
2018-03-06 20:31 ` [Qemu-devel] [PATCH 18/19] mac_newworld: remove pics IRQ array and wire up macio to OpenPIC directly Mark Cave-Ayland
2018-03-21 3:40 ` David Gibson
2018-03-22 8:38 ` Philippe Mathieu-Daudé
2018-03-06 20:31 ` [Qemu-devel] [PATCH 19/19] mac_newworld: move wiring of macio IRQs to macio_newworld_realize() Mark Cave-Ayland
2018-03-21 3:42 ` David Gibson
2018-03-06 20:59 ` [Qemu-devel] [PATCH 00/19] uninorth fixes/mac_newworld board wiring improvements no-reply
2018-03-06 21:08 ` Mark Cave-Ayland
2018-03-14 5:40 ` David Gibson
2018-03-14 6:42 ` 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=20180309003238.GR3083@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).