Merge tag 'fsi-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi...

Joel writes:

FSI changes for v5.14

 - Bug fixes for the OCC, SCOM and SBEFIFO drivers

 - Performance fix for aspeed fsi master

 - Small fixes from the mailing lists

* tag 'fsi-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi:
  fsi/sbefifo: Fix reset timeout
  fsi/sbefifo: Clean up correct FIFO when receiving reset request from SBE
  fsi: master-ast-cf: Remove redundant error printing in fsi_master_acf_probe()
  fsi: Aspeed: Reduce poll timeout
  fsi: aspeed: convert to devm_platform_ioremap_resource
  hwmon: (occ) Print response status in first poll error message
  hwmon: (occ) Start sequence number at one
  fsi: occ: Log error for checksum failure
  fsi: occ: Don't accept response from un-initialized OCC
  fsi: scom: Remove retries
  fsi: scom: Reset the FSI2PIB engine for any error
  fsi: aspeed: Emit fewer barriers in opb operations
  fsi: core: Fix return of error values on failures
  fsi: Add missing MODULE_DEVICE_TABLE

diff --combined drivers/hwmon/occ/common.c
index 967532afb1c01caeed05039a023d50473bf4bf32,6b7bf46b21cba212c49f9c66fccc16acfb506d7e..0d68a78be980db1488de7140b9889807a4a5626e
--- 1/drivers/hwmon/occ/common.c
--- 2/drivers/hwmon/occ/common.c
+++ b/drivers/hwmon/occ/common.c
@@@ -217,9 -217,9 +217,9 @@@ int occ_update_response(struct occ *occ
                return rc;
  
        /* limit the maximum rate of polling the OCC */
 -      if (time_after(jiffies, occ->last_update + OCC_UPDATE_FREQUENCY)) {
 +      if (time_after(jiffies, occ->next_update)) {
                rc = occ_poll(occ);
 -              occ->last_update = jiffies;
 +              occ->next_update = jiffies + OCC_UPDATE_FREQUENCY;
        } else {
                rc = occ->last_error;
        }
@@@ -1151,6 -1151,8 +1151,8 @@@ int occ_setup(struct occ *occ, const ch
  {
        int rc;
  
+       /* start with 1 to avoid false match with zero-initialized SRAM buffer */
+       occ->seq_no = 1;
        mutex_init(&occ->lock);
        occ->groups[0] = &occ->group;
  
@@@ -1160,12 -1162,12 +1162,13 @@@
                dev_info(occ->bus_dev, "host is not ready\n");
                return rc;
        } else if (rc < 0) {
-               dev_err(occ->bus_dev, "failed to get OCC poll response: %d\n",
-                       rc);
+               dev_err(occ->bus_dev,
+                       "failed to get OCC poll response=%02x: %d\n",
+                       occ->resp.return_status, rc);
                return rc;
        }
  
 +      occ->next_update = jiffies + OCC_UPDATE_FREQUENCY;
        occ_parse_poll_response(occ);
  
        rc = occ_setup_sensor_attrs(occ);