From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 262002557E for ; Wed, 27 Mar 2024 15:09:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711552159; cv=none; b=TQQTZBq9TIIRudrTVOYObir6C20E0ZXjIM7RLRu4DjkyHod1UFOoHNyHAfZZQeaN/rzf1MhNAeHuIe3BhS4LWwj7DV2cp/0mrH6o9QKE+uKkGiaaty57PPAVWh2mI4d0O+poqHAE28i65r7ZySiCZY9c5IGg2cFp0q0XDzXrOcM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711552159; c=relaxed/simple; bh=N4KGJU9HkU5X/CuQglUNBkxcxNIaIU7alh8/35unHgY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=n4x4ZGWldOjF5bjw+PCt3R4y9/xK9ca33lEnqfjUktCol9YalERCcuJdG3kgekeQNwQH3QV77BwljO/6Y7xFmRMHYGEMQ0Ds69aQcz7Gw8WA5d1bHp5iww2XsYCdUWHgJeQyrNbhm3POXktDBgyWE6dR4FG8MGKbdQIPbFzJEls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=R35YNe9O; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="R35YNe9O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B528C433F1; Wed, 27 Mar 2024 15:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711552158; bh=N4KGJU9HkU5X/CuQglUNBkxcxNIaIU7alh8/35unHgY=; h=Subject:To:Cc:From:Date:From; b=R35YNe9OeWZLVIP50Eb7RsW+VJNnCzy0KqGamcxVjELB7WUmUHvcG5EnlRW++Ze8M slxQW/NGzg3+dC/mti72e5M0obijY8v5tzTL5l7X8t4a2t/73ol1IaHgso1QeTT/Ex RTEo6UsL0Z0HwrWGV7Tj88iJZftQVpRH3E3MWAfM= Subject: FAILED: patch "[PATCH] usb: typec: ucsi: fix UCSI on SM8550 & SM8650 Qualcomm" failed to apply to 6.1-stable tree To: neil.armstrong@linaro.org,gregkh@linuxfoundation.org,heikki.krogerus@linux.intel.com,stable@kernel.org Cc: From: Date: Wed, 27 Mar 2024 16:09:08 +0100 Message-ID: <2024032708-replay-kilobyte-d938@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 4a30dcac38c2b34f5b4f358630774bc2c2c104b0 # git commit -s git send-email --to '' --in-reply-to '2024032708-replay-kilobyte-d938@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 4a30dcac38c2 ("usb: typec: ucsi: fix UCSI on SM8550 & SM8650 Qualcomm devices") 1d103d6af241 ("usb: typec: ucsi: fix UCSI on buggy Qualcomm devices") c6165ed2f425 ("usb: ucsi: glink: use the connector orientation GPIO to provide switch events") 62b5412b1f4a ("usb: typec: ucsi: add PMIC Glink UCSI driver") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4a30dcac38c2b34f5b4f358630774bc2c2c104b0 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 23 Feb 2024 10:40:40 +0100 Subject: [PATCH] usb: typec: ucsi: fix UCSI on SM8550 & SM8650 Qualcomm devices On SM8550 and SM8650 Qualcomm platforms a call to UCSI_GET_PDOS for non-PD partners will cause a firmware crash with no easy way to recover from it. Add UCSI_NO_PARTNER_PDOS quirk for those platform until we find a way to properly handle the crash. Signed-off-by: Neil Armstrong Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20240223-topic-sm8550-upstream-ucsi-no-pdos-v1-1-8900ad510944@linaro.org Cc: stable Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c index 53a7ede8556d..faccc942b381 100644 --- a/drivers/usb/typec/ucsi/ucsi_glink.c +++ b/drivers/usb/typec/ucsi/ucsi_glink.c @@ -301,6 +301,7 @@ static const struct of_device_id pmic_glink_ucsi_of_quirks[] = { { .compatible = "qcom,sc8180x-pmic-glink", .data = (void *)UCSI_NO_PARTNER_PDOS, }, { .compatible = "qcom,sc8280xp-pmic-glink", .data = (void *)UCSI_NO_PARTNER_PDOS, }, { .compatible = "qcom,sm8350-pmic-glink", .data = (void *)UCSI_NO_PARTNER_PDOS, }, + { .compatible = "qcom,sm8550-pmic-glink", .data = (void *)UCSI_NO_PARTNER_PDOS, }, {} };