Browse Source

Update v5.8 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/50b5cf34b800574978b784c952d7ef7558797924
Maximilian Luz 4 years ago
parent
commit
8611b6e18e

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

@@ -1,4 +1,4 @@
-From 9d7f494a8b1c8703603c31f6b4a6b994450f2877 Mon Sep 17 00:00:00 2001
+From e56ab1f796646568a6f183bc64cbbbe615e3ec3d 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.8/0002-wifi.patch

@@ -1,13 +1,15 @@
-From 80e6d8710e46395a451ba732804f431d0c7346ca Mon Sep 17 00:00:00 2001
+From 4e625be82e0c20fd760e84c51c90b12129178e39 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 4e4f59c17ded3..528eedfbf41c9 100644
@@ -53,6 +55,19 @@ index 4e4f59c17ded3..528eedfbf41c9 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 8047e307892e3..d9f8bdbc817b2 100644
+--- a/drivers/net/wireless/marvell/mwifiex/fw.h
++++ b/drivers/net/wireless/marvell/mwifiex/fw.h
+@@ -954,7 +954,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 8bd355d7974e9..256c8c38deee3 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.8/0003-ipts.patch

@@ -1,4 +1,4 @@
-From e90476ee50f502a86f532ea2d5dd9d2e25f3da7a Mon Sep 17 00:00:00 2001
+From 617b52707ec79582c381c551cc77c53a3ee12c21 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Thu, 30 Jul 2020 13:21:53 +0200
 Subject: [PATCH 3/6] ipts

File diff suppressed because it is too large
+ 411 - 117
patches/5.8/0004-surface-sam.patch


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

@@ -1,4 +1,4 @@
-From 411f731cdc03327b4c5cafd15556b56e648d0aa5 Mon Sep 17 00:00:00 2001
+From 6e0b3fb32080f8059019df7ee0bc0aec064ae7e7 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.8/0006-surface-gpe.patch

@@ -1,4 +1,4 @@
-From 7529ebaf6c23335f4684b39a6a2040c69327319a Mon Sep 17 00:00:00 2001
+From d82b636e7d95da69503a18f55dea28503c23511a 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

+ 6 - 6
pkg/arch/kernel/PKGBUILD

@@ -40,12 +40,12 @@ sha256sums=('f1206f692d2d6982e16649a2cfe53f49307845aa26a1f4d68ccee7e4774dfe36'
             '457d5c9717048cd5334ba3d14dfb37699ac1d2c6dc2fd1df93adb487d6921f2f'
             '28d8988615b71b80710cec7d110ad31d078bfd3cb61852c381ab8b6d8bc870b0'
             '8dbaa21d2c03621b0c5d96c4fbcc7a839bea5a34a5f2279a409c3b404756e753'
-            'd922aaf741067d1372c7fd188434e5119a52455e0c0513461267f57e5a6ed04c'
-            'f88fb1d9a594b02879e3b8300dc919f3201c240ad728042088fe355b371074c4'
-            '1e3f7eee4be2a156b3992709d3f156c9cbdd5650c2a9ea4951d4d371d2710874'
-            'ca6482665cc0f32401f4f26528e5672e7ccc69ebf6eb98272284568c14c6f981'
-            '725d6a68c2ffe1d5bbebb249d09239d01bda27d4b046a4750dca652f63595e39'
-            'a8bb42afae1e922d8776feceb3188a0345651adc5d65b25e6e596cd9ea608f41')
+            '240312181b9049bb38cbc629d2f6ec2fccc6ebd2c9f9a417ce4dace4b1671cc2'
+            '17320989d284da8d45f7ef9db4b8acb0bbd660e334f4501b11391bf250a4d47f'
+            '6ae7a48aabf3cd19928c43c7fa89f311da21315efc5612e3e9f10e126488ae50'
+            '0c07cbe9bea55d8059c9f785e53b49019cf7e46eb3f866968c3da1425f370827'
+            'c6776a89b3d8cd52d8f9920b6b7b2449f26f20b539f07e945ef90a01aa0a0f1b'
+            'd1b9badf1ca432e6df7e6042a8a5fefa5b0ac6c65e1c122957db67b4f3f3aeab')
 
 
 export KBUILD_BUILD_HOST=archlinux

Some files were not shown because too many files changed in this diff