Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3578583ybl; Fri, 20 Dec 2019 11:41:54 -0800 (PST) X-Google-Smtp-Source: APXvYqyiPX4z5JHnhK5iocw9Ysy4JTEU+903f/BZTVw8bASQfhEfDfTIPVPrIatg2Qe9G1yaicxI X-Received: by 2002:a9d:7d99:: with SMTP id j25mr7146581otn.226.1576870914288; Fri, 20 Dec 2019 11:41:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576870914; cv=none; d=google.com; s=arc-20160816; b=vsw2iX8z4O4+Kx0Ari7Z7up/hnIDjOjYgaCmtipEu96jRzJcLEs+WKgWCl4HZh1VgQ U94eLuBNoVSjVR27TK0WK+6AIzgGGzNMh9dczPzYFO560y+JU2nCMIkVdlzha8Rq+smo od9I3JwSpRjm1W6eytioIWu3bsycYi1eyckEdGEhORueZGLZ6M6kvAGwqj/qtsTxuCMl kkHP//5NOqFD/uyA0tUuVgHFoH+OKJ52yzDBtiq4EpG7wOk7Vm+awI+NuftAxSAWMt7P 5KiX/WTZjpCrlM48mjdlc6ZDll2hP56/sASOwA7EL1A1wLO0uRj1ikVB/gHwGR0hwaIb i5Aw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=lFMjMiBcMXdvnNC5YFzR0WC5mSKVlFhkE6pUjNlt2o0=; b=tZB7MtUtizRETO46ZGjoMohPjWVWbKDJkepfkYbbnxMS0MJyVHlgYVA1zBpEb1HdHt r83FMDnZMt3cklMygZES11oFcg161WK5rSeCfVbXrJRI0hDj1IvUbOVzwjquOLvEw4Ez wjmD9CQf6AWWJDkZvuxr1rKXddtPgb1TJpEMHqVE3xVHJSivvBq7MlRJtS9C2m1swY/h yd7taIR3rGKNuBO+abiCJfgg7XZqkB5WJD12wDAWa8xyz3PxtTTojEp54qwhhihtd9PD Az4dt6jou5Yl9bBSiYkUauTOujAzgEEZ/MSF2sZ2uRpZJqXKUMGGWDTfb3n64ne8f+8e SfTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="B19q8/zp"; 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 l17si5304205otk.218.2019.12.20.11.41.42; Fri, 20 Dec 2019 11:41:54 -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="B19q8/zp"; 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 S1727527AbfLTTko (ORCPT + 99 others); Fri, 20 Dec 2019 14:40:44 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:44806 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727411AbfLTTkn (ORCPT ); Fri, 20 Dec 2019 14:40:43 -0500 Received: by mail-pl1-f194.google.com with SMTP id az3so4520014plb.11 for ; Fri, 20 Dec 2019 11:40:43 -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:mime-version :content-transfer-encoding; bh=lFMjMiBcMXdvnNC5YFzR0WC5mSKVlFhkE6pUjNlt2o0=; b=B19q8/zpcMfdRMQeA+2wf9o8PR0ECzC3FS0toBDpXIMbAI0AKsB40ZJOZkzKx94qtV ONjZIJnzP+4jastKJm5d+HN2kGbD2KxIt60lSbRJFPn3pPTAFs0Ps9E214TIKJyOvu/b VLcPMo9Lo6VOV++TGN7R37yQLPr7B3KDG+roI= 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:mime-version :content-transfer-encoding; bh=lFMjMiBcMXdvnNC5YFzR0WC5mSKVlFhkE6pUjNlt2o0=; b=dltkpu5J5jnLsNj8EHnMEccWw2hd+hWDEpQohGHi+fRHudPPP+w4fvrEPtPXMoXIBU 7vTrn9/EqeKSNmIiIr5p27ZSnXeb2lJyDMmNLp3EFkajMtX2SzC38jKoz9TuDevBbLtl TDPcIB0ouFirI6u9eZTy343vH3PPTUkjebs18H9UetGZB0KefJbM9f3HNBjSY7wWg00J l8tKfTM30ulSKp8MUYSDSLgNCiZfxaNG6PhxTnFI2Xvpd0owRstSvHC/TNqY1OMNLIr0 RNTomr1fPoGFXuBm/05dgFbaPR5eJEmLKRKo7GhdUCX8/h123tsDJMwFX2T4t/85299r MCvQ== X-Gm-Message-State: APjAAAVsswOmgaJDTAsm5LEtyBsDHrkXpb8OTGlMk4UfUywge0sqWz0C wi5JHTLbdn0VbdWbh9NOcyyp6kechqE= X-Received: by 2002:a17:902:724b:: with SMTP id c11mr16666855pll.177.1576870842823; Fri, 20 Dec 2019 11:40:42 -0800 (PST) Received: from pmalani2.mtv.corp.google.com ([2620:15c:202:201:172e:4646:c089:ce59]) by smtp.gmail.com with ESMTPSA id e2sm14109577pfh.84.2019.12.20.11.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 11:40:42 -0800 (PST) From: Prashant Malani To: enric.balletbo@collabora.com, groeck@chromium.org, bleung@chromium.org, lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Jon Flatley , Prashant Malani , Gwendal Grignou Subject: [PATCH v4 1/2] platform: chrome: Add cros-usbpd-notify driver Date: Fri, 20 Dec 2019 11:38:44 -0800 Message-Id: <20191220193843.47182-1-pmalani@chromium.org> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog 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: Jon Flatley ChromiumOS uses ACPI device with HID "GOOG0003" for power delivery related events. The existing cros-usbpd-charger driver relies on these events without ever actually receiving them on ACPI platforms. This is because in the ChromeOS kernel trees, the GOOG0003 device is owned by an ACPI driver that offers firmware updates to USB-C chargers. Introduce a new platform driver under cros-ec, the ChromeOS embedded controller, that handles these PD events and dispatches them appropriately over a notifier chain to all drivers that use them. On non-ACPI platforms, the driver gets instantiated for ECs which support the EC_FEATURE_USB_PD feature bit, and on such platforms, the notification events will get delivered using the MKBP event handling mechanism. Co-Developed-by: Prashant Malani Reviewed-by: Gwendal Grignou Signed-off-by: Jon Flatley Signed-off-by: Prashant Malani --- Changes in v4(pmalani@chromium.org): - No code changes, but added new version so that versioning is consistent with the next patch in the series. Changes in v3 (pmalani@chromium.org): - Renamed driver and files from "cros_ec_pd_notify" to "cros_usbpd_notify" to be more consistent with other naming. - Moved the change to include cros-usbpd-notify in the charger MFD into a separate follow-on patch. Changes in v2 (pmalani@chromium.org): - Removed dependency on DT entry; instead, we will instantiate the driver on detecting EC_FEATURE_USB_PD for non-ACPI platforms. - Modified the cros-ec-pd-notify device to be an mfd_cell under usbpdcharger for non-ACPI platforms. Altered the platform_probe() call to derive the cros EC structs appropriately. - Replaced "usbpd_notify" with "pd_notify" in functions and structures. - Addressed comments from upstream maintainer. drivers/platform/chrome/Kconfig | 9 ++ drivers/platform/chrome/Makefile | 1 + drivers/platform/chrome/cros_usbpd_notify.c | 151 ++++++++++++++++++ .../linux/platform_data/cros_usbpd_notify.h | 17 ++ 4 files changed, 178 insertions(+) create mode 100644 drivers/platform/chrome/cros_usbpd_notify.c create mode 100644 include/linux/platform_data/cros_usbpd_notify.h diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig index 5f57282a28da0..3a8a98f2fb4d1 100644 --- a/drivers/platform/chrome/Kconfig +++ b/drivers/platform/chrome/Kconfig @@ -226,6 +226,15 @@ config CROS_USBPD_LOGGER To compile this driver as a module, choose M here: the module will be called cros_usbpd_logger. +config CROS_USBPD_NOTIFY + tristate "ChromeOS Type-C power delivery event notifier" + depends on CROS_EC + help + If you say Y here, you get support for Type-C PD event notifications + from the ChromeOS EC. On ACPI platorms this driver will bind to the + GOOG0003 ACPI device, and on non-ACPI platforms this driver will get + initialized on ECs which support the feature EC_FEATURE_USB_PD. + source "drivers/platform/chrome/wilco_ec/Kconfig" endif # CHROMEOS_PLATFORMS diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile index aacd5920d8a18..f6465f8ef0b5e 100644 --- a/drivers/platform/chrome/Makefile +++ b/drivers/platform/chrome/Makefile @@ -22,5 +22,6 @@ obj-$(CONFIG_CROS_EC_DEBUGFS) += cros_ec_debugfs.o obj-$(CONFIG_CROS_EC_SENSORHUB) += cros_ec_sensorhub.o obj-$(CONFIG_CROS_EC_SYSFS) += cros_ec_sysfs.o obj-$(CONFIG_CROS_USBPD_LOGGER) += cros_usbpd_logger.o +obj-$(CONFIG_CROS_USBPD_NOTIFY) += cros_usbpd_notify.o obj-$(CONFIG_WILCO_EC) += wilco_ec/ diff --git a/drivers/platform/chrome/cros_usbpd_notify.c b/drivers/platform/chrome/cros_usbpd_notify.c new file mode 100644 index 0000000000000..05a7db834d2e0 --- /dev/null +++ b/drivers/platform/chrome/cros_usbpd_notify.c @@ -0,0 +1,151 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2019 Google LLC + * + * This driver serves as the receiver of cros_ec PD host events. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define DRV_NAME "cros-usbpd-notify" +#define ACPI_DRV_NAME "GOOG0003" + +static BLOCKING_NOTIFIER_HEAD(cros_usbpd_notifier_list); + +/** + * cros_usbpd_register_notify - Register a notifier callback for PD events. + * @nb: Notifier block pointer to register + * + * On ACPI platforms this corresponds to host events on the ECPD + * "GOOG0003" ACPI device. On non-ACPI platforms this will filter mkbp events + * for USB PD events. + * + * Return: 0 on success or negative error code. + */ +int cros_usbpd_register_notify(struct notifier_block *nb) +{ + return blocking_notifier_chain_register( + &cros_usbpd_notifier_list, nb); +} +EXPORT_SYMBOL_GPL(cros_usbpd_register_notify); + + +/** + * cros_usbpd_unregister_notify - Unregister notifier callback for PD events. + * @nb: Notifier block pointer to unregister + * + * Unregister a notifier callback that was previously registered with + * cros_usbpd_register_notify(). + */ +void cros_usbpd_unregister_notify(struct notifier_block *nb) +{ + blocking_notifier_chain_unregister(&cros_usbpd_notifier_list, nb); +} +EXPORT_SYMBOL_GPL(cros_usbpd_unregister_notify); + +#ifdef CONFIG_ACPI + +static int cros_usbpd_notify_add_acpi(struct acpi_device *adev) +{ + return 0; +} + +static void cros_usbpd_notify_acpi(struct acpi_device *adev, u32 event) +{ + blocking_notifier_call_chain(&cros_usbpd_notifier_list, event, NULL); +} + +static const struct acpi_device_id cros_usbpd_notify_acpi_device_ids[] = { + { ACPI_DRV_NAME, 0 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, cros_usbpd_acpi_device_ids); + +static struct acpi_driver cros_usbpd_notify_driver = { + .name = DRV_NAME, + .class = DRV_NAME, + .ids = cros_usbpd_notify_acpi_device_ids, + .ops = { + .add = cros_usbpd_notify_add_acpi, + .notify = cros_usbpd_notify_acpi, + }, +}; +module_acpi_driver(cros_usbpd_notify_driver); + +#else /* CONFIG_ACPI */ + +static int cros_usbpd_notify_plat(struct notifier_block *nb, + unsigned long queued_during_suspend, void *data) +{ + struct cros_ec_device *ec_dev = (struct cros_ec_device *)data; + u32 host_event = cros_ec_get_host_event(ec_dev); + + if (!host_event) + return NOTIFY_BAD; + + if (host_event & EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)) { + blocking_notifier_call_chain(&cros_usbpd_notifier_list, + host_event, NULL); + return NOTIFY_OK; + } + return NOTIFY_DONE; +} + +static int cros_usbpd_notify_probe_plat(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct cros_ec_dev *ecdev = dev_get_drvdata(dev->parent); + struct notifier_block *nb; + int ret; + + nb = devm_kzalloc(dev, sizeof(*nb), GFP_KERNEL); + if (!nb) + return -ENOMEM; + + nb->notifier_call = cros_usbpd_notify_plat; + dev_set_drvdata(dev, nb); + + ret = blocking_notifier_chain_register(&ecdev->ec_dev->event_notifier, + nb); + if (ret < 0) { + dev_err(dev, "Failed to register notifier\n"); + return ret; + } + + return 0; +} + +static int cros_usbpd_notify_remove_plat(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct cros_ec_dev *ecdev = dev_get_drvdata(dev->parent); + struct notifier_block *nb = + (struct notifier_block *)dev_get_drvdata(dev); + + blocking_notifier_chain_unregister(&ecdev->ec_dev->event_notifier, + nb); + + return 0; +} + +static struct platform_driver cros_usbpd_notify_driver = { + .driver = { + .name = DRV_NAME, + }, + .probe = cros_usbpd_notify_probe_plat, + .remove = cros_usbpd_notify_remove_plat, +}; +module_platform_driver(cros_usbpd_notify_driver); + +#endif /* CONFIG_ACPI */ + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("ChromeOS power delivery notifier device"); +MODULE_AUTHOR("Jon Flatley "); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/include/linux/platform_data/cros_usbpd_notify.h b/include/linux/platform_data/cros_usbpd_notify.h new file mode 100644 index 0000000000000..cd7c7bebf18da --- /dev/null +++ b/include/linux/platform_data/cros_usbpd_notify.h @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ChromeOS EC Power Delivery Notifier Driver + * + * Copyright 2019 Google LLC + */ + +#ifndef __LINUX_PLATFORM_DATA_CROS_USBPD_NOTIFY_H +#define __LINUX_PLATFORM_DATA_CROS_USBPD_NOTIFY_H + +#include + +int cros_usbpd_register_notify(struct notifier_block *nb); + +void cros_usbpd_unregister_notify(struct notifier_block *nb); + +#endif /* __LINUX_PLATFORM_DATA_CROS_USBPD_NOTIFY_H */ -- 2.24.1.735.g03f4e72817-goog