From patchwork Wed Feb 28 22:03:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 208050 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:a1a:b0:17b:cd04:e0c6 with SMTP id 26csp220376rwa; Wed, 28 Feb 2024 14:04:58 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXBakvZO0icDD9nLaaqLoM8jdHXzydLnoG6fxOKUJVNnrmpqjCM4sAjDjD0iaJPYMnB1dkrVnFn6ZqhDx3UJ5KwVcWqhQ== X-Google-Smtp-Source: AGHT+IHkTk+0E8ExTHKk2a99yflKg0OFpyC2z0TyS1Y5Nm1jtMbh0aOhMXXDgnW6Cbh7+cJQEfTe X-Received: by 2002:a05:6a20:e607:b0:19e:9a75:7851 with SMTP id my7-20020a056a20e60700b0019e9a757851mr677215pzb.3.1709157898675; Wed, 28 Feb 2024 14:04:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709157898; cv=pass; d=google.com; s=arc-20160816; b=eyt4HLwFZXvDZkSNeaPjAECHouMLnwdfKrr9yhdVjOx+1sKH5/w4zt2wiZilvDXwDk wNC7ObmK3VGsPGLmOUJbX/RAZOa94vAJVAQsY9OVDvVCD1bT9aMr8uG1LvzwP573oWvf PiK8ZgHnFHiO5TpiukNNwNN1qKcxZAjgf3EkGwj8iWCXbSDgL3WrFaWAJqMSq4lZ+wbh hVqg8jT5BexirBf1Pnl33XzEsfSdvVAc52oQe8D9Nc/Yv4LhSdDkZgo6kQWfobtmfM1R qePtwi9mWoyEAgaII8rWh9+evrfMere3HR4S9XDeV4ZyZWgMiWI/RegmfgfsDgZwsDd0 eSBQ== 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=4CA4tg/c3dgG9UMrMK9e+dv6nPpGjSIEc2b658y+GNA=; fh=fMIHEctLmlBizITNa86vmqPLCQcYyeKeIaBOcCb3Y5c=; b=SQlzA76z74ihAS5AjSKqE5PLK/f/upk2a9oxCFgCMbieFqfhWVscYw+kl/9g55wWAK huFsyGexLYXb6dQzcjsmZq8VHzBVDEI1Nru5dyzg18O1/YRX6MXfedyb/uk1VPV62V5i oIIBGCPqcJ7NGTk70U4Pp4zXXurU4EdqAde/RutZZRfuv9PAgSZwVsrLVdajrdaGRUwr zsi9GmmirLdGpicO8oAmEAkwoF6WcJFSfrsMF6bnvvI/r/eH5mPwYOfepUzHdUPPt9Jk WKR4QEkxihk5ea29L/OIJ5GDoAufyUfNOiM49bImNvD8sPpkI1xw0uLKIlB76JHdXH5A 5FNw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=zpN+EVC2; 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-85769-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85769-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id p25-20020a639519000000b005e2b0672449si363341pgd.27.2024.02.28.14.04.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 14:04:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-85769-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=zpN+EVC2; 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-85769-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85769-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 7527A2861C9 for ; Wed, 28 Feb 2024 22:04:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CCF471361B1; Wed, 28 Feb 2024 22:04:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="zpN+EVC2" Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 DAEB271ED3 for ; Wed, 28 Feb 2024 22:03:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709157838; cv=none; b=Sve15wJEfhSw05+mdljYRjd5FoRoBmcP61m0aveXkkbiAIoDaPNiE31UoCvJGbys92+TCym/s6bvk7XcSKdFCDzKQQ/CxoqkscC/v2iTCDW92GKBClFwYXjaeBdt3yh8n8im3etzwzyXJmE/CbPW2JOPvIgoB4rIFcNqQRI0SjY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709157838; c=relaxed/simple; bh=Z/DkHcQWucfnp59Rztm+Uc4+DaWNClDgYlOSekDwPTQ=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=f9WyO/n0D1IgoJl8d7jdloeamBQJ68DSTaQstOqdLHx3lIPPtwF6npe9/pltFLEpJv/sFqpL9Kn3/sqpr6ywqHHG/qTFWSz/ifKxc6geUGywxmQBo5PpvXXHcISrkwPpqHOak7SmCjPzPK2OUJnkuRiLxgl4WL2tmaNInelRtT8= 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=zpN+EVC2; arc=none smtp.client-ip=209.85.128.202 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-f202.google.com with SMTP id 00721157ae682-608852fc324so3685607b3.2 for ; Wed, 28 Feb 2024 14:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709157836; x=1709762636; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=4CA4tg/c3dgG9UMrMK9e+dv6nPpGjSIEc2b658y+GNA=; b=zpN+EVC24EQZrjwmgNTLgae8Zkq27I+8j61fASCgvGS7TW4PCCZiFau8qG040J3bzl cvDDD46ZQBXBqPRq/xPMInh7D+4pboET7Rvv6r7w2LIERoWwKb0NTxtSGAyEZ8mgBzIJ s7BQbX/TVm6Mi+3OaZhpY7t9Hn2DCh62PP+/Dkl1C4Eh+D7BavjaHSsZKyq/P6a/aP4H +NR60LYjN6UI/JC3asFVSA2bC2QhB/cVojOeYOIgB8X5NRDfwICvD++C58v4+EdXYsnx KolRw2DlWR/hxOGQZD+f2QOgDGQcMFAWfjke684/6JHLNHfkOm80rCvTsaAlvx05TKiZ Sbug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709157836; x=1709762636; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4CA4tg/c3dgG9UMrMK9e+dv6nPpGjSIEc2b658y+GNA=; b=I6TvXU+kz1E3aXMVBxF7Mv73QibsJCXtxh5RrRbATjitXFUjCei2WdBlabOseTD1Aq m02rRbgNhBCCY58qP3uMiU4caZDIXaGM2RFtG4lCZwag3qq2fSP8DaEC1vtSnZUDzP53 LJ+ptFkjD+pvdjdxNjks1Cts0G+AkY2Q/eJBHisAUbKRurA5Lu17fL1HTIE7CT3N//NS 5bwsN9ave9MdyxA0JAIrMtq3wk5IhKSpCHh7NtSG/TLtSECoFG0UXOh1D0/RfBwcm/Po ONBP3LaQ4OA+5Ebbvv2t90SBr3ZI/nCmdg8V2gWjkA2yTFY6vizI9jBLZjvm7xp6IG3b b1tw== X-Forwarded-Encrypted: i=1; AJvYcCWqnr2H6UfEaRMmnh2Ib2McjmSO/Lx5wKT3KaWdx7mGAdCOCDMxZZYdooIVnXvDBqgCWLZL4JiCyOWrgkLe7ZcffYpgvt2dWOWgSoUf X-Gm-Message-State: AOJu0YzirecTZs3zloStOy4UgNMZNhmBSFhVaSFs6plQoCZYI/OdVYU5 wYoj/QSokqY9a1pkf+xhbkzrNzkSgS7gtxP7+OFqoP5tPAQFcA3itQ/KjXo0jCKTnMUKZcR+2k2 Ukw== X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a81:9858:0:b0:609:2faf:7dca with SMTP id p85-20020a819858000000b006092faf7dcamr71912ywg.8.1709157835923; Wed, 28 Feb 2024 14:03:55 -0800 (PST) Date: Wed, 28 Feb 2024 22:03:52 +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: <20240228220352.3614262-1-jthies@google.com> Subject: [PATCH v2 3/4] usb: typec: ucsi: Register SOP/SOP' Discover Identity Responses 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792181952600385397 X-GMAIL-MSGID: 1792181952600385397 Register SOP and SOP' Discover Identity responses with the USB Type-C Connector Class as partner and cable identities, respectively. Discover Identity responses are requested from the PPM using the GET_PD_MESSAGE UCSI command. Signed-off-by: Jameson Thies --- GET_PD_MESSAGE responses from the PPM populate partner and cable identity in sysfs: nospike-rev4 /sys/class/typec # ls port0-partner/identity/ cert_stat id_header product product_type_vdo1 product_type_vdo2 product_type_vdo3 nospike-rev4 /sys/class/typec # ls port0-cable/identity/ cert_stat id_header product product_type_vdo1 product_type_vdo2 product_type_vdo3 Changes in v2: - Re-ordered memset call and null assignment when unregistering partners and cables. - Supports registering partner and cable identity with UCSI versions before v2.0. - Shortened lines to within 80 characters with the exception of two error log lines with three indentations. - Tested on usb-testing branch merged with chromeOS 6.8-rc2 kernel. drivers/usb/typec/ucsi/ucsi.c | 125 ++++++++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.h | 29 ++++++++ 2 files changed, 154 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 7c84687b5d1a3..4088422b33c74 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -646,6 +646,121 @@ static int ucsi_get_src_pdos(struct ucsi_connector *con) return ret; } +static int ucsi_read_identity(struct ucsi_connector *con, u8 recipient, + struct usb_pd_identity *id) +{ + struct ucsi *ucsi = con->ucsi; + struct ucsi_pd_message_disc_id resp = {}; + u64 command; + int ret; + + if (ucsi->version < UCSI_VERSION_2_0) { + /* + * Before UCSI v2.0, MESSAGE_IN is 16 bytes which cannot fit + * the 28 byte identity response including the VDM header. + * First request the VDM header, ID Header VDO, Cert Stat VDO + * and Product VDO. + */ + command = UCSI_COMMAND(UCSI_GET_PD_MESSAGE) | + UCSI_CONNECTOR_NUMBER(con->num); + command |= UCSI_GET_PD_MESSAGE_RECIPIENT(recipient); + command |= UCSI_GET_PD_MESSAGE_OFFSET(0); + command |= UCSI_GET_PD_MESSAGE_BYTES(0x10); + command |= UCSI_GET_PD_MESSAGE_TYPE( + UCSI_GET_PD_MESSAGE_TYPE_IDENTITY); + + ret = ucsi_send_command(ucsi, command, &resp, 0x10); + if (ret < 0) { + dev_err(ucsi->dev, + "UCSI_GET_PD_MESSAGE v1.2 failed first request (%d)\n", + ret); + return ret; + } + + /* Then request Product Type VDO1 through Product Type VDO3. */ + command = UCSI_COMMAND(UCSI_GET_PD_MESSAGE) | + UCSI_CONNECTOR_NUMBER(con->num); + command |= UCSI_GET_PD_MESSAGE_RECIPIENT(recipient); + command |= UCSI_GET_PD_MESSAGE_OFFSET(0x10); + command |= UCSI_GET_PD_MESSAGE_BYTES(0xc); + command |= UCSI_GET_PD_MESSAGE_TYPE( + UCSI_GET_PD_MESSAGE_TYPE_IDENTITY); + + ret = ucsi_send_command(ucsi, command, &resp.vdo[0], 0xc); + if (ret < 0) { + dev_err(ucsi->dev, + "UCSI_GET_PD_MESSAGE v1.2 failed second request (%d)\n", + ret); + return ret; + } + } else { + /* + * In UCSI v2.0 and after, MESSAGE_IN is large enough to request + * the large enough to request the full Discover Identity + * response at once. + */ + command = UCSI_COMMAND(UCSI_GET_PD_MESSAGE) | + UCSI_CONNECTOR_NUMBER(con->num); + command |= UCSI_GET_PD_MESSAGE_RECIPIENT(recipient); + /* VDM Header + 6 VDOs (0x1c bytes) without an offset */ + command |= UCSI_GET_PD_MESSAGE_OFFSET(0); + command |= UCSI_GET_PD_MESSAGE_BYTES(0x1c); + command |= UCSI_GET_PD_MESSAGE_TYPE( + UCSI_GET_PD_MESSAGE_TYPE_IDENTITY); + + ret = ucsi_send_command(ucsi, command, &resp, sizeof(resp)); + if (ret < 0) { + dev_err(ucsi->dev, "UCSI_GET_PD_MESSAGE failed (%d)\n", + ret); + return ret; + } + } + + id->id_header = resp.id_header; + id->cert_stat = resp.cert_stat; + id->product = resp.product; + id->vdo[0] = resp.vdo[0]; + id->vdo[1] = resp.vdo[1]; + id->vdo[2] = resp.vdo[2]; + return 0; +} + +static int ucsi_get_partner_identity(struct ucsi_connector *con) +{ + int ret; + + ret = ucsi_read_identity(con, UCSI_RECIPIENT_SOP, + &con->partner_identity); + if (ret < 0) + return ret; + + ret = typec_partner_set_identity(con->partner); + if (ret < 0) { + dev_err(con->ucsi->dev, "Failed to set partner identity (%d)\n", + ret); + } + + return ret; +} + +static int ucsi_get_cable_identity(struct ucsi_connector *con) +{ + int ret; + + ret = ucsi_read_identity(con, UCSI_RECIPIENT_SOP_P, + &con->cable_identity); + if (ret < 0) + return ret; + + ret = typec_cable_set_identity(con->cable); + if (ret < 0) { + dev_err(con->ucsi->dev, "Failed to set cable identity (%d)\n", + ret); + } + + return ret; +} + static int ucsi_check_altmodes(struct ucsi_connector *con) { int ret, num_partner_am; @@ -754,6 +869,7 @@ static int ucsi_register_cable(struct ucsi_connector *con) break; } + desc.identity = &con->cable_identity; desc.active = !!(UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE & con->cable_prop.flags); desc.pd_revision = UCSI_CABLE_PROP_FLAG_PD_MAJOR_REV_AS_BCD( @@ -777,6 +893,7 @@ static void ucsi_unregister_cable(struct ucsi_connector *con) return; typec_unregister_cable(con->cable); + memset(&con->cable_identity, 0, sizeof(con->cable_identity)); con->cable = NULL; } @@ -827,6 +944,7 @@ static int ucsi_register_partner(struct ucsi_connector *con) break; } + desc.identity = &con->partner_identity; desc.usb_pd = pwr_opmode == UCSI_CONSTAT_PWR_OPMODE_PD; desc.pd_revision = UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(con->cap.flags); @@ -855,6 +973,7 @@ static void ucsi_unregister_partner(struct ucsi_connector *con) ucsi_unregister_altmodes(con, UCSI_RECIPIENT_SOP); ucsi_unregister_cable(con); typec_unregister_partner(con->partner); + memset(&con->partner_identity, 0, sizeof(con->partner_identity)); con->partner = NULL; } @@ -975,6 +1094,10 @@ static int ucsi_check_cable(struct ucsi_connector *con) if (ret < 0) return ret; + ret = ucsi_get_cable_identity(con); + if (ret < 0) + return ret; + return 0; } @@ -1019,6 +1142,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_get_partner_identity, 1, HZ); ucsi_partner_task(con, ucsi_check_cable, 1, HZ); if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) == @@ -1418,6 +1542,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_get_partner_identity(con); ucsi_check_cable(con); } diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index f0aabef0b7c64..b89fae82e8ce7 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -106,6 +106,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); #define UCSI_GET_CABLE_PROPERTY 0x11 #define UCSI_GET_CONNECTOR_STATUS 0x12 #define UCSI_GET_ERROR_STATUS 0x13 +#define UCSI_GET_PD_MESSAGE 0x15 #define UCSI_CONNECTOR_NUMBER(_num_) ((u64)(_num_) << 16) #define UCSI_COMMAND(_cmd_) ((_cmd_) & 0xff) @@ -159,6 +160,18 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); #define UCSI_MAX_PDOS (4) #define UCSI_GET_PDOS_SRC_PDOS ((u64)1 << 34) +/* GET_PD_MESSAGE command bits */ +#define UCSI_GET_PD_MESSAGE_RECIPIENT(_r_) ((u64)(_r_) << 23) +#define UCSI_GET_PD_MESSAGE_OFFSET(_r_) ((u64)(_r_) << 26) +#define UCSI_GET_PD_MESSAGE_BYTES(_r_) ((u64)(_r_) << 34) +#define UCSI_GET_PD_MESSAGE_TYPE(_r_) ((u64)(_r_) << 42) +#define UCSI_GET_PD_MESSAGE_TYPE_SNK_CAP_EXT 0 +#define UCSI_GET_PD_MESSAGE_TYPE_SRC_CAP_EXT 1 +#define UCSI_GET_PD_MESSAGE_TYPE_BAT_CAP 2 +#define UCSI_GET_PD_MESSAGE_TYPE_BAT_STAT 3 +#define UCSI_GET_PD_MESSAGE_TYPE_IDENTITY 4 +#define UCSI_GET_PD_MESSAGE_TYPE_REVISION 5 + /* -------------------------------------------------------------------------- */ /* Error information returned by PPM in response to GET_ERROR_STATUS command. */ @@ -338,6 +351,18 @@ struct ucsi_connector_status { ((get_unaligned_le32(&(_p_)[5]) & GENMASK(16, 1)) >> 1) } __packed; +/* + * Data structure filled by PPM in response to GET_PD_MESSAGE command with the + * Response Message Type set to Discover Identity Response. + */ +struct ucsi_pd_message_disc_id { + u32 vdm_header; + u32 id_header; + u32 cert_stat; + u32 product; + u32 vdo[3]; +} __packed; + /* -------------------------------------------------------------------------- */ struct ucsi_debugfs_entry { @@ -428,6 +453,10 @@ struct ucsi_connector { struct usb_power_delivery_capabilities *partner_sink_caps; struct usb_role_switch *usb_role_sw; + + /* USB PD identity */ + struct usb_pd_identity partner_identity; + struct usb_pd_identity cable_identity; }; int ucsi_send_command(struct ucsi *ucsi, u64 command,