From patchwork Wed Apr 16 00:02:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 881944 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B12A18C02E for ; Wed, 16 Apr 2025 00:02:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744761741; cv=none; b=EU4fKKR+iO9jUdNlgNSS21sCOKfBSJCohv6zo6oYBJKtD9ShV0Am37rVCeDd3yqqvUk6zxuVszYOXiKk6cQ5plfJ9nQWKJYc+KAn7SoPYlxF75HIF+fsfYEE73G5YtnAbPa4OJTv4ti41x+kWqPcqVj7C33bkrt5m3/OZJ20zCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744761741; c=relaxed/simple; bh=GwnkAZU+uW9fAkCDWWme3oB1O6PxoBs+pYMPoHkdFMQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VdkcApHlqiuPQ0NnQZpGmubM5OtkWLrWjEGjflLc1mpxRCdREM6h4N+Ey2lN7fdEIzgvNvU2++eWOemTj85ch/ekoW+3+DuHVDAbGw3uO20GjC1BDGIw4lkQ5lY+ngg5wskbfzO8HJj1LYrxh9PL5/eUbqM4pfpYziuE2jpfi40= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=jDxg0ZmW; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jDxg0ZmW" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2254e0b4b79so84045105ad.2 for ; Tue, 15 Apr 2025 17:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1744761737; x=1745366537; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pLpTjFW7p6ghiYRblP02dy0kbs1t/nRG9KfdA64BMng=; b=jDxg0ZmWXkY7/crCU4dh2s0ImdvGa3j7mKy8npK2BmZp6SxxErN+YJw5TL8PoSxTc6 9G5uulvzJU1bR9eFHsBjgU2rEnJAtHWJb+7b+QmwwZqZ0JTBhAlU/34sZDLC6DnJjlNo J3DrfSpyMsN9ZDzq2VZpjr4riVdV+FqZlWbLQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744761737; x=1745366537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pLpTjFW7p6ghiYRblP02dy0kbs1t/nRG9KfdA64BMng=; b=HrjGdH0kv7yKZ6V+K7S25cq6+sQ+VeMaumpioTl8Z7R0ldajP5wpvKecmc2v5miZBP jNiJQT6y1qCkZ5O6glDZ2aU+EpSAivQXx8Mep8xiL4XDwdfrw9Bjo/3d+FYEEPcXkkiD kmVwLMIMZlZEb8cFDfeIiW+uACkC4eV7/Qxna0KIkmwe7m64E1Y5vbqSmeO3KGrHuxVi UKirxZJthI9MH++CT2vzg8PxYu+EyZPPB1I65/e9ATkwbk8EZOZG/VUhZy2nCFQWLY+e R+6JxF7krxGWFOcNvte1bsKyphtf9RyC93PjIGaHTcQ6nsLUGgooaED5J4+j9ZIaMCjP ptmw== X-Forwarded-Encrypted: i=1; AJvYcCWdXgHkQDD6ttkoTto3jkDTHaPqgXSiOEeJ61v4kHMB35hJTOjYaiwqUt1l97olHM8QVirsZiss8ZXfrsrJ@vger.kernel.org X-Gm-Message-State: AOJu0YxRbOQqdOjx1+L4UQeuoLwJrVmX7sOWYU16x23QES6cpxgXHKhB WRYEKAk8VO+a0ZGnyzVYd8QWVbb61/3hxpqS58AI2hVMtmXVCSoxyaTpAhtMwQ== X-Gm-Gg: ASbGncu/+0CO4+gYZ7XnYTjnkwxOZTGeSQ9RQG8KMC+olYyjqo5NeoKmqBpA8WQfGh8 cKHKLKfu7HV8NDoLGITaz899vjR2DpyfQZAGVXdHOQPleT7OwvlkQBr6NjWLE4jjXipdHEcTKlm SnfP00yRG1etZ5PDDozz/HIHym2/RP9jNxC6XnGNQcat8/N39HZpBOrOiSLOucuJL99DfQXWlFr 7Mnh2DQwOjez6LsyX5JxXPc2bMc3XgnFYrNUGKNfDw79o+5EPYJZImb/vzVT4TIhL2iTlkL+556 RIjYN5x3LIUauDwyEp68n3DPkPs1Y69u4mHnRfzLOgILozD955WqN6FC0fERbg+4jkIqqElYckR wxQ== X-Google-Smtp-Source: AGHT+IFgDSfSzHJQGblYKtBgX+uGjROsnXUma1oaTnVLcJEUU+QM71Xipmk/uC+evcJTJfTYjoWWzQ== X-Received: by 2002:a17:902:d585:b0:223:536d:f67b with SMTP id d9443c01a7336-22c31a86b22mr19203715ad.38.1744761736701; Tue, 15 Apr 2025 17:02:16 -0700 (PDT) Received: from localhost (199.24.125.34.bc.googleusercontent.com. [34.125.24.199]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-308613b3849sm196331a91.38.2025.04.15.17.02.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Apr 2025 17:02:16 -0700 (PDT) From: Stephen Boyd To: Tzung-Bi Shih Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, Bjorn Andersson , Konrad Dybcio , devicetree@vger.kernel.org, Dmitry Baryshkov , Krzysztof Kozlowski , Rob Herring , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Conor Dooley , Benson Leung , chrome-platform@lists.linux.dev, Pin-yen Lin , Abhishek Pandit-Subedi , =?utf-8?q?=C5=81ukasz?= =?utf-8?q?_Bartosik?= , Jameson Thies , Andrei Kuchynski Subject: [PATCH 3/7] platform/chrome: cros_ec_typec: Support EC mode entry Date: Tue, 15 Apr 2025 17:02:03 -0700 Message-ID: <20250416000208.3568635-4-swboyd@chromium.org> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog In-Reply-To: <20250416000208.3568635-1-swboyd@chromium.org> References: <20250416000208.3568635-1-swboyd@chromium.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Support ChromeOS EC firmwares that don't support AP mode entry. Check that the mode has been entered by querying the EC and reject mode entry attempts if the EC hasn't already entered the mode requested. This allows us to bind the DP altmode driver on devices that don't support AP mode entry, i.e. most ChromeOS devices where the EC controls mode entry. Cc: Benson Leung Cc: Tzung-Bi Shih Cc: Cc: Pin-yen Lin Cc: Abhishek Pandit-Subedi Cc: Łukasz Bartosik Cc: Jameson Thies Cc: Andrei Kuchynski Signed-off-by: Stephen Boyd --- drivers/platform/chrome/cros_typec_altmode.c | 112 +++++++++++++------ 1 file changed, 75 insertions(+), 37 deletions(-) diff --git a/drivers/platform/chrome/cros_typec_altmode.c b/drivers/platform/chrome/cros_typec_altmode.c index c2d9c548b5e8..97ca4cfabbc0 100644 --- a/drivers/platform/chrome/cros_typec_altmode.c +++ b/drivers/platform/chrome/cros_typec_altmode.c @@ -58,31 +58,50 @@ static void cros_typec_altmode_work(struct work_struct *work) static int cros_typec_altmode_enter(struct typec_altmode *alt, u32 *vdo) { struct cros_typec_altmode_data *adata = typec_altmode_get_drvdata(alt); - struct ec_params_typec_control req = { - .port = adata->port->port_num, - .command = TYPEC_CONTROL_COMMAND_ENTER_MODE, - }; + struct cros_ec_device *ec = adata->port->typec_data->ec; + unsigned int port = adata->port->port_num; int svdm_version; int ret; if (!adata->ap_mode_entry) { - dev_warn(&alt->dev, - "EC does not support AP driven mode entry\n"); - return -EOPNOTSUPP; + struct ec_response_usb_pd_mux_info resp; + struct ec_params_usb_pd_mux_info req = { + .port = port, + }; + uint8_t flags; + + if (adata->sid == USB_TYPEC_DP_SID) + flags = USB_PD_MUX_DP_ENABLED; + else if (adata->sid == USB_TYPEC_TBT_SID) + flags = USB_PD_MUX_TBT_COMPAT_ENABLED; + else + return -EOPNOTSUPP; + + ret = cros_ec_cmd(ec, 0, EC_CMD_USB_PD_MUX_INFO, + &req, sizeof(req), &resp, sizeof(resp)); + if (ret < 0) + return ret; + + if (!(resp.flags & flags)) + return -EINVAL; + } else { + struct ec_params_typec_control req = { + .port = port, + .command = TYPEC_CONTROL_COMMAND_ENTER_MODE, + }; + + if (adata->sid == USB_TYPEC_DP_SID) + req.mode_to_enter = CROS_EC_ALTMODE_DP; + else if (adata->sid == USB_TYPEC_TBT_SID) + req.mode_to_enter = CROS_EC_ALTMODE_TBT; + else + return -EOPNOTSUPP; + + ret = cros_ec_cmd(ec, 0, EC_CMD_TYPEC_CONTROL, &req, sizeof(req), NULL, 0); + if (ret < 0) + return ret; } - if (adata->sid == USB_TYPEC_DP_SID) - req.mode_to_enter = CROS_EC_ALTMODE_DP; - else if (adata->sid == USB_TYPEC_TBT_SID) - req.mode_to_enter = CROS_EC_ALTMODE_TBT; - else - return -EOPNOTSUPP; - - ret = cros_ec_cmd(adata->port->typec_data->ec, 0, EC_CMD_TYPEC_CONTROL, - &req, sizeof(req), NULL, 0); - if (ret < 0) - return ret; - svdm_version = typec_altmode_get_svdm_version(alt); if (svdm_version < 0) return svdm_version; @@ -97,31 +116,52 @@ static int cros_typec_altmode_enter(struct typec_altmode *alt, u32 *vdo) schedule_work(&adata->work); mutex_unlock(&adata->lock); - return ret; + + return 0; } static int cros_typec_altmode_exit(struct typec_altmode *alt) { struct cros_typec_altmode_data *adata = typec_altmode_get_drvdata(alt); - struct ec_params_typec_control req = { - .port = adata->port->port_num, - .command = TYPEC_CONTROL_COMMAND_EXIT_MODES, - }; + struct cros_ec_device *ec = adata->port->typec_data->ec; + unsigned int port = adata->port->port_num; int svdm_version; int ret; if (!adata->ap_mode_entry) { - dev_warn(&alt->dev, - "EC does not support AP driven mode exit\n"); - return -EOPNOTSUPP; + struct ec_response_usb_pd_mux_info resp; + struct ec_params_usb_pd_mux_info req = { + .port = port, + }; + uint8_t flags; + + if (adata->sid == USB_TYPEC_DP_SID) + flags = USB_PD_MUX_DP_ENABLED; + else if (adata->sid == USB_TYPEC_TBT_SID) + flags = USB_PD_MUX_TBT_COMPAT_ENABLED; + else + return -EOPNOTSUPP; + + ret = cros_ec_cmd(ec, 0, EC_CMD_USB_PD_MUX_INFO, + &req, sizeof(req), &resp, sizeof(resp)); + if (ret < 0) + return ret; + + if (resp.flags & flags) + return -EINVAL; + } else { + struct ec_params_typec_control req = { + .port = port, + .command = TYPEC_CONTROL_COMMAND_EXIT_MODES, + }; + + ret = cros_ec_cmd(adata->port->typec_data->ec, 0, EC_CMD_TYPEC_CONTROL, + &req, sizeof(req), NULL, 0); + + if (ret < 0) + return ret; } - ret = cros_ec_cmd(adata->port->typec_data->ec, 0, EC_CMD_TYPEC_CONTROL, - &req, sizeof(req), NULL, 0); - - if (ret < 0) - return ret; - svdm_version = typec_altmode_get_svdm_version(alt); if (svdm_version < 0) return svdm_version; @@ -136,7 +176,8 @@ static int cros_typec_altmode_exit(struct typec_altmode *alt) schedule_work(&adata->work); mutex_unlock(&adata->lock); - return ret; + + return 0; } static int cros_typec_displayport_vdm(struct typec_altmode *alt, u32 header, @@ -254,9 +295,6 @@ static int cros_typec_altmode_vdm(struct typec_altmode *alt, u32 header, { struct cros_typec_altmode_data *adata = typec_altmode_get_drvdata(alt); - if (!adata->ap_mode_entry) - return -EOPNOTSUPP; - if (adata->sid == USB_TYPEC_DP_SID) return cros_typec_displayport_vdm(alt, header, data, count);