Sync with upstream canonical/master-next @ Ubuntu-qcom-6.8.0-1058.59 + USB role switch fixes#23
Merged
circlecircus3 merged 3233 commits intomainfrom Jan 17, 2026
Merged
Conversation
BugLink: https://bugs.launchpad.net/bugs/2059080 Sync with master Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2064342 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2068148 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2069428 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2071977 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2072195 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2071853 Disable CONFIG_DEBUG_PREEMPT because it can introduce additional latency into the realtime kernel. Signed-off-by: Kevin Becker <kevin.becker@canonical.com> Acked-by: Manuel Diewald <manuel.diewald@canonical.com> Acked-by: Noah Wager <noah.wager@canonical.com> Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2075606 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2076642 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2078095 Properties: no-test-build Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2082113 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Ignore: yes Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/2082432 Properties: no-test-build Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
Add support for updating message out data structure for UCSI ACPI interface for UCSI 2.1 and UCSI 3.0 commands such as Set PDOs and LPM Firmware Update. Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Pooja Katiyar <pooja.katiyar@intel.com> Link: https://patch.msgid.link/5bb1f367e44c9fc5244c3e10e513f02d62fe8166.1761773881.git.pooja.katiyar@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit d74502a)
Add support for UCSI SET_PDOS command as per UCSI specification v2.1 and above to debugfs. Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Pooja Katiyar <pooja.katiyar@intel.com> Link: https://patch.msgid.link/b4ccc1e75746b04a8b48c8998b42b019afb934f1.1761773881.git.pooja.katiyar@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit b114c98)
Add typec_cable_ops struct for enter, exit, and vdm. The struct is added to typec_altmode so port alt modes can have access to partner and cable specific callbacks, and alt mode drivers can specify operations over SOP' and SOP'' without modifying the existing API. typec_port_register_cable_ops is added as a new symbol for port drivers to use to register cable operations to their registered port alt modes. Signed-off-by: RD Babiera <rdbabiera@google.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20240108191620.987785-15-rdbabiera@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit d3e7499)
Add typec_cable_set_svdm_version and typec_get_cable_svdm version symbols. Cables can operate under a lower PD revision than the port partner, and the max SVDM version is tied to the PD revision. So, typec_cable maintains its own svdm_version. Add typec_altmode_get_cable_svdm_version to return the cable's negotiated svdm_version for altmode drivers to use. Signed-off-by: RD Babiera <rdbabiera@google.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20240108191620.987785-16-rdbabiera@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 0aaf504)
When adding altmode ops, update the sysfs group so that visibility is also recalculated. Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Benson Leung <bleung@chromium.org> Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> Signed-off-by: Jameson Thies <jthies@google.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20240510201244.2968152-3-jthies@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 8beab59)
… port This attribute file, named "usb_capability", will show the supported USB modes, which are USB 2.0, USB 3.2 and USB4. These modes are defined in the USB Type-C (R2.0) and USB Power Delivery (R3.0 V2.0) Specifications. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20241016131834.898599-2-heikki.krogerus@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit fb9a496)
This attribute file shows the supported USB modes (USB 2.0, USB 3.0 and USB4) of the partner, and the currently active mode. The active mode is determined primarily by checking the speed of the enumerated USB device. When USB Power Delivery is supported, the active USB mode should be always the mode that was used with the Enter_USB Message, regardless of the result of the USB enumeration. The port drivers can separately assign the mode with a dedicated API. If USB Power Delivery Identity is supplied for the partner device, the supported modes are extracted from it. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20241016131834.898599-3-heikki.krogerus@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 74aa673)
The active property of port altmode should be writable (to prevent or allow partner altmodes from entering) and needs to be part of typec_altmode_desc so we can initialize the port to an inactive state if desired. Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Benson Leung <bleung@chromium.org> Link: https://lore.kernel.org/r/20241213153543.v5.3.I794566684ab2965e209f326b08232006eff333f8@changeid Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 9adef11)
Alt Mode drivers are responsible for sending Enter Mode through the TCPM, but only a DFP is allowed to send Enter Mode. typec_get_data_role gets the port's data role, which can then be used in altmode drivers via typec_altmode_get_data_role to know if Enter Mode should be sent. Signed-off-by: RD Babiera <rdbabiera@google.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20250923181606.1583584-5-rdbabiera@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 2d8eba6)
(cherry picked from commit 49baa70)
In certain situations like role switching, the glue layers need to be informed of these events, so that they can take any necessary action. But in non-flattened implementations, the glue drivers have no data on when the core driver probe was successful post invoking of_platform_ populate. Now that the core driver supports flattened implementations as well, introduce vendor callbacks that can be passed on from glue to core before invoking dwc3_core_probe. Introduce callbacks to notify glue layer of role_switch and run_stop changes. These can be used by flattened implementation of Qualcomm glue layer to generate connect/disconnect events in controller during cable connect and run stop modifications by udc in device mode. Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com> (cherry picked from commit c5924bf)
After phy initialization, some phy operations can only be executed while
in lower P states. Ensure GUSB3PIPECTL.SUSPENDENABLE and
GUSB2PHYCFG.SUSPHY are set soon after initialization to avoid blocking
phy ops.
Previously the SUSPENDENABLE bits are only set after the controller
initialization, which may not happen right away if there's no gadget
driver or xhci driver bound. Revise this to clear SUSPENDENABLE bits
only when there's mode switching (change in GCTL.PRTCAPDIR).
Fixes: 6d735722063a ("usb: dwc3: core: Prevent phy suspend during init")
Cc: stable <stable@kernel.org>
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/633aef0afee7d56d2316f7cc3e1b2a6d518a8cc9.1738280911.git.Thinh.Nguyen@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 1610c45)
* Post the artifacts on a PR build. Add in build and install scripts (cherry picked from commit 161d1d8)
(cherry picked from commit 577d1f1)
* Enable panic debug
circlecircus3
force-pushed
the
merge/Ubuntu-qcom-6.8.0-1058.59
branch
from
08ca049 to
44b88a8
Compare
Collaborator
Collaborator
mrlambchop
approved these changes
Jan 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Only
git merge --ff-onlymanually or use 'Rebase and merge' in Github UI if there were no changes in main since this PR inception, otherwise do not merge as-isAll PRs required:
particle-iot/tachyon-u-boot#32
particle-iot/tachyon-overlays#12
#23
See particle-iot/tachyon-composer#42 for a prebuilt release.