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

Commit 0d64a233 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: separate ATA_EHI_DID_RESET into DID_SOFTRESET and DID_HARDRESET 



Separate ATA_EHI_DID_RESET into ATA_EHI_DID_SOFTRESET and
ATA_EHI_DID_HARDRESET.  ATA_EHI_DID_RESET is redefined as OR of the
two flags.  This patch doesn't introduce any behavior change.  This
will be used later to determine whether _SDD is necessary or not.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1188c0d8

drivers/ata/libata-eh.c

+4 −1
Original line number Diff line number Diff line
@@ -1671,7 +1671,10 @@ static int ata_eh_reset(struct ata_port *ap, int classify, 
				reset == softreset ? "soft" : "hard");



	/* mark that this EH session started with reset */

	ehc->i.flags |= ATA_EHI_DID_RESET;

	if (reset == hardreset)

		ehc->i.flags |= ATA_EHI_DID_HARDRESET;

	else

		ehc->i.flags |= ATA_EHI_DID_SOFTRESET;



	rc = ata_do_reset(ap, reset, classes);

include/linux/libata.h

+6 −4
Original line number Diff line number Diff line
@@ -282,11 +282,13 @@ enum { 
	ATA_EHI_NO_AUTOPSY	= (1 << 2),  /* no autopsy */

	ATA_EHI_QUIET		= (1 << 3),  /* be quiet */



	ATA_EHI_DID_RESET	= (1 << 16), /* already reset this port */

	ATA_EHI_PRINTINFO	= (1 << 17), /* print configuration info */

	ATA_EHI_SETMODE		= (1 << 18), /* configure transfer mode */

	ATA_EHI_POST_SETMODE	= (1 << 19), /* revaildating after setmode */

	ATA_EHI_DID_SOFTRESET	= (1 << 16), /* already soft-reset this port */

	ATA_EHI_DID_HARDRESET	= (1 << 17), /* already soft-reset this port */

	ATA_EHI_PRINTINFO	= (1 << 18), /* print configuration info */

	ATA_EHI_SETMODE		= (1 << 19), /* configure transfer mode */

	ATA_EHI_POST_SETMODE	= (1 << 20), /* revaildating after setmode */



	ATA_EHI_DID_RESET	= ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,

	ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,



	/* max repeat if error condition is still set after ->error_handler */