1 files changed, 16 insertions, 8 deletions

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 5f2ecaf3f9d8..28d9efacc9b6 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -48,6 +48,7 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/x86_init.h>
+#include <asm/rtc.h>
 
 #define EFI_DEBUG       1
 
@@ -258,10 +259,10 @@ static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
 
 int efi_set_rtc_mmss(unsigned long nowtime)
 {
-        int real_seconds, real_minutes;
         efi_status_t    status;
         efi_time_t      eft;
         efi_time_cap_t  cap;
+        struct rtc_time tm;
 
         status = efi.get_time(&eft, &cap);
         if (status != EFI_SUCCESS) {
@@ -269,13 +270,20 @@ int efi_set_rtc_mmss(unsigned long nowtime)
                 return -1;
         }
 
-        real_seconds = nowtime % 60;
-        real_minutes = nowtime / 60;
-        if (((abs(real_minutes - eft.minute) + 15)/30) & 1)
-                real_minutes += 30;
-        real_minutes %= 60;
-        eft.minute = real_minutes;
-        eft.second = real_seconds;
+        rtc_time_to_tm(nowtime, &tm);
+        if (!rtc_valid_tm(&tm)) {
+                eft.year = tm.tm_year + 1900;
+                eft.month = tm.tm_mon + 1;
+                eft.day = tm.tm_mday;
+                eft.minute = tm.tm_min;
+                eft.second = tm.tm_sec;
+                eft.nanosecond = 0;
+        } else {
+                printk(KERN_ERR
+                       "%s: Invalid EFI RTC value: write of %lx to EFI RTC failed\n",
+                       __FUNCTION__, nowtime);
+                return -1;
+        }
 
         status = efi.set_time(&eft);
         if (status != EFI_SUCCESS) {