From patchwork Thu Feb 29 01:53:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 208161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp121937dyb; Wed, 28 Feb 2024 17:53:56 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU4+UPUqNZZMXi7xYY+VDjiHyr1YCjyeHrHfnYkgMLGeD4/UmyIjy7xCW8h4xmGvNty+9htCNWoS9MVnLp28B/Q3Q94qg== X-Google-Smtp-Source: AGHT+IHdFuJ0GB/ZuMMBbS+Y1MZlmZgYUfPbN1CxbWzqh8mJqUFaK/Dikc3vwcVOxUvev6+iP459 X-Received: by 2002:a37:ef15:0:b0:787:fd08:1d0 with SMTP id j21-20020a37ef15000000b00787fd0801d0mr139132qkk.50.1709171636439; Wed, 28 Feb 2024 17:53:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709171636; cv=pass; d=google.com; s=arc-20160816; b=t8sVktFkLKXp/VULlYg6HHI+0Y0XFCpkx5YsWvM1pZlXHHMHjwfQI59r6P5JlTgHA/ TDcfkODx5Vpjr5+o3z8Ogm67mB1Fy6TzgB3EST5VYbNkUjYtt4qw4dEfye+Igp4he79P g/xsdphhWaYQXlxy3/ajl1BJ5z2oQZBbHs4gWW4gDIfApJKqGs8IC7mMA1ztp9t39rdD 3wtkxZMw6RdxkS14s2N18JDpBxDTU3RSNC52QsTPKHlPr0R4pUS7LP6T7+y0u+DfFmoy rTFD7u+Z/SDRI9NG243WQy+MLP/VcfMPSC7rDMQng0dgqCAu4tgRAG66zfc/o+QwcP40 zbPw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:dkim-signature; bh=N9kAHr6PseqJ6J9peq4yN8LHGuh8P9E7ag/V2tVJ+14=; fh=LX2shkHCVKsWjrvXeJyJW8lE2/GSqQ2U9gCYs4Wr+fY=; b=wgIwQMTbgIIYl61wzrgC5qUcKHQBgjBMiHtAKjnM1b4EvBOScPW1oYbievvv85KR6o 5v6Yl1FRgzoq/KqXqE0qfKudyyvdGNqdkwH2JBeF9tWlrxkpR0sXaHLkShYMu7R6UFIx AJek3svRFKP3XeJxh4y94modE+ur8cALLZMsc+2roVRJVq2PTu+vO+1nYjG4JSiHRw8W uCDTk4Pw+fupuNkROjfZGFbeY8+I7ax/EgYPBJxyTk0u2XS2VWJzIgDWIptuN6wWTbXh f/yES9MWAChkrxpb4YKkK79Jl6RYjNSRNMSJKdKyHGwjvD8qWlT+2czqoX8Mb6gxM2La dVOQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=hjotJDf0; arc=pass (i=1 spf=pass spfdomain=flex--jthies.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-86016-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86016-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id a24-20020a05620a103800b00787d7b956dasi440771qkk.510.2024.02.28.17.53.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 17:53:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86016-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=hjotJDf0; arc=pass (i=1 spf=pass spfdomain=flex--jthies.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-86016-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86016-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2C61A1C2186C for ; Thu, 29 Feb 2024 01:53:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4641B36AFE; Thu, 29 Feb 2024 01:53:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hjotJDf0" Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 649AC3611D for ; Thu, 29 Feb 2024 01:53:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709171618; cv=none; b=sJfDtZ3tmCiKwZt2xWQpkoH7wKSrW+KNvdPq+DtqSc0QSgjjG+eSV29ds2iT6mxsKD0/hfkS1y+EMwUaAd3WOCLAjAnOOA8jAdLoE/1+yT8VRxVLYzBdNp9LXL/ZnRvyN51hircYd1uX1Qog6WlW38ikYiRzSeV5r4x0+hWN5Zo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709171618; c=relaxed/simple; bh=zVkV9Lv4z6NJ5nKGNK4w+Ge1IZKAPYn8766k2zyh1V0=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=fJCwk7m+hAduzaZjfgVMZXzaM+b2lW+mlpes5NkyraYCN5lt3sbLQW7Q2e8dQZno0Kh7uWDpqG3iYMv1fC2uvgyNneD2fOeSLU5FtVl1ks84NJ4Hm8Uk8dbG50D/2PBnsx4hc0USUd7xyn6W5pQcPjmQk8gnMuL1sVa52C+yLxQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hjotJDf0; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-608ab197437so7513007b3.1 for ; Wed, 28 Feb 2024 17:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709171615; x=1709776415; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=N9kAHr6PseqJ6J9peq4yN8LHGuh8P9E7ag/V2tVJ+14=; b=hjotJDf09VE5MxyWUgN+PORlAxZc7ksIymqB4sC3avEqzEJ/fJcdgqLMimm4kL89tw uXtS90KEcpuXYE53vAm4Yplco3jCxtQ3la60Sw3etkYaoKao65wV1dH+9XoN0kIfG1JE 464IghqI4sC+LA51O0HmtJBKFMwJM7EzJiNt6J1xOahprayIWudk24SL/AarBIKQkkIN plw0YbSlekQ6RahCek2YikGkyNY+4H06GEBn7hdXEShSy8KC/EO1FclwnUhN1e2bFueq hpKzgZ0ViZ1EPvMkOC0UYt4Sf7sGUc1mKPlX+F9uhpIj5v5ESISKFSOsCLdqEbVu5N1U 3t0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709171615; x=1709776415; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=N9kAHr6PseqJ6J9peq4yN8LHGuh8P9E7ag/V2tVJ+14=; b=PNBvK+pYoMpOvOL7ibm8NcaCb97fNTPjykE3whOzFP9WrUI215PdwBWsEUASRYDGhl wHauBLwZyMGrCdAjrQ1PeWAcfYjT8nx5z5DOsI6gehRIloJVquaxoRf+42f0I2MARn+e Wg++9OIlN9kvo82HTpN88d+2VjehBUh/j797ca2W3oOg2/eTwBEoZKBUWnRoomk/Gv4I QhokZE+jfZZLUv47NveNlpwKjIJRo3mOEiELSmQdBHrA/3oNUKTYKwZdvHeu+vSaleUq jt/Cs3uIx1+GGEuGHcHQ87lmsQvKr8ON/3kt3pex3wPqf8jhMILue4u7WB0y7wNsOAEK jqaA== X-Forwarded-Encrypted: i=1; AJvYcCViUqg4tJ+4omRlS2//uIuRRpYINN+4KDwaGv9ReJAmgYh7k2kvubO/v14tb32hMDIi1qNUkPZUIX9iz7D7/bfTDMrEC1TouiqaPKiK X-Gm-Message-State: AOJu0YyvNrdbK/ogjHmpdNTjRY1SOE4n7EixB7R016Utinnto0tCKV0G YNi909jQci+zvV3aB7XcAbtRpWXBZlps3f6MgPZE+Fu+UEsLMqJ9I0rmQEVaIwZ7LOpTeiHbkRl SNw== X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a81:9849:0:b0:609:3c46:1889 with SMTP id p70-20020a819849000000b006093c461889mr189060ywg.7.1709171615446; Wed, 28 Feb 2024 17:53:35 -0800 (PST) Date: Thu, 29 Feb 2024 01:53:08 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.rc1.240.g4c46232300-goog Message-ID: <20240229015308.3669513-1-jthies@google.com> Subject: [PATCH v3 2/4] usb: typec: ucsi: Register cables based on GET_CABLE_PROPERTY From: Jameson Thies To: heikki.krogerus@linux.intel.com, linux-usb@vger.kernel.org Cc: jthies@google.com, pmalani@chromium.org, bleung@google.com, abhishekpandit@chromium.org, andersson@kernel.org, dmitry.baryshkov@linaro.org, fabrice.gasnier@foss.st.com, gregkh@linuxfoundation.org, hdegoede@redhat.com, neil.armstrong@linaro.org, rajaram.regupathy@intel.com, saranya.gopal@intel.com, linux-kernel@vger.kernel.org, Benson Leung X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792181934195900494 X-GMAIL-MSGID: 1792196358136417833 Register cables with the Type-C Connector Class in the UCSI driver based on the PPM response to GET_CABLE_PROPERTY. Registered cable properties include plug type, cable type and major revision. Reviewed-by: Benson Leung Reviewed-by: Prashant Malani Reviewed-by: Dmitry Baryshkov Reviewed-by: Heikki Krogerus Signed-off-by: Jameson Thies --- Expected cable properties populate the USB Type-C connector class sysfs paths: nospike-rev4 /sys/class/typec # ls port0-cable device identity plug_type port0-plug0 power subsystem type uevent usb_power_delivery_revision Changes in v3: - None. Changes in v2: - Shortened lines to within 80 characters. - Tested on usb-testing branch merged with chromeOS 6.8-rc2 kernel. drivers/usb/typec/ucsi/ucsi.c | 73 +++++++++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.h | 5 +++ 2 files changed, 78 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index ae105383e69e7..7c84687b5d1a3 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -734,6 +734,52 @@ static void ucsi_unregister_partner_pdos(struct ucsi_connector *con) con->partner_pd = NULL; } +static int ucsi_register_cable(struct ucsi_connector *con) +{ + struct typec_cable *cable; + struct typec_cable_desc desc = {}; + + switch (UCSI_CABLE_PROP_FLAG_PLUG_TYPE(con->cable_prop.flags)) { + case UCSI_CABLE_PROPERTY_PLUG_TYPE_A: + desc.type = USB_PLUG_TYPE_A; + break; + case UCSI_CABLE_PROPERTY_PLUG_TYPE_B: + desc.type = USB_PLUG_TYPE_B; + break; + case UCSI_CABLE_PROPERTY_PLUG_TYPE_C: + desc.type = USB_PLUG_TYPE_C; + break; + default: + desc.type = USB_PLUG_NONE; + break; + } + + desc.active = !!(UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE & + con->cable_prop.flags); + desc.pd_revision = UCSI_CABLE_PROP_FLAG_PD_MAJOR_REV_AS_BCD( + con->cable_prop.flags); + + cable = typec_register_cable(con->port, &desc); + if (IS_ERR(cable)) { + dev_err(con->ucsi->dev, + "con%d: failed to register cable (%ld)\n", con->num, + PTR_ERR(cable)); + return PTR_ERR(cable); + } + + con->cable = cable; + return 0; +} + +static void ucsi_unregister_cable(struct ucsi_connector *con) +{ + if (!con->cable) + return; + + typec_unregister_cable(con->cable); + con->cable = NULL; +} + static void ucsi_pwr_opmode_change(struct ucsi_connector *con) { switch (UCSI_CONSTAT_PWR_OPMODE(con->status.flags)) { @@ -807,6 +853,7 @@ static void ucsi_unregister_partner(struct ucsi_connector *con) typec_partner_set_usb_power_delivery(con->partner, NULL); ucsi_unregister_partner_pdos(con); ucsi_unregister_altmodes(con, UCSI_RECIPIENT_SOP); + ucsi_unregister_cable(con); typec_unregister_partner(con->partner); con->partner = NULL; } @@ -907,6 +954,30 @@ static int ucsi_check_connection(struct ucsi_connector *con) return 0; } +static int ucsi_check_cable(struct ucsi_connector *con) +{ + u64 command; + int ret; + + if (con->cable) + return 0; + + command = UCSI_GET_CABLE_PROPERTY | UCSI_CONNECTOR_NUMBER(con->num); + ret = ucsi_send_command(con->ucsi, command, &con->cable_prop, + sizeof(con->cable_prop)); + if (ret < 0) { + dev_err(con->ucsi->dev, "GET_CABLE_PROPERTY failed (%d)\n", + ret); + return ret; + } + + ret = ucsi_register_cable(con); + if (ret < 0) + return ret; + + return 0; +} + static void ucsi_handle_connector_change(struct work_struct *work) { struct ucsi_connector *con = container_of(work, struct ucsi_connector, @@ -948,6 +1019,7 @@ static void ucsi_handle_connector_change(struct work_struct *work) ucsi_register_partner(con); ucsi_partner_task(con, ucsi_check_connection, 1, HZ); ucsi_partner_task(con, ucsi_check_connector_capability, 1, HZ); + ucsi_partner_task(con, ucsi_check_cable, 1, HZ); if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) == UCSI_CONSTAT_PWR_OPMODE_PD) @@ -1346,6 +1418,7 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con) ucsi_register_partner(con); ucsi_pwr_opmode_change(con); ucsi_port_psy_changed(con); + ucsi_check_cable(con); } /* Only notify USB controller if partner supports USB data */ diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 469a2baf472e4..f0aabef0b7c64 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -265,6 +265,9 @@ struct ucsi_cable_property { #define UCSI_CABLE_PROPERTY_PLUG_TYPE_C 2 #define UCSI_CABLE_PROPERTY_PLUG_OTHER 3 #define UCSI_CABLE_PROP_FLAG_MODE_SUPPORT BIT(5) +#define UCSI_CABLE_PROP_FLAG_PD_MAJOR_REV(_f_) (((_f_) & GENMASK(7, 6)) >> 6) +#define UCSI_CABLE_PROP_FLAG_PD_MAJOR_REV_AS_BCD(_f_) \ + UCSI_SPEC_REVISION_TO_BCD(UCSI_CABLE_PROP_FLAG_PD_MAJOR_REV(_f_)) u8 latency; } __packed; @@ -400,6 +403,7 @@ struct ucsi_connector { struct typec_port *port; struct typec_partner *partner; + struct typec_cable *cable; struct typec_altmode *port_altmode[UCSI_MAX_ALTMODES]; struct typec_altmode *partner_altmode[UCSI_MAX_ALTMODES]; @@ -408,6 +412,7 @@ struct ucsi_connector { struct ucsi_connector_status status; struct ucsi_connector_capability cap; + struct ucsi_cable_property cable_prop; struct power_supply *psy; struct power_supply_desc psy_desc; u32 rdo;