Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp1039348ybh; Thu, 12 Mar 2020 16:03:45 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsuI8I6tBsi4FxTxCfUxeXLqpESxgnFDHFx3dDjOA4mJsNYuiwXPqegV0L25U+19vlxyqu8 X-Received: by 2002:a05:6830:1d7:: with SMTP id r23mr8317865ota.181.1584054225561; Thu, 12 Mar 2020 16:03:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584054225; cv=none; d=google.com; s=arc-20160816; b=vZKPKclrnJEhssNLL979aJzyg4rPM/D+tg3QD0pojW5zEPVgLduL5scCNX+HZ35I0+ SPkddGQCYmpn5BoX8p6z64Jiq4KcppfzCRgaVnPYCPUJPs2ZsDEVCMAM3Uclh+1hdQKd 8otqnpMWRJmGemTzEJ4mGevkWUC3D6ZV598BWaRwmqB89tPZVTj0Bn6brbJfwIvZRWXT VEY8ITVpMA05OkXW0X8uRQrucJFNkEgTrXxdVFM6s6ldHFTutP9GX5LN6MeoUTAxqXLl djniiqMiIUGsjQV+H9fGgrSjPQ77N0RTyWP6LrhSTsHouPs0DhX4ar8KNzcIeubi6ItY 2lxg== 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=8WpKzitjg6rSTUT38hPq41oC3amKiQy8wxho0fEwWGY=; b=cGqFrNkDaj3H/p5utOuliheDfGYFjQNUdGc1zUKoVihsR2FJ/MjN9uFzURMV1jrFOO HkA5p+LvfB+/FVutevQE1iBfEZfJ8DsvAeWl99EvLw4ohVFMh5YG+G7M0RZQT7Qm+bYN pqtd//MVtNg80PfBIQBaXUaeZDTktTunlNLd6W+g1Lpo+xV2dnzBmogGh4gvyq4kww10 0iHpyroStlHZFahOwgx2dfkOWnuzX4JqMjb6fdEHRl27FWxby838/zGSusNThJjT+374 mmtm5evBQT0At1T82JBRq/Pgi8zduedhgJTxKsPkiyC7Q8pmaZ+4XfVFViDmR+0ZReZS kGUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=R97j1htl; 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 d27si2612564otf.22.2020.03.12.16.03.30; Thu, 12 Mar 2020 16:03:45 -0700 (PDT) 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=R97j1htl; 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 S1726885AbgCLXBy (ORCPT + 99 others); Thu, 12 Mar 2020 19:01:54 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:46868 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726775AbgCLXBx (ORCPT ); Thu, 12 Mar 2020 19:01:53 -0400 Received: by mail-pf1-f194.google.com with SMTP id c19so3997563pfo.13 for ; Thu, 12 Mar 2020 16:01:52 -0700 (PDT) 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=8WpKzitjg6rSTUT38hPq41oC3amKiQy8wxho0fEwWGY=; b=R97j1htljXNf94rmI77mblgWb0p6DXaahYEeEfdOpHR2yDWuqF94S3zrbxQl55n2xD MMnJ5TCL8Uvaz57e2nElUKGijE8PzVYvSGD83UyybCuvW0f+3SZOTpA8JJ+MM/0RvKZO SQmnuMsehKNfJkoAZtcL4EuY5jhSwfv/NDRBQ= 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=8WpKzitjg6rSTUT38hPq41oC3amKiQy8wxho0fEwWGY=; b=eOwhAbnkX0fQ7zteOMovJJZZfRNL96dEdOeeFhG/p2HwRod9gQotieRC5f5r+OCZRJ PDOP0al38Tgqsbarf5ueRDOWoGYBKUDj+MLnv6AwnygndWiJQkNcHUSHjEe5tam7bGlm Jz5KN+kgxVflDkYuAyptSGQj/CHq1fNnuDF7N2EhWo4D3Pim7A/ZKJmLdrFbLjKZtG1r 1sfZ/YrbBgBO+EGIPnR/V/eRpjwfdjc7iBv0jFzsbnjYguyLtOpfGx6I1aDcHs+mmLBQ GqBRHFlku/SZO5wkwo1wz24Tl+/2u2VeVvuttgX8qJT1Qyfsm/eClxiQAQsBDlgr63Xg CQ+Q== X-Gm-Message-State: ANhLgQ0D0Jeql8GfHPw/pm68nPeRpLSsDfATWpuj6HRBjAMw2aF1sD1G lAv32LedOHP2shA8ky16XIUNhWWFMQY= X-Received: by 2002:aa7:9538:: with SMTP id c24mr10768269pfp.14.1584054111485; Thu, 12 Mar 2020 16:01:51 -0700 (PDT) Received: from pmalani2.mtv.corp.google.com ([2620:15c:202:201:476b:691:abc3:38db]) by smtp.gmail.com with ESMTPSA id v123sm28763161pfb.85.2020.03.12.16.01.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 16:01:51 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org Cc: Prashant Malani , Benson Leung , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), Enric Balletbo i Serra , Guenter Roeck , Mark Rutland , Rob Herring Subject: [PATCH v4 2/4] platform/chrome: Add Type C connector class driver Date: Thu, 12 Mar 2020 15:57:14 -0700 Message-Id: <20200312225719.14753-3-pmalani@chromium.org> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog In-Reply-To: <20200312225719.14753-1-pmalani@chromium.org> References: <20200312225719.14753-1-pmalani@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 Add a driver to implement the Type C connector class for Chrome OS devices with ECs (Embedded Controllers). The driver relies on firmware device specifications for various port attributes. On ACPI platforms, this is specified using the logical device with HID GOOG0014. On DT platforms, this is specified using the DT node with compatible string "google,cros-ec-typec". The driver reads the device FW node and uses the port attributes to register the typec ports with the Type C connector class framework, but doesn't do much else. Subsequent patches will add more functionality to the driver, including obtaining current port information (polarity, vconn role, current power role etc.) after querying the EC. Signed-off-by: Prashant Malani --- Changes in v4: - Added Reviewed-by tag from previous review cycle - Added code to store port caps within the Cros EC type C data structure - Added code to use “reg” to get the port-number in DT platforms. Changes in v3: - Fixed minor spacing nits, and moved a modification to probe() if check from later patch to here instead. Changes in v2: - Updated Kconfig to default to MFD_CROS_EC_DEV. - Fixed code comments. - Moved get_num_ports() code into probe(). - Added module author. drivers/platform/chrome/Kconfig | 11 ++ drivers/platform/chrome/Makefile | 1 + drivers/platform/chrome/cros_ec_typec.c | 238 ++++++++++++++++++++++++ 3 files changed, 250 insertions(+) create mode 100644 drivers/platform/chrome/cros_ec_typec.c diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig index 5f57282a28da0..2320a4f0d9301 100644 --- a/drivers/platform/chrome/Kconfig +++ b/drivers/platform/chrome/Kconfig @@ -214,6 +214,17 @@ config CROS_EC_SYSFS To compile this driver as a module, choose M here: the module will be called cros_ec_sysfs. +config CROS_EC_TYPEC + tristate "ChromeOS EC Type-C Connector Control" + depends on MFD_CROS_EC_DEV && TYPEC + default MFD_CROS_EC_DEV + help + If you say Y here, you get support for accessing Type C connector + information from the Chrome OS EC. + + To compile this driver as a module, choose M here: the module will be + called cros_ec_typec. + config CROS_USBPD_LOGGER tristate "Logging driver for USB PD charger" depends on CHARGER_CROS_USBPD diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile index aacd5920d8a18..caf2a9cdb5e6d 100644 --- a/drivers/platform/chrome/Makefile +++ b/drivers/platform/chrome/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_CROS_EC_ISHTP) += cros_ec_ishtp.o obj-$(CONFIG_CROS_EC_RPMSG) += cros_ec_rpmsg.o obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_mec.o +obj-$(CONFIG_CROS_EC_TYPEC) += cros_ec_typec.o obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o obj-$(CONFIG_CROS_EC_PROTO) += cros_ec_proto.o cros_ec_trace.o obj-$(CONFIG_CROS_KBD_LED_BACKLIGHT) += cros_kbd_led_backlight.o diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c new file mode 100644 index 0000000000000..02e6d5cbbbf7a --- /dev/null +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -0,0 +1,238 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2020 Google LLC + * + * This driver provides the ability to view and manage Type C ports through the + * Chrome OS EC. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define DRV_NAME "cros-ec-typec" + +/* Platform-specific data for the Chrome OS EC Type C controller. */ +struct cros_typec_data { + struct device *dev; + struct cros_ec_device *ec; + int num_ports; + /* Array of ports, indexed by port number. */ + struct typec_port *ports[EC_USB_PD_MAX_PORTS]; + /* Initial capabilities for each port. */ + struct typec_capability *caps[EC_USB_PD_MAX_PORTS]; +}; + +static int cros_typec_parse_port_props(struct typec_capability *cap, + struct fwnode_handle *fwnode, + struct device *dev) +{ + const char *buf; + int ret; + + memset(cap, 0, sizeof(*cap)); + ret = fwnode_property_read_string(fwnode, "power-role", &buf); + if (ret) { + dev_err(dev, "power-role not found: %d\n", ret); + return ret; + } + + ret = typec_find_port_power_role(buf); + if (ret < 0) + return ret; + cap->type = ret; + + ret = fwnode_property_read_string(fwnode, "data-role", &buf); + if (ret) { + dev_err(dev, "data-role not found: %d\n", ret); + return ret; + } + + ret = typec_find_port_data_role(buf); + if (ret < 0) + return ret; + cap->data = ret; + + ret = fwnode_property_read_string(fwnode, "try-power-role", &buf); + if (ret) { + dev_err(dev, "try-power-role not found: %d\n", ret); + return ret; + } + + ret = typec_find_power_role(buf); + if (ret < 0) + return ret; + cap->prefer_role = ret; + + cap->fwnode = fwnode; + + return 0; +} + +static int cros_typec_init_ports(struct cros_typec_data *typec) +{ + struct device *dev = typec->dev; + struct typec_capability *cap; + struct fwnode_handle *fwnode; + const char *port_prop; + int ret; + int i; + int nports; + u32 port_num = 0; + + nports = device_get_child_node_count(dev); + if (nports == 0) { + dev_err(dev, "No port entries found.\n"); + return -ENODEV; + } + + if (nports > typec->num_ports) { + dev_err(dev, "More ports listed than can be supported.\n"); + return -EINVAL; + } + + /* DT uses "reg" to specify port number. */ + port_prop = dev->of_node ? "reg" : "port-number"; + device_for_each_child_node(dev, fwnode) { + if (fwnode_property_read_u32(fwnode, port_prop, &port_num)) { + ret = -EINVAL; + dev_err(dev, "No port-number for port, aborting.\n"); + goto unregister_ports; + } + + if (port_num >= typec->num_ports) { + dev_err(dev, "Invalid port number.\n"); + ret = -EINVAL; + goto unregister_ports; + } + + dev_dbg(dev, "Registering port %d\n", port_num); + + cap = devm_kzalloc(dev, sizeof(*cap), GFP_KERNEL); + if (!cap) { + ret = -ENOMEM; + goto unregister_ports; + } + + typec->caps[port_num] = cap; + + ret = cros_typec_parse_port_props(cap, fwnode, dev); + if (ret < 0) + goto unregister_ports; + + typec->ports[port_num] = typec_register_port(dev, cap); + if (IS_ERR(typec->ports[port_num])) { + dev_err(dev, "Failed to register port %d\n", port_num); + ret = PTR_ERR(typec->ports[port_num]); + goto unregister_ports; + } + } + + return 0; + +unregister_ports: + for (i = 0; i < typec->num_ports; i++) + typec_unregister_port(typec->ports[i]); + return ret; +} + +static int cros_typec_ec_command(struct cros_typec_data *typec, + unsigned int version, + unsigned int command, + void *outdata, + unsigned int outsize, + void *indata, + unsigned int insize) +{ + struct cros_ec_command *msg; + int ret; + + msg = kzalloc(sizeof(*msg) + max(outsize, insize), GFP_KERNEL); + if (!msg) + return -ENOMEM; + + msg->version = version; + msg->command = command; + msg->outsize = outsize; + msg->insize = insize; + + if (outsize) + memcpy(msg->data, outdata, outsize); + + ret = cros_ec_cmd_xfer_status(typec->ec, msg); + if (ret >= 0 && insize) + memcpy(indata, msg->data, insize); + + kfree(msg); + return ret; +} + +#ifdef CONFIG_ACPI +static const struct acpi_device_id cros_typec_acpi_id[] = { + { "GOOG0014", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, cros_typec_acpi_id); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id cros_typec_of_match[] = { + { .compatible = "google,cros-ec-typec", }, + {} +}; +MODULE_DEVICE_TABLE(of, cros_typec_of_match); +#endif + +static int cros_typec_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct cros_typec_data *typec; + struct ec_response_usb_pd_ports resp; + int ret; + + typec = devm_kzalloc(dev, sizeof(*typec), GFP_KERNEL); + if (!typec) + return -ENOMEM; + + typec->dev = dev; + typec->ec = dev_get_drvdata(pdev->dev.parent); + platform_set_drvdata(pdev, typec); + + ret = cros_typec_ec_command(typec, 0, EC_CMD_USB_PD_PORTS, NULL, 0, + &resp, sizeof(resp)); + if (ret < 0) + return ret; + + typec->num_ports = resp.num_ports; + if (typec->num_ports > EC_USB_PD_MAX_PORTS) { + dev_warn(typec->dev, + "Too many ports reported: %d, limiting to max: %d\n", + typec->num_ports, EC_USB_PD_MAX_PORTS); + typec->num_ports = EC_USB_PD_MAX_PORTS; + } + + ret = cros_typec_init_ports(typec); + if (ret < 0) + return ret; + + return 0; +} + +static struct platform_driver cros_typec_driver = { + .driver = { + .name = DRV_NAME, + .acpi_match_table = ACPI_PTR(cros_typec_acpi_id), + .of_match_table = of_match_ptr(cros_typec_of_match), + }, + .probe = cros_typec_probe, +}; + +module_platform_driver(cros_typec_driver); + +MODULE_AUTHOR("Prashant Malani "); +MODULE_DESCRIPTION("Chrome OS EC Type C control"); +MODULE_LICENSE("GPL"); -- 2.25.1.481.gfbce0eb801-goog