| Message ID | fe4097ff2b486092108663532c015a40984bc5f9.1396426390.git.agordeev@redhat.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hello, Alexander. On Wed, Apr 02, 2014 at 10:19:56AM +0200, Alexander Gordeev wrote: > +static int ahci_is_mrsm(struct ahci_host_priv *hpriv) > +{ > + void __iomem *mmio = hpriv->mmio; > + u32 ctl = readl(mmio + HOST_CTL); > + > + return ctl & HOST_MRSM; > +} Can you please just open code this in ahci_init_interrupt()? Also, do I need to backport this through -stable? Has this been tested somehow? What are the impacts of missing this? Thanks.
On Wed, Apr 16, 2014 at 04:01:32PM -0400, Tejun Heo wrote: > Can you please just open code this in ahci_init_interrupt()? Also, do > I need to backport this through -stable? Has this been tested > somehow? What are the impacts of missing this? Hi Tejun, Sent out an updated version. Yes, I think it needs to go to -stable. > Thanks. > > -- > tejun
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 5a0bf8e..838d97e 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1163,6 +1163,14 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host) {} #endif +static int ahci_is_mrsm(struct ahci_host_priv *hpriv) +{ + void __iomem *mmio = hpriv->mmio; + u32 ctl = readl(mmio + HOST_CTL); + + return ctl & HOST_MRSM; +} + static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, struct ahci_host_priv *hpriv) { @@ -1189,6 +1197,15 @@ static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, else if (nvec < 0) goto intx; + /* + * Fallback to single MSI mode if the controller enforced MRSM mode + */ + if (ahci_is_mrsm(hpriv)) { + pci_disable_msi(pdev); + printk(KERN_INFO "ahci: MRSM is on, fallback to single MSI\n"); + goto single_msi; + } + return nvec; single_msi: diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 51af275..b5eb886 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -94,6 +94,7 @@ enum { /* HOST_CTL bits */ HOST_RESET = (1 << 0), /* reset controller; self-clear */ HOST_IRQ_EN = (1 << 1), /* global IRQ enable */ + HOST_MRSM = (1 << 2), /* MSI Revert to Single Message */ HOST_AHCI_EN = (1 << 31), /* AHCI enabled */ /* HOST_CAP bits */
Do not rely on successful initialization of multiple MSIs mode alone and always check if "MSI Revert to Single Message" mode was enforced by the controller. Fall back to the single MSI mode in case it did. Not doing so might screw up the interrupt handling. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Cc: linux-ide@vger.kernel.org --- drivers/ata/ahci.c | 17 +++++++++++++++++ drivers/ata/ahci.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-)