From nobody Tue Dec 16 07:10:46 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 48AFA14831C for ; Tue, 14 Jan 2025 14:25:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736864722; cv=none; b=MxAUb411xXbPT1iINJ+fbDQntJ1sDhU8EzcqvJD7lUW9irKqvTk6CLUeKtNDlEcdZeQVw0Gf67pdo9DaCShBJZq3360kz2CXKjzJNToUltZTn3vB8T5q8eOKC+ClegMOre6Dn3VZT0HUV8wV77E2DI5mVLbTbtpUsjRKvxrHWWw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736864722; c=relaxed/simple; bh=3mZhZEpsVXvbK8kRBz620qSwc7gVFgby48NhPbc9xTE=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=eUPm37R/gGWQYXBzj5URE2PM/pE3HY+OWzJIVq3+du4u/JAZbWEGwrzkdm4E+5skvUfz3bTh3rMEzDOehRoxzDUboPiQAaqTJyq9U+V+t8sNdkZ0HEQpUhewyR0YpwPUinHP+UyD6o9kGfEoAF2uNPrGy6L+gXKxJ1sgJUMqbZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kyletso.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=xuYlPV1s; arc=none smtp.client-ip=209.85.214.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--kyletso.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="xuYlPV1s" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2163c2f32fdso157410755ad.2 for ; Tue, 14 Jan 2025 06:25:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736864720; x=1737469520; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=tSu4xp3Y6HOXZlKWn+sVDCe4JiYP/94emAGWE5skEzM=; b=xuYlPV1shoOzB2rJ0aWTP7Ve0u9ujyFpc0aDrCgvQ8H/3GTmO8eMil3/784WfOX8qD yp3+j0JvnRfPt2EMNjBJ+CtOE2tDg4PzxCMrK6TCpJklwA8zqhLsJSFr5ekH8wt3//PW 46jMfbYdSaal+NXZv0qRDlfi0czaWKm92vTjBq2pmHxwGSSMZCk73C9VkVizwjq0t3Dt SqvkVeWwgW9/dR60QmVyWR2fpL6Xk0VpC31iMPgqKXtoFdA7SQwHkqb+oFB3FbMvfy5X DbWbuffLBvgdTPC460V+N962OrQBmK5xBmWGv/sUXtuhLRz/GlnxlxRFHyiMrYiYRCq5 LSgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736864720; x=1737469520; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tSu4xp3Y6HOXZlKWn+sVDCe4JiYP/94emAGWE5skEzM=; b=tI2mVjADN771scCP1SqkkSdRyOfd07hPjAMkcpuhr4jMPfHWlYCjoCu9bm6sSwDPBU q/rTrmWKAWnyFk6uzDj+P2KAbVvlANcEIIk3oZpl9awQi2FAz8hn9mRVegPw3Adjvru+ MSWOQFLFdai9u5PEdSsQ6UkqgjBBiS98wRQEcmVe033qgvEvPE+DvsBod+QwWz4fWxek 1OMVbx+isb+Ohlyv54UgJYTPr0CmMyhwkS/iXplkQev77OsghnH/eteS/DzVYQ57ki8A CbFbQk/PE4yiPQ2H869Xo+XAQgg0K1aaUhfG4O20pIWUO6R+/f9em3ILrPpOLhx+J7Q3 TSlw== X-Gm-Message-State: AOJu0Yz7MuRq40ptx5/s37l37bhQdSgOt7wYWC+HzcqkL+OLFI3lfCUw BQS6N1lmCIG1J7rAHmqBxta7AoSaUa4D2pJ2KjiPkpQApZlPTCG8mxkQD+hJa0vlj8/PgyLbYDz MU/MDIQ== X-Google-Smtp-Source: AGHT+IGzEszmDZk4FhEWLOcRg1abwedqDueuOVK7MIK2k4wjynrs8GaVu9upTo3mx4cp9fIselYBFA62pIWo X-Received: from plbmo13.prod.google.com ([2002:a17:903:a8d:b0:216:31f0:27de]) (user=kyletso job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c94f:b0:216:25a2:2ebe with SMTP id d9443c01a7336-21a83f573d7mr374935705ad.19.1736864720690; Tue, 14 Jan 2025 06:25:20 -0800 (PST) Date: Tue, 14 Jan 2025 22:24:35 +0800 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.47.1.688.g23fc6f90ad-goog Message-ID: <20250114142435.2093857-1-kyletso@google.com> Subject: [PATCH v1] usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS From: Kyle Tso To: heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org, andre.draszik@linaro.org, rdbabiera@google.com, m.felsch@pengutronix.de, xu.yang_2@nxp.com, u.kleine-koenig@baylibre.com, emanuele.ghidoli@toradex.com, badhri@google.com, amitsd@google.com Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Kyle Tso , stable@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Source can drop its output voltage to the minimum of the requested PPS APDO voltage range when it is in Current Limit Mode. If this voltage falls within the range of vPpsShutdown, the Source initiates a Hard Reset and discharges Vbus. However, currently the Sink may disconnect before the voltage reaches vPpsShutdown, leading to unexpected behavior. Prevent premature disconnection by setting the Sink's disconnect threshold to the minimum vPpsShutdown value. Additionally, consider the voltage drop due to IR drop when calculating the appropriate threshold. This ensures a robust and reliable interaction between the Source and Sink during SPR PPS Current Limit Mode operation. Fixes: 4288debeaa4e ("usb: typec: tcpci: Fix up sink disconnect thresholds = for PD") Cc: stable@vger.kernel.org Signed-off-by: Kyle Tso Reviewed-by: Badhri Jagan Sridharan Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci.c | 13 +++++++++---- drivers/usb/typec/tcpm/tcpm.c | 8 +++++--- include/linux/usb/tcpm.h | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index 48762508cc86..19ab6647af70 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -27,6 +27,7 @@ #define VPPS_NEW_MIN_PERCENT 95 #define VPPS_VALID_MIN_MV 100 #define VSINKDISCONNECT_PD_MIN_PERCENT 90 +#define VPPS_SHUTDOWN_MIN_PERCENT 85 =20 struct tcpci { struct device *dev; @@ -366,7 +367,8 @@ static int tcpci_enable_auto_vbus_discharge(struct tcpc= _dev *dev, bool enable) } =20 static int tcpci_set_auto_vbus_discharge_threshold(struct tcpc_dev *dev, e= num typec_pwr_opmode mode, - bool pps_active, u32 requested_vbus_voltage_mv) + bool pps_active, u32 requested_vbus_voltage_mv, + u32 apdo_min_voltage_mv) { struct tcpci *tcpci =3D tcpc_to_tcpci(dev); unsigned int pwr_ctrl, threshold =3D 0; @@ -388,9 +390,12 @@ static int tcpci_set_auto_vbus_discharge_threshold(str= uct tcpc_dev *dev, enum ty threshold =3D AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV; } else if (mode =3D=3D TYPEC_PWR_MODE_PD) { if (pps_active) - threshold =3D ((VPPS_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100)= - - VSINKPD_MIN_IR_DROP_MV - VPPS_VALID_MIN_MV) * - VSINKDISCONNECT_PD_MIN_PERCENT / 100; + /* + * To prevent disconnect when the source is in Current Limit Mode. + * Set the threshold to the lowest possible voltage vPpsShutdown (min) + */ + threshold =3D VPPS_SHUTDOWN_MIN_PERCENT * apdo_min_voltage_mv / 100 - + VSINKPD_MIN_IR_DROP_MV; else threshold =3D ((VSRC_NEW_MIN_PERCENT * requested_vbus_voltage_mv / 100)= - VSINKPD_MIN_IR_DROP_MV - VSRC_VALID_MIN_MV) * diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 460dbde9fe22..e4b85a09c3ae 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -2973,10 +2973,12 @@ static int tcpm_set_auto_vbus_discharge_threshold(s= truct tcpm_port *port, return 0; =20 ret =3D port->tcpc->set_auto_vbus_discharge_threshold(port->tcpc, mode, p= ps_active, - requested_vbus_voltage); + requested_vbus_voltage, + port->pps_data.min_volt); tcpm_log_force(port, - "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u = ret:%d", - mode, pps_active ? 'y' : 'n', requested_vbus_voltage, ret); + "set_auto_vbus_discharge_threshold mode:%d pps_active:%c vbus:%u = pps_apdo_min_volt:%u ret:%d", + mode, pps_active ? 'y' : 'n', requested_vbus_voltage, + port->pps_data.min_volt, ret); =20 return ret; } diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h index 061da9546a81..b22e659f81ba 100644 --- a/include/linux/usb/tcpm.h +++ b/include/linux/usb/tcpm.h @@ -163,7 +163,8 @@ struct tcpc_dev { void (*frs_sourcing_vbus)(struct tcpc_dev *dev); int (*enable_auto_vbus_discharge)(struct tcpc_dev *dev, bool enable); int (*set_auto_vbus_discharge_threshold)(struct tcpc_dev *dev, enum typec= _pwr_opmode mode, - bool pps_active, u32 requested_vbus_voltage); + bool pps_active, u32 requested_vbus_voltage, + u32 pps_apdo_min_voltage); bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev); void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable); void (*check_contaminant)(struct tcpc_dev *dev); --=20 2.47.1.688.g23fc6f90ad-goog