浏览代码

Update v5.7 patches

Changes:
- SAM
  - Properly re-enable events after hibernation.
  - Other bugfixes.
  - Continued work on internal documentation.

- mwifiex
  - Fix bug causing network connection failure on certain networks.

Links:
- SAM: https://github.com/linux-surface/surface-aggregator-module/commit/735a01f74b6eb3f0bb790f4b687a98002b49d289
- mwifiex: https://lkml.org/lkml/2020/8/27/642
- kernel: https://github.com/linux-surface/kernel/commit/d9aab7bed97e403f744b77dc4ecfd708bc3bb181
Maximilian Luz 4 年之前
父节点
当前提交
441a362da9

+ 1 - 1
patches/5.7/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 343739da78ef1ce9473603dc0b25d7840ee96aa9 Mon Sep 17 00:00:00 2001
+From df1edc75db3143735131a735b2895e9f738e9781 Mon Sep 17 00:00:00 2001
 From: Chih-Wei Huang <cwhuang@linux.org.tw>
 Date: Tue, 18 Sep 2018 11:01:37 +0800
 Subject: [PATCH 1/6] surface3-oemb

+ 39 - 2
patches/5.7/0002-wifi.patch

@@ -1,13 +1,15 @@
-From b1cacc77a3021c286248e98858a497024955dfa4 Mon Sep 17 00:00:00 2001
+From 8ff6f12fa7093981493e63b56830bd22f634750c Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Thu, 20 Feb 2020 16:51:11 +0900
 Subject: [PATCH 2/6] wifi
 
 ---
  .../net/wireless/marvell/mwifiex/cfg80211.c   | 26 ++++++
+ drivers/net/wireless/marvell/mwifiex/fw.h     |  2 +-
  drivers/net/wireless/marvell/mwifiex/pcie.c   | 84 +++++++++++--------
  .../net/wireless/marvell/mwifiex/sta_cmd.c    | 31 ++-----
- 3 files changed, 84 insertions(+), 57 deletions(-)
+ .../wireless/marvell/mwifiex/sta_cmdresp.c    |  4 +-
+ 5 files changed, 87 insertions(+), 60 deletions(-)
 
 diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
 index 12bfd653a4052..68404a1767945 100644
@@ -53,6 +55,19 @@ index 12bfd653a4052..68404a1767945 100644
  	return mwifiex_drv_set_power(priv, &ps_mode);
  }
  
+diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
+index a415d73a73e62..d55e70a411d77 100644
+--- a/drivers/net/wireless/marvell/mwifiex/fw.h
++++ b/drivers/net/wireless/marvell/mwifiex/fw.h
+@@ -953,7 +953,7 @@ struct mwifiex_tkip_param {
+ struct mwifiex_aes_param {
+ 	u8 pn[WPA_PN_SIZE];
+ 	__le16 key_len;
+-	u8 key[WLAN_KEY_LEN_CCMP];
++	u8 key[WLAN_KEY_LEN_CCMP_256];
+ } __packed;
+ 
+ struct mwifiex_wapi_param {
 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
 index 87b4ccca4b9a2..3bdad5e80ecbb 100644
 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -250,6 +265,28 @@ index 0bd93f26bd7f8..91b03423c09d0 100644
  
  	if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
  		/* Send cmd to FW to enable/disable 11D function */
+diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+index 962d8bfe6f101..119ccacd1fcc4 100644
+--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
++++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+@@ -619,7 +619,7 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv,
+ 	key_v2 = &resp->params.key_material_v2;
+ 
+ 	len = le16_to_cpu(key_v2->key_param_set.key_params.aes.key_len);
+-	if (len > WLAN_KEY_LEN_CCMP)
++	if (len > sizeof(key_v2->key_param_set.key_params.aes.key))
+ 		return -EINVAL;
+ 
+ 	if (le16_to_cpu(key_v2->action) == HostCmd_ACT_GEN_SET) {
+@@ -635,7 +635,7 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv,
+ 		return 0;
+ 
+ 	memset(priv->aes_key_v2.key_param_set.key_params.aes.key, 0,
+-	       WLAN_KEY_LEN_CCMP);
++	       sizeof(key_v2->key_param_set.key_params.aes.key));
+ 	priv->aes_key_v2.key_param_set.key_params.aes.key_len =
+ 				cpu_to_le16(len);
+ 	memcpy(priv->aes_key_v2.key_param_set.key_params.aes.key,
 -- 
 2.28.0
 

+ 1 - 1
patches/5.7/0003-ipts.patch

@@ -1,4 +1,4 @@
-From 43907bdd270cbe3efa05226264beb926d6d3ad15 Mon Sep 17 00:00:00 2001
+From 420424e40c197a09ad3d53a5f63cf8cb6cf6e623 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 27 Jan 2020 21:16:20 +0100
 Subject: [PATCH 3/6] ipts

文件差异内容过多而无法显示
+ 411 - 117
patches/5.7/0004-surface-sam.patch


+ 1 - 1
patches/5.7/0005-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From ee647c89454ae9be8c5d805d91563dc15d69d94e Mon Sep 17 00:00:00 2001
+From 6504bcec6db69f55f5b94c1aa4ac5112f64bb9a2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH 5/6] surface-sam-over-hid

+ 1 - 1
patches/5.7/0006-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 35efe438183b4be2b03711529f7707f6facfc8d3 Mon Sep 17 00:00:00 2001
+From a151e4b8740bd6dd4fe439a217a58f24f5127621 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 16 Aug 2020 23:39:56 +0200
 Subject: [PATCH 6/6] surface-gpe

部分文件因为文件数量过多而无法显示