Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp4128693rwb; Tue, 16 Aug 2022 15:16:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR7IoeLLLvZpK2YRWszje775sTOLs9llJc7ZeoZT/8nOdsWhljaMmJetCgI4US+oinS9INbR X-Received: by 2002:a17:90b:384e:b0:1f5:6330:8294 with SMTP id nl14-20020a17090b384e00b001f563308294mr701008pjb.35.1660688175110; Tue, 16 Aug 2022 15:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660688175; cv=none; d=google.com; s=arc-20160816; b=YSYEcCLPLVP/zUGXk79n3JmiQ3c48TlXbvj+MpSH0el3coSOTs4uHj9A2QFyp2JXQn dN6mgsSZojXbKewNQuLkAa4nrUcf8nZI9U2Oe2Z8YCorc3pT+nmrkKJbHQ4GhT2ij3Oy ju+C4vehSHbiRuPXFUWSwHcYWazlbUtmCet6igneRe+8zjQrHHHaWcavLcWeIbmW5AjC V07v+Rf4Bk0+P9CpN119dPDI7ZAZi8Rbe0FGnAc0LLFAHG+5MW0aXbVlgV1Jqcl0ckRP Sg9NzuOlbdXn+EMyweH06qlqr28soaKJRV+MnByIBu4bwR6a1l4sUXUzD8QKd6o6JPiL lxOQ== 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=r1II7vmAgVkCqHsiA8BbdVtUuQAByr0L3xNyWetJTpE=; b=O+azpRvKXisuzhq25dII8BWLmH4up5+KoLzs/EwMLRadnqvDgNdckVkgPHLmGm/hGf IUjoDWmem66KB+5GciOgb0x3Smh5a7uVEUOMUVdVqpK7D1fN4m2VLgGDRC7DbiOel+8l sBx25bAs/ipCzgeVCkfvUWZqZ84hyN8DLjBbHdTYZqhoyvR1zi0HSQHlpo4CYxBxPSlM AvHO3rHj62U8TtpTxIawI5hW9LPzoDZnIB32Pfq6ivF2akw1vlWUsMuDJAzqZ+W97ymL +ihNIjARG3mM1cqK5EXbp1FqTndfwRWRnhh/NlUR3uYKj5iXYCS8wAoBMYyyXj0x7J5N T85g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="O/ZBRTe6"; 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 f3-20020a631003000000b0041beb6e9d1csi14811824pgl.810.2022.08.16.15.16.03; Tue, 16 Aug 2022 15:16:15 -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="O/ZBRTe6"; 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 S237758AbiHPVub (ORCPT + 99 others); Tue, 16 Aug 2022 17:50:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237741AbiHPVu3 (ORCPT ); Tue, 16 Aug 2022 17:50:29 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AE098C035 for ; Tue, 16 Aug 2022 14:50:27 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id z187so10457122pfb.12 for ; Tue, 16 Aug 2022 14:50:27 -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=r1II7vmAgVkCqHsiA8BbdVtUuQAByr0L3xNyWetJTpE=; b=O/ZBRTe61u5Oz7sNvPyYI7TTaIrXsEwKKNX1bKqWr6ullalsDhs5kczIi2aRXGXbWS CxvtjReZwDe6fjYymP/vkSYHlIDmH8p+nH03bwye8IOcur/r7Dhb3U9VhAt4UuUuFK2j 6ZFmygU0Xsv7QCm7lhwa335fzKpScNBW1S1J4= 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=r1II7vmAgVkCqHsiA8BbdVtUuQAByr0L3xNyWetJTpE=; b=fpPGN+w2fAa1OooaqdhwdJLiYNr2POyn6CHbKnXRWUnHPHv2U8VJx2WhfInSnr9qnz 8BCIQNihbosfTL7Ex60SoIpZDu1ZPCzPiDfnkssooWF3D2ftZHQetEyxqKB9LFHJP4g/ wwnEW6u52ZN3D+SKMBUU3R2xBpKih2NDLeCy2OAlWbcvfwuugRrUTHq81kB+utD33b6L zzIAk89rZcDymYGI/VB6pPj9sG8YkTTw8C1J8F2nc+uG6RFizvY/cbr2Kt+zDQPDLTDb yNXJeo21982ZU2D+ztsMEcOmavAO+g06Qr7z3qU3VJlio717v4NRBwhOwqc1KLlp/Q/L xG9w== X-Gm-Message-State: ACgBeo3bJ3Ba3By5qlluWQLj7yPcIDPllL2hImOJnvPd6hMgrLAufZGB FBta2mbqUX2tLAt2hFRDWFvWm1Mb25DVEA== X-Received: by 2002:a63:6a41:0:b0:41c:86b0:596b with SMTP id f62-20020a636a41000000b0041c86b0596bmr19139791pgc.582.1660686626765; Tue, 16 Aug 2022 14:50:26 -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 z5-20020a623305000000b005323a1a9fecsm8916650pfz.101.2022.08.16.14.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 14:50:26 -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" , Kees Cook , Sebastian Reichel , Tinghan Shen , Tzung-Bi Shih , Xiang wangx Subject: [PATCH v6 3/7] platform/chrome: cros_typec_switch: Set EC retimer Date: Tue, 16 Aug 2022 21:48:31 +0000 Message-Id: <20220816214857.2088914-4-pmalani@chromium.org> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog In-Reply-To: <20220816214857.2088914-1-pmalani@chromium.org> References: <20220816214857.2088914-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 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 ChromeOS EC host commands to set EC-controlled retimer switches to the state the Type-C framework instructs. Signed-off-by: Prashant Malani --- Changes since v5: - Change "Chrome OS" -> "ChromeOS". - Change "Type C" -> "Type-C". - Inline mux_params struct initialization. - Make cros_ec_cmd() invocation fit on 1 line. 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 | 53 ++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform/chrome/cros_typec_switch.c index db773bf57899..eae7d26416aa 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,57 @@ 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 ec_params_typec_control req = { + .port = port_num, + .command = TYPEC_CONTROL_COMMAND_USB_MUX_SET, + .mux_params = { + .mux_index = index, + .mux_flags = state, + }, + }; + + 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 ChromeOS 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