github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 15:12:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

thunderbolt: Fixes for v6.7-rc6

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJUBAABCgA+FiEEVTdhRGBbNzLrSUBaAP2fSd+ZWKAFAmV4HrogHG1pa2Eud2Vz
 dGVyYmVyZ0BsaW51eC5pbnRlbC5jb20ACgkQAP2fSd+ZWKBoiRAAkEfYf6wtINKE
 OdQVb8KKz+p3BMsWJFtndY0lcWKhy5c9nhSvJ+5yjdE1v67UytbQtvLaiUEpDZKt
 NZMyufUYrzCj8YuX0RtROmhuPF1SB05+xOXm5haS9V6/N0oFEshsu5NzAXr8qxAG
 cvuy9DPDHUz3qrjueon8bgDtEmuTTrRouwkL9fg4kp1oT/20lYoiZvojsYNlzXp7
 NdHZYhflibhaaZ0pVAo1DyZ03Wq+408EhXXUXcfc4A50d0LbaPoTy1i2DgDOcooA
 95KKRW9tfRFn/RSSqlMjCAiYxsGVMOMwPoptn0fejPHP0c4bSz3ogmmi65R0KAdK
 Fnovf1/C5WIN1ENV2qlbUGHn/V/nTZrhpynI4dGhUER9ksVhGQ018yiOS1HMsHhw
 3GVvqbguEvRTMlEMX1u3S42Act6MK/PWh2v6oonUg3kTZx6zOgvflKIGTFx2UTMW
 VJfDy4myx8I3mKoAApVT4Mg+c+hMqVOG//K5SHMqiE1cnPVQWwHTvp29wj12g5cU
 JEHEHTvnwhb1NZeaVirFXcs6ZOlW8ZRAUOtcz/U9tU0k+VMJJdqPkX2SOV9ikGk7
 yJAVPh8An4kTP9NNhBXwd9oyaxmhh8x6UEmnNUA3tfXC2PMnrQD/KZ052DGvEXCH
 58z2dJ5F8ze956VVDq3Y1u4A/9HVn4o=
 =NP97
 -----END PGP SIGNATURE-----

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

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
commit da48708e87
2 changed files with 6 additions and 6 deletions
Show Stats 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);