From patchwork Fri Oct 9 06:28:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 35569 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 818EEB70B3 for ; Fri, 9 Oct 2009 18:00:22 +1100 (EST) Received: from localhost ([127.0.0.1]:39378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw9Sc-0003np-8E for incoming@patchwork.ozlabs.org; Fri, 09 Oct 2009 03:00:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mw90L-00048p-6A for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:31:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mw90A-0003zE-A3 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:30:58 -0400 Received: from [199.232.76.173] (port=55770 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw90A-0003xn-3B for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:30:54 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:36134) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mw907-0001Q7-B4 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:30:51 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 2E55749E27; Fri, 9 Oct 2009 15:30:40 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1Mw8yN-00046s-0D; Fri, 09 Oct 2009 15:29:03 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Fri, 9 Oct 2009 15:28:51 +0900 Message-Id: <1255069742-15724-19-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1255069742-15724-1-git-send-email-yamahata@valinux.co.jp> References: <1255069742-15724-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V5 18/29] pci: factor out the conversion logic from io port address into pci device. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org factor out the logic which converts io port address into pci device and offset in PCI configuration space. Signed-off-by: Isaku Yamahata --- hw/pci.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 33cc476..0021c96 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -654,24 +654,33 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) pci_update_mappings(d); } +static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, uint32_t addr) +{ + uint8_t bus_num = (addr >> 16) & 0xff; + uint8_t devfn = (addr >> 8) & 0xff; + return pci_find_device(bus, bus_num, PCI_SLOT(devfn), PCI_FUNC(devfn)); +} + +static inline int pci_addr_to_config(uint32_t addr) +{ + return addr & 0xff; +} + void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len) { PCIBus *s = opaque; PCIDevice *pci_dev; - int config_addr, bus_num; + int config_addr; #if 0 PCI_DPRINTF("pci_data_write: addr=%08x val=%08x len=%d\n", addr, val, len); #endif - bus_num = (addr >> 16) & 0xff; - s = pci_find_bus(s, bus_num); - if (!s) - return; - pci_dev = s->devices[(addr >> 8) & 0xff]; + pci_dev = pci_addr_to_dev(s, addr); if (!pci_dev) return; config_addr = addr & 0xff; + config_addr = pci_addr_to_config(addr); PCI_DPRINTF("pci_config_write: %s: addr=%02x val=%08x len=%d\n", pci_dev->name, config_addr, val, len); pci_dev->config_write(pci_dev, config_addr, val, len); @@ -681,16 +690,11 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len) { PCIBus *s = opaque; PCIDevice *pci_dev; - int config_addr, bus_num; + int config_addr; uint32_t val; - bus_num = (addr >> 16) & 0xff; - s = pci_find_bus(s, bus_num); - if (!s) - goto fail; - pci_dev = s->devices[(addr >> 8) & 0xff]; + pci_dev = pci_addr_to_dev(s, addr); if (!pci_dev) { - fail: switch(len) { case 1: val = 0xff; @@ -705,7 +709,7 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len) } goto the_end; } - config_addr = addr & 0xff; + config_addr = pci_addr_to_config(addr); val = pci_dev->config_read(pci_dev, config_addr, len); PCI_DPRINTF("pci_config_read: %s: addr=%02x val=%08x len=%d\n", pci_dev->name, config_addr, val, len);