]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.0-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Apr 2012 16:12:13 +0000 (09:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Apr 2012 16:12:13 +0000 (09:12 -0700)
added patches:
ath9k-fix-max-noise-floor-threshold.patch
fcaps-clear-the-same-personality-flags-as-suid-when-fcaps-are-used.patch
serial-pl011-clear-pending-interrupts.patch
serial-pl011-move-interrupt-clearing.patch
xhci-add-xhci_reset_on_resume-quirk-for-via-xhci-host.patch

queue-3.0/ath9k-fix-max-noise-floor-threshold.patch [new file with mode: 0644]
queue-3.0/fcaps-clear-the-same-personality-flags-as-suid-when-fcaps-are-used.patch [new file with mode: 0644]
queue-3.0/serial-pl011-clear-pending-interrupts.patch [new file with mode: 0644]
queue-3.0/serial-pl011-move-interrupt-clearing.patch [new file with mode: 0644]
queue-3.0/series
queue-3.0/xhci-add-xhci_reset_on_resume-quirk-for-via-xhci-host.patch [new file with mode: 0644]

diff --git a/queue-3.0/ath9k-fix-max-noise-floor-threshold.patch b/queue-3.0/ath9k-fix-max-noise-floor-threshold.patch
new file mode 100644 (file)
index 0000000..9fa2e39
--- /dev/null
@@ -0,0 +1,53 @@
+From 6d19cb7b3325e6c460db0f07f178793f4500783a Mon Sep 17 00:00:00 2001
+From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
+Date: Thu, 15 Mar 2012 06:08:04 +0530
+Subject: [PATCH] ath9k: fix max noise floor threshold
+
+From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
+
+commit 2ee0a07028d2cde6e131b73f029dae2b93c50f3a upstream.
+
+Currently the maximum noise floor limit is set as too high (-60dB). The
+assumption of having a higher threshold limit is that it would help
+de-sensitize the receiver (reduce phy errors) from continuous
+interference. But when we have a bursty interference where there are
+collisions and then free air time and if the receiver is desensitized too
+much, it will miss the normal packets too. Lets make use of chips
+specific min, nom and max limits always. This patch helps to improve the
+connection stability in congested networks.
+
+Cc: Paul Stewart <pstew@google.com>
+Tested-by: Gary Morain <gmorain@google.com>
+Signed-off-by: Madhan Jaganathan <madhanj@qca.qualcomm.com>
+Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+[bwh: Backported to 3.0/3.2: adjust context]
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/ath/ath9k/calib.c |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath9k/calib.c
++++ b/drivers/net/wireless/ath/ath9k/calib.c
+@@ -19,7 +19,6 @@
+ /* Common calibration code */
+-#define ATH9K_NF_TOO_HIGH     -60
+ static int16_t ath9k_hw_get_nf_hist_mid(int16_t *nfCalBuffer)
+ {
+@@ -335,10 +334,10 @@ static void ath9k_hw_nf_sanitize(struct
+                       "NF calibrated [%s] [chain %d] is %d\n",
+                       (i >= 3 ? "ext" : "ctl"), i % 3, nf[i]);
+-              if (nf[i] > ATH9K_NF_TOO_HIGH) {
++              if (nf[i] > limit->max) {
+                       ath_dbg(common, ATH_DBG_CALIBRATE,
+                               "NF[%d] (%d) > MAX (%d), correcting to MAX\n",
+-                              i, nf[i], ATH9K_NF_TOO_HIGH);
++                              i, nf[i], limit->max);
+                       nf[i] = limit->max;
+               } else if (nf[i] < limit->min) {
+                       ath_dbg(common, ATH_DBG_CALIBRATE,
diff --git a/queue-3.0/fcaps-clear-the-same-personality-flags-as-suid-when-fcaps-are-used.patch b/queue-3.0/fcaps-clear-the-same-personality-flags-as-suid-when-fcaps-are-used.patch
new file mode 100644 (file)
index 0000000..e603b40
--- /dev/null
@@ -0,0 +1,38 @@
+From d52fc5dde171f030170a6cb78034d166b13c9445 Mon Sep 17 00:00:00 2001
+From: Eric Paris <eparis@redhat.com>
+Date: Tue, 17 Apr 2012 16:26:54 -0400
+Subject: fcaps: clear the same personality flags as suid when fcaps are used
+
+From: Eric Paris <eparis@redhat.com>
+
+commit d52fc5dde171f030170a6cb78034d166b13c9445 upstream.
+
+If a process increases permissions using fcaps all of the dangerous
+personality flags which are cleared for suid apps should also be cleared.
+Thus programs given priviledge with fcaps will continue to have address space
+randomization enabled even if the parent tried to disable it to make it
+easier to attack.
+
+Signed-off-by: Eric Paris <eparis@redhat.com>
+Reviewed-by: Serge Hallyn <serge.hallyn@canonical.com>
+Signed-off-by: James Morris <james.l.morris@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ security/commoncap.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -510,6 +510,11 @@ int cap_bprm_set_creds(struct linux_binp
+       }
+ skip:
++      /* if we have fs caps, clear dangerous personality flags */
++      if (!cap_issubset(new->cap_permitted, old->cap_permitted))
++              bprm->per_clear |= PER_CLEAR_ON_SETID;
++
++
+       /* Don't let someone trace a set[ug]id/setpcap binary with the revised
+        * credentials unless they have the appropriate permit
+        */
diff --git a/queue-3.0/serial-pl011-clear-pending-interrupts.patch b/queue-3.0/serial-pl011-clear-pending-interrupts.patch
new file mode 100644 (file)
index 0000000..64a4e24
--- /dev/null
@@ -0,0 +1,80 @@
+From 9b96fbacda34079dea0638ee1e92c56286f6114a Mon Sep 17 00:00:00 2001
+From: Linus Walleij <linus.walleij@linaro.org>
+Date: Tue, 13 Mar 2012 13:27:23 +0100
+Subject: serial: PL011: clear pending interrupts
+
+From: Linus Walleij <linus.walleij@linaro.org>
+
+commit 9b96fbacda34079dea0638ee1e92c56286f6114a upstream.
+
+Chanho Min reported that when the boot loader transfers
+control to the kernel, there may be pending interrupts
+causing the UART to lock up in an eternal loop trying to
+pick tokens from the FIFO (since the RX interrupt flag
+indicates there are tokens) while in practice there are
+no tokens - in fact there is only a pending IRQ flag.
+
+This patch address the issue with a combination of two
+patches suggested by Russell King that clears and mask
+all interrupts at probe() and clears any pending error
+and RX interrupts at port startup time.
+
+We suspect the spurious interrupts are a side-effect of
+switching the UART from FIFO to non-FIFO mode.
+
+Cc: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
+Reported-by: Chanho Min <chanho0207@gmail.com>
+Suggested-by: Russell King <linux@arm.linux.org.uk>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Reviewed-by: Jong-Sung Kim <neidhard.kim@lge.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/amba-pl011.c |   15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+--- a/drivers/tty/serial/amba-pl011.c
++++ b/drivers/tty/serial/amba-pl011.c
+@@ -1376,6 +1376,10 @@ static int pl011_startup(struct uart_por
+       uap->port.uartclk = clk_get_rate(uap->clk);
++      /* Clear pending error and receive interrupts */
++      writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS |
++             UART011_RTIS | UART011_RXIS, uap->port.membase + UART011_ICR);
++
+       /*
+        * Allocate the IRQ
+        */
+@@ -1410,10 +1414,6 @@ static int pl011_startup(struct uart_por
+       cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
+       writew(cr, uap->port.membase + UART011_CR);
+-      /* Clear pending error interrupts */
+-      writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS,
+-             uap->port.membase + UART011_ICR);
+-
+       /*
+        * initialise the old status of the modem signals
+        */
+@@ -1428,6 +1428,9 @@ static int pl011_startup(struct uart_por
+        * as well.
+        */
+       spin_lock_irq(&uap->port.lock);
++      /* Clear out any spuriously appearing RX interrupts */
++       writew(UART011_RTIS | UART011_RXIS,
++              uap->port.membase + UART011_ICR);
+       uap->im = UART011_RTIM;
+       if (!pl011_dma_rx_running(uap))
+               uap->im |= UART011_RXIM;
+@@ -1904,6 +1907,10 @@ static int pl011_probe(struct amba_devic
+               goto unmap;
+       }
++      /* Ensure interrupts from this UART are masked and cleared */
++      writew(0, uap->port.membase + UART011_IMSC);
++      writew(0xffff, uap->port.membase + UART011_ICR);
++
+       uap->vendor = vendor;
+       uap->lcrh_rx = vendor->lcrh_rx;
+       uap->lcrh_tx = vendor->lcrh_tx;
diff --git a/queue-3.0/serial-pl011-move-interrupt-clearing.patch b/queue-3.0/serial-pl011-move-interrupt-clearing.patch
new file mode 100644 (file)
index 0000000..4fee507
--- /dev/null
@@ -0,0 +1,53 @@
+From c3d8b76f61586714cdc5f219ba45592a54caaa55 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <linus.walleij@linaro.org>
+Date: Wed, 21 Mar 2012 20:15:18 +0100
+Subject: serial: PL011: move interrupt clearing
+
+From: Linus Walleij <linus.walleij@linaro.org>
+
+commit c3d8b76f61586714cdc5f219ba45592a54caaa55 upstream.
+
+Commit 360f748b204275229f8398cb2f9f53955db1503b
+"serial: PL011: clear pending interrupts"
+attempts to clear interrupts by writing to a
+yet-unassigned memory address. This fixes the issue.
+
+The breaking patch is marked for stable so should be
+carried along with the other patch.
+
+Cc: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
+Cc: Russell King <linux@arm.linux.org.uk>
+Cc: Nicolas Pitre <nico@fluxnic.net>
+Reported-by: Viresh Kumar <viresh.kumar@st.com>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Tested-by: Grant Likely <grant.likely@secretlab.ca>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/amba-pl011.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/tty/serial/amba-pl011.c
++++ b/drivers/tty/serial/amba-pl011.c
+@@ -1907,10 +1907,6 @@ static int pl011_probe(struct amba_devic
+               goto unmap;
+       }
+-      /* Ensure interrupts from this UART are masked and cleared */
+-      writew(0, uap->port.membase + UART011_IMSC);
+-      writew(0xffff, uap->port.membase + UART011_ICR);
+-
+       uap->vendor = vendor;
+       uap->lcrh_rx = vendor->lcrh_rx;
+       uap->lcrh_tx = vendor->lcrh_tx;
+@@ -1927,6 +1923,10 @@ static int pl011_probe(struct amba_devic
+       uap->port.line = i;
+       pl011_dma_probe(uap);
++      /* Ensure interrupts from this UART are masked and cleared */
++      writew(0, uap->port.membase + UART011_IMSC);
++      writew(0xffff, uap->port.membase + UART011_ICR);
++
+       snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev));
+       amba_ports[i] = uap;
index d644729875e4ecad2c707d55e1d5fc3a98ff7562..3f9d1136d80d0e2a12abddb2acbc4639ea735522 100644 (file)
@@ -24,3 +24,8 @@ xhci-don-t-re-enable-ie-constantly.patch
 xhci-don-t-write-zeroed-pointers-to-xhc-registers.patch
 xhci-restore-event-ring-dequeue-pointer-on-resume.patch
 xhci-correct-the-define-xhci_legacy_disable_smi.patch
+xhci-add-xhci_reset_on_resume-quirk-for-via-xhci-host.patch
+serial-pl011-clear-pending-interrupts.patch
+serial-pl011-move-interrupt-clearing.patch
+fcaps-clear-the-same-personality-flags-as-suid-when-fcaps-are-used.patch
+ath9k-fix-max-noise-floor-threshold.patch
diff --git a/queue-3.0/xhci-add-xhci_reset_on_resume-quirk-for-via-xhci-host.patch b/queue-3.0/xhci-add-xhci_reset_on_resume-quirk-for-via-xhci-host.patch
new file mode 100644 (file)
index 0000000..aa39896
--- /dev/null
@@ -0,0 +1,41 @@
+From 457a4f61f9bfc3ae76e5b49f30f25d86bb696f67 Mon Sep 17 00:00:00 2001
+From: Elric Fu <elricfu1@gmail.com>
+Date: Thu, 29 Mar 2012 15:47:50 +0800
+Subject: xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host
+
+From: Elric Fu <elricfu1@gmail.com>
+
+commit 457a4f61f9bfc3ae76e5b49f30f25d86bb696f67 upstream.
+
+The suspend operation of VIA xHCI host have some issues and
+hibernate operation works fine, so The XHCI_RESET_ON_RESUME
+quirk is added for it.
+
+This patch should base on "xHCI: Don't write zeroed pointer
+to xHC registers" that is released by Sarah. Otherwise, the
+host system error will ocurr in the hibernate operation
+process.
+
+This should be backported to stable kernels as old as 2.6.37,
+that contain the commit c877b3b2ad5cb9d4fe523c5496185cc328ff3ae9
+"xhci: Add reset on resume quirk for asrock p67 host".
+
+Signed-off-by: Elric Fu <elricfu1@gmail.com>
+Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/xhci-pci.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -145,6 +145,8 @@ static int xhci_pci_setup(struct usb_hcd
+               xhci->quirks |= XHCI_RESET_ON_RESUME;
+               xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
+       }
++      if (pdev->vendor == PCI_VENDOR_ID_VIA)
++              xhci->quirks |= XHCI_RESET_ON_RESUME;
+       /* Make sure the HC is halted. */
+       retval = xhci_halt(xhci);