From patchwork Fri Jan 24 23:18:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prashant Malani X-Patchwork-Id: 11351271 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2093A159A for ; Fri, 24 Jan 2020 23:21:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E040D2081E for ; Fri, 24 Jan 2020 23:21:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="NacjkgaM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729236AbgAXXVo (ORCPT ); Fri, 24 Jan 2020 18:21:44 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:40173 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729163AbgAXXVo (ORCPT ); Fri, 24 Jan 2020 18:21:44 -0500 Received: by mail-pf1-f195.google.com with SMTP id q8so1833397pfh.7 for ; Fri, 24 Jan 2020 15:21: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=g62W9zyRnLaJvDqXWj9zO8N5kgKMPJ8ADRZEejZYC2Q=; b=NacjkgaMLSdt+bsZ95POQ3P8F3AcKOaUf16/7ejq/BM3me1p5THLD3dOZQPhl8/0HY ZSGcc47t42ZxfBVVNOGc7hAj8y8QhLz4C+jTWChwtGlWcryTzna5cuT5g5uXRUyyZSWF J6ikdpifo/xuobAzVSTAX1zb7k9lCco3O4L6c= 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=g62W9zyRnLaJvDqXWj9zO8N5kgKMPJ8ADRZEejZYC2Q=; b=IyB/pzTsLGi38PkDM7zziiHWbHMAS72Qij37L1Hy4l7O6PTji6gu8bmdrDOd59hDot SF4Seu9nLaN2vt0GaQha430gbzOUlEjcpSAxtkTm3wZWYceXVMG9AzS9E6uyu9X9VXs3 K40OgNfLQKJOlfW4fpVIzi4CFLUdvTaZ/SUgWzyDOTOS+K0pBafMjREmQ65aWBlEfija pJJsIFo63ybv0+t1OZR5yoo3MY8UODHE2WBdvMB2E5SGflvqpJlDuoY7cycLemQzrLsw wGrod/z5KoAsdh/ZM8PIdlCXcbK1c9ooa3LEOqePJGmP9JlNXRQI1JBSo2LAA41DWgqn FJUg== X-Gm-Message-State: APjAAAVCkB7cph5/ra9/hCSvaAd+/R+eU1Thlh46zRyjLV1f4FR//x5m fQWn/xB3K0HpQlDK1wbuOuY4yg== X-Google-Smtp-Source: APXvYqzzQ2d9Yma0Fs4fWCdE079O/MMZDb2R3jVairL1yz4v+98wPBb4ze64gBctzviVo3BaJwfYLQ== X-Received: by 2002:a62:cece:: with SMTP id y197mr5690912pfg.9.1579908102978; Fri, 24 Jan 2020 15:21: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 b12sm2823103pfr.26.2020.01.24.15.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 15:21:42 -0800 (PST) From: Prashant Malani To: enric.balletbo@collabora.com, groeck@chromium.org, bleung@chromium.org, lee.jones@linaro.org, sre@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Jon Flatley , Prashant Malani , Gwendal Grignou Subject: [PATCH v8 1/4] platform: chrome: Add cros-usbpd-notify driver Date: Fri, 24 Jan 2020 15:18:32 -0800 Message-Id: <20200124231834.63628-1-pmalani@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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 platforms that don't have the ACPI device defined, the driver gets instantiated for ECs which support the EC_FEATURE_USB_PD feature bit, and the notification events will get delivered using the MKBP event handling mechanism. Co-Developed-by: Prashant Malani Reviewed-by: Gwendal Grignou Reviewed-by: Benson Leung Signed-off-by: Jon Flatley Signed-off-by: Prashant Malani --- Changes in v8(pmalani@chromium.org): - Fix style nits. - Remove unrequired header. - Remove #ifdef CONFIG_OF dependency for platform driver registration. - Add module compile text to Kconfig help section. Changes in v7(pmalani@chromium.org): - Removed use of module_platform_driver() and module_acpi_driver() since that was causing redefinition compilation errors on arm64 defconfig. Instead, explicitly defined the init and exit routines and register/unregister the platform and ACPI drivers there. - Alphabetize #include header. Changes in v6(pmalani@chromium.org): - Fix build error from typo in cros_usbpd_notify_acpi_device_ids variable name. Changes in v5(pmalani@chromium.org): - Split the driver into platform and ACPI variants, each enclosed by CONFIG_OF and CONFIG_ACPI #ifdefs respectively. - Updated the copyright year to 2020. - Reworded the commit message and Kconfig description to incorporate the modified driver structure. 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 | 13 ++ drivers/platform/chrome/Makefile | 1 + drivers/platform/chrome/cros_usbpd_notify.c | 170 ++++++++++++++++++ .../linux/platform_data/cros_usbpd_notify.h | 17 ++ 4 files changed, 201 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..e45e0fe057586 100644 --- a/drivers/platform/chrome/Kconfig +++ b/drivers/platform/chrome/Kconfig @@ -226,6 +226,19 @@ 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 platforms which don't have this device it + will get initialized on ECs which support the feature + EC_FEATURE_USB_PD. + + To compile this driver as a module, choose M here: the + module will be called cros_usbpd_notify. + 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..6ead5c62b3c5f --- /dev/null +++ b/drivers/platform/chrome/cros_usbpd_notify.c @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2020 Google LLC + * + * This driver serves as the receiver of cros_ec PD host events. + */ + +#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_notify_acpi_device_ids); + +static struct acpi_driver cros_usbpd_notify_acpi_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, + }, +}; + +#endif /* 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_plat_driver = { + .driver = { + .name = DRV_NAME, + }, + .probe = cros_usbpd_notify_probe_plat, + .remove = cros_usbpd_notify_remove_plat, +}; + +static int __init cros_usbpd_notify_init(void) +{ + int ret; + + ret = platform_driver_register(&cros_usbpd_notify_plat_driver); + if (ret < 0) + return ret; + +#ifdef CONFIG_ACPI + acpi_bus_register_driver(&cros_usbpd_notify_acpi_driver); +#endif + return 0; +} + +static void __exit cros_usbpd_notify_exit(void) +{ +#ifdef CONFIG_ACPI + acpi_bus_unregister_driver(&cros_usbpd_notify_acpi_driver); +#endif + platform_driver_unregister(&cros_usbpd_notify_plat_driver); +} + +module_init(cros_usbpd_notify_init); +module_exit(cros_usbpd_notify_exit); + +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..4f2791722b6d3 --- /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 2020 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 */ From patchwork Fri Jan 24 23:18:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prashant Malani X-Patchwork-Id: 11351293 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 23E84159A for ; Fri, 24 Jan 2020 23:24:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02C0B2077C for ; Fri, 24 Jan 2020 23:24:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="oAxRHSpk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729353AbgAXXYp (ORCPT ); Fri, 24 Jan 2020 18:24:45 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:39534 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729299AbgAXXYp (ORCPT ); Fri, 24 Jan 2020 18:24:45 -0500 Received: by mail-pj1-f66.google.com with SMTP id e11so495882pjt.4 for ; Fri, 24 Jan 2020 15:24:45 -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=WzqWvK5o+ybR/i3ON58T7OBtUXSoGrpaLS3XPpmmh0A=; b=oAxRHSpko6+wbCZ+XPcsBwlhuXzprapRJ6ZcGOKxys0g1A1XFkMUzICXYjOw0u8Clc beS9cyE9tFJ3aIpjvNjFsWSqrWIRMKb4SnQJOJxujHrG9aKGH9fTSb9N6RFx+HqqD3/3 uZ3yU+hdm7BcFpK0QoABL0UJAWC3DCu02w3Ws= 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=WzqWvK5o+ybR/i3ON58T7OBtUXSoGrpaLS3XPpmmh0A=; b=m/27tTT9zxgFnzz75hv5jt0SYdNSPc9R4Jwm51eZAXQqCafrPKrnn9eRxPYMyYM53E /9AM3Ha5NSC6AsvDRh0VL0DLDgJ9CJAx2p4XzMdUERTD2em2sOF9d/xKBEIk/S5o6tX/ 0fCSsU+OWSwHQOvT9UOCVcerSB2c2RXtEu65imQz1eoah4TKdVskM1X0nkAQnJH8u9Gz Dq8+8qR+nLLtKxuNA2q9Z662Vcm3HMuv6v1rRpwkK3d8PQDuTxIBTd+kke/Zm3e80TG9 boNnX+QpyPAfoG1csHLwBD4iz7MtBrdH8tOQ2myJ6a3jOyIrO0QDdV4kDsS+Upe7uNGU yD5w== X-Gm-Message-State: APjAAAVAesShMfaiUKq+xEcS8L1Lr81kUMQZtdw71ML6nQLPnRbdsDQA 64ky0zl1tCROXODmKO46F6F6dA== X-Google-Smtp-Source: APXvYqzX4PEk08eSMfSGJt0meMlg10gfZoj4miTS8teTEZnQBYUzKZjvd5YAiAgw3Jbjl0s3IXokRg== X-Received: by 2002:a17:902:ba86:: with SMTP id k6mr5847880pls.96.1579908284673; Fri, 24 Jan 2020 15:24:44 -0800 (PST) Received: from pmalani2.mtv.corp.google.com ([2620:15c:202:201:172e:4646:c089:ce59]) by smtp.gmail.com with ESMTPSA id b12sm2823103pfr.26.2020.01.24.15.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 15:24:44 -0800 (PST) From: Prashant Malani To: enric.balletbo@collabora.com, groeck@chromium.org, bleung@chromium.org, lee.jones@linaro.org, sre@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Prashant Malani Subject: [PATCH v8 2/4] mfd: cros_ec: Add cros-usbpd-notify subdevice Date: Fri, 24 Jan 2020 15:18:34 -0800 Message-Id: <20200124231834.63628-2-pmalani@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200124231834.63628-1-pmalani@chromium.org> References: <20200124231834.63628-1-pmalani@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add the cros-usbpd-notify driver as a subdevice on platforms that support the EC_FEATURE_USB_PD EC feature flag and don't have the ACPI PD notification device defined. This driver allows other cros-ec devices to receive PD event notifications from the Chrome OS Embedded Controller (EC) via a notification chain. Reviewed-by: Benson Leung Signed-off-by: Prashant Malani --- Changes in v8: - No changes. Patch v6 was applied, but maintaining it in this series, since Patch 3/4 adds a change to the if condition. Changes in v7: - No changes. Changes in v6: - No changes. Changes in v5: - Updated the IS_ENABLED() check to check for CONFIG_OF instead of !CONFIG_ACPI according to upstream comments. Changes in v4: - Removed #ifndef usage; instead, moved cros-usbpd-notify to a separate mfd_cell and used an IS_ENABLED() check. - Changed commit title and description slightly to reflect change in code. drivers/mfd/cros_ec_dev.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index c4b977a5dd966..d0c28a4c10ad0 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -5,6 +5,7 @@ * Copyright (C) 2014 Google, Inc. */ +#include #include #include #include @@ -87,6 +88,10 @@ static const struct mfd_cell cros_usbpd_charger_cells[] = { { .name = "cros-usbpd-logger", }, }; +static const struct mfd_cell cros_usbpd_notify_cells[] = { + { .name = "cros-usbpd-notify", }, +}; + static const struct cros_feature_to_cells cros_subdevices[] = { { .id = EC_FEATURE_CEC, @@ -202,6 +207,23 @@ static int ec_device_probe(struct platform_device *pdev) } } + /* + * The PD notifier driver cell is separate since it only needs to be + * explicitly added on platforms that don't have the PD notifier ACPI + * device entry defined. + */ + if (IS_ENABLED(CONFIG_OF)) { + if (cros_ec_check_features(ec, EC_FEATURE_USB_PD)) { + retval = mfd_add_hotplug_devices(ec->dev, + cros_usbpd_notify_cells, + ARRAY_SIZE(cros_usbpd_notify_cells)); + if (retval) + dev_err(ec->dev, + "failed to add PD notify devices: %d\n", + retval); + } + } + /* * The following subdevices cannot be detected by sending the * EC_FEATURE_GET_CMD to the Embedded Controller device. From patchwork Fri Jan 24 23:18:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prashant Malani X-Patchwork-Id: 11351297 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 481B4159A for ; Fri, 24 Jan 2020 23:25:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 261C22077C for ; Fri, 24 Jan 2020 23:25:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="H06xmx89" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387447AbgAXXZY (ORCPT ); Fri, 24 Jan 2020 18:25:24 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:34934 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387449AbgAXXZY (ORCPT ); Fri, 24 Jan 2020 18:25:24 -0500 Received: by mail-pj1-f68.google.com with SMTP id q39so510582pjc.0 for ; Fri, 24 Jan 2020 15:25:23 -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=FARh9+NSyoh9cEVojaQ5yO/5qNpny8hvAgXD5nEC67I=; b=H06xmx89YXaZ0rcfRMS2TzEW37mYI8VF98nq0ZMSaYi3lu8uAeqHa9gZSfOnFRnKYm qoFdh8VmrW/jYfFXK8gbQ2XlEKnW0TJ3P54II9lv3xnVRSLXaGayP+I8D1beKJxMK8bs oKHBzJRcMOmv12M0LXdfYDDpetCcuhWsZ6r5A= 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=FARh9+NSyoh9cEVojaQ5yO/5qNpny8hvAgXD5nEC67I=; b=Da01SoC2dciWO9pgzy1Ne/oxg1ijWHE9Y8AWMftiM56h1iHFE2oJZ0DFkqdprJUB2g jPQfuKfcoD06VGm07eyQ38TYubmcLyeOFf0p5N7tdexE1KTWTKdsrlypm/rrdDJAu/I7 xLEqkk2A9I7Ssoab/QjmPAbBaZuZle9G3nl29t7UWqjup4d6M+x2L7crtakacOL08QZE kVw8I3KYNBJiwK8l5Vq79K97Dw0zn8GNv1jmHM3Zvoh4vVxxjV+8whc2+20Dw4Tr/C5p o+pkbaR6WY/29g/YCZPcrtTdWqnuvxu6tsUfNTe2z5VVoNS2s+VtINDs1nh/F5ZrybcC 6xVA== X-Gm-Message-State: APjAAAVYYwF/6TG88N0P10FYYwl+zzn5SxanxvAS8OoTaVEpLnviXQ9X ScKdzCFBTq6n+pubYdvPYaNTbQ== X-Google-Smtp-Source: APXvYqyHd5FT8CvoOI9/vPxv4sxwo5PHmJDSN6SkVVSjaI1OtaJ7MDk1gnotjCGKLpyZEXEYrUGOcA== X-Received: by 2002:a17:90a:9c1:: with SMTP id 59mr1846965pjo.65.1579908323338; Fri, 24 Jan 2020 15:25:23 -0800 (PST) Received: from pmalani2.mtv.corp.google.com ([2620:15c:202:201:172e:4646:c089:ce59]) by smtp.gmail.com with ESMTPSA id b12sm2823103pfr.26.2020.01.24.15.25.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 15:25:22 -0800 (PST) From: Prashant Malani To: enric.balletbo@collabora.com, groeck@chromium.org, bleung@chromium.org, lee.jones@linaro.org, sre@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Prashant Malani Subject: [PATCH v8 3/4] mfd: cros_ec: Check DT node for usbpd-notify add Date: Fri, 24 Jan 2020 15:18:36 -0800 Message-Id: <20200124231834.63628-3-pmalani@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200124231834.63628-1-pmalani@chromium.org> References: <20200124231834.63628-1-pmalani@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add a check to ensure there is indeed an EC device tree entry before adding the cros-usbpd-notify device. This covers configs where both CONFIG_ACPI and CONFIG_OF are defined, but the EC device is defined using device tree and not in ACPI. Signed-off-by: Prashant Malani Tested-by: Enric Balletbo i Serra --- Changes in v8: - Patch first introduced in v8 of the series. drivers/mfd/cros_ec_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index d0c28a4c10ad0..411e80fc9a066 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -212,7 +212,7 @@ static int ec_device_probe(struct platform_device *pdev) * explicitly added on platforms that don't have the PD notifier ACPI * device entry defined. */ - if (IS_ENABLED(CONFIG_OF)) { + if (IS_ENABLED(CONFIG_OF) && ec->ec_dev->dev->of_node) { if (cros_ec_check_features(ec, EC_FEATURE_USB_PD)) { retval = mfd_add_hotplug_devices(ec->dev, cros_usbpd_notify_cells, From patchwork Fri Jan 24 23:18:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prashant Malani X-Patchwork-Id: 11351301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D2756C1 for ; Fri, 24 Jan 2020 23:27:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2120F2071A for ; Fri, 24 Jan 2020 23:27:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="J8T7f7GL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729537AbgAXX1f (ORCPT ); Fri, 24 Jan 2020 18:27:35 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:51712 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729521AbgAXX1f (ORCPT ); Fri, 24 Jan 2020 18:27:35 -0500 Received: by mail-pj1-f65.google.com with SMTP id d15so478457pjw.1 for ; Fri, 24 Jan 2020 15:27:34 -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=pMA+QteS/JKIrgzNNehkgXK6WKtqs9yO/7325HU0xxA=; b=J8T7f7GLnK78uiyRBnCLfOmhrZTQC9Snw78JgipV4iORMKkCyjpWK6Ywu969t4OCWn vHVgk8OMilaDg72I96iQnY49oKejS5E4WkIGj7sHU4H9yMdm7xTCLQ/pLUUUruZZOKSd 5TxNBzu5M228WEMt7/FxGDohHhvzc8IdHhmw0= 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=pMA+QteS/JKIrgzNNehkgXK6WKtqs9yO/7325HU0xxA=; b=X9beMhhDQu4T3E1fh3hpaxLlzVFnyHrWw7P9RiLHVCr2oeCxkiQjS+muJkCp1ZCnN1 sqzTQX8OAHUuw39oWeGzo+vlY7/qTNau6Nz6mkeZXP8vgxRE+WwBfoWqUGHuWdsZD5np pJKbN7t2padXAh1/zAg4noJe1k0dTf6rMdaOejsEsMfIbOTHp2w13dRbD9lp3AwewhNQ 0yMZKSOhS/B0WI16WuH3rg3ANKNX+FbMk6mSke1qPHqHrYu0xu/AAGiMOXf67Md3MwHq 0unCAYLTkem/OvrqqcmwSvr9mfjMXCC66LmPnDDM+z7nql1kQScoD+dZVzwvPlezxEu9 geHw== X-Gm-Message-State: APjAAAUgQ7zd0yvWFSrGnFqPo8/Z41Q3/BXcMtTRP0uB7Os9o6fRNR4/ gHSfSvXZkbh5Rw2MKh7QkC5Jg9qqG7A= X-Google-Smtp-Source: APXvYqwY0AaVqS2LMQRZ1k5/WiWlXd2hBWliRPyl4SxOhlErcaZ2nhCS1Or5k6hnLxc4GiBDU6wz0w== X-Received: by 2002:a17:902:6ac3:: with SMTP id i3mr6070491plt.111.1579908454326; Fri, 24 Jan 2020 15:27:34 -0800 (PST) Received: from pmalani2.mtv.corp.google.com ([2620:15c:202:201:172e:4646:c089:ce59]) by smtp.gmail.com with ESMTPSA id b12sm2823103pfr.26.2020.01.24.15.27.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 15:27:33 -0800 (PST) From: Prashant Malani To: enric.balletbo@collabora.com, groeck@chromium.org, bleung@chromium.org, lee.jones@linaro.org, sre@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Jon Flatley , Prashant Malani Subject: [PATCH v8 4/4] power: supply: cros-ec-usbpd-charger: Fix host events Date: Fri, 24 Jan 2020 15:18:38 -0800 Message-Id: <20200124231834.63628-4-pmalani@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200124231834.63628-1-pmalani@chromium.org> References: <20200124231834.63628-1-pmalani@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Jon Flatley There's a bug on ACPI platforms where host events from the ECPD ACPI device never make their way to the cros-ec-usbpd-charger driver. This makes it so the only time the charger driver updates its state is when user space accesses its sysfs attributes. Now that these events have been unified into a single notifier chain on both ACPI and non-ACPI platforms, update the charger driver to use this new notifier. Reviewed-by: Benson Leung Co-Developed-by: Prashant Malani Signed-off-by: Jon Flatley Signed-off-by: Prashant Malani --- Changes in v8(pmalani@chromium.org): - No changes. Changes in v7(pmalani@chromium.org): - Alphabetize #include header. Changes in v6(pmalani@chromium.org): - Patch first introduced into the series in v6. drivers/power/supply/Kconfig | 2 +- drivers/power/supply/cros_usbpd-charger.c | 50 ++++++++--------------- 2 files changed, 19 insertions(+), 33 deletions(-) diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 27164a1d3c7c4..ba74ddd793c3d 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -659,7 +659,7 @@ config CHARGER_RT9455 config CHARGER_CROS_USBPD tristate "ChromeOS EC based USBPD charger" - depends on CROS_EC + depends on CROS_USBPD_NOTIFY default n help Say Y here to enable ChromeOS EC based USBPD charger diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c index 6cc7c3910e098..7eea080048f43 100644 --- a/drivers/power/supply/cros_usbpd-charger.c +++ b/drivers/power/supply/cros_usbpd-charger.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -524,32 +525,21 @@ static int cros_usbpd_charger_property_is_writeable(struct power_supply *psy, } static int cros_usbpd_charger_ec_event(struct notifier_block *nb, - unsigned long queued_during_suspend, + unsigned long host_event, void *_notify) { - struct cros_ec_device *ec_device; - struct charger_data *charger; - u32 host_event; + struct charger_data *charger = container_of(nb, struct charger_data, + notifier); - charger = container_of(nb, struct charger_data, notifier); - ec_device = charger->ec_device; - - host_event = cros_ec_get_host_event(ec_device); - if (host_event & EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)) { - cros_usbpd_charger_power_changed(charger->ports[0]->psy); - return NOTIFY_OK; - } else { - return NOTIFY_DONE; - } + cros_usbpd_charger_power_changed(charger->ports[0]->psy); + return NOTIFY_OK; } static void cros_usbpd_charger_unregister_notifier(void *data) { struct charger_data *charger = data; - struct cros_ec_device *ec_device = charger->ec_device; - blocking_notifier_chain_unregister(&ec_device->event_notifier, - &charger->notifier); + cros_usbpd_unregister_notify(&charger->notifier); } static int cros_usbpd_charger_probe(struct platform_device *pd) @@ -683,21 +673,17 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) goto fail; } - if (ec_device->mkbp_event_supported) { - /* Get PD events from the EC */ - charger->notifier.notifier_call = cros_usbpd_charger_ec_event; - ret = blocking_notifier_chain_register( - &ec_device->event_notifier, - &charger->notifier); - if (ret < 0) { - dev_warn(dev, "failed to register notifier\n"); - } else { - ret = devm_add_action_or_reset(dev, - cros_usbpd_charger_unregister_notifier, - charger); - if (ret < 0) - goto fail; - } + /* Get PD events from the EC */ + charger->notifier.notifier_call = cros_usbpd_charger_ec_event; + ret = cros_usbpd_register_notify(&charger->notifier); + if (ret < 0) { + dev_warn(dev, "failed to register notifier\n"); + } else { + ret = devm_add_action_or_reset(dev, + cros_usbpd_charger_unregister_notifier, + charger); + if (ret < 0) + goto fail; } return 0;