From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NF76n-0007av-1f for qemu-devel@nongnu.org; Mon, 30 Nov 2009 09:20:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NF76i-0007a9-5b for qemu-devel@nongnu.org; Mon, 30 Nov 2009 09:20:08 -0500 Received: from [199.232.76.173] (port=52200 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NF76h-0007a6-TX for qemu-devel@nongnu.org; Mon, 30 Nov 2009 09:20:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51365) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NF76h-0004mA-HE for qemu-devel@nongnu.org; Mon, 30 Nov 2009 09:20:03 -0500 Date: Mon, 30 Nov 2009 16:17:22 +0200 From: "Michael S. Tsirkin" Message-ID: <20091130141722.GB25613@redhat.com> References: <20091008155256.GA13660@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091008155256.GA13660@redhat.com> Subject: [Qemu-devel] [PATCHv2-repost] pcbios: enable io/memory unconditionally List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: Anthony Liguori , "qemu-devel@nongnu.org" , kvm-devel On Thu, Oct 08, 2009 at 05:52:56PM +0200, Michael S. Tsirkin wrote: VGA adapters need to claim memory and i/o transactions even if they do not have any i/o or memory bars. E.g. PCI spec, page 297, gives an example of such a device: Programming interface 0000 0000b VGA-compatible controller. Memory addresses 0A 0000h through 0B FFFFh. I/O addresses 3B0h to 3BBh and 3C0h to 3DFh and all aliases of these addresses. While we could check for these devices and special-case them, it is easier to fix this by enabling i/o and memory space unconditionally: devices that do not support it will just ignore this setting. Signed-off-by: Michael S. Tsirkin --- This patch is needed for qemu-kvm as that is still using pcbios. rombios32.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/rombios32.c b/rombios32.c index 624f39f..d01b61d 100644 --- a/rombios32.c +++ b/rombios32.c @@ -693,6 +693,7 @@ void smp_probe(void) #define PCI_COMMAND 0x04 /* 16 bits */ #define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ #define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ +#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */ #define PCI_CLASS_DEVICE 0x0a /* Device class */ #define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ #define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ @@ -760,7 +761,6 @@ static uint32_t pci_config_readb(PCIDevice *d, uint32_t addr) static void pci_set_io_region_addr(PCIDevice *d, int region_num, uint32_t addr) { - uint16_t cmd; uint32_t ofs, old_addr; if ( region_num == PCI_ROM_SLOT ) { @@ -773,16 +773,6 @@ static void pci_set_io_region_addr(PCIDevice *d, int region_num, uint32_t addr) pci_config_writel(d, ofs, addr); BX_INFO("region %d: 0x%08x\n", region_num, addr); - - /* enable memory mappings */ - cmd = pci_config_readw(d, PCI_COMMAND); - if ( region_num == PCI_ROM_SLOT ) - cmd |= 2; - else if (old_addr & PCI_ADDRESS_SPACE_IO) - cmd |= 1; - else - cmd |= 2; - pci_config_writew(d, PCI_COMMAND, cmd); } /* return the global irq number corresponding to a given device irq @@ -939,6 +929,7 @@ static void pci_bios_init_device(PCIDevice *d) { int class; uint32_t *paddr; + uint16_t cmd; int i, pin, pic_irq, vendor_id, device_id; class = pci_config_readw(d, PCI_CLASS_DEVICE); @@ -1016,6 +1007,11 @@ static void pci_bios_init_device(PCIDevice *d) break; } + /* enable memory mappings */ + cmd = pci_config_readw(d, PCI_COMMAND); + cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY; + pci_config_writew(d, PCI_COMMAND, cmd); + /* map the interrupt */ pin = pci_config_readb(d, PCI_INTERRUPT_PIN); if (pin != 0) { -- 1.6.5.rc2