svn commit: r342160 - head/sys/dev/pci
Greg Lehey
grog at FreeBSD.org
Mon Dec 17 07:09:47 UTC 2018
Author: grog
Date: Mon Dec 17 07:09:46 2018
New Revision: 342160
URL: https://svnweb.freebsd.org/changeset/base/342160
Log:
Work around BIOS quirks on HPE Proliant MicroServer Gen10
PR: 221350
Submitted by: Bob Bishop
Reported by: Rafal Lukawiecki
Reviewed by: jhb
MFC after: 2 weeks
Modified:
head/sys/dev/pci/pci.c
Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c Mon Dec 17 07:03:36 2018 (r342159)
+++ head/sys/dev/pci/pci.c Mon Dec 17 07:09:46 2018 (r342160)
@@ -230,6 +230,7 @@ struct pci_quirk {
#define PCI_QUIRK_UNMAP_REG 4 /* Ignore PCI map register */
#define PCI_QUIRK_DISABLE_MSIX 5 /* MSI-X doesn't work */
#define PCI_QUIRK_MSI_INTX_BUG 6 /* PCIM_CMD_INTxDIS disables MSI */
+#define PCI_QUIRK_REALLOC_BAR 7 /* Can't allocate memory at the default address */
int arg1;
int arg2;
};
@@ -311,6 +312,12 @@ static const struct pci_quirk pci_quirks[] = {
{ 0x167814e4, PCI_QUIRK_MSI_INTX_BUG, 0, 0 }, /* BCM5715 */
{ 0x167914e4, PCI_QUIRK_MSI_INTX_BUG, 0, 0 }, /* BCM5715S */
+ /*
+ * HPE Gen 10 VGA has a memory range that can't be allocated in the
+ * expected place.
+ */
+ { 0x98741002, PCI_QUIRK_REALLOC_BAR, 0, 0 },
+
{ 0 }
};
@@ -3283,7 +3290,9 @@ pci_add_map(device_t bus, device_t dev, int reg, struc
*/
res = resource_list_reserve(rl, bus, dev, type, ®, start, end, count,
flags);
- if (pci_do_realloc_bars && res == NULL && (start != 0 || end != ~0)) {
+ if ((pci_do_realloc_bars
+ || pci_has_quirk(pci_get_devid(dev), PCI_QUIRK_REALLOC_BAR))
+ && res == NULL && (start != 0 || end != ~0)) {
/*
* If the allocation fails, try to allocate a resource for
* this BAR using any available range. The firmware felt
More information about the svn-src-all
mailing list