From patchwork Thu May 7 16:16:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 22365 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n47GKeUc025286 for ; Thu, 7 May 2009 16:20:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134AbZEGQUd (ORCPT ); Thu, 7 May 2009 12:20:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753837AbZEGQUd (ORCPT ); Thu, 7 May 2009 12:20:33 -0400 Received: from g5t0009.atlanta.hp.com ([15.192.0.46]:16244 "EHLO g5t0009.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753524AbZEGQUd (ORCPT ); Thu, 7 May 2009 12:20:33 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g5t0009.atlanta.hp.com (Postfix) with ESMTP id 9E96730087; Thu, 7 May 2009 16:20:33 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 011CF30030; Thu, 7 May 2009 16:20:32 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl.fc.hp.com (Postfix) with ESMTP id B32FD39C008; Thu, 7 May 2009 10:20:32 -0600 (MDT) X-Virus-Scanned: Debian amavisd-new at ldl.fc.hp.com Received: from ldl.fc.hp.com ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U6u0AIl6GCW2; Thu, 7 May 2009 10:20:31 -0600 (MDT) Received: from kvm.aw (lart.fc.hp.com [15.11.146.31]) by ldl.fc.hp.com (Postfix) with ESMTP id 8E14B39C003; Thu, 7 May 2009 10:20:31 -0600 (MDT) From: Alex Williamson Subject: [PATCH] bios: Use a different mask to size the option ROM BAR To: bochs-developers@lists.sourceforge.net Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, alex.williamson@hp.com Date: Thu, 07 May 2009 10:16:03 -0600 Message-ID: <20090507161533.25315.52621.stgit@kvm.aw> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Bit 0 is the enable bit, which we not only don't want to set, but it will stick and make us think it's an I/O port resource. Signed-off-by: Alex Williamson --- bios/rombios32.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/bios/rombios32.c b/bios/rombios32.c index 269f175..616e70a 100644 --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -948,11 +948,13 @@ static void pci_bios_init_device(PCIDevice *d) int ofs; uint32_t val, size ; - if (i == PCI_ROM_SLOT) + if (i == PCI_ROM_SLOT) { ofs = 0x30; - else + pci_config_writel(d, ofs, 0xfffffffe); + } else { ofs = 0x10 + i * 4; - pci_config_writel(d, ofs, 0xffffffff); + pci_config_writel(d, ofs, 0xffffffff); + } val = pci_config_readl(d, ofs); if (val != 0) { size = (~(val & ~0xf)) + 1;