Update v6.0 patches

Changes:
 - Add fix for TypeCover communication dropping packets on SP9,
   preventing the TypeCover from working

Links:
 - kernel: 613da8d0c8
This commit is contained in:
Maximilian Luz 2022-11-13 11:44:12 +01:00
parent e8851c0adf
commit 5cfca66118
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
6 changed files with 93 additions and 20 deletions

View file

@ -1022,10 +1022,10 @@ index 585911020cea..3afe293ac114 100644
--
2.38.1
From 633430779fbfd06713f6907fdcb6a8be4da98279 Mon Sep 17 00:00:00 2001
From f1274adec1f3f91fad86eaed1566c9d043faa685 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 9 Nov 2022 13:13:12 +0100
Subject: [PATCH] wip! platform/surface: ggregator_registry: Add preliminary
Subject: [PATCH] wip! platform/surface: aggregator_registry: Add preliminary
support for Surface Pro 9
Adds support for battery and charger status, as well as platform profile
@ -1083,10 +1083,10 @@ index 3afe293ac114..443fe7647315 100644
--
2.38.1
From 31a1be4047c7c774f466048a02915ff83ef2a245 Mon Sep 17 00:00:00 2001
From 86721e97861259dadbbd998549bbc3339f4973bf Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 12 Nov 2022 22:51:26 +0100
Subject: [PATCH] wip! platform/surface: ggregator_registry: Add preliminary
Subject: [PATCH] wip! platform/surface: aggregator_registry: Add preliminary
typecover support for Surface Pro 9
Still missing: Tablet mode switch.
@ -1117,3 +1117,76 @@ index 443fe7647315..58ad4cad445c 100644
--
2.38.1
From e585a9fde47a9f2418d160f5da97e274f3319482 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 13 Nov 2022 11:38:58 +0100
Subject: [PATCH] wip! platform/surface: aggregator: Do not check for repeated
unsequenced packets
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Patchset: surface-sam
---
.../surface/aggregator/ssh_packet_layer.c | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/surface/aggregator/ssh_packet_layer.c b/drivers/platform/surface/aggregator/ssh_packet_layer.c
index 6748fe4ac5d5..e0d5b18ade0b 100644
--- a/drivers/platform/surface/aggregator/ssh_packet_layer.c
+++ b/drivers/platform/surface/aggregator/ssh_packet_layer.c
@@ -1596,16 +1596,33 @@ static void ssh_ptl_timeout_reap(struct work_struct *work)
ssh_ptl_tx_wakeup_packet(ptl);
}
-static bool ssh_ptl_rx_retransmit_check(struct ssh_ptl *ptl, u8 seq)
+static bool ssh_ptl_rx_retransmit_check(struct ssh_ptl *ptl,
+ const struct ssh_frame *frame)
{
int i;
+ /*
+ * Ignore unsequenced packets. On some devices (notably Surface Pro 9),
+ * unsequenced events will always be sent with SEQ=0x00. Attempting to
+ * detect re-transmission would thus just block all events.
+ *
+ * While sequence numbers would also allow detection of re-transmitted
+ * packets in unsequenced communication, they have only ever been used
+ * to cover edge-cases in sequenced transmission. In particular, the
+ * only instance of packets being retransmitted (that we are aware of)
+ * is due to an ACK timeout. As this does not happen in unsequenced
+ * communication, skip the re-transmission check for those packets
+ * entirely.
+ */
+ if (frame->type == SSH_FRAME_TYPE_DATA_NSQ)
+ return false;
+
/*
* Check if SEQ has been seen recently (i.e. packet was
* re-transmitted and we should ignore it).
*/
for (i = 0; i < ARRAY_SIZE(ptl->rx.blocked.seqs); i++) {
- if (likely(ptl->rx.blocked.seqs[i] != seq))
+ if (likely(ptl->rx.blocked.seqs[i] != frame->seq))
continue;
ptl_dbg(ptl, "ptl: ignoring repeated data packet\n");
@@ -1613,7 +1630,7 @@ static bool ssh_ptl_rx_retransmit_check(struct ssh_ptl *ptl, u8 seq)
}
/* Update list of blocked sequence IDs. */
- ptl->rx.blocked.seqs[ptl->rx.blocked.offset] = seq;
+ ptl->rx.blocked.seqs[ptl->rx.blocked.offset] = frame->seq;
ptl->rx.blocked.offset = (ptl->rx.blocked.offset + 1)
% ARRAY_SIZE(ptl->rx.blocked.seqs);
@@ -1624,7 +1641,7 @@ static void ssh_ptl_rx_dataframe(struct ssh_ptl *ptl,
const struct ssh_frame *frame,
const struct ssam_span *payload)
{
- if (ssh_ptl_rx_retransmit_check(ptl, frame->seq))
+ if (ssh_ptl_rx_retransmit_check(ptl, frame))
return;
ptl->ops.data_received(ptl, payload);
--
2.38.1

View file

@ -1,4 +1,4 @@
From 5c822b198b3e86929e3b90702f20e09fca2a0e9a Mon Sep 17 00:00:00 2001
From bfaebd45292f3b5c3d2fb54ecf234ede9dcedac7 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
@ -110,7 +110,7 @@ index 08b561f0709d..d7c397bce0f0 100644
--
2.38.1
From b6ed092e67b368241e69af6f3d7ef01d7e6f46e1 Mon Sep 17 00:00:00 2001
From 918ffe7b1ea79bc411d865c714683ce1bf4c54ae Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 13 Feb 2021 16:41:18 +0100
Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch

View file

@ -1,4 +1,4 @@
From a42f2237791d546bbbf7a9d83519d9b389deea04 Mon Sep 17 00:00:00 2001
From 60126bdbdad2ceac62b4a74ce2433330d2d8fb6d Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Tue, 5 Oct 2021 00:05:09 +1100
Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@ -75,7 +75,7 @@ index 480476121c01..36e1bf7b7a01 100644
--
2.38.1
From c9f8c4f59f2060c6d53808ff5fdae91929703bc7 Mon Sep 17 00:00:00 2001
From 0363efd5ccd8f9b93d9a1cce67d25f4ca1fce5fb Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Tue, 5 Oct 2021 00:22:57 +1100
Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd

View file

@ -1,4 +1,4 @@
From faaa02f3a030264f021373f9f83e29d34b2e5497 Mon Sep 17 00:00:00 2001
From dc86b9197c39cd7076a47166bd965b110e2277be 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
@ -231,7 +231,7 @@ index 91a4d3fc30e0..458537bf4a8e 100644
--
2.38.1
From 219e89d9c3d57bc998ed6aafde09c96105a80dad Mon Sep 17 00:00:00 2001
From 3a965054331edf475a9878b180c0e053a3fa2d7a Mon Sep 17 00:00:00 2001
From: PJungkamp <p.jungkamp@gmail.com>
Date: Fri, 25 Feb 2022 12:04:25 +0100
Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet

View file

@ -1,4 +1,4 @@
From 4395d280ebe5b72648640ef63588fdadbcf3404b Mon Sep 17 00:00:00 2001
From 49e1272cbd568f29984f1a92f5f4fb628e7e90f5 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 10 Oct 2021 20:56:57 +0200
Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
@ -74,7 +74,7 @@ index 42cec8120f18..72d0e599120f 100644
--
2.38.1
From 14a5925250e1eaf440925c88c6a055f2cf0490f1 Mon Sep 17 00:00:00 2001
From 4ac498a1b567d58746cb2dd6f9642919c3e68a45 Mon Sep 17 00:00:00 2001
From: zouxiaoh <xiaohong.zou@intel.com>
Date: Fri, 25 Jun 2021 08:52:59 +0800
Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
@ -191,7 +191,7 @@ index 4c895b5f7e2d..f68f031dee46 100644
--
2.38.1
From 6fe580b0bb6383a45e0b319007a06aae9ac2ce90 Mon Sep 17 00:00:00 2001
From bdf47a8de8d834916fcb1b3910e25571274dd454 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Sun, 10 Oct 2021 20:57:02 +0200
Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
@ -228,7 +228,7 @@ index 22f61b47f9e5..e1de1ff40bba 100644
--
2.38.1
From afb496b7714c8e94697c4b5fdecae6573883c6f8 Mon Sep 17 00:00:00 2001
From 313a1b9f288052c084f5961e44b234f5c7e95f3a Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Thu, 28 Oct 2021 21:55:16 +0100
Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
@ -734,7 +734,7 @@ index 000000000000..8451c75b696b
--
2.38.1
From 83877415f586ae1d54c3958e1c6307ee9984b5cf Mon Sep 17 00:00:00 2001
From bdc60eaaa8aec8d9f0f4f3c5974014b718652f01 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Wed, 4 May 2022 23:21:45 +0100
Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
@ -849,7 +849,7 @@ index a3fe547b7fce..5648f29ced7b 100644
--
2.38.1
From 6148516d49304e7fc633695762fd4ba12b4057a4 Mon Sep 17 00:00:00 2001
From 09bd5dff551151916506fa94bbe1227913d1f0e7 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Thu, 2 Jun 2022 22:15:56 +0100
Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
@ -892,7 +892,7 @@ index 5648f29ced7b..957a30cd369d 100644
--
2.38.1
From 812f17227ae50a74cd75c43a9f6fa58dfa8ccac6 Mon Sep 17 00:00:00 2001
From 6f92a3fe154d3b110b5cab8bd84672db76c2a118 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 15 Jul 2022 23:48:00 +0200
Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
@ -921,7 +921,7 @@ index 98d081efeef7..c67966cafe10 100644
--
2.38.1
From 79d2968e29d7c65b44cb341d4f8a20cd4e1b277d Mon Sep 17 00:00:00 2001
From e600b49557e80cd1ae75d2c6731214f99ab84446 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 7 Sep 2022 15:38:08 +0200
Subject: [PATCH] ipu3-imgu: Fix NULL pointer dereference in

View file

@ -1,4 +1,4 @@
From 578ed47c830c312f9e4cc264da31d3f9001a0ba4 Mon Sep 17 00:00:00 2001
From 4ee56dbefbabca4351e5c4a8a6453ee92b229139 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Sat, 29 May 2021 17:47:38 +1000
Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@ -65,7 +65,7 @@ index 907cc98b1938..0116d27b29ea 100644
--
2.38.1
From 5a41f9382326e7f05b8ed4dfeacd7c0d9759588a Mon Sep 17 00:00:00 2001
From 9b3f18d7dd54d2fc22fd41b4ffd5600bef736167 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 3 Jun 2021 14:04:26 +0200
Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override