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

Commit 79829fc4 authored by Eddie James's avatar Eddie James Committed by Greg Kroah-Hartman
Browse files

fsi: scom: Don't abort operations for minor errors 



commit 8919dfcb31161fae7d607bbef5247e5e82fd6457 upstream.

The scom driver currently fails out of operations if certain system
errors are flagged in the status register; system checkstop, special
attention, or recoverable error. These errors won't impact the ability
of the scom engine to perform operations, so the driver should continue
under these conditions.
Also, don't do a PIB reset for these conditions, since it won't help.

Fixes: 6b293258 ("fsi: scom: Major overhaul")
Signed-off-by: default avatarEddie James <eajames@linux.ibm.com>
Cc: stable <stable@vger.kernel.org>
Acked-by: default avatarJeremy Kerr <jk@ozlabs.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20190827041249.13381-1-jk@ozlabs.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e44840b7

drivers/fsi/fsi-scom.c

+1 −7
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ 
#define SCOM_STATUS_PIB_RESP_MASK	0x00007000

#define SCOM_STATUS_PIB_RESP_SHIFT	12



#define SCOM_STATUS_ANY_ERR		(SCOM_STATUS_ERR_SUMMARY | \

					 SCOM_STATUS_PROTECTION | \

#define SCOM_STATUS_ANY_ERR		(SCOM_STATUS_PROTECTION | \

					 SCOM_STATUS_PARITY |	  \

					 SCOM_STATUS_PIB_ABORT | \

					 SCOM_STATUS_PIB_RESP_MASK)
@@ -260,11 +259,6 @@ static int handle_fsi2pib_status(struct scom_device *scom, uint32_t status) 
	/* Return -EBUSY on PIB abort to force a retry */

	if (status & SCOM_STATUS_PIB_ABORT)

		return -EBUSY;

	if (status & SCOM_STATUS_ERR_SUMMARY) {

		fsi_device_write(scom->fsi_dev, SCOM_FSI2PIB_RESET_REG, &dummy,

				 sizeof(uint32_t));

		return -EIO;

	}

	return 0;

}