Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3728766imu; Fri, 18 Jan 2019 16:18:16 -0800 (PST) X-Google-Smtp-Source: ALg8bN5cZz5UF7funsOmFly3rS0G/i9bomadH3RWpAzSH9QmU6JmOv/0vgIXMSbNz7TWd9ACnv1w X-Received: by 2002:a63:2406:: with SMTP id k6mr19085543pgk.229.1547857095991; Fri, 18 Jan 2019 16:18:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547857095; cv=none; d=google.com; s=arc-20160816; b=lnPxNAE/zNJvl9czz+f4I+s2SnoDcGu0sNgRU5CNcFk0Cn4PD6SzWqxbxrBoQoDYBO EUZhc+8tmABJcGllzMKTzK5dB66J4+scZ/g73oTA8jm0phVOjsgw9AEH7yRC9L030ZA2 QCzJx6JwvXFl3PLQ8DCrQxNmWBDGtangRXLT/VyPELp8xGXFkRkqDT1Bg7RLxbzNFvui obp4/tMgV5W02tgmx2DIzWqZxFAyNN4W4ZJy0H340SJIu+SkNnir3QpJHrA/LycOXnJw KDFJ7w3Y5HI/izVCKvUzomLQq4ev9zbCDxwchP3ejcs69xVzAI6MURWJtSYsxHHvHb6n KeAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U4/11qBya9eW0TJulgY+pL3W8mKOzagyoDohcwhv/7A=; b=dkHHk/DL1HqHBseeRfeVn5dyjl8M2qE2GPPGYq8o8HBxcY5MUmv9XzGt1g8BDDlK7f JfKWKqdEm5y69C34SyhjvCuhSK13Cy8tsD9wP19b/rrFBgfrZVnTic0VQ1bJfbG7KzcC 45erjchm4j92AyH+voJGJ7MiKETZ95tauES3pPaRvrUas/5nhTjQxpvP8wrMgj+ZAUOV GK+gM3dTTXkZX0HFod2Gmd0tVnWoKbJN/4/Ax9cGHc31gZYFAOXOaGNYOho+dPgIQFaG gcCY2BysbUHiBd0b5fO/2SvgHZQEAIBEK6In0QTgBYBDLta/CRbdJ71jy3EOWdWcN+L4 Wl5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Q8g2CYvF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i16si5778602pgk.445.2019.01.18.16.18.00; Fri, 18 Jan 2019 16:18:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Q8g2CYvF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730408AbfASAPK (ORCPT + 99 others); Fri, 18 Jan 2019 19:15:10 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:39865 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730329AbfASAOi (ORCPT ); Fri, 18 Jan 2019 19:14:38 -0500 Received: by mail-it1-f196.google.com with SMTP id a6so8138916itl.4 for ; Fri, 18 Jan 2019 16:14:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U4/11qBya9eW0TJulgY+pL3W8mKOzagyoDohcwhv/7A=; b=Q8g2CYvFZ2UYeUj77LcTL3vkxcfxEPoIB439S9+EqUmuDAbzYtgWiQ3jf05hkXWD/6 3tY1MKyy89MkZIZkVM3yrADfnvnVYnMglnZp65eslvKy3dEhH0v1NNjVOy9uOrinJfOG 5uHQArlFqJFNUefh4kwNC9K9gefzHtxXA15hg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U4/11qBya9eW0TJulgY+pL3W8mKOzagyoDohcwhv/7A=; b=uHT08N2s7U1RawYRTFHD07z0Yd7wwY2BmaS+RjNpW7dLRaNxz9z8b7qv2gjQSZtSpf +u9UQfqJfeRuACik7pkqsiIKdb2G/9OewZTLGQCMoODG/FxS8UBuZwq3LOBnFGXLOpZa 7cSsVSPEDy+/qaJ5j723NBP/n4vPySYrKqIBu52cO24+V6nWaGZsrOanlR3TK9vqMLEL PEtmPoMmCQu5VT79pX82UR4XJpd/LW9dAHWVM8DDOQAQkdE6qehjoDYZxalwxB5tzRkv HFLQjMDtQ2+H9V/2InjAnAn+6AodBFz1tYle16EuEH5s9g/wiS1meEtjEy/GyPFQ7MiN nvmQ== X-Gm-Message-State: AJcUukeoS9n1WNCm1QwMw0J16VBKfAo9AR2zKbHX08Y9BvL+Tx5sNEU9 PLJqG3QRGz2DHRvse5urm1+gWva1Gv8= X-Received: by 2002:a24:9a01:: with SMTP id l1mr1265823ite.113.1547856876495; Fri, 18 Jan 2019 16:14:36 -0800 (PST) Received: from ncrews2.bld.corp.google.com ([2620:15c:183:200:8140:8e3f:aea5:bcdf]) by smtp.gmail.com with ESMTPSA id e22sm2382062iod.47.2019.01.18.16.14.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 16:14:35 -0800 (PST) From: Nick Crews To: linux-kernel@vger.kernel.org Cc: groeck@chromium.org, sjg@chromium.org, djkurtz@google.com, dlaurie@chromium.org, Duncan Laurie , Nick Crews , linux-rtc@vger.kernel.org, Enric Balletbo i Serra , Alessandro Zummo , Benson Leung , Nick Crews , Alexandre Belloni Subject: [PATCH v3 5/9] platform/chrome: rtc: Add RTC driver Date: Fri, 18 Jan 2019 17:14:18 -0700 Message-Id: <20190119001422.48186-6-ncrews@chromium.org> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog In-Reply-To: <20190119001422.48186-1-ncrews@chromium.org> References: <20190119001422.48186-1-ncrews@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Duncan Laurie 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. > 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 --- 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 | 17 +++ drivers/rtc/Kconfig | 11 ++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-wilco-ec.c | 177 ++++++++++++++++++++++++ 4 files changed, 206 insertions(+) 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 9b4a25e63b56..dd8b896b3833 100644 --- a/drivers/platform/chrome/wilco_ec/core.c +++ b/drivers/platform/chrome/wilco_ec/core.c @@ -34,6 +34,7 @@ static int wilco_ec_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct wilco_ec_device *ec; + struct platform_device *child_pdev; int ret; ec = devm_kzalloc(dev, sizeof(*ec), GFP_KERNEL); @@ -76,8 +77,24 @@ static int wilco_ec_probe(struct platform_device *pdev) goto rm_debugfs; } + /* + * Register a RTC platform device that will get picked up by the RTC + * subsystem. This platform device will get freed when its parent device + * dev is unregistered. + */ + child_pdev = platform_device_register_data(dev, "rtc-wilco-ec", + PLATFORM_DEVID_AUTO, + NULL, 0); + if (IS_ERR(child_pdev)) { + dev_err(dev, "Failed to create RTC platform device\n"); + ret = PTR_ERR(child_pdev); + goto remove_sysfs; + } + return 0; +remove_sysfs: + wilco_ec_sysfs_remove(ec); rm_debugfs: wilco_ec_debugfs_remove(ec); destroy_mec: 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..b721cc3f17f0 --- /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"); -- 2.20.1.321.g9e740568ce-goog