Skip to contentSkip to conversation

staging: sm750fb: replace magic number with jiffies timeout

PATCH Superseded Madhumitha Sundar 2 participants 2 messages Jan 27 – Jan 28

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: sm750fb: replace magic number with jiffies timeout

The hardware wait loop in hw_sm750_de_wait used a hardcoded loop counter (0x10000000), which depends on CPU speed and is unreliable.

Replace the loop counter with a jiffies-based timeout (1 second) using time_before(). This ensures consistent delays across architectures.

---
Changes in v2:
- Switched from loop counter to jiffies + cpu_relax() as requested by Greg KH.

---
 drivers/staging/sm750fb/sm750_hw.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/staging/sm750fb/sm750_hw.c +17 -4
index ce46f240c..b24d27a77 100644
@@ -523,19 +523,32 @@ int hw_sm750le_de_wait(void)
 
 int hw_sm750_de_wait(void)
 {
-	int i = 0x10000000;
+	/* Wait for 1 second (HZ) */
+	unsigned long timeout = jiffies + HZ;
 	unsigned int mask = SYSTEM_CTRL_DE_STATUS_BUSY |
 			    SYSTEM_CTRL_DE_FIFO_EMPTY |
 			    SYSTEM_CTRL_DE_MEM_FIFO_EMPTY;
+	unsigned int val;
 
-	while (i--) {
-		unsigned int val = peek32(SYSTEM_CTRL);
+	/* Run while Current Time is BEFORE the Deadline */
+	while (time_before(jiffies, timeout)) {
+		val = peek32(SYSTEM_CTRL);
 
+		/* If Not Busy (0) AND Buffers Empty (1), we are good */
 		if ((val & mask) ==
 		    (SYSTEM_CTRL_DE_FIFO_EMPTY | SYSTEM_CTRL_DE_MEM_FIFO_EMPTY))
 			return 0;
+
+		/* Polite pause to save power */
+		cpu_relax();
 	}
-	/* timeout error */
+
+	/* Final check in case we succeeded at the last millisecond */
+	val = peek32(SYSTEM_CTRL);
+	if ((val & mask) ==
+	    (SYSTEM_CTRL_DE_FIFO_EMPTY | SYSTEM_CTRL_DE_MEM_FIFO_EMPTY))
+		return 0;
+
 	return -1;
 }
 
Signature · 1 line
2.43.0
#1 lore raw
Quoted 8 lines · Madhumitha Sundar

The hardware wait loop in hw_sm750_de_wait used a hardcoded loop counter (0x10000000), which depends on CPU speed and is unreliable.

Replace the loop counter with a jiffies-based timeout (1 second) using time_before(). This ensures consistent delays across architectures.

---

This feels like an AI patch? AI patches need to be disclosed.

Anyway, we couldn't merge something like this without testing.

regards,
dan carpenter