Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtc: opal: Enable alarms only when opal supports tpo

rtc-opal driver provides support for rtc alarms via
timed-power-on(tpo). However some Power platforms like BML use a fake
rtc clock and don't support tpo. Such platforms are indicated by the
missing 'has-tpo' property in the device tree.

Current implementation however enables callback for
rtc_class_ops.read/set alarm irrespective of the tpo support from the
platform. This results in a failed opal call when kernel tries to read
an existing alarms via opal_get_tpo_time during rtc device registration.

This patch fixes this issue by setting opal_rtc_ops.read/set_alarm
callback pointers only when tpo is supported.

Acked-by: Michael Neuling <mikey@neuling.org>
Acked-by: Neelesh Gupta <neelegup@linux.vnet.ibm.com>
Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
Acked-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

authored by

Vaibhav Jain and committed by
Alexandre Belloni
f4a2eecb c28b42e3

+5 -4
+5 -4
drivers/rtc/rtc-opal.c
··· 190 190 return rc; 191 191 } 192 192 193 - static const struct rtc_class_ops opal_rtc_ops = { 193 + static struct rtc_class_ops opal_rtc_ops = { 194 194 .read_time = opal_get_rtc_time, 195 195 .set_time = opal_set_rtc_time, 196 - .read_alarm = opal_get_tpo_time, 197 - .set_alarm = opal_set_tpo_time, 198 196 }; 199 197 200 198 static int opal_rtc_probe(struct platform_device *pdev) ··· 200 202 struct rtc_device *rtc; 201 203 202 204 if (pdev->dev.of_node && of_get_property(pdev->dev.of_node, "has-tpo", 203 - NULL)) 205 + NULL)) { 204 206 device_set_wakeup_capable(&pdev->dev, true); 207 + opal_rtc_ops.read_alarm = opal_get_tpo_time; 208 + opal_rtc_ops.set_alarm = opal_set_tpo_time; 209 + } 205 210 206 211 rtc = devm_rtc_device_register(&pdev->dev, DRVNAME, &opal_rtc_ops, 207 212 THIS_MODULE);