From patchwork Fri Oct 9 06:28:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 35590 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 40D76B7BAA for ; Fri, 9 Oct 2009 19:37:02 +1100 (EST) Received: from localhost ([127.0.0.1]:53876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MwAyA-0006uJ-CO for incoming@patchwork.ozlabs.org; Fri, 09 Oct 2009 04:36:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MwAxY-0006to-K0 for qemu-devel@nongnu.org; Fri, 09 Oct 2009 04:36:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MwAxU-0006sH-UE for qemu-devel@nongnu.org; Fri, 09 Oct 2009 04:36:20 -0400 Received: from [199.232.76.173] (port=39269 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MwAxU-0006s8-MZ for qemu-devel@nongnu.org; Fri, 09 Oct 2009 04:36:16 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:47308) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MwAxT-0002lt-Sc for qemu-devel@nongnu.org; Fri, 09 Oct 2009 04:36:16 -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 2540749E25; 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 1Mw8yM-00046n-Um; Fri, 09 Oct 2009 15:29:02 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Fri, 9 Oct 2009 15:28:49 +0900 Message-Id: <1255069742-15724-17-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 16/29] pci: 64bit bar support. 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 implemented pci 64bit bar support. Signed-off-by: Isaku Yamahata --- hw/pci.c | 34 +++++++++++++++++++++++++++++----- hw/pci.h | 2 ++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index e7f8fb4..ee3ab05 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -454,6 +454,13 @@ static int pci_unregister_device(DeviceState *dev) return 0; } +static inline int pci_bar_is_mem64(const PCIIORegion *r) +{ + return !(r->type & PCI_BASE_ADDRESS_SPACE_IO) && + (r->type & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == + PCI_BASE_ADDRESS_MEM_TYPE_64; +} + void pci_register_bar(PCIDevice *pci_dev, int region_num, pcibus_t size, int type, PCIMapIORegionFunc *map_func) @@ -484,8 +491,13 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, wmask |= PCI_ROM_ADDRESS_ENABLE; } pci_set_long(pci_dev->config + addr, type); - pci_set_long(pci_dev->wmask + addr, wmask & 0xffffffff); - pci_set_long(pci_dev->cmask + addr, 0xffffffff); + if (pci_bar_is_mem64(r)) { + pci_set_quad(pci_dev->wmask + addr, wmask); + pci_set_quad(pci_dev->cmask + addr, ~0ULL); + } else { + pci_set_long(pci_dev->wmask + addr, wmask & 0xffffffff); + pci_set_long(pci_dev->cmask + addr, 0xffffffff); + } } static void pci_update_mappings(PCIDevice *d) @@ -513,7 +525,11 @@ static void pci_update_mappings(PCIDevice *d) } } else { if (cmd & PCI_COMMAND_MEMORY) { - new_addr = pci_get_long(d->config + pci_bar(d, i)); + if (pci_bar_is_mem64(r)) { + new_addr = pci_get_quad(d->config + pci_bar(d, i)); + } else { + new_addr = pci_get_long(d->config + pci_bar(d, i)); + } /* the ROM slot has a specific enable bit */ if (i == PCI_ROM_SLOT && !(new_addr & PCI_ROM_ADDRESS_ENABLE)) goto no_mem_map; @@ -531,7 +547,7 @@ static void pci_update_mappings(PCIDevice *d) * Without this, PC ide doesn't work well. * TODO: remove this work around. */ - last_addr >= UINT32_MAX) { + (!pci_bar_is_mem64(r) && last_addr >= UINT32_MAX)) { new_addr = PCI_BAR_UNMAPPED; } } else { @@ -773,8 +789,16 @@ static void pci_info_device(PCIDevice *d) " [0x%04"FMT_PCIBUS"].\n", r->addr, r->addr + r->size - 1); } else { - monitor_printf(mon, "32 bit memory at 0x%08"FMT_PCIBUS + const char *type = pci_bar_is_mem64(r)? "64 bit": "32 bit"; + const char *prefetch = ""; + + if (r->type & PCI_BASE_ADDRESS_MEM_PREFETCH) { + prefetch = " prefetchable"; + } + + monitor_printf(mon, "%s%s memory at 0x%08"FMT_PCIBUS " [0x%08"FMT_PCIBUS"].\n", + type, prefetch, r->addr, r->addr + r->size - 1); } } diff --git a/hw/pci.h b/hw/pci.h index 8fbd45e..269981a 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -114,6 +114,8 @@ typedef struct PCIIORegion { #define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */ #define PCI_BASE_ADDRESS_SPACE_IO 0x01 #define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 +#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 +#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ #define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ #define PCI_PRIMARY_BUS 0x18 /* Primary bus number */ #define PCI_SECONDARY_BUS 0x19 /* Secondary bus number */