Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit
+4
-8
drivers/pci/msi.c
+4
-8
drivers/pci/msi.c
···
255
255
pci_write_config_word(dev, msi_control_reg(pos), control);
256
256
dev->msix_enabled = 1;
257
257
}
258
-
if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
259
-
/* PCI Express Endpoint device detected */
260
-
pci_intx(dev, 0); /* disable intx */
261
-
}
258
+
259
+
pci_intx(dev, 0); /* disable intx */
262
260
}
263
261
264
262
void disable_msi_mode(struct pci_dev *dev, int pos, int type)
···
274
276
pci_write_config_word(dev, msi_control_reg(pos), control);
275
277
dev->msix_enabled = 0;
276
278
}
277
-
if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
278
-
/* PCI Express Endpoint device detected */
279
-
pci_intx(dev, 1); /* enable intx */
280
-
}
279
+
280
+
pci_intx(dev, 1); /* enable intx */
281
281
}
282
282
283
283
static int msi_lookup_irq(struct pci_dev *dev, int type)