Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ccd3329 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: don't normalize UNKNOWN to NONE after reset 



After non-classifying reset, ehc->classes[] could contain
ATA_DEV_UNKNOWN which used to be normalized to ATA_DEV_NONE for
consistency.  However, this causes unfortunate side effect for drivers
which have non-classifying hardresets (e.g. sata_nv) by making
hardreset report ATA_DEV_NONE for non-classifying resets and thus
makes EH believe that the port is unoccupied and recovery can be
skipped.  The end result is that after a device is swapped with
another one, the new device isn't attached after the old one is
detached.

This patch makes ata_eh_reset() not normalize UNKNOWN to NONE after
non-classifying resets.  This fixes the above problem.  As UNKNOWN and
NONE are handled differently by only EH hotplug logic, this doesn't
cause other behavior changes.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Cc: Robert Hancock <hancockr@shaw.ca>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2695e366

drivers/ata/libata-eh.c

+1 −3
Original line number Diff line number Diff line
@@ -2167,13 +2167,11 @@ int ata_eh_reset(struct ata_link *link, int classify, 
		if (ata_link_offline(link))

			continue;



		/* apply class override and convert UNKNOWN to NONE */

		/* apply class override */

		if (lflags & ATA_LFLAG_ASSUME_ATA)

			classes[dev->devno] = ATA_DEV_ATA;

		else if (lflags & ATA_LFLAG_ASSUME_SEMB)

			classes[dev->devno] = ATA_DEV_SEMB_UNSUP; /* not yet */

		else if (classes[dev->devno] == ATA_DEV_UNKNOWN)

			classes[dev->devno] = ATA_DEV_NONE;

	}



	/* record current link speed */