d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially revert previous change. Drop the quirk to disable MSI for HT

Browse Source 
chipsets that do not have an HT slave at 0:0:0:0.  The Linux quirk is
actually specific to Nvidia chipsets and the check I had added was in
the wrong place.

Prodded by:	nathanw
This commit is contained in:
John Baldwin 2011-03-18 14:06:12 +00:00
parent 9201145d02
commit 54a03acb86
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/pci/pci.c
View File

@ -236,7 +236,7 @@ struct pci_quirk pci_quirks[] = {
struct devlist pci_devq;
uint32_t pci_generation;
uint32_t pci_numdevs = 0;
static int ht_chipset, pcie_chipset, pcix_chipset;
static int pcie_chipset, pcix_chipset;
/* sysctl vars */
SYSCTL_NODE(_hw, OID_AUTO, pci, CTLFLAG_RD, 0, "PCI bus tuning parameters");
@ -616,19 +616,9 @@ pci_read_extcap(device_t pcib, pcicfgregs *cfg)
/* Determine HT-specific capability type. */
val = REG(ptr + PCIR_HT_COMMAND, 2);
if ((val & 0xe000) == PCIM_HTCAP_SLAVE) {
if ((val & 0xe000) == PCIM_HTCAP_SLAVE)
cfg->ht.ht_slave = ptr;
/*
* If device 0:0:0:0 is an HT slave,
* then this is an HT chipset and MSI
* should be enabled for HT devices.
*/
if (cfg->domain == 0 && cfg->bus == 0 &&
cfg->slot == 0 && cfg->func == 0)
ht_chipset = 1;
}
#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
switch (val & PCIM_HTCMD_CAP_MASK) {
case PCIM_HTCAP_MSI_MAPPING:
@ -1869,13 +1859,6 @@ pci_msi_device_blacklisted(device_t dev)
q->type == PCI_QUIRK_DISABLE_MSI)
return (1);
}
/*
* Blacklist HyperTransport devices if the device at 0:0:0:0
* is not a HyperTransport slave.
*/
if (!ht_chipset && pci_find_extcap(dev, PCIY_HT, NULL) == 0)
return (1);
return (0);
}