Commit d82e6848 authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Revert "scsi: mpt3sas: Fix ioc->base_readl() use" 

This reverts commit 7ab4d244 as it is
breaking the mpt3sas driver on big-endian machines.

Link: https://lore.kernel.org/r/20220916130111.168195-3-damien.lemoal@opensource.wdc.com


Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f920642e

drivers/scsi/mpt3sas/mpt3sas_base.c

+7 −6
Original line number Diff line number Diff line
@@ -7082,16 +7082,16 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, 
	}



	/* read the first two 16-bits, it gives the total length of the reply */

	reply[0] = ioc->base_readl(&ioc->chip->Doorbell)

		& MPI2_DOORBELL_DATA_MASK;

	reply[0] = le16_to_cpu(ioc->base_readl(&ioc->chip->Doorbell)

	    & MPI2_DOORBELL_DATA_MASK);

	writel(0, &ioc->chip->HostInterruptStatus);

	if ((_base_wait_for_doorbell_int(ioc, 5))) {

		ioc_err(ioc, "doorbell handshake int failed (line=%d)\n",

			__LINE__);

		return -EFAULT;

	}

	reply[1] = ioc->base_readl(&ioc->chip->Doorbell)

		& MPI2_DOORBELL_DATA_MASK;

	reply[1] = le16_to_cpu(ioc->base_readl(&ioc->chip->Doorbell)

	    & MPI2_DOORBELL_DATA_MASK);

	writel(0, &ioc->chip->HostInterruptStatus);



	for (i = 2; i < default_reply->MsgLength * 2; i++)  {
@@ -7103,8 +7103,9 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, 
		if (i >=  reply_bytes/2) /* overflow case */

			ioc->base_readl(&ioc->chip->Doorbell);

		else

			reply[i] = ioc->base_readl(&ioc->chip->Doorbell)

				& MPI2_DOORBELL_DATA_MASK;

			reply[i] = le16_to_cpu(

			    ioc->base_readl(&ioc->chip->Doorbell)

			    & MPI2_DOORBELL_DATA_MASK);

		writel(0, &ioc->chip->HostInterruptStatus);

	}