Skip to contentSkip to conversation

sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()

PATCH In review Tejun Heo 2 participants 4 messages May 14, 2010 – May 15, 2010 libata

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()

sata_nv was incorrectly using ata_host_activate() instead of ata_pci_sff_activate_host() leading to IRQ assignment failure in legacy mode. Fix it.

Signed-off-by Tejun Heo <[email protected]>
Cc Robert Hancock <[email protected]>
Cc [email protected]
---
 drivers/ata/sata_nv.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/ata/sata_nv.c +1 -2
Index: ata/drivers/ata/sata_nv.c
===================================================================
@@ -2479,8 +2479,7 @@ static int nv_init_one(struct pci_dev *p
 	}
 
 	pci_set_master(pdev);
-	return ata_host_activate(host, pdev->irq, ipriv->irq_handler,
-				 IRQF_SHARED, ipriv->sht);
+	return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht);
 }
 
 #ifdef CONFIG_PM
#1 lore raw
Quoted 16 lines · Tejun Heo

sata_nv was incorrectly using ata_host_activate() instead of ata_pci_sff_activate_host() leading to IRQ assignment failure in legacy mode. Fix it.

Signed-off-by Tejun Heo<[email protected]>
Cc Robert Hancock<[email protected]>
Cc [email protected]
---
  drivers/ata/sata_nv.c |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

Index: ata/drivers/ata/sata_nv.c
===================================================================

drivers/ata/sata_nv.c static int nv_init_one(struct pci_dev *p · line 2482

Quoted 6 lines
drivers/ata/sata_nv.c +1 -2
@@ -2479,8 +2479,7 @@ static int nv_init_one(struct pci_dev *p
  	}
 
  	pci_set_master(pdev);
-	return ata_host_activate(host, pdev->irq, ipriv->irq_handler,
-				 IRQF_SHARED, ipriv->sht);
+	return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht);

hmmmm. I agree 100% with this patch, but is it a recent regression?

At -rc7, we are trying hard to only include fixes for regressions.

Around -rc1, I would stuff this into #upstream-fixes without hesitation.
But now, I'm thinking #upstream.

Jeff

author
#2 lore raw

Hello,

Quoted 1 line · Jeff Garzik

hmmmm. I agree 100% with this patch, but is it a recent regression?

It's more than a year old at least. It's a bit surprising that no one reported this before.

Quoted 4 lines

At -rc7, we are trying hard to only include fixes for regressions.

Around -rc1, I would stuff this into #upstream-fixes without hesitation. But now, I'm thinking #upstream.

Yeap, sure. We can wait some time after it makes -rc1 and then push it through -stable.

Thanks.

Signature · 1 line
tejun