4.14-stable patches

added patches:
	rtlwifi-btcoex-add-power_on_setting-routine.patch

diff --git a/queue-4.14/rdma-mlx4-add-missed-rss-hash-inner-header-flag.patch b/queue-4.14/rdma-mlx4-add-missed-rss-hash-inner-header-flag.patch
deleted file mode 100644 (file)
index ada4b94..0000000
--- a/queue-4.14/rdma-mlx4-add-missed-rss-hash-inner-header-flag.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4f9ca2d8686ecfdd40ca4f0294a3d94f83f05cea Mon Sep 17 00:00:00 2001
-From: Leon Romanovsky <leonro@mellanox.com>
-Date: Thu, 26 Apr 2018 15:37:48 +0300
-Subject: RDMA/mlx4: Add missed RSS hash inner header flag
-
-From: Leon Romanovsky <leonro@mellanox.com>
-
-commit 4f9ca2d8686ecfdd40ca4f0294a3d94f83f05cea upstream.
-
-Despite being advertised to user space application, the RSS inner
-header flag was filtered by checks at the beginning of QP creation
-routine.
-
-Cc: <stable@vger.kernel.org> # 4.15
-Fixes: 4d02ebd9bbbd ("IB/mlx4: Fix RSS hash fields restrictions")
-Fixes: 07d84f7b6adf ("IB/mlx4: Add support to RSS hash for inner headers")
-Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
-Signed-off-by: Doug Ledford <dledford@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/infiniband/hw/mlx4/qp.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/mlx4/qp.c
-+++ b/drivers/infiniband/hw/mlx4/qp.c
-@@ -673,7 +673,8 @@ static int set_qp_rss(struct mlx4_ib_dev
-                                         MLX4_IB_RX_HASH_SRC_PORT_TCP  |
-                                         MLX4_IB_RX_HASH_DST_PORT_TCP  |
-                                         MLX4_IB_RX_HASH_SRC_PORT_UDP  |
--                                        MLX4_IB_RX_HASH_DST_PORT_UDP)) {
-+                                        MLX4_IB_RX_HASH_DST_PORT_UDP  |
-+                                        MLX4_IB_RX_HASH_INNER)) {
-               pr_debug("RX Hash fields_mask has unsupported mask (0x%llx)\n",
-                        ucmd->rx_hash_fields_mask);
-               return (-EOPNOTSUPP);

diff --git a/queue-4.14/rtlwifi-btcoex-add-power_on_setting-routine.patch b/queue-4.14/rtlwifi-btcoex-add-power_on_setting-routine.patch
new file mode 100644 (file)
index 0000000..a098573
--- /dev/null
+++ b/queue-4.14/rtlwifi-btcoex-add-power_on_setting-routine.patch
@@ -0,0 +1,76 @@
+From a44709bba70fb9badc44b6a551415b152db13182 Mon Sep 17 00:00:00 2001
+From: Ping-Ke Shih <pkshih@realtek.com>
+Date: Wed, 17 Jan 2018 14:15:26 +0800
+Subject: rtlwifi: btcoex: Add power_on_setting routine
+
+From: Ping-Ke Shih <pkshih@realtek.com>
+
+commit a44709bba70fb9badc44b6a551415b152db13182 upstream.
+
+After mac power-on sequence, wifi will start to work so notify btcoex the
+event to configure registers especially related to antenna. This will not
+only help to assign antenna but also to yield better user experience.
+
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h |    1 +
+ drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c      |    6 ++++++
+ drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h      |    1 +
+ drivers/net/wireless/realtek/rtlwifi/wifi.h                   |    1 +
+ 4 files changed, 9 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
++++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
+@@ -601,6 +601,7 @@ extern struct btc_coexist gl_bt_coexist;
+ 
+ bool exhalbtc_initlize_variables(void);
+ bool exhalbtc_bind_bt_coex_withadapter(void *adapter);
++void exhalbtc_power_on_setting(struct btc_coexist *btcoexist);
+ void exhalbtc_init_hw_config(struct btc_coexist *btcoexist, bool wifi_only);
+ void exhalbtc_init_coex_dm(struct btc_coexist *btcoexist);
+ void exhalbtc_ips_notify(struct btc_coexist *btcoexist, u8 type);
+--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
++++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
+@@ -32,6 +32,7 @@
+ static struct rtl_btc_ops rtl_btc_operation = {
+       .btc_init_variables = rtl_btc_init_variables,
+       .btc_init_hal_vars = rtl_btc_init_hal_vars,
++      .btc_power_on_setting = rtl_btc_power_on_setting,
+       .btc_init_hw_config = rtl_btc_init_hw_config,
+       .btc_ips_notify = rtl_btc_ips_notify,
+       .btc_lps_notify = rtl_btc_lps_notify,
+@@ -110,6 +111,11 @@ void rtl_btc_init_hal_vars(struct rtl_pr
+        */
+ }
+ 
++void rtl_btc_power_on_setting(struct rtl_priv *rtlpriv)
++{
++      exhalbtc_power_on_setting(&gl_bt_coexist);
++}
++
+ void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv)
+ {
+       u8 bt_exist;
+--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
++++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
+@@ -29,6 +29,7 @@
+ 
+ void rtl_btc_init_variables(struct rtl_priv *rtlpriv);
+ void rtl_btc_init_hal_vars(struct rtl_priv *rtlpriv);
++void rtl_btc_power_on_setting(struct rtl_priv *rtlpriv);
+ void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv);
+ void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type);
+ void rtl_btc_lps_notify(struct rtl_priv *rtlpriv, u8 type);
+--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
++++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
+@@ -2545,6 +2545,7 @@ struct bt_coexist_info {
+ struct rtl_btc_ops {
+       void (*btc_init_variables) (struct rtl_priv *rtlpriv);
+       void (*btc_init_hal_vars) (struct rtl_priv *rtlpriv);
++      void (*btc_power_on_setting)(struct rtl_priv *rtlpriv);
+       void (*btc_init_hw_config) (struct rtl_priv *rtlpriv);
+       void (*btc_ips_notify) (struct rtl_priv *rtlpriv, u8 type);
+       void (*btc_lps_notify)(struct rtl_priv *rtlpriv, u8 type);

diff --git a/queue-4.14/rtlwifi-cleanup-8723be-ant_sel-definition.patch b/queue-4.14/rtlwifi-cleanup-8723be-ant_sel-definition.patch
index ba88e2b53b5aa3e90d050f0177c9dc2016249e9c..88c4e4fcf3c4304a8b6933fe9b0f570b2a205c5b 100644 (file)
--- a/queue-4.14/rtlwifi-cleanup-8723be-ant_sel-definition.patch
+++ b/queue-4.14/rtlwifi-cleanup-8723be-ant_sel-definition.patch
@@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
 +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
-@@ -2707,6 +2707,11 @@ enum bt_ant_num {
+@@ -2708,6 +2708,11 @@ enum bt_ant_num {
        ANT_X1 = 1,
  };
  

diff --git a/queue-4.14/series b/queue-4.14/series
index 3dea4e1e484439629c88d984cfad839ed89381f1..1acd1edeff74cc826d1e9c75efdfb82d0046d5b0 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -12,12 +12,12 @@ tracepoint-do-not-warn-on-enomem.patch
 scsi-target-fix-fortify_panic-kernel-exception.patch
 input-leds-fix-out-of-bound-access.patch
 input-atmel_mxt_ts-add-touchpad-button-mapping-for-samsung-chromebook-pro.patch
+rtlwifi-btcoex-add-power_on_setting-routine.patch
 rtlwifi-cleanup-8723be-ant_sel-definition.patch
 xfs-prevent-creating-negative-sized-file-via-insert_range.patch
 rdma-cxgb4-release-hw-resources-on-device-removal.patch
 rdma-ucma-allow-resolving-address-w-o-specifying-source-address.patch
 rdma-mlx5-fix-multiple-null-ptr-deref-errors-in-rereg_mr-flow.patch
-rdma-mlx4-add-missed-rss-hash-inner-header-flag.patch
 rdma-mlx5-protect-from-shift-operand-overflow.patch
 net-usb-qmi_wwan-add-support-for-ublox-r410m-pid-0x90b2.patch
 ib-mlx5-use-unlimited-rate-when-static-rate-is-not-supported.patch