From: Greg Kroah-Hartman Date: Fri, 26 Jun 2015 04:24:05 +0000 (-0700) Subject: 4.0-stable patches X-Git-Tag: v3.10.82~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b51887716fd3dda86297b790392ddce21e6e9035;p=thirdparty%2Fkernel%2Fstable-queue.git 4.0-stable patches added patches: ath3k-add-support-of-0489-e076-ar3012-device.patch ath3k-add-support-of-13d3-3474-ar3012-device.patch b43-fix-support-for-14e4-4321-pci-dev-with-bcm4321-chipset.patch --- diff --git a/queue-4.0/ath3k-add-support-of-0489-e076-ar3012-device.patch b/queue-4.0/ath3k-add-support-of-0489-e076-ar3012-device.patch new file mode 100644 index 00000000000..4ebe0c380c0 --- /dev/null +++ b/queue-4.0/ath3k-add-support-of-0489-e076-ar3012-device.patch @@ -0,0 +1,79 @@ +From 692c062e7c282164fd7cda68077f79dafd176eaf Mon Sep 17 00:00:00 2001 +From: Dmitry Tunin +Date: Sat, 6 Jun 2015 20:25:40 +0300 +Subject: ath3k: Add support of 0489:e076 AR3012 device + +From: Dmitry Tunin + +commit 692c062e7c282164fd7cda68077f79dafd176eaf upstream. + +BugLink: https://bugs.launchpad.net/bugs/1462614 + +This device requires new firmware files + AthrBT_0x11020100.dfu and ramps_0x11020100_40.dfu added to +/lib/firmware/ar3k/ that are not included in linux-firmware yet. + +T: Bus=03 Lev=01 Prnt=01 Port=09 Cnt=06 Dev#= 7 Spd=12 MxCh= 0 +D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0489 ProdID=e076 Rev= 0.01 +C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) +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=e0(wlcon) Sub=01 Prot=01 Driver=(none) +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=e0(wlcon) Sub=01 Prot=01 Driver=(none) +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=e0(wlcon) Sub=01 Prot=01 Driver=(none) +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=e0(wlcon) Sub=01 Prot=01 Driver=(none) +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=e0(wlcon) Sub=01 Prot=01 Driver=(none) +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=e0(wlcon) Sub=01 Prot=01 Driver=(none) +E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms +E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms + +Signed-off-by: Dmitry Tunin +Signed-off-by: Marcel Holtmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/bluetooth/ath3k.c | 2 ++ + drivers/bluetooth/btusb.c | 1 + + 2 files changed, 3 insertions(+) + +--- a/drivers/bluetooth/ath3k.c ++++ b/drivers/bluetooth/ath3k.c +@@ -80,6 +80,7 @@ static const struct usb_device_id ath3k_ + { USB_DEVICE(0x0489, 0xe057) }, + { USB_DEVICE(0x0489, 0xe056) }, + { USB_DEVICE(0x0489, 0xe05f) }, ++ { USB_DEVICE(0x0489, 0xe076) }, + { USB_DEVICE(0x0489, 0xe078) }, + { USB_DEVICE(0x04c5, 0x1330) }, + { USB_DEVICE(0x04CA, 0x3004) }, +@@ -135,6 +136,7 @@ static const struct usb_device_id ath3k_ + { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, ++ { USB_DEVICE(0x0489, 0xe076), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -174,6 +174,7 @@ static const struct usb_device_id blackl + { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, ++ { USB_DEVICE(0x0489, 0xe076), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, diff --git a/queue-4.0/ath3k-add-support-of-13d3-3474-ar3012-device.patch b/queue-4.0/ath3k-add-support-of-13d3-3474-ar3012-device.patch new file mode 100644 index 00000000000..3f7e85e0498 --- /dev/null +++ b/queue-4.0/ath3k-add-support-of-13d3-3474-ar3012-device.patch @@ -0,0 +1,59 @@ +From 0d0cef6183aec0fb6d0c9f00a09ff51ee086bbe2 Mon Sep 17 00:00:00 2001 +From: Dmitry Tunin +Date: Sat, 6 Jun 2015 20:29:25 +0300 +Subject: ath3k: add support of 13d3:3474 AR3012 device + +From: Dmitry Tunin + +commit 0d0cef6183aec0fb6d0c9f00a09ff51ee086bbe2 upstream. + +BugLink: https://bugs.launchpad.net/bugs/1427680 + +This device requires new firmware files + AthrBT_0x11020100.dfu and ramps_0x11020100_40.dfu added to +/lib/firmware/ar3k/ that are not included in linux-firmware yet. + +T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 +D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=13d3 ProdID=3474 Rev=00.01 +C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA +I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb + +Signed-off-by: Dmitry Tunin +Signed-off-by: Marcel Holtmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/bluetooth/ath3k.c | 2 ++ + drivers/bluetooth/btusb.c | 1 + + 2 files changed, 3 insertions(+) + +--- a/drivers/bluetooth/ath3k.c ++++ b/drivers/bluetooth/ath3k.c +@@ -112,6 +112,7 @@ static const struct usb_device_id ath3k_ + { USB_DEVICE(0x13d3, 0x3408) }, + { USB_DEVICE(0x13d3, 0x3423) }, + { USB_DEVICE(0x13d3, 0x3432) }, ++ { USB_DEVICE(0x13d3, 0x3474) }, + + /* Atheros AR5BBU12 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE02C) }, +@@ -168,6 +169,7 @@ static const struct usb_device_id ath3k_ + { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 }, ++ { USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 }, + + /* Atheros AR5BBU22 with sflash firmware */ + { USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 }, +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -206,6 +206,7 @@ static const struct usb_device_id blackl + { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 }, ++ { USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 }, + + /* Atheros AR5BBU12 with sflash firmware */ + { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, diff --git a/queue-4.0/b43-fix-support-for-14e4-4321-pci-dev-with-bcm4321-chipset.patch b/queue-4.0/b43-fix-support-for-14e4-4321-pci-dev-with-bcm4321-chipset.patch new file mode 100644 index 00000000000..a8468085779 --- /dev/null +++ b/queue-4.0/b43-fix-support-for-14e4-4321-pci-dev-with-bcm4321-chipset.patch @@ -0,0 +1,41 @@ +From 90f91b129810c3f169e443252be30ed7c0130326 Mon Sep 17 00:00:00 2001 +From: Rafał Miłecki +Date: Sat, 6 Jun 2015 22:45:59 +0200 +Subject: b43: fix support for 14e4:4321 PCI dev with BCM4321 chipset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +commit 90f91b129810c3f169e443252be30ed7c0130326 upstream. + +It seems Broadcom released two devices with conflicting device id. There +are for sure 14e4:4321 PCI devices with BCM4321 (N-PHY) chipset, they +can be found in routers, e.g. Netgear WNR834Bv2. However, according to +Broadcom public sources 0x4321 is also used for 5 GHz BCM4306 (G-PHY). +It's unsure if they meant PCI device id, or "virtual" id (from SPROM). +To distinguish these devices lets check PHY type (G vs. N). + +Signed-off-by: Rafał Miłecki +Cc: # 3.16+ +Signed-off-by: Kalle Valo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/b43/main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -5365,6 +5365,10 @@ static void b43_supported_bands(struct b + *have_5ghz_phy = true; + return; + case 0x4321: /* BCM4306 */ ++ /* There are 14e4:4321 PCI devs with 2.4 GHz BCM4321 (N-PHY) */ ++ if (dev->phy.type != B43_PHYTYPE_G) ++ break; ++ /* fall through */ + case 0x4313: /* BCM4311 */ + case 0x431a: /* BCM4318 */ + case 0x432a: /* BCM4321 */ diff --git a/queue-4.0/series b/queue-4.0/series index 45fd487d495..b121036d4ef 100644 --- a/queue-4.0/series +++ b/queue-4.0/series @@ -11,3 +11,6 @@ drm-mgag200-reject-non-character-cell-aligned-mode-widths.patch drm-i915-always-reset-vma-ggtt_view.pages-cache-on-unbinding.patch revert-drm-i915-don-t-skip-request-retirement-if-the-active-list-is-empty.patch drm-radeon-add-radeon_info_va_unmap_working-query.patch +ath3k-add-support-of-0489-e076-ar3012-device.patch +ath3k-add-support-of-13d3-3474-ar3012-device.patch +b43-fix-support-for-14e4-4321-pci-dev-with-bcm4321-chipset.patch