Drop patches included in 4.17
This commit is contained in:
Marek Marczykowski-Górecki
parent
06f28bd3c9
commit
d27a8e5314
@ -1,41 +0,0 @@
|
||||
From patchwork Mon Oct 16 14:48:55 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: Input: synaptics - add Intertouch support on X1 Carbon 6th and X280
|
||||
From: Aaron Ma <aaron.ma@canonical.com>
|
||||
X-Patchwork-Id: 10008513
|
||||
Message-Id: <1508165335-16738-1-git-send-email-aaron.ma@canonical.com>
|
||||
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||
dmitry.torokhov@gmail.com, aaron.ma@canonical.com
|
||||
Date: Mon, 16 Oct 2017 22:48:55 +0800
|
||||
|
||||
Synaptics devices reported it has Intertouch support,
|
||||
and it fails via PS/2 as following logs:
|
||||
|
||||
psmouse serio2: Failed to reset mouse on synaptics-pt/serio0
|
||||
psmouse serio2: Failed to enable mouse on synaptics-pt/serio0
|
||||
|
||||
Set these new devices to use SMBus to fix this issue,
|
||||
then they report SMBus version 3 is using,
|
||||
patch: https://patchwork.kernel.org/patch/9989547/ enabled SMBus ver 3 and
|
||||
makes synaptics devices work fine on SMBus mode.
|
||||
|
||||
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
|
||||
---
|
||||
drivers/input/mouse/synaptics.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
|
||||
index 5af0b7d200bc..da3a5e40e80c 100644
|
||||
--- a/drivers/input/mouse/synaptics.c
|
||||
+++ b/drivers/input/mouse/synaptics.c
|
||||
@@ -173,6 +173,8 @@ static const char * const smbus_pnp_ids[] = {
|
||||
"LEN0046", /* X250 */
|
||||
"LEN004a", /* W541 */
|
||||
"LEN0073", /* X1 Carbon 5 */
|
||||
+ "LEN0092", /* X1 Carbon 6 */
|
||||
+ "LEN0096", /* X280 */
|
||||
"LEN200f", /* T450s */
|
||||
NULL
|
||||
};
|
||||
@ -1,28 +0,0 @@
|
||||
From patchwork Fri Oct 6 14:06:30 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v2,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI
|
||||
From: Yiannis Marangos <yiannis.marangos@gmail.com>
|
||||
X-Patchwork-Id: 9989549
|
||||
Message-Id: <20171006140630.6398-3-yiannis.marangos@gmail.com>
|
||||
To: linux-input@vger.kernel.org
|
||||
Cc: Yiannis Marangos <yiannis.marangos@gmail.com>
|
||||
Date: Fri, 6 Oct 2017 17:06:30 +0300
|
||||
|
||||
---
|
||||
drivers/input/mouse/synaptics.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
|
||||
index 5af0b7d200bc..eecb8872c1a5 100644
|
||||
--- a/drivers/input/mouse/synaptics.c
|
||||
+++ b/drivers/input/mouse/synaptics.c
|
||||
@@ -172,6 +172,7 @@ static const char * const smbus_pnp_ids[] = {
|
||||
"LEN0048", /* X1 Carbon 3 */
|
||||
"LEN0046", /* X250 */
|
||||
"LEN004a", /* W541 */
|
||||
+ "LEN0073", /* X1 Carbon 5 */
|
||||
"LEN200f", /* T450s */
|
||||
NULL
|
||||
};
|
||||
@ -1,55 +0,0 @@
|
||||
From 8fe5ab411209ac6e2c7021131e622fd004506d1a Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Date: Thu, 15 Mar 2018 03:43:22 +0100
|
||||
Subject: [PATCH 3/3] xen: xenbus_dev_frontend: Verify body of
|
||||
XS_TRANSACTION_END
|
||||
|
||||
By guaranteeing that the argument of XS_TRANSACTION_END is valid we can
|
||||
assume that the transaction has been closed when we get an XS_ERROR
|
||||
response from xenstore (Note that we already verify that it's a valid
|
||||
transaction id).
|
||||
|
||||
Signed-off-by: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Reviewed-by: Juergen Gross <jgross@suse.com>
|
||||
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
---
|
||||
drivers/xen/xenbus/xenbus_dev_frontend.c | 14 +++++++++++---
|
||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
|
||||
index 81a84b3c1c50..0d6d9264d6a9 100644
|
||||
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
|
||||
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
|
||||
@@ -429,6 +429,10 @@ static int xenbus_write_transaction(unsigned msg_type,
|
||||
{
|
||||
int rc;
|
||||
struct xenbus_transaction_holder *trans = NULL;
|
||||
+ struct {
|
||||
+ struct xsd_sockmsg hdr;
|
||||
+ char body[];
|
||||
+ } *msg = (void *)u->u.buffer;
|
||||
|
||||
if (msg_type == XS_TRANSACTION_START) {
|
||||
trans = kzalloc(sizeof(*trans), GFP_KERNEL);
|
||||
@@ -437,11 +441,15 @@ static int xenbus_write_transaction(unsigned msg_type,
|
||||
goto out;
|
||||
}
|
||||
list_add(&trans->list, &u->transactions);
|
||||
- } else if (u->u.msg.tx_id != 0 &&
|
||||
- !xenbus_get_transaction(u, u->u.msg.tx_id))
|
||||
+ } else if (msg->hdr.tx_id != 0 &&
|
||||
+ !xenbus_get_transaction(u, msg->hdr.tx_id))
|
||||
return xenbus_command_reply(u, XS_ERROR, "ENOENT");
|
||||
+ else if (msg_type == XS_TRANSACTION_END &&
|
||||
+ !(msg->hdr.len == 2 &&
|
||||
+ (!strcmp(msg->body, "T") || !strcmp(msg->body, "F"))))
|
||||
+ return xenbus_command_reply(u, XS_ERROR, "EINVAL");
|
||||
|
||||
- rc = xenbus_dev_request_and_reply(&u->u.msg, u);
|
||||
+ rc = xenbus_dev_request_and_reply(&msg->hdr, u);
|
||||
if (rc && trans) {
|
||||
list_del(&trans->list);
|
||||
kfree(trans);
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From b93008d1ac657dc67819330c5995e65e7c3e7978 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Date: Thu, 15 Mar 2018 03:43:21 +0100
|
||||
Subject: [PATCH 2/3] xen: xenbus: Catch closing of non existent transactions
|
||||
|
||||
Users of the xenbus functions should never close a non existent
|
||||
transaction (for example by trying to closing the same transaction
|
||||
twice) but better catch it in xs_request_exit() than to corrupt the
|
||||
reference counter.
|
||||
|
||||
Signed-off-by: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Reviewed-by: Juergen Gross <jgross@suse.com>
|
||||
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
---
|
||||
drivers/xen/xenbus/xenbus_xs.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
|
||||
index 3f3b29398ab8..49a3874ae6bb 100644
|
||||
--- a/drivers/xen/xenbus/xenbus_xs.c
|
||||
+++ b/drivers/xen/xenbus/xenbus_xs.c
|
||||
@@ -140,7 +140,9 @@ void xs_request_exit(struct xb_req_data *req)
|
||||
spin_lock(&xs_state_lock);
|
||||
xs_state_users--;
|
||||
if ((req->type == XS_TRANSACTION_START && req->msg.type == XS_ERROR) ||
|
||||
- req->type == XS_TRANSACTION_END)
|
||||
+ (req->type == XS_TRANSACTION_END &&
|
||||
+ !WARN_ON_ONCE(req->msg.type == XS_ERROR &&
|
||||
+ !strcmp(req->body, "ENOENT"))))
|
||||
xs_state_users--;
|
||||
spin_unlock(&xs_state_lock);
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@ -24,11 +24,3 @@ patches.xen/pci_op-cleanup.patch
|
||||
|
||||
# Fix for MSI support with stubdoms
|
||||
patches.xen/xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
|
||||
|
||||
# Upstreamed fix for HVM suspend issue with >= 4.11
|
||||
patches.xen/b93008d1ac65-xen-xenbus-Catch-closing-of-non-existent-transaction.patch
|
||||
patches.xen/8fe5ab411209-xen-xenbus_dev_frontend-Verify-body-of-XS_TRANSACTIO.patch
|
||||
|
||||
# Hardware-specific fixes, backported from newer kernel and/or developers branches
|
||||
patches.backports/v2-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
|
||||
patches.backports/Input-synaptics---add-Intertouch-support-on-X1-Carbon-6th-and-X280.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user