From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Stefano Stabellini" <sstabellini@kernel.org>, "Michael S. Tsirkin" <mst@redhat.com>, "Paul Durrant" <paul@xen.org>, "Paolo Bonzini" <pbonzini@redhat.com>, "Hervé Poussineau" <hpoussin@reactos.org>, "Aleksandar Markovic" <amarkovic@wavecomp.com>, "Igor Mammedov" <imammedo@redhat.com>, "Anthony Perard" <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "Richard Henderson" <rth@twiddle.net>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net>, "Eduardo Habkost" <ehabkost@redhat.com> Subject: [PATCH v2 10/20] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create() Date: Fri, 18 Oct 2019 15:47:44 +0200 [thread overview] Message-ID: <20191018134754.16362-11-philmd@redhat.com> (raw) In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> The Malta board instantiate a PIIX4 chipset doing various calls. Refactor all those related calls into a single function: piix4_create(). Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/mips/mips_malta.c | 47 +++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 774bb810f6..0d4312840b 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1210,6 +1210,34 @@ static void mips_create_cpu(MachineState *ms, MaltaState *s, } } +static DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, + I2CBus **smbus, size_t ide_buses) +{ + const size_t ide_drives = ide_buses * MAX_IDE_DEVS; + DriveInfo **hd; + PCIDevice *pci; + DeviceState *dev; + + pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), + true, TYPE_PIIX4_PCI_DEVICE); + dev = DEVICE(pci); + if (isa_bus) { + *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); + } + + hd = g_new(DriveInfo *, ide_drives); + ide_drive_get(hd, ide_drives); + pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); + g_free(hd); + pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci"); + if (smbus) { + *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100, + isa_get_irq(NULL, 9), NULL, 0, NULL); + } + + return dev; +} + static void mips_malta_init(MachineState *machine) { @@ -1231,12 +1259,8 @@ void mips_malta_init(MachineState *machine) PCIBus *pci_bus; ISABus *isa_bus; qemu_irq cbus_irq, i8259_irq; - PCIDevice *pci; - int piix4_devfn; I2CBus *smbus; DriveInfo *dinfo; - const size_t ide_drives = MAX_IDE_BUS * MAX_IDE_DEVS; - DriveInfo **hd; int fl_idx = 0; int be; @@ -1407,14 +1431,7 @@ void mips_malta_init(MachineState *machine) pci_bus = gt64120_register(s->i8259); /* Southbridge */ - hd = g_new(DriveInfo *, ide_drives); - ide_drive_get(hd, ide_drives); - - pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), - true, TYPE_PIIX4_PCI_DEVICE); - dev = DEVICE(pci); - isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); - piix4_devfn = pci->devfn; + dev = piix4_create(pci_bus, &isa_bus, &smbus, MAX_IDE_BUS); /* Interrupt controller */ qdev_connect_gpio_out_named(dev, "intr", 0, i8259_irq); @@ -1422,12 +1439,6 @@ void mips_malta_init(MachineState *machine) s->i8259[i] = qdev_get_gpio_in_named(dev, "isa", i); } - pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); - g_free(hd); - pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); - smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, - isa_get_irq(NULL, 9), NULL, 0, NULL); - /* generate SPD EEPROM data */ generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size); generate_eeprom_serial(&smbus_eeprom_buf[6 * 256]); -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Stefano Stabellini" <sstabellini@kernel.org>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Paul Durrant" <paul@xen.org>, "Paolo Bonzini" <pbonzini@redhat.com>, "Hervé Poussineau" <hpoussin@reactos.org>, "Aleksandar Markovic" <amarkovic@wavecomp.com>, "Igor Mammedov" <imammedo@redhat.com>, "Anthony Perard" <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "Richard Henderson" <rth@twiddle.net>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net>, "Eduardo Habkost" <ehabkost@redhat.com> Subject: [Xen-devel] [PATCH v2 10/20] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create() Date: Fri, 18 Oct 2019 15:47:44 +0200 [thread overview] Message-ID: <20191018134754.16362-11-philmd@redhat.com> (raw) In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> The Malta board instantiate a PIIX4 chipset doing various calls. Refactor all those related calls into a single function: piix4_create(). Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/mips/mips_malta.c | 47 +++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 774bb810f6..0d4312840b 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1210,6 +1210,34 @@ static void mips_create_cpu(MachineState *ms, MaltaState *s, } } +static DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, + I2CBus **smbus, size_t ide_buses) +{ + const size_t ide_drives = ide_buses * MAX_IDE_DEVS; + DriveInfo **hd; + PCIDevice *pci; + DeviceState *dev; + + pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), + true, TYPE_PIIX4_PCI_DEVICE); + dev = DEVICE(pci); + if (isa_bus) { + *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); + } + + hd = g_new(DriveInfo *, ide_drives); + ide_drive_get(hd, ide_drives); + pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); + g_free(hd); + pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci"); + if (smbus) { + *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100, + isa_get_irq(NULL, 9), NULL, 0, NULL); + } + + return dev; +} + static void mips_malta_init(MachineState *machine) { @@ -1231,12 +1259,8 @@ void mips_malta_init(MachineState *machine) PCIBus *pci_bus; ISABus *isa_bus; qemu_irq cbus_irq, i8259_irq; - PCIDevice *pci; - int piix4_devfn; I2CBus *smbus; DriveInfo *dinfo; - const size_t ide_drives = MAX_IDE_BUS * MAX_IDE_DEVS; - DriveInfo **hd; int fl_idx = 0; int be; @@ -1407,14 +1431,7 @@ void mips_malta_init(MachineState *machine) pci_bus = gt64120_register(s->i8259); /* Southbridge */ - hd = g_new(DriveInfo *, ide_drives); - ide_drive_get(hd, ide_drives); - - pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), - true, TYPE_PIIX4_PCI_DEVICE); - dev = DEVICE(pci); - isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); - piix4_devfn = pci->devfn; + dev = piix4_create(pci_bus, &isa_bus, &smbus, MAX_IDE_BUS); /* Interrupt controller */ qdev_connect_gpio_out_named(dev, "intr", 0, i8259_irq); @@ -1422,12 +1439,6 @@ void mips_malta_init(MachineState *machine) s->i8259[i] = qdev_get_gpio_in_named(dev, "isa", i); } - pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); - g_free(hd); - pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); - smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, - isa_get_irq(NULL, 9), NULL, 0, NULL); - /* generate SPD EEPROM data */ generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size); generate_eeprom_serial(&smbus_eeprom_buf[6 * 256]); -- 2.21.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-10-18 13:53 UTC|newest] Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-18 13:47 [PATCH v2 00/20] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 01/20] MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-21 0:54 ` Li Qiang 2019-10-21 0:54 ` [Xen-devel] " Li Qiang 2019-10-18 13:47 ` [PATCH v2 02/20] piix4: Add the Reset Control Register Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-21 1:25 ` Li Qiang 2019-10-21 1:25 ` [Xen-devel] " Li Qiang 2019-10-21 8:37 ` Philippe Mathieu-Daudé 2019-10-21 8:37 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 03/20] piix4: Add a i8259 Interrupt Controller as specified in datasheet Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-21 14:59 ` Li Qiang 2019-10-21 14:59 ` [Xen-devel] " Li Qiang 2019-10-26 14:29 ` Philippe Mathieu-Daudé 2019-10-26 14:29 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-22 8:44 ` Esteban Bosse 2019-10-22 8:44 ` [Xen-devel] " Esteban Bosse 2019-10-22 9:35 ` Philippe Mathieu-Daudé 2019-10-22 9:35 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-23 18:53 ` Esteban Bosse 2019-10-23 18:53 ` [Xen-devel] " Esteban Bosse 2019-10-22 8:48 ` Esteban Bosse 2019-10-22 8:48 ` [Xen-devel] " Esteban Bosse 2019-10-22 9:24 ` Philippe Mathieu-Daudé 2019-10-22 9:24 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-22 9:42 ` Peter Maydell 2019-10-22 9:42 ` [Xen-devel] " Peter Maydell 2019-10-23 18:52 ` Esteban Bosse 2019-10-23 18:52 ` [Xen-devel] " Esteban Bosse 2019-10-22 9:53 ` Aleksandar Markovic 2019-10-22 9:53 ` [Xen-devel] " Aleksandar Markovic 2019-10-22 10:09 ` Philippe Mathieu-Daudé 2019-10-22 10:09 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 04/20] Revert "irq: introduce qemu_irq_proxy()" Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-21 15:18 ` Li Qiang 2019-10-21 15:18 ` [Xen-devel] " Li Qiang 2019-10-22 8:50 ` Esteban Bosse 2019-10-22 8:50 ` [Xen-devel] " Esteban Bosse 2019-10-18 13:47 ` [PATCH v2 05/20] piix4: Rename PIIX4 object to piix4-isa Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-21 15:19 ` Li Qiang 2019-10-21 15:19 ` [Xen-devel] " Li Qiang 2019-10-22 8:57 ` Esteban Bosse 2019-10-22 8:57 ` [Xen-devel] " Esteban Bosse 2019-10-18 13:47 ` [PATCH v2 06/20] piix4: Add a i8257 DMA Controller as specified in datasheet Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-21 15:25 ` Li Qiang 2019-10-21 15:25 ` [Xen-devel] " Li Qiang 2019-10-21 15:56 ` Philippe Mathieu-Daudé 2019-10-21 15:56 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-22 9:01 ` Esteban Bosse 2019-10-22 9:01 ` [Xen-devel] " Esteban Bosse 2019-10-18 13:47 ` [PATCH v2 07/20] piix4: Add a i8254 PIT " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 08/20] piix4: Add a MC146818 RTC " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 09/20] hw/mips/mips_malta: Create IDE hard drive array dynamically Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-21 15:28 ` Li Qiang 2019-10-21 15:28 ` [Xen-devel] " Li Qiang 2019-10-18 13:47 ` Philippe Mathieu-Daudé [this message] 2019-10-18 13:47 ` [Xen-devel] [PATCH v2 10/20] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create() Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 11/20] hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 12/20] hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 13/20] hw/pci-host/piix: Extract piix3_create() Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-22 9:33 ` Esteban Bosse 2019-10-22 9:33 ` [Xen-devel] " Esteban Bosse 2019-10-18 13:47 ` [PATCH v2 14/20] hw/pci-host/piix: Move RCR_IOPORT register definition Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 15/20] hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 16/20] hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 17/20] hw/pci-host/piix: Fix code style issues Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-22 9:39 ` Esteban Bosse 2019-10-22 9:39 ` [Xen-devel] " Esteban Bosse 2019-10-18 13:47 ` [PATCH v2 18/20] hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 19/20] hw/pci-host: Rename incorrectly named 'piix' as 'i440fx' Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 13:47 ` [PATCH v2 20/20] hw/pci-host/i440fx: Remove the last PIIX3 traces Philippe Mathieu-Daudé 2019-10-18 13:47 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-18 17:04 ` Aleksandar Markovic 2019-10-18 17:04 ` [Xen-devel] " Aleksandar Markovic 2019-10-19 15:22 ` Philippe Mathieu-Daudé 2019-10-19 15:22 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-19 10:50 ` [PATCH v2 00/20] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge no-reply 2019-10-19 10:50 ` [Xen-devel] " no-reply 2019-10-19 15:15 ` Aleksandar Markovic 2019-10-19 15:15 ` [Xen-devel] " Aleksandar Markovic 2019-10-24 19:55 ` Aleksandar Markovic 2019-10-24 19:55 ` [Xen-devel] " Aleksandar Markovic 2019-10-25 10:51 ` Aleksandar Markovic 2019-10-25 10:51 ` [Xen-devel] " Aleksandar Markovic 2019-10-26 14:39 ` Philippe Mathieu-Daudé 2019-10-26 14:39 ` [Xen-devel] " Philippe Mathieu-Daudé 2019-10-26 15:17 ` Aleksandar Markovic 2019-10-26 15:17 ` [Xen-devel] " Aleksandar Markovic
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=20191018134754.16362-11-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=aleksandar.rikalo@rt-rk.com \ --cc=amarkovic@wavecomp.com \ --cc=anthony.perard@citrix.com \ --cc=aurelien@aurel32.net \ --cc=ehabkost@redhat.com \ --cc=hpoussin@reactos.org \ --cc=imammedo@redhat.com \ --cc=mst@redhat.com \ --cc=paul@xen.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=sstabellini@kernel.org \ --cc=xen-devel@lists.xenproject.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.