Skip to contentSkip to conversation

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

PATCH In review Eddie James 3 participants 3 messages Aug 15, 2019 – Aug 21, 2019 FSI

lore
Share & tools
lore

Eddie James

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 drivers/fsi/fsi-scom.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/fsi/fsi-scom.c +1 -7
index 343153d..004dc03 100644
@@ -38,8 +38,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)
@@ -251,11 +250,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;
 }
 
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Eddie James

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.

Quoted 30 lines
---
 drivers/fsi/fsi-scom.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/fsi/fsi-scom.c +1 -7
index 343153d..004dc03 100644
@@ -38,8 +38,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)
@@ -251,11 +250,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;
 }
 
Acked-by Jeremy Kerr
#2 lore raw
Quoted 9 lines · Benjamin Herrenschmidt
Quoted 7 lines · Eddie James

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.

Quoted 3 lines
Quoted 1 line

Thanks Ben. We also have one from jk which was sent to the openbmc list:

And we can add:

Fixes 6b293258cded ("fsi: scom: Major overhaul")

I'll stick this in the FSI tree.

Cheers,

Joel

Quoted 32 lines
Quoted 31 lines
---
 drivers/fsi/fsi-scom.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/fsi/fsi-scom.c +1 -7
index 343153d..004dc03 100644
@@ -38,8 +38,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)
@@ -251,11 +250,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;
 }