From nobody Sat Apr 11 04:02:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20B54C25B0E for ; Tue, 16 Aug 2022 21:51:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237782AbiHPVvE (ORCPT ); Tue, 16 Aug 2022 17:51:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237719AbiHPVvC (ORCPT ); Tue, 16 Aug 2022 17:51:02 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 949B08D3ED for ; Tue, 16 Aug 2022 14:51:01 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id d16so10377342pll.11 for ; Tue, 16 Aug 2022 14:51:01 -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=tjMBMSeLf47Dl9twMgr77h09YFRDoxykrXGPZHBAccY=; b=MbZdnqhDu3qlh1Cy6jJRu1PFT0mgvRF/UzbWWvdiCnSbqwBAcPduwys9Yt977aNLAR t8FY7+27CjCn906Nnnt+DEXHYIYioH9+Wq0L54MGDpk95ih6PHETpfmhZ5dSi40pxART 3QauOv9pmCCfcr6Gv1gtFLfjKqgKt46BW9VkY= 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=tjMBMSeLf47Dl9twMgr77h09YFRDoxykrXGPZHBAccY=; b=6sa5t5vVc8jT3fXnfu9YXw2PjiaXBz6Tpkw2gWfro2i7mb+i/Yj5Gi/i9xWc1OZqX/ Z2HJ06UC4RNaUkI4Hd56Txrk5xvlhm34aaTGcsMC784Y4myDmcg/FWJaqcO8Ma+W5uku tz1v4nwL9Ju6/EcItEVFnl1oxf3ddACovSxwOkSorjFhFM4imONTVhoNlGtUy0PXJest Ct1WXW8gp53NBC6zQfEn6rj8sRKa4YN+6IlHFWpdNFQ/o5PQAP7OZs959ky3w8eQl2rq +LkcAKD7fafqEk57bEdQDhLyR4BShFwQ+pIuZnYBhx5l5apQ6bJyWqfdJmFVMqdgaokI vqjQ== X-Gm-Message-State: ACgBeo2Oiq5VJJ7vbkNQEXyE4m96PE+kIxMN85t9CjbogycEjJzJNvk+ v9e6tbYZacUuIRuTxwMojK7gnDpNlKY65Q== X-Google-Smtp-Source: AA6agR4vBYgz2zHsn0+x4VIXE126q6rD9Mi4i/Y2ISPSXNn4+YYi9wPEDAkrdZ0LoEcwyduFjRNWgQ== X-Received: by 2002:a17:90b:1bd0:b0:1f3:396f:9942 with SMTP id oa16-20020a17090b1bd000b001f3396f9942mr573956pjb.220.1660686660978; Tue, 16 Aug 2022 14:51:00 -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.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 14:51:00 -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 , Lee Jones , Tinghan Shen , Tzung-Bi Shih , Xiang wangx Subject: [PATCH v6 4/7] platform/chrome: cros_typec_switch: Add event check Date: Tue, 16 Aug 2022 21:48:32 +0000 Message-Id: <20220816214857.2088914-5-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: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The ChromeOS EC updates Type-C status events when mux set requests from the Application Processor (AP) are completed. Add a check to the flow of configuring muxes to look for this status done bit, so that the driver is aware that the mux set completed successfully or not. Signed-off-by: Prashant Malani Reviewed-by: Tzung-Bi Shih --- Changes since v5: - Change "Chrome OS" -> "ChromeOS". - Make cros_ec_cmd() invocation fit on 1 line. Changes since v4: - Update cros_ec_command() to cros_ec_cmd(). - Dropped unnecessary Reported-by tag (since this patch is not a bug fix). Changes since v3: - No changes. Changes since v2: - Fixed missing "static" identifier. Changes since v1: - No changes. drivers/platform/chrome/cros_typec_switch.c | 71 ++++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform= /chrome/cros_typec_switch.c index eae7d26416aa..dc84cdec8f7f 100644 --- a/drivers/platform/chrome/cros_typec_switch.c +++ b/drivers/platform/chrome/cros_typec_switch.c @@ -7,6 +7,8 @@ */ =20 #include +#include +#include #include #include #include @@ -60,6 +62,39 @@ static int cros_typec_get_mux_state(unsigned long mode, = struct typec_altmode *al return ret; } =20 +static int cros_typec_send_clear_event(struct cros_typec_switch_data *sdat= a, int port_num, + u32 events_mask) +{ + struct ec_params_typec_control req =3D { + .port =3D port_num, + .command =3D TYPEC_CONTROL_COMMAND_CLEAR_EVENTS, + .clear_events_mask =3D events_mask, + }; + + return cros_ec_cmd(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req, sizeof(req),= NULL, 0); +} + +static bool cros_typec_check_event(struct cros_typec_switch_data *sdata, i= nt port_num, u32 mask) +{ + struct ec_response_typec_status resp; + struct ec_params_typec_status req =3D { + .port =3D port_num, + }; + int ret; + + ret =3D cros_ec_cmd(sdata->ec, 0, EC_CMD_TYPEC_STATUS, &req, sizeof(req), + &resp, sizeof(resp)); + if (ret < 0) { + dev_warn(sdata->dev, "EC_CMD_TYPEC_STATUS failed for port: %d\n", port_n= um); + return false; + } + + if (resp.events & mask) + return true; + + return false; +} + /* * The ChromeOS EC treats both mode-switches and retimers as "muxes" for t= he purposes of the * host command API. This common function configures and verifies the reti= mer/mode-switch @@ -68,12 +103,44 @@ static int cros_typec_get_mux_state(unsigned long mode= , struct typec_altmode *al 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 =3D cros_typec_get_mux_state(mode, alt); + unsigned long end; + u32 event_mask; + u8 mux_state; + int ret; + + ret =3D cros_typec_get_mux_state(mode, alt); + if (ret < 0) + return ret; + mux_state =3D (u8)ret; + + /* Clear any old mux set done event. */ + if (index =3D=3D 0) + event_mask =3D PD_STATUS_EVENT_MUX_0_SET_DONE; + else + event_mask =3D PD_STATUS_EVENT_MUX_1_SET_DONE; =20 + ret =3D cros_typec_send_clear_event(sdata, port_num, event_mask); if (ret < 0) return ret; =20 - return cros_typec_cmd_mux_set(sdata, port_num, index, (u8)ret); + /* Send the set command. */ + ret =3D cros_typec_cmd_mux_set(sdata, port_num, index, mux_state); + if (ret < 0) + return ret; + + /* Check for the mux set done event. */ + end =3D jiffies + msecs_to_jiffies(1000); + do { + if (cros_typec_check_event(sdata, port_num, event_mask)) + return 0; + + usleep_range(500, 1000); + } while (time_before(jiffies, end)); + + dev_err(sdata->dev, "Timed out waiting for mux set done on index: %d, sta= te: %d\n", + index, mux_state); + + return -ETIMEDOUT; } =20 static int cros_typec_retimer_set(struct typec_retimer *retimer, struct ty= pec_retimer_state *state) --=20 2.37.1.595.g718a3a8f04-goog