From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD49BC282CC for ; Fri, 8 Feb 2019 12:18:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9FC6D218D4 for ; Fri, 8 Feb 2019 12:18:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727280AbfBHMSq (ORCPT ); Fri, 8 Feb 2019 07:18:46 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:54400 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbfBHMSq (ORCPT ); Fri, 8 Feb 2019 07:18:46 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id D7A2027F107 Subject: Re: [PATCH v6 4/4] platform/chrome: rtc: Add RTC driver To: Nick Crews , linux-kernel@vger.kernel.org Cc: alexandre.belloni@bootlin.com, eballetbo@gmail.com, sjg@chromium.org, dmitry.torokhov@gmail.com, groeck@chromium.org, dlaurie@chromium.org, Duncan Laurie , linux-rtc@vger.kernel.org, Alessandro Zummo , Benson Leung References: <20190208012312.105259-1-ncrews@chromium.org> <20190208012312.105259-5-ncrews@chromium.org> From: Enric Balletbo i Serra Message-ID: <4620e71f-9579-0d4e-2cf8-7851e77e81fc@collabora.com> Date: Fri, 8 Feb 2019 13:18:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190208012312.105259-5-ncrews@chromium.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 8/2/19 2:23, Nick Crews wrote: > This Embedded Controller has an internal RTC that is exposed > as a standard RTC class driver with read/write functionality. > > The driver is added to the drivers/rtc/ so that the maintainer of that > directory will be able to comment on this change, as that maintainer is > the expert on this system. In addition, the driver code is called > indirectly after a corresponding device is registered from core.c, > as opposed to core.c registering the driver callbacks directly. > > To test: >> hwclock --show --rtc /dev/rtc1 > 2007-12-31 16:01:20.460959-08:00 >> hwclock --systohc --rtc /dev/rtc1 >> hwclock --show --rtc /dev/rtc1 > 2018-11-29 17:08:00.780793-08:00 > >> hwclock --show --rtc /dev/rtc1 > 2007-12-31 16:01:20.460959-08:00 >> hwclock --systohc --rtc /dev/rtc1 >> hwclock --show --rtc /dev/rtc1 > 2018-11-29 17:08:00.780793-08:00 > > Signed-off-by: Duncan Laurie > Signed-off-by: Nick Crews I think that you missed :) Acked-by: Enric Balletbo i Serra Acked-by: Alexandre Belloni > --- > > Changes in v6: > - In the core, actually unregister the RTC child platform_device. > > Changes in v5: None > Changes in v4: > - Change me email to @chromium.org from @google.com > - Move "Add RTC driver" before "Add sysfs attributes" so that > it could get accepted earlier, since it is less contentious > > Changes in v3: > - rm #define for driver name > - Don't compute weekday when reading from RTC. > Still set weekday when writing, as RTC needs this > to control advanced power scheduling > - rm check for invalid month data > - Set range_min and range_max on rtc_device > > Changes in v2: > - rm license boiler plate > - rm "wilco_ec_rtc -" prefix in docstring > - Make rtc driver its own module within the drivers/rtc/ directory > - Register a rtc device from core.c that is picked up by this driver > > drivers/platform/chrome/wilco_ec/core.c | 22 ++- Alexandre, this specific patch depends on the patches of the series to apply, and the first patches of the series also conflicts/depends on some patches queued in chrome-platform-5.1 branch [1]. Is it fine with you if I create an immutable branch and all go via your tree? Or what do you think? I am new here and I am not sure how to manage that. Thanks, Enric [1] https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git/log/?h=chrome-platform-5.1 > drivers/rtc/Kconfig | 11 ++ > drivers/rtc/Makefile | 1 + > drivers/rtc/rtc-wilco-ec.c | 177 ++++++++++++++++++++++++ > include/linux/platform_data/wilco-ec.h | 2 + > 5 files changed, 211 insertions(+), 2 deletions(-) > create mode 100644 drivers/rtc/rtc-wilco-ec.c > > diff --git a/drivers/platform/chrome/wilco_ec/core.c b/drivers/platform/chrome/wilco_ec/core.c > index ae86cae216fd..e67385ec5103 100644 > --- a/drivers/platform/chrome/wilco_ec/core.c > +++ b/drivers/platform/chrome/wilco_ec/core.c > @@ -42,6 +42,7 @@ static int wilco_ec_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct wilco_ec_device *ec; > + int ret; > > ec = devm_kzalloc(dev, sizeof(*ec), GFP_KERNEL); > if (!ec) > @@ -70,21 +71,38 @@ static int wilco_ec_probe(struct platform_device *pdev) > ec->io_packet->start + EC_MAILBOX_DATA_SIZE); > > /* > - * Register a debugfs platform device that will get picked up by the > - * debugfs driver. Ignore failure. > + * Register a child device that will be found by the RTC driver. > + * Ignore failure. > */ > ec->debugfs_pdev = platform_device_register_data(dev, > "wilco-ec-debugfs", > PLATFORM_DEVID_AUTO, > NULL, 0); > > + /* Register a child device that will be found by the RTC driver. */ > + ec->rtc_pdev = platform_device_register_data(dev, "rtc-wilco-ec", > + PLATFORM_DEVID_AUTO, > + NULL, 0); > + if (IS_ERR(ec->rtc_pdev)) { > + dev_err(dev, "Failed to create RTC platform device\n"); > + ret = PTR_ERR(ec->rtc_pdev); > + goto unregister_debugfs; > + } > + > return 0; > + > +unregister_debugfs: > + if (ec->debugfs_pdev) > + platform_device_unregister(ec->debugfs_pdev); > + cros_ec_lpc_mec_destroy(); > + return ret; > } > > static int wilco_ec_remove(struct platform_device *pdev) > { > struct wilco_ec_device *ec = platform_get_drvdata(pdev); > > + platform_device_unregister(ec->rtc_pdev); > if (ec->debugfs_pdev) > platform_device_unregister(ec->debugfs_pdev); > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > index 225b0b8516f3..d5063c791515 100644 > --- a/drivers/rtc/Kconfig > +++ b/drivers/rtc/Kconfig > @@ -1814,4 +1814,15 @@ config RTC_DRV_GOLDFISH > Goldfish is a code name for the virtual platform developed by Google > for Android emulation. > > +config RTC_DRV_WILCO_EC > + tristate "Wilco EC RTC" > + depends on WILCO_EC > + default m > + help > + If you say yes here, you get read/write support for the Real Time > + Clock on the Wilco Embedded Controller (Wilco is a kind of Chromebook) > + > + This can also be built as a module. If so, the module will > + be named "rtc_wilco_ec". > + > endif # RTC_CLASS > diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile > index df022d820bee..6255ea78da25 100644 > --- a/drivers/rtc/Makefile > +++ b/drivers/rtc/Makefile > @@ -172,6 +172,7 @@ obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o > obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o > obj-$(CONFIG_RTC_DRV_VRTC) += rtc-mrst.o > obj-$(CONFIG_RTC_DRV_VT8500) += rtc-vt8500.o > +obj-$(CONFIG_RTC_DRV_WILCO_EC) += rtc-wilco-ec.o > obj-$(CONFIG_RTC_DRV_WM831X) += rtc-wm831x.o > obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o > obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o > diff --git a/drivers/rtc/rtc-wilco-ec.c b/drivers/rtc/rtc-wilco-ec.c > new file mode 100644 > index 000000000000..35cc56114c1c > --- /dev/null > +++ b/drivers/rtc/rtc-wilco-ec.c > @@ -0,0 +1,177 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * RTC interface for Wilco Embedded Controller with R/W abilities > + * > + * Copyright 2018 Google LLC > + * > + * The corresponding platform device is typically registered in > + * drivers/platform/chrome/wilco_ec/core.c > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define EC_COMMAND_CMOS 0x7c > +#define EC_CMOS_TOD_WRITE 0x02 > +#define EC_CMOS_TOD_READ 0x08 > + > +/** > + * struct ec_rtc_read - Format of RTC returned by EC. > + * @second: Second value (0..59) > + * @minute: Minute value (0..59) > + * @hour: Hour value (0..23) > + * @day: Day value (1..31) > + * @month: Month value (1..12) > + * @year: Year value (full year % 100) > + * @century: Century value (full year / 100) > + * > + * All values are presented in binary (not BCD). > + */ > +struct ec_rtc_read { > + u8 second; > + u8 minute; > + u8 hour; > + u8 day; > + u8 month; > + u8 year; > + u8 century; > +} __packed; > + > +/** > + * struct ec_rtc_write - Format of RTC sent to the EC. > + * @param: EC_CMOS_TOD_WRITE > + * @century: Century value (full year / 100) > + * @year: Year value (full year % 100) > + * @month: Month value (1..12) > + * @day: Day value (1..31) > + * @hour: Hour value (0..23) > + * @minute: Minute value (0..59) > + * @second: Second value (0..59) > + * @weekday: Day of the week (0=Saturday) > + * > + * All values are presented in BCD. > + */ > +struct ec_rtc_write { > + u8 param; > + u8 century; > + u8 year; > + u8 month; > + u8 day; > + u8 hour; > + u8 minute; > + u8 second; > + u8 weekday; > +} __packed; > + > +int wilco_ec_rtc_read(struct device *dev, struct rtc_time *tm) > +{ > + struct wilco_ec_device *ec = dev_get_drvdata(dev->parent); > + u8 param = EC_CMOS_TOD_READ; > + struct ec_rtc_read rtc; > + struct wilco_ec_message msg = { > + .type = WILCO_EC_MSG_LEGACY, > + .flags = WILCO_EC_FLAG_RAW_RESPONSE, > + .command = EC_COMMAND_CMOS, > + .request_data = ¶m, > + .request_size = sizeof(param), > + .response_data = &rtc, > + .response_size = sizeof(rtc), > + }; > + int ret; > + > + ret = wilco_ec_mailbox(ec, &msg); > + if (ret < 0) > + return ret; > + > + tm->tm_sec = rtc.second; > + tm->tm_min = rtc.minute; > + tm->tm_hour = rtc.hour; > + tm->tm_mday = rtc.day; > + tm->tm_mon = rtc.month - 1; > + tm->tm_year = rtc.year + (rtc.century * 100) - 1900; > + tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year); > + > + /* Don't compute day of week, we don't need it. */ > + tm->tm_wday = -1; > + > + return 0; > +} > + > +int wilco_ec_rtc_write(struct device *dev, struct rtc_time *tm) > +{ > + struct wilco_ec_device *ec = dev_get_drvdata(dev->parent); > + struct ec_rtc_write rtc; > + struct wilco_ec_message msg = { > + .type = WILCO_EC_MSG_LEGACY, > + .flags = WILCO_EC_FLAG_RAW_RESPONSE, > + .command = EC_COMMAND_CMOS, > + .request_data = &rtc, > + .request_size = sizeof(rtc), > + }; > + int year = tm->tm_year + 1900; > + /* > + * Convert from 0=Sunday to 0=Saturday for the EC > + * We DO need to set weekday because the EC controls battery charging > + * schedules that depend on the day of the week. > + */ > + int wday = tm->tm_wday == 6 ? 0 : tm->tm_wday + 1; > + int ret; > + > + rtc.param = EC_CMOS_TOD_WRITE; > + rtc.century = bin2bcd(year / 100); > + rtc.year = bin2bcd(year % 100); > + rtc.month = bin2bcd(tm->tm_mon + 1); > + rtc.day = bin2bcd(tm->tm_mday); > + rtc.hour = bin2bcd(tm->tm_hour); > + rtc.minute = bin2bcd(tm->tm_min); > + rtc.second = bin2bcd(tm->tm_sec); > + rtc.weekday = bin2bcd(wday); > + > + ret = wilco_ec_mailbox(ec, &msg); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static const struct rtc_class_ops wilco_ec_rtc_ops = { > + .read_time = wilco_ec_rtc_read, > + .set_time = wilco_ec_rtc_write, > +}; > + > +static int wilco_ec_rtc_probe(struct platform_device *pdev) > +{ > + struct rtc_device *rtc; > + > + rtc = devm_rtc_allocate_device(&pdev->dev); > + if (IS_ERR(rtc)) > + return PTR_ERR(rtc); > + > + rtc->ops = &wilco_ec_rtc_ops; > + /* EC only supports this century */ > + rtc->range_min = RTC_TIMESTAMP_BEGIN_2000; > + rtc->range_max = RTC_TIMESTAMP_END_2099; > + rtc->owner = THIS_MODULE; > + > + return rtc_register_device(rtc); > +} > + > +static struct platform_driver wilco_ec_rtc_driver = { > + .driver = { > + .name = "rtc-wilco-ec", > + }, > + .probe = wilco_ec_rtc_probe, > +}; > + > +module_platform_driver(wilco_ec_rtc_driver); > + > +MODULE_ALIAS("platform:rtc-wilco-ec"); > +MODULE_AUTHOR("Nick Crews "); > +MODULE_LICENSE("GPL v2"); > +MODULE_DESCRIPTION("Wilco EC RTC driver"); > diff --git a/include/linux/platform_data/wilco-ec.h b/include/linux/platform_data/wilco-ec.h > index 5344975afa1a..446473a46b88 100644 > --- a/include/linux/platform_data/wilco-ec.h > +++ b/include/linux/platform_data/wilco-ec.h > @@ -35,6 +35,7 @@ > * is used to hold the request and the response. > * @data_size: Size of the data buffer used for EC communication. > * @debugfs_pdev: The child platform_device used by the debugfs sub-driver. > + * @rtc_pdev: The child platform_device used by the RTC sub-driver. > */ > struct wilco_ec_device { > struct device *dev; > @@ -45,6 +46,7 @@ struct wilco_ec_device { > void *data_buffer; > size_t data_size; > struct platform_device *debugfs_pdev; > + struct platform_device *rtc_pdev; > }; > > /** >