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 913C1CA9EA0 for ; Fri, 18 Oct 2019 13:50:08 +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 6FE93222BD for ; Fri, 18 Oct 2019 13:50:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6FE93222BD 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 1iLSdj-0005Dw-18; Fri, 18 Oct 2019 13:49:59 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSdh-0005DX-UN for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:49:57 +0000 X-Inumbo-ID: 2a9d17cc-f1ae-11e9-a531-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2a9d17cc-f1ae-11e9-a531-bc764e2007e4; Fri, 18 Oct 2019 13:49:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17239C05AA6C; Fri, 18 Oct 2019 13:49:55 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 92E9660BF1; Fri, 18 Oct 2019 13:49:41 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:44 +0200 Message-Id: <20191018134754.16362-11-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 18 Oct 2019 13:49:55 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 10/20] 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: Stefano Stabellini , Marcel Apfelbaum , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlIE1hbHRhIGJvYXJkIGluc3RhbnRpYXRlIGEgUElJWDQgY2hpcHNldCBkb2luZyB2YXJpb3Vz CmNhbGxzLiBSZWZhY3RvciBhbGwgdGhvc2UgcmVsYXRlZCBjYWxscyBpbnRvIGEgc2luZ2xlCmZ1 bmN0aW9uOiBwaWl4NF9jcmVhdGUoKS4KClJldmlld2VkLWJ5OiBBbGVrc2FuZGFyIE1hcmtvdmlj IDxhbWFya292aWNAd2F2ZWNvbXAuY29tPgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwZSBNYXRoaWV1 LURhdWTDqSA8cGhpbG1kQHJlZGhhdC5jb20+Ci0tLQogaHcvbWlwcy9taXBzX21hbHRhLmMgfCA0 NyArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3 L21pcHMvbWlwc19tYWx0YS5jIGIvaHcvbWlwcy9taXBzX21hbHRhLmMKaW5kZXggNzc0YmI4MTBm Ni4uMGQ0MzEyODQwYiAxMDA2NDQKLS0tIGEvaHcvbWlwcy9taXBzX21hbHRhLmMKKysrIGIvaHcv bWlwcy9taXBzX21hbHRhLmMKQEAgLTEyMTAsNiArMTIxMCwzNCBAQCBzdGF0aWMgdm9pZCBtaXBz X2NyZWF0ZV9jcHUoTWFjaGluZVN0YXRlICptcywgTWFsdGFTdGF0ZSAqcywKICAgICB9CiB9CiAK K3N0YXRpYyBEZXZpY2VTdGF0ZSAqcGlpeDRfY3JlYXRlKFBDSUJ1cyAqcGNpX2J1cywgSVNBQnVz ICoqaXNhX2J1cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEkyQ0J1cyAqKnNt YnVzLCBzaXplX3QgaWRlX2J1c2VzKQoreworICAgIGNvbnN0IHNpemVfdCBpZGVfZHJpdmVzID0g aWRlX2J1c2VzICogTUFYX0lERV9ERVZTOworICAgIERyaXZlSW5mbyAqKmhkOworICAgIFBDSURl dmljZSAqcGNpOworICAgIERldmljZVN0YXRlICpkZXY7CisKKyAgICBwY2kgPSBwY2lfY3JlYXRl X3NpbXBsZV9tdWx0aWZ1bmN0aW9uKHBjaV9idXMsIFBDSV9ERVZGTigxMCwgMCksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLCBUWVBFX1BJSVg0X1BDSV9E RVZJQ0UpOworICAgIGRldiA9IERFVklDRShwY2kpOworICAgIGlmIChpc2FfYnVzKSB7CisgICAg ICAgICppc2FfYnVzID0gSVNBX0JVUyhxZGV2X2dldF9jaGlsZF9idXMoZGV2LCAiaXNhLjAiKSk7 CisgICAgfQorCisgICAgaGQgPSBnX25ldyhEcml2ZUluZm8gKiwgaWRlX2RyaXZlcyk7CisgICAg aWRlX2RyaXZlX2dldChoZCwgaWRlX2RyaXZlcyk7CisgICAgcGNpX3BpaXg0X2lkZV9pbml0KHBj aV9idXMsIGhkLCBwY2ktPmRldmZuICsgMSk7CisgICAgZ19mcmVlKGhkKTsKKyAgICBwY2lfY3Jl YXRlX3NpbXBsZShwY2lfYnVzLCBwY2ktPmRldmZuICsgMiwgInBpaXg0LXVzYi11aGNpIik7Cisg ICAgaWYgKHNtYnVzKSB7CisgICAgICAgICpzbWJ1cyA9IHBpaXg0X3BtX2luaXQocGNpX2J1cywg cGNpLT5kZXZmbiArIDMsIDB4MTEwMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp c2FfZ2V0X2lycShOVUxMLCA5KSwgTlVMTCwgMCwgTlVMTCk7CisgICB9CisKKyAgICByZXR1cm4g ZGV2OworfQorCiBzdGF0aWMKIHZvaWQgbWlwc19tYWx0YV9pbml0KE1hY2hpbmVTdGF0ZSAqbWFj aGluZSkKIHsKQEAgLTEyMzEsMTIgKzEyNTksOCBAQCB2b2lkIG1pcHNfbWFsdGFfaW5pdChNYWNo aW5lU3RhdGUgKm1hY2hpbmUpCiAgICAgUENJQnVzICpwY2lfYnVzOwogICAgIElTQUJ1cyAqaXNh X2J1czsKICAgICBxZW11X2lycSBjYnVzX2lycSwgaTgyNTlfaXJxOwotICAgIFBDSURldmljZSAq cGNpOwotICAgIGludCBwaWl4NF9kZXZmbjsKICAgICBJMkNCdXMgKnNtYnVzOwogICAgIERyaXZl SW5mbyAqZGluZm87Ci0gICAgY29uc3Qgc2l6ZV90IGlkZV9kcml2ZXMgPSBNQVhfSURFX0JVUyAq IE1BWF9JREVfREVWUzsKLSAgICBEcml2ZUluZm8gKipoZDsKICAgICBpbnQgZmxfaWR4ID0gMDsK ICAgICBpbnQgYmU7CiAKQEAgLTE0MDcsMTQgKzE0MzEsNyBAQCB2b2lkIG1pcHNfbWFsdGFfaW5p dChNYWNoaW5lU3RhdGUgKm1hY2hpbmUpCiAgICAgcGNpX2J1cyA9IGd0NjQxMjBfcmVnaXN0ZXIo cy0+aTgyNTkpOwogCiAgICAgLyogU291dGhicmlkZ2UgKi8KLSAgICBoZCA9IGdfbmV3KERyaXZl SW5mbyAqLCBpZGVfZHJpdmVzKTsKLSAgICBpZGVfZHJpdmVfZ2V0KGhkLCBpZGVfZHJpdmVzKTsK LQotICAgIHBjaSA9IHBjaV9jcmVhdGVfc2ltcGxlX211bHRpZnVuY3Rpb24ocGNpX2J1cywgUENJ X0RFVkZOKDEwLCAwKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHRydWUsIFRZUEVfUElJWDRfUENJX0RFVklDRSk7Ci0gICAgZGV2ID0gREVWSUNFKHBjaSk7Ci0g ICAgaXNhX2J1cyA9IElTQV9CVVMocWRldl9nZXRfY2hpbGRfYnVzKGRldiwgImlzYS4wIikpOwot ICAgIHBpaXg0X2RldmZuID0gcGNpLT5kZXZmbjsKKyAgICBkZXYgPSBwaWl4NF9jcmVhdGUocGNp X2J1cywgJmlzYV9idXMsICZzbWJ1cywgTUFYX0lERV9CVVMpOwogCiAgICAgLyogSW50ZXJydXB0 IGNvbnRyb2xsZXIgKi8KICAgICBxZGV2X2Nvbm5lY3RfZ3Bpb19vdXRfbmFtZWQoZGV2LCAiaW50 ciIsIDAsIGk4MjU5X2lycSk7CkBAIC0xNDIyLDEyICsxNDM5LDYgQEAgdm9pZCBtaXBzX21hbHRh X2luaXQoTWFjaGluZVN0YXRlICptYWNoaW5lKQogICAgICAgICBzLT5pODI1OVtpXSA9IHFkZXZf Z2V0X2dwaW9faW5fbmFtZWQoZGV2LCAiaXNhIiwgaSk7CiAgICAgfQogCi0gICAgcGNpX3BpaXg0 X2lkZV9pbml0KHBjaV9idXMsIGhkLCBwaWl4NF9kZXZmbiArIDEpOwotICAgIGdfZnJlZShoZCk7 Ci0gICAgcGNpX2NyZWF0ZV9zaW1wbGUocGNpX2J1cywgcGlpeDRfZGV2Zm4gKyAyLCAicGlpeDQt dXNiLXVoY2kiKTsKLSAgICBzbWJ1cyA9IHBpaXg0X3BtX2luaXQocGNpX2J1cywgcGlpeDRfZGV2 Zm4gKyAzLCAweDExMDAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGlzYV9nZXRfaXJxKE5V TEwsIDkpLCBOVUxMLCAwLCBOVUxMKTsKLQogICAgIC8qIGdlbmVyYXRlIFNQRCBFRVBST00gZGF0 YSAqLwogICAgIGdlbmVyYXRlX2VlcHJvbV9zcGQoJnNtYnVzX2VlcHJvbV9idWZbMCAqIDI1Nl0s IHJhbV9zaXplKTsKICAgICBnZW5lcmF0ZV9lZXByb21fc2VyaWFsKCZzbWJ1c19lZXByb21fYnVm WzYgKiAyNTZdKTsKLS0gCjIuMjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhl bnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5m by94ZW4tZGV2ZWw= 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 6F0F6CA9EA0 for ; Fri, 18 Oct 2019 13:53:51 +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 4567B222BD for ; Fri, 18 Oct 2019 13:53:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4567B222BD 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]:40406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLShS-0001OI-6K for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 09:53:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55051) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSdh-0004yz-GK for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSdg-0006IL-5N for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46744) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSdf-0006HY-Sp for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17239C05AA6C; Fri, 18 Oct 2019 13:49:55 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 92E9660BF1; Fri, 18 Oct 2019 13:49:41 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Message-Id: <20191018134754.16362-11-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 18 Oct 2019 13:49:55 +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: Stefano Stabellini , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost 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(). Reviewed-by: Aleksandar Markovic 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