From 04e184b70717a9c5ae8e14c13d3bca01b856e1c7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 Feb 2014 08:22:31 -0800 Subject: [PATCH] fix up 3.4 patches so the tree builds. Basically delete a bunch of patches... --- ...-disk-hotplug-for-armada-370-xp-socs.patch | 95 ------------------- ...-definitions-in-the-dm_common-header.patch | 48 ---------- ...o-save-restore-power-index-registers.patch | 62 ------------ ...2cu-update-the-power-index-registers.patch | 47 --------- ...ate-beacon-statistics-for-usb-driver.patch | 31 ------ queue-3.4/series | 5 - 6 files changed, 288 deletions(-) delete mode 100644 queue-3.4/ata-sata_mv-fix-disk-hotplug-for-armada-370-xp-socs.patch delete mode 100644 queue-3.4/rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch delete mode 100644 queue-3.4/rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch delete mode 100644 queue-3.4/rtlwifi-rtl8192cu-update-the-power-index-registers.patch delete mode 100644 queue-3.4/rtlwifi-update-beacon-statistics-for-usb-driver.patch diff --git a/queue-3.4/ata-sata_mv-fix-disk-hotplug-for-armada-370-xp-socs.patch b/queue-3.4/ata-sata_mv-fix-disk-hotplug-for-armada-370-xp-socs.patch deleted file mode 100644 index 7dbc81fc223..00000000000 --- a/queue-3.4/ata-sata_mv-fix-disk-hotplug-for-armada-370-xp-socs.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 9013d64e661fc2a37a1742670202171c27fef4b5 Mon Sep 17 00:00:00 2001 -From: Lior Amsalem -Date: Tue, 14 Jan 2014 20:09:57 +0100 -Subject: ata: sata_mv: fix disk hotplug for Armada 370/XP SoCs - -From: Lior Amsalem - -commit 9013d64e661fc2a37a1742670202171c27fef4b5 upstream. - -On Armada 370/XP SoCs, once a disk is removed from a SATA port, then the -re-plug events are not detected by the sata_mv driver. This patch fixes -the issue by updating the PHY speed in the LP_PHY_CTL register (0x58) -according to the SControl speed. - -Note that this fix is only applied if the compatible string -"marvell,armada-370-sata" is found in the SATA DT node. - -Fixes: 9ae6f740b49f ("arm: mach-mvebu: add support for Armada 370 and Armada XP with DT") -Signed-off-by: Lior Amsalem -Signed-off-by: Nadav Haklai -Signed-off-by: Simon Guinot -Cc: Thomas Petazzoni -Cc: Jason Cooper -Cc: Andrew Lunn -Cc: Gregory Clement -Cc: Sebastian Hesselbarth -Acked-by: Jason Cooper -Signed-off-by: Tejun Heo -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/ata/sata_mv.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - ---- a/drivers/ata/sata_mv.c -+++ b/drivers/ata/sata_mv.c -@@ -302,6 +302,7 @@ enum { - MV5_LTMODE = 0x30, - MV5_PHY_CTL = 0x0C, - SATA_IFCFG = 0x050, -+ LP_PHY_CTL = 0x058, - - MV_M2_PREAMP_MASK = 0x7e0, - -@@ -429,6 +430,7 @@ enum { - MV_HP_CUT_THROUGH = (1 << 10), /* can use EDMA cut-through */ - MV_HP_FLAG_SOC = (1 << 11), /* SystemOnChip, no PCI */ - MV_HP_QUIRK_LED_BLINK_EN = (1 << 12), /* is led blinking enabled? */ -+ MV_HP_FIX_LP_PHY_CTL = (1 << 13), /* fix speed in LP_PHY_CTL ? */ - - /* Port private flags (pp_flags) */ - MV_PP_FLAG_EDMA_EN = (1 << 0), /* is EDMA engine enabled? */ -@@ -1348,6 +1350,7 @@ static int mv_scr_write(struct ata_link - - if (ofs != 0xffffffffU) { - void __iomem *addr = mv_ap_base(link->ap) + ofs; -+ struct mv_host_priv *hpriv = link->ap->host->private_data; - if (sc_reg_in == SCR_CONTROL) { - /* - * Workaround for 88SX60x1 FEr SATA#26: -@@ -1364,6 +1367,18 @@ static int mv_scr_write(struct ata_link - */ - if ((val & 0xf) == 1 || (readl(addr) & 0xf) == 1) - val |= 0xf000; -+ -+ if (hpriv->hp_flags & MV_HP_FIX_LP_PHY_CTL) { -+ void __iomem *lp_phy_addr = -+ mv_ap_base(link->ap) + LP_PHY_CTL; -+ /* -+ * Set PHY speed according to SControl speed. -+ */ -+ if ((val & 0xf0) == 0x10) -+ writelfl(0x7, lp_phy_addr); -+ else -+ writelfl(0x227, lp_phy_addr); -+ } - } - writelfl(val, addr); - return 0; -@@ -4082,6 +4097,15 @@ static int mv_platform_probe(struct plat - if (rc) - goto err; - -+ /* -+ * To allow disk hotplug on Armada 370/XP SoCs, the PHY speed must be -+ * updated in the LP_PHY_CTL register. -+ */ -+ if (pdev->dev.of_node && -+ of_device_is_compatible(pdev->dev.of_node, -+ "marvell,armada-370-sata")) -+ hpriv->hp_flags |= MV_HP_FIX_LP_PHY_CTL; -+ - /* initialize adapter */ - rc = mv_init_host(host); - if (rc) diff --git a/queue-3.4/rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch b/queue-3.4/rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch deleted file mode 100644 index 29ae8d8df35..00000000000 --- a/queue-3.4/rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c908c74e005de780fddbe8cb6fcd44803f5d4b74 Mon Sep 17 00:00:00 2001 -From: Larry Finger -Date: Mon, 18 Nov 2013 11:11:29 -0600 -Subject: rtlwifi: rtl8192c: Add new definitions in the dm_common header - -From: Larry Finger - -commit c908c74e005de780fddbe8cb6fcd44803f5d4b74 upstream. - -Changes in the gain-control mechanism will require some changes in the header. - -Signed-off-by: Larry Finger -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - ---- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h -+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h -@@ -125,6 +125,17 @@ struct dig_t { - u8 cur_ccasate; - }; - -+#define DYNAMIC_FUNC_DISABLE 0x0 -+#define DYNAMIC_FUNC_DIG BIT(0) -+#define DYNAMIC_FUNC_HP BIT(1) -+#define DYNAMIC_FUNC_SS BIT(2) /*Tx Power Tracking*/ -+#define DYNAMIC_FUNC_BT BIT(3) -+#define DYNAMIC_FUNC_ANT_DIV BIT(4) -+ -+#define RSSI_CCK 0 -+#define RSSI_OFDM 1 -+#define RSSI_DEFAULT 2 -+ - struct swat_t { - u8 failure_cnt; - u8 try_flag; -@@ -202,5 +213,8 @@ void rtl92c_phy_lc_calibrate(struct ieee - void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery); - void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw); - void rtl92c_dm_bt_coexist(struct ieee80211_hw *hw); -+void dm_savepowerindex(struct ieee80211_hw *hw); -+void dm_writepowerindex(struct ieee80211_hw *hw, u8 value); -+void dm_restorepowerindex(struct ieee80211_hw *hw); - - #endif diff --git a/queue-3.4/rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch b/queue-3.4/rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch deleted file mode 100644 index b0bea1ce276..00000000000 --- a/queue-3.4/rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 97204e93f01868eeba6ae5c4f3270f32905bb418 Mon Sep 17 00:00:00 2001 -From: Larry Finger -Date: Mon, 18 Nov 2013 11:11:32 -0600 -Subject: rtlwifi: rtl8192c: Add routines to save/restore power index registers - -From: Larry Finger - -commit 97204e93f01868eeba6ae5c4f3270f32905bb418 upstream. - -Signed-off-by: Larry Finger -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 36 ++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - ---- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c -+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c -@@ -161,6 +161,42 @@ static const u8 cckswing_table_ch14[CCK_ - {0x09, 0x08, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00} - }; - -+static u32 power_index_reg[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; -+ -+void dm_restorepowerindex(struct ieee80211_hw *hw) -+{ -+ struct rtl_priv *rtlpriv = rtl_priv(hw); -+ u8 index; -+ -+ for (index = 0; index < 6; index++) -+ rtl_write_byte(rtlpriv, power_index_reg[index], -+ rtlpriv->dm.powerindex_backup[index]); -+} -+EXPORT_SYMBOL_GPL(dm_restorepowerindex); -+ -+void dm_writepowerindex(struct ieee80211_hw *hw, u8 value) -+{ -+ struct rtl_priv *rtlpriv = rtl_priv(hw); -+ u8 index; -+ -+ for (index = 0; index < 6; index++) -+ rtl_write_byte(rtlpriv, power_index_reg[index], value); -+} -+EXPORT_SYMBOL_GPL(dm_writepowerindex); -+ -+void dm_savepowerindex(struct ieee80211_hw *hw) -+{ -+ struct rtl_priv *rtlpriv = rtl_priv(hw); -+ u8 index; -+ u8 tmp; -+ -+ for (index = 0; index < 6; index++) { -+ tmp = rtl_read_byte(rtlpriv, power_index_reg[index]); -+ rtlpriv->dm.powerindex_backup[index] = tmp; -+ } -+} -+EXPORT_SYMBOL_GPL(dm_savepowerindex); -+ - static void rtl92c_dm_diginit(struct ieee80211_hw *hw) - { - dm_digtable.dig_enable_flag = true; diff --git a/queue-3.4/rtlwifi-rtl8192cu-update-the-power-index-registers.patch b/queue-3.4/rtlwifi-rtl8192cu-update-the-power-index-registers.patch deleted file mode 100644 index bc7c79e17de..00000000000 --- a/queue-3.4/rtlwifi-rtl8192cu-update-the-power-index-registers.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9806eacf5de27ab01d680c5d75c92a3a89734e4f Mon Sep 17 00:00:00 2001 -From: Larry Finger -Date: Mon, 18 Nov 2013 11:11:33 -0600 -Subject: rtlwifi: rtl8192cu: Update the power index registers - -From: Larry Finger - -commit 9806eacf5de27ab01d680c5d75c92a3a89734e4f upstream. - -This patch uses the newly introduced power index register routines. - -Signed-off-by: Larry Finger -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 9 +++++++++ - drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 3 +++ - 2 files changed, 12 insertions(+) - ---- a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c -+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c -@@ -107,6 +107,15 @@ void rtl92cu_dm_dynamic_txpower(struct i - "PHY_SetTxPowerLevel8192S() Channel = %d\n", - rtlphy->current_channel); - rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel); -+ if (rtlpriv->dm.dynamic_txhighpower_lvl == -+ TXHIGHPWRLEVEL_NORMAL) -+ dm_restorepowerindex(hw); -+ else if (rtlpriv->dm.dynamic_txhighpower_lvl == -+ TXHIGHPWRLEVEL_LEVEL1) -+ dm_writepowerindex(hw, 0x14); -+ else if (rtlpriv->dm.dynamic_txhighpower_lvl == -+ TXHIGHPWRLEVEL_LEVEL2) -+ dm_writepowerindex(hw, 0x10); - } - - rtlpriv->dm.last_dtp_lvl = rtlpriv->dm.dynamic_txhighpower_lvl; ---- a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h -+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h -@@ -30,3 +30,6 @@ - #include "../rtl8192ce/dm.h" - - void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw); -+void dm_savepowerindex(struct ieee80211_hw *hw); -+void dm_writepowerindex(struct ieee80211_hw *hw, u8 value); -+void dm_restorepowerindex(struct ieee80211_hw *hw); diff --git a/queue-3.4/rtlwifi-update-beacon-statistics-for-usb-driver.patch b/queue-3.4/rtlwifi-update-beacon-statistics-for-usb-driver.patch deleted file mode 100644 index 7bfd58e62ad..00000000000 --- a/queue-3.4/rtlwifi-update-beacon-statistics-for-usb-driver.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 65b9cc97c6852fae19dc5c7745e9abc8dd380aad Mon Sep 17 00:00:00 2001 -From: Larry Finger -Date: Mon, 18 Nov 2013 11:11:31 -0600 -Subject: rtlwifi: Update beacon statistics for USB driver - -From: Larry Finger - -commit 65b9cc97c6852fae19dc5c7745e9abc8dd380aad upstream. - -The USB drivers were not updating the beacon statistics, which led to -false beacon loss indications. - -Signed-off-by: Larry Finger -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/rtlwifi/usb.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/net/wireless/rtlwifi/usb.c -+++ b/drivers/net/wireless/rtlwifi/usb.c -@@ -480,6 +480,8 @@ static void _rtl_usb_rx_process_agg(stru - if (unicast) - rtlpriv->link_info.num_rx_inperiod++; - } -+ /* static bcn for roaming */ -+ rtl_beacon_statistic(hw, skb); - } - } - diff --git a/queue-3.4/series b/queue-3.4/series index 90a662db945..dbbe2ef9433 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -8,11 +8,7 @@ usb-cypress_m8-fix-ring-indicator-detection-and-reporting.patch usb-nokia-502-is-an-unusual-device.patch usb-xhci-check-for-xhci_plat-in-xhci_cleanup_msix.patch rtlwifi-rtl8192cu-add-new-device-id.patch -rtlwifi-update-beacon-statistics-for-usb-driver.patch rtlwifi-set-the-link-state.patch -rtlwifi-rtl8192c-add-new-definitions-in-the-dm_common-header.patch -rtlwifi-rtl8192c-add-routines-to-save-restore-power-index-registers.patch -rtlwifi-rtl8192cu-update-the-power-index-registers.patch rtlwifi-rtl8192cu-fix-some-code-in-rf-handling.patch b43-fix-lockdep-splat.patch b43-fix-unload-oops-if-firmware-is-not-available.patch @@ -29,5 +25,4 @@ rtc-cmos-add-an-alarm-disable-quirk.patch asoc-adau1701-fix-adau1701_seroctl_word_len_16-constant.patch alsa-rme9652-fix-a-missing-comma-in-channel_map_9636_ds.patch alsa-enable-config_zone_dma-for-smaller-pci-dma-masks.patch -ata-sata_mv-fix-disk-hotplug-for-armada-370-xp-socs.patch hp_accel-add-a-new-pnp-id-hpq6007-for-new-hp-laptops.patch -- 2.47.2