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 BEBFDC10F14 for ; Tue, 15 Oct 2019 16:30:39 +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 9DE372086A for ; Tue, 15 Oct 2019 16:30:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DE372086A 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 1iKPiN-0004mO-O0; Tue, 15 Oct 2019 16:30:27 +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 1iKPiM-0004lf-Ft for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:30:26 +0000 X-Inumbo-ID: 1698ab2a-ef69-11e9-9397-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1698ab2a-ef69-11e9-9397-12813bfff9fa; Tue, 15 Oct 2019 16:30:24 +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 C849B3090FC2; Tue, 15 Oct 2019 16:30:23 +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 E754519C58; Tue, 15 Oct 2019 16:30:14 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:49 +0200 Message-Id: <20191015162705.28087-17-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:24 +0000 (UTC) Subject: [Xen-devel] [PATCH 16/32] piix4: add a mc146818rtc controller as specified in datasheet 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" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KClJlbW92ZSBt YzE0NjgxOHJ0YyBpbnN0YW5jaWF0ZWQgaW4gbWFsdGEgYm9hcmQsIHRvIG5vdCBoYXZlIGl0IHR3 aWNlLgoKQWNrZWQtYnk6IE1pY2hhZWwgUy4gVHNpcmtpbiA8bXN0QHJlZGhhdC5jb20+CkFja2Vk LWJ5OiBQYW9sbyBCb256aW5pIDxwYm9uemluaUByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBI ZXJ2w6kgUG91c3NpbmVhdSA8aHBvdXNzaW5AcmVhY3Rvcy5vcmc+Ck1lc3NhZ2UtSWQ6IDwyMDE3 MTIxNjA5MDIyOC4yODUwNS0xMy1ocG91c3NpbkByZWFjdG9zLm9yZz4KW1BNRDogcmViYXNlZCwg c2V0IFJUQyBiYXNlX3llYXIgdG8gMjAwMF0KU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGll dS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIE1BSU5UQUlORVJTICAgICAgICAgICAg ICAgICAgIHwgIDMgKystCiBody9hY3BpL3BpaXg0LmMgICAgICAgICAgICAgICB8ICAyICstCiBo dy9pMzg2L2FjcGktYnVpbGQuYyAgICAgICAgICB8ICAzICstLQogaHcvaTM4Ni9wY19waWl4LmMg ICAgICAgICAgICAgfCAgMSArCiBody9pc2EvcGlpeDQuYyAgICAgICAgICAgICAgICB8IDIyICsr KysrKysrKysrKysrKysrKysrKysKIGh3L21pcHMvbWlwc19tYWx0YS5jICAgICAgICAgIHwgIDQg Ky0tLQogaW5jbHVkZS9ody9hY3BpL3BpaXg0LmggICAgICAgfCAgNiAtLS0tLS0KIGluY2x1ZGUv aHcvaTM4Ni9wYy5oICAgICAgICAgIHwgIDYgLS0tLS0tCiBpbmNsdWRlL2h3L3NvdXRoYnJpZGdl L3BpaXguaCB8IDIwICsrKysrKysrKysrKysrKysrKysrCiA5IGZpbGVzIGNoYW5nZWQsIDQ4IGlu c2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQogZGVsZXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUv aHcvYWNwaS9waWl4NC5oCiBjcmVhdGUgbW9kZSAxMDA2NDQgaW5jbHVkZS9ody9zb3V0aGJyaWRn ZS9waWl4LmgKCmRpZmYgLS1naXQgYS9NQUlOVEFJTkVSUyBiL01BSU5UQUlORVJTCmluZGV4IGM5 ZjYyNWZjMmUuLjU1NmY1OGJkOGMgMTAwNjQ0Ci0tLSBhL01BSU5UQUlORVJTCisrKyBiL01BSU5U QUlORVJTCkBAIC0xMjM1LDcgKzEyMzUsNyBAQCBGOiBody9pMmMvc21idXNfaWNoOS5jCiBGOiBo dy9hY3BpL3BpaXg0LmMKIEY6IGh3L2FjcGkvaWNoOS5jCiBGOiBpbmNsdWRlL2h3L2FjcGkvaWNo OS5oCi1GOiBpbmNsdWRlL2h3L2FjcGkvcGlpeDQuaAorRjogaW5jbHVkZS9ody9zb3V0aGJyaWRn ZS9waWl4LmgKIEY6IGh3L21pc2Mvc2dhLmMKIEY6IGh3L2lzYS9hcG0uYwogRjogaW5jbHVkZS9o dy9pc2EvYXBtLmgKQEAgLTE3MjAsNiArMTcyMCw3IEBAIE06IEhlcnbDqSBQb3Vzc2luZWF1IDxo cG91c3NpbkByZWFjdG9zLm9yZz4KIE06IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxmNGJ1Z0Bh bXNhdC5vcmc+CiBTOiBNYWludGFpbmVkCiBGOiBody9pc2EvcGlpeDQuYworRjogaW5jbHVkZS9o dy9zb3V0aGJyaWRnZS9waWl4LmgKIAogRmlybXdhcmUgY29uZmlndXJhdGlvbiAoZndfY2ZnKQog TTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgpkaWZmIC0tZ2l0 IGEvaHcvYWNwaS9waWl4NC5jIGIvaHcvYWNwaS9waWl4NC5jCmluZGV4IDFkMjlkNDM4YzcuLjI3 MjcwNjIxYWIgMTAwNjQ0Ci0tLSBhL2h3L2FjcGkvcGlpeDQuYworKysgYi9ody9hY3BpL3BpaXg0 LmMKQEAgLTIxLDYgKzIxLDcgQEAKIAogI2luY2x1ZGUgInFlbXUvb3NkZXAuaCIKICNpbmNsdWRl ICJody9pMzg2L3BjLmgiCisjaW5jbHVkZSAiaHcvc291dGhicmlkZ2UvcGlpeC5oIgogI2luY2x1 ZGUgImh3L2lycS5oIgogI2luY2x1ZGUgImh3L2lzYS9hcG0uaCIKICNpbmNsdWRlICJody9pMmMv cG1fc21idXMuaCIKQEAgLTMzLDcgKzM0LDYgQEAKICNpbmNsdWRlICJxYXBpL2Vycm9yLmgiCiAj aW5jbHVkZSAicWVtdS9yYW5nZS5oIgogI2luY2x1ZGUgImV4ZWMvYWRkcmVzcy1zcGFjZXMuaCIK LSNpbmNsdWRlICJody9hY3BpL3BpaXg0LmgiCiAjaW5jbHVkZSAiaHcvYWNwaS9wY2locC5oIgog I2luY2x1ZGUgImh3L2FjcGkvY3B1X2hvdHBsdWcuaCIKICNpbmNsdWRlICJody9hY3BpL2NwdS5o IgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMgYi9ody9pMzg2L2FjcGktYnVpbGQu YwppbmRleCA0ZTBmOWY0MjVhLi5hYTZmZTYxMTkxIDEwMDY0NAotLS0gYS9ody9pMzg2L2FjcGkt YnVpbGQuYworKysgYi9ody9pMzg2L2FjcGktYnVpbGQuYwpAQCAtMzQsNyArMzQsNiBAQAogI2lu Y2x1ZGUgImh3L2FjcGkvYWNwaS1kZWZzLmgiCiAjaW5jbHVkZSAiaHcvYWNwaS9hY3BpLmgiCiAj aW5jbHVkZSAiaHcvYWNwaS9jcHUuaCIKLSNpbmNsdWRlICJody9hY3BpL3BpaXg0LmgiCiAjaW5j bHVkZSAiaHcvbnZyYW0vZndfY2ZnLmgiCiAjaW5jbHVkZSAiaHcvYWNwaS9iaW9zLWxpbmtlci1s b2FkZXIuaCIKICNpbmNsdWRlICJody9pc2EvaXNhLmgiCkBAIC01Miw3ICs1MSw3IEBACiAjaW5j bHVkZSAic3lzZW11L3Jlc2V0LmgiCiAKIC8qIFN1cHBvcnRlZCBjaGlwc2V0czogKi8KLSNpbmNs dWRlICJody9hY3BpL3BpaXg0LmgiCisjaW5jbHVkZSAiaHcvc291dGhicmlkZ2UvcGlpeC5oIgog I2luY2x1ZGUgImh3L2FjcGkvcGNpaHAuaCIKICNpbmNsdWRlICJody9pMzg2L2ljaDkuaCIKICNp bmNsdWRlICJody9wY2kvcGNpX2J1cy5oIgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9wY19waWl4LmMg Yi9ody9pMzg2L3BjX3BpaXguYwppbmRleCA2ODI0YjcyMTI0Li40MzE5NjVkOTIxIDEwMDY0NAot LS0gYS9ody9pMzg2L3BjX3BpaXguYworKysgYi9ody9pMzg2L3BjX3BpaXguYwpAQCAtMjksNiAr MjksNyBAQAogI2luY2x1ZGUgImh3L2xvYWRlci5oIgogI2luY2x1ZGUgImh3L2kzODYvcGMuaCIK ICNpbmNsdWRlICJody9pMzg2L2FwaWMuaCIKKyNpbmNsdWRlICJody9zb3V0aGJyaWRnZS9waWl4 LmgiCiAjaW5jbHVkZSAiaHcvZGlzcGxheS9yYW1mYi5oIgogI2luY2x1ZGUgImh3L2Zpcm13YXJl L3NtYmlvcy5oIgogI2luY2x1ZGUgImh3L3BjaS9wY2kuaCIKZGlmZiAtLWdpdCBhL2h3L2lzYS9w aWl4NC5jIGIvaHcvaXNhL3BpaXg0LmMKaW5kZXggMGIwYTBlY2FiMS4uOWY1NTQ3NDdhZiAxMDA2 NDQKLS0tIGEvaHcvaXNhL3BpaXg0LmMKKysrIGIvaHcvaXNhL3BpaXg0LmMKQEAgLTI0LDYgKzI0 LDcgQEAKICAqLwogCiAjaW5jbHVkZSAicWVtdS9vc2RlcC5oIgorI2luY2x1ZGUgInFhcGkvZXJy b3IuaCIKICNpbmNsdWRlICJody9pcnEuaCIKICNpbmNsdWRlICJody9pMzg2L3BjLmgiCiAjaW5j bHVkZSAiaHcvcGNpL3BjaS5oIgpAQCAtMzEsNiArMzIsNyBAQAogI2luY2x1ZGUgImh3L3N5c2J1 cy5oIgogI2luY2x1ZGUgImh3L2RtYS9pODI1Ny5oIgogI2luY2x1ZGUgImh3L3RpbWVyL2k4MjU0 LmgiCisjaW5jbHVkZSAiaHcvdGltZXIvbWMxNDY4MThydGMuaCIKICNpbmNsdWRlICJtaWdyYXRp b24vdm1zdGF0ZS5oIgogI2luY2x1ZGUgInN5c2VtdS9yZXNldC5oIgogI2luY2x1ZGUgInN5c2Vt dS9ydW5zdGF0ZS5oIgpAQCAtNDIsNiArNDQsNyBAQCB0eXBlZGVmIHN0cnVjdCBQSUlYNFN0YXRl IHsKICAgICBxZW11X2lycSBjcHVfaW50cjsKICAgICBxZW11X2lycSAqaXNhOwogCisgICAgUlRD U3RhdGUgcnRjOwogICAgIC8qIFJlc2V0IENvbnRyb2wgUmVnaXN0ZXIgKi8KICAgICBNZW1vcnlS ZWdpb24gcmNyX21lbTsKICAgICB1aW50OF90IHJjcjsKQEAgLTE0NCw2ICsxNDcsNyBAQCBzdGF0 aWMgdm9pZCBwaWl4NF9yZWFsaXplKFBDSURldmljZSAqcGNpX2RldiwgRXJyb3IgKiplcnJwKQog ICAgIFBJSVg0U3RhdGUgKnMgPSBET19VUENBU1QoUElJWDRTdGF0ZSwgZGV2LCBwY2lfZGV2KTsK ICAgICBJU0FCdXMgKmlzYV9idXM7CiAgICAgcWVtdV9pcnEgKmk4MjU5X291dF9pcnE7CisgICAg RXJyb3IgKmVyciA9IE5VTEw7CiAKICAgICBpc2FfYnVzID0gaXNhX2J1c19uZXcoZGV2LCBwY2lf YWRkcmVzc19zcGFjZShwY2lfZGV2KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgcGNpX2Fk ZHJlc3Nfc3BhY2VfaW8ocGNpX2RldiksIGVycnApOwpAQCAtMTcyLDkgKzE3NiwyNiBAQCBzdGF0 aWMgdm9pZCBwaWl4NF9yZWFsaXplKFBDSURldmljZSAqcGNpX2RldiwgRXJyb3IgKiplcnJwKQog ICAgIC8qIERNQSAqLwogICAgIGk4MjU3X2RtYV9pbml0KGlzYV9idXMsIDApOwogCisgICAgLyog UlRDICovCisgICAgcWRldl9zZXRfcGFyZW50X2J1cyhERVZJQ0UoJnMtPnJ0YyksIEJVUyhpc2Ff YnVzKSk7CisgICAgcWRldl9wcm9wX3NldF9pbnQzMihERVZJQ0UoJnMtPnJ0YyksICJiYXNlX3ll YXIiLCAyMDAwKTsKKyAgICBvYmplY3RfcHJvcGVydHlfc2V0X2Jvb2woT0JKRUNUKCZzLT5ydGMp LCB0cnVlLCAicmVhbGl6ZWQiLCAmZXJyKTsKKyAgICBpZiAoZXJyKSB7CisgICAgICAgIGVycm9y X3Byb3BhZ2F0ZShlcnJwLCBlcnIpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGlzYV9p bml0X2lycShJU0FfREVWSUNFKCZzLT5ydGMpLCAmcy0+cnRjLmlycSwgUlRDX0lTQV9JUlEpOwor CiAgICAgcGlpeDRfZGV2ID0gcGNpX2RldjsKIH0KIAorc3RhdGljIHZvaWQgcGlpeDRfaW5pdChP YmplY3QgKm9iaikKK3sKKyAgICBQSUlYNFN0YXRlICpzID0gUElJWDRfUENJX0RFVklDRShvYmop OworCisgICAgb2JqZWN0X2luaXRpYWxpemUoJnMtPnJ0Yywgc2l6ZW9mKHMtPnJ0YyksIFRZUEVf TUMxNDY4MThfUlRDKTsKK30KKwogc3RhdGljIHZvaWQgcGlpeDRfY2xhc3NfaW5pdChPYmplY3RD bGFzcyAqa2xhc3MsIHZvaWQgKmRhdGEpCiB7CiAgICAgRGV2aWNlQ2xhc3MgKmRjID0gREVWSUNF X0NMQVNTKGtsYXNzKTsKQEAgLTE5OSw2ICsyMjAsNyBAQCBzdGF0aWMgY29uc3QgVHlwZUluZm8g cGlpeDRfaW5mbyA9IHsKICAgICAubmFtZSAgICAgICAgICA9IFRZUEVfUElJWDRfUENJX0RFVklD RSwKICAgICAucGFyZW50ICAgICAgICA9IFRZUEVfUENJX0RFVklDRSwKICAgICAuaW5zdGFuY2Vf c2l6ZSA9IHNpemVvZihQSUlYNFN0YXRlKSwKKyAgICAuaW5zdGFuY2VfaW5pdCA9IHBpaXg0X2lu aXQsCiAgICAgLmNsYXNzX2luaXQgICAgPSBwaWl4NF9jbGFzc19pbml0LAogICAgIC5pbnRlcmZh Y2VzID0gKEludGVyZmFjZUluZm9bXSkgewogICAgICAgICB7IElOVEVSRkFDRV9DT05WRU5USU9O QUxfUENJX0RFVklDRSB9LApkaWZmIC0tZ2l0IGEvaHcvbWlwcy9taXBzX21hbHRhLmMgYi9ody9t aXBzL21pcHNfbWFsdGEuYwppbmRleCAxNmQ3YTBlNzg1Li41MjhjMzRhMWMzIDEwMDY0NAotLS0g YS9ody9taXBzL21pcHNfbWFsdGEuYworKysgYi9ody9taXBzL21pcHNfbWFsdGEuYwpAQCAtMjYs NyArMjYsNyBAQAogI2luY2x1ZGUgInFlbXUvdW5pdHMuaCIKICNpbmNsdWRlICJxZW11LWNvbW1v bi5oIgogI2luY2x1ZGUgImNwdS5oIgotI2luY2x1ZGUgImh3L2kzODYvcGMuaCIKKyNpbmNsdWRl ICJody9zb3V0aGJyaWRnZS9waWl4LmgiCiAjaW5jbHVkZSAiaHcvaXNhL3N1cGVyaW8uaCIKICNp bmNsdWRlICJody9jaGFyL3NlcmlhbC5oIgogI2luY2x1ZGUgIm5ldC9uZXQuaCIKQEAgLTQ0LDcg KzQ0LDYgQEAKICNpbmNsdWRlICJody9pcnEuaCIKICNpbmNsdWRlICJody9sb2FkZXIuaCIKICNp bmNsdWRlICJlbGYuaCIKLSNpbmNsdWRlICJody90aW1lci9tYzE0NjgxOHJ0Yy5oIgogI2luY2x1 ZGUgImV4ZWMvYWRkcmVzcy1zcGFjZXMuaCIKICNpbmNsdWRlICJody9zeXNidXMuaCIgICAgICAg ICAgICAgLyogU3lzQnVzRGV2aWNlICovCiAjaW5jbHVkZSAicWVtdS9ob3N0LXV0aWxzLmgiCkBA IC0xNDI1LDcgKzE0MjQsNiBAQCB2b2lkIG1pcHNfbWFsdGFfaW5pdChNYWNoaW5lU3RhdGUgKm1h Y2hpbmUpCiAgICAgcGNpX2NyZWF0ZV9zaW1wbGUocGNpX2J1cywgcGlpeDRfZGV2Zm4gKyAyLCAi cGlpeDQtdXNiLXVoY2kiKTsKICAgICBzbWJ1cyA9IHBpaXg0X3BtX2luaXQocGNpX2J1cywgcGlp eDRfZGV2Zm4gKyAzLCAweDExMDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIGlzYV9nZXRf aXJxKE5VTEwsIDkpLCBOVUxMLCAwLCBOVUxMKTsKLSAgICBtYzE0NjgxOF9ydGNfaW5pdChpc2Ff YnVzLCAyMDAwLCBOVUxMKTsKIAogICAgIC8qIGdlbmVyYXRlIFNQRCBFRVBST00gZGF0YSAqLwog ICAgIGdlbmVyYXRlX2VlcHJvbV9zcGQoJnNtYnVzX2VlcHJvbV9idWZbMCAqIDI1Nl0sIHJhbV9z aXplKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcvYWNwaS9waWl4NC5oIGIvaW5jbHVkZS9ody9h Y3BpL3BpaXg0LmgKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAyOGJiNTNlM2QuLjAw MDAwMDAwMDAKLS0tIGEvaW5jbHVkZS9ody9hY3BpL3BpaXg0LmgKKysrIC9kZXYvbnVsbApAQCAt MSw2ICswLDAgQEAKLSNpZm5kZWYgSFdfQUNQSV9QSUlYNF9ICi0jZGVmaW5lIEhXX0FDUElfUElJ WDRfSAotCi0jZGVmaW5lIFRZUEVfUElJWDRfUE0gIlBJSVg0X1BNIgotCi0jZW5kaWYKZGlmZiAt LWdpdCBhL2luY2x1ZGUvaHcvaTM4Ni9wYy5oIGIvaW5jbHVkZS9ody9pMzg2L3BjLmgKaW5kZXgg YTk1ZWFiMGQ4YS4uYzY3MWM5ZmQyYSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ody9pMzg2L3BjLmgK KysrIGIvaW5jbHVkZS9ody9pMzg2L3BjLmgKQEAgLTI0NCwxMiArMjQ0LDYgQEAgaW50IGNtb3Nf Z2V0X2ZkX2RyaXZlX3R5cGUoRmxvcHB5RHJpdmVUeXBlIGZkMCk7CiAKICNkZWZpbmUgUE9SVDky X0EyMF9MSU5FICJhMjAiCiAKLS8qIGFjcGlfcGlpeC5jICovCi0KLUkyQ0J1cyAqcGlpeDRfcG1f aW5pdChQQ0lCdXMgKmJ1cywgaW50IGRldmZuLCB1aW50MzJfdCBzbWJfaW9fYmFzZSwKLSAgICAg ICAgICAgICAgICAgICAgICBxZW11X2lycSBzY2lfaXJxLCBxZW11X2lycSBzbWlfaXJxLAotICAg ICAgICAgICAgICAgICAgICAgIGludCBzbW1fZW5hYmxlZCwgRGV2aWNlU3RhdGUgKipwaWl4NF9w bSk7Ci0KIC8qIGhwZXQuYyAqLwogZXh0ZXJuIGludCBub19ocGV0OwogCmRpZmYgLS1naXQgYS9p bmNsdWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaCBiL2luY2x1ZGUvaHcvc291dGhicmlkZ2UvcGlp eC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLmI4Y2UyNmZlYzQKLS0t IC9kZXYvbnVsbAorKysgYi9pbmNsdWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaApAQCAtMCwwICsx LDIwIEBACisvKgorICogUUVNVSBQSUlYIFNvdXRoIEJyaWRnZSBFbXVsYXRpb24KKyAqCisgKiBD b3B5cmlnaHQgKGMpIDIwMDYgRmFicmljZSBCZWxsYXJkCisgKgorICogVGhpcyB3b3JrIGlzIGxp Y2Vuc2VkIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdQTCwgdmVyc2lvbiAyIG9yIGxhdGVy LgorICogU2VlIHRoZSBDT1BZSU5HIGZpbGUgaW4gdGhlIHRvcC1sZXZlbCBkaXJlY3RvcnkuCisg KgorICovCisKKyNpZm5kZWYgSFdfU09VVEhCUklER0VfUElJWF9ICisjZGVmaW5lIEhXX1NPVVRI QlJJREdFX1BJSVhfSAorCisjZGVmaW5lIFRZUEVfUElJWDRfUE0gIlBJSVg0X1BNIgorCitJMkNC dXMgKnBpaXg0X3BtX2luaXQoUENJQnVzICpidXMsIGludCBkZXZmbiwgdWludDMyX3Qgc21iX2lv X2Jhc2UsCisgICAgICAgICAgICAgICAgICAgICAgcWVtdV9pcnEgc2NpX2lycSwgcWVtdV9pcnEg c21pX2lycSwKKyAgICAgICAgICAgICAgICAgICAgICBpbnQgc21tX2VuYWJsZWQsIERldmljZVN0 YXRlICoqcGlpeDRfcG0pOworCisjZW5kaWYKLS0gCjIuMjEuMAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= 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 A3216C10F14 for ; Tue, 15 Oct 2019 16:30:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76A7D2086A for ; Tue, 15 Oct 2019 16:30:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388054AbfJOQaY (ORCPT ); Tue, 15 Oct 2019 12:30:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43910 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387919AbfJOQaY (ORCPT ); Tue, 15 Oct 2019 12:30:24 -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 C849B3090FC2; Tue, 15 Oct 2019 16:30:23 +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 E754519C58; Tue, 15 Oct 2019 16:30:14 +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?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 16/32] piix4: add a mc146818rtc controller as specified in datasheet Date: Tue, 15 Oct 2019 18:26:49 +0200 Message-Id: <20191015162705.28087-17-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:24 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Philippe Mathieu-Daudé Remove mc146818rtc instanciated in malta board, to not have it twice. Acked-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Hervé Poussineau Message-Id: <20171216090228.28505-13-hpoussin@reactos.org> [PMD: rebased, set RTC base_year to 2000] Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 3 ++- hw/acpi/piix4.c | 2 +- hw/i386/acpi-build.c | 3 +-- hw/i386/pc_piix.c | 1 + hw/isa/piix4.c | 22 ++++++++++++++++++++++ hw/mips/mips_malta.c | 4 +--- include/hw/acpi/piix4.h | 6 ------ include/hw/i386/pc.h | 6 ------ include/hw/southbridge/piix.h | 20 ++++++++++++++++++++ 9 files changed, 48 insertions(+), 19 deletions(-) delete mode 100644 include/hw/acpi/piix4.h create mode 100644 include/hw/southbridge/piix.h diff --git a/MAINTAINERS b/MAINTAINERS index c9f625fc2e..556f58bd8c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1235,7 +1235,7 @@ F: hw/i2c/smbus_ich9.c F: hw/acpi/piix4.c F: hw/acpi/ich9.c F: include/hw/acpi/ich9.h -F: include/hw/acpi/piix4.h +F: include/hw/southbridge/piix.h F: hw/misc/sga.c F: hw/isa/apm.c F: include/hw/isa/apm.h @@ -1720,6 +1720,7 @@ M: Hervé Poussineau M: Philippe Mathieu-Daudé S: Maintained F: hw/isa/piix4.c +F: include/hw/southbridge/piix.h Firmware configuration (fw_cfg) M: Philippe Mathieu-Daudé diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 1d29d438c7..27270621ab 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/i386/pc.h" +#include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" @@ -33,7 +34,6 @@ #include "qapi/error.h" #include "qemu/range.h" #include "exec/address-spaces.h" -#include "hw/acpi/piix4.h" #include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4e0f9f425a..aa6fe61191 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -34,7 +34,6 @@ #include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu.h" -#include "hw/acpi/piix4.h" #include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/isa/isa.h" @@ -52,7 +51,7 @@ #include "sysemu/reset.h" /* Supported chipsets: */ -#include "hw/acpi/piix4.h" +#include "hw/southbridge/piix.h" #include "hw/acpi/pcihp.h" #include "hw/i386/ich9.h" #include "hw/pci/pci_bus.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6824b72124..431965d921 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -29,6 +29,7 @@ #include "hw/loader.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" +#include "hw/southbridge/piix.h" #include "hw/display/ramfb.h" #include "hw/firmware/smbios.h" #include "hw/pci/pci.h" diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 0b0a0ecab1..9f554747af 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/irq.h" #include "hw/i386/pc.h" #include "hw/pci/pci.h" @@ -31,6 +32,7 @@ #include "hw/sysbus.h" #include "hw/dma/i8257.h" #include "hw/timer/i8254.h" +#include "hw/timer/mc146818rtc.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -42,6 +44,7 @@ typedef struct PIIX4State { qemu_irq cpu_intr; qemu_irq *isa; + RTCState rtc; /* Reset Control Register */ MemoryRegion rcr_mem; uint8_t rcr; @@ -144,6 +147,7 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp) PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev); ISABus *isa_bus; qemu_irq *i8259_out_irq; + Error *err = NULL; isa_bus = isa_bus_new(dev, pci_address_space(pci_dev), pci_address_space_io(pci_dev), errp); @@ -172,9 +176,26 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp) /* DMA */ i8257_dma_init(isa_bus, 0); + /* RTC */ + qdev_set_parent_bus(DEVICE(&s->rtc), BUS(isa_bus)); + qdev_prop_set_int32(DEVICE(&s->rtc), "base_year", 2000); + object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, RTC_ISA_IRQ); + piix4_dev = pci_dev; } +static void piix4_init(Object *obj) +{ + PIIX4State *s = PIIX4_PCI_DEVICE(obj); + + object_initialize(&s->rtc, sizeof(s->rtc), TYPE_MC146818_RTC); +} + static void piix4_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -199,6 +220,7 @@ static const TypeInfo piix4_info = { .name = TYPE_PIIX4_PCI_DEVICE, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIX4State), + .instance_init = piix4_init, .class_init = piix4_class_init, .interfaces = (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 16d7a0e785..528c34a1c3 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -26,7 +26,7 @@ #include "qemu/units.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/i386/pc.h" +#include "hw/southbridge/piix.h" #include "hw/isa/superio.h" #include "hw/char/serial.h" #include "net/net.h" @@ -44,7 +44,6 @@ #include "hw/irq.h" #include "hw/loader.h" #include "elf.h" -#include "hw/timer/mc146818rtc.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" @@ -1425,7 +1424,6 @@ void mips_malta_init(MachineState *machine) 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); - mc146818_rtc_init(isa_bus, 2000, NULL); /* generate SPD EEPROM data */ generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size); diff --git a/include/hw/acpi/piix4.h b/include/hw/acpi/piix4.h deleted file mode 100644 index 028bb53e3d..0000000000 --- a/include/hw/acpi/piix4.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef HW_ACPI_PIIX4_H -#define HW_ACPI_PIIX4_H - -#define TYPE_PIIX4_PM "PIIX4_PM" - -#endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a95eab0d8a..c671c9fd2a 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -244,12 +244,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); #define PORT92_A20_LINE "a20" -/* acpi_piix.c */ - -I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq sci_irq, qemu_irq smi_irq, - int smm_enabled, DeviceState **piix4_pm); - /* hpet.c */ extern int no_hpet; diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h new file mode 100644 index 0000000000..b8ce26fec4 --- /dev/null +++ b/include/hw/southbridge/piix.h @@ -0,0 +1,20 @@ +/* + * QEMU PIIX South Bridge Emulation + * + * Copyright (c) 2006 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef HW_SOUTHBRIDGE_PIIX_H +#define HW_SOUTHBRIDGE_PIIX_H + +#define TYPE_PIIX4_PM "PIIX4_PM" + +I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, + qemu_irq sci_irq, qemu_irq smi_irq, + int smm_enabled, DeviceState **piix4_pm); + +#endif -- 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, 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 708A0ECE596 for ; Tue, 15 Oct 2019 16:40:33 +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 49B6820650 for ; Tue, 15 Oct 2019 16:40:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 49B6820650 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]:52796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPs7-000625-PQ for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:40:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41636) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPiM-000335-PB for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPiL-0005n1-0r for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57694) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPiK-0005mb-N2 for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:24 -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 C849B3090FC2; Tue, 15 Oct 2019 16:30:23 +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 E754519C58; Tue, 15 Oct 2019 16:30:14 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 16/32] piix4: add a mc146818rtc controller as specified in datasheet Date: Tue, 15 Oct 2019 18:26:49 +0200 Message-Id: <20191015162705.28087-17-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:24 +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" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" From: Philippe Mathieu-Daud=C3=A9 Remove mc146818rtc instanciated in malta board, to not have it twice. Acked-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Herv=C3=A9 Poussineau Message-Id: <20171216090228.28505-13-hpoussin@reactos.org> [PMD: rebased, set RTC base_year to 2000] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 3 ++- hw/acpi/piix4.c | 2 +- hw/i386/acpi-build.c | 3 +-- hw/i386/pc_piix.c | 1 + hw/isa/piix4.c | 22 ++++++++++++++++++++++ hw/mips/mips_malta.c | 4 +--- include/hw/acpi/piix4.h | 6 ------ include/hw/i386/pc.h | 6 ------ include/hw/southbridge/piix.h | 20 ++++++++++++++++++++ 9 files changed, 48 insertions(+), 19 deletions(-) delete mode 100644 include/hw/acpi/piix4.h create mode 100644 include/hw/southbridge/piix.h diff --git a/MAINTAINERS b/MAINTAINERS index c9f625fc2e..556f58bd8c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1235,7 +1235,7 @@ F: hw/i2c/smbus_ich9.c F: hw/acpi/piix4.c F: hw/acpi/ich9.c F: include/hw/acpi/ich9.h -F: include/hw/acpi/piix4.h +F: include/hw/southbridge/piix.h F: hw/misc/sga.c F: hw/isa/apm.c F: include/hw/isa/apm.h @@ -1720,6 +1720,7 @@ M: Herv=C3=A9 Poussineau M: Philippe Mathieu-Daud=C3=A9 S: Maintained F: hw/isa/piix4.c +F: include/hw/southbridge/piix.h =20 Firmware configuration (fw_cfg) M: Philippe Mathieu-Daud=C3=A9 diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 1d29d438c7..27270621ab 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -21,6 +21,7 @@ =20 #include "qemu/osdep.h" #include "hw/i386/pc.h" +#include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" @@ -33,7 +34,6 @@ #include "qapi/error.h" #include "qemu/range.h" #include "exec/address-spaces.h" -#include "hw/acpi/piix4.h" #include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4e0f9f425a..aa6fe61191 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -34,7 +34,6 @@ #include "hw/acpi/acpi-defs.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu.h" -#include "hw/acpi/piix4.h" #include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/isa/isa.h" @@ -52,7 +51,7 @@ #include "sysemu/reset.h" =20 /* Supported chipsets: */ -#include "hw/acpi/piix4.h" +#include "hw/southbridge/piix.h" #include "hw/acpi/pcihp.h" #include "hw/i386/ich9.h" #include "hw/pci/pci_bus.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6824b72124..431965d921 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -29,6 +29,7 @@ #include "hw/loader.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" +#include "hw/southbridge/piix.h" #include "hw/display/ramfb.h" #include "hw/firmware/smbios.h" #include "hw/pci/pci.h" diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 0b0a0ecab1..9f554747af 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -24,6 +24,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/irq.h" #include "hw/i386/pc.h" #include "hw/pci/pci.h" @@ -31,6 +32,7 @@ #include "hw/sysbus.h" #include "hw/dma/i8257.h" #include "hw/timer/i8254.h" +#include "hw/timer/mc146818rtc.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -42,6 +44,7 @@ typedef struct PIIX4State { qemu_irq cpu_intr; qemu_irq *isa; =20 + RTCState rtc; /* Reset Control Register */ MemoryRegion rcr_mem; uint8_t rcr; @@ -144,6 +147,7 @@ static void piix4_realize(PCIDevice *pci_dev, Error *= *errp) PIIX4State *s =3D DO_UPCAST(PIIX4State, dev, pci_dev); ISABus *isa_bus; qemu_irq *i8259_out_irq; + Error *err =3D NULL; =20 isa_bus =3D isa_bus_new(dev, pci_address_space(pci_dev), pci_address_space_io(pci_dev), errp); @@ -172,9 +176,26 @@ static void piix4_realize(PCIDevice *pci_dev, Error = **errp) /* DMA */ i8257_dma_init(isa_bus, 0); =20 + /* RTC */ + qdev_set_parent_bus(DEVICE(&s->rtc), BUS(isa_bus)); + qdev_prop_set_int32(DEVICE(&s->rtc), "base_year", 2000); + object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, RTC_ISA_IRQ); + piix4_dev =3D pci_dev; } =20 +static void piix4_init(Object *obj) +{ + PIIX4State *s =3D PIIX4_PCI_DEVICE(obj); + + object_initialize(&s->rtc, sizeof(s->rtc), TYPE_MC146818_RTC); +} + static void piix4_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -199,6 +220,7 @@ static const TypeInfo piix4_info =3D { .name =3D TYPE_PIIX4_PCI_DEVICE, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PIIX4State), + .instance_init =3D piix4_init, .class_init =3D piix4_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 16d7a0e785..528c34a1c3 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -26,7 +26,7 @@ #include "qemu/units.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/i386/pc.h" +#include "hw/southbridge/piix.h" #include "hw/isa/superio.h" #include "hw/char/serial.h" #include "net/net.h" @@ -44,7 +44,6 @@ #include "hw/irq.h" #include "hw/loader.h" #include "elf.h" -#include "hw/timer/mc146818rtc.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" @@ -1425,7 +1424,6 @@ void mips_malta_init(MachineState *machine) 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); - mc146818_rtc_init(isa_bus, 2000, NULL); =20 /* generate SPD EEPROM data */ generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size); diff --git a/include/hw/acpi/piix4.h b/include/hw/acpi/piix4.h deleted file mode 100644 index 028bb53e3d..0000000000 --- a/include/hw/acpi/piix4.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef HW_ACPI_PIIX4_H -#define HW_ACPI_PIIX4_H - -#define TYPE_PIIX4_PM "PIIX4_PM" - -#endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a95eab0d8a..c671c9fd2a 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -244,12 +244,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); =20 #define PORT92_A20_LINE "a20" =20 -/* acpi_piix.c */ - -I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq sci_irq, qemu_irq smi_irq, - int smm_enabled, DeviceState **piix4_pm); - /* hpet.c */ extern int no_hpet; =20 diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.= h new file mode 100644 index 0000000000..b8ce26fec4 --- /dev/null +++ b/include/hw/southbridge/piix.h @@ -0,0 +1,20 @@ +/* + * QEMU PIIX South Bridge Emulation + * + * Copyright (c) 2006 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef HW_SOUTHBRIDGE_PIIX_H +#define HW_SOUTHBRIDGE_PIIX_H + +#define TYPE_PIIX4_PM "PIIX4_PM" + +I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, + qemu_irq sci_irq, qemu_irq smi_irq, + int smm_enabled, DeviceState **piix4_pm); + +#endif --=20 2.21.0