From: Alex Williamson Subject: [PATCH] bios: Use a different mask to size the option ROM BAR Date: Thu, 07 May 2009 10:16:03 -0600 Message-ID: <20090507161533.25315.52621.stgit@kvm.aw> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, alex.williamson@hp.com To: bochs-developers@lists.sourceforge.net Return-path: 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 Sender: kvm-owner@vger.kernel.org List-ID: 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(-) 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;