diff options
| author | Neelesh Gupta <neelegup@linux.vnet.ibm.com> | 2014-10-14 04:38:36 -0400 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-17 02:04:01 -0500 |
| commit | 16b1d26e77b142546e2b9b6dc3b5aa5c44ae3b77 (patch) | |
| tree | 20c1c8e82cecb391dafadc01eb57c7a6bd58b25a | |
| parent | 59994fb01a102a448ba758c9b824a29b4a99cc1b (diff) | |
rtc/tpo: Driver to support rtc and wakeup on PowerNV platform
The patch implements the OPAL rtc driver that binds with the rtc
driver subsystem. The driver uses the platform device infrastructure
to probe the rtc device and register it to rtc class framework. The
'wakeup' is supported depending upon the property 'has-tpo' present
in the OF node. It provides a way to load the generic rtc driver in
in the absence of an OPAL driver.
The patch also moves the existing OPAL rtc get/set time interfaces to the
new driver and exposes the necessary OPAL calls using EXPORT_SYMBOL_GPL.
Test results:
-------------
Host:
[root@tul169p1 ~]# ls -l /sys/class/rtc/
total 0
lrwxrwxrwx 1 root root 0 Oct 14 03:07 rtc0 -> ../../devices/opal-rtc/rtc/rtc0
[root@tul169p1 ~]# cat /sys/devices/opal-rtc/rtc/rtc0/time
08:10:07
[root@tul169p1 ~]# echo `date '+%s' -d '+ 2 minutes'` > /sys/class/rtc/rtc0/wakealarm
[root@tul169p1 ~]# cat /sys/class/rtc/rtc0/wakealarm
1413274345
[root@tul169p1 ~]#
FSP:
$ smgr mfgState
standby
$ rtim timeofday
System time is valid: 2014/10/14 08:12:04.225115
$ smgr mfgState
ipling
$
CC: devicetree@vger.kernel.org
CC: tglx@linutronix.de
CC: rtc-linux@googlegroups.com
CC: a.zummo@towertech.it
Signed-off-by: Neelesh Gupta <neelegup@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/rtc-opal.txt | 16 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/opal.h | 7 | ||||
| -rw-r--r-- | arch/powerpc/kernel/time.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-async.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-rtc.c | 65 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-wrappers.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powernv/setup.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/rtc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/rtc/rtc-opal.c | 261 |
11 files changed, 325 insertions, 50 deletions
diff --git a/Documentation/devicetree/bindings/rtc/rtc-opal.txt b/Documentation/devicetree/bindings/rtc/rtc-opal.txt new file mode 100644 index 000000000000..af87e5ecac54 --- /dev/null +++ b/Documentation/devicetree/bindings/rtc/rtc-opal.txt | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | IBM OPAL real-time clock | ||
| 2 | ------------------------ | ||
| 3 | |||
| 4 | Required properties: | ||
| 5 | - comapatible: Should be "ibm,opal-rtc" | ||
| 6 | |||
| 7 | Optional properties: | ||
| 8 | - has-tpo: Decides if the wakeup is supported or not. | ||
| 9 | |||
| 10 | Example: | ||
| 11 | rtc { | ||
| 12 | compatible = "ibm,opal-rtc"; | ||
| 13 | has-tpo; | ||
| 14 | phandle = <0x10000029>; | ||
| 15 | linux,phandle = <0x10000029>; | ||
| 16 | }; | ||
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index 5d073e50cac8..60250e2d1f0d 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h | |||
| @@ -154,6 +154,8 @@ struct opal_sg_list { | |||
| 154 | #define OPAL_HANDLE_HMI 98 | 154 | #define OPAL_HANDLE_HMI 98 |
| 155 | #define OPAL_REGISTER_DUMP_REGION 101 | 155 | #define OPAL_REGISTER_DUMP_REGION 101 |
| 156 | #define OPAL_UNREGISTER_DUMP_REGION 102 | 156 | #define OPAL_UNREGISTER_DUMP_REGION 102 |
| 157 | #define OPAL_WRITE_TPO 103 | ||
| 158 | #define OPAL_READ_TPO 104 | ||
| 157 | #define OPAL_IPMI_SEND 107 | 159 | #define OPAL_IPMI_SEND 107 |
| 158 | #define OPAL_IPMI_RECV 108 | 160 | #define OPAL_IPMI_RECV 108 |
| 159 | 161 | ||
| @@ -832,6 +834,9 @@ int64_t opal_rtc_read(__be32 *year_month_day, | |||
| 832 | __be64 *hour_minute_second_millisecond); | 834 | __be64 *hour_minute_second_millisecond); |
| 833 | int64_t opal_rtc_write(uint32_t year_month_day, | 835 | int64_t opal_rtc_write(uint32_t year_month_day, |
| 834 | uint64_t hour_minute_second_millisecond); | 836 | uint64_t hour_minute_second_millisecond); |
| 837 | int64_t opal_tpo_read(uint64_t token, __be32 *year_mon_day, __be32 *hour_min); | ||
| 838 | int64_t opal_tpo_write(uint64_t token, uint32_t year_mon_day, | ||
| 839 | uint32_t hour_min); | ||
| 835 | int64_t opal_cec_power_down(uint64_t request); | 840 | int64_t opal_cec_power_down(uint64_t request); |
| 836 | int64_t opal_cec_reboot(void); | 841 | int64_t opal_cec_reboot(void); |
| 837 | int64_t opal_read_nvram(uint64_t buffer, uint64_t size, uint64_t offset); | 842 | int64_t opal_read_nvram(uint64_t buffer, uint64_t size, uint64_t offset); |
| @@ -1009,8 +1014,6 @@ extern int opal_async_wait_response(uint64_t token, struct opal_msg *msg); | |||
| 1009 | extern int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data); | 1014 | extern int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data); |
| 1010 | 1015 | ||
| 1011 | struct rtc_time; | 1016 | struct rtc_time; |
| 1012 | extern int opal_set_rtc_time(struct rtc_time *tm); | ||
| 1013 | extern void opal_get_rtc_time(struct rtc_time *tm); | ||
| 1014 | extern unsigned long opal_get_boot_time(void); | 1017 | extern unsigned long opal_get_boot_time(void); |
| 1015 | extern void opal_nvram_init(void); | 1018 | extern void opal_nvram_init(void); |
| 1016 | extern void opal_flash_init(void); | 1019 | extern void opal_flash_init(void); |
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 9f8ea617ff2c..fa7c4f12104f 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
| @@ -989,6 +989,7 @@ void GregorianDay(struct rtc_time * tm) | |||
| 989 | 989 | ||
| 990 | tm->tm_wday = day % 7; | 990 | tm->tm_wday = day % 7; |
| 991 | } | 991 | } |
| 992 | EXPORT_SYMBOL_GPL(GregorianDay); | ||
| 992 | 993 | ||
| 993 | void to_tm(int tim, struct rtc_time * tm) | 994 | void to_tm(int tim, struct rtc_time * tm) |
| 994 | { | 995 | { |
diff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c index e462ab947d16..693b6cdac691 100644 --- a/arch/powerpc/platforms/powernv/opal-async.c +++ b/arch/powerpc/platforms/powernv/opal-async.c | |||
| @@ -71,6 +71,7 @@ int opal_async_get_token_interruptible(void) | |||
| 71 | 71 | ||
| 72 | return token; | 72 | return token; |
| 73 | } | 73 | } |
| 74 | EXPORT_SYMBOL_GPL(opal_async_get_token_interruptible); | ||
| 74 | 75 | ||
| 75 | int __opal_async_release_token(int token) | 76 | int __opal_async_release_token(int token) |
| 76 | { | 77 | { |
| @@ -102,6 +103,7 @@ int opal_async_release_token(int token) | |||
| 102 | 103 | ||
| 103 | return 0; | 104 | return 0; |
| 104 | } | 105 | } |
| 106 | EXPORT_SYMBOL_GPL(opal_async_release_token); | ||
| 105 | 107 | ||
| 106 | int opal_async_wait_response(uint64_t token, struct opal_msg *msg) | 108 | int opal_async_wait_response(uint64_t token, struct opal_msg *msg) |
| 107 | { | 109 | { |
| @@ -120,6 +122,7 @@ int opal_async_wait_response(uint64_t token, struct opal_msg *msg) | |||
| 120 | 122 | ||
| 121 | return 0; | 123 | return 0; |
| 122 | } | 124 | } |
| 125 | EXPORT_SYMBOL_GPL(opal_async_wait_response); | ||
| 123 | 126 | ||
| 124 | static int opal_async_comp_event(struct notifier_block *nb, | 127 | static int opal_async_comp_event(struct notifier_block *nb, |
| 125 | unsigned long msg_type, void *msg) | 128 | unsigned long msg_type, void *msg) |
diff --git a/arch/powerpc/platforms/powernv/opal-rtc.c b/arch/powerpc/platforms/powernv/opal-rtc.c index 499707ddaa9c..37dbee15769f 100644 --- a/arch/powerpc/platforms/powernv/opal-rtc.c +++ b/arch/powerpc/platforms/powernv/opal-rtc.c | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | #include <linux/bcd.h> | 15 | #include <linux/bcd.h> |
| 16 | #include <linux/rtc.h> | 16 | #include <linux/rtc.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/platform_device.h> | ||
| 19 | #include <linux/of_platform.h> | ||
| 18 | 20 | ||
| 19 | #include <asm/opal.h> | 21 | #include <asm/opal.h> |
| 20 | #include <asm/firmware.h> | 22 | #include <asm/firmware.h> |
| @@ -43,7 +45,7 @@ unsigned long __init opal_get_boot_time(void) | |||
| 43 | long rc = OPAL_BUSY; | 45 | long rc = OPAL_BUSY; |
| 44 | 46 | ||
| 45 | if (!opal_check_token(OPAL_RTC_READ)) | 47 | if (!opal_check_token(OPAL_RTC_READ)) |
| 46 | goto out; | 48 | return 0; |
| 47 | 49 | ||
| 48 | while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) { | 50 | while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) { |
| 49 | rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms); | 51 | rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms); |
| @@ -53,62 +55,33 @@ unsigned long __init opal_get_boot_time(void) | |||
| 53 | mdelay(10); | 55 | mdelay(10); |
| 54 | } | 56 | } |
| 55 | if (rc != OPAL_SUCCESS) | 57 | if (rc != OPAL_SUCCESS) |
| 56 | goto out; | 58 | return 0; |
| 57 | 59 | ||
| 58 | y_m_d = be32_to_cpu(__y_m_d); | 60 | y_m_d = be32_to_cpu(__y_m_d); |
| 59 | h_m_s_ms = be64_to_cpu(__h_m_s_ms); | 61 | h_m_s_ms = be64_to_cpu(__h_m_s_ms); |
| 60 | opal_to_tm(y_m_d, h_m_s_ms, &tm); | 62 | opal_to_tm(y_m_d, h_m_s_ms, &tm); |
| 61 | return mktime(tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, | 63 | return mktime(tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, |
| 62 | tm.tm_hour, tm.tm_min, tm.tm_sec); | 64 | tm.tm_hour, tm.tm_min, tm.tm_sec); |
| 63 | out: | ||
| 64 | ppc_md.get_rtc_time = NULL; | ||
| 65 | ppc_md.set_rtc_time = NULL; | ||
| 66 | return 0; | ||
| 67 | } | 65 | } |
| 68 | 66 | ||
| 69 | void opal_get_rtc_time(struct rtc_time *tm) | 67 | static __init int opal_time_init(void) |
| 70 | { | 68 | { |
| 71 | long rc = OPAL_BUSY; | 69 | struct platform_device *pdev; |
| 72 | u32 y_m_d; | 70 | struct device_node *rtc; |
| 73 | u64 h_m_s_ms; | ||
| 74 | __be32 __y_m_d; | ||
| 75 | __be64 __h_m_s_ms; | ||
| 76 | 71 | ||
| 77 | while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) { | 72 | rtc = of_find_node_by_path("/ibm,opal/rtc"); |
| 78 | rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms); | 73 | if (rtc) { |
| 79 | if (rc == OPAL_BUSY_EVENT) | 74 | pdev = of_platform_device_create(rtc, "opal-rtc", NULL); |
| 80 | opal_poll_events(NULL); | 75 | of_node_put(rtc); |
| 76 | } else { | ||
| 77 | if (opal_check_token(OPAL_RTC_READ) || | ||
| 78 | opal_check_token(OPAL_READ_TPO)) | ||
| 79 | pdev = platform_device_register_simple("opal-rtc", -1, | ||
| 80 | NULL, 0); | ||
| 81 | else | 81 | else |
| 82 | mdelay(10); | 82 | return -ENODEV; |
| 83 | } | 83 | } |
| 84 | if (rc != OPAL_SUCCESS) | ||
| 85 | return; | ||
| 86 | y_m_d = be32_to_cpu(__y_m_d); | ||
| < | |||
