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

Commit 848e4c68 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: transfer EHI control flags to slave ehc.i 



ATA_EHI_NO_AUTOPSY and ATA_EHI_QUIET are used to control the behavior
of EH.  As only the master link is visible outside EH, these flags are
set only for the master link although they should also apply to the
slave link, which causes spurious EH messages during probe and
suspend/resume.

This patch transfers those two flags to slave ehc.i before performing
slave autopsy and reporting.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 570106df

drivers/ata/libata-eh.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -2010,8 +2010,13 @@ void ata_eh_autopsy(struct ata_port *ap) 
		struct ata_eh_context *mehc = &ap->link.eh_context;

		struct ata_eh_context *mehc = &ap->link.eh_context;

		struct ata_eh_context *sehc = &ap->slave_link->eh_context;

		struct ata_eh_context *sehc = &ap->slave_link->eh_context;





		/* transfer control flags from master to slave */

		sehc->i.flags |= mehc->i.flags & ATA_EHI_TO_SLAVE_MASK;



		/* perform autopsy on the slave link */

		ata_eh_link_autopsy(ap->slave_link);

		ata_eh_link_autopsy(ap->slave_link);





		/* transfer actions from slave to master and clear slave */

		ata_eh_about_to_do(ap->slave_link, NULL, ATA_EH_ALL_ACTIONS);

		ata_eh_about_to_do(ap->slave_link, NULL, ATA_EH_ALL_ACTIONS);

		mehc->i.action		|= sehc->i.action;

		mehc->i.action		|= sehc->i.action;

		mehc->i.dev_action[1]	|= sehc->i.dev_action[1];

		mehc->i.dev_action[1]	|= sehc->i.dev_action[1];

include/linux/libata.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -340,6 +340,9 @@ enum { 




	ATA_EHI_DID_RESET	= ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,

	ATA_EHI_DID_RESET	= ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,





	/* mask of flags to transfer *to* the slave link */

	ATA_EHI_TO_SLAVE_MASK	= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET,



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

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

	ATA_EH_MAX_TRIES	= 5,

	ATA_EH_MAX_TRIES	= 5,