diff options
| author | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2015-04-06 12:26:34 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-04-09 15:24:14 +1000 |
| commit | d0483a67a1e56323cecd7c59dd4e09a90d7640a6 (patch) | |
| tree | 0b14f9ae30708b118b47c27d8f387df816dc6129 | |
| parent | 82073c8e4105d030a64810485c695862725ad1df (diff) | |
| download | skiboot-d0483a67a1e56323cecd7c59dd4e09a90d7640a6.zip skiboot-d0483a67a1e56323cecd7c59dd4e09a90d7640a6.tar.gz skiboot-d0483a67a1e56323cecd7c59dd4e09a90d7640a6.tar.bz2 | |
FSP/CUPD: Fix lock issueskiboot-5.0
Commit a5ee9d40 does unlock/lock of flash_lock in fsp_code_update_wait_vpd().
This function is called during init as well (where we enter this function
without lock). And in corner cases (CUPD init is not completed) when we
entered this function (in init path) then we hit lock error.
Also remove redundant lock from fsp_flash_firmware...which solves possible
poller lock issue.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | hw/fsp/fsp-codeupdate.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/fsp/fsp-codeupdate.c b/hw/fsp/fsp-codeupdate.c index 33fd9e6..7fc43c9 100644 --- a/hw/fsp/fsp-codeupdate.c +++ b/hw/fsp/fsp-codeupdate.c @@ -459,11 +459,8 @@ void fsp_code_update_wait_vpd(bool is_boot) prlog(PR_NOTICE, "CUPD: Waiting read marker LID" " and in flight parsm completion...\n"); - while (flash_state == FLASH_STATE_READING || in_flight_params) { - unlock(&flash_lock); + while (flash_state == FLASH_STATE_READING || in_flight_params) time_wait_ms(100); - lock(&flash_lock); - } if (is_boot) add_opal_firmware_version(); @@ -980,8 +977,6 @@ static int fsp_flash_firmware(void) struct opal_sg_entry *entry; int rc, i; - lock(&flash_lock); - /* Make sure no outstanding LID read is in progress */ rc = code_update_check_state(); if (rc == OPAL_BUSY) @@ -1068,7 +1063,6 @@ static int fsp_flash_firmware(void) /* Code update completed */ rc = code_update_complete(FSP_CMD_FLASH_COMPLETE); - unlock(&flash_lock); return rc; abort_update: @@ -1078,7 +1072,6 @@ abort_update: "Code update abort command failed. (rc : %d).", rc); out: - unlock(&flash_lock); return -1; } |