Merge 80a04d0 into 587f9c7

OFS · Jun 17, 2024 · 9dca837 · 9dca837
2 parents 587f9c7 + 80a04d0
commit 9dca837
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/binaries/hssi/ethernet/hssicommon.py b/binaries/hssi/ethernet/hssicommon.py
@@ -51,10 +51,12 @@
 DEFAULT_BDF = 'ssss:bb:dd.f'
 
 # mailbox register poll interval 1 microseconds
-HSSI_POLL_SLEEP_TIME = 1/1000000
+HSSI_POLL_SLEEP_TIME_SEC = 1/1000000
 
-# mailbox register poll timeout 500 microseconds
-HSSI_POLL_TIMEOUT = 5/10000
+# Mailbox register poll timeout 1 second. Responses are typically much
+# faster than one second, but in rare cases can take a while. No reason
+# to make this short since timeout is generally a failure.
+HSSI_POLL_TIMEOUT_SEC = 1
 
 HSSI_FEATURE_ID = 0x15
 
@@ -1185,11 +1187,11 @@ def clear_reg_bits(self,
                                             idx, width, 0)
             self.write32(region_index, reg_offset, value)
 
-            time.sleep(HSSI_POLL_SLEEP_TIME)
-            if total_time > HSSI_POLL_TIMEOUT:
+            time.sleep(HSSI_POLL_SLEEP_TIME_SEC)
+            if total_time > HSSI_POLL_TIMEOUT_SEC:
                 return False
 
-            total_time = HSSI_POLL_SLEEP_TIME + total_time
+            total_time = HSSI_POLL_SLEEP_TIME_SEC + total_time
         return False
 
     def clear_reg(self,
@@ -1209,11 +1211,11 @@ def clear_reg(self,
                 return True
             self.write32(region_index, reg_offset, 0x0)
 
-            time.sleep(HSSI_POLL_SLEEP_TIME)
-            if total_time > HSSI_POLL_TIMEOUT:
+            time.sleep(HSSI_POLL_SLEEP_TIME_SEC)
+            if total_time > HSSI_POLL_TIMEOUT_SEC:
                 return False
 
-            total_time = HSSI_POLL_SLEEP_TIME + total_time
+            total_time = HSSI_POLL_SLEEP_TIME_SEC + total_time
 
         return False
 
@@ -1262,10 +1264,10 @@ def read_poll_timeout(self,
             if ((reg_data >> bit_index) & 1) == 1:
                 return True
 
-            time.sleep(HSSI_POLL_SLEEP_TIME)
-            if total_time > HSSI_POLL_TIMEOUT:
+            time.sleep(HSSI_POLL_SLEEP_TIME_SEC)
+            if total_time > HSSI_POLL_TIMEOUT_SEC:
                 return False
-            total_time = HSSI_POLL_SLEEP_TIME + total_time
+            total_time = HSSI_POLL_SLEEP_TIME_SEC + total_time
 
         return False