From: Tejun Heo Date: Tue, 12 Dec 2006 11:17:32 +0000 (+0900) Subject: [PATCH] ahci: do not mangle saved HOST_CAP while resetting controller X-Git-Tag: v2.6.20-rc2~123^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=551c012d7eea3dc5ec063c7ff9c718d39e77634f;p=linux-2.6-omap-h63xx.git [PATCH] ahci: do not mangle saved HOST_CAP while resetting controller Do not mangle with HOST_CAP while resetting controller. The code is there for a historical reason. The mangling breaks controller feature detection and 0 PORTS_IMPL workaround code. This problem was spotted by Manoj Kasichainula. Signed-off-by: Tejun Heo Cc: Manoj Kasichainula Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index f36da488a2c..dbae6d97104 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -645,8 +645,6 @@ static int ahci_reset_controller(void __iomem *mmio, struct pci_dev *pdev) u32 cap_save, impl_save, tmp; cap_save = readl(mmio + HOST_CAP); - cap_save &= ( (1<<28) | (1<<17) ); - cap_save |= (1 << 27); impl_save = readl(mmio + HOST_PORTS_IMPL); /* global controller reset */