Update v5.4 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: 735a01f74b
- mwifiex: https://lkml.org/lkml/2020/8/27/642
- kernel: 9ea314c74e
This commit is contained in:
Maximilian Luz 2020-08-28 17:09:20 +02:00
parent d000c7488a
commit 8327001638
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
7 changed files with 1521 additions and 450 deletions

View file

@ -1,4 +1,4 @@
From 8c4f78a3553971e806e06337e6af692b26efad17 Mon Sep 17 00:00:00 2001
From 39e02befec04246af9c03fb5889e3fb880023d7f Mon Sep 17 00:00:00 2001
From: qzed <qzed@users.noreply.github.com>
Date: Tue, 17 Sep 2019 17:17:56 +0200
Subject: [PATCH 1/7] surface3-power

View file

@ -1,4 +1,4 @@
From a3c07035d224bbceceeb3296b93ebe98ce41e3cb Mon Sep 17 00:00:00 2001
From b76b3c481adf002e8acf628a4a8937b6f51176a4 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 2/7] surface3-oemb

View file

@ -1,13 +1,15 @@
From e0f8d15d66c210c93c4f14d56f9276ee16466941 Mon Sep 17 00:00:00 2001
From 769dda1fd68fcfb45c3d659072b13bac1fa59258 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 3/7] 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 9e6dc289ec3e8..00b4bc4469892 100644
@ -53,6 +55,19 @@ index 9e6dc289ec3e8..00b4bc4469892 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 1fb76d2f5d3fd..8b9d0809daf62 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 fc1706d0647d7..b51c5e3571426 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
@ -250,6 +265,28 @@ index 4ed10cf82f9a4..410bef3d6a6eb 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 7ae2c34f65db2..4eaa493e33253 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

View file

@ -1,4 +1,4 @@
From 8e4e701cc005750d4ec036ca5ad8b1b406772ac7 Mon Sep 17 00:00:00 2001
From 5c6bb3181cd713454d69d8007eae9e389b57cb8d 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 4/7] ipts

File diff suppressed because it is too large Load diff

View file

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

View file

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