Skip to contentSkip to conversation

x86/mrst/pci: avoid enabling intx for msi capable devices

PATCH In review Jacob Pan 3 participants 3 messages Jun 21, 2010

Subsystems (2)
lore
Share & tools
lore

Jacob Pan

author
#0 lore raw

PATCH 1/1 x86/mrst/pci: avoid enabling intx for msi capable devices

On Moorestown platform, true PCI devices with MSI capabilities do not support INTx mode. IRQ line# for those devices are zeros in the PCI shim, an attempt to enable INTx on these MSI capable devices will cause conflict in the system such as IRQ0 for the system timers.
If the device driver probes/enables MSI before pci_enable_device(), the conflict is not shown since INTx will be disabled. But if the driver tries to enable INTx before MSI, the conflict will cause system timer IRQ0 to break.

This patch will ensure the ordering of INTx and MSI setup by the driver is not relavent to INTx conflict. We will always skip INTx setup for MSI capable devices on Moorestown.

---
 arch/x86/pci/mrst.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/x86/pci/mrst.c +3 -0
index d5c7aef..ba3f08b 100644
@@ -203,6 +203,9 @@ static int mrst_pci_irq_enable(struct pci_dev *dev)
 	u8 pin;
 	struct io_apic_irq_attr irq_attr;
 
+	if (pci_find_capability(dev, PCI_CAP_ID_MSI))
+		return 0;
+
 	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
 
 	/* MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to
Signature · 1 line
1.6.3.3
#1 lore raw

Jesse: are you taking this or should I?

-hpa

Quoted 11 lines · Jacob Pan

On Moorestown platform, true PCI devices with MSI capabilities do not support INTx mode. IRQ line# for those devices are zeros in the PCI shim, an attempt to enable INTx on these MSI capable devices will cause conflict in the system such as IRQ0 for the system timers.
If the device driver probes/enables MSI before pci_enable_device(), the conflict is not shown since INTx will be disabled. But if the driver tries to enable INTx before MSI, the conflict will cause system timer IRQ0 to break.

This patch will ensure the ordering of INTx and MSI setup by the driver is not relavent to INTx conflict. We will always skip INTx setup for MSI capable devices on Moorestown.

Acked-by
#2 lore raw
Quoted 16 lines · On Mon, 21 Jun 2010 12:01:30 -0700 "H. Peter Anvin" <[email protected]> wrote:

Jesse: are you taking this or should I?

-hpa

Quoted 11 lines · Jacob Pan

On Moorestown platform, true PCI devices with MSI capabilities do not support INTx mode. IRQ line# for those devices are zeros in the PCI shim, an attempt to enable INTx on these MSI capable devices will cause conflict in the system such as IRQ0 for the system timers.
If the device driver probes/enables MSI before pci_enable_device(), the conflict is not shown since INTx will be disabled. But if the driver tries to enable INTx before MSI, the conflict will cause system timer IRQ0 to break.

This patch will ensure the ordering of INTx and MSI setup by the driver is not relavent to INTx conflict. We will always skip INTx setup for MSI capable devices on Moorestown.

You go ahead. You can add my:

Thanks,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center