fsi: scom: Remove retries

On a functioning FSI link there is not need to retry a write when doing
a scom in the driver.

Allow the higher layers (eg. userspace) to attempt a retry if they want,
or to accept that the address they are talking to is not accessible.

By removing the retries we can separate the error handling from retry
logic. In particular -EBUSY was used to force the get/put scom logic to
retry.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20210527070109.225198-1-joel@jms.id.au
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
index 75d1389e2626da1418cee72da488963645e3d35e..da1486bb6a14440b91b7675b544deb74c5ccc977 100644 (file)
--- a/drivers/fsi/fsi-scom.c
+++ b/drivers/fsi/fsi-scom.c
@@ -61,7 +61,6 @@
 #define XSCOM_ADDR_FORM1_HI_SHIFT      20
 
 /* Retries */
-#define SCOM_MAX_RETRIES               100     /* Retries on busy */
 #define SCOM_MAX_IND_RETRIES           10      /* Retries indirect not ready */
 
 struct scom_device {
@@ -249,7 +248,7 @@ static int handle_fsi2pib_status(struct scom_device *scom, uint32_t status)
                return -EPERM;
        if (status & SCOM_STATUS_PARITY)
                return -EIO;
-       /* Return -EBUSY on PIB abort to force a retry */
+
        if (status & SCOM_STATUS_PIB_ABORT)
                return -EBUSY;
        return 0;
@@ -286,69 +285,39 @@ static int handle_pib_status(struct scom_device *scom, uint8_t status)
 static int put_scom(struct scom_device *scom, uint64_t value,
                    uint64_t addr)
 {
-       uint32_t status, dummy = -1;
-       int rc, retries;
-
-       for (retries = 0; retries < SCOM_MAX_RETRIES; retries++) {
-               rc = raw_put_scom(scom, value, addr, &status);
-               if (rc) {
-                       /* Try resetting the bridge if FSI fails */
-                       if (rc != -ENODEV && retries == 0) {
-                               fsi_device_write(scom->fsi_dev, SCOM_FSI2PIB_RESET_REG,
-                                                &dummy, sizeof(uint32_t));
-                               rc = -EBUSY;
-                       } else
-                               return rc;
-               } else
-                       rc = handle_fsi2pib_status(scom, status);
-               if (rc && rc != -EBUSY)
-                       break;
-               if (rc == 0) {
-                       rc = handle_pib_status(scom,
-                                              (status & SCOM_STATUS_PIB_RESP_MASK)
-                                              >> SCOM_STATUS_PIB_RESP_SHIFT);
-                       if (rc && rc != -EBUSY)
-                               break;
-               }
-               if (rc == 0)
-                       break;
-               msleep(1);
-       }
-       return rc;
+       uint32_t status;
+       int rc;
+
+       rc = raw_put_scom(scom, value, addr, &status);
+       if (rc == -ENODEV)
+               return rc;
+
+       rc = handle_fsi2pib_status(scom, status);
+       if (rc)
+               return rc;
+
+       return handle_pib_status(scom,
+                                (status & SCOM_STATUS_PIB_RESP_MASK)
+                                >> SCOM_STATUS_PIB_RESP_SHIFT);
 }
 
 static int get_scom(struct scom_device *scom, uint64_t *value,
                    uint64_t addr)
 {
-       uint32_t status, dummy = -1;
-       int rc, retries;
-
-       for (retries = 0; retries < SCOM_MAX_RETRIES; retries++) {
-               rc = raw_get_scom(scom, value, addr, &status);
-               if (rc) {
-                       /* Try resetting the bridge if FSI fails */
-                       if (rc != -ENODEV && retries == 0) {
-                               fsi_device_write(scom->fsi_dev, SCOM_FSI2PIB_RESET_REG,
-                                                &dummy, sizeof(uint32_t));
-                               rc = -EBUSY;
-                       } else
-                               return rc;
-               } else
-                       rc = handle_fsi2pib_status(scom, status);
-               if (rc && rc != -EBUSY)
-                       break;
-               if (rc == 0) {
-                       rc = handle_pib_status(scom,
-                                              (status & SCOM_STATUS_PIB_RESP_MASK)
-                                              >> SCOM_STATUS_PIB_RESP_SHIFT);
-                       if (rc && rc != -EBUSY)
-                               break;
-               }
-               if (rc == 0)
-                       break;
-               msleep(1);
-       }
-       return rc;
+       uint32_t status;
+       int rc;
+
+       rc = raw_get_scom(scom, value, addr, &status);
+       if (rc == -ENODEV)
+               return rc;
+
+       rc = handle_fsi2pib_status(scom, status);
+       if (rc)
+               return rc;
+
+       return handle_pib_status(scom,
+                                (status & SCOM_STATUS_PIB_RESP_MASK)
+                                >> SCOM_STATUS_PIB_RESP_SHIFT);
 }
 
 static ssize_t scom_read(struct file *filep, char __user *buf, size_t len,