From patchwork Fri Feb 23 01:03:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 775484 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 78975B651 for ; Fri, 23 Feb 2024 01:04:52 +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=1708650293; cv=none; b=RVes+Hwe0Y3UtVrKCcBSQK+pM7umNiSj19CHIZKISqyiIyYwZsufmDJdi5z6Xw1WPSfpzZMpKyjdbX23Y6L5B6RPJCjw+nKa7fOP6nWmkcvzuPfs/oZSaU4uw+LfgeYpSVer8HR1k+GULwNmK5tQ5mQTNseH96F43FyJgACtRH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708650293; c=relaxed/simple; bh=z+h1yXxJcUa7Q+rt4Z5SzcMtHfpQaYLneY32ZhvvCDU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PKpjmi7o9jzhCpla80XS4Y8Us2wbWZ3+IvK+5o1NjTVXOkpFJ6ExeKCoT/qfHD0pYTElVQHjol8F7Ki1Bw8PCJ3EtCMWwEIhRE69gwBhMG0kW+oNMPJrdm2rKz6vJedPZLwWVMYf8X65A0adtaMtE09EXydVgsHdomJwhg8wIBI= 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=WA36HLS+; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WA36HLS+" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60853aafd93so7512667b3.0 for ; Thu, 22 Feb 2024 17:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708650291; x=1709255091; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eXcGLp3XklPDGcQgU4Tvmf4Q43ky22vQ6sErhij3a6c=; b=WA36HLS+J5v+rQdbMhr2IpkjNfrT9BewdgAGiw3HJjBH/Yiyvza2XQVVutXYo72ZBe 5zhZzC5e2YMEyf5z0oCyX+irfTq3s6eavAsqI5N0NamkxlJgikK21wvwla40E6W2Sunv J9NRokaAi8oLPeJpc/sT+HlN6xMY/1JUXrSj94DzcZ7wl05IN7NYhlW6d8rJulCr6vzH 2epKbRkJQJWMpj8xEtJ/JfAVg5xGVJHr/Cv6bsKT2Uz3M0i1DGxcsSTrPBgAsp4sqSJu 8oCxa8iElsg/CN/aiY4M0+SXl93Epc47A7GrkORbrIwY4SC3g9yalOyxGjBxALmlTluw NFvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708650291; x=1709255091; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eXcGLp3XklPDGcQgU4Tvmf4Q43ky22vQ6sErhij3a6c=; b=UuxA65GkhltorpZOgl/N5HYlL2vOk08OoiA35yf0+1Cgsb5sEGlNyR4wgeX2wgIykX X4ANxhhp9tGHE1hBMppBtRcFsxZpWS7jVnRODy6IkhnRDftNNQeqkGQs/+bMmS8ppHRO xzjTxWcqlu5lnhxPYqr2pB5kt2+ELPLWPiixDKZeTSNPMQBibxHUDUmCavGA056oBf1V rh/dN8NyIuNRBs6RLfUA7CP14nle+lRhcHPH3xDguwzwU9Wd49sjqtEwpQqdAxJKRUnq wvZ/KHe5r/ZcMDfnvIGq56w9aFDEpFJWbZ7Om8UA6IEaKiUlD4r7pDGYMQctSHfR+F3F QOcQ== X-Forwarded-Encrypted: i=1; AJvYcCWI2q3mIxCmLF9i0hoi2RX87kvdWdLKqI4An6gw4TXJLVTROhFd34+u05x4s1bfxG0/kaUepiuaU7mEcNSZpL1WPvAYoysxJla6 X-Gm-Message-State: AOJu0YwxGua5TpF4FnAXjUYkimHg82ocm1K3RnMhu+wxOyEG8OXAQNs4 akJ/P0xMtfVSmtrukuFfICxGXrd0a2HUu2ov6tWMyBERCmybNUzycI8NfYVWeoICdJ3OsULOoUc HHQ== X-Google-Smtp-Source: AGHT+IG03PrEw0HtTG4m+Bmf4i5fWw4eM9SL3vavSQOaa0Hr4Q3QsF3Zw3M2mOiSLiC8G1EsDy9aVF5f8J8= X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a05:6902:18ce:b0:dc6:fec4:1c26 with SMTP id ck14-20020a05690218ce00b00dc6fec41c26mr202150ybb.1.1708650291721; Thu, 22 Feb 2024 17:04:51 -0800 (PST) Date: Fri, 23 Feb 2024 01:03:25 +0000 In-Reply-To: <20240223010328.2826774-1-jthies@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240223010328.2826774-1-jthies@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240223010328.2826774-2-jthies@google.com> Subject: [PATCH 1/4] usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros 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 Clean up UCSI_CABLE_PROP macros by fixing a bitmask shifting error for plug type and updating the modal support macro for consistent naming. Fixes: 3cf657f07918 ("usb: typec: ucsi: Remove all bit-fields") Signed-off-by: Jameson Thies Reviewed-by: Prashant Malani --- Tested by building v6.6 kernel. drivers/usb/typec/ucsi/ucsi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 7e35ffbe0a6f..469a2baf472e 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -259,12 +259,12 @@ struct ucsi_cable_property { #define UCSI_CABLE_PROP_FLAG_VBUS_IN_CABLE BIT(0) #define UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE BIT(1) #define UCSI_CABLE_PROP_FLAG_DIRECTIONALITY BIT(2) -#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_) ((_f_) & GENMASK(3, 0)) +#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_) (((_f_) & GENMASK(4, 3)) >> 3) #define UCSI_CABLE_PROPERTY_PLUG_TYPE_A 0 #define UCSI_CABLE_PROPERTY_PLUG_TYPE_B 1 #define UCSI_CABLE_PROPERTY_PLUG_TYPE_C 2 #define UCSI_CABLE_PROPERTY_PLUG_OTHER 3 -#define UCSI_CABLE_PROP_MODE_SUPPORT BIT(5) +#define UCSI_CABLE_PROP_FLAG_MODE_SUPPORT BIT(5) u8 latency; } __packed; From patchwork Fri Feb 23 01:03:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 775727 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 D1946BA56 for ; Fri, 23 Feb 2024 01:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708650297; cv=none; b=ZXdOAd26Xxw3cHjQj53PKRF0nP6n1myUrWgoMZH7b0Zdso5S5iBYtOhor53UWWq+n7b/A5laDYBQCVfvG4ynOCmo8DJ21503xL8GL0g2L/gDvuWDxBJOOq9J7hM4NZgGjVovJUBO5I/Us8gNn4k6x57VMBRxHypRIxpNZOvAOqc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708650297; c=relaxed/simple; bh=AudtEw/bZJ4k+bg0BQXq7THY6fgEi4z3QFF3Hrqxw/o=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oUKMO1OGE/pxcV15BmCIkemDoMKEXGwq5KJgGqvY5qgJll2InlT7mqerOXXYojldxXu0TYOkisbkuYMMy86hjVNK3AP9wzso0JGSgZyvTAY3wnNZaQvjctVn5Vkf2gLLUOI0R+z7IRLn/OBMBaTj1864frPlrkF07LKWC4v85iQ= 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=coZQTzsb; arc=none smtp.client-ip=209.85.219.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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="coZQTzsb" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6ade10cb8so919422276.0 for ; Thu, 22 Feb 2024 17:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708650294; x=1709255094; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nQLpgxev/UCFVGLIwR3AMfjodJpmJGMqgmKMEJOc+QI=; b=coZQTzsb+j5y6+fDWV/GhQTsnEY2EaDPan0aE8Jd8U3rmuOvbzPhtiX6PZ6knZJWfH /7+ZMMWp1YggZW2i8CTzBdZD4VIDFnTlRztMzTq03XfXqf8E9Hy7y4j1ezQxKiqPpEJx Y3BsCnW40ugWxbpCf4vVCwcIrSGakvXQjxEq9/lP7DvI7xW4H6l7UX2XbyAEk8fCj6KT fFfLDbHLfaAYg9D0T81D/eYT/npOnEsjnkUcYt/KSjSlnUpyanNcPLeXQG7i2c1RgCTk POxTnx6E9NONYcaAE2cedOEXaevaUBA5gN0ZC0AIYlii1ARe8tVVpWMPY2P0kG73kfsw 8m8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708650294; x=1709255094; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nQLpgxev/UCFVGLIwR3AMfjodJpmJGMqgmKMEJOc+QI=; b=pHuT+jxyizuq9/prBF4szpdp8iWeudOuHLXvpi6hAa/KvwMEM4m17dKTvMod7Lhk7o hr3vY82RiyxI2HOMH+Epixz2m0gmt1lmfd9TgVZYXxKQhEeLEudHcGt69hNS3Pr5qOYJ NrdmlMH8F1PRmBe36yiBf1TBjkeHFlHayoRnTbRjPO9U/PAdkVGrksX8Yrv6LCDG7Tub o7udEJB8nNIMr5Pfkn78JeVBi0+V0wyEqezWXT2RaMxCABh4LYKU5lqio2/LDaSr++vS GvKwpO6KMXZDua6ZjzABp4bc4azm6rQIyRE0qpgew16Ce2WnzmbIUR2Rn1be9KE7i+hD f55A== X-Forwarded-Encrypted: i=1; AJvYcCUWAGDMA1PV5v1T3twva2FdEdlPJ/kK2a9nPA3sjknEsg1TJDez4kp8DZH1wWIcTqClFqqstm7hRitFimOj7DU+x0fBl/AOwqiW X-Gm-Message-State: AOJu0YyfMC9GJ7wippo3YEjO8nxuD8fPY0gM5L6/H/jVDNxTLawD8R0q gO4iPAv/0jkK+AEZCmM5cn5eViQCtdByIpso7xzXtXh6goGsEFedM0sblbSL6Fmw+23PVN3V81Z zUA== X-Google-Smtp-Source: AGHT+IH7+MqAZARcx1INh7j3pZVkMPgMbKUi15UsYSr52zBlvbI26cjbHg9VKykt97KsPD1Sdu7371KOR2Y= X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a25:ab89:0:b0:dc6:e884:2342 with SMTP id v9-20020a25ab89000000b00dc6e8842342mr184752ybi.5.1708650294753; Thu, 22 Feb 2024 17:04:54 -0800 (PST) Date: Fri, 23 Feb 2024 01:03:26 +0000 In-Reply-To: <20240223010328.2826774-1-jthies@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240223010328.2826774-1-jthies@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240223010328.2826774-3-jthies@google.com> Subject: [PATCH 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 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. Signed-off-by: Jameson Thies Reviewed-by: Heikki Krogerus --- Tested on v6.6 kernel. Expected cable properties populate the USB Type-C connector class sysfs paths: redrix-rev3 /sys/class/typec # ls port2-cable device identity plug_type port2-plug0 power subsystem type uevent usb_power_delivery_revision drivers/usb/typec/ucsi/ucsi.c | 69 +++++++++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.h | 5 +++ 2 files changed, 74 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index ae105383e69e..15e82f5fab37 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -734,6 +734,50 @@ 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 +851,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 +952,28 @@ 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 +1015,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 +1414,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 469a2baf472e..f0aabef0b7c6 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; From patchwork Fri Feb 23 01:03:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 775483 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 BB383C2E9 for ; Fri, 23 Feb 2024 01:04:58 +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=1708650300; cv=none; b=btso9mnrwSB75THe5j9LZDLS/oO4YGeCNkZGes83FwRV3oISa2gpKWAOV0zksk8s5ZzACK4CXQ697JARDDflptL0LrxS3nwOuKBFXZXJoXIopJbNSUjjMIGfRDk8kRjC9Zed908Iu8hUkhUgqhnP6LFId44Cobx2d1Vijv683rc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708650300; c=relaxed/simple; bh=djqlNsa6R1dXZ3viePd2hZAocsyo8u3alB6TS2xk+fc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CXr46ThMOCyobZ1xFdSofCNOsjjANteA0TXH5f0zF+pXwuHrzKSK0GJW/5GvNRtO+3CEzhMKsiALl9f6EvXi/NjoVUahxILcK3AHvf4to9LJHqCFwzWWOWjWG0vDNai871q4mvSrXqhirDJM0o8MSE3OGTL/jo2hIsS+GE86+Qk= 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=4sMjwBCN; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="4sMjwBCN" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6047a047f58so6472767b3.3 for ; Thu, 22 Feb 2024 17:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708650298; x=1709255098; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=E/AmGDcfgM6pSbOLU88NIVIJmr/j1xj0yT5Nk8P+cUw=; b=4sMjwBCNo0/XmVxDVMWcjH0FcjZEvOB41tz9wHgC6JnxS3h11SGPl8vG9ApY0VYZxD wNN33XUemgWAais5SeIu0iqzcNM9hAJIN15FY5/unPgbaogqIqtkyIHh0Mbb6Q6aqxQw PWlYOllzTzpKzB1UJL8WpYliN7tUbKPH0B9QxUVx1C/KEsK+Peo0ubb/fqnJMVlx3FQ7 JLi558JE0NvoXxWqKmheq47q+fRjNrshO+0A7/kZQ4omu9eHlWFgkCnVnJtieRnHdTU3 sInSmaZpjIilfe2j2jR9I9VSPjMpgGvbrevMFJ/HXLg8Yqc7NHfKImMgATGfMn+ztP0V uLCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708650298; x=1709255098; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=E/AmGDcfgM6pSbOLU88NIVIJmr/j1xj0yT5Nk8P+cUw=; b=H3IsENsGZLic/eg6GL7aUyjr+YIGQZjWu4u0mA0YGVSHXqW/OUwF15Fp5RA1USwF9w ZyvMCyDyukwgO5xqQ9guq/37jNAgvPp8ErCZTkeJ+HClqDh3LO6l+IhsCC3SP8MIOEr5 HCr1VY4mbJOUQ9qf8cEfU85cRJlzY+MODsMAiq4135U71YoMLstJSbuzwBKquCzADHvN e0bG4K6yWQYbqjIaZHOqhCvGHYH55VOlGRXD8xHJQWVtGv8eL9VICalzSq9FvaMy6MNB 2cQFUxz1U+1aq9iV/d6oBN0mwpFvDIFGey6mfg4Hh1lVDX9QH18XzpUjxddFv/xXMpgE TcTg== X-Forwarded-Encrypted: i=1; AJvYcCUU/AqyiyjAGkSKGHMWOffdtOPaR/blWNRm7QpR0kpESSf1dAVsBerCIfYHSsEIJwlU8ZTOEnDPprMy5guk7VvDaH5mhvusObTZ X-Gm-Message-State: AOJu0Yx6srthpskQR0qDm/bSYUJNFCRaZD226Ogm2LrDWJexzpM3aEJi ysqa+kH38HHVzsS8zgK2FO5B/k87NzEjJKVuJtjclTCGtx85d1HXEv3EM8Zy/EqxKi9vy0u2pV8 UKw== X-Google-Smtp-Source: AGHT+IE8KW+BV9Skf2PKiid4kOdLJB1IdEed7ZYX9DP0T1HouM2WC9WweAYs0HoDiJweNFtH83AFQh8xe9g= X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a25:160b:0:b0:dc7:7ce9:fb4d with SMTP id 11-20020a25160b000000b00dc77ce9fb4dmr198675ybw.12.1708650297856; Thu, 22 Feb 2024 17:04:57 -0800 (PST) Date: Fri, 23 Feb 2024 01:03:27 +0000 In-Reply-To: <20240223010328.2826774-1-jthies@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240223010328.2826774-1-jthies@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240223010328.2826774-4-jthies@google.com> Subject: [PATCH 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 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 Reviewed-by: Heikki Krogerus Reviewed-by: Prashant Malani --- Tested on v6.6 kernel. GET_PD_MESSAGE responses from the PPM populate partner and cable identity in sysfs. redrix-rev3 /sys/class/typec # ls port2-partner/identity/ cert_stat id_header product product_type_vdo1 product_type_vdo2 product_type_vdo3 redrix-rev3 /sys/class/typec # ls port2-cable/identity/ cert_stat id_header product product_type_vdo1 product_type_vdo2 product_type_vdo3 drivers/usb/typec/ucsi/ucsi.c | 77 +++++++++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.h | 29 +++++++++++++ 2 files changed, 106 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 15e82f5fab37..6d6443e61faa 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -646,6 +646,73 @@ 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; + + /* + * Skip identity discovery and registration if UCSI version is less than + * v2.0. Before v2.0 MESSAGE_IN is 16 bytes which cannot fit a complete + * 24 byte identity response. + */ + if (ucsi->version < UCSI_VERSION_2_0) + return -EPROTO; + + 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 +821,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(con->cable_prop.flags); @@ -776,6 +844,7 @@ static void ucsi_unregister_cable(struct ucsi_connector *con) typec_unregister_cable(con->cable); con->cable = NULL; + memset(&con->cable_identity, 0, sizeof(con->cable_identity)); } static void ucsi_pwr_opmode_change(struct ucsi_connector *con) @@ -825,6 +894,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); @@ -854,6 +924,7 @@ static void ucsi_unregister_partner(struct ucsi_connector *con) ucsi_unregister_cable(con); typec_unregister_partner(con->partner); con->partner = NULL; + memset(&con->partner_identity, 0, sizeof(con->partner_identity)); } static void ucsi_partner_change(struct ucsi_connector *con) @@ -971,6 +1042,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; } @@ -1015,6 +1090,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) == @@ -1414,6 +1490,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 f0aabef0b7c6..b89fae82e8ce 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, From patchwork Fri Feb 23 01:03:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 775726 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 BE593F9EB for ; Fri, 23 Feb 2024 01:05:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708650304; cv=none; b=USjw5f7mF0TTJTeT5u5qL0JpXNgOx4mMDc11T/krE80FFHvBwB3e3AplPD+JzgVxrJFwBWqnsDiF2AxCBkZv/pErmyrsJ29g7RBePyNp853ywEwk/zyVNpPYs14RSTVJoT8WmU1Q5RI3GfAcb7rp+Y+14IbTdt6z1XKjcP8JWpo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708650304; c=relaxed/simple; bh=qGvxPb9wBNo74qyixFNMzC5WpsOmHQBVgooo0liTEMQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cB3CGyXigt59/70KpBtZC9L857Dt1ZA0YPCFWJj4YYZFqQESBrMBtq0E7BZ0UlF/GSybKoQLpAywzGclM/TtNVaS7XpiqXdogIWdmBiRxI/kqDDhkeP3g1j0zN7T3xg/emB6lJbqYDFluW/gAzfNJvt7pmMDzLD6/DPa+K+eS3A= 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=RIawMauK; arc=none smtp.client-ip=209.85.219.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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RIawMauK" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcbee93a3e1so536908276.3 for ; Thu, 22 Feb 2024 17:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708650302; x=1709255102; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SfnrjBnv6BQLK9jEvV+2jcZHgVods2JgdI/a3aIK/Hg=; b=RIawMauK6dglklq7bJsuGxYAINPh+ApIup/nn8UfQwGvD4qL8UiAjniCbTMzJmWJo2 W+8+5DCvrEKo0QmHjhV8H18VKrK6o9gux2M1Lk4yn3XQVObd186qn/Y814HZtLp8Bga5 9PAnrcdxhnFvnfr0OCTS3QnDmWAE90fJ4mxu2o7tLWxhgVOMkTIvGfCrqJzdZOQnVkx/ C9XBpqzp9vK5FeTaKQlkVNfDP0Q4dReg9020u+QrrmNckcSFjwskbNQH4KSkf5sYZokY Harp8+YUM37m5mipGfmLJ8afDol6FJriPL9zGHSDNvD2wk+jMJpkHRp59wZTj0nH0RrD qUKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708650302; x=1709255102; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SfnrjBnv6BQLK9jEvV+2jcZHgVods2JgdI/a3aIK/Hg=; b=WSR0Zlaw1wVw9i6ewTalb8bVFOo3q8GvAknGTKX7yhb99SkBOWQQ63sD63xET3TAyO qPzYN3b/6hTL+wvFsHxk+u1FLxI4v6rvAr8uTUuisxLMpcee4jjRB9SDl0iSLaQf32hS LD1cQfptH9bbodwA/tPjrXXzrxCaEeqOynTn3ZkpYbU0CAdvH8qabG8pl7jV061AiTBh MunYtrKCX/v+mYQU8LrJyHFuuy2TURs6Uc+DI0O5ebdcC5FTQ0jbDmlfoh83sMQwov7c Qz+tQZXM16m3kiUHV+kZtnvaH2PkEKMf6gTi1dt4g+ZvUXuUkbcXV8pnUseAGvN/eLHh d99w== X-Forwarded-Encrypted: i=1; AJvYcCXegptqbB/KgaRcyzlg+aXITrZVZe1j3LCbShZ4tOLrAJiK9bl3F014BCeqfQQkRWQ2KT8eFMcffPOuyqp7DSiRbHkyEnyRGTqS X-Gm-Message-State: AOJu0YxmzdZ8knj4s9tDn/hBH0/VwVKPR8VvhU0IrksXdbI660jWwlcz u9nnaDDBsDFOz8H611YNHZ1f3RwgCjvKS45aRwmbcyawZ+UKJKhPu/94Ox266p+F2C8er0dtMsf eDw== X-Google-Smtp-Source: AGHT+IHsrtZJ1Y2yJh2vWG/92/vGGtCGaCqZx8RLto3Oa1J1XPVKZ8hDFBaEnXp8vdfKzzBfgbY83a/+iyU= X-Received: from jthies.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:23db]) (user=jthies job=sendgmr) by 2002:a05:6902:1146:b0:dc6:d9eb:6422 with SMTP id p6-20020a056902114600b00dc6d9eb6422mr27236ybu.10.1708650301885; Thu, 22 Feb 2024 17:05:01 -0800 (PST) Date: Fri, 23 Feb 2024 01:03:28 +0000 In-Reply-To: <20240223010328.2826774-1-jthies@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240223010328.2826774-1-jthies@google.com> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240223010328.2826774-5-jthies@google.com> Subject: [PATCH 4/4] usb: typec: ucsi: Register SOP' alternate modes with cable plug 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 Register SOP' alternate modes with a Type-C Connector Class cable plug. Alternate modes are queried from the PPM using the GET_ALTERNATE_MODES command with recipient set to SOP'. Signed-off-by: Jameson Thies Reviewed-by: Heikki Krogerus --- Tested on v6.6 kernel. SOP' GET_ALTERNATE_MODE responses from the PPM are correctly registered as to the cable plug. redrix-rev3 /sys/class/typec # ls port2-cable/port2-plug0/ device port2-plug0.0 port2-plug0.1 power subsystem uevent drivers/usb/typec/ucsi/ucsi.c | 60 +++++++++++++++++++++++++++++++++++ drivers/usb/typec/ucsi/ucsi.h | 2 ++ 2 files changed, 62 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 6d6443e61faa..9b541547917b 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -399,6 +399,27 @@ static int ucsi_register_altmode(struct ucsi_connector *con, con->partner_altmode[i] = alt; break; + case UCSI_RECIPIENT_SOP_P: + i = ucsi_next_altmode(con->plug_altmode); + if (i < 0) { + ret = i; + goto err; + } + + ret = ucsi_altmode_next_mode(con->plug_altmode, desc->svid); + if (ret < 0) + return ret; + + desc->mode = ret; + + alt = typec_plug_register_altmode(con->plug, desc); + if (IS_ERR(alt)) { + ret = PTR_ERR(alt); + goto err; + } + + con->plug_altmode[i] = alt; + break; default: return -EINVAL; } @@ -566,6 +587,9 @@ static void ucsi_unregister_altmodes(struct ucsi_connector *con, u8 recipient) case UCSI_RECIPIENT_SOP: adev = con->partner_altmode; break; + case UCSI_RECIPIENT_SOP_P: + adev = con->plug_altmode; + break; default: return; } @@ -801,6 +825,33 @@ static void ucsi_unregister_partner_pdos(struct ucsi_connector *con) con->partner_pd = NULL; } +static int ucsi_register_plug(struct ucsi_connector *con) +{ + struct typec_plug *plug; + struct typec_plug_desc desc = {.index = TYPEC_PLUG_SOP_P}; + + plug = typec_register_plug(con->cable, &desc); + if (IS_ERR(plug)) { + dev_err(con->ucsi->dev, + "con%d: failed to register plug (%ld)\n", con->num, + PTR_ERR(plug)); + return PTR_ERR(plug); + } + + con->plug = plug; + return 0; +} + +static void ucsi_unregister_plug(struct ucsi_connector *con) +{ + if (!con->plug) + return; + + ucsi_unregister_altmodes(con, UCSI_RECIPIENT_SOP_P); + typec_unregister_plug(con->plug); + con->plug = NULL; +} + static int ucsi_register_cable(struct ucsi_connector *con) { struct typec_cable *cable; @@ -842,6 +893,7 @@ static void ucsi_unregister_cable(struct ucsi_connector *con) if (!con->cable) return; + ucsi_unregister_plug(con); typec_unregister_cable(con->cable); con->cable = NULL; memset(&con->cable_identity, 0, sizeof(con->cable_identity)); @@ -1046,6 +1098,14 @@ static int ucsi_check_cable(struct ucsi_connector *con) if (ret < 0) return ret; + ret = ucsi_register_plug(con); + if (ret < 0) + return ret; + + ret = ucsi_register_altmodes(con, UCSI_RECIPIENT_SOP_P); + if (ret < 0) + return ret; + return 0; } diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index b89fae82e8ce..32daf5f58650 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -429,9 +429,11 @@ struct ucsi_connector { struct typec_port *port; struct typec_partner *partner; struct typec_cable *cable; + struct typec_plug *plug; struct typec_altmode *port_altmode[UCSI_MAX_ALTMODES]; struct typec_altmode *partner_altmode[UCSI_MAX_ALTMODES]; + struct typec_altmode *plug_altmode[UCSI_MAX_ALTMODES]; struct typec_capability typec_cap;