mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 06:04:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'thunderbolt-for-v6.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Browse Source 
Mika writes:

thunderbolt: Fixes for v6.7-rc6

This includes following USB4/Thunderbolt fixes for v6.7-rc6:

  - Fix memory leak in margining_port_remove()
  - Correct minimum bandwidth allocated for USB 3.x and PCIe to avoid
    reducing DisplayPort capabilities in certain monitor configurations.

Both have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix minimum allocated USB 3.x and PCIe bandwidth
  thunderbolt: Fix memory leak in margining_port_remove()
This commit is contained in:
Greg Kroah-Hartman
2023-12-12 11:34:07 +01:00
parent a39b6ac378 f0b94c1c5c
commit da48708e87
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/thunderbolt/debugfs.c
View File

@@ -959,7 +959,7 @@ static void margining_port_remove(struct tb_port *port)
snprintf(dir_name, sizeof(dir_name), "port%d", port->port);
parent = debugfs_lookup(dir_name, port->sw->debugfs_dir);
if (parent)
debugfs_remove_recursive(debugfs_lookup("margining", parent));
debugfs_lookup_and_remove("margining", parent);
kfree(port->usb4->margining);
port->usb4->margining = NULL;

10
drivers/thunderbolt/usb4.c
View File

@@ -2311,13 +2311,13 @@ int usb4_usb3_port_release_bandwidth(struct tb_port *port, int *upstream_bw,
goto err_request;
/*
* Always keep 1000 Mb/s to make sure xHCI has at least some
* Always keep 900 Mb/s to make sure xHCI has at least some
* bandwidth available for isochronous traffic.
*/
if (consumed_up < 1000)
consumed_up = 1000;
if (consumed_down < 1000)
consumed_down = 1000;
if (consumed_up < 900)
consumed_up = 900;
if (consumed_down < 900)
consumed_down = 900;
ret = usb4_usb3_port_write_allocated_bandwidth(port, consumed_up,
consumed_down);