From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [RFC v3 49/56] uhci: convert to memory API Date: Sun, 10 Jul 2011 21:15:02 +0300 Message-ID: <1310321709-30770-50-git-send-email-avi@redhat.com> References: <1310321709-30770-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:29654 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756370Ab1GJSPX (ORCPT ); Sun, 10 Jul 2011 14:15:23 -0400 In-Reply-To: <1310321709-30770-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Avi Kivity --- hw/usb-uhci.c | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 12 deletions(-) diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 405fa7b..95ef260 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -132,6 +132,7 @@ typedef struct UHCIPort { struct UHCIState { PCIDevice dev; + MemoryRegion io_bar; USBBus bus; uint16_t cmd; /* cmd register */ uint16_t status; @@ -1083,19 +1084,38 @@ static void uhci_frame_timer(void *opaque) qemu_mod_timer(s->frame_timer, s->expire_time); } -static void uhci_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) +static uint64_t uhci_ioport_read(void *opaque, target_phys_addr_t addr, + unsigned size) { - UHCIState *s = (UHCIState *)pci_dev; - - register_ioport_write(addr, 32, 2, uhci_ioport_writew, s); - register_ioport_read(addr, 32, 2, uhci_ioport_readw, s); - register_ioport_write(addr, 32, 4, uhci_ioport_writel, s); - register_ioport_read(addr, 32, 4, uhci_ioport_readl, s); - register_ioport_write(addr, 32, 1, uhci_ioport_writeb, s); - register_ioport_read(addr, 32, 1, uhci_ioport_readb, s); + UHCIState *s = opaque; + + switch (size) { + case 1: return uhci_ioport_readb(s, addr); + case 2: return uhci_ioport_readw(s, addr); + case 4: return uhci_ioport_readl(s, addr); + default: abort(); + } +} + +static void uhci_ioport_write(void *opaque, target_phys_addr_t addr, + uint64_t data, unsigned size) +{ + UHCIState *s = opaque; + + switch (size) { + case 1: return uhci_ioport_writeb(s, addr, data); + case 2: return uhci_ioport_writew(s, addr, data); + case 4: return uhci_ioport_writel(s, addr, data); + default: abort(); + } } +static MemoryRegionOps uhci_ioport_ops = { + .read = uhci_ioport_read, + .write = uhci_ioport_write, + .endianness = DEVICE_LITTLE_ENDIAN, +}; + static void uhci_device_destroy(USBBus *bus, USBDevice *dev) { UHCIState *s = container_of(bus, UHCIState, bus); @@ -1137,10 +1157,11 @@ static int usb_uhci_common_initfn(PCIDevice *dev) qemu_register_reset(uhci_reset, s); + memory_region_init_io(&s->io_bar, &uhci_ioport_ops, s, "uhci", 0x20); /* Use region 4 for consistency with real hardware. BSD guests seem to rely on this. */ - pci_register_bar(&s->dev, 4, 0x20, - PCI_BASE_ADDRESS_SPACE_IO, uhci_map); + pci_register_bar_region(&s->dev, 4, + PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar); return 0; } @@ -1160,12 +1181,22 @@ static int usb_uhci_vt82c686b_initfn(PCIDevice *dev) return usb_uhci_common_initfn(dev); } +static int usb_uhci_exit(PCIDevice *dev) +{ + UHCIState *s = DO_UPCAST(UHCIState, dev, dev); + + memory_region_destroy(&s->io_bar); + return 0; +} + + static PCIDeviceInfo uhci_info[] = { { .qdev.name = "piix3-usb-uhci", .qdev.size = sizeof(UHCIState), .qdev.vmsd = &vmstate_uhci, .init = usb_uhci_common_initfn, + .exit = usb_uhci_exit, .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = PCI_DEVICE_ID_INTEL_82371SB_2, .revision = 0x01, @@ -1175,6 +1206,7 @@ static PCIDeviceInfo uhci_info[] = { .qdev.size = sizeof(UHCIState), .qdev.vmsd = &vmstate_uhci, .init = usb_uhci_common_initfn, + .exit = usb_uhci_exit, .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = PCI_DEVICE_ID_INTEL_82371AB_2, .revision = 0x01, @@ -1184,6 +1216,7 @@ static PCIDeviceInfo uhci_info[] = { .qdev.size = sizeof(UHCIState), .qdev.vmsd = &vmstate_uhci, .init = usb_uhci_vt82c686b_initfn, + .exit = usb_uhci_exit, .vendor_id = PCI_VENDOR_ID_VIA, .device_id = PCI_DEVICE_ID_VIA_UHCI, .revision = 0x01, -- 1.7.5.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfyXc-0004K3-UZ for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfyXM-0007eb-UB for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfyXF-0007Yy-F5 for qemu-devel@nongnu.org; Sun, 10 Jul 2011 14:15:18 -0400 From: Avi Kivity Date: Sun, 10 Jul 2011 21:15:02 +0300 Message-Id: <1310321709-30770-50-git-send-email-avi@redhat.com> In-Reply-To: <1310321709-30770-1-git-send-email-avi@redhat.com> References: <1310321709-30770-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [RFC v3 49/56] uhci: convert to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Signed-off-by: Avi Kivity --- hw/usb-uhci.c | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 12 deletions(-) diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 405fa7b..95ef260 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -132,6 +132,7 @@ typedef struct UHCIPort { struct UHCIState { PCIDevice dev; + MemoryRegion io_bar; USBBus bus; uint16_t cmd; /* cmd register */ uint16_t status; @@ -1083,19 +1084,38 @@ static void uhci_frame_timer(void *opaque) qemu_mod_timer(s->frame_timer, s->expire_time); } -static void uhci_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) +static uint64_t uhci_ioport_read(void *opaque, target_phys_addr_t addr, + unsigned size) { - UHCIState *s = (UHCIState *)pci_dev; - - register_ioport_write(addr, 32, 2, uhci_ioport_writew, s); - register_ioport_read(addr, 32, 2, uhci_ioport_readw, s); - register_ioport_write(addr, 32, 4, uhci_ioport_writel, s); - register_ioport_read(addr, 32, 4, uhci_ioport_readl, s); - register_ioport_write(addr, 32, 1, uhci_ioport_writeb, s); - register_ioport_read(addr, 32, 1, uhci_ioport_readb, s); + UHCIState *s = opaque; + + switch (size) { + case 1: return uhci_ioport_readb(s, addr); + case 2: return uhci_ioport_readw(s, addr); + case 4: return uhci_ioport_readl(s, addr); + default: abort(); + } +} + +static void uhci_ioport_write(void *opaque, target_phys_addr_t addr, + uint64_t data, unsigned size) +{ + UHCIState *s = opaque; + + switch (size) { + case 1: return uhci_ioport_writeb(s, addr, data); + case 2: return uhci_ioport_writew(s, addr, data); + case 4: return uhci_ioport_writel(s, addr, data); + default: abort(); + } } +static MemoryRegionOps uhci_ioport_ops = { + .read = uhci_ioport_read, + .write = uhci_ioport_write, + .endianness = DEVICE_LITTLE_ENDIAN, +}; + static void uhci_device_destroy(USBBus *bus, USBDevice *dev) { UHCIState *s = container_of(bus, UHCIState, bus); @@ -1137,10 +1157,11 @@ static int usb_uhci_common_initfn(PCIDevice *dev) qemu_register_reset(uhci_reset, s); + memory_region_init_io(&s->io_bar, &uhci_ioport_ops, s, "uhci", 0x20); /* Use region 4 for consistency with real hardware. BSD guests seem to rely on this. */ - pci_register_bar(&s->dev, 4, 0x20, - PCI_BASE_ADDRESS_SPACE_IO, uhci_map); + pci_register_bar_region(&s->dev, 4, + PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar); return 0; } @@ -1160,12 +1181,22 @@ static int usb_uhci_vt82c686b_initfn(PCIDevice *dev) return usb_uhci_common_initfn(dev); } +static int usb_uhci_exit(PCIDevice *dev) +{ + UHCIState *s = DO_UPCAST(UHCIState, dev, dev); + + memory_region_destroy(&s->io_bar); + return 0; +} + + static PCIDeviceInfo uhci_info[] = { { .qdev.name = "piix3-usb-uhci", .qdev.size = sizeof(UHCIState), .qdev.vmsd = &vmstate_uhci, .init = usb_uhci_common_initfn, + .exit = usb_uhci_exit, .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = PCI_DEVICE_ID_INTEL_82371SB_2, .revision = 0x01, @@ -1175,6 +1206,7 @@ static PCIDeviceInfo uhci_info[] = { .qdev.size = sizeof(UHCIState), .qdev.vmsd = &vmstate_uhci, .init = usb_uhci_common_initfn, + .exit = usb_uhci_exit, .vendor_id = PCI_VENDOR_ID_INTEL, .device_id = PCI_DEVICE_ID_INTEL_82371AB_2, .revision = 0x01, @@ -1184,6 +1216,7 @@ static PCIDeviceInfo uhci_info[] = { .qdev.size = sizeof(UHCIState), .qdev.vmsd = &vmstate_uhci, .init = usb_uhci_vt82c686b_initfn, + .exit = usb_uhci_exit, .vendor_id = PCI_VENDOR_ID_VIA, .device_id = PCI_DEVICE_ID_VIA_UHCI, .revision = 0x01, -- 1.7.5.3