Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51de32d2 authored by Mark Lord's avatar Mark Lord Committed by Jeff Garzik
Browse files

sata_mv: don't blindly enable IRQs 



Part one of simplifying/fixing handling of the main_irq_mask register
to resolve unexpected interrupt issues observed in 2.6.26-rc*.

Don't blindly enable port IRQs at host init time.
Instead, enable only the bits that we want,
which in this case is simply the PCI_ERR bit.

The per-port bits can wait until the ports are reset/probed for devices.

Signed-off-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c443c500

drivers/ata/sata_mv.c

+6 −26
Original line number Diff line number Diff line
@@ -202,13 +202,6 @@ enum { 
	HC_MAIN_RSVD		= (0x7f << 25),	/* bits 31-25 */

	HC_MAIN_RSVD_5		= (0x1fff << 19), /* bits 31-19 */

	HC_MAIN_RSVD_SOC	= (0x3fffffb << 6),     /* bits 31-9, 7-6 */

	HC_MAIN_MASKED_IRQS	= (TRAN_LO_DONE | TRAN_HI_DONE |

				   PORTS_0_3_COAL_DONE | PORTS_4_7_COAL_DONE |

				   PORTS_0_7_COAL_DONE | GPIO_INT | TWSI_INT |

				   HC_MAIN_RSVD),

	HC_MAIN_MASKED_IRQS_5	= (PORTS_0_3_COAL_DONE | PORTS_4_7_COAL_DONE |

				   HC_MAIN_RSVD_5),

	HC_MAIN_MASKED_IRQS_SOC = (PORTS_0_3_COAL_DONE | HC_MAIN_RSVD_SOC),



	/* SATAHC registers */

	HC_CFG_OFS		= 0,
@@ -3101,25 +3094,12 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx) 


		/* and unmask interrupt generation for host regs */

		writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);

		if (IS_GEN_I(hpriv))

			writelfl(~HC_MAIN_MASKED_IRQS_5,

				 hpriv->main_irq_mask_addr);

		else

			writelfl(~HC_MAIN_MASKED_IRQS,

				 hpriv->main_irq_mask_addr);



		VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x "

			"PCI int cause/mask=0x%08x/0x%08x\n",

			readl(hpriv->main_irq_cause_addr),

			readl(hpriv->main_irq_mask_addr),

			readl(mmio + hpriv->irq_cause_ofs),

			readl(mmio + hpriv->irq_mask_ofs));

	} else {

		writelfl(~HC_MAIN_MASKED_IRQS_SOC,

			 hpriv->main_irq_mask_addr);

		VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x\n",

			readl(hpriv->main_irq_cause_addr),

			readl(hpriv->main_irq_mask_addr));



		/*

		 * enable only global host interrupts for now.

		 * The per-port interrupts get done later as ports are set up.

		 */

		writelfl(PCI_ERR, hpriv->main_irq_mask_addr);

	}

done:

	return rc;