misc, docs: Remove ERTM patches and update docs

This patch has been accepted upstream: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=98d2c3e1731007acf03addf83c863df6694beb95 Signed-off-by: Kai Krakow <[email protected]>
kakra · Apr 12, 2021 · 3450125 · 3450125
1 parent 2c587d5
commit 3450125
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 73 deletions.
diff --git a/docs/3P-BUGS.md b/docs/3P-BUGS.md
@@ -5,9 +5,6 @@ some of which are fixed now - others are not:
 
 * Broken Battery Indicator in KDE
   fixed! https://www.kde.org/announcements/kde-frameworks-5.45.0.php
-* L2CAP Layer does not handle ERTM requests
-  * workaround: disable ERTM
-  * unofficially fixed: see kernel_patches folder
 * Cambridge Silicon Radio (CSR) chipsets do have problems while reconnecting (OUI 00:1A:7D)
   * Most of these problems may be fixed in kernel 5.10
 * Qualcomm chipsets may have performance and lag problems (OUI 9C:B6:D0)

diff --git a/docs/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md
@@ -4,8 +4,7 @@
 
 #### Enhanced ReTransmission Mode is enabled
 
-If your Gamepad is stuck in a Connected / Disconnected loop, then it may be caused by ERTM.
-Usually the driver does disable this incompatible mode automatically, but sometimes things go wrong.
+**Obsolete:** This section is scheduled for removal. Future kernels will include the proper fix for this.
 
 Also, there seems to be a bug in the L2CAP handling of the kernel and you may need to force-disable
 this setting:

diff --git a/hid-xpadneo/dkms.post_install b/hid-xpadneo/dkms.post_install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+#TODO Remove ERTM after kernel patch is deployed in the wild
 ERTM_OVERRIDE="/etc/modprobe.d/99-xpadneo-bluetooth.conf"
 DISABLE_ERTM="/sys/module/bluetooth/parameters/disable_ertm"
 

diff --git a/hid-xpadneo/dkms.post_remove b/hid-xpadneo/dkms.post_remove
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+#TODO Remove ERTM after kernel patch is deployed in the wild
 ERTM_OVERRIDE="/etc/modprobe.d/99-xpadneo-bluetooth.conf"
 
 [ -L "${ERTM_OVERRIDE}" ] || { echo "Uninstalling ERTM override..."; rm -f "${ERTM_OVERRIDE}"; }

diff --git a/misc/kernel_patches/0001-fix_bluetooth_reconnect.patch b/misc/kernel_patches/0001-fix_bluetooth_reconnect.patch
diff --git a/misc/kernel_patches/raspi3/0001-fix_bluetooth_reconnect.patch b/misc/kernel_patches/raspi3/0001-fix_bluetooth_reconnect.patch