|
@@ -44,6 +44,10 @@ static ssize_t opal_nvram_read(char *buf, size_t count, loff_t *index)
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * This can be called in the panic path with interrupts off, so use
|
|
|
+ * mdelay in that case.
|
|
|
+ */
|
|
|
static ssize_t opal_nvram_write(char *buf, size_t count, loff_t *index)
|
|
|
{
|
|
|
s64 rc = OPAL_BUSY;
|
|
@@ -58,10 +62,16 @@ static ssize_t opal_nvram_write(char *buf, size_t count, loff_t *index)
|
|
|
while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
|
|
|
rc = opal_write_nvram(__pa(buf), count, off);
|
|
|
if (rc == OPAL_BUSY_EVENT) {
|
|
|
- msleep(OPAL_BUSY_DELAY_MS);
|
|
|
+ if (in_interrupt() || irqs_disabled())
|
|
|
+ mdelay(OPAL_BUSY_DELAY_MS);
|
|
|
+ else
|
|
|
+ msleep(OPAL_BUSY_DELAY_MS);
|
|
|
opal_poll_events(NULL);
|
|
|
} else if (rc == OPAL_BUSY) {
|
|
|
- msleep(OPAL_BUSY_DELAY_MS);
|
|
|
+ if (in_interrupt() || irqs_disabled())
|
|
|
+ mdelay(OPAL_BUSY_DELAY_MS);
|
|
|
+ else
|
|
|
+ msleep(OPAL_BUSY_DELAY_MS);
|
|
|
}
|
|
|
}
|
|
|
|