From patchwork Mon Oct 5 10:06:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 34990 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 4A604B7BC3 for ; Mon, 5 Oct 2009 22:24:23 +1100 (EST) Received: from localhost ([127.0.0.1]:44911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mulfv-0002Un-Q9 for incoming@patchwork.ozlabs.org; Mon, 05 Oct 2009 07:24:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Muklm-000246-Vc for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:26:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Muklh-00021A-GC for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:26:17 -0400 Received: from [199.232.76.173] (port=55348 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Muklh-000210-9Q for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:26:13 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:38730) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Muklg-0001oe-9h for qemu-devel@nongnu.org; Mon, 05 Oct 2009 06:26:12 -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 21B8849D8D; Mon, 5 Oct 2009 19:08:42 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1MukTA-0004D7-2A; Mon, 05 Oct 2009 19:07:04 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Mon, 5 Oct 2009 19:06:54 +0900 Message-Id: <1254737223-16129-15-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1254737223-16129-1-git-send-email-yamahata@valinux.co.jp> References: <1254737223-16129-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 14/23] pci: factor out the logic to get pci device from address. 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 conversion logic from io port address into bus+dev+func with bit shift operation and conversion bus+dev+func into pci device. They will be used later by pcie support. This patch also eliminates the logic duplication. Signed-off-by: Isaku Yamahata --- hw/pci.c | 83 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 46 insertions(+), 37 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 6ddd256..5f808ff 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -629,44 +629,25 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) pci_update_mappings(d); } -void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len) +static void pci_data_write_common(PCIDevice *pci_dev, + uint32_t config_addr, uint32_t val, int len) { - PCIBus *s = opaque; - PCIDevice *pci_dev; - int config_addr, bus_num; - -#if 0 - PCI_DPRINTF("pci_data_write: addr=%08"PRIx32" val=%08"PRIx32" 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]; + assert(len == 1 || len == 2 || len == 4); if (!pci_dev) return; - config_addr = addr & 0xff; - PCI_DPRINTF("pci_config_write: %s: " - "addr=%02x val=%08"PRI32x" len=%d\n", - pci_dev->name, config_addr, val, len); + + PCI_DPRINTF("%s: %s: addr=%02"PRIx32" val=%08"PRI32x" len=%d\n", + __func__, pci_dev->name, config_addr, val, len); pci_dev->config_write(pci_dev, config_addr, val, len); } -uint32_t pci_data_read(void *opaque, uint32_t addr, int len) +static uint32_t pci_data_read_common(PCIDevice *pci_dev, + uint32_t config_addr, int len) { - PCIBus *s = opaque; - PCIDevice *pci_dev; - int config_addr, bus_num; 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]; + assert(len == 1 || len == 2 || len == 4); if (!pci_dev) { - fail: switch(len) { case 1: val = 0xff; @@ -679,21 +660,49 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len) val = 0xffffffff; break; } - goto the_end; + } else { + val = pci_dev->config_read(pci_dev, config_addr, len); + PCI_DPRINTF("%s: %s: addr=%02"PRIx32" val=%08"PRIx32" len=%d\n", + __func__, pci_dev->name, config_addr, val, len); } - config_addr = addr & 0xff; - val = pci_dev->config_read(pci_dev, config_addr, len); - PCI_DPRINTF("pci_config_read: %s: " - "addr=%02x val=%08"PRIx32" len=%d\n", - pci_dev->name, config_addr, val, len); - the_end: + #if 0 - PCI_DPRINTF("pci_data_read: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n", - addr, val, len); + PCI_DPRINTF("%s: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n", + __func__, addr, val, len); #endif return val; } +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 uint32_t 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; +#if 0 + PCI_DPRINTF("pci_data_write: addr=%08"PRIx32" val=%08"PRIx32" len=%d\n", + addr, val, len); +#endif + + pci_data_write_common(pci_addr_to_dev(s, addr), pci_addr_to_config(addr), + val, len); +} + +uint32_t pci_data_read(void *opaque, uint32_t addr, int len) +{ + PCIBus *s = opaque; + return pci_data_read_common(pci_addr_to_dev(s, addr), + pci_addr_to_config(addr), len); +} /***********************************************************/ /* generic PCI irq support */