Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2192689rwb; Mon, 15 Aug 2022 00:04:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR4KOGozVN818SFqNJ6RS3sDVH2eWIzrjlz2xeUAfzBxf/K+a2CvQj+exDQwuPgimxC99WPV X-Received: by 2002:a05:6a00:1581:b0:52f:a5bb:b9a0 with SMTP id u1-20020a056a00158100b0052fa5bbb9a0mr15606975pfk.80.1660547043954; Mon, 15 Aug 2022 00:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660547043; cv=none; d=google.com; s=arc-20160816; b=pabUwCeod47mK8JfAr7hWCk8i3Eyw8OBFSDcAwrmzap1nUFdsDqD7NRA5LBmW0sSWi qdelJQPCnCdub+AwwYoZSVTs7jTUz3CjRFWOEZ6e3Hv7wCSxednT2tiAa1SWa6Sqi155 Xo833AxTRV+p55dqQvBr2ZmA5+NS6OMblV0+PRIg3NsaEFDyIZoZiyVqlvVBM+yTBRsF ZfqxGKrSA/RZq7i11Gj65Znx+F4ln55MvlnmHIyUVQt9UDOHcd0kUfmt9L/YqbsJfKeN s0VDhfgN1o0b5Hew6mCrL5OzaHSYGsk05BbtUWS+86BxIpHYYdEWt1QXHtFBMoDGzc7F zYyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DmjHhmRYRQK+znnXE5rwgH9w/NTCsFJdGvq/FsVg4CY=; b=SESGnIUh4AQ8eYCRNd4YoRGBQNpyG/atN0PNH8cPsgUOaXqmtNcUJ5vb/7+QVm0s+m F+DWzsxsuT9Id5aS9kVbaW0MUNxMfWI5+G3wGt7ZSm1Jr4IqkpFuaPQ7zuvAjqO8xijh +lP2W9f5GUXrOzYc58rVG5gdxaX/Kt9NhtJPs4dVqavCMjY9RwyPRfTg2vgQ7uQ396df 83O7U1KzBi8pkN5XY53H8kDt4zpiWLHhrtj56GRldFKr2LgLtlCVXKrWc8Ejvk7EfBkm uj8CERFbqiVoeT/tTqGuNhSR1LGvtFeVHdmnxRLI/Dk4ScsPjBZwswGapnEqJ3gD+1oH v/vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=D7yaJFBW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y31-20020a056a00181f00b0051899760d88si10337904pfa.9.2022.08.15.00.03.53; Mon, 15 Aug 2022 00:04:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=D7yaJFBW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231858AbiHOGl4 (ORCPT + 99 others); Mon, 15 Aug 2022 02:41:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229887AbiHOGly (ORCPT ); Mon, 15 Aug 2022 02:41:54 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4DD11AD95 for ; Sun, 14 Aug 2022 23:41:53 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id o5-20020a17090a3d4500b001ef76490983so6008315pjf.2 for ; Sun, 14 Aug 2022 23:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=DmjHhmRYRQK+znnXE5rwgH9w/NTCsFJdGvq/FsVg4CY=; b=D7yaJFBWtQefZHhd2ltWvHiYWaMGjLKMMDACtsG3+unG6sLpKHAF+q5A8NbJAYQ3Fo xTf3B3Q6gY6SiF/AGBYDEC2Vm7oqyD1Twfu0MxQemY0MUJPIiYcarJlE+naRRXxxWEap tvTiqt/AaQWfiKCibzqsDq6Fq6GOcwLCNlcuI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=DmjHhmRYRQK+znnXE5rwgH9w/NTCsFJdGvq/FsVg4CY=; b=WTMYDxQjn1Y3SixE7byIpVlFaCeyrbhitWBM57Iz+MPvV2lPKpy/lRlyNugsvdcDin hGUbIG/ocMzwAqW4HcWRn0eImsPQ3/Ab0LWiDvoZ6Z1goW3/uCoHTHW6yPVNQPsRdD3p Alr5F+o+Z/Hkci2KlwOwQT/Lslw98v4CSxEtEcAu+iBJUmMJNX8fikQGEaoxZ08k3Mcj 6oO3EmhzB63HpL5e8tv7t7LJBFhtmiKELvVWNyrEvl4bjajKirpQQiO8e69LihxKjMcg cf0EJ/HerxKXKZaTH96br+cFm4tVsBWL0PRIfGv+I5zIcEhYahOJu0DDYNezBUuDrKeQ hNOg== X-Gm-Message-State: ACgBeo07odKQNPjff6TPwJlHr0VGRaaCzZGekaptpUdtMaIBW1rf5hpb ieh7ZSvRbCs94At6DwDOi+MRzMU6WtbrEw== X-Received: by 2002:a17:90b:164d:b0:1f6:a38b:91e9 with SMTP id il13-20020a17090b164d00b001f6a38b91e9mr17004297pjb.211.1660545712941; Sun, 14 Aug 2022 23:41:52 -0700 (PDT) Received: from pmalani.c.googlers.com.com (137.22.168.34.bc.googleusercontent.com. [34.168.22.137]) by smtp.gmail.com with ESMTPSA id 200-20020a6214d1000000b0052db82ad8b2sm5988233pfu.123.2022.08.14.23.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:41:52 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Tinghan Shen , Tzung-Bi Shih , Xiang wangx Subject: [PATCH v5 3/7] platform/chrome: cros_typec_switch: Set EC retimer Date: Mon, 15 Aug 2022 06:34:21 +0000 Message-Id: <20220815063555.1384505-4-pmalani@chromium.org> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog In-Reply-To: <20220815063555.1384505-1-pmalani@chromium.org> References: <20220815063555.1384505-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Invoke Chrome EC host commands to set EC-controlled retimer switches to the state the Type-C framework instructs. Signed-off-by: Prashant Malani --- Changes since v4: - Update cros_ec_command() to cros_ec_cmd(). Changes since v3: - No changes. Changes since v2: - No changes. Changes since v1: - No changes. drivers/platform/chrome/cros_typec_switch.c | 56 ++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform/chrome/cros_typec_switch.c index 0d319e315d57..befe35655a9a 100644 --- a/drivers/platform/chrome/cros_typec_switch.c +++ b/drivers/platform/chrome/cros_typec_switch.c @@ -9,7 +9,10 @@ #include #include #include +#include #include +#include +#include #include #define DRV_NAME "cros-typec-switch" @@ -28,9 +31,60 @@ struct cros_typec_switch_data { struct cros_typec_port *ports[EC_USB_PD_MAX_PORTS]; }; +static int cros_typec_cmd_mux_set(struct cros_typec_switch_data *sdata, int port_num, u8 index, + u8 state) +{ + struct typec_usb_mux_set params = { + .mux_index = index, + .mux_flags = state, + }; + + struct ec_params_typec_control req = { + .port = port_num, + .command = TYPEC_CONTROL_COMMAND_USB_MUX_SET, + .mux_params = params, + }; + + return cros_ec_cmd(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req, + sizeof(req), NULL, 0); +} + +static int cros_typec_get_mux_state(unsigned long mode, struct typec_altmode *alt) +{ + int ret = -EOPNOTSUPP; + + if (mode == TYPEC_STATE_SAFE) + ret = USB_PD_MUX_SAFE_MODE; + else if (mode == TYPEC_STATE_USB) + ret = USB_PD_MUX_USB_ENABLED; + else if (alt && alt->svid == USB_TYPEC_DP_SID) + ret = USB_PD_MUX_DP_ENABLED; + + return ret; +} + +/* + * The Chrome EC treats both mode-switches and retimers as "muxes" for the purposes of the + * host command API. This common function configures and verifies the retimer/mode-switch + * according to the provided setting. + */ +static int cros_typec_configure_mux(struct cros_typec_switch_data *sdata, int port_num, int index, + unsigned long mode, struct typec_altmode *alt) +{ + int ret = cros_typec_get_mux_state(mode, alt); + + if (ret < 0) + return ret; + + return cros_typec_cmd_mux_set(sdata, port_num, index, (u8)ret); +} + static int cros_typec_retimer_set(struct typec_retimer *retimer, struct typec_retimer_state *state) { - return 0; + struct cros_typec_port *port = typec_retimer_get_drvdata(retimer); + + /* Retimers have index 1. */ + return cros_typec_configure_mux(port->sdata, port->port_num, 1, state->mode, state->alt); } static void cros_typec_unregister_switches(struct cros_typec_switch_data *sdata) -- 2.37.1.595.g718a3a8f04-goog