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 7F1C1CA9EA4 for ; Fri, 18 Oct 2019 14:05:29 +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 56CA821925 for ; Fri, 18 Oct 2019 14:05:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56CA821925 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]:40550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSsh-0005KT-S9 for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 10:05:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54934) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSd4-000475-Sf for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSd3-00060C-Ln for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3784) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSd3-0005zs-GJ for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:17 -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 A749D3090FEC; Fri, 18 Oct 2019 13:49:16 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D673960BF4; Fri, 18 Oct 2019 13:49:09 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/20] piix4: Add a i8254 PIT Controller as specified in datasheet Date: Fri, 18 Oct 2019 15:47:41 +0200 Message-Id: <20191018134754.16362-8-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.43]); Fri, 18 Oct 2019 13:49:16 +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" From: Herv=C3=A9 Poussineau Remove i8254 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-10-hpoussin@reactos.org> Reviewed-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Fixed typo (thuth) --- hw/isa/piix4.c | 4 ++++ hw/mips/mips_malta.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 0b24d8323c..dda8bc3f90 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -30,6 +30,7 @@ #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/dma/i8257.h" +#include "hw/timer/i8254.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -168,6 +169,9 @@ static void piix4_realize(PCIDevice *dev, Error **err= p) /* initialize ISA irqs */ isa_bus_irqs(isa_bus, s->isa); =20 + /* initialize pit */ + i8254_pit_init(isa_bus, 0x40, 0, NULL); + /* DMA */ i8257_dma_init(isa_bus, 0); =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index df247177ca..16d7a0e785 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -45,7 +45,6 @@ #include "hw/loader.h" #include "elf.h" #include "hw/timer/mc146818rtc.h" -#include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" @@ -99,8 +98,6 @@ typedef struct { qemu_irq i8259[16]; } MaltaState; =20 -static ISADevice *pit; - static struct _loaderparams { int ram_size, ram_low_size; const char *kernel_filename; @@ -1428,7 +1425,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); - pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); mc146818_rtc_init(isa_bus, 2000, NULL); =20 /* generate SPD EEPROM data */ --=20 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 4C7D8CA9EA0 for ; Fri, 18 Oct 2019 13:49:30 +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 28139222BD for ; Fri, 18 Oct 2019 13:49:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28139222BD 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 1iLSd4-0004y4-Uf; Fri, 18 Oct 2019 13:49:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSd3-0004xb-Pa for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:49:17 +0000 X-Inumbo-ID: 13bca108-f1ae-11e9-beca-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 13bca108-f1ae-11e9-beca-bc764e2007e4; Fri, 18 Oct 2019 13:49:17 +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 A749D3090FEC; Fri, 18 Oct 2019 13:49:16 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D673960BF4; Fri, 18 Oct 2019 13:49:09 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:41 +0200 Message-Id: <20191018134754.16362-8-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.43]); Fri, 18 Oct 2019 13:49:16 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 07/20] piix4: Add a i8254 PIT 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 , 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" RnJvbTogSGVydsOpIFBvdXNzaW5lYXUgPGhwb3Vzc2luQHJlYWN0b3Mub3JnPgoKUmVtb3ZlIGk4 MjU0IGluc3RhbmNpYXRlZCBpbiBtYWx0YSBib2FyZCwgdG8gbm90IGhhdmUgaXQgdHdpY2UuCgpB Y2tlZC1ieTogTWljaGFlbCBTLiBUc2lya2luIDxtc3RAcmVkaGF0LmNvbT4KQWNrZWQtYnk6IFBh b2xvIEJvbnppbmkgPHBib256aW5pQHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IEhlcnbDqSBQ b3Vzc2luZWF1IDxocG91c3NpbkByZWFjdG9zLm9yZz4KTWVzc2FnZS1JZDogPDIwMTcxMjE2MDkw MjI4LjI4NTA1LTEwLWhwb3Vzc2luQHJlYWN0b3Mub3JnPgpSZXZpZXdlZC1ieTogQWxla3NhbmRh ciBNYXJrb3ZpYyA8YW1hcmtvdmljQHdhdmVjb21wLmNvbT4KU2lnbmVkLW9mZi1ieTogUGhpbGlw cGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KdjI6IEZpeGVkIHR5cG8g KHRodXRoKQotLS0KIGh3L2lzYS9waWl4NC5jICAgICAgIHwgNCArKysrCiBody9taXBzL21pcHNf bWFsdGEuYyB8IDQgLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvaXNhL3BpaXg0LmMgYi9ody9pc2EvcGlpeDQuYwpp bmRleCAwYjI0ZDgzMjNjLi5kZGE4YmMzZjkwIDEwMDY0NAotLS0gYS9ody9pc2EvcGlpeDQuYwor KysgYi9ody9pc2EvcGlpeDQuYwpAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgImh3L2lzYS9p c2EuaCIKICNpbmNsdWRlICJody9zeXNidXMuaCIKICNpbmNsdWRlICJody9kbWEvaTgyNTcuaCIK KyNpbmNsdWRlICJody90aW1lci9pODI1NC5oIgogI2luY2x1ZGUgIm1pZ3JhdGlvbi92bXN0YXRl LmgiCiAjaW5jbHVkZSAic3lzZW11L3Jlc2V0LmgiCiAjaW5jbHVkZSAic3lzZW11L3J1bnN0YXRl LmgiCkBAIC0xNjgsNiArMTY5LDkgQEAgc3RhdGljIHZvaWQgcGlpeDRfcmVhbGl6ZShQQ0lEZXZp Y2UgKmRldiwgRXJyb3IgKiplcnJwKQogICAgIC8qIGluaXRpYWxpemUgSVNBIGlycXMgKi8KICAg ICBpc2FfYnVzX2lycXMoaXNhX2J1cywgcy0+aXNhKTsKIAorICAgIC8qIGluaXRpYWxpemUgcGl0 ICovCisgICAgaTgyNTRfcGl0X2luaXQoaXNhX2J1cywgMHg0MCwgMCwgTlVMTCk7CisKICAgICAv KiBETUEgKi8KICAgICBpODI1N19kbWFfaW5pdChpc2FfYnVzLCAwKTsKIApkaWZmIC0tZ2l0IGEv aHcvbWlwcy9taXBzX21hbHRhLmMgYi9ody9taXBzL21pcHNfbWFsdGEuYwppbmRleCBkZjI0NzE3 N2NhLi4xNmQ3YTBlNzg1IDEwMDY0NAotLS0gYS9ody9taXBzL21pcHNfbWFsdGEuYworKysgYi9o dy9taXBzL21pcHNfbWFsdGEuYwpAQCAtNDUsNyArNDUsNiBAQAogI2luY2x1ZGUgImh3L2xvYWRl ci5oIgogI2luY2x1ZGUgImVsZi5oIgogI2luY2x1ZGUgImh3L3RpbWVyL21jMTQ2ODE4cnRjLmgi Ci0jaW5jbHVkZSAiaHcvdGltZXIvaTgyNTQuaCIKICNpbmNsdWRlICJleGVjL2FkZHJlc3Mtc3Bh Y2VzLmgiCiAjaW5jbHVkZSAiaHcvc3lzYnVzLmgiICAgICAgICAgICAgIC8qIFN5c0J1c0Rldmlj ZSAqLwogI2luY2x1ZGUgInFlbXUvaG9zdC11dGlscy5oIgpAQCAtOTksOCArOTgsNiBAQCB0eXBl ZGVmIHN0cnVjdCB7CiAgICAgcWVtdV9pcnEgaTgyNTlbMTZdOwogfSBNYWx0YVN0YXRlOwogCi1z dGF0aWMgSVNBRGV2aWNlICpwaXQ7Ci0KIHN0YXRpYyBzdHJ1Y3QgX2xvYWRlcnBhcmFtcyB7CiAg ICAgaW50IHJhbV9zaXplLCByYW1fbG93X3NpemU7CiAgICAgY29uc3QgY2hhciAqa2VybmVsX2Zp bGVuYW1lOwpAQCAtMTQyOCw3ICsxNDI1LDYgQEAgdm9pZCBtaXBzX21hbHRhX2luaXQoTWFjaGlu ZVN0YXRlICptYWNoaW5lKQogICAgIHBjaV9jcmVhdGVfc2ltcGxlKHBjaV9idXMsIHBpaXg0X2Rl dmZuICsgMiwgInBpaXg0LXVzYi11aGNpIik7CiAgICAgc21idXMgPSBwaWl4NF9wbV9pbml0KHBj aV9idXMsIHBpaXg0X2RldmZuICsgMywgMHgxMTAwLAogICAgICAgICAgICAgICAgICAgICAgICAg ICBpc2FfZ2V0X2lycShOVUxMLCA5KSwgTlVMTCwgMCwgTlVMTCk7Ci0gICAgcGl0ID0gaTgyNTRf cGl0X2luaXQoaXNhX2J1cywgMHg0MCwgMCwgTlVMTCk7CiAgICAgbWMxNDY4MThfcnRjX2luaXQo aXNhX2J1cywgMjAwMCwgTlVMTCk7CiAKICAgICAvKiBnZW5lcmF0ZSBTUEQgRUVQUk9NIGRhdGEg Ki8KLS0gCjIuMjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qu b3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2 ZWw=