From patchwork Thu Jun 17 11:03:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 56019 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 B7169B7D9B for ; Thu, 17 Jun 2010 21:25:35 +1000 (EST) Received: from localhost ([127.0.0.1]:55888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPDDw-0003MW-9F for incoming@patchwork.ozlabs.org; Thu, 17 Jun 2010 07:25:32 -0400 Received: from [140.186.70.92] (port=37955 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPCw3-00033U-8h for qemu-devel@nongnu.org; Thu, 17 Jun 2010 07:07:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPCw0-0001Ks-U0 for qemu-devel@nongnu.org; Thu, 17 Jun 2010 07:07:03 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:46413) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPCw0-0001K8-L7 for qemu-devel@nongnu.org; Thu, 17 Jun 2010 07:07:00 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id B2C771072B7; Thu, 17 Jun 2010 20:06:56 +0900 (JST) Received: (nullmailer pid 8747 invoked by uid 1000); Thu, 17 Jun 2010 11:03:16 -0000 From: Isaku Yamahata To: seabios@seabios.org Date: Thu, 17 Jun 2010 20:03:14 +0900 Message-Id: X-Mailer: git-send-email 1.6.6.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: stefano.stabellini@eu.citrix.com, jan.kiszka@siemens.com, mst@redhat.com, allen.m.kay@intel.com, qemu-devel@nongnu.org, yamahata@valinux.co.jp, jean.guyader@gmail.com Subject: [Qemu-devel] [PATCH 6/8] seabios: pciinit: make bar offset calculation pci bridge aware. 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 This patch makes pci bar offset calculation pci bridge aware. The offset of pci bridge rom is different from normal device. Signed-off-by: Isaku Yamahata --- src/pciinit.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/pciinit.c b/src/pciinit.c index 6ba51f2..1c2c8c6 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -27,7 +27,11 @@ static u32 pci_bar(u16 bdf, int region_num) if (region_num != PCI_ROM_SLOT) { return PCI_BASE_ADDRESS_0 + region_num * 4; } - return PCI_ROM_ADDRESS; + +#define PCI_HEADER_TYPE_MULTI_FUNCTION 0x80 + u8 type = pci_config_readb(bdf, PCI_HEADER_TYPE); + type &= ~PCI_HEADER_TYPE_MULTI_FUNCTION; + return type == PCI_HEADER_TYPE_BRIDGE ? PCI_ROM_ADDRESS1 : PCI_ROM_ADDRESS; } static void pci_set_io_region_addr(u16 bdf, int region_num, u32 addr)