Update v5.8 patches

Changes:
- Fix a bug preventing the Surface Serial Hub driver from probing
  successfully under certain conditions.

Links:
- SAM: f973e273e1
- kernel: a60417830c
This commit is contained in:
Maximilian Luz 2020-09-18 03:34:55 +02:00
parent 6a3e490796
commit b27a8f90c7
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
4 changed files with 17 additions and 14 deletions

View file

@ -1,4 +1,4 @@
From 0cf1a38c9f30523f762e09c891c0a8d9095edb63 Mon Sep 17 00:00:00 2001 From 6549b6242a7aaaeb8d0c0db18bac57d60d41f3e5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com> From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 17 Aug 2020 01:23:20 +0200 Date: Mon, 17 Aug 2020 01:23:20 +0200
Subject: [PATCH 4/6] surface-sam Subject: [PATCH 4/6] surface-sam
@ -23,7 +23,7 @@ Subject: [PATCH 4/6] surface-sam
drivers/misc/surface_aggregator/bus.h | 22 + drivers/misc/surface_aggregator/bus.h | 22 +
.../misc/surface_aggregator/clients/Kconfig | 154 + .../misc/surface_aggregator/clients/Kconfig | 154 +
.../misc/surface_aggregator/clients/Makefile | 11 + .../misc/surface_aggregator/clients/Makefile | 11 +
.../clients/surface_acpi_notify.c | 844 ++++++ .../clients/surface_acpi_notify.c | 847 ++++++
.../clients/surface_aggregator_debugfs.c | 280 ++ .../clients/surface_aggregator_debugfs.c | 280 ++
.../clients/surface_aggregator_registry.c | 645 +++++ .../clients/surface_aggregator_registry.c | 645 +++++
.../clients/surface_battery.c | 1096 +++++++ .../clients/surface_battery.c | 1096 +++++++
@ -50,7 +50,7 @@ Subject: [PATCH 4/6] surface-sam
include/linux/surface_aggregator/serial_hub.h | 657 +++++ include/linux/surface_aggregator/serial_hub.h | 657 +++++
scripts/mod/devicetable-offsets.c | 8 + scripts/mod/devicetable-offsets.c | 8 +
scripts/mod/file2alias.c | 23 + scripts/mod/file2alias.c | 23 +
46 files changed, 17906 insertions(+) 46 files changed, 17909 insertions(+)
create mode 100644 Documentation/driver-api/surface_aggregator/client-api.rst 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/client.rst
create mode 100644 Documentation/driver-api/surface_aggregator/clients/dbgdev.rst create mode 100644 Documentation/driver-api/surface_aggregator/clients/dbgdev.rst
@ -2094,10 +2094,10 @@ index 000000000000..a859fecae8d5
+obj-$(CONFIG_SURFACE_PERFMODE) += surface_perfmode.o +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 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 new file mode 100644
index 000000000000..3bf715c32c24 index 000000000000..10a623d1afda
--- /dev/null --- /dev/null
+++ b/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c +++ b/drivers/misc/surface_aggregator/clients/surface_acpi_notify.c
@@ -0,0 +1,844 @@ @@ -0,0 +1,847 @@
+// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-License-Identifier: GPL-2.0-or-later
+/* +/*
+ * Driver for the Surface ACPI Notify (SAN) interface/shim. + * Driver for the Surface ACPI Notify (SAN) interface/shim.
@ -2622,7 +2622,8 @@ index 000000000000..3bf715c32c24
+ memcpy(&gsb->data.out.pld[0], ptr, len); + memcpy(&gsb->data.out.pld[0], ptr, len);
+} +}
+ +
+static acpi_status san_rqst_fixup_suspended(struct ssam_request *rqst, +static acpi_status san_rqst_fixup_suspended(struct san_data *d,
+ struct ssam_request *rqst,
+ struct gsb_buffer *gsb) + struct gsb_buffer *gsb)
+{ +{
+ if (rqst->target_category == SSAM_SSH_TC_BAS && rqst->command_id == 0x0D) { + if (rqst->target_category == SSAM_SSH_TC_BAS && rqst->command_id == 0x0D) {
@ -2643,6 +2644,8 @@ index 000000000000..3bf715c32c24
+ * delay. + * delay.
+ */ + */
+ +
+ dev_dbg(d->dev, "rqst: fixup: base-state quirk\n");
+
+ gsb_rqsx_response_success(gsb, &base_state, sizeof(base_state)); + gsb_rqsx_response_success(gsb, &base_state, sizeof(base_state));
+ return AE_OK; + return AE_OK;
+ } + }
@ -2678,7 +2681,7 @@ index 000000000000..3bf715c32c24
+ // handle suspended device + // handle suspended device
+ if (d->dev->power.is_suspended) { + if (d->dev->power.is_suspended) {
+ dev_warn(d->dev, "rqst: device is suspended, not executing\n"); + dev_warn(d->dev, "rqst: device is suspended, not executing\n");
+ return san_rqst_fixup_suspended(&rqst, buffer); + return san_rqst_fixup_suspended(d, &rqst, buffer);
+ } + }
+ +
+ status = ssam_retry(ssam_request_sync_onstack, SAN_REQUEST_NUM_TRIES, + status = ssam_retry(ssam_request_sync_onstack, SAN_REQUEST_NUM_TRIES,
@ -7902,7 +7905,7 @@ index 000000000000..ed93596adcf6
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff --git a/drivers/misc/surface_aggregator/controller.c b/drivers/misc/surface_aggregator/controller.c diff --git a/drivers/misc/surface_aggregator/controller.c b/drivers/misc/surface_aggregator/controller.c
new file mode 100644 new file mode 100644
index 000000000000..d8973cb35a5e index 000000000000..641a17a06da2
--- /dev/null --- /dev/null
+++ b/drivers/misc/surface_aggregator/controller.c +++ b/drivers/misc/surface_aggregator/controller.c
@@ -0,0 +1,2509 @@ @@ -0,0 +1,2509 @@
@ -8980,7 +8983,7 @@ index 000000000000..d8973cb35a5e
+static int ssam_controller_caps_load_from_acpi( +static int ssam_controller_caps_load_from_acpi(
+ acpi_handle handle, struct ssam_controller_caps *caps) + acpi_handle handle, struct ssam_controller_caps *caps)
+{ +{
+ u32 d3_closes_handle; + u32 d3_closes_handle = false;
+ u64 funcs; + u64 funcs;
+ int status; + int status;
+ +

View file

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

View file

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

View file

@ -43,9 +43,9 @@ sha256sums=('eab6585c171a8aea470d32a5946a1fc43f854ae0a239c00daedb366d0e2c1132'
'e23c77883c3dca61c5ebc6689310bbb5b28f22255354bfb02a53a43e18354643' 'e23c77883c3dca61c5ebc6689310bbb5b28f22255354bfb02a53a43e18354643'
'b7c4f87ca8b0b14ec5bc55cf6ed1eee9c0a567090448964cdb5b580625e386dc' 'b7c4f87ca8b0b14ec5bc55cf6ed1eee9c0a567090448964cdb5b580625e386dc'
'd37b50ea734343fb48284583ea75363d39bc747e1f8fe5a10361d09bd791a805' 'd37b50ea734343fb48284583ea75363d39bc747e1f8fe5a10361d09bd791a805'
'91f33a243ac0d5368b1e3922d9c80444a5def0ff378aa5c498b558a542bf65ed' 'fc816c09817e742a8bc2fe321b8db6582d043ca0296ac3736e195c729e48c887'
'f5d45c9861ed0ec53590f82eed46f0ee3ef61a960d8aecf11c997f5e8e4e9789' '32e4373361fe9909c2eea7fa2bc60a2a51b67974dde26cb85ad78cc68bab5cf6'
'dc8cb35b8a022ee544715bb91967c128863343da9f92bedb08ccf247d4669828') 'e32e0db374dde3074414e817ab0e590f66453b1e92d6dede61f4229157edc2cb')
export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_HOST=archlinux