Browse Source

Update v5.4 patches

Changes:
 - Various small fixes.

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/e52e09bdbc4c5e7bd69f2856943cb8e12d3b498f
 - SAM: https://github.com/linux-surface/surface-aggregator-module/commit/e73516d1d21fb9fe2956b770d73bdf2490001938
 - GPE: https://github.com/linux-surface/surface-gpe/commit/6ecfdb39050129bf17e5f1fff784e4df7aa56171
Maximilian Luz 4 năm trước cách đây
mục cha
commit
bace7092a5

+ 1 - 1
patches/5.4/0001-surface3-power.patch

@@ -1,4 +1,4 @@
-From 2e3618224a468628bcc9f59093900e9661382f7f Mon Sep 17 00:00:00 2001
+From 97796e7d29cf461df923c61fe70f6ca236c4997f 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] platform/x86: Surface 3 battery platform operation region

+ 1 - 1
patches/5.4/0002-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From 3d9f4c91e10591f08eb456c28271e5f70711b7af Mon Sep 17 00:00:00 2001
+From 37fd7de62d1aa0a910f97dc4eb37cecb7c28393e Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 18 Oct 2020 16:42:44 +0900
 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI

+ 11 - 11
patches/5.4/0003-wifi.patch

@@ -1,4 +1,4 @@
-From f15553df0068b02b3b0b0805beb90418cff9e777 Mon Sep 17 00:00:00 2001
+From 06e17723ae88ae7030681b499b965eeffb7337a5 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Thu, 24 Sep 2020 18:02:06 +0900
 Subject: [PATCH] mwifiex: pcie: skip cancel_work_sync() on reset failure path
@@ -156,7 +156,7 @@ index f7ce9b6db6b4..72d0c01ff359 100644
 -- 
 2.30.0
 
-From 124094e80dad2d7f3c72ba54e6fecf7cd77dc83c Mon Sep 17 00:00:00 2001
+From d27c246316c2c8d8615b43fc68e1a620d1998940 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Mon, 28 Sep 2020 17:46:49 +0900
 Subject: [PATCH] mwifiex: pcie: add DMI-based quirk impl for Surface devices
@@ -364,7 +364,7 @@ index 000000000000..5326ae7e5671
 -- 
 2.30.0
 
-From 75a97b0aaa4adc7b176815a3225b72497e2aaa0a Mon Sep 17 00:00:00 2001
+From c2ac862bd2dd1183e158a76950500a7560218987 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:25:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_d3cold quirk for Surface gen4+
@@ -565,7 +565,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644
 -- 
 2.30.0
 
-From 292284200eded4826db7572f726c51b087239222 Mon Sep 17 00:00:00 2001
+From b8ae7bac392c8a965e1d4d2d6d1ef550597ef47f Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Tue, 29 Sep 2020 17:32:22 +0900
 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@@ -744,7 +744,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
 -- 
 2.30.0
 
-From 1eae4c2c1f41daba8f541e88e7241785e8d6462a Mon Sep 17 00:00:00 2001
+From e9db9491f97d658cf5c000a4ab07f1272e3bee59 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Wed, 30 Sep 2020 18:08:24 +0900
 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@@ -806,7 +806,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
 -- 
 2.30.0
 
-From 7d0e4dd6288e6cf2834186b4322348cca069a40e Mon Sep 17 00:00:00 2001
+From 053f2f3cc88d60a2978004704395dc8c914671fe Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Thu, 24 Sep 2020 01:56:34 +0900
 Subject: [PATCH] mwifiex: pcie: use shutdown_sw()/reinit_sw() on
@@ -948,7 +948,7 @@ index 263d918767bd..bd6791dc3a0f 100644
 -- 
 2.30.0
 
-From 238a65c778b48bf0218d0ab4e52636c336cd495f Mon Sep 17 00:00:00 2001
+From d002bafb6f43d694650f1a910edb3672c8de641f Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Mon, 24 Aug 2020 17:11:35 +0900
 Subject: [PATCH] mwifiex: pcie: add enable_device_dump module parameter
