beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update patches

Browse source
This commit is contained in:
Maximilian Luz 2020-03-17 02:16:47 +01:00
parent 1f1435d585
commit 239f75d22d
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
17 changed files with 1546 additions and 1376 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/4.19/0001-surface3-power.patch
View file

@ -1,4 +1,4 @@
From 173ad7941bfc2f1231e1210218fecd8416269487 Mon Sep 17 00:00:00 2001
From b932081d4a4690f34c928abf1beaa784a50fa3fe Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 28 Sep 2019 18:00:43 +0200
Subject: [PATCH 01/10] surface3-power
@ -651,5 +651,5 @@ index 000000000000..e0af01a60302
+MODULE_DESCRIPTION("mshw0011 driver");
+MODULE_LICENSE("GPL v2");
--
2.25.0
2.25.1

4
patches/4.19/0002-surface3-spi.patch
View file

@ -1,4 +1,4 @@
From 453ea3f94fd2c3d7f944864d55196d1f9577bb8e Mon Sep 17 00:00:00 2001
From 8255cdea04cc9c59a5e702f0e5acadd2f258eab6 Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Fri, 6 Dec 2019 23:10:30 +0900
Subject: [PATCH 02/10] surface3-spi
@ -59,5 +59,5 @@ index 5db0f1c4ef38..8935ddbc2357 100644
}
--
2.25.0
2.25.1

4
patches/4.19/0003-surface3-oemb.patch
View file

@ -1,4 +1,4 @@
From dbe15026e61130dbbf2f44039bfabed548b4efd2 Mon Sep 17 00:00:00 2001
From 000864916c307c9f6b7a1af544f241a8927cd732 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 03/10] surface3-oemb
@ -65,5 +65,5 @@ index 91bb99b69601..c9f966bacfc1 100644
{ }
};
--
2.25.0
2.25.1

4
patches/4.19/0004-surface-buttons.patch
View file

@ -1,4 +1,4 @@
From 40baf1bc4739c49334e9b6dc7badc44771c5ee4a Mon Sep 17 00:00:00 2001
From 29532061e18b218be50e52966d52a3ab1c1dbd85 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 27 Jul 2019 17:51:37 +0200
Subject: [PATCH 04/10] surface-buttons
@ -270,5 +270,5 @@ index 1b491690ce07..96627627060e 100644
if (!button)
return -ENOMEM;
--
2.25.0
2.25.1

849
patches/4.19/0005-surface-sam.patch
View file

File diff suppressed because it is too large Load diff

8
patches/4.19/0006-suspend.patch
View file

