Automatic merge of 'fixes-test' into merge-test (2024-03-15 19:34)

mpe · mpe · commit d69129eb92e2 · 2024-03-15T19:34:34.000+11:00
diff --git a/arch/powerpc/include/asm/plpks.h b/arch/powerpc/include/asm/plpks.h
@@ -44,9 +44,8 @@
 #define PLPKS_MAX_DATA_SIZE		4000
 
 // Timeouts for PLPKS operations
-#define PLPKS_MAX_TIMEOUT		5000 // msec
-#define PLPKS_FLUSH_SLEEP		10 // msec
-#define PLPKS_FLUSH_SLEEP_RANGE		400
+#define PLPKS_MAX_TIMEOUT		(5 * USEC_PER_SEC)
+#define PLPKS_FLUSH_SLEEP		10000 // usec
 
 struct plpks_var {
 	char *component;
diff --git a/arch/powerpc/platforms/pseries/plpks.c b/arch/powerpc/platforms/pseries/plpks.c
@@ -415,8 +415,7 @@ static int plpks_confirm_object_flushed(struct label *label,
 			break;
 		}
 
-		usleep_range(PLPKS_FLUSH_SLEEP,
-			     PLPKS_FLUSH_SLEEP + PLPKS_FLUSH_SLEEP_RANGE);
+		fsleep(PLPKS_FLUSH_SLEEP);
 		timeout = timeout + PLPKS_FLUSH_SLEEP;
 	} while (timeout < PLPKS_MAX_TIMEOUT);
 

Original file line number	Diff line number	Diff line change
`@@ -415,8 +415,7 @@ static int plpks_confirm_object_flushed(struct label *label,`
`415`	`415`	`break;`
`416`	`416`	`}`
`417`	`417`
`418`		`- usleep_range(PLPKS_FLUSH_SLEEP,`
`419`		`- PLPKS_FLUSH_SLEEP + PLPKS_FLUSH_SLEEP_RANGE);`
	`418`	`+ fsleep(PLPKS_FLUSH_SLEEP);`
`420`	`419`	`timeout = timeout + PLPKS_FLUSH_SLEEP;`
`421`	`420`	`} while (timeout < PLPKS_MAX_TIMEOUT);`
`422`	`421`