Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp2743163imw; Wed, 6 Jul 2022 10:58:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sIplnUueBvrq86vwQvMearc1eTD0Gf4gxRl2cmgu3qEXzNfvqQ88t8WUvR7r5Wj2bow/mJ X-Received: by 2002:a05:6402:1907:b0:435:c243:a66e with SMTP id e7-20020a056402190700b00435c243a66emr54895138edz.44.1657130323222; Wed, 06 Jul 2022 10:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657130323; cv=none; d=google.com; s=arc-20160816; b=fJN8Il3/IRDkVMvzEAvsWijTyPJF7Mugzkpoxo5VFqZAzzMipKd795uDQTII1BpRbK 8mXcCv3gH9NypbPqQPMU/TzBR3XueYrxcya4HQCv+JJiULacLaCWlqC8whJZN1t47q7M ICeJzSkdA2uRb9pLqD2azXXCn4bfEIsr5kgeXaVFztFHUp9AojC+8JdHCt4Jg6hrkLj8 vp4NBoE+3yymQu8aOCaUJ4gqAt/JQY5IIrncWNXcjXDbwpPE29SQzFWpdKV1HZbKijIX hC6t/W3GA98sB1sgzS1PQQMuhpV6VuB4pSmp5l4j5Ee68GDCkpycqPgihv1FIWMf7oXD gBlg== 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=iKsWwpzQXwEVWxC4hA16xAKXLByt31Hz+Z1LHyl6odk=; b=yZfw3kjrsi9VL2dmx+Vij0EJNQPbik2se+77awb3w111pMBqJfhtNGjurQoz+ZxtTG bZTeekkvyMvul21pU92vlb8oWEQ9cawdsxSeOWHm/ia3/7QgMvtTBZclu10fTLJNr31N OpDu8AwvWGkfPkpATZPLlQagUbUdieOHrWppaB2byhvNtZ4tHXwfaf4eB4Gcr8LDkl5+ 3nW97CuEhKRSoTj8gARODmrat1cXe38vr6nxouCpdKYFSzz/eu5kWXERyryNv6BE8rvv MRtKAdqOiu4CypLTUDYgaLmHbtqyq980b5qwZRGG3sUNFv2udjsjO0SU+AYvKgJrorVw RNLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=OA2MFIvZ; 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 dp20-20020a170906c15400b0072ab4b5ffdcsi17784408ejc.96.2022.07.06.10.58.11; Wed, 06 Jul 2022 10:58:43 -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=OA2MFIvZ; 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 S233777AbiGFRVe (ORCPT + 99 others); Wed, 6 Jul 2022 13:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233475AbiGFRVd (ORCPT ); Wed, 6 Jul 2022 13:21:33 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 078601EC65 for ; Wed, 6 Jul 2022 10:21:33 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id t5-20020a17090a6a0500b001ef965b262eso6138662pjj.5 for ; Wed, 06 Jul 2022 10:21:33 -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=iKsWwpzQXwEVWxC4hA16xAKXLByt31Hz+Z1LHyl6odk=; b=OA2MFIvZ3ACYya3+5sy4cjFvSgoFnng2goQPIEYeRwDtH8JbMlJzdbK2rGIXZuTyns toWUjNuf7ovSDhd9371LGJpkFN7zkve+RQOcxyC0wJZdkHZ3/VBTH3ZYlMt0UAEBOnUz Ebd3OMWvkMpTNeLLX6hnmBEVKpTcbqQ8Iyzlo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iKsWwpzQXwEVWxC4hA16xAKXLByt31Hz+Z1LHyl6odk=; b=P3sWnI5r5drmyUZCFm4gO0AS7m+KVyLWCa97Qu2RxbRwMu4+npCkObj8ZxJYITYNRh En7Udvcf4DZHVxGV/IeKRXN0Dc3P2AId6rLSid3NzKjDXkCCM35ngBrHj8VevMy8QSlI O6jAzRSz0QPchT+fIkyGAFyD7JX5H5pWLYKL/uEMp1/8HXenBjTxu5rj9W2Vt0MMYLJW rwW4GoiGP9LQT1lRK5xpu/vtCPnpFx+l1GvJykY70G85XE6FMUw3EzzzgaBaubfiLmT4 YgGKjs3QJJBiVVtvgV2NPGTwhDbajfTJ7jekCVwn2G90G9To9bg+CQEFlOKnywU3jNb6 HfHA== X-Gm-Message-State: AJIora/V67ZMybba2JGaWdanT01muBm8Qug9p9+z0PqxwqWhGTILfPJC Zvj2VhR7np6pazm5BUkZxGe3LgDLPcRIig== X-Received: by 2002:a17:903:2347:b0:16a:33cd:5308 with SMTP id c7-20020a170903234700b0016a33cd5308mr47348306plh.122.1657128092414; Wed, 06 Jul 2022 10:21:32 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:21:32 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 5/9] platform/chrome: cros_typec_switch: Set EC retimer Date: Wed, 6 Jul 2022 17:15:09 +0000 Message-Id: <20220706171601.807042-6-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.8 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 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 1a795f613543..9faa442dd81a 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,10 +31,61 @@ 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_command(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); } void cros_typec_unregister_switches(struct cros_typec_switch_data *sdata) -- 2.37.0.rc0.161.g10f37bed90-goog