Linux v4.0.2
This commit is contained in:
Justin M. Forbes
parent
5448a3eac2
commit
df7af79594
|
|
@ -1,71 +0,0 @@
|
|||
From: Alexander Ploumistos <alex.ploumistos@gmail.com>
|
||||
Date: Fri, 13 Feb 2015 21:05:11 +0200
|
||||
Subject: [PATCH] Bluetooth: ath3k: Add support Atheros AR5B195 combo Mini PCIe
|
||||
card
|
||||
|
||||
Add 04f2:aff1 to ath3k.c supported devices list and btusb.c blacklist, so
|
||||
that the device can load the ath3k firmware and re-enumerate itself as an
|
||||
AR3011 device.
|
||||
|
||||
T: Bus=05 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0
|
||||
D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
|
||||
P: Vendor=04f2 ProdID=aff1 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=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=e0(wlcon) 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=e0(wlcon) 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=e0(wlcon) 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=e0(wlcon) 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=e0(wlcon) 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=e0(wlcon) 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
|
||||
|
||||
Signed-off-by: Alexander Ploumistos <alexpl@fedoraproject.org>
|
||||
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
||||
Cc: stable@vger.kernel.org
|
||||
---
|
||||
drivers/bluetooth/ath3k.c | 1 +
|
||||
drivers/bluetooth/btusb.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
|
||||
index de4c8499cbac..288547a3c566 100644
|
||||
--- a/drivers/bluetooth/ath3k.c
|
||||
+++ b/drivers/bluetooth/ath3k.c
|
||||
@@ -65,6 +65,7 @@ static const struct usb_device_id ath3k_table[] = {
|
||||
/* Atheros AR3011 with sflash firmware*/
|
||||
{ USB_DEVICE(0x0489, 0xE027) },
|
||||
{ USB_DEVICE(0x0489, 0xE03D) },
|
||||
+ { USB_DEVICE(0x04F2, 0xAFF1) },
|
||||
{ USB_DEVICE(0x0930, 0x0215) },
|
||||
{ USB_DEVICE(0x0CF3, 0x3002) },
|
||||
{ USB_DEVICE(0x0CF3, 0xE019) },
|
||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||
index 8bfc4c2bba87..2c527da668ae 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -159,6 +159,7 @@ static const struct usb_device_id blacklist_table[] = {
|
||||
/* Atheros 3011 with sflash firmware */
|
||||
{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
|
||||
{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
|
||||
+ { USB_DEVICE(0x04f2, 0xaff1), .driver_info = BTUSB_IGNORE },
|
||||
{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
|
||||
{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
|
||||
{ USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },
|
||||
--
|
||||
2.1.0
|
||||
|
||||
19
kernel.spec
19
kernel.spec
|
|
@ -52,7 +52,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 1
|
||||
%define stable_update 2
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
|
@ -608,9 +608,6 @@ Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
|
|||
#CVE-2015-0275 rhbz 1193907 1195178
|
||||
Patch26138: ext4-Allocate-entire-range-in-zero-range.patch
|
||||
|
||||
#rhbz 1190947
|
||||
Patch26139: Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
|
||||
|
||||
#rhbz 1196825
|
||||
Patch26140: security-yama-Remove-unnecessary-selects-from-Kconfi.patch
|
||||
|
||||
|
|
@ -642,10 +639,6 @@ Patch26184: 0001-ALSA-hda-realtek-Support-headset-mode-for-ALC286-288.patch
|
|||
#rhbz 1208999
|
||||
Patch26177: SCSI-add-1024-max-sectors-black-list-flag.patch
|
||||
|
||||
#rhbz 1211017 1211013
|
||||
Patch26190: nfs-fix-DIO-good-bytes-calculation.patch
|
||||
Patch26191: nfs-remove-WARN_ON_ONCE-from-nfs_direct_good_bytes.patch
|
||||
|
||||
#rhbz 1210857
|
||||
Patch26192: blk-loop-avoid-too-many-pending-per-work-IO.patch
|
||||
|
||||
|
|
@ -1380,9 +1373,6 @@ ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
|
|||
#CVE-2015-0275 rhbz 1193907 1195178
|
||||
ApplyPatch ext4-Allocate-entire-range-in-zero-range.patch
|
||||
|
||||
#rhbz 1190947
|
||||
ApplyPatch Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
|
||||
|
||||
#rhbz 1196825
|
||||
ApplyPatch security-yama-Remove-unnecessary-selects-from-Kconfi.patch
|
||||
|
||||
|
|
@ -1414,10 +1404,6 @@ ApplyPatch 0001-ALSA-hda-realtek-Support-headset-mode-for-ALC286-288.patch
|
|||
#rhbz 1208999
|
||||
ApplyPatch SCSI-add-1024-max-sectors-black-list-flag.patch
|
||||
|
||||
#rhbz 1211017 1211013
|
||||
ApplyPatch nfs-fix-DIO-good-bytes-calculation.patch
|
||||
ApplyPatch nfs-remove-WARN_ON_ONCE-from-nfs_direct_good_bytes.patch
|
||||
|
||||
#rhbz 1210857
|
||||
ApplyPatch blk-loop-avoid-too-many-pending-per-work-IO.patch
|
||||
|
||||
|
|
@ -2280,6 +2266,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu May 07 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 4.0.2-300
|
||||
- Linux v4.0.2
|
||||
|
||||
* Tue May 05 2015 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Backport patch to blacklist TRIM on all Samsung 8xx series SSDs (rhbz 1218662)
|
||||
- CVE-2015-3636 ping-sockets use-after-free privilege escalation (rhbz 1218074 1218110)
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
From: Peng Tao <tao.peng@primarydata.com>
|
||||
Date: Thu, 9 Apr 2015 23:02:16 +0800
|
||||
Subject: [PATCH] nfs: fix DIO good bytes calculation
|
||||
|
||||
For direct read that has IO size larger than rsize, we'll split
|
||||
it into several READ requests and nfs_direct_good_bytes() would
|
||||
count completed bytes incorrectly by eating last zero count reply.
|
||||
|
||||
Fix it by handling mirror and non-mirror cases differently such that
|
||||
we only count mirrored writes differently.
|
||||
|
||||
This fixes 5fadeb47("nfs: count DIO good bytes correctly with mirroring").
|
||||
|
||||
Reported-by: Jean Spector <jean@primarydata.com>
|
||||
Cc: <stable@vger.kernel.org> # v3.19+
|
||||
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
|
||||
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
|
||||
---
|
||||
fs/nfs/direct.c | 29 +++++++++++++++++------------
|
||||
1 file changed, 17 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
|
||||
index e907c8cf732e..5e451a75132d 100644
|
||||
--- a/fs/nfs/direct.c
|
||||
+++ b/fs/nfs/direct.c
|
||||
@@ -131,20 +131,25 @@ nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr)
|
||||
|
||||
WARN_ON_ONCE(hdr->pgio_mirror_idx >= dreq->mirror_count);
|
||||
|
||||
- count = dreq->mirrors[hdr->pgio_mirror_idx].count;
|
||||
- if (count + dreq->io_start < hdr->io_start + hdr->good_bytes) {
|
||||
- count = hdr->io_start + hdr->good_bytes - dreq->io_start;
|
||||
- dreq->mirrors[hdr->pgio_mirror_idx].count = count;
|
||||
- }
|
||||
-
|
||||
- /* update the dreq->count by finding the minimum agreed count from all
|
||||
- * mirrors */
|
||||
- count = dreq->mirrors[0].count;
|
||||
+ if (dreq->mirror_count == 1) {
|
||||
+ dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;
|
||||
+ dreq->count += hdr->good_bytes;
|
||||
+ } else {
|
||||
+ /* mirrored writes */
|
||||
+ count = dreq->mirrors[hdr->pgio_mirror_idx].count;
|
||||
+ if (count + dreq->io_start < hdr->io_start + hdr->good_bytes) {
|
||||
+ count = hdr->io_start + hdr->good_bytes - dreq->io_start;
|
||||
+ dreq->mirrors[hdr->pgio_mirror_idx].count = count;
|
||||
+ }
|
||||
+ /* update the dreq->count by finding the minimum agreed count from all
|
||||
+ * mirrors */
|
||||
+ count = dreq->mirrors[0].count;
|
||||
|
||||
- for (i = 1; i < dreq->mirror_count; i++)
|
||||
- count = min(count, dreq->mirrors[i].count);
|
||||
+ for (i = 1; i < dreq->mirror_count; i++)
|
||||
+ count = min(count, dreq->mirrors[i].count);
|
||||
|
||||
- dreq->count = count;
|
||||
+ dreq->count = count;
|
||||
+ }
|
||||
}
|
||||
|
||||
/*
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From: Peng Tao <tao.peng@primarydata.com>
|
||||
Date: Thu, 9 Apr 2015 23:02:17 +0800
|
||||
Subject: [PATCH] nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
|
||||
|
||||
For flexfiles driver, we might choose to read from mirror index other
|
||||
than 0 while mirror_count is always 1 for read.
|
||||
|
||||
Reported-by: Jean Spector <jean@primarydata.com>
|
||||
Cc: <stable@vger.kernel.org> # v3.19+
|
||||
Cc: Weston Andros Adamson <dros@primarydata.com>
|
||||
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
|
||||
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
|
||||
---
|
||||
fs/nfs/direct.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
|
||||
index 5e451a75132d..ab21ef16a11a 100644
|
||||
--- a/fs/nfs/direct.c
|
||||
+++ b/fs/nfs/direct.c
|
||||
@@ -129,8 +129,6 @@ nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr)
|
||||
int i;
|
||||
ssize_t count;
|
||||
|
||||
- WARN_ON_ONCE(hdr->pgio_mirror_idx >= dreq->mirror_count);
|
||||
-
|
||||
if (dreq->mirror_count == 1) {
|
||||
dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;
|
||||
dreq->count += hdr->good_bytes;
|
||||
--
|
||||
2.1.0
|
||||
|
||||
Loading…
Reference in New Issue