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 144C8CA9EA0 for ; Fri, 18 Oct 2019 13:49:43 +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 E25D8222BD for ; Fri, 18 Oct 2019 13:49:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E25D8222BD 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 1iLSdH-00053t-8w; Fri, 18 Oct 2019 13:49:31 +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 1iLSdG-00053M-0c for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:49:30 +0000 X-Inumbo-ID: 1a9b29ce-f1ae-11e9-93f5-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1a9b29ce-f1ae-11e9-93f5-12813bfff9fa; Fri, 18 Oct 2019 13:49:29 +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 154BC11A1F; Fri, 18 Oct 2019 13:49:29 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4969460BF4; Fri, 18 Oct 2019 13:49:17 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:42 +0200 Message-Id: <20191018134754.16362-9-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.28]); Fri, 18 Oct 2019 13:49:29 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 08/20] piix4: Add a MC146818 RTC 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: Stefano Stabellini , Marcel Apfelbaum , "Michael S. Tsirkin" , Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KClJlbW92ZSBt YzE0NjgxOHJ0YyBpbnN0YW5jaWF0ZWQgaW4gbWFsdGEgYm9hcmQsIHRvIG5vdCBoYXZlIGl0IHR3 aWNlLgoKQWNrZWQtYnk6IE1pY2hhZWwgUy4gVHNpcmtpbiA8bXN0QHJlZGhhdC5jb20+CkFja2Vk LWJ5OiBQYW9sbyBCb256aW5pIDxwYm9uemluaUByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBI ZXJ2w6kgUG91c3NpbmVhdSA8aHBvdXNzaW5AcmVhY3Rvcy5vcmc+Ck1lc3NhZ2UtSWQ6IDwyMDE3 MTIxNjA5MDIyOC4yODUwNS0xMy1ocG91c3NpbkByZWFjdG9zLm9yZz4KW1BNRDogcmViYXNlZCwg c2V0IFJUQyBiYXNlX3llYXIgdG8gMjAwMF0KUmV2aWV3ZWQtYnk6IEFsZWtzYW5kYXIgTWFya292 aWMgPGFtYXJrb3ZpY0B3YXZlY29tcC5jb20+ClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhp ZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBNQUlOVEFJTkVSUyAgICAgICAgICAg ICAgICAgICB8ICAzICsrLQogaHcvYWNwaS9waWl4NC5jICAgICAgICAgICAgICAgfCAgMiArLQog aHcvaTM4Ni9hY3BpLWJ1aWxkLmMgICAgICAgICAgfCAgMyArLS0KIGh3L2kzODYvcGNfcGlpeC5j ICAgICAgICAgICAgIHwgIDEgKwogaHcvaXNhL3BpaXg0LmMgICAgICAgICAgICAgICAgfCAyMiAr KysrKysrKysrKysrKysrKysrKysrCiBody9taXBzL21pcHNfbWFsdGEuYyAgICAgICAgICB8ICA0 ICstLS0KIGluY2x1ZGUvaHcvYWNwaS9waWl4NC5oICAgICAgIHwgIDYgLS0tLS0tCiBpbmNsdWRl L2h3L2kzODYvcGMuaCAgICAgICAgICB8ICA2IC0tLS0tLQogaW5jbHVkZS9ody9zb3V0aGJyaWRn ZS9waWl4LmggfCAyMCArKysrKysrKysrKysrKysrKysrKwogOSBmaWxlcyBjaGFuZ2VkLCA0OCBp bnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0NCBpbmNsdWRl L2h3L2FjcGkvcGlpeDQuaAogY3JlYXRlIG1vZGUgMTAwNjQ0IGluY2x1ZGUvaHcvc291dGhicmlk Z2UvcGlpeC5oCgpkaWZmIC0tZ2l0IGEvTUFJTlRBSU5FUlMgYi9NQUlOVEFJTkVSUwppbmRleCBj OWY2MjVmYzJlLi41NTZmNThiZDhjIDEwMDY0NAotLS0gYS9NQUlOVEFJTkVSUworKysgYi9NQUlO VEFJTkVSUwpAQCAtMTIzNSw3ICsxMjM1LDcgQEAgRjogaHcvaTJjL3NtYnVzX2ljaDkuYwogRjog aHcvYWNwaS9waWl4NC5jCiBGOiBody9hY3BpL2ljaDkuYwogRjogaW5jbHVkZS9ody9hY3BpL2lj aDkuaAotRjogaW5jbHVkZS9ody9hY3BpL3BpaXg0LmgKK0Y6IGluY2x1ZGUvaHcvc291dGhicmlk Z2UvcGlpeC5oCiBGOiBody9taXNjL3NnYS5jCiBGOiBody9pc2EvYXBtLmMKIEY6IGluY2x1ZGUv aHcvaXNhL2FwbS5oCkBAIC0xNzIwLDYgKzE3MjAsNyBAQCBNOiBIZXJ2w6kgUG91c3NpbmVhdSA8 aHBvdXNzaW5AcmVhY3Rvcy5vcmc+CiBNOiBQaGlsaXBwZSBNYXRoaWV1LURhdWTDqSA8ZjRidWdA YW1zYXQub3JnPgogUzogTWFpbnRhaW5lZAogRjogaHcvaXNhL3BpaXg0LmMKK0Y6IGluY2x1ZGUv aHcvc291dGhicmlkZ2UvcGlpeC5oCiAKIEZpcm13YXJlIGNvbmZpZ3VyYXRpb24gKGZ3X2NmZykK IE06IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KZGlmZiAtLWdp dCBhL2h3L2FjcGkvcGlpeDQuYyBiL2h3L2FjcGkvcGlpeDQuYwppbmRleCA0ZTA3OWIzOWJkLi4y ZWZkMTYwNWI4IDEwMDY0NAotLS0gYS9ody9hY3BpL3BpaXg0LmMKKysrIGIvaHcvYWNwaS9waWl4 NC5jCkBAIC0yMSw2ICsyMSw3IEBACiAKICNpbmNsdWRlICJxZW11L29zZGVwLmgiCiAjaW5jbHVk ZSAiaHcvaTM4Ni9wYy5oIgorI2luY2x1ZGUgImh3L3NvdXRoYnJpZGdlL3BpaXguaCIKICNpbmNs dWRlICJody9pcnEuaCIKICNpbmNsdWRlICJody9pc2EvYXBtLmgiCiAjaW5jbHVkZSAiaHcvaTJj L3BtX3NtYnVzLmgiCkBAIC0zMiw3ICszMyw2IEBACiAjaW5jbHVkZSAicWFwaS9lcnJvci5oIgog I2luY2x1ZGUgInFlbXUvcmFuZ2UuaCIKICNpbmNsdWRlICJleGVjL2FkZHJlc3Mtc3BhY2VzLmgi Ci0jaW5jbHVkZSAiaHcvYWNwaS9waWl4NC5oIgogI2luY2x1ZGUgImh3L2FjcGkvcGNpaHAuaCIK ICNpbmNsdWRlICJody9hY3BpL2NwdV9ob3RwbHVnLmgiCiAjaW5jbHVkZSAiaHcvYWNwaS9jcHUu aCIKZGlmZiAtLWdpdCBhL2h3L2kzODYvYWNwaS1idWlsZC5jIGIvaHcvaTM4Ni9hY3BpLWJ1aWxk LmMKaW5kZXggMWQwNzdhN2NiNy4uNTZjNDI3Zjc3MiAxMDA2NDQKLS0tIGEvaHcvaTM4Ni9hY3Bp LWJ1aWxkLmMKKysrIGIvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMKQEAgLTM0LDcgKzM0LDYgQEAKICNp bmNsdWRlICJody9hY3BpL2FjcGktZGVmcy5oIgogI2luY2x1ZGUgImh3L2FjcGkvYWNwaS5oIgog I2luY2x1ZGUgImh3L2FjcGkvY3B1LmgiCi0jaW5jbHVkZSAiaHcvYWNwaS9waWl4NC5oIgogI2lu Y2x1ZGUgImh3L252cmFtL2Z3X2NmZy5oIgogI2luY2x1ZGUgImh3L2FjcGkvYmlvcy1saW5rZXIt bG9hZGVyLmgiCiAjaW5jbHVkZSAiaHcvaXNhL2lzYS5oIgpAQCAtNTIsNyArNTEsNyBAQAogI2lu Y2x1ZGUgInN5c2VtdS9yZXNldC5oIgogCiAvKiBTdXBwb3J0ZWQgY2hpcHNldHM6ICovCi0jaW5j bHVkZSAiaHcvYWNwaS9waWl4NC5oIgorI2luY2x1ZGUgImh3L3NvdXRoYnJpZGdlL3BpaXguaCIK ICNpbmNsdWRlICJody9hY3BpL3BjaWhwLmgiCiAjaW5jbHVkZSAiaHcvaTM4Ni9pY2g5LmgiCiAj aW5jbHVkZSAiaHcvcGNpL3BjaV9idXMuaCIKZGlmZiAtLWdpdCBhL2h3L2kzODYvcGNfcGlpeC5j IGIvaHcvaTM4Ni9wY19waWl4LmMKaW5kZXggNjgyNGI3MjEyNC4uNDMxOTY1ZDkyMSAxMDA2NDQK LS0tIGEvaHcvaTM4Ni9wY19waWl4LmMKKysrIGIvaHcvaTM4Ni9wY19waWl4LmMKQEAgLTI5LDYg KzI5LDcgQEAKICNpbmNsdWRlICJody9sb2FkZXIuaCIKICNpbmNsdWRlICJody9pMzg2L3BjLmgi CiAjaW5jbHVkZSAiaHcvaTM4Ni9hcGljLmgiCisjaW5jbHVkZSAiaHcvc291dGhicmlkZ2UvcGlp eC5oIgogI2luY2x1ZGUgImh3L2Rpc3BsYXkvcmFtZmIuaCIKICNpbmNsdWRlICJody9maXJtd2Fy ZS9zbWJpb3MuaCIKICNpbmNsdWRlICJody9wY2kvcGNpLmgiCmRpZmYgLS1naXQgYS9ody9pc2Ev cGlpeDQuYyBiL2h3L2lzYS9waWl4NC5jCmluZGV4IGRkYThiYzNmOTAuLmIzNWI4YTVmNzEgMTAw NjQ0Ci0tLSBhL2h3L2lzYS9waWl4NC5jCisrKyBiL2h3L2lzYS9waWl4NC5jCkBAIC0yNCw2ICsy NCw3IEBACiAgKi8KIAogI2luY2x1ZGUgInFlbXUvb3NkZXAuaCIKKyNpbmNsdWRlICJxYXBpL2Vy cm9yLmgiCiAjaW5jbHVkZSAiaHcvaXJxLmgiCiAjaW5jbHVkZSAiaHcvaTM4Ni9wYy5oIgogI2lu Y2x1ZGUgImh3L3BjaS9wY2kuaCIKQEAgLTMxLDYgKzMyLDcgQEAKICNpbmNsdWRlICJody9zeXNi dXMuaCIKICNpbmNsdWRlICJody9kbWEvaTgyNTcuaCIKICNpbmNsdWRlICJody90aW1lci9pODI1 NC5oIgorI2luY2x1ZGUgImh3L3RpbWVyL21jMTQ2ODE4cnRjLmgiCiAjaW5jbHVkZSAibWlncmF0 aW9uL3Ztc3RhdGUuaCIKICNpbmNsdWRlICJzeXNlbXUvcmVzZXQuaCIKICNpbmNsdWRlICJzeXNl bXUvcnVuc3RhdGUuaCIKQEAgLTQyLDYgKzQ0LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgUElJWDRTdGF0 ZSB7CiAgICAgcWVtdV9pcnEgY3B1X2ludHI7CiAgICAgcWVtdV9pcnEgKmlzYTsKIAorICAgIFJU Q1N0YXRlIHJ0YzsKICAgICAvKiBSZXNldCBDb250cm9sIFJlZ2lzdGVyICovCiAgICAgTWVtb3J5 UmVnaW9uIHJjcl9tZW07CiAgICAgdWludDhfdCByY3I7CkBAIC0xNDUsNiArMTQ4LDcgQEAgc3Rh dGljIHZvaWQgcGlpeDRfcmVhbGl6ZShQQ0lEZXZpY2UgKmRldiwgRXJyb3IgKiplcnJwKQogICAg IFBJSVg0U3RhdGUgKnMgPSBQSUlYNF9QQ0lfREVWSUNFKGRldik7CiAgICAgSVNBQnVzICppc2Ff YnVzOwogICAgIHFlbXVfaXJxICppODI1OV9vdXRfaXJxOworICAgIEVycm9yICplcnIgPSBOVUxM OwogCiAgICAgaXNhX2J1cyA9IGlzYV9idXNfbmV3KERFVklDRShkZXYpLCBwY2lfYWRkcmVzc19z cGFjZShkZXYpLAogICAgICAgICAgICAgICAgICAgICAgICAgICBwY2lfYWRkcmVzc19zcGFjZV9p byhkZXYpLCBlcnJwKTsKQEAgLTE3NSw5ICsxNzksMjYgQEAgc3RhdGljIHZvaWQgcGlpeDRfcmVh bGl6ZShQQ0lEZXZpY2UgKmRldiwgRXJyb3IgKiplcnJwKQogICAgIC8qIERNQSAqLwogICAgIGk4 MjU3X2RtYV9pbml0KGlzYV9idXMsIDApOwogCisgICAgLyogUlRDICovCisgICAgcWRldl9zZXRf cGFyZW50X2J1cyhERVZJQ0UoJnMtPnJ0YyksIEJVUyhpc2FfYnVzKSk7CisgICAgcWRldl9wcm9w X3NldF9pbnQzMihERVZJQ0UoJnMtPnJ0YyksICJiYXNlX3llYXIiLCAyMDAwKTsKKyAgICBvYmpl Y3RfcHJvcGVydHlfc2V0X2Jvb2woT0JKRUNUKCZzLT5ydGMpLCB0cnVlLCAicmVhbGl6ZWQiLCAm ZXJyKTsKKyAgICBpZiAoZXJyKSB7CisgICAgICAgIGVycm9yX3Byb3BhZ2F0ZShlcnJwLCBlcnIp OworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGlzYV9pbml0X2lycShJU0FfREVWSUNFKCZz LT5ydGMpLCAmcy0+cnRjLmlycSwgUlRDX0lTQV9JUlEpOworCiAgICAgcGlpeDRfZGV2ID0gZGV2 OwogfQogCitzdGF0aWMgdm9pZCBwaWl4NF9pbml0KE9iamVjdCAqb2JqKQoreworICAgIFBJSVg0 U3RhdGUgKnMgPSBQSUlYNF9QQ0lfREVWSUNFKG9iaik7CisKKyAgICBvYmplY3RfaW5pdGlhbGl6 ZSgmcy0+cnRjLCBzaXplb2Yocy0+cnRjKSwgVFlQRV9NQzE0NjgxOF9SVEMpOworfQorCiBzdGF0 aWMgdm9pZCBwaWl4NF9jbGFzc19pbml0KE9iamVjdENsYXNzICprbGFzcywgdm9pZCAqZGF0YSkK IHsKICAgICBEZXZpY2VDbGFzcyAqZGMgPSBERVZJQ0VfQ0xBU1Moa2xhc3MpOwpAQCAtMjAyLDYg KzIyMyw3IEBAIHN0YXRpYyBjb25zdCBUeXBlSW5mbyBwaWl4NF9pbmZvID0gewogICAgIC5uYW1l ICAgICAgICAgID0gVFlQRV9QSUlYNF9QQ0lfREVWSUNFLAogICAgIC5wYXJlbnQgICAgICAgID0g VFlQRV9QQ0lfREVWSUNFLAogICAgIC5pbnN0YW5jZV9zaXplID0gc2l6ZW9mKFBJSVg0U3RhdGUp LAorICAgIC5pbnN0YW5jZV9pbml0ID0gcGlpeDRfaW5pdCwKICAgICAuY2xhc3NfaW5pdCAgICA9 IHBpaXg0X2NsYXNzX2luaXQsCiAgICAgLmludGVyZmFjZXMgPSAoSW50ZXJmYWNlSW5mb1tdKSB7 CiAgICAgICAgIHsgSU5URVJGQUNFX0NPTlZFTlRJT05BTF9QQ0lfREVWSUNFIH0sCmRpZmYgLS1n aXQgYS9ody9taXBzL21pcHNfbWFsdGEuYyBiL2h3L21pcHMvbWlwc19tYWx0YS5jCmluZGV4IDE2 ZDdhMGU3ODUuLjUyOGMzNGExYzMgMTAwNjQ0Ci0tLSBhL2h3L21pcHMvbWlwc19tYWx0YS5jCisr KyBiL2h3L21pcHMvbWlwc19tYWx0YS5jCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAicWVt dS91bml0cy5oIgogI2luY2x1ZGUgInFlbXUtY29tbW9uLmgiCiAjaW5jbHVkZSAiY3B1LmgiCi0j aW5jbHVkZSAiaHcvaTM4Ni9wYy5oIgorI2luY2x1ZGUgImh3L3NvdXRoYnJpZGdlL3BpaXguaCIK ICNpbmNsdWRlICJody9pc2Evc3VwZXJpby5oIgogI2luY2x1ZGUgImh3L2NoYXIvc2VyaWFsLmgi CiAjaW5jbHVkZSAibmV0L25ldC5oIgpAQCAtNDQsNyArNDQsNiBAQAogI2luY2x1ZGUgImh3L2ly cS5oIgogI2luY2x1ZGUgImh3L2xvYWRlci5oIgogI2luY2x1ZGUgImVsZi5oIgotI2luY2x1ZGUg Imh3L3RpbWVyL21jMTQ2ODE4cnRjLmgiCiAjaW5jbHVkZSAiZXhlYy9hZGRyZXNzLXNwYWNlcy5o IgogI2luY2x1ZGUgImh3L3N5c2J1cy5oIiAgICAgICAgICAgICAvKiBTeXNCdXNEZXZpY2UgKi8K ICNpbmNsdWRlICJxZW11L2hvc3QtdXRpbHMuaCIKQEAgLTE0MjUsNyArMTQyNCw2IEBAIHZvaWQg bWlwc19tYWx0YV9pbml0KE1hY2hpbmVTdGF0ZSAqbWFjaGluZSkKICAgICBwY2lfY3JlYXRlX3Np bXBsZShwY2lfYnVzLCBwaWl4NF9kZXZmbiArIDIsICJwaWl4NC11c2ItdWhjaSIpOwogICAgIHNt YnVzID0gcGlpeDRfcG1faW5pdChwY2lfYnVzLCBwaWl4NF9kZXZmbiArIDMsIDB4MTEwMCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgaXNhX2dldF9pcnEoTlVMTCwgOSksIE5VTEwsIDAsIE5V TEwpOwotICAgIG1jMTQ2ODE4X3J0Y19pbml0KGlzYV9idXMsIDIwMDAsIE5VTEwpOwogCiAgICAg LyogZ2VuZXJhdGUgU1BEIEVFUFJPTSBkYXRhICovCiAgICAgZ2VuZXJhdGVfZWVwcm9tX3NwZCgm c21idXNfZWVwcm9tX2J1ZlswICogMjU2XSwgcmFtX3NpemUpOwpkaWZmIC0tZ2l0IGEvaW5jbHVk ZS9ody9hY3BpL3BpaXg0LmggYi9pbmNsdWRlL2h3L2FjcGkvcGlpeDQuaApkZWxldGVkIGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDI4YmI1M2UzZC4uMDAwMDAwMDAwMAotLS0gYS9pbmNsdWRlL2h3 L2FjcGkvcGlpeDQuaAorKysgL2Rldi9udWxsCkBAIC0xLDYgKzAsMCBAQAotI2lmbmRlZiBIV19B Q1BJX1BJSVg0X0gKLSNkZWZpbmUgSFdfQUNQSV9QSUlYNF9ICi0KLSNkZWZpbmUgVFlQRV9QSUlY NF9QTSAiUElJWDRfUE0iCi0KLSNlbmRpZgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9pMzg2L3Bj LmggYi9pbmNsdWRlL2h3L2kzODYvcGMuaAppbmRleCAzNzRmM2U4ODM1Li5jZjkyMmZkMTYyIDEw MDY0NAotLS0gYS9pbmNsdWRlL2h3L2kzODYvcGMuaAorKysgYi9pbmNsdWRlL2h3L2kzODYvcGMu aApAQCAtMjQ4LDEyICsyNDgsNiBAQCBpbnQgY21vc19nZXRfZmRfZHJpdmVfdHlwZShGbG9wcHlE cml2ZVR5cGUgZmQwKTsKIAogI2RlZmluZSBQT1JUOTJfQTIwX0xJTkUgImEyMCIKIAotLyogYWNw aV9waWl4LmMgKi8KLQotSTJDQnVzICpwaWl4NF9wbV9pbml0KFBDSUJ1cyAqYnVzLCBpbnQgZGV2 Zm4sIHVpbnQzMl90IHNtYl9pb19iYXNlLAotICAgICAgICAgICAgICAgICAgICAgIHFlbXVfaXJx IHNjaV9pcnEsIHFlbXVfaXJxIHNtaV9pcnEsCi0gICAgICAgICAgICAgICAgICAgICAgaW50IHNt bV9lbmFibGVkLCBEZXZpY2VTdGF0ZSAqKnBpaXg0X3BtKTsKLQogLyogaHBldC5jICovCiBleHRl cm4gaW50IG5vX2hwZXQ7CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcvc291dGhicmlkZ2UvcGlp eC5oIGIvaW5jbHVkZS9ody9zb3V0aGJyaWRnZS9waWl4LmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMC4uYjhjZTI2ZmVjNAotLS0gL2Rldi9udWxsCisrKyBiL2luY2x1ZGUv aHcvc291dGhicmlkZ2UvcGlpeC5oCkBAIC0wLDAgKzEsMjAgQEAKKy8qCisgKiBRRU1VIFBJSVgg U291dGggQnJpZGdlIEVtdWxhdGlvbgorICoKKyAqIENvcHlyaWdodCAoYykgMjAwNiBGYWJyaWNl IEJlbGxhcmQKKyAqCisgKiBUaGlzIHdvcmsgaXMgbGljZW5zZWQgdW5kZXIgdGhlIHRlcm1zIG9m IHRoZSBHTlUgR1BMLCB2ZXJzaW9uIDIgb3IgbGF0ZXIuCisgKiBTZWUgdGhlIENPUFlJTkcgZmls ZSBpbiB0aGUgdG9wLWxldmVsIGRpcmVjdG9yeS4KKyAqCisgKi8KKworI2lmbmRlZiBIV19TT1VU SEJSSURHRV9QSUlYX0gKKyNkZWZpbmUgSFdfU09VVEhCUklER0VfUElJWF9ICisKKyNkZWZpbmUg VFlQRV9QSUlYNF9QTSAiUElJWDRfUE0iCisKK0kyQ0J1cyAqcGlpeDRfcG1faW5pdChQQ0lCdXMg KmJ1cywgaW50IGRldmZuLCB1aW50MzJfdCBzbWJfaW9fYmFzZSwKKyAgICAgICAgICAgICAgICAg ICAgICBxZW11X2lycSBzY2lfaXJxLCBxZW11X2lycSBzbWlfaXJxLAorICAgICAgICAgICAgICAg ICAgICAgIGludCBzbW1fZW5hYmxlZCwgRGV2aWNlU3RhdGUgKipwaWl4NF9wbSk7CisKKyNlbmRp ZgotLSAKMi4yMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5v cmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZl bA== 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 535BBCA9EA1 for ; Fri, 18 Oct 2019 13:58:20 +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 26D1D222BD for ; Fri, 18 Oct 2019 13:58:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26D1D222BD 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]:40442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSln-0006Cq-6o for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 09:58:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54966) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSdH-0004PO-T4 for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSdG-00064N-70 for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23220) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSdF-00063y-UU for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:30 -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 154BC11A1F; Fri, 18 Oct 2019 13:49:29 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4969460BF4; Fri, 18 Oct 2019 13:49:17 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/20] piix4: Add a MC146818 RTC Controller as specified in datasheet Date: Fri, 18 Oct 2019 15:47:42 +0200 Message-Id: <20191018134754.16362-9-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.28]); Fri, 18 Oct 2019 13:49:29 +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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" 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] Reviewed-by: Aleksandar Markovic 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 4e079b39bd..2efd1605b8 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" @@ -32,7 +33,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 1d077a7cb7..56c427f772 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 dda8bc3f90..b35b8a5f71 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; @@ -145,6 +148,7 @@ static void piix4_realize(PCIDevice *dev, Error **err= p) PIIX4State *s =3D PIIX4_PCI_DEVICE(dev); ISABus *isa_bus; qemu_irq *i8259_out_irq; + Error *err =3D NULL; =20 isa_bus =3D isa_bus_new(DEVICE(dev), pci_address_space(dev), pci_address_space_io(dev), errp); @@ -175,9 +179,26 @@ static void piix4_realize(PCIDevice *dev, Error **er= rp) /* 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 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); @@ -202,6 +223,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 374f3e8835..cf922fd162 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -248,12 +248,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