--- /dev/null
+From a3adb1432d7a3ad86bb17a1638e44414537e4118 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Fri, 7 Dec 2012 18:30:51 +0100
+Subject: ASoC: sigmadsp: Fix endianness conversion issue
+
+From: Lars-Peter Clausen <lars@metafoo.de>
+
+commit a3adb1432d7a3ad86bb17a1638e44414537e4118 upstream.
+
+The 'addr' field of the sigma_action struct is stored as big endian in the
+firmware file.
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/sigmadsp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/sigmadsp.c
++++ b/sound/soc/codecs/sigmadsp.c
+@@ -225,7 +225,7 @@ EXPORT_SYMBOL(process_sigma_firmware);
+ static int sigma_action_write_regmap(void *control_data,
+ const struct sigma_action *sa, size_t len)
+ {
+- return regmap_raw_write(control_data, le16_to_cpu(sa->addr),
++ return regmap_raw_write(control_data, be16_to_cpu(sa->addr),
+ sa->payload, len - 2);
+ }
+
--- /dev/null
+From 72222be39afbd39c16eb180646b0ac44bb1ba460 Mon Sep 17 00:00:00 2001
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Date: Wed, 28 Nov 2012 13:46:56 +0000
+Subject: ASoC: wm8994: Use the same DCS codes for all WM1811 variants
+
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+
+commit 72222be39afbd39c16eb180646b0ac44bb1ba460 upstream.
+
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/wm8994.c | 16 ++--------------
+ 1 file changed, 2 insertions(+), 14 deletions(-)
+
+--- a/sound/soc/codecs/wm8994.c
++++ b/sound/soc/codecs/wm8994.c
+@@ -3839,20 +3839,8 @@ static int wm8994_codec_probe(struct snd
+ wm8994->hubs.no_cache_dac_hp_direct = true;
+ wm8994->fll_byp = true;
+
+- switch (control->cust_id) {
+- case 0:
+- case 2:
+- wm8994->hubs.dcs_codes_l = -9;
+- wm8994->hubs.dcs_codes_r = -7;
+- break;
+- case 1:
+- case 3:
+- wm8994->hubs.dcs_codes_l = -8;
+- wm8994->hubs.dcs_codes_r = -7;
+- break;
+- default:
+- break;
+- }
++ wm8994->hubs.dcs_codes_l = -9;
++ wm8994->hubs.dcs_codes_r = -7;
+
+ snd_soc_update_bits(codec, WM8994_ANALOGUE_HP_1,
+ WM1811_HPOUT1_ATTN, WM1811_HPOUT1_ATTN);
--- /dev/null
+From b3cd8021379306c0be6932e4d3b4b01efc681769 Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Sun, 9 Dec 2012 23:57:09 +0100
+Subject: ath9k: ar9003: fix OTP register offsets for AR9340
+
+From: Gabor Juhos <juhosg@openwrt.org>
+
+commit b3cd8021379306c0be6932e4d3b4b01efc681769 upstream.
+
+Trying to access the OTP memory on the AR9340
+causes a data bus error like this:
+
+ Data bus error, epc == 86e84164, ra == 86e84164
+ Oops[#1]:
+ Cpu 0
+ $ 0 : 00000000 00000061 deadc0de 00000000
+ $ 4 : b8115f18 00015f18 00000007 00000004
+ $ 8 : 00000001 7c7c3c7c 7c7c7c7c 7c7c7c7c
+ $12 : 7c7c3c7c 001f0041 00000000 7c7c7c3c
+ $16 : 86ee0000 00015f18 00000000 00000007
+ $20 : 00000004 00000064 00000004 86d71c44
+ $24 : 00000000 86e6ca00
+ $28 : 86d70000 86d71b20 86ece0c0 86e84164
+ Hi : 00000000
+ Lo : 00000064
+ epc : 86e84164 ath9k_hw_wait+0x58/0xb0 [ath9k_hw]
+ Tainted: G O
+ ra : 86e84164 ath9k_hw_wait+0x58/0xb0 [ath9k_hw]
+ Status: 1100d403 KERNEL EXL IE
+ Cause : 4080801c
+ PrId : 0001974c (MIPS 74Kc)
+ Modules linked in: ath9k(O+) ath9k_common(O) ath9k_hw(O) ath(O) ar934x_nfc
+ mac80211(O) usbcore usb_common scsi_mod nls_base nand nand_ecc nand_ids
+ crc_ccitt cfg80211(O) compat(O) arc4 aes_generic crypto_blkcipher cryptomgr
+ aead crypto_hash crypto_algapi ledtrig_timer ledtrig_default_on leds_gpio
+ Process insmod (pid: 459, threadinfo=86d70000, task=87942140, tls=779ac440)
+ Stack : 802fb500 000200da 804db150 804e0000 87816130 86ee0000 00010000 86d71b88
+ 86d71bc0 00000004 00000003 86e9fcd0 80305300 0002c0d0 86e74c50 800b4c20
+ 000003e8 00000001 00000000 86ee0000 000003ff 86e9fd64 80305300 80123938
+ fffffffc 00000004 000058bc 00000000 86ea0000 86ee0000 000001ff 878d6000
+ 99999999 86e9fdc0 86ee0fcc 86e9e664 0000c0d0 86ee0000 0000700000007000
+ ...
+ Call Trace:
+ [<86e84164>] ath9k_hw_wait+0x58/0xb0 [ath9k_hw]
+ [<86e9fcd0>] ath9k_hw_setup_statusring+0x16b8/0x1c7c [ath9k_hw]
+
+ Code: 0000a812 0040f809 00000000 <00531024> 1054000b 24020001 0c05b5dc 2404000a 26520001
+
+The cause of the error is that the OTP register
+offsets are different on the AR9340 than the
+actually used values.
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+@@ -68,13 +68,13 @@
+ #define AR9300_BASE_ADDR 0x3ff
+ #define AR9300_BASE_ADDR_512 0x1ff
+
+-#define AR9300_OTP_BASE 0x14000
+-#define AR9300_OTP_STATUS 0x15f18
++#define AR9300_OTP_BASE (AR_SREV_9340(ah) ? 0x30000 : 0x14000)
++#define AR9300_OTP_STATUS (AR_SREV_9340(ah) ? 0x30018 : 0x15f18)
+ #define AR9300_OTP_STATUS_TYPE 0x7
+ #define AR9300_OTP_STATUS_VALID 0x4
+ #define AR9300_OTP_STATUS_ACCESS_BUSY 0x2
+ #define AR9300_OTP_STATUS_SM_BUSY 0x1
+-#define AR9300_OTP_READ_DATA 0x15f1c
++#define AR9300_OTP_READ_DATA (AR_SREV_9340(ah) ? 0x3001c : 0x15f1c)
+
+ enum targetPowerHTRates {
+ HT_TARGET_RATE_0_8_16,
--- /dev/null
+From 1680260226a8fd2aab590319da83ad8e610da9bd Mon Sep 17 00:00:00 2001
+From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
+Date: Thu, 25 Oct 2012 17:11:31 +0530
+Subject: ath9k_hw: Enable hw PLL power save for AR9462
+
+From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
+
+commit 1680260226a8fd2aab590319da83ad8e610da9bd upstream.
+
+This reduced the power consumption to half in full and network sleep.
+
+Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
+Cc: Paul Stewart <pstew@chromium.org>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+@@ -219,10 +219,10 @@ static void ar9003_hw_init_mode_regs(str
+
+ /* Awake -> Sleep Setting */
+ INIT_INI_ARRAY(&ah->iniPcieSerdes,
+- ar9462_pciephy_pll_on_clkreq_disable_L1_2p0);
++ ar9462_pciephy_clkreq_disable_L1_2p0);
+ /* Sleep -> Awake Setting */
+ INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
+- ar9462_pciephy_pll_on_clkreq_disable_L1_2p0);
++ ar9462_pciephy_clkreq_disable_L1_2p0);
+
+ /* Fast clock modal settings */
+ INIT_INI_ARRAY(&ah->iniModesFastClock,
--- /dev/null
+From a796a1dd5da9645ad77aa687d1a890ecd63ab5a6 Mon Sep 17 00:00:00 2001
+From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
+Date: Wed, 26 Dec 2012 12:27:39 +0530
+Subject: ath9k_hw: Fix RX gain initvals for AR9485
+
+From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
+
+commit a796a1dd5da9645ad77aa687d1a890ecd63ab5a6 upstream.
+
+Populate iniModesRxGain with the correct initvals
+array for AR9485 v1.1
+
+Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+@@ -540,7 +540,7 @@ static void ar9003_rx_gain_table_mode0(s
+ ar9340Common_rx_gain_table_1p0);
+ else if (AR_SREV_9485_11(ah))
+ INIT_INI_ARRAY(&ah->iniModesRxGain,
+- ar9485Common_wo_xlna_rx_gain_1_1);
++ ar9485_common_rx_gain_1_1);
+ else if (AR_SREV_9550(ah)) {
+ INIT_INI_ARRAY(&ah->iniModesRxGain,
+ ar955x_1p0_common_rx_gain_table);
--- /dev/null
+From b7c0c238898d200e80487516e2b67aba2a522cc0 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 10 Dec 2012 14:03:17 +0100
+Subject: ath9k_hw: Fix signal strength / channel noise reporting
+
+From: Felix Fietkau <nbd@openwrt.org>
+
+commit b7c0c238898d200e80487516e2b67aba2a522cc0 upstream.
+
+While AR_PHY_CCA_NOM_VAL_* does contain the expected internal noise floor
+for a chip measured in clean air, it refers to the lowest expected reading.
+
+Depending on the frequency, this measurement can vary by about 6db, thus
+causing a higher reported channel noise and signal strength.
+
+Factor in the 6db offset when converting internal noisefloor to channel noise.
+
+This patch makes the reported values more accurate for all chips without
+affecting NF calibration behavior.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath9k/calib.c | 1 +
+ drivers/net/wireless/ath/ath9k/calib.h | 3 +++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/net/wireless/ath/ath9k/calib.c
++++ b/drivers/net/wireless/ath/ath9k/calib.c
+@@ -69,6 +69,7 @@ s16 ath9k_hw_getchan_noise(struct ath_hw
+
+ if (chan && chan->noisefloor) {
+ s8 delta = chan->noisefloor -
++ ATH9K_NF_CAL_NOISE_THRESH -
+ ath9k_hw_get_default_nf(ah, chan);
+ if (delta > 0)
+ noise += delta;
+--- a/drivers/net/wireless/ath/ath9k/calib.h
++++ b/drivers/net/wireless/ath/ath9k/calib.h
+@@ -21,6 +21,9 @@
+
+ #define AR_PHY_CCA_FILTERWINDOW_LENGTH 5
+
++/* Internal noise floor can vary by about 6db depending on the frequency */
++#define ATH9K_NF_CAL_NOISE_THRESH 6
++
+ #define NUM_NF_READINGS 6
+ #define ATH9K_NF_CAL_HIST_MAX 5
+
--- /dev/null
+From 6c653f66772c39c5e25db715bbd4730596fccd9e Mon Sep 17 00:00:00 2001
+From: Christian Lamparter <chunkeey@googlemail.com>
+Date: Sat, 22 Dec 2012 04:35:24 +0100
+Subject: carl9170: fix -EINVAL bailout during init with !CONFIG_MAC80211_MESH
+
+From: Christian Lamparter <chunkeey@googlemail.com>
+
+commit 6c653f66772c39c5e25db715bbd4730596fccd9e upstream.
+
+Sean reported that as of 3.7, his AR9170 device no longer works
+because the driver fails during initialization. He noted this
+is due to:
+"In carl9170/fw.c, ar->hw->wiphy is tagged with
+NL80211_IFTYPE_MESH_POINT support if the firmware has Content
+after Beacon Queuing. This is both in interface_modes and the
+only iface_combinations entry.
+
+If CONFIG_MAC80211_MESH is not set, ieee80211_register_hw
+removes NL80211_IFTYPE_MESH_POINT from interface_modes, but
+not iface_combinations.
+
+wiphy_register then checks to see if every interface type in
+every interface combination is in interface_modes.
+NL80211_IFTYPE_MESH_POINT was removed, so you get a WARN_ON
+warning and it returns -EINVAL, giving up."
+
+Unfortunately, the iface_combination (types) feature bitmap
+in ieee80211_iface_limit is part of a const member in the
+ieee80211_iface_combination struct. Hence, the MESH_POINT
+feature flag can't be masked by wiphy_register in the
+same way as interface_modes in ieee80211_register_hw.
+
+Reported-by: Sean Patrick Santos <quantheory@gmail.com>
+Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
+Tested-by: Sean Patrick Santos <quantheory@gmail.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/carl9170/fw.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ath/carl9170/fw.c
++++ b/drivers/net/wireless/ath/carl9170/fw.c
+@@ -341,8 +341,12 @@ static int carl9170_fw(struct ar9170 *ar
+ if (SUPP(CARL9170FW_WLANTX_CAB)) {
+ if_comb_types |=
+ BIT(NL80211_IFTYPE_AP) |
+- BIT(NL80211_IFTYPE_MESH_POINT) |
+ BIT(NL80211_IFTYPE_P2P_GO);
++
++#ifdef CONFIG_MAC80211_MESH
++ if_comb_types |=
++ BIT(NL80211_IFTYPE_MESH_POINT);
++#endif /* CONFIG_MAC80211_MESH */
+ }
+ }
+
--- /dev/null
+From 9d2373420900a39f5212a3b289331aa3535b1000 Mon Sep 17 00:00:00 2001
+From: Stephan Gatzka <stephan.gatzka@gmail.com>
+Date: Wed, 28 Nov 2012 20:04:32 +0100
+Subject: firewire: net: Fix handling of fragmented multicast/broadcast packets.
+
+From: Stephan Gatzka <stephan.gatzka@gmail.com>
+
+commit 9d2373420900a39f5212a3b289331aa3535b1000 upstream.
+
+This patch fixes both the transmit and receive portion of sending
+fragmented mutlicast and broadcast packets.
+
+The transmit section was broken because the offset for INTFRAG and
+LASTFRAG packets were just miscalculated by IEEE1394_GASP_HDR_SIZE (which
+was reserved with skb_push() in fwnet_send_packet).
+
+The receive section was broken because in fwnet_incoming_packet is a call
+to fwnet_peer_find_by_node_id(). Called with generation == -1 it will
+not find a peer and the partial datagrams are associated to a peer.
+
+[Stefan R: The fix to use context->card->generation is not perfect.
+It relies on the IR tasklet which processes packets from the prior bus
+generation to run before the self-ID-complete worklet which sets the
+current card generation. Alas, there is no simple way of a race-free
+implementation. Let's do it this way for now.]
+
+Signed-off-by: Stephan Gatzka <stephan.gatzka@gmail.com>
+Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/firewire/net.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- a/drivers/firewire/net.c
++++ b/drivers/firewire/net.c
+@@ -861,8 +861,8 @@ static void fwnet_receive_broadcast(stru
+ if (specifier_id == IANA_SPECIFIER_ID && ver == RFC2734_SW_VERSION) {
+ buf_ptr += 2;
+ length -= IEEE1394_GASP_HDR_SIZE;
+- fwnet_incoming_packet(dev, buf_ptr, length,
+- source_node_id, -1, true);
++ fwnet_incoming_packet(dev, buf_ptr, length, source_node_id,
++ context->card->generation, true);
+ }
+
+ packet.payload_length = dev->rcv_buffer_size;
+@@ -958,7 +958,12 @@ static void fwnet_transmit_packet_done(s
+ break;
+ }
+
+- skb_pull(skb, ptask->max_payload);
++ if (ptask->dest_node == IEEE1394_ALL_NODES) {
++ skb_pull(skb,
++ ptask->max_payload + IEEE1394_GASP_HDR_SIZE);
++ } else {
++ skb_pull(skb, ptask->max_payload);
++ }
+ if (ptask->outstanding_pkts > 1) {
+ fwnet_make_sf_hdr(&ptask->hdr, RFC2374_HDR_INTFRAG,
+ dg_size, fg_off, datagram_label);
+@@ -1062,7 +1067,7 @@ static int fwnet_send_packet(struct fwne
+ smp_rmb();
+ node_id = dev->card->node_id;
+
+- p = skb_push(ptask->skb, 8);
++ p = skb_push(ptask->skb, IEEE1394_GASP_HDR_SIZE);
+ put_unaligned_be32(node_id << 16 | IANA_SPECIFIER_ID >> 8, p);
+ put_unaligned_be32((IANA_SPECIFIER_ID & 0xff) << 24
+ | RFC2734_SW_VERSION, &p[4]);
--- /dev/null
+From 5b632fe85ec82e5c43740b52e74c66df50a37db3 Mon Sep 17 00:00:00 2001
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: Mon, 3 Dec 2012 12:56:33 +0100
+Subject: mac80211: introduce IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL
+
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+
+commit 5b632fe85ec82e5c43740b52e74c66df50a37db3 upstream.
+
+Commit f0425beda4d404a6e751439b562100b902ba9c98 "mac80211: retry sending
+failed BAR frames later instead of tearing down aggr" caused regression
+on rt2x00 hardware (connection hangs). This regression was fixed by
+commit be03d4a45c09ee5100d3aaaedd087f19bc20d01 "rt2x00: Don't let
+mac80211 send a BAR when an AMPDU subframe fails". But the latter
+commit caused yet another problem reported in
+https://bugzilla.kernel.org/show_bug.cgi?id=42828#c22
+
+After long discussion in this thread:
+http://mid.gmane.org/20121018075615.GA18212@redhat.com
+and testing various alternative solutions, which failed on one or other
+setup, we have no other good fix for the issues like just revert both
+mentioned earlier commits.
+
+To do not affect other hardware which benefit from commit
+f0425beda4d404a6e751439b562100b902ba9c98, instead of reverting it,
+introduce flag that when used will restore mac80211 behaviour before
+the commit.
+
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+[replaced link with mid.gmane.org that has message-id]
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/net/mac80211.h | 5 +++++
+ net/mac80211/status.c | 6 +++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -1253,6 +1253,10 @@ struct ieee80211_tx_control {
+ * @IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF: Use the P2P Device address for any
+ * P2P Interface. This will be honoured even if more than one interface
+ * is supported.
++ *
++ * @IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL: On this hardware TX BA session
++ * should be tear down once BAR frame will not be acked.
++ *
+ */
+ enum ieee80211_hw_flags {
+ IEEE80211_HW_HAS_RATE_CONTROL = 1<<0,
+@@ -1281,6 +1285,7 @@ enum ieee80211_hw_flags {
+ IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 1<<23,
+ IEEE80211_HW_SCAN_WHILE_IDLE = 1<<24,
+ IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25,
++ IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL = 1<<26,
+ };
+
+ /**
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -432,7 +432,11 @@ void ieee80211_tx_status(struct ieee8021
+ IEEE80211_BAR_CTRL_TID_INFO_MASK) >>
+ IEEE80211_BAR_CTRL_TID_INFO_SHIFT;
+
+- ieee80211_set_bar_pending(sta, tid, ssn);
++ if (local->hw.flags &
++ IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL)
++ ieee80211_stop_tx_ba_session(&sta->sta, tid);
++ else
++ ieee80211_set_bar_pending(sta, tid, ssn);
+ }
+ }
+
--- /dev/null
+From 10d73e655cef6e86ea8589dca3df4e495e4900b0 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Fri, 11 Jan 2013 14:31:52 -0800
+Subject: mm: bootmem: fix free_all_bootmem_core() with odd bitmap alignment
+
+From: Max Filippov <jcmvbkbc@gmail.com>
+
+commit 10d73e655cef6e86ea8589dca3df4e495e4900b0 upstream.
+
+Currently free_all_bootmem_core ignores that node_min_pfn may be not
+multiple of BITS_PER_LONG. Eg commit 6dccdcbe2c3e ("mm: bootmem: fix
+checking the bitmap when finally freeing bootmem") shifts vec by lower
+bits of start instead of lower bits of idx. Also
+
+ if (IS_ALIGNED(start, BITS_PER_LONG) && vec == ~0UL)
+
+assumes that vec bit 0 corresponds to start pfn, which is only true when
+node_min_pfn is a multiple of BITS_PER_LONG. Also loop in the else
+clause can double-free pages (e.g. with node_min_pfn == start == 1,
+map[0] == ~0 on 32-bit machine page 32 will be double-freed).
+
+This bug causes the following message during xtensa kernel boot:
+
+ bootmem::free_all_bootmem_core nid=0 start=1 end=8000
+ BUG: Bad page state in process swapper pfn:00001
+ page:d04bd020 count:0 mapcount:-127 mapping: (null) index:0x2
+ page flags: 0x0()
+ Call Trace:
+ bad_page+0x8c/0x9c
+ free_pages_prepare+0x5e/0x88
+ free_hot_cold_page+0xc/0xa0
+ __free_pages+0x24/0x38
+ __free_pages_bootmem+0x54/0x56
+ free_all_bootmem_core$part$11+0xeb/0x138
+ free_all_bootmem+0x46/0x58
+ mem_init+0x25/0xa4
+ start_kernel+0x11e/0x25c
+ should_never_return+0x0/0x3be7
+
+The fix is the following:
+ - always align vec so that its bit 0 corresponds to start
+ - provide BITS_PER_LONG bits in vec, if those bits are available in the
+ map
+ - don't free pages past next start position in the else clause.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Cc: Gavin Shan <shangw@linux.vnet.ibm.com>
+Cc: Johannes Weiner <hannes@cmpxchg.org>
+Cc: Tejun Heo <tj@kernel.org>
+Cc: Yinghai Lu <yinghai@kernel.org>
+Cc: Joonsoo Kim <js1304@gmail.com>
+Cc: Prasad Koya <prasad.koya@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/bootmem.c | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+--- a/mm/bootmem.c
++++ b/mm/bootmem.c
+@@ -185,10 +185,23 @@ static unsigned long __init free_all_boo
+
+ while (start < end) {
+ unsigned long *map, idx, vec;
++ unsigned shift;
+
+ map = bdata->node_bootmem_map;
+ idx = start - bdata->node_min_pfn;
++ shift = idx & (BITS_PER_LONG - 1);
++ /*
++ * vec holds at most BITS_PER_LONG map bits,
++ * bit 0 corresponds to start.
++ */
+ vec = ~map[idx / BITS_PER_LONG];
++
++ if (shift) {
++ vec >>= shift;
++ if (end - start >= BITS_PER_LONG)
++ vec |= ~map[idx / BITS_PER_LONG + 1] <<
++ (BITS_PER_LONG - shift);
++ }
+ /*
+ * If we have a properly aligned and fully unreserved
+ * BITS_PER_LONG block of pages in front of us, free
+@@ -201,19 +214,18 @@ static unsigned long __init free_all_boo
+ count += BITS_PER_LONG;
+ start += BITS_PER_LONG;
+ } else {
+- unsigned long off = 0;
++ unsigned long cur = start;
+
+- vec >>= start & (BITS_PER_LONG - 1);
+- while (vec) {
++ start = ALIGN(start + 1, BITS_PER_LONG);
++ while (vec && cur != start) {
+ if (vec & 1) {
+- page = pfn_to_page(start + off);
++ page = pfn_to_page(cur);
+ __free_pages_bootmem(page, 0);
+ count++;
+ }
+ vec >>= 1;
+- off++;
++ ++cur;
+ }
+- start = ALIGN(start + 1, BITS_PER_LONG);
+ }
+ }
+
--- /dev/null
+From 7964c06d66c76507d8b6b662bffea770c29ef0ce Mon Sep 17 00:00:00 2001
+From: Jason Liu <r64343@freescale.com>
+Date: Fri, 11 Jan 2013 14:31:47 -0800
+Subject: mm: compaction: fix echo 1 > compact_memory return error issue
+
+From: Jason Liu <r64343@freescale.com>
+
+commit 7964c06d66c76507d8b6b662bffea770c29ef0ce upstream.
+
+when run the folloing command under shell, it will return error
+
+ sh/$ echo 1 > /proc/sys/vm/compact_memory
+ sh/$ sh: write error: Bad address
+
+After strace, I found the following log:
+
+ ...
+ write(1, "1\n", 2) = 3
+ write(1, "", 4294967295) = -1 EFAULT (Bad address)
+ write(2, "echo: write error: Bad address\n", 31echo: write error: Bad address
+ ) = 31
+
+This tells system return 3(COMPACT_COMPLETE) after write data to
+compact_memory.
+
+The fix is to make the system just return 0 instead 3(COMPACT_COMPLETE)
+from sysctl_compaction_handler after compaction_nodes finished.
+
+Signed-off-by: Jason Liu <r64343@freescale.com>
+Suggested-by: David Rientjes <rientjes@google.com>
+Acked-by: Mel Gorman <mgorman@suse.de>
+Cc: Rik van Riel <riel@redhat.com>
+Cc: Minchan Kim <minchan@kernel.org>
+Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+Acked-by: David Rientjes <rientjes@google.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/compaction.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/mm/compaction.c
++++ b/mm/compaction.c
+@@ -1174,7 +1174,7 @@ static int compact_node(int nid)
+ }
+
+ /* Compact all nodes in the system */
+-static int compact_nodes(void)
++static void compact_nodes(void)
+ {
+ int nid;
+
+@@ -1183,8 +1183,6 @@ static int compact_nodes(void)
+
+ for_each_online_node(nid)
+ compact_node(nid);
+-
+- return COMPACT_COMPLETE;
+ }
+
+ /* The written value is actually unused, all memory is compacted */
+@@ -1195,7 +1193,7 @@ int sysctl_compaction_handler(struct ctl
+ void __user *buffer, size_t *length, loff_t *ppos)
+ {
+ if (write)
+- return compact_nodes();
++ compact_nodes();
+
+ return 0;
+ }
--- /dev/null
+From c060f943d0929f3e429c5d9522290584f6281d6e Mon Sep 17 00:00:00 2001
+From: Laura Abbott <lauraa@codeaurora.org>
+Date: Fri, 11 Jan 2013 14:31:51 -0800
+Subject: mm: use aligned zone start for pfn_to_bitidx calculation
+
+From: Laura Abbott <lauraa@codeaurora.org>
+
+commit c060f943d0929f3e429c5d9522290584f6281d6e upstream.
+
+The current calculation in pfn_to_bitidx assumes that (pfn -
+zone->zone_start_pfn) >> pageblock_order will return the same bit for
+all pfn in a pageblock. If zone_start_pfn is not aligned to
+pageblock_nr_pages, this may not always be correct.
+
+Consider the following with pageblock order = 10, zone start 2MB:
+
+ pfn | pfn - zone start | (pfn - zone start) >> page block order
+ ----------------------------------------------------------------
+ 0x26000 | 0x25e00 | 0x97
+ 0x26100 | 0x25f00 | 0x97
+ 0x26200 | 0x26000 | 0x98
+ 0x26300 | 0x26100 | 0x98
+
+This means that calling {get,set}_pageblock_migratetype on a single page
+will not set the migratetype for the full block. Fix this by rounding
+down zone_start_pfn when doing the bitidx calculation.
+
+For our use case, the effects of this bug were mostly tied to the fact
+that CMA allocations would either take a long time or fail to happen.
+Depending on the driver using CMA, this could result in anything from
+visual glitches to application failures.
+
+Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
+Acked-by: Mel Gorman <mgorman@suse.de>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/page_alloc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -5506,7 +5506,7 @@ static inline int pfn_to_bitidx(struct z
+ pfn &= (PAGES_PER_SECTION-1);
+ return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS;
+ #else
+- pfn = pfn - zone->zone_start_pfn;
++ pfn = pfn - round_down(zone->zone_start_pfn, pageblock_nr_pages);
+ return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS;
+ #endif /* CONFIG_SPARSEMEM */
+ }
--- /dev/null
+From f7ebaaeb0b4b97b20c1816f11884e7bfe610a2fa Mon Sep 17 00:00:00 2001
+From: Sangbeom Kim <sbkim73@samsung.com>
+Date: Sat, 24 Nov 2012 11:13:28 +0900
+Subject: regulator: s2mps11: Fix ramp delay value shift operation
+
+From: Sangbeom Kim <sbkim73@samsung.com>
+
+commit f7ebaaeb0b4b97b20c1816f11884e7bfe610a2fa upstream.
+
+This patch fix the abnormal ramp delay setting.
+The shift operation was wrong.
+
+Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/regulator/s2mps11.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/regulator/s2mps11.c
++++ b/drivers/regulator/s2mps11.c
+@@ -269,16 +269,16 @@ static __devinit int s2mps11_pmic_probe(
+
+ if (ramp_enable) {
+ if (s2mps11->buck2_ramp)
+- ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6;
++ ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) << 6;
+ if (s2mps11->buck3_ramp || s2mps11->buck4_ramp)
+- ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4;
++ ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) << 4;
+ sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable);
+ }
+
+ ramp_reg &= 0x00;
+- ramp_reg |= get_ramp_delay(s2mps11->ramp_delay5) >> 6;
+- ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) >> 4;
+- ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2;
++ ramp_reg |= get_ramp_delay(s2mps11->ramp_delay5) << 6;
++ ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) << 4;
++ ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) << 2;
+ ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);
+ sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);
+
--- /dev/null
+From 9c170e068636deb3e3f96114034bb711675f0faa Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Thu, 6 Dec 2012 18:40:11 +0100
+Subject: Revert "ath9k_hw: Update AR9003 high_power tx gain table"
+
+From: Felix Fietkau <nbd@openwrt.org>
+
+commit 9c170e068636deb3e3f96114034bb711675f0faa upstream.
+
+This reverts commit f74b9d365ddd33a375802b064f96a5d0e99af7c0.
+
+Turns out reverting commit a240dc7b3c7463bd60cf0a9b2a90f52f78aae0fd
+"ath9k_hw: Updated AR9003 tx gain table for 5GHz" was not enough to
+bring the tx power back to normal levels on devices like the
+Buffalo WZR-HP-G450H, this one needs to be reverted as well.
+
+This revert improves tx power by ~10 db on that device
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Cc: rmanohar@qca.qualcomm.com
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 172 +++++++++----------
+ 1 file changed, 86 insertions(+), 86 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+@@ -534,98 +534,98 @@ static const u32 ar9300_2p2_baseband_cor
+
+ static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
+ /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
+- {0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+- {0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+- {0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
++ {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+- {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+- {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+- {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+- {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+- {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+- {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
+- {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
+- {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
+- {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
+- {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
+- {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
+- {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
+- {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
+- {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
+- {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
+- {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
+- {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
+- {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
+- {0x0000a544, 0x52022470, 0x52022470, 0x3f001861, 0x3f001861},
+- {0x0000a548, 0x55022490, 0x55022490, 0x43001a81, 0x43001a81},
+- {0x0000a54c, 0x59022492, 0x59022492, 0x47001a83, 0x47001a83},
+- {0x0000a550, 0x5d022692, 0x5d022692, 0x4a001c84, 0x4a001c84},
+- {0x0000a554, 0x61022892, 0x61022892, 0x4e001ce3, 0x4e001ce3},
+- {0x0000a558, 0x65024890, 0x65024890, 0x52001ce5, 0x52001ce5},
+- {0x0000a55c, 0x69024892, 0x69024892, 0x56001ce9, 0x56001ce9},
+- {0x0000a560, 0x6e024c92, 0x6e024c92, 0x5a001ceb, 0x5a001ceb},
+- {0x0000a564, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a568, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a56c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a570, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a574, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a578, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a57c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+- {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+- {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
+- {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
+- {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
+- {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
+- {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
+- {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
+- {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
+- {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
+- {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
+- {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
+- {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
+- {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
+- {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
+- {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
+- {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
+- {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
+- {0x0000a5c4, 0x52822470, 0x52822470, 0x3f801861, 0x3f801861},
+- {0x0000a5c8, 0x55822490, 0x55822490, 0x43801a81, 0x43801a81},
+- {0x0000a5cc, 0x59822492, 0x59822492, 0x47801a83, 0x47801a83},
+- {0x0000a5d0, 0x5d822692, 0x5d822692, 0x4a801c84, 0x4a801c84},
+- {0x0000a5d4, 0x61822892, 0x61822892, 0x4e801ce3, 0x4e801ce3},
+- {0x0000a5d8, 0x65824890, 0x65824890, 0x52801ce5, 0x52801ce5},
+- {0x0000a5dc, 0x69824892, 0x69824892, 0x56801ce9, 0x56801ce9},
+- {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x5a801ceb, 0x5a801ceb},
+- {0x0000a5e4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5e8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5ec, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5f0, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5f4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5f8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+- {0x0000a5fc, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
++ {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
++ {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
++ {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
++ {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
++ {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
++ {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
++ {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
++ {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
++ {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
++ {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
++ {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
++ {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
++ {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
++ {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
++ {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
++ {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
++ {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
++ {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
++ {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
++ {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
++ {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
++ {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
++ {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
++ {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
++ {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
++ {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
++ {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++ {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
++ {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
++ {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
++ {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
++ {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
++ {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
++ {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
++ {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
++ {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
++ {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
++ {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
++ {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
++ {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
++ {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
++ {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
++ {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
++ {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
++ {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
++ {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
++ {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
++ {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
++ {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
++ {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
++ {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
++ {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
++ {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++ {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+ {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+- {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+- {0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
+- {0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
+- {0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
+- {0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
+- {0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
+- {0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
+- {0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+- {0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+- {0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+- {0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+- {0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+- {0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+- {0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+- {0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
++ {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
++ {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
++ {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
++ {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
++ {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
++ {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
++ {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
++ {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++ {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+- {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+- {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+- {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
++ {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++ {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++ {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+ {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+ {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
kvm-fix-user-memslot-overlap-check.patch
s390-cio-fix-pgid-reserved-check.patch
mips-fix-poweroff-failure-when-hotplug_cpu-configured.patch
+mm-compaction-fix-echo-1-compact_memory-return-error-issue.patch
+mm-use-aligned-zone-start-for-pfn_to_bitidx-calculation.patch
+mm-bootmem-fix-free_all_bootmem_core-with-odd-bitmap-alignment.patch
+ath9k_hw-enable-hw-pll-power-save-for-ar9462.patch
+revert-ath9k_hw-update-ar9003-high_power-tx-gain-table.patch
+ath9k-ar9003-fix-otp-register-offsets-for-ar9340.patch
+ath9k_hw-fix-signal-strength-channel-noise-reporting.patch
+ath9k_hw-fix-rx-gain-initvals-for-ar9485.patch
+mac80211-introduce-ieee80211_hw_teardown_aggr_on_bar_fail.patch
+carl9170-fix-einval-bailout-during-init-with-config_mac80211_mesh.patch
+firewire-net-fix-handling-of-fragmented-multicast-broadcast-packets.patch
+watchdog-fix-disable-enable-regression.patch
+asoc-wm8994-use-the-same-dcs-codes-for-all-wm1811-variants.patch
+asoc-sigmadsp-fix-endianness-conversion-issue.patch
+regulator-s2mps11-fix-ramp-delay-value-shift-operation.patch
--- /dev/null
+From 3935e89505a1c3ab3f3b0c7ef0eae54124f48905 Mon Sep 17 00:00:00 2001
+From: Bjørn Mork <bjorn@mork.no>
+Date: Wed, 19 Dec 2012 20:51:31 +0100
+Subject: watchdog: Fix disable/enable regression
+
+From: Bjørn Mork <bjorn@mork.no>
+
+commit 3935e89505a1c3ab3f3b0c7ef0eae54124f48905 upstream.
+
+Commit 8d4516904b39 ("watchdog: Fix CPU hotplug regression") causes an
+oops or hard lockup when doing
+
+ echo 0 > /proc/sys/kernel/nmi_watchdog
+ echo 1 > /proc/sys/kernel/nmi_watchdog
+
+and the kernel is booted with nmi_watchdog=1 (default)
+
+Running laptop-mode-tools and disconnecting/connecting AC power will
+cause this to trigger, making it a common failure scenario on laptops.
+
+Instead of bailing out of watchdog_disable() when !watchdog_enabled we
+can initialize the hrtimer regardless of watchdog_enabled status. This
+makes it safe to call watchdog_disable() in the nmi_watchdog=0 case,
+without the negative effect on the enabled => disabled => enabled case.
+
+All these tests pass with this patch:
+- nmi_watchdog=1
+ echo 0 > /proc/sys/kernel/nmi_watchdog
+ echo 1 > /proc/sys/kernel/nmi_watchdog
+
+- nmi_watchdog=0
+ echo 0 > /sys/devices/system/cpu/cpu1/online
+
+- nmi_watchdog=0
+ echo mem > /sys/power/state
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=51661
+
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Cc: Norbert Warmuth <nwarmuth@t-online.de>
+Cc: Joseph Salisbury <joseph.salisbury@canonical.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/watchdog.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+--- a/kernel/watchdog.c
++++ b/kernel/watchdog.c
+@@ -343,6 +343,10 @@ static void watchdog_enable(unsigned int
+ {
+ struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
+
++ /* kick off the timer for the hardlockup detector */
++ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++ hrtimer->function = watchdog_timer_fn;
++
+ if (!watchdog_enabled) {
+ kthread_park(current);
+ return;
+@@ -351,10 +355,6 @@ static void watchdog_enable(unsigned int
+ /* Enable the perf event */
+ watchdog_nmi_enable(cpu);
+
+- /* kick off the timer for the hardlockup detector */
+- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+- hrtimer->function = watchdog_timer_fn;
+-
+ /* done here because hrtimer_start can only pin to smp_processor_id() */
+ hrtimer_start(hrtimer, ns_to_ktime(get_sample_period()),
+ HRTIMER_MODE_REL_PINNED);
+@@ -368,9 +368,6 @@ static void watchdog_disable(unsigned in
+ {
+ struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
+
+- if (!watchdog_enabled)
+- return;
+-
+ watchdog_set_prio(SCHED_NORMAL, 0);
+ hrtimer_cancel(hrtimer);
+ /* disable the perf event */
projects / thirdparty / kernel / stable-queue.git / commitdiff
