From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A83ECECE588 for ; Tue, 15 Oct 2019 16:30:58 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 876AD2086A for ; Tue, 15 Oct 2019 16:30:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 876AD2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPii-0004yl-Cy; Tue, 15 Oct 2019 16:30:48 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPih-0004xz-1U for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:30:47 +0000 X-Inumbo-ID: 23b84019-ef69-11e9-9397-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 23b84019-ef69-11e9-9397-12813bfff9fa; Tue, 15 Oct 2019 16:30:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1F817308FBAC; Tue, 15 Oct 2019 16:30:46 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22B6819C5B; Tue, 15 Oct 2019 16:30:35 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:51 +0200 Message-Id: <20191015162705.28087-19-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:30:46 +0000 (UTC) Subject: [Xen-devel] [PATCH 18/32] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlIE1hbHRhIGJvYXJkIGluc3RhbnRpYXRlIGEgUElJWDQgY2hpcHNldCBkb2luZyB2YXJpb3Vz CmNhbGxzLiBSZWZhY3RvciBhbGwgdGhvc2UgcmVsYXRlZCBjYWxscyBpbnRvIGEgc2luZ2xlCmZ1 bmN0aW9uOiBwaWl4NF9jcmVhdGUoKS4KClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUt RGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBody9taXBzL21pcHNfbWFsdGEuYyB8IDQ3 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcv bWlwcy9taXBzX21hbHRhLmMgYi9ody9taXBzL21pcHNfbWFsdGEuYwppbmRleCA3NzRiYjgxMGY2 Li4wZDQzMTI4NDBiIDEwMDY0NAotLS0gYS9ody9taXBzL21pcHNfbWFsdGEuYworKysgYi9ody9t aXBzL21pcHNfbWFsdGEuYwpAQCAtMTIxMCw2ICsxMjEwLDM0IEBAIHN0YXRpYyB2b2lkIG1pcHNf Y3JlYXRlX2NwdShNYWNoaW5lU3RhdGUgKm1zLCBNYWx0YVN0YXRlICpzLAogICAgIH0KIH0KIAor c3RhdGljIERldmljZVN0YXRlICpwaWl4NF9jcmVhdGUoUENJQnVzICpwY2lfYnVzLCBJU0FCdXMg Kippc2FfYnVzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSTJDQnVzICoqc21i dXMsIHNpemVfdCBpZGVfYnVzZXMpCit7CisgICAgY29uc3Qgc2l6ZV90IGlkZV9kcml2ZXMgPSBp ZGVfYnVzZXMgKiBNQVhfSURFX0RFVlM7CisgICAgRHJpdmVJbmZvICoqaGQ7CisgICAgUENJRGV2 aWNlICpwY2k7CisgICAgRGV2aWNlU3RhdGUgKmRldjsKKworICAgIHBjaSA9IHBjaV9jcmVhdGVf c2ltcGxlX211bHRpZnVuY3Rpb24ocGNpX2J1cywgUENJX0RFVkZOKDEwLCAwKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRydWUsIFRZUEVfUElJWDRfUENJX0RF VklDRSk7CisgICAgZGV2ID0gREVWSUNFKHBjaSk7CisgICAgaWYgKGlzYV9idXMpIHsKKyAgICAg ICAgKmlzYV9idXMgPSBJU0FfQlVTKHFkZXZfZ2V0X2NoaWxkX2J1cyhkZXYsICJpc2EuMCIpKTsK KyAgICB9CisKKyAgICBoZCA9IGdfbmV3KERyaXZlSW5mbyAqLCBpZGVfZHJpdmVzKTsKKyAgICBp ZGVfZHJpdmVfZ2V0KGhkLCBpZGVfZHJpdmVzKTsKKyAgICBwY2lfcGlpeDRfaWRlX2luaXQocGNp X2J1cywgaGQsIHBjaS0+ZGV2Zm4gKyAxKTsKKyAgICBnX2ZyZWUoaGQpOworICAgIHBjaV9jcmVh dGVfc2ltcGxlKHBjaV9idXMsIHBjaS0+ZGV2Zm4gKyAyLCAicGlpeDQtdXNiLXVoY2kiKTsKKyAg ICBpZiAoc21idXMpIHsKKyAgICAgICAgKnNtYnVzID0gcGlpeDRfcG1faW5pdChwY2lfYnVzLCBw Y2ktPmRldmZuICsgMywgMHgxMTAwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlz YV9nZXRfaXJxKE5VTEwsIDkpLCBOVUxMLCAwLCBOVUxMKTsKKyAgIH0KKworICAgIHJldHVybiBk ZXY7Cit9CisKIHN0YXRpYwogdm9pZCBtaXBzX21hbHRhX2luaXQoTWFjaGluZVN0YXRlICptYWNo aW5lKQogewpAQCAtMTIzMSwxMiArMTI1OSw4IEBAIHZvaWQgbWlwc19tYWx0YV9pbml0KE1hY2hp bmVTdGF0ZSAqbWFjaGluZSkKICAgICBQQ0lCdXMgKnBjaV9idXM7CiAgICAgSVNBQnVzICppc2Ff YnVzOwogICAgIHFlbXVfaXJxIGNidXNfaXJxLCBpODI1OV9pcnE7Ci0gICAgUENJRGV2aWNlICpw Y2k7Ci0gICAgaW50IHBpaXg0X2RldmZuOwogICAgIEkyQ0J1cyAqc21idXM7CiAgICAgRHJpdmVJ bmZvICpkaW5mbzsKLSAgICBjb25zdCBzaXplX3QgaWRlX2RyaXZlcyA9IE1BWF9JREVfQlVTICog TUFYX0lERV9ERVZTOwotICAgIERyaXZlSW5mbyAqKmhkOwogICAgIGludCBmbF9pZHggPSAwOwog ICAgIGludCBiZTsKIApAQCAtMTQwNywxNCArMTQzMSw3IEBAIHZvaWQgbWlwc19tYWx0YV9pbml0 KE1hY2hpbmVTdGF0ZSAqbWFjaGluZSkKICAgICBwY2lfYnVzID0gZ3Q2NDEyMF9yZWdpc3Rlcihz LT5pODI1OSk7CiAKICAgICAvKiBTb3V0aGJyaWRnZSAqLwotICAgIGhkID0gZ19uZXcoRHJpdmVJ bmZvICosIGlkZV9kcml2ZXMpOwotICAgIGlkZV9kcml2ZV9nZXQoaGQsIGlkZV9kcml2ZXMpOwot Ci0gICAgcGNpID0gcGNpX2NyZWF0ZV9zaW1wbGVfbXVsdGlmdW5jdGlvbihwY2lfYnVzLCBQQ0lf REVWRk4oMTAsIDApLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dHJ1ZSwgVFlQRV9QSUlYNF9QQ0lfREVWSUNFKTsKLSAgICBkZXYgPSBERVZJQ0UocGNpKTsKLSAg ICBpc2FfYnVzID0gSVNBX0JVUyhxZGV2X2dldF9jaGlsZF9idXMoZGV2LCAiaXNhLjAiKSk7Ci0g ICAgcGlpeDRfZGV2Zm4gPSBwY2ktPmRldmZuOworICAgIGRldiA9IHBpaXg0X2NyZWF0ZShwY2lf YnVzLCAmaXNhX2J1cywgJnNtYnVzLCBNQVhfSURFX0JVUyk7CiAKICAgICAvKiBJbnRlcnJ1cHQg Y29udHJvbGxlciAqLwogICAgIHFkZXZfY29ubmVjdF9ncGlvX291dF9uYW1lZChkZXYsICJpbnRy IiwgMCwgaTgyNTlfaXJxKTsKQEAgLTE0MjIsMTIgKzE0MzksNiBAQCB2b2lkIG1pcHNfbWFsdGFf aW5pdChNYWNoaW5lU3RhdGUgKm1hY2hpbmUpCiAgICAgICAgIHMtPmk4MjU5W2ldID0gcWRldl9n ZXRfZ3Bpb19pbl9uYW1lZChkZXYsICJpc2EiLCBpKTsKICAgICB9CiAKLSAgICBwY2lfcGlpeDRf aWRlX2luaXQocGNpX2J1cywgaGQsIHBpaXg0X2RldmZuICsgMSk7Ci0gICAgZ19mcmVlKGhkKTsK LSAgICBwY2lfY3JlYXRlX3NpbXBsZShwY2lfYnVzLCBwaWl4NF9kZXZmbiArIDIsICJwaWl4NC11 c2ItdWhjaSIpOwotICAgIHNtYnVzID0gcGlpeDRfcG1faW5pdChwY2lfYnVzLCBwaWl4NF9kZXZm biArIDMsIDB4MTEwMCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgaXNhX2dldF9pcnEoTlVM TCwgOSksIE5VTEwsIDAsIE5VTEwpOwotCiAgICAgLyogZ2VuZXJhdGUgU1BEIEVFUFJPTSBkYXRh ICovCiAgICAgZ2VuZXJhdGVfZWVwcm9tX3NwZCgmc21idXNfZWVwcm9tX2J1ZlswICogMjU2XSwg cmFtX3NpemUpOwogICAgIGdlbmVyYXRlX2VlcHJvbV9zZXJpYWwoJnNtYnVzX2VlcHJvbV9idWZb NiAqIDI1Nl0pOwotLSAKMi4yMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVu cHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZv L3hlbi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85B55C10F14 for ; Tue, 15 Oct 2019 16:30:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 67C082086A for ; Tue, 15 Oct 2019 16:30:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388056AbfJOQaq (ORCPT ); Tue, 15 Oct 2019 12:30:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44114 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727651AbfJOQaq (ORCPT ); Tue, 15 Oct 2019 12:30:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1F817308FBAC; Tue, 15 Oct 2019 16:30:46 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22B6819C5B; Tue, 15 Oct 2019 16:30:35 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , Eduardo Habkost , Thomas Huth , Igor Mammedov , Anthony Perard , Stefano Stabellini , Paul Durrant , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , xen-devel@lists.xenproject.org, Laurent Vivier , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 18/32] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create() Date: Tue, 15 Oct 2019 18:26:51 +0200 Message-Id: <20191015162705.28087-19-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:30:46 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The Malta board instantiate a PIIX4 chipset doing various calls. Refactor all those related calls into a single function: piix4_create(). Signed-off-by: Philippe Mathieu-Daudé --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 787D0ECE588 for ; Tue, 15 Oct 2019 16:43:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07B5420650 for ; Tue, 15 Oct 2019 16:43:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07B5420650 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52835 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPub-0001Q6-Fp for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:43:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41673) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPii-0003Rn-EP for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPih-00062w-9E for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57900) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPig-00062S-Vz for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:47 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1F817308FBAC; Tue, 15 Oct 2019 16:30:46 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22B6819C5B; Tue, 15 Oct 2019 16:30:35 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 18/32] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create() Date: Tue, 15 Oct 2019 18:26:51 +0200 Message-Id: <20191015162705.28087-19-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:30:46 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The Malta board instantiate a PIIX4 chipset doing various calls. Refactor all those related calls into a single function: piix4_create(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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, Malt= aState *s, } } =20 +static DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, + I2CBus **smbus, size_t ide_buses) +{ + const size_t ide_drives =3D ide_buses * MAX_IDE_DEVS; + DriveInfo **hd; + PCIDevice *pci; + DeviceState *dev; + + pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), + true, TYPE_PIIX4_PCI_DEVICE); + dev =3D DEVICE(pci); + if (isa_bus) { + *isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); + } + + hd =3D 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 =3D 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 =3D MAX_IDE_BUS * MAX_IDE_DEVS; - DriveInfo **hd; int fl_idx =3D 0; int be; =20 @@ -1407,14 +1431,7 @@ void mips_malta_init(MachineState *machine) pci_bus =3D gt64120_register(s->i8259); =20 /* Southbridge */ - hd =3D g_new(DriveInfo *, ide_drives); - ide_drive_get(hd, ide_drives); - - pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), - true, TYPE_PIIX4_PCI_DEVICE); - dev =3D DEVICE(pci); - isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); - piix4_devfn =3D pci->devfn; + dev =3D piix4_create(pci_bus, &isa_bus, &smbus, MAX_IDE_BUS); =20 /* 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] =3D qdev_get_gpio_in_named(dev, "isa", i); } =20 - 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 =3D 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]); --=20 2.21.0