AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

rtc: opal: Fix OPAL RTC driver OPAL_BUSY loops

Browse Source 
The OPAL RTC driver does not sleep in case it gets OPAL_BUSY or
OPAL_BUSY_EVENT from firmware, which causes large scheduling
latencies, up to 50 seconds have been observed here when RTC stops
responding (BMC reboot can do it).

Fix this by converting it to the standard form OPAL_BUSY loop that
sleeps.

Fixes: 628daa8d5a ("powerpc/powernv: Add RTC and NVRAM support plus RTAS fallbacks")
Cc: stable@vger.kernel.org # v3.2+
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin 2018-04-10 21:49:32 +10:00 committed by Michael Ellerman
parent 75ecfb4951
commit 682e6b4da5
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/platforms/powernv/opal-rtc.c
View File

@ -48,10 +48,12 @@ unsigned long __init opal_get_boot_time(void)
while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) { while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms); rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms);
if (rc == OPAL_BUSY_EVENT) if (rc == OPAL_BUSY_EVENT) {
mdelay(OPAL_BUSY_DELAY_MS);
opal_poll_events(NULL); opal_poll_events(NULL);
else if (rc == OPAL_BUSY) } else if (rc == OPAL_BUSY) {
mdelay(10); mdelay(OPAL_BUSY_DELAY_MS);
}
} }
if (rc != OPAL_SUCCESS) if (rc != OPAL_SUCCESS)
return 0; return 0;

37
drivers/rtc/rtc-opal.c
View File

@ -57,7 +57,7 @@ static void tm_to_opal(struct rtc_time *tm, u32 *y_m_d, u64 *h_m_s_ms)
static int opal_get_rtc_time(struct device *dev, struct rtc_time *tm) static int opal_get_rtc_time(struct device *dev, struct rtc_time *tm)
{ {
long rc = OPAL_BUSY; s64 rc = OPAL_BUSY;
int retries = 10; int retries = 10;
u32 y_m_d; u32 y_m_d;
u64 h_m_s_ms; u64 h_m_s_ms;
@ -66,13 +66,17 @@ static int opal_get_rtc_time(struct device *dev, struct rtc_time *tm)
while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) { while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms); rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms);
if (rc == OPAL_BUSY_EVENT) if (rc == OPAL_BUSY_EVENT) {
msleep(OPAL_BUSY_DELAY_MS);
opal_poll_events(NULL); opal_poll_events(NULL);
else if (retries-- && (rc == OPAL_HARDWARE } else if (rc == OPAL_BUSY) {
|| rc == OPAL_INTERNAL_ERROR)) msleep(OPAL_BUSY_DELAY_MS);
msleep(10); } else if (rc == OPAL_HARDWARE || rc == OPAL_INTERNAL_ERROR) {
else if (rc != OPAL_BUSY && rc != OPAL_BUSY_EVENT) if (retries--) {
break; msleep(10); /* Wait 10ms before retry */
rc = OPAL_BUSY; /* go around again */
}
}
} }
if (rc != OPAL_SUCCESS) if (rc != OPAL_SUCCESS)
@ -87,21 +91,26 @@ static int opal_get_rtc_time(struct device *dev, struct rtc_time *tm)
static int opal_set_rtc_time(struct device *dev, struct rtc_time *tm) static int opal_set_rtc_time(struct device *dev, struct rtc_time *tm)
{ {
long rc = OPAL_BUSY; s64 rc = OPAL_BUSY;
int retries = 10; int retries = 10;
u32 y_m_d = 0; u32 y_m_d = 0;
u64 h_m_s_ms = 0; u64 h_m_s_ms = 0;
tm_to_opal(tm, &y_m_d, &h_m_s_ms); tm_to_opal(tm, &y_m_d, &h_m_s_ms);
while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) { while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
rc = opal_rtc_write(y_m_d, h_m_s_ms); rc = opal_rtc_write(y_m_d, h_m_s_ms);
if (rc == OPAL_BUSY_EVENT) if (rc == OPAL_BUSY_EVENT) {
msleep(OPAL_BUSY_DELAY_MS);
opal_poll_events(NULL); opal_poll_events(NULL);
else if (retries-- && (rc == OPAL_HARDWARE } else if (rc == OPAL_BUSY) {
|| rc == OPAL_INTERNAL_ERROR)) msleep(OPAL_BUSY_DELAY_MS);
msleep(10); } else if (rc == OPAL_HARDWARE || rc == OPAL_INTERNAL_ERROR) {
else if (rc != OPAL_BUSY && rc != OPAL_BUSY_EVENT) if (retries--) {
break; msleep(10); /* Wait 10ms before retry */
rc = OPAL_BUSY; /* go around again */
}
}
} }
return rc == OPAL_SUCCESS ? 0 : -EIO; return rc == OPAL_SUCCESS ? 0 : -EIO;