diff options
| author | Janne Grunau <j@jannau.net> | 2022-06-14 09:09:09 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-16 15:22:55 -0400 |
| commit | 4ef409c137f249821d43c9ec70dfc3768f0d27d5 (patch) | |
| tree | 3a4c4e1a47df1f16f8f1924d046d25ef908c351a | |
| parent | e2e40499306d56bee9b145c619c91bdd7d0a9744 (diff) | |
| download | u-boot-WIP/2022-06-16-assorted-bugfixes.zip u-boot-WIP/2022-06-16-assorted-bugfixes.tar.gz u-boot-WIP/2022-06-16-assorted-bugfixes.tar.bz2 | |
arm: apple: Increase RTKit timeoutsWIP/2022-06-16-assorted-bugfixes
Timeouts are not expected to happen and are handled as fatal errors.
Increase all timeouts to 1 second as defensive measure to avoid relying
on the timing behaviour of certain firmware versions or configurations.
Signed-off-by: Janne Grunau <j@jannau.net>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Tested-by: Mark Kettenis <kettenis@openbsd.org>
| -rw-r--r-- | arch/arm/mach-apple/rtkit.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-apple/rtkit.c b/arch/arm/mach-apple/rtkit.c index da77718..a550b55 100644 --- a/arch/arm/mach-apple/rtkit.c +++ b/arch/arm/mach-apple/rtkit.c @@ -52,6 +52,8 @@ #define APPLE_RTKIT_BUFFER_REQUEST_SIZE GENMASK(51, 44) #define APPLE_RTKIT_BUFFER_REQUEST_IOVA GENMASK(41, 0) +#define TIMEOUT_1SEC_US 1000000 + struct apple_rtkit { struct mbox_chan *chan; void *cookie; @@ -168,7 +170,7 @@ int apple_rtkit_boot(struct apple_rtkit *rtk) return ret; /* Wait for protocol version negotiation message. */ - ret = mbox_recv(rtk->chan, &msg, 10000); + ret = mbox_recv(rtk->chan, &msg, TIMEOUT_1SEC_US); if (ret < 0) return ret; @@ -210,7 +212,7 @@ int apple_rtkit_boot(struct apple_rtkit *rtk) wait_epmap: /* Wait for endpoint map message. */ - ret = mbox_recv(rtk->chan, &msg, 10000); + ret = mbox_recv(rtk->chan, &msg, TIMEOUT_1SEC_US); if (ret < 0) return ret; @@ -275,7 +277,7 @@ wait_epmap: pwrstate = APPLE_RTKIT_PWR_STATE_SLEEP; while (pwrstate != APPLE_RTKIT_PWR_STATE_ON) { - ret = mbox_recv(rtk->chan, &msg, 100000); + ret = mbox_recv(rtk->chan, &msg, TIMEOUT_1SEC_US); if (ret < 0) return ret; @@ -330,7 +332,7 @@ int apple_rtkit_shutdown(struct apple_rtkit *rtk, int pwrstate) if (ret < 0) return ret; - ret = mbox_recv(rtk->chan, &msg, 100000); + ret = mbox_recv(rtk->chan, &msg, TIMEOUT_1SEC_US); if (ret < 0) return ret; |