Attachment 304118 Details for Bug 432452 – Patch based on 1769b46a to fix spurious interrupts

[patch] Patch based on 1769b46a to fix spurious interrupts

add-pci_intx-1769b46a.patch (text/plain), 4.93 KB, created by Flavio Leitner on 2008-04-29 14:08:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Flavio Leitner

Created: 2008-04-29 14:08:13 UTC

Size: 4.93 KB

patch

obsolete

>Index: linux-2.6.9/drivers/pci/pci.c
>===================================================================
>--- linux-2.6.9.orig/drivers/pci/pci.c
>+++ linux-2.6.9/drivers/pci/pci.c
>@@ -741,6 +741,31 @@ pci_clear_mwi(struct pci_dev *dev)
> 	}
> }
> 
>+/**
>+ * pci_intx - enables/disables PCI INTx for device dev
>+ * @pdev: the PCI device to operate on
>+ * @enable: boolean: whether to enable or disable PCI INTx
>+ *
>+ * Enables/disables PCI INTx for device dev
>+ */
>+void
>+pci_intx(struct pci_dev *pdev, int enable)
>+{
>+	u16 pci_command, new;
>+
>+	pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
>+
>+	if (enable) {
>+		new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
>+	} else {
>+		new = pci_command | PCI_COMMAND_INTX_DISABLE;
>+	}
>+
>+	if (new != pci_command) {
>+		pci_write_config_word(pdev, PCI_COMMAND, new);
>+	}
>+}
>+
> #ifndef HAVE_ARCH_PCI_SET_DMA_MASK
> /*
>  * These can be overridden by arch-specific implementations
>@@ -1021,6 +1046,7 @@ EXPORT_SYMBOL(pci_request_region);
> EXPORT_SYMBOL(pci_set_master);
> EXPORT_SYMBOL(pci_set_mwi);
> EXPORT_SYMBOL(pci_clear_mwi);
>+EXPORT_SYMBOL_GPL(pci_intx);
> EXPORT_SYMBOL(pci_set_dma_mask);
> EXPORT_SYMBOL(pci_dac_set_dma_mask);
> EXPORT_SYMBOL(pci_set_consistent_dma_mask);
>Index: linux-2.6.9/include/linux/pci.h
>===================================================================
>--- linux-2.6.9.orig/include/linux/pci.h
>+++ linux-2.6.9/include/linux/pci.h
>@@ -797,6 +797,7 @@ int pci_set_pcie_reset_state(struct pci_
> #define HAVE_PCI_SET_MWI
> int pci_set_mwi(struct pci_dev *dev);
> void pci_clear_mwi(struct pci_dev *dev);
>+void pci_intx(struct pci_dev *dev, int enable);
> int __must_check pci_set_dma_mask(struct pci_dev *dev, u64 mask);
> int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask);
> int __must_check pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
>Index: linux-2.6.9/drivers/infiniband/hw/ipath/ipath_iba7220.c
>===================================================================
>--- linux-2.6.9.orig/drivers/infiniband/hw/ipath/ipath_iba7220.c
>+++ linux-2.6.9/drivers/infiniband/hw/ipath/ipath_iba7220.c
>@@ -1178,10 +1178,7 @@ static void ipath_enable_intx(struct pci
> 	int pos;
> 
> 	/* first, turn on INTx */
>-	pci_read_config_word(pdev, PCI_COMMAND, &cw);
>-	new = cw & ~PCI_COMMAND_INTX_DISABLE;
>-	if (new != cw)
>-		pci_write_config_word(pdev, PCI_COMMAND, new);
>+	pci_intx(pdev, 1);
> 
> 	/* then turn off MSI */
> 	pos = pci_find_capability(pdev, PCI_CAP_ID_MSI);
>Index: linux-2.6.9/drivers/net/tg3_compat.h
>===================================================================
>--- linux-2.6.9.orig/drivers/net/tg3_compat.h
>+++ linux-2.6.9/drivers/net/tg3_compat.h
>@@ -90,23 +90,4 @@ static inline void netif_tx_unlock(struc
>         spin_unlock(&dev->xmit_lock);
> }
> 
>-static inline void pci_intx(struct pci_dev *pdev, int enable)
>-{
>-	u16 pci_command, new;
>-
>-	pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
>-
>-	if (enable) {
>-		new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
>-	} else {
>-		new = pci_command | PCI_COMMAND_INTX_DISABLE;
>-	}
>-
>-	if (new != pci_command) {
>-		pci_write_config_word(pdev, PCI_COMMAND, new);
>-	}
>-}
>-
>-
>-
> #endif /* __TG3_COMPAT_H__ */
>Index: linux-2.6.9/drivers/pci/msi.c
>===================================================================
>--- linux-2.6.9.orig/drivers/pci/msi.c
>+++ linux-2.6.9/drivers/pci/msi.c
>@@ -468,13 +468,9 @@ static void enable_msi_mode(struct pci_d
> 		msix_enable(control);
> 		pci_write_config_word(dev, msi_control_reg(pos), control);
> 	}
>-    	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
>-		/* PCI Express Endpoint device detected */
>-		u16 cmd;
>-		pci_read_config_word(dev, PCI_COMMAND, &cmd);
>-		cmd |= PCI_COMMAND_INTX_DISABLE;
>-		pci_write_config_word(dev, PCI_COMMAND, cmd);
>-	}
>+
>+	/* disable intx */
>+	pci_intx(dev, 0);
> }
> 
> void disable_msi_mode(struct pci_dev *dev, int pos, int type)
>@@ -490,13 +486,9 @@ void disable_msi_mode(struct pci_dev *de
> 		msix_disable(control);
> 		pci_write_config_word(dev, msi_control_reg(pos), control);
> 	}
>-    	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
>-		/* PCI Express Endpoint device detected */
>-		u16 cmd;
>-		pci_read_config_word(dev, PCI_COMMAND, &cmd);
>-		cmd &= ~PCI_COMMAND_INTX_DISABLE;
>-		pci_write_config_word(dev, PCI_COMMAND, cmd);
>-	}
>+
>+	/* enable intx */
>+	pci_intx(dev, 1);
> }
> 
> static int msi_lookup_vector(struct pci_dev *dev, int type)
>Index: linux-2.6.9/include/linux/libata-compat.h
>===================================================================
>--- linux-2.6.9.orig/include/linux/libata-compat.h
>+++ linux-2.6.9/include/linux/libata-compat.h
>@@ -13,22 +13,4 @@ typedef u32 pm_message_t;
> 
> typedef void (*work_func_t)(void *);
> 
>-static inline void
>-pci_intx(struct pci_dev *pdev, int enable)
>-{
>-	u16 pci_command, new;
>-
>-	pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
>-
>-	if (enable) {
>-		new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
>-	} else {
>-		new = pci_command | PCI_COMMAND_INTX_DISABLE;
>-	}
>-
>-	if (new != pci_command) {
>-		pci_write_config_word(pdev, PCI_COMMAND, new);
>-	}
>-}
>-
> #endif /* __LIBATA_COMPAT_H__ */

Actions: View | Diff

Attachments on bug 432452: 294622 | 304118 | 304255