From patchwork Fri Oct 9 06:28:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 35576 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 C7F53B7B83 for ; Fri, 9 Oct 2009 18:14:07 +1100 (EST) Received: from localhost ([127.0.0.1]:40263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw9fw-0001xq-RA for incoming@patchwork.ozlabs.org; Fri, 09 Oct 2009 03:14:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mw90N-0004DR-JQ for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:31:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mw90D-00042T-32 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:31:02 -0400 Received: from [199.232.76.173] (port=55777 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw90A-0003zm-H6 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:30:56 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:36131) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mw907-0001Q1-Pf for qemu-devel@nongnu.org; Fri, 09 Oct 2009 02:30:53 -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 469B349E28; 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-00046z-29; 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:53 +0900 Message-Id: <1255069742-15724-21-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 20/29] pci: move pci host stuff from pci.c to pci_host.c 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 Move pci host stuff from pci.c to pci_host.c. And add some comments. Later pcie host bridge functions will be defined in pcie_host.c not to bloat pci.c. Signed-off-by: Isaku Yamahata --- hw/pci.c | 34 ++++------------------------------ hw/pci.h | 4 ++++ hw/pci_host.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index d472b58..99b420f 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -654,8 +654,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) pci_update_mappings(d); } -static void pci_dev_write_config(PCIDevice *pci_dev, - uint32_t config_addr, uint32_t val, int len) +void pci_dev_write_config(PCIDevice *pci_dev, + uint32_t config_addr, uint32_t val, int len) { assert(len == 1 || len == 2 || len == 4); if (!pci_dev) @@ -666,8 +666,8 @@ static void pci_dev_write_config(PCIDevice *pci_dev, pci_dev->config_write(pci_dev, config_addr, val, len); } -static uint32_t pci_dev_read_config(PCIDevice *pci_dev, - uint32_t config_addr, int len) +uint32_t pci_dev_read_config(PCIDevice *pci_dev, + uint32_t config_addr, int len) { uint32_t val; @@ -693,32 +693,6 @@ static uint32_t pci_dev_read_config(PCIDevice *pci_dev, 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 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; - pci_dev_write_config(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_dev_read_config(pci_addr_to_dev(s, addr), - pci_addr_to_config(addr), len); -} - /***********************************************************/ /* generic PCI irq support */ diff --git a/hw/pci.h b/hw/pci.h index 3a3838d..7711ed4 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -268,6 +268,10 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr); PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, const char *default_devaddr); +void pci_dev_write_config(PCIDevice *pci_dev, + uint32_t config_addr, uint32_t val, int len); +uint32_t pci_dev_read_config(PCIDevice *pci_dev, + uint32_t config_addr, int len); void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len); uint32_t pci_data_read(void *opaque, uint32_t addr, int len); int pci_bus_num(PCIBus *s); diff --git a/hw/pci_host.c b/hw/pci_host.c index 99416c8..d827b06 100644 --- a/hw/pci_host.c +++ b/hw/pci_host.c @@ -32,6 +32,40 @@ do { printf("pci_host_data: " fmt , ## __VA_ARGS__); } while (0) #define PCI_DPRINTF(fmt, ...) #endif +/* + * PCI address + * bit 16 - 24: bus number + * bit 8 - 15: devfun number + * bit 0 - 7: offset in configuration space of a given pci device + */ + +/* the helper functio to get a PCIDeice* for a given pci address */ +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; + pci_dev_write_config(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_dev_read_config(pci_addr_to_dev(s, addr), + pci_addr_to_config(addr), len); +} + static void pci_host_config_writel(void *opaque, target_phys_addr_t addr, uint32_t val) {