From patchwork Wed Aug 29 03:01:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 180674 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DEA182C00AC for ; Wed, 29 Aug 2012 20:09:04 +1000 (EST) Received: from localhost ([::1]:59926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6eXb-00060U-3Z for incoming@patchwork.ozlabs.org; Wed, 29 Aug 2012 05:26:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6eWs-0004hI-1b for qemu-devel@nongnu.org; Wed, 29 Aug 2012 05:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6eWn-0003EA-Bx for qemu-devel@nongnu.org; Wed, 29 Aug 2012 05:25:41 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:13321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6eWn-0003Av-6H for qemu-devel@nongnu.org; Wed, 29 Aug 2012 05:25:37 -0400 X-IronPort-AV: E=Sophos;i="4.80,332,1344211200"; d="scan'208";a="206516819" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 29 Aug 2012 09:25:36 +0000 Received: from meteora.cam.xci-test.com (10.80.248.22) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Wed, 29 Aug 2012 05:25:36 -0400 From: Julien Grall To: qemu-devel@nongnu.org Date: Wed, 29 Aug 2012 04:01:41 +0100 Message-ID: X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: Stefano.Stabellini@eu.citrix.com, jan.kiszka@siemens.com, Julien Grall , kraxel@redhat.com, afaerber@suse.de, avi@redhat.com Subject: [Qemu-devel] [PATCH V6 8/8] smb: replace_register_ioport* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch fix smb_ioport_* to be compliant with read/write memory callback. Moreover it replaces all register_ioport* which use theses functions by the new Memory API. Signed-off-by: Julien Grall --- hw/pm_smbus.c | 7 ++++--- hw/pm_smbus.h | 6 ++++-- hw/vt82c686.c | 18 ++++++++++++++++-- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/hw/pm_smbus.c b/hw/pm_smbus.c index 5d6046d..fe59ca6 100644 --- a/hw/pm_smbus.c +++ b/hw/pm_smbus.c @@ -94,7 +94,8 @@ static void smb_transaction(PMSMBus *s) s->smb_stat |= 0x04; } -void smb_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) +void smb_ioport_writeb(void *opaque, target_phys_addr_t addr, uint64_t val, + unsigned size) { PMSMBus *s = opaque; addr &= 0x3f; @@ -131,10 +132,10 @@ void smb_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) } } -uint32_t smb_ioport_readb(void *opaque, uint32_t addr) +uint64_t smb_ioport_readb(void *opaque, target_phys_addr_t addr, unsigned size) { PMSMBus *s = opaque; - uint32_t val; + uint64_t val; addr &= 0x3f; switch(addr) { diff --git a/hw/pm_smbus.h b/hw/pm_smbus.h index 4750a40..45b4330 100644 --- a/hw/pm_smbus.h +++ b/hw/pm_smbus.h @@ -15,7 +15,9 @@ typedef struct PMSMBus { } PMSMBus; void pm_smbus_init(DeviceState *parent, PMSMBus *smb); -void smb_ioport_writeb(void *opaque, uint32_t addr, uint32_t val); -uint32_t smb_ioport_readb(void *opaque, uint32_t addr); +void smb_ioport_writeb(void *opaque, target_phys_addr_t addr, uint64_t val, + unsigned size); +uint64_t smb_ioport_readb(void *opaque, target_phys_addr_t addr, + unsigned size); #endif /* !PM_SMBUS_H */ diff --git a/hw/vt82c686.c b/hw/vt82c686.c index 7f11dbe..3ad75ea 100644 --- a/hw/vt82c686.c +++ b/hw/vt82c686.c @@ -163,6 +163,7 @@ typedef struct VT686PMState { APMState apm; PMSMBus smb; uint32_t smb_io_base; + MemoryRegion smb_io; } VT686PMState; typedef struct VT686AC97State { @@ -405,6 +406,16 @@ static TypeInfo via_mc97_info = { .class_init = via_mc97_class_init, }; +static const MemoryRegionOps smb_io_ops = { + .read = smb_ioport_readb, + .write = smb_ioport_writeb, + .endianness = DEVICE_NATIVE_ENDIAN, + .impl = { + .min_access_size = 1, + .max_access_size = 1, + }, +}; + /* vt82c686 pm init */ static int vt82c686b_pm_initfn(PCIDevice *dev) { @@ -424,8 +435,11 @@ static int vt82c686b_pm_initfn(PCIDevice *dev) pci_conf[0x90] = s->smb_io_base | 1; pci_conf[0x91] = s->smb_io_base >> 8; pci_conf[0xd2] = 0x90; - register_ioport_write(s->smb_io_base, 0xf, 1, smb_ioport_writeb, &s->smb); - register_ioport_read(s->smb_io_base, 0xf, 1, smb_ioport_readb, &s->smb); + + memory_region_init_io(&s->smb_io, &smb_io_ops, &s->smb, "vt82c686b-smb", + 0xf); + memory_region_add_subregion(pci_address_space_io(dev), s->smb_io_base, + &s->smb_io); apm_init(dev, &s->apm, NULL, s);