@@ -997,7 +997,7 @@ index bd6791dc3a0f..d7ff898c1767 100644
 -- 
 2.30.0
 
-From 7dae32e200a6be79173aa58d14eacc9807ef5021 Mon Sep 17 00:00:00 2001
+From 55b4bf63af39b2422dac63d89253e66a9a87e0f2 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:11:49 +0900
 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@@ -1152,7 +1152,7 @@ index 3ef7440418e3..a95ebac06e13 100644
 -- 
 2.30.0
 
-From 36fb7040f93d2dac91e06e84474897dfcf568004 Mon Sep 17 00:00:00 2001
+From ea3c4820fc14f520366a5d61fb11637a8d09519a Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:25:48 +0900
 Subject: [PATCH] mwifiex: add allow_ps_mode module parameter
@@ -1214,7 +1214,7 @@ index 9e6dc289ec3e..20f5ee3fe7e3 100644
 -- 
 2.30.0
 
-From c7bf76fbd76f077e8e827eb8119b42147f4952bd Mon Sep 17 00:00:00 2001
+From 6282406f43441ff1c45e9f326380f62cfd1154cb Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:38:48 +0900
 Subject: [PATCH] mwifiex: print message when changing ps_mode
@@ -1249,7 +1249,7 @@ index 20f5ee3fe7e3..8020a2929069 100644
 -- 
 2.30.0
 
-From a16819a6bea610faa96362669ca7da1595dec7e4 Mon Sep 17 00:00:00 2001
+From d68427cdc69ec1683b85f6502be6fd977ef9863d Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 Date: Sun, 4 Oct 2020 00:59:37 +0900
 Subject: [PATCH] mwifiex: disable ps_mode explicitly by default instead

+ 3 - 3
patches/5.4/0004-ipts.patch

@@ -1,4 +1,4 @@
-From f1e54076f867da76964691f8e144a58b018ee875 Mon Sep 17 00:00:00 2001
+From 863c231e1cc6ec12c47819a1c1121db9d80ec88b 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] mei: Add IPTS device IDs
@@ -53,7 +53,7 @@ index 75ab2ffbf235..78790904d77c 100644
 -- 
 2.30.0
 
-From 40be1479fec6e4a6cee9ab85ed709e0ae7af96c8 Mon Sep 17 00:00:00 2001
+From e5db54a618d5f4c7325e52abaae5d302cfc446e8 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Fri, 20 Dec 2019 23:15:58 +0100
 Subject: [PATCH] uapi: Add MEI bus ID
@@ -79,7 +79,7 @@ index 9a61c28ed3ae..47fc20975245 100644
 -- 
 2.30.0
 
-From 98c06a40e62a5c3f127943b917832bf22255aca5 Mon Sep 17 00:00:00 2001
+From e402b004f197426819ed17bb3e1ec89fe1001157 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 27 Jan 2020 21:22:42 +0100
 Subject: [PATCH] input: Add support for Intel Precise Touch & Stylus

+ 6 - 6
patches/5.4/0005-surface-gpe.patch

@@ -1,4 +1,4 @@
-From c02d2d63270898ad9ba17a4e74e584861a795bd4 Mon Sep 17 00:00:00 2001
+From 8a49d9d3c28983fcacbb4dd0d7e8113a100d2b54 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 16 Aug 2020 23:39:56 +0200
 Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface
@@ -71,7 +71,7 @@ index 6dd955ad9bf1..5db303f43bda 100644
  obj-$(CONFIG_INTEL_TELEMETRY)	+= intel_telemetry_core.o \
 diff --git a/drivers/platform/x86/surface_gpe.c b/drivers/platform/x86/surface_gpe.c
 new file mode 100644
-index 000000000000..573dc52f568f
+index 000000000000..86f6991b1215
 --- /dev/null
 +++ b/drivers/platform/x86/surface_gpe.c
 @@ -0,0 +1,321 @@
