Attachment 294622 Details for Bug 432452 – Patch fixing smp irq affinity

[patch] Patch fixing smp irq affinity

rhel4-68.11-fix-smp-irq_affinity.patch (text/plain), 5.59 KB, created by Flavio Leitner on 2008-02-12 03:34:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Flavio Leitner

Created: 2008-02-12 03:34:32 UTC

Size: 5.59 KB

patch

obsolete

>
>The MSI should be disabled when moving IRQs on chips without
>Mask-and-Pending bits. This patch based on upstream merge two 
>IRQ chip drivers and also add msi_set_enable() to handle this case.
>
>Signed-off-by: Flavio Leitner <fleitner@redhat.com>
>
>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
>@@ -56,24 +56,43 @@ static int msi_cache_init(void)
> 	return 0;
> }
> 
>+static void msi_set_enable(struct pci_dev *dev, int enable)
>+{
>+	int pos;
>+	u16 control;
>+
>+	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
>+	if (pos) {
>+		pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control);
>+		control &= ~PCI_MSI_FLAGS_ENABLE;
>+		if (enable)
>+			control |= PCI_MSI_FLAGS_ENABLE;
>+		pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control);
>+	}
>+}
>+
> static void msi_set_mask_bit(unsigned int vector, int flag)
> {
> 	struct msi_desc *entry;
> 
> 	entry = (struct msi_desc *)msi_desc[vector];
>-	if (!entry || !entry->dev || !entry->mask_base)
>+	if (!entry || !entry->dev)
> 		return;
> 	switch (entry->msi_attrib.type) {
> 	case PCI_CAP_ID_MSI:
> 	{
>-		int		pos;
>-		u32		mask_bits;
>-
>-		pos = entry->mask_base;
>-		pci_read_config_dword(entry->dev, pos, &mask_bits);
>-		mask_bits &= ~(1);
>-		mask_bits |= flag;
>-		pci_write_config_dword(entry->dev, pos, mask_bits);
>+		if (entry->msi_attrib.maskbit) {
>+			int		pos;
>+			u32		mask_bits;
>+
>+			pos = (long)entry->mask_base;
>+			pci_read_config_dword(entry->dev, pos, &mask_bits);
>+			mask_bits &= ~(1);
>+			mask_bits |= flag;
>+			pci_write_config_dword(entry->dev, pos, mask_bits);
>+		} else {
>+			msi_set_enable(entry->dev, !flag);
>+		}
> 		break;
> 	}
> 	case PCI_CAP_ID_MSIX:
>@@ -165,40 +184,13 @@ static void unmask_MSI_irq(unsigned int 
> 	msi_set_mask_bit(vector, 0);
> }
> 
>-static unsigned int startup_msi_irq_wo_maskbit(unsigned int vector)
>-{
>-	struct msi_desc *entry;
>-	unsigned long flags;
>-
>-	spin_lock_irqsave(&msi_lock, flags);
>-	entry = msi_desc[vector];
>-	if (!entry || !entry->dev) {
>-		spin_unlock_irqrestore(&msi_lock, flags);
>-		return 0;
>-	}
>-	entry->msi_attrib.state = 1;	/* Mark it active */
>-	spin_unlock_irqrestore(&msi_lock, flags);
>-
>-	return 0;	/* never anything pending */
>-}
>-
> static void release_msi(unsigned int vector);
> static void shutdown_msi_irq(unsigned int vector)
> {
> 	release_msi(vector);
> }
> 
>-#define shutdown_msi_irq_wo_maskbit	shutdown_msi_irq
>-static void enable_msi_irq_wo_maskbit(unsigned int vector) {}
>-static void disable_msi_irq_wo_maskbit(unsigned int vector) {}
>-static void ack_msi_irq_wo_maskbit(unsigned int vector) {}
>-static void end_msi_irq_wo_maskbit(unsigned int vector)
>-{
>-	move_msi(vector);
>-	ack_APIC_irq();
>-}
>-
>-static unsigned int startup_msi_irq_w_maskbit(unsigned int vector)
>+static unsigned int startup_msi_irq(unsigned int vector)
> {
> 	struct msi_desc *entry;
> 	unsigned long flags;
>@@ -216,12 +208,7 @@ static unsigned int startup_msi_irq_w_ma
> 	return 0;	/* never anything pending */
> }
> 
>-#define shutdown_msi_irq_w_maskbit	shutdown_msi_irq
>-#define enable_msi_irq_w_maskbit	unmask_MSI_irq
>-#define disable_msi_irq_w_maskbit	mask_MSI_irq
>-#define ack_msi_irq_w_maskbit		mask_MSI_irq
>-
>-static void end_msi_irq_w_maskbit(unsigned int vector)
>+static void end_msi_irq_maskbit(unsigned int vector)
> {
> 	move_msi(vector);
> 	unmask_MSI_irq(vector);
>@@ -234,44 +221,27 @@ static void end_msi_irq_w_maskbit(unsign
>  */
> static struct hw_interrupt_type msix_irq_type = {
> 	.typename	= "PCI-MSI-X",
>-	.startup	= startup_msi_irq_w_maskbit,
>-	.shutdown	= shutdown_msi_irq_w_maskbit,
>-	.enable		= enable_msi_irq_w_maskbit,
>-	.disable	= disable_msi_irq_w_maskbit,
>-	.ack		= ack_msi_irq_w_maskbit,
>-	.end		= end_msi_irq_w_maskbit,
>-	.set_affinity	= set_msi_irq_affinity
>-};
>-
>-/*
>- * Interrupt Type for MSI PCI/PCI-X/PCI-Express Devices,
>- * which implement the MSI Capability Structure with
>- * Mask-and-Pending Bits.
>- */
>-static struct hw_interrupt_type msi_irq_w_maskbit_type = {
>-	.typename	= "PCI-MSI",
>-	.startup	= startup_msi_irq_w_maskbit,
>-	.shutdown	= shutdown_msi_irq_w_maskbit,
>-	.enable		= enable_msi_irq_w_maskbit,
>-	.disable	= disable_msi_irq_w_maskbit,
>-	.ack		= ack_msi_irq_w_maskbit,
>-	.end		= end_msi_irq_w_maskbit,
>+	.startup	= startup_msi_irq,
>+	.shutdown	= shutdown_msi_irq,
>+	.enable		= unmask_MSI_irq,
>+	.disable	= mask_MSI_irq,
>+	.ack		= mask_MSI_irq,
>+	.end		= end_msi_irq_maskbit,
> 	.set_affinity	= set_msi_irq_affinity
> };
> 
> /*
>- * Interrupt Type for MSI PCI/PCI-X/PCI-Express Devices,
>- * which implement the MSI Capability Structure without
>- * Mask-and-Pending Bits.
>+ * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
>+ * which implement the MSI or MSI-X Capability Structure.
>  */
>-static struct hw_interrupt_type msi_irq_wo_maskbit_type = {
>+static struct hw_interrupt_type msi_irq_type = {
> 	.typename	= "PCI-MSI",
>-	.startup	= startup_msi_irq_wo_maskbit,
>-	.shutdown	= shutdown_msi_irq_wo_maskbit,
>-	.enable		= enable_msi_irq_wo_maskbit,
>-	.disable	= disable_msi_irq_wo_maskbit,
>-	.ack		= ack_msi_irq_wo_maskbit,
>-	.end		= end_msi_irq_wo_maskbit,
>+	.startup	= startup_msi_irq,
>+	.shutdown	= shutdown_msi_irq,
>+	.enable		= unmask_MSI_irq,
>+	.disable	= mask_MSI_irq,
>+	.ack		= mask_MSI_irq,
>+	.end		= end_msi_irq_maskbit,
> 	.set_affinity	= set_msi_irq_affinity
> };
> 
>@@ -446,12 +416,8 @@ static void irq_handler_init(int cap_id,
> 	spin_lock(&irq_desc[pos].lock);
> 	if (cap_id == PCI_CAP_ID_MSIX)
> 		irq_desc[pos].handler = &msix_irq_type;
>-	else {
>-		if (!mask)
>-			irq_desc[pos].handler = &msi_irq_wo_maskbit_type;
>-		else
>-			irq_desc[pos].handler = &msi_irq_w_maskbit_type;
>-	}
>+	else
>+		irq_desc[pos].handler = &msi_irq_type;
> 	spin_unlock(&irq_desc[pos].lock);
> }
>

Actions: View | Diff

Attachments on bug 432452: 294622 | 304118 | 304255