summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2015-02-18 14:57:24 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2015-02-18 15:37:39 +1100
commit741c531315b3deb2472221383200aacadd197f85 (patch)
tree3931ef59ff2b7f90d195970298587ce0d519d62c /hw
parent87690bd19dbb10e5b1ca004e7eab6a573153516b (diff)
downloadblackbird-skiboot-741c531315b3deb2472221383200aacadd197f85.tar.gz
blackbird-skiboot-741c531315b3deb2472221383200aacadd197f85.zip
fsp/console: Don't time_wait with lock held
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/fsp/fsp-console.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c
index d77d0867..554dbde8 100644
--- a/hw/fsp/fsp-console.c
+++ b/hw/fsp/fsp-console.c
@@ -819,7 +819,6 @@ static bool send_all_hvsi_close(void)
bool has_hvsi = false;
static const uint8_t close_packet[] = { 0xfe, 6, 0, 1, 0, 3 };
- lock(&fsp_con_lock);
for (i = 0; i < MAX_SERIAL; i++) {
struct fsp_serial *fs = &fsp_serials[i];
struct fsp_serbuf_hdr *sb = fs->out_buf;
@@ -839,9 +838,10 @@ static bool send_all_hvsi_close(void)
break;
time_wait_ms(500);
}
+ lock(&fsp_con_lock);
fsp_write_vserial(fs, close_packet, 6);
+ unlock(&fsp_con_lock);
}
- unlock(&fsp_con_lock);
return has_hvsi;
}
OpenPOWER on IntegriCloud