@@ -215,7 +215,7 @@ index 000000000000..573dc52f568f
 +		.ident = "Surface Laptop 3 (Intel 13\")",
 +		.matches = {
 +			/*
-+			 * We match for SKU here due to different vairants: The
++			 * We match for SKU here due to different variants: The
 +			 * AMD (15") version does not rely on GPEs.
 +			 */
 +			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
@@ -227,7 +227,7 @@ index 000000000000..573dc52f568f
 +		.ident = "Surface Laptop 3 (Intel 15\")",
 +		.matches = {
 +			/*
-+			 * We match for SKU here due to different vairants: The
++			 * We match for SKU here due to different variants: The
 +			 * AMD (15") version does not rely on GPEs.
 +			 */
 +			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
@@ -258,12 +258,12 @@ index 000000000000..573dc52f568f
 +	return 0;
 +}
 +
-+static int surface_gpe_suspend(struct device *dev)
++static int __maybe_unused surface_gpe_suspend(struct device *dev)
 +{
 +	return surface_lid_enable_wakeup(dev, true);
 +}
 +
-+static int surface_gpe_resume(struct device *dev)
++static int __maybe_unused surface_gpe_resume(struct device *dev)
 +{
 +	return surface_lid_enable_wakeup(dev, false);
 +}

+ 2 - 2
patches/5.4/0006-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From b903f98473970c1aab030d1e7cb82b01938da6fd Mon Sep 17 00:00:00 2001
+From 026ad3f65be8a3f3a5dffad423a2dde7251a01b0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
 Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@@ -109,7 +109,7 @@ index c70983780ae7..1c90651161a6 100644
 -- 
 2.30.0
 
-From 15fe294f16e8aa93d91bffe7304294f10ea83dff Mon Sep 17 00:00:00 2001
+From 0a1661bae14793c84a3d9c440bcf825ffb64e370 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 6 Sep 2020 04:01:19 +0200
 Subject: [PATCH] platform/x86: Add driver for Surface Book 1 dGPU switch

+ 58 - 23
patches/5.4/0007-surface-sam.patch

@@ -1,4 +1,4 @@
-From 4f1cd3f4da8cf250dcdee9edaf08802a3d8c5150 Mon Sep 17 00:00:00 2001
+From f3005b47f052eb94cfab78f38aafa57acb30fbcd Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 Date: Mon, 26 Aug 2019 01:11:08 +0200
 Subject: [PATCH] ACPI: Fix buffer/integer type mismatch
@@ -60,7 +60,7 @@ index d3d2dbfba680..0b7f617a6e9b 100644
 -- 
 2.30.0
 
-From 880ce43d10d83d8201160bcaa3abbdea860943e5 Mon Sep 17 00:00:00 2001
+From 892dfdea075d24abf3e1eb5b0f32662890a58b92 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 24 Sep 2019 17:38:12 +0200
 Subject: [PATCH] serdev: Add ACPI devices by ResourceSource field
@@ -248,7 +248,7 @@ index a9719858c950..ce5309d00280 100644
 -- 
 2.30.0
 
-From baea73b8602dbd6ac6fe1dfb7a094431b224f1ce Mon Sep 17 00:00:00 2001
+From 96bbe52d5ea5308d776bee60ace244f05cb480a4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:23:20 +0200
 Subject: [PATCH] misc: surface_sam: Add file2alias support for Surface SAM
@@ -350,7 +350,7 @@ index c91eba751804..bc06f7631200 100644
 -- 
 2.30.0
 
-From 86bc3d0ecd32e004024303e7bfe4dcd09c4523f3 Mon Sep 17 00:00:00 2001
+From 1c5e72241965f1a32d98b190e04cfbbaf0c8ab09 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 17 Aug 2020 01:44:30 +0200
 Subject: [PATCH] misc: Add support for Surface System Aggregator Module
@@ -388,7 +388,7 @@ Patchset: surface-sam
  .../misc/surface_aggregator/clients/Kconfig   |  134 +
  .../misc/surface_aggregator/clients/Makefile  |   10 +
  .../clients/surface_acpi_notify.c             |  886 ++++++
- .../clients/surface_aggregator_cdev.c         |  303 ++
+ .../clients/surface_aggregator_cdev.c         |  322 ++
  .../clients/surface_aggregator_registry.c     |  616 ++++
  .../clients/surface_battery.c                 | 1168 ++++++++
  .../surface_aggregator/clients/surface_dtx.c  | 1277 ++++++++
@@ -398,11 +398,11 @@ Patchset: surface-sam
  drivers/misc/surface_aggregator/controller.h  |  285 ++
  drivers/misc/surface_aggregator/core.c        |  851 ++++++
  drivers/misc/surface_aggregator/ssh_msgb.h    |  205 ++
- .../surface_aggregator/ssh_packet_layer.c     | 2057 +++++++++++++
+ .../surface_aggregator/ssh_packet_layer.c     | 2074 +++++++++++++
  .../surface_aggregator/ssh_packet_layer.h     |  190 ++
  drivers/misc/surface_aggregator/ssh_parser.c  |  228 ++
  drivers/misc/surface_aggregator/ssh_parser.h  |  155 +
- .../surface_aggregator/ssh_request_layer.c    | 1264 ++++++++
+ .../surface_aggregator/ssh_request_layer.c    | 1263 ++++++++
  .../surface_aggregator/ssh_request_layer.h    |  143 +
  drivers/misc/surface_aggregator/trace.h       |  632 ++++
  include/linux/mod_devicetable.h               |    5 +-
@@ -414,7 +414,7 @@ Patchset: surface-sam
  include/uapi/linux/surface_aggregator/dtx.h   |  146 +
  scripts/mod/devicetable-offsets.c             |    3 +-
  scripts/mod/file2alias.c                      |   10 +-
- 47 files changed, 19135 insertions(+), 7 deletions(-)
+ 47 files changed, 19170 insertions(+), 7 deletions(-)
  create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst
  create mode 100644 Documentation/driver-api/surface_aggregator/client.rst
  create mode 100644 Documentation/driver-api/surface_aggregator/clients/cdev.rst
@@ -3646,7 +3646,7 @@ index 000000000000..4249af06d738
 +obj-$(CONFIG_SURFACE_PERFMODE) 			+= surface_perfmode.o
 diff --git a/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c b/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c
 new file mode 100644
-index 000000000000..8cd67a669c86
+index 000000000000..ef9c1f8e8336
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c
 @@ -0,0 +1,886 @@
@@ -3840,7 +3840,7 @@ index 000000000000..8cd67a669c86
 +	union acpi_object *obj;
 +	int status = 0;
 +
-+	if (!acpi_check_dsm(san, &SAN_DSM_UUID, SAN_DSM_REVISION, 1 << func))
++	if (!acpi_check_dsm(san, &SAN_DSM_UUID, SAN_DSM_REVISION, BIT_ULL(func)))
 +		return 0;
 +
 +	dev_dbg(dev, "notify event %#04llx\n", func);
@@ -4538,10 +4538,10 @@ index 000000000000..8cd67a669c86
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/misc/surface_aggregator/clients/surface_aggregator_cdev.c b/drivers/misc/surface_aggregator/clients/surface_aggregator_cdev.c
 new file mode 100644
-index 000000000000..340d15b148b9
+index 000000000000..79e28fab7e40
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/clients/surface_aggregator_cdev.c
-@@ -0,0 +1,303 @@
+@@ -0,0 +1,322 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Provides user-space access to the SSAM EC via the /dev/surface/aggregator
@@ -4610,8 +4610,8 @@ index 000000000000..340d15b148b9
 +{
 +	struct ssam_cdev_request __user *r;
 +	struct ssam_cdev_request rqst;
-+	struct ssam_request spec;
-+	struct ssam_response rsp;
++	struct ssam_request spec = {};
++	struct ssam_response rsp = {};
 +	const void __user *plddata;
 +	void __user *rspdata;
 +	int status = 0, ret = 0, tmp;
@@ -4650,6 +4650,15 @@ index 000000000000..340d15b148b9
 +			goto out;
 +		}
 +
++		/*
++		 * Note: spec.length is limited to U16_MAX bytes via struct
++		 * ssam_cdev_request. This is slightly larger than the
++		 * theoretical maximum (SSH_COMMAND_MAX_PAYLOAD_SIZE) of the
++		 * underlying protocol (note that nothing remotely this size
++		 * should ever be allocated in any normal case). This size is
++		 * validated later in ssam_request_sync(), for allocation the
++		 * bound imposed by u16 should be enough.
++		 */
 +		spec.payload = kzalloc(spec.length, GFP_KERNEL);
 +		if (!spec.payload) {
 +			ret = -ENOMEM;
@@ -4669,6 +4678,16 @@ index 000000000000..340d15b148b9
 +			goto out;
 +		}
 +
++		/*
++		 * Note: rsp.capacity is limited to U16_MAX bytes via struct
++		 * ssam_cdev_request. This is slightly larger than the
++		 * theoretical maximum (SSH_COMMAND_MAX_PAYLOAD_SIZE) of the
++		 * underlying protocol (note that nothing remotely this size
++		 * should ever be allocated in any normal case). In later use,
++		 * this capacity does not have to be strictly bounded, as it
++		 * is only used as an output buffer to be written to. For
++		 * allocation the bound imposed by u16 should be enough.
++		 */
 +		rsp.pointer = kzalloc(rsp.capacity, GFP_KERNEL);
 +		if (!rsp.pointer) {
 +			ret = -ENOMEM;
@@ -12928,10 +12947,10 @@ index 000000000000..1221f642dda1
 +#endif /* _SURFACE_AGGREGATOR_SSH_MSGB_H */
 diff --git a/drivers/misc/surface_aggregator/ssh_packet_layer.c b/drivers/misc/surface_aggregator/ssh_packet_layer.c
 new file mode 100644
-index 000000000000..74f0faaa2b27
+index 000000000000..583315db8b02
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/ssh_packet_layer.c
-@@ -0,0 +1,2057 @@
+@@ -0,0 +1,2074 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * SSH packet transport layer.
@@ -14628,7 +14647,24 @@ index 000000000000..74f0faaa2b27
 +	/* Find SYN. */
 +	syn_found = sshp_find_syn(source, &aligned);
 +
-+	if (unlikely(aligned.ptr - source->ptr) > 0) {
++	if (unlikely(aligned.ptr != source->ptr)) {
++		/*
++		 * We expect aligned.ptr == source->ptr. If this is not the
++		 * case, then aligned.ptr > source->ptr and we've encountered
++		 * some unexpected data where we'd expect the start of a new
++		 * message (i.e. the SYN sequence).
++		 *
++		 * This can happen when a CRC check for the previous message
++		 * failed and we start actively searching for the next one
++		 * (via the call to sshp_find_syn() above), or the first bytes
++		 * of a message got dropped or corrupted.
++		 *
++		 * In any case, we issue a warning, send a NAK to the EC to
++		 * request re-transmission of any data we haven't acknowledged
++		 * yet, and finally, skip everything up to the next SYN
++		 * sequence.
++		 */
++
 +		ptl_warn(ptl, "rx: parser: invalid start of frame, skipping\n");
 +
 +		/*
@@ -15582,10 +15618,10 @@ index 000000000000..395c61ef890b
 +#endif /* _SURFACE_AGGREGATOR_SSH_PARSER_h */
 diff --git a/drivers/misc/surface_aggregator/ssh_request_layer.c b/drivers/misc/surface_aggregator/ssh_request_layer.c
 new file mode 100644
-index 000000000000..bb1c862411a2
+index 000000000000..52a83a8fcf82
 --- /dev/null
 +++ b/drivers/misc/surface_aggregator/ssh_request_layer.c
-@@ -0,0 +1,1264 @@
+@@ -0,0 +1,1263 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * SSH request transport layer.
@@ -16592,9 +16628,8 @@ index 000000000000..bb1c862411a2
 + *
 + * Initializes the given request transport layer and associated packet
 + * transport layer. Transmitter and receiver threads must be started
-+ * separately via ssh_rtl_tx_start() and ssh_rtl_rx_start(), after the
-+ * request-layer has been initialized and the lower-level serial device layer
-+ * has been set up.
++ * separately via ssh_rtl_start(), after the request-layer has been
++ * initialized and the lower-level serial device layer has been set up.
 + *
 + * Return: Returns zero on success and a nonzero error code on failure.
 + */
@@ -16644,7 +16679,7 @@ index 000000000000..bb1c862411a2
 +}
 +
 +/**
-+ * ssh_rtl_tx_start() - Start request transmitter and receiver.
++ * ssh_rtl_start() - Start request transmitter and receiver.
 + * @rtl: The request transport layer.
 + *
 + * Return: Returns zero on success, a negative error code on failure.

+ 3 - 3
patches/5.4/0008-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From e402930b19acd3ba5f25fa3b9f02093281ce551a Mon Sep 17 00:00:00 2001
+From d3f60896ae2a2fb6c6b610e230916d2a81b24e2f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 9 Nov 2020 14:23:00 +0100
 Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
@@ -60,7 +60,7 @@ index 89dece8a4132..fd34c8743cbc 100644
 -- 
 2.30.0
 
-From f3cf499a73e34f49c874077b5ac3034e0ed7c5bd Mon Sep 17 00:00:00 2001
+From 32bc35a7ad400888222f5cf083d080e646f5e9ef Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 31 Oct 2020 20:46:33 +0100
 Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
@@ -133,7 +133,7 @@ index e401f040f157..418927872ae6 100644
 -- 
 2.30.0
 
-From e27b8f80ee3149f1bc5d25d66393e0e20e2409ac Mon Sep 17 00:00:00 2001
+From 6ebd60f882ad789a2dc4b8c7d681b16bb3e227f1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 14 Dec 2020 20:50:59 +0100
 Subject: [PATCH] platform/x86: Add Surface Hotplug driver

+ 3 - 3
patches/5.4/0009-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 6cabd905a62cc8cdb6093c98347b512ba97cb427 Mon Sep 17 00:00:00 2001
+From 8a77d6cf83747db2b3de6e84eec497f07a6d49a6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Thu, 5 Nov 2020 13:09:45 +0100
 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@@ -34,7 +34,7 @@ Patchset: surface-typecover
  1 file changed, 98 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 128d8f4319b9..2c30f65056d9 100644
+index d91e6679afb1..11bf0d87523d 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -34,7 +34,10 @@
@@ -216,7 +216,7 @@ index 128d8f4319b9..2c30f65056d9 100644
  	del_timer_sync(&td->release_timer);
  
  	sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
-@@ -2146,6 +2237,11 @@ static const struct hid_device_id mt_devices[] = {
+@@ -2150,6 +2241,11 @@ static const struct hid_device_id mt_devices[] = {
  		MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
  			USB_DEVICE_ID_XIROKU_CSR2) },
  

+ 1 - 1
patches/5.4/0010-surface-sensors.patch

@@ -1,4 +1,4 @@
-From 0379fc00d84e8700bb2fdf368c5c5d9c0ec937f5 Mon Sep 17 00:00:00 2001
+From da8e015edd4236fd6994164c01ecae7916d64aab Mon Sep 17 00:00:00 2001
 From: Max Leiter <maxwell.leiter@gmail.com>
 Date: Sat, 19 Dec 2020 17:50:55 -0800
 Subject: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in