From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexey Kardashevskiy Subject: [PATCH] kernel vfio: PCI ROM size calculation Date: Sat, 12 May 2012 16:50:12 +1000 Message-ID: <4FAE0824.4050209@ozlabs.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Cc: Benjamin Herrenschmidt , Alex Williamson , David Gibson , Alex Graf , kvm@vger.kernel.org, qemu-devel@nongnu.org To: Alex Williamson Return-path: Received: from mail-pb0-f46.google.com ([209.85.160.46]:62462 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752241Ab2ELGuP (ORCPT ); Sat, 12 May 2012 02:50:15 -0400 Received: by pbbrp8 with SMTP id rp8so4133660pbb.19 for ; Fri, 11 May 2012 23:50:14 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: The original code calculated the real size of the ROM and passed it to QEMU which tried to do pci_register_bar and failed with error message "ERROR: PCI region size must be pow2". The example card is PCIe Intel E1000E with the ROM size 0x9c00. pci_resource_len seems to be a proper solution. Signed-off-by: Alexey Kardashevskiy --- drivers/vfio/pci/vfio_pci.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index b2f1f3a..6d4a783 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -234,12 +234,9 @@ static long vfio_pci_ioctl(void *device_data, * this gives the user an easy way to determine whether * there's anything here w/o trying to read it. */ if (info.index == VFIO_PCI_ROM_REGION_INDEX) { - void __iomem *io; - size_t size; - - io = pci_map_rom(pdev, &size); - info.size = io ? size : 0; - pci_unmap_rom(pdev, io); + info.size = pci_resource_len(pdev, + PCI_ROM_RESOURCE); + info.flags |= VFIO_PCI_ROM_REGION_INDEX; } else if (flags & IORESOURCE_MEM) { info.size = pci_resource_len(pdev, info.index); info.flags |= (VFIO_REGION_INFO_FLAG_WRITE | -- Alexey