diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 3efa990..dbbf6cf 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -562,15 +562,23 @@ static inline void __iomem *ahci_port_base(struct ata_port *ap) static void ahci_enable_ahci(void __iomem *mmio) { + int i; u32 tmp; - /* turn on AHCI_EN */ tmp = readl(mmio + HOST_CTL); - if (!(tmp & HOST_AHCI_EN)) { + if (tmp & HOST_AHCI_EN) + return; + + for (i = 0; i < 10; i++) { + msleep(100); tmp |= HOST_AHCI_EN; writel(tmp, mmio + HOST_CTL); tmp = readl(mmio + HOST_CTL); /* flush && sanity check */ - WARN_ON(!(tmp & HOST_AHCI_EN)); + + /* turn on AHCI_EN */ + if (tmp & HOST_AHCI_EN) + break; + printk("AHCI_EN failed i=%d\n", i); } }