[libata] AHCI: fix newly introduced host-reset bug



The recent fix to host reset introduced a problem, whereby AHCI-enable
bit would be cleared upon reset, if it was not asserted prior to reset.

Unconditionally enable AHCI-enable bit.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent 360737a9

drivers/ata/ahci.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -898,8 +898,10 @@ static int ahci_reset_controller(struct ata_host *host)
		* AHCI-specific, such as HOST_RESET.
		*/
		tmp = readl(mmio + HOST_CTL);
		if (!(tmp & HOST_AHCI_EN))
		writel(tmp \| HOST_AHCI_EN, mmio + HOST_CTL);
		if (!(tmp & HOST_AHCI_EN)) {
		tmp \|= HOST_AHCI_EN;
		writel(tmp, mmio + HOST_CTL);
		}

		/* global controller reset */
		if ((tmp & HOST_RESET) == 0) {