[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 <[email protected]>
Cc: Manoj Kasichainula <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f36da488a2c1c1ee9a62e54637bf1d46e7f4c0fd..dbae6d9710414325f48423490761a52c4ce77fa8 100644 (file)
--- 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 */