From patchwork Thu Oct 18 20:31:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 986313 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X+rZceLD"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bhh867yPz9s5c for ; Fri, 19 Oct 2018 08:17:12 +1100 (AEDT) Received: from localhost ([::1]:44750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDFfK-0003D4-DU for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2018 17:17:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDEyF-0007H4-D8 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDEy9-0006E7-Gp for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:37 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDEy8-00069r-OY for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:33 -0400 Received: by mail-wr1-x42e.google.com with SMTP id e4-v6so35109887wrs.0 for ; Thu, 18 Oct 2018 13:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=seeNlGHlQ89oIKFlSzm1J8VJgVA7puMCRqVvyGllTcg=; b=X+rZceLDkuJNBK2BLOliOCu6H1jv4N+nykM6OL+T90SpB3Y9X5GWAELw83hF4tLqJq wF/vqUENXhVjIoWm73AaOzSXsSXujvBPgFHq0OwZLmgs1D1FjrdH/ZHOfsvMp0PpTjw+ lUM0nmlKJPm3iioGZxmVurUCe42aDgiDpqWz7LdfgkerPMXLJbLdI+Uwynl/CRQcdNmm f2p13Pz3X+klA892MubDz+q1lYeBan+7I0YxvL/5fwXAH8YXxmow2c+xpd9iQlNdejC8 97lk0zIZGbC25ELf0qUUsga3BkSwpWskpcj8Lj55OL5tU6g1U+D+pIhQbKUAH2LmZ7V8 /9Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=seeNlGHlQ89oIKFlSzm1J8VJgVA7puMCRqVvyGllTcg=; b=sATRvZEKh2wlMfKpN8lhbfj1AHbu5XKwEMLYKpifvMx7ZjKPUZ3iA3dAVDA41k9DQj 0/D+3GGWzehUQmP1XFIuvIC43dw0SKPn24mG0eJTFjYkF24b3o/kI1gJ+4HLf0ASjGTs ozrHCFahiv+WSnDfIB0b7Za8NKo8oKXc2NdKomJA+hNLfBLqs4Awo74t8E8pJVhOqBoJ GypxuxHPwf7aftp7HUlVRUNk8v0LizBUGdxb9JjqH2urAMrTk99ostOoxUiPuRfdUsQ7 kdRrEUehA2gagpHlLFkr/ZyZLNdZkG9mONyB8LdjL6/paLDtoMZX7TtyQjYlvKZ0oVEc /Hmw== X-Gm-Message-State: ABuFfohj8+M0C11wa4/26ub1/GEM1pjC3qVWpv3APn7VyFu+V8OI6iVy 83jOv023jMX2yM88KFERiDyxZ78Z X-Google-Smtp-Source: ACcGV62oYlvebKEpwY7WBX+MUKFCXolzwx6YKjeEUvthDqI26pyKbxtbsK5PDdpxxx745K60LHVxWA== X-Received: by 2002:adf:cd0c:: with SMTP id w12-v6mr31736657wrm.67.1539894747561; Thu, 18 Oct 2018 13:32:27 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-231-174.clienti.tiscali.it. [78.12.231.174]) by smtp.gmail.com with ESMTPSA id a12-v6sm14270952wrr.71.2018.10.18.13.32.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 13:32:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 22:31:36 +0200 Message-Id: <1539894735-14232-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539894735-14232-1-git-send-email-pbonzini@redhat.com> References: <1539894735-14232-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 09/48] target-i386: add rtc 0x70 port as coalesced_pio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Hao Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peng Hao Signed-off-by: Peng Hao Message-Id: <1539890353-30273-1-git-send-email-peng.hao2@zte.com.cn> Signed-off-by: Paolo Bonzini --- hw/timer/mc146818rtc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index acee47d..e4e4de8 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -34,6 +34,7 @@ #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-events-misc.h" #include "qapi/visitor.h" +#include "exec/address-spaces.h" #ifdef TARGET_I386 #include "hw/i386/apic.h" @@ -70,6 +71,7 @@ typedef struct RTCState { ISADevice parent_obj; MemoryRegion io; + MemoryRegion coalesced_io; uint8_t cmos_data[128]; uint8_t cmos_index; int32_t base_year; @@ -990,6 +992,13 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) memory_region_init_io(&s->io, OBJECT(s), &cmos_ops, s, "rtc", 2); isa_register_ioport(isadev, &s->io, base); + /* register rtc 0x70 port for coalesced_pio */ + memory_region_set_flush_coalesced(&s->io); + memory_region_init_io(&s->coalesced_io, OBJECT(s), &cmos_ops, + s, "rtc-index", 1); + memory_region_add_subregion(&s->io, 0, &s->coalesced_io); + memory_region_add_coalescing(&s->coalesced_io, 0, 1); + qdev_set_legacy_instance_id(dev, base, 3); qemu_register_reset(rtc_reset, s);