From: Greg Kroah-Hartman Date: Sat, 28 Feb 2015 22:07:40 +0000 (-0800) Subject: delete some bluetooth patches X-Git-Tag: v3.10.71~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3635cf4778dcff0efe46b3e45467ab75bd90e78;p=thirdparty%2Fkernel%2Fstable-queue.git delete some bluetooth patches --- diff --git a/queue-3.10/bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch b/queue-3.10/bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch deleted file mode 100644 index 1fffe84890c..00000000000 --- a/queue-3.10/bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch +++ /dev/null @@ -1,138 +0,0 @@ -From d049f4e513e861167361b06c7ca85f9e872c8cde Mon Sep 17 00:00:00 2001 -From: Marcel Holtmann -Date: Mon, 26 Jan 2015 20:35:32 -0800 -Subject: Bluetooth: btusb: Add support for Dynex/Insignia USB dongles - -From: Marcel Holtmann - -commit d049f4e513e861167361b06c7ca85f9e872c8cde upstream. - -The Dynex/Insignia USB dongles are Broadcom BCM20702B0 based and require -firmware update before operation. - -T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 -D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 -P: Vendor=19ff ProdID=0239 Rev= 1.12 -S: Manufacturer=Broadcom Corp -S: Product=BCM20702A0 -C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA -I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms -E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms -E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms -I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms -I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms -I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms -I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms -I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms -I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms -I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) -E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms -E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms -I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) - -Since this is an unsual USB vendor ID (0x19ff), these dongles are added -via USB_DEVICE macro and not USB_VENDOR_AND_INTERFACE_INFO as done for -mainstream Broadcom based dongles. - -The latest known working firmware is BCM20702B0_002.001.014.0527.0557.hex -which needs to be converted using hex2hcd utility and then installed -as /lib/firmware/brcm/BCM20702A0-19ff-0239.hcd to make this device fully -operational. - -Bluetooth: hci0: BCM: patching hci_ver=06 hci_rev=2000 lmp_ver=06 lmp_subver=410e -Bluetooth: hci0: BCM: firmware hci_ver=06 hci_rev=222d lmp_ver=06 lmp_subver=410e - -With this firmware the device reports support for connectionless slave -broadcast (master and slave) feature used by 3D Glasses and TVs. - - < HCI Command: Read Local Extended Features (0x04|0x0004) plen 1 - Page: 2 - > HCI Event: Command Complete (0x0e) plen 14 - Read Local Extended Features (0x04|0x0004) ncmd 1 - Status: Success (0x00) - Page: 2/2 - Features: 0x0f 0x00 0x00 0x00 0x00 0x00 0x00 0x00 - Connectionless Slave Broadcast - Master - Connectionless Slave Broadcast - Slave - Synchronization Train - Synchronization Scan - -However there are some flaws with this feature. The Set Event Mask Page 2 -command is actually not supported and with that all connectionless slave -broadcast events are always enabled. - - < HCI Command: Set Event Mask Page 2 (0x03|0x0063) plen 8 - Mask: 0x00000000000f0000 - Synchronization Train Received - Connectionless Slave Broadcast Receive - Connectionless Slave Broadcast Timeout - Truncated Page Complete - > HCI Event: Command Complete (0x0e) plen 4 - Set Event Mask Page 2 (0x03|0x0063) ncmd 1 - Status: Unknown HCI Command (0x01) - -In addition the Synchronization Train Received event is actually broken -on this controller. It mixes up the order of parameters. According to the -Bluetooth Core specification the fields are like this: - - struct hci_ev_sync_train_received { - __u8 status; - bdaddr_t bdaddr; - __le32 offset; - __u8 map[10]; - __u8 lt_addr; - __le32 instant; - __le16 interval; - __u8 service_data; - } __packed; - -This controller however sends the service_data as 5th parameter instead -of having it as last parameter. - - struct hci_ev_sync_train_received { - __u8 status; - bdaddr_t bdaddr; - __le32 offset; - __u8 map[10]; - __u8 service_data; - __u8 lt_addr; - __le32 instant; - __le16 interval; - } __packed; - -So anybody trying to use this hardware for utilizing connectionless slave -broadcast receivers (aka 3D Glasses), be warned about this shortcoming. - -Signed-off-by: Marcel Holtmann -Signed-off-by: Johan Hedberg -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/bluetooth/btusb.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -107,6 +107,9 @@ static struct usb_device_id btusb_table[ - { USB_DEVICE(0x0489, 0xe042) }, - { USB_DEVICE(0x413c, 0x8197) }, - -+ /* Broadcom BCM20702B0 (Dynex/Insignia) */ -+ { USB_DEVICE(0x19ff, 0x0239), .driver_info = BTUSB_BCM_PATCHRAM }, -+ - /* Foxconn - Hon Hai */ - { USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) }, - diff --git a/queue-3.10/series b/queue-3.10/series index 34611bd80ff..0282333ab80 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,5 +1,4 @@ bluetooth-ath3k-workaround-the-compatibility-issue-with-xhci-controller.patch -bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch xfs-ensure-buffer-types-are-set-correctly.patch xfs-inode-unlink-does-not-set-agi-buffer-type.patch xfs-set-superblock-buffer-type-correctly.patch diff --git a/queue-3.14/bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch b/queue-3.14/bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch deleted file mode 100644 index 44dc0d63bfa..00000000000 --- a/queue-3.14/bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch +++ /dev/null @@ -1,138 +0,0 @@ -From d049f4e513e861167361b06c7ca85f9e872c8cde Mon Sep 17 00:00:00 2001 -From: Marcel Holtmann -Date: Mon, 26 Jan 2015 20:35:32 -0800 -Subject: Bluetooth: btusb: Add support for Dynex/Insignia USB dongles - -From: Marcel Holtmann - -commit d049f4e513e861167361b06c7ca85f9e872c8cde upstream. - -The Dynex/Insignia USB dongles are Broadcom BCM20702B0 based and require -firmware update before operation. - -T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 -D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 -P: Vendor=19ff ProdID=0239 Rev= 1.12 -S: Manufacturer=Broadcom Corp -S: Product=BCM20702A0 -C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA -I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms -E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms -E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms -I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms -I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms -I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms -I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms -I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms -I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms -I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) -E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms -E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms -I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) - -Since this is an unsual USB vendor ID (0x19ff), these dongles are added -via USB_DEVICE macro and not USB_VENDOR_AND_INTERFACE_INFO as done for -mainstream Broadcom based dongles. - -The latest known working firmware is BCM20702B0_002.001.014.0527.0557.hex -which needs to be converted using hex2hcd utility and then installed -as /lib/firmware/brcm/BCM20702A0-19ff-0239.hcd to make this device fully -operational. - -Bluetooth: hci0: BCM: patching hci_ver=06 hci_rev=2000 lmp_ver=06 lmp_subver=410e -Bluetooth: hci0: BCM: firmware hci_ver=06 hci_rev=222d lmp_ver=06 lmp_subver=410e - -With this firmware the device reports support for connectionless slave -broadcast (master and slave) feature used by 3D Glasses and TVs. - - < HCI Command: Read Local Extended Features (0x04|0x0004) plen 1 - Page: 2 - > HCI Event: Command Complete (0x0e) plen 14 - Read Local Extended Features (0x04|0x0004) ncmd 1 - Status: Success (0x00) - Page: 2/2 - Features: 0x0f 0x00 0x00 0x00 0x00 0x00 0x00 0x00 - Connectionless Slave Broadcast - Master - Connectionless Slave Broadcast - Slave - Synchronization Train - Synchronization Scan - -However there are some flaws with this feature. The Set Event Mask Page 2 -command is actually not supported and with that all connectionless slave -broadcast events are always enabled. - - < HCI Command: Set Event Mask Page 2 (0x03|0x0063) plen 8 - Mask: 0x00000000000f0000 - Synchronization Train Received - Connectionless Slave Broadcast Receive - Connectionless Slave Broadcast Timeout - Truncated Page Complete - > HCI Event: Command Complete (0x0e) plen 4 - Set Event Mask Page 2 (0x03|0x0063) ncmd 1 - Status: Unknown HCI Command (0x01) - -In addition the Synchronization Train Received event is actually broken -on this controller. It mixes up the order of parameters. According to the -Bluetooth Core specification the fields are like this: - - struct hci_ev_sync_train_received { - __u8 status; - bdaddr_t bdaddr; - __le32 offset; - __u8 map[10]; - __u8 lt_addr; - __le32 instant; - __le16 interval; - __u8 service_data; - } __packed; - -This controller however sends the service_data as 5th parameter instead -of having it as last parameter. - - struct hci_ev_sync_train_received { - __u8 status; - bdaddr_t bdaddr; - __le32 offset; - __u8 map[10]; - __u8 service_data; - __u8 lt_addr; - __le32 instant; - __le16 interval; - } __packed; - -So anybody trying to use this hardware for utilizing connectionless slave -broadcast receivers (aka 3D Glasses), be warned about this shortcoming. - -Signed-off-by: Marcel Holtmann -Signed-off-by: Johan Hedberg -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/bluetooth/btusb.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -107,6 +107,9 @@ static const struct usb_device_id btusb_ - { USB_DEVICE(0x0489, 0xe042) }, - { USB_DEVICE(0x413c, 0x8197) }, - -+ /* Broadcom BCM20702B0 (Dynex/Insignia) */ -+ { USB_DEVICE(0x19ff, 0x0239), .driver_info = BTUSB_BCM_PATCHRAM }, -+ - /* Foxconn - Hon Hai */ - { USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) }, - diff --git a/queue-3.14/series b/queue-3.14/series index 34611bd80ff..0282333ab80 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -1,5 +1,4 @@ bluetooth-ath3k-workaround-the-compatibility-issue-with-xhci-controller.patch -bluetooth-btusb-add-support-for-dynex-insignia-usb-dongles.patch xfs-ensure-buffer-types-are-set-correctly.patch xfs-inode-unlink-does-not-set-agi-buffer-type.patch xfs-set-superblock-buffer-type-correctly.patch