@ -1,4 +1,4 @@
From 56465e5f753dd383417dc9d22532d4b4c7d70e14 Mon Sep 17 00:00:00 2001
From a770b09614e53afd014b85a7bd79d6c10c90d2f6 Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Sat, 28 Sep 2019 17:48:21 +0200
Subject: [PATCH 06/10] suspend
@ -12,7 +12,7 @@ Subject: [PATCH 06/10] suspend
5 files changed, 162 insertions(+), 6 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b7bd89b3b2f9..a9c689c10d3d 100644
index a8132e8d72bb..acb0d5bb3a8d 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1055,15 +1055,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
@ -24,8 +24,8 @@ index b7bd89b3b2f9..a9c689c10d3d 100644
+static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,
+ unsigned int dword11, void *buffer, size_t buflen, u32 *result)
{
union nvme_result res = { 0 };
struct nvme_command c;
union nvme_result res;
int ret;
memset(&c, 0, sizeof(c));
@ -312,5 +312,5 @@ index b1f297f4b7b0..94ab2fc800d3 100644
#ifdef CONFIG_PCIEAER
--
2.25.0
2.25.1

36
patches/4.19/0007-ipts.patch
View file

@ -1,4 +1,4 @@
From 3aa4577c1327da13ed2cece7174da5ee7153d570 Mon Sep 17 00:00:00 2001
From 9c8623f624d31b18be85f69684c7e5d07102fbb1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 28 Sep 2019 17:58:17 +0200
Subject: [PATCH 07/10] ipts
@ -20,7 +20,6 @@ Subject: [PATCH 07/10] ipts
drivers/gpu/drm/i915/intel_lrc.c | 12 +-
drivers/gpu/drm/i915/intel_lrc.h | 8 +
drivers/gpu/drm/i915/intel_panel.c | 7 +
drivers/hid/hid-core.c | 5 +-
drivers/misc/Kconfig | 1 +
drivers/misc/Makefile | 1 +
drivers/misc/ipts/Kconfig | 12 +
@ -33,7 +32,7 @@ Subject: [PATCH 07/10] ipts
drivers/misc/ipts/dbgfs.c | 277 +++++
drivers/misc/ipts/gfx.c | 180 ++++
drivers/misc/ipts/gfx.h | 25 +
drivers/misc/ipts/hid.c | 499 +++++++++
drivers/misc/ipts/hid.c | 502 +++++++++
drivers/misc/ipts/hid.h | 21 +
drivers/misc/ipts/ipts.c | 62 ++
drivers/misc/ipts/ipts.h | 172 +++
@ -55,7 +54,7 @@ Subject: [PATCH 07/10] ipts
include/linux/ipts-companion.h | 30 +
include/linux/ipts-gfx.h | 86 ++
include/linux/ipts.h | 20 +
51 files changed, 6802 insertions(+), 24 deletions(-)
50 files changed, 6802 insertions(+), 22 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_ipts.c
create mode 100644 drivers/gpu/drm/i915/intel_ipts.h
create mode 100644 drivers/misc/ipts/Kconfig
@ -1291,22 +1290,6 @@ index 4a9f139e7b73..c137a57f6702 100644
}
static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e723156057a6..11795c7a1662 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -290,8 +290,9 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
/* Total size check: Allow for possible report index byte */
if (report->size > (HID_MAX_BUFFER_SIZE - 1) << 3) {
- hid_err(parser->device, "report is too long\n");
- return -1;
+ hid_warn(parser->device, "report is too long (%u), skipping\n",
+ report->size);
+ return 0;
}
if (!parser->local.usage_index) /* Ignore padding fields */
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 3726eacdf65d..77263b5f5915 100644
--- a/drivers/misc/Kconfig
@ -2396,10 +2379,10 @@ index 000000000000..2880e122e9f9
+#endif // _IPTS_GFX_H_
diff --git a/drivers/misc/ipts/hid.c b/drivers/misc/ipts/hid.c
new file mode 100644
index 000000000000..3652803b5376
index 000000000000..1a487b633fdd
--- /dev/null
+++ b/drivers/misc/ipts/hid.c
@@ -0,0 +1,499 @@
@@ -0,0 +1,502 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
@ -2705,8 +2688,11 @@ index 000000000000..3652803b5376
+
+ switch (raw_header->data_type) {
+ case TOUCH_RAW_DATA_TYPE_HID_REPORT: {
+ if (raw_header->raw_data_size_bytes > HID_MAX_BUFFER_SIZE)
+ raw_header->raw_data_size_bytes = HID_MAX_BUFFER_SIZE;
+ if (raw_header->raw_data_size_bytes > HID_MAX_BUFFER_SIZE) {
+ ipts_err(ipts, "input report too large (%u bytes), skipping",
+ raw_header->raw_data_size_bytes);
+ break;
+ }
+
+ memcpy(ipts->hid_input_report, raw_data,
+ raw_header->raw_data_size_bytes);
@ -7441,5 +7427,5 @@ index 000000000000..bfa8e1375926
+
+#endif // IPTS_H
--
2.25.0
2.25.1

4
patches/4.19/0008-surface-lte.patch
View file

@ -1,4 +1,4 @@
From 4b4d681cceaa20cf93fd2e6afa93a8fb93f528ad Mon Sep 17 00:00:00 2001
From 3fdfb22a2d964dc0f89db2ab444b7aaf855b35eb Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 28 Sep 2019 18:02:03 +0200
Subject: [PATCH 08/10] surface-lte
@ -20,5 +20,5 @@ index 613f91add03d..e1428222dd73 100644
/* Huawei devices */
{DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */
--
2.25.0
2.25.1

4
patches/4.19/0009-ioremap_uc.patch
View file

@ -1,4 +1,4 @@
From 6405ace9361dabd32a7c47e989de5aa8f005be0d Mon Sep 17 00:00:00 2001
From dd5b315097f1f0eb3bf3e81f355cd7d7afc4bef5 Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:28 -0600
Subject: [PATCH 09/10] ioremap_uc
@ -93,5 +93,5 @@ index aa0f5308ac6b..75ea32d9b661 100644
* devm_ioremap_nocache - Managed ioremap_nocache()
* @dev: Generic device to remap IO address for
--
2.25.0
2.25.1

75
patches/4.19/0010-wifi.patch
View file

@ -1,13 +1,58 @@
From 0ddca72e89d8d512ec8ba779be709c7be185aca2 Mon Sep 17 00:00:00 2001
From 2b22581e4dd5184f87f264af7499cc034b543cb6 Mon Sep 17 00:00:00 2001
From: sebanc <22224731+sebanc@users.noreply.github.com>
Date: Mon, 4 Nov 2019 09:30:57 +0100
Subject: [PATCH 10/10] wifi
---
.../net/wireless/marvell/mwifiex/cfg80211.c | 26 +++++++
drivers/net/wireless/marvell/mwifiex/pcie.c | 75 ++++++++++---------
.../net/wireless/marvell/mwifiex/sta_cmd.c | 15 +---
2 files changed, 40 insertions(+), 50 deletions(-)
.../net/wireless/marvell/mwifiex/sta_cmd.c | 26 +------
3 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 7b74ef71bef1..d8e65b733cb3 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -25,6 +25,11 @@
static char *reg_alpha2;
module_param(reg_alpha2, charp, 0);
+static bool allow_ps_mode;
+module_param(allow_ps_mode, bool, 0444);
+MODULE_PARM_DESC(allow_ps_mode,
+ "allow WiFi power management to be enabled. (default: disallowed)");
+
static const struct ieee80211_iface_limit mwifiex_ap_sta_limits[] = {
{
.max = 3, .types = BIT(NL80211_IFTYPE_STATION) |
@@ -439,6 +444,27 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
ps_mode = enabled;
+ /* Allow ps_mode to be enabled only when allow_ps_mode is set
+ * (but always allow ps_mode to be disabled in case it gets enabled
+ * for unknown reason and you want to disable it) */
+ if (ps_mode && !allow_ps_mode) {
+ dev_info(priv->adapter->dev,
+ "Request to enable ps_mode received but it's disallowed "
+ "by module parameter. Rejecting the request.\n");
+
+ /* Return negative value to inform userspace tools that setting
+ * power_save to be enabled is not permitted. */
+ return -1;
+ }
+
+ if (ps_mode)
+ dev_warn(priv->adapter->dev,
+ "WARN: Request to enable ps_mode received. Enabling it. "
+ "Disable it if you encounter connection instability.\n");
+ else
+ dev_info(priv->adapter->dev,
+ "Request to disable ps_mode received. Disabling it.\n");
+
return mwifiex_drv_set_power(priv, &ps_mode);
}
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 991b9cc18000..4549359ee19b 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
@ -128,7 +173,7 @@ index 991b9cc18000..4549359ee19b 100644
}
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 4ed10cf82f9a..013db4386c39 100644
index 4ed10cf82f9a..977b57c0908f 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -2265,14 +2265,13 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
@ -147,7 +192,25 @@ index 4ed10cf82f9a..013db4386c39 100644
if (first_sta) {
if (priv->adapter->iface_type == MWIFIEX_PCIE) {
@@ -2395,18 +2394,6 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
@@ -2339,17 +2338,6 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
if (ret)
return -1;
- if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
- /* Enable IEEE PS by default */
- priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
- ret = mwifiex_send_cmd(priv,
- HostCmd_CMD_802_11_PS_MODE_ENH,
- EN_AUTO_PS, BITMAP_STA_PS, NULL,
- true);
- if (ret)
- return -1;
- }
-
if (drcs) {
adapter->drcs_enabled = true;
if (ISSUPP_DRCS_ENABLED(adapter->fw_cap_info))
@@ -2395,18 +2383,6 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
if (ret)
return -1;
@ -167,5 +230,5 @@ index 4ed10cf82f9a..013db4386c39 100644
/* Send cmd to FW to enable/disable 11D function */
state_11d = ENABLE_11D;
--
2.25.0
2.25.1

4
patches/5.5/0001-surface3-power.patch
View file

@ -1,4 +1,4 @@
From 5837cdffdde0776ea3c77378ab2bd8b81d4c6b41 Mon Sep 17 00:00:00 2001
From fffa55005ebcb790bb06de17dd629fe921849d73 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
@ -651,5 +651,5 @@ index 000000000000..e0af01a60302
+MODULE_DESCRIPTION("mshw0011 driver");
+MODULE_LICENSE("GPL v2");
--
2.25.0
2.25.1

4
patches/5.5/0002-surface3-spi.patch
View file

@ -1,4 +1,4 @@
From c36ef21bb796176659ca9edeed13eac751c1f7b4 Mon Sep 17 00:00:00 2001
From 0196c30f6df1a30ce6edd99c47f44435b0ee2c18 Mon Sep 17 00:00:00 2001
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
Date: Fri, 6 Dec 2019 23:10:30 +0900
Subject: [PATCH 2/7] surface3-spi
@ -59,5 +59,5 @@ index ce4828b1415a..63b0b8ddf090 100644
}
--
2.25.0
2.25.1

4
patches/5.5/0003-surface3-oemb.patch
View file

@ -1,4 +1,4 @@
From 9807d209ae39183dc4ed805f30f171e96321515f Mon Sep 17 00:00:00 2001
From 32cf290466d335c1d0f4cd70081900a6bd0e89ab 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 3/7] surface3-oemb
@ -65,5 +65,5 @@ index d0fb43c2b9f6..de2583918afd 100644
{ }
};
--
2.25.0
2.25.1

840
patches/5.5/0004-surface-sam.patch
View file

File diff suppressed because it is too large Load diff

4
patches/5.5/0005-surface-lte.patch
View file

@ -1,4 +1,4 @@
From b320e77ae285b2f4e42b6df18e0b0f04c96c6c21 Mon Sep 17 00:00:00 2001
From 57027f7807afd9632dc87270fcfb000a8496ce32 Mon Sep 17 00:00:00 2001
From: qzed <qzed@users.noreply.github.com>
Date: Tue, 17 Sep 2019 17:21:43 +0200
Subject: [PATCH 5/7] surface-lte
@ -20,5 +20,5 @@ index 613f91add03d..e1428222dd73 100644
/* Huawei devices */
{DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */
--
2.25.0
2.25.1

75
patches/5.5/0006-wifi.patch
View file

@ -1,13 +1,58 @@
From 5dcda52bdd2ff95eaab22ce628aa703fa60d7b1f Mon Sep 17 00:00:00 2001
From a926655d1999213564b845bb2db49d777a8c0a85 Mon Sep 17 00:00:00 2001
From: sebanc <22224731+sebanc@users.noreply.github.com>
Date: Mon, 4 Nov 2019 09:30:57 +0100
Subject: [PATCH 6/7] wifi
---
.../net/wireless/marvell/mwifiex/cfg80211.c | 26 +++++++
drivers/net/wireless/marvell/mwifiex/pcie.c | 74 ++++++++++---------
.../net/wireless/marvell/mwifiex/sta_cmd.c | 15 +---
2 files changed, 41 insertions(+), 48 deletions(-)
.../net/wireless/marvell/mwifiex/sta_cmd.c | 26 +------
3 files changed, 67 insertions(+), 59 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index d89684168500..108d7ac6a0dd 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -25,6 +25,11 @@
static char *reg_alpha2;
module_param(reg_alpha2, charp, 0);
+static bool allow_ps_mode;
+module_param(allow_ps_mode, bool, 0444);
+MODULE_PARM_DESC(allow_ps_mode,
+ "allow WiFi power management to be enabled. (default: disallowed)");
+
static const struct ieee80211_iface_limit mwifiex_ap_sta_limits[] = {
{
.max = 3, .types = BIT(NL80211_IFTYPE_STATION) |
@@ -439,6 +444,27 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
ps_mode = enabled;
+ /* Allow ps_mode to be enabled only when allow_ps_mode is set
+ * (but always allow ps_mode to be disabled in case it gets enabled
+ * for unknown reason and you want to disable it) */
+ if (ps_mode && !allow_ps_mode) {
+ dev_info(priv->adapter->dev,
+ "Request to enable ps_mode received but it's disallowed "
+ "by module parameter. Rejecting the request.\n");
+
+ /* Return negative value to inform userspace tools that setting
+ * power_save to be enabled is not permitted. */
+ return -1;
+ }
+
+ if (ps_mode)
+ dev_warn(priv->adapter->dev,
+ "WARN: Request to enable ps_mode received. Enabling it. "
+ "Disable it if you encounter connection instability.\n");
+ else
+ dev_info(priv->adapter->dev,
+ "Request to disable ps_mode received. Disabling it.\n");
+
return mwifiex_drv_set_power(priv, &ps_mode);
}
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index fc1706d0647d..b3380ed75431 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
@ -125,7 +170,7 @@ index fc1706d0647d..b3380ed75431 100644
}
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 4ed10cf82f9a..013db4386c39 100644
index 4ed10cf82f9a..977b57c0908f 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -2265,14 +2265,13 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
@ -144,7 +189,25 @@ index 4ed10cf82f9a..013db4386c39 100644
if (first_sta) {
if (priv->adapter->iface_type == MWIFIEX_PCIE) {
@@ -2395,18 +2394,6 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
@@ -2339,17 +2338,6 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
if (ret)
return -1;
- if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
- /* Enable IEEE PS by default */
- priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
- ret = mwifiex_send_cmd(priv,
- HostCmd_CMD_802_11_PS_MODE_ENH,
- EN_AUTO_PS, BITMAP_STA_PS, NULL,
- true);
- if (ret)
- return -1;
- }
-
if (drcs) {
adapter->drcs_enabled = true;
if (ISSUPP_DRCS_ENABLED(adapter->fw_cap_info))
@@ -2395,18 +2383,6 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
if (ret)
return -1;
@ -164,5 +227,5 @@ index 4ed10cf82f9a..013db4386c39 100644
/* Send cmd to FW to enable/disable 11D function */
state_11d = ENABLE_11D;
--
2.25.0
2.25.1

999
patches/5.5/0007-ipts.patch
View file

File diff suppressed because it is too large Load diff