Skip to content

Commit 8919dfc

Browse files
Eddie Jamesgregkh
authored andcommitted
fsi: scom: Don't abort operations for minor errors
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: 6b29325 ("fsi: scom: Major overhaul") Signed-off-by: Eddie James <[email protected]> Cc: stable <[email protected]> Acked-by: Jeremy Kerr <[email protected]> Acked-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Joel Stanley <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 468e0ff commit 8919dfc

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/fsi/fsi-scom.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
#define SCOM_STATUS_PIB_RESP_MASK 0x00007000
3939
#define SCOM_STATUS_PIB_RESP_SHIFT 12
4040

41-
#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_ERR_SUMMARY | \
42-
SCOM_STATUS_PROTECTION | \
41+
#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_PROTECTION | \
4342
SCOM_STATUS_PARITY | \
4443
SCOM_STATUS_PIB_ABORT | \
4544
SCOM_STATUS_PIB_RESP_MASK)
@@ -251,11 +250,6 @@ static int handle_fsi2pib_status(struct scom_device *scom, uint32_t status)
251250
/* Return -EBUSY on PIB abort to force a retry */
252251
if (status & SCOM_STATUS_PIB_ABORT)
253252
return -EBUSY;
254-
if (status & SCOM_STATUS_ERR_SUMMARY) {
255-
fsi_device_write(scom->fsi_dev, SCOM_FSI2PIB_RESET_REG, &dummy,
256-
sizeof(uint32_t));
257-
return -EIO;
258-
}
259253
return 0;
260254
}
261255

0 commit comments

Comments
 (0)