diff options
| author | Cyril Bur <cyril.bur@au1.ibm.com> | 2017-12-05 12:01:06 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-14 23:58:38 -0600 |
| commit | c3fc675285bc9542262e23c7330581eaf5a24de1 (patch) | |
| tree | e86e118190767c4187bf5eef778c63d40419c752 /libflash | |
| parent | f47de2b05f9dcda78df6b8717956fa8f23bcc22f (diff) | |
| download | skiboot-c3fc675285bc9542262e23c7330581eaf5a24de1.zip skiboot-c3fc675285bc9542262e23c7330581eaf5a24de1.tar.gz skiboot-c3fc675285bc9542262e23c7330581eaf5a24de1.tar.bz2 | |
libflash/mbox-flash: Allow mbox-flash to tell the driver msg timeouts
Currently when mbox-flash decides that a message times out the driver
has no way of knowing to drop the message and will continue waiting for
a response indefinitely preventing more messages from ever being sent.
This is a problem if the BMC crashes or has some other issue where it
won't ever respond to our outstanding message.
This patch provides a method for mbox-flash to tell the driver how long
it should wait before it no longer needs to care about the response.
Signed-off-by: Cyril Bur <cyril.bur@au1.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'libflash')
| -rw-r--r-- | libflash/mbox-flash.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libflash/mbox-flash.c b/libflash/mbox-flash.c index 3615df7..7fd2e11 100644 --- a/libflash/mbox-flash.c +++ b/libflash/mbox-flash.c @@ -252,13 +252,14 @@ static bool is_reboot(struct mbox_flash_data *mbox_flash) return mbox_flash->reboot; } -static int msg_send(struct mbox_flash_data *mbox_flash, struct bmc_mbox_msg *msg) +static int msg_send(struct mbox_flash_data *mbox_flash, struct bmc_mbox_msg *msg, + unsigned int timeout_sec) { if (is_reboot(mbox_flash)) return FLASH_ERR_AGAIN; mbox_flash->busy = true; mbox_flash->rc = 0; - return bmc_mbox_enqueue(msg); + return bmc_mbox_enqueue(msg, timeout_sec); } static int wait_for_bmc(struct mbox_flash_data *mbox_flash, unsigned int timeout_sec) @@ -307,7 +308,7 @@ static int mbox_flash_ack(struct mbox_flash_data *mbox_flash, uint8_t reg) /* Clear this first so msg_send() doesn't freak out */ mbox_flash->reboot = false; - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); /* Still need to deal with it, we've only acked it now. */ mbox_flash->reboot = true; @@ -499,7 +500,7 @@ static int mbox_flash_mark_write(struct mbox_flash_data *mbox_flash, msg_put_u16(msg, 2, end - start); /* Total Length */ } - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -554,7 +555,7 @@ static int mbox_flash_flush(struct mbox_flash_data *mbox_flash) if (!msg) return FLASH_ERR_MALLOC_FAILED; - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -609,7 +610,7 @@ static int mbox_window_move(struct mbox_flash_data *mbox_flash, return FLASH_ERR_MALLOC_FAILED; msg_put_u16(msg, 0, bytes_to_blocks(mbox_flash, pos)); - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -772,7 +773,7 @@ static int mbox_flash_get_info(struct blocklevel_device *bl, const char **name, *name = NULL; mbox_flash->busy = true; - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; @@ -965,7 +966,7 @@ static int protocol_init(struct mbox_flash_data *mbox_flash) return FLASH_ERR_MALLOC_FAILED; msg_put_u8(msg, 0, mbox_flash->version); - rc = msg_send(mbox_flash, msg); + rc = msg_send(mbox_flash, msg, MBOX_DEFAULT_TIMEOUT); if (rc) { prlog(PR_ERR, "Failed to enqueue/send BMC MBOX message\n"); goto out; |