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

Commit ca6832e9 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Update the timing requirements for issuing a Hard Reset 



Updated the mpt2sas driver code that issues hard reset to comply with the
timing requirements mentioned in MPI specifications rev V.

[jejb: checpatch fixes]
Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 10ec24e4

drivers/scsi/mpt2sas/mpt2sas_base.c

+13 −7
Original line number Diff line number Diff line
@@ -3936,11 +3936,15 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) 
	writel(host_diagnostic | MPI2_DIAG_RESET_ADAPTER,

	     &ioc->chip->HostDiagnostic);



	/* don't access any registers for 50 milliseconds */

	msleep(50);

	/* This delay allows the chip PCIe hardware time to finish reset tasks*/

	if (sleep_flag == CAN_SLEEP)

		msleep(MPI2_HARD_RESET_PCIE_FIRST_READ_DELAY_MICRO_SEC/1000);

	else

		mdelay(MPI2_HARD_RESET_PCIE_FIRST_READ_DELAY_MICRO_SEC/1000);



	/* 300 second max wait */

	for (count = 0; count < 3000000 ; count++) {

	/* Approximately 300 second max wait */

	for (count = 0; count < (300000000 /

	    MPI2_HARD_RESET_PCIE_SECOND_READ_DELAY_MICRO_SEC); count++) {



		host_diagnostic = readl(&ioc->chip->HostDiagnostic);
@@ -3949,11 +3953,13 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) 
		if (!(host_diagnostic & MPI2_DIAG_RESET_ADAPTER))

			break;



		/* wait 100 msec */

		/* Wait to pass the second read delay window */

		if (sleep_flag == CAN_SLEEP)

			msleep(1);

			msleep(MPI2_HARD_RESET_PCIE_SECOND_READ_DELAY_MICRO_SEC

			       /1000);

		else

			mdelay(1);

			mdelay(MPI2_HARD_RESET_PCIE_SECOND_READ_DELAY_MICRO_SEC

			       /1000);

	}



	if (host_diagnostic & MPI2_DIAG_HCB_MODE) {