From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYF2q-0005D0-RO for qemu-devel@nongnu.org; Thu, 10 Apr 2014 09:29:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYF2h-0005Pj-F7 for qemu-devel@nongnu.org; Thu, 10 Apr 2014 09:29:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYF2h-0005PR-8P for qemu-devel@nongnu.org; Thu, 10 Apr 2014 09:29:23 -0400 From: Marcel Apfelbaum Date: Thu, 10 Apr 2014 16:29:41 +0300 Message-Id: <1397136581-10500-3-git-send-email-marcel.a@redhat.com> In-Reply-To: <1397136581-10500-1-git-send-email-marcel.a@redhat.com> References: <1397136581-10500-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH V3 2/2] hw/pci: check if pci2pci bridges implement optional limit registers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: seabios@seabios.org Cc: kevin@koconnor.net, kraxel@redhat.com, qemu-devel@nongnu.org, mst@redhat.com pair and pair are both optional. Do not reserve ranges if the above registers are not implemented. Signed-off-by: Marcel Apfelbaum --- src/fw/pciinit.c | 9 ++------- src/hw/pci.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/hw/pci.h | 9 +++++++++ 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c index 9b5d7ad..bbaecd6 100644 --- a/src/fw/pciinit.c +++ b/src/fw/pciinit.c @@ -26,13 +26,6 @@ #define PCI_BRIDGE_MEM_MIN (1<<21) // 2M == hugepage size #define PCI_BRIDGE_IO_MIN 0x1000 // mandated by pci bridge spec -enum pci_region_type { - PCI_REGION_TYPE_IO, - PCI_REGION_TYPE_MEM, - PCI_REGION_TYPE_PREFMEM, - PCI_REGION_TYPE_COUNT, -}; - static const char *region_type_name[] = { [ PCI_REGION_TYPE_IO ] = "io", [ PCI_REGION_TYPE_MEM ] = "mem", @@ -681,6 +674,8 @@ static int pci_bios_check_devices(struct pci_bus *busses) for (type = 0; type < PCI_REGION_TYPE_COUNT; type++) { u64 align = (type == PCI_REGION_TYPE_IO) ? PCI_BRIDGE_IO_MIN : PCI_BRIDGE_MEM_MIN; + if (!pci_bridge_has_region(s->bus_dev, type)) + continue; if (pci_region_align(&s->r[type]) > align) align = pci_region_align(&s->r[type]); u64 sum = pci_region_sum(&s->r[type]); diff --git a/src/hw/pci.c b/src/hw/pci.c index 055353d..27e7b1c 100644 --- a/src/hw/pci.c +++ b/src/hw/pci.c @@ -243,6 +243,54 @@ u8 pci_find_capability(struct pci_device *pci, u8 cap_id) return 0; } +static int pci_config_writableb(struct pci_device *pci, u32 addr, u8 test_val) +{ + u8 val; + + val = pci_config_readb(pci->bdf, addr); + pci_config_writeb(pci->bdf, addr, test_val); + + if (!(pci_config_readb(pci->bdf, addr))) + return 0; + + pci_config_writeb(pci->bdf, addr, val); + return 1; +} + +static int pci_config_writablew(struct pci_device *pci, u32 addr, u16 test_val) +{ + u16 val; + + val = pci_config_readw(pci->bdf, addr); + pci_config_writew(pci->bdf, addr, test_val); + + if (!(pci_config_readw(pci->bdf, addr))) + return 0; + + pci_config_writew(pci->bdf, addr, val); + return 1; +} + +int pci_bridge_has_region(struct pci_device *pci, + enum pci_region_type region_type) +{ + if (pci->class != PCI_CLASS_BRIDGE_PCI) + return 0; + + switch (region_type) { + case PCI_REGION_TYPE_IO: + return pci_config_writableb(pci, PCI_IO_BASE, 0xF0) && + pci_config_writableb(pci, PCI_IO_LIMIT, 0xF0); + case PCI_REGION_TYPE_PREFMEM: + return pci_config_writablew(pci, PCI_PREF_MEMORY_BASE, 0xFFF0) && + pci_config_writablew(pci, PCI_PREF_MEMORY_LIMIT, 0xFFF0); + case PCI_REGION_TYPE_MEM: /* fall through */ + default: + return 1; + } + + return 1; +} void pci_reboot(void) diff --git a/src/hw/pci.h b/src/hw/pci.h index e828225..0aaa84c 100644 --- a/src/hw/pci.h +++ b/src/hw/pci.h @@ -12,6 +12,13 @@ #define PCI_NUM_REGIONS 7 #define PCI_BRIDGE_NUM_REGIONS 2 +enum pci_region_type { + PCI_REGION_TYPE_IO, + PCI_REGION_TYPE_MEM, + PCI_REGION_TYPE_PREFMEM, + PCI_REGION_TYPE_COUNT, +}; + static inline u8 pci_bdf_to_bus(u16 bdf) { return bdf >> 8; } @@ -117,6 +124,8 @@ int pci_init_device(const struct pci_device_id *ids struct pci_device *pci_find_init_device(const struct pci_device_id *ids , void *arg); u8 pci_find_capability(struct pci_device *pci, u8 cap_id); +int pci_bridge_has_region(struct pci_device *pci, + enum pci_region_type region_type); void pci_reboot(void); #endif -- 1.8.3.1