Browse Source

Fix GPE interrupt setup for Surface Book 1

qzed 6 years ago
parent
commit
21508168a7

+ 14 - 9
patches/4.19/0001-surface-acpi.patch

@@ -1,4 +1,4 @@
-From c88960a183f465316b28486bf7a9031563547001 Mon Sep 17 00:00:00 2001
+From fa76ab4055175cad9c3ae34fed2257f2d7346fac Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:40:41 +0200
 Subject: [PATCH 01/12] surface-acpi
@@ -8,9 +8,9 @@ Subject: [PATCH 01/12] surface-acpi
  drivers/acpi/acpica/exfield.c       |   26 +-
  drivers/platform/x86/Kconfig        |   97 +
  drivers/platform/x86/Makefile       |    1 +
- drivers/platform/x86/surface_acpi.c | 3908 +++++++++++++++++++++++++++
+ drivers/platform/x86/surface_acpi.c | 3913 +++++++++++++++++++++++++++
  drivers/tty/serdev/core.c           |   90 +-
- 6 files changed, 4105 insertions(+), 19 deletions(-)
+ 6 files changed, 4110 insertions(+), 19 deletions(-)
  create mode 100644 drivers/platform/x86/surface_acpi.c
 
 diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
@@ -201,10 +201,10 @@ index dc29af4d8e2f..2250a32a5527 100644
  obj-$(CONFIG_FUJITSU_TABLET)	+= fujitsu-tablet.o
 diff --git a/drivers/platform/x86/surface_acpi.c b/drivers/platform/x86/surface_acpi.c
 new file mode 100644
-index 000000000000..a17538905642
+index 000000000000..f62aecb0df69
 --- /dev/null
 +++ b/drivers/platform/x86/surface_acpi.c
-@@ -0,0 +1,3908 @@
+@@ -0,0 +1,3913 @@
 +#include <asm/unaligned.h>
 +#include <linux/acpi.h>
 +#include <linux/completion.h>
@@ -3996,7 +3996,12 @@ index 000000000000..a17538905642
 +	.lid_device = &lid_device_l17,
 +};
 +
-+static const struct si_device_info si_device_book = {
++static const struct si_device_info si_device_book_1 = {
++	.has_perf_mode = false,
++	.lid_device = &lid_device_l17,
++};
++
++static const struct si_device_info si_device_book_2 = {
 +	.has_perf_mode = true,
 +	.lid_device = &lid_device_l17,
 +};
@@ -4008,8 +4013,8 @@ index 000000000000..a17538905642
 +
 +static const struct acpi_device_id surfacegen5_acpi_sid_match[] = {
 +	{ "MSHW0081", (unsigned long)&si_device_pro },     /* Surface Pro 4 and 5 */
-+	{ "MSHW0080", (unsigned long)&si_device_book },    /* Surface Book 1 */
-+	{ "MSHW0107", (unsigned long)&si_device_book },    /* Surface Book 2 */
++	{ "MSHW0080", (unsigned long)&si_device_book_1 },  /* Surface Book 1 */
++	{ "MSHW0107", (unsigned long)&si_device_book_2 },  /* Surface Book 2 */
 +	{ "MSHW0086", (unsigned long)&si_device_laptop },  /* Surface Laptop 1 */
 +	{ "MSHW0112", (unsigned long)&si_device_laptop },  /* Surface Laptop 2 */
 +	{ },
@@ -4236,5 +4241,5 @@ index 9db93f500b4e..2290d4f86ca4 100644
  		return -ENODEV;
  
 -- 
-2.22.0
+2.23.0
 

+ 6 - 6
patches/4.19/0002-suspend.patch

@@ -1,4 +1,4 @@
-From 37bc0c403af84fc5c6018c7ec1d974607b8040f2 Mon Sep 17 00:00:00 2001
+From 5b096f13d4fdc994dbef3b0ff8c50c1fea7adb1e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:41:22 +0200
 Subject: [PATCH 02/12] suspend
@@ -13,7 +13,7 @@ Subject: [PATCH 02/12] suspend
  6 files changed, 40 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index e82cdaec81c9..3b63eafb21d7 100644
+index d5e29b57eb34..cadc756e0534 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
 @@ -90,6 +90,11 @@ enum nvme_quirks {
@@ -29,7 +29,7 @@ index e82cdaec81c9..3b63eafb21d7 100644
  
  /*
 diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index c8eeecc58115..2b578fc8f2a4 100644
+index 0a5d064f82ca..55c6a273588a 100644
 --- a/drivers/nvme/host/pci.c
 +++ b/drivers/nvme/host/pci.c
 @@ -30,6 +30,7 @@
@@ -40,7 +40,7 @@ index c8eeecc58115..2b578fc8f2a4 100644
  
  #include "nvme.h"
  
-@@ -2605,8 +2606,11 @@ static int nvme_suspend(struct device *dev)
+@@ -2609,8 +2610,11 @@ static int nvme_suspend(struct device *dev)
  {
  	struct pci_dev *pdev = to_pci_dev(dev);
  	struct nvme_dev *ndev = pci_get_drvdata(pdev);
@@ -53,7 +53,7 @@ index c8eeecc58115..2b578fc8f2a4 100644
  	return 0;
  }
  
-@@ -2710,6 +2714,10 @@ static const struct pci_device_id nvme_id_table[] = {
+@@ -2714,6 +2718,10 @@ static const struct pci_device_id nvme_id_table[] = {
  		.driver_data = NVME_QUIRK_LIGHTNVM, },
  	{ PCI_DEVICE(0x1d1d, 0x2601),	/* CNEX Granby */
  		.driver_data = NVME_QUIRK_LIGHTNVM, },
@@ -141,5 +141,5 @@ index f8576509c7be..a5fa80e72aba 100644
  		.procname	= "sched_child_runs_first",
  		.data		= &sysctl_sched_child_runs_first,
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/4.19/0003-buttons.patch

@@ -1,4 +1,4 @@
-From 16423edf1a61130f052c5f6035e5b20870151810 Mon Sep 17 00:00:00 2001
+From 0aafad89af1091dd4a919d2c5caff7f0188b2f99 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:42:15 +0200
 Subject: [PATCH 03/12] buttons
@@ -263,5 +263,5 @@ index 1b491690ce07..96627627060e 100644
  	if (!button)
  		return -ENOMEM;
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/4.19/0004-cameras.patch

@@ -1,4 +1,4 @@
-From 3f8115c937177e03121f1860dd279835f5328931 Mon Sep 17 00:00:00 2001
+From 9e96184aa9f22bcfe4dc193c986ce483910a52ce Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:42:25 +0200
 Subject: [PATCH 04/12] cameras
@@ -2749,5 +2749,5 @@ index 000000000000..79aef69666e8
 +};
 +#endif
 -- 
-2.22.0
+2.23.0
 

+ 4 - 4
patches/4.19/0005-ipts.patch

@@ -1,4 +1,4 @@
-From 60508845ee5f6a06bce7ba337511a35929bb5645 Mon Sep 17 00:00:00 2001
+From a73c53808311f58ad03f0029274ae0e4c84aa022 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:42:39 +0200
 Subject: [PATCH 05/12] ipts
@@ -6065,7 +6065,7 @@ index 000000000000..1fcd02146b50
 +
 +#endif // _IPTS_H_
 diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
-index bb1ee9834a02..2bbffe8aad40 100644
+index 225373e4a9ef..828342db01be 100644
 --- a/drivers/misc/mei/hw-me-regs.h
 +++ b/drivers/misc/mei/hw-me-regs.h
 @@ -119,6 +119,7 @@
@@ -6077,7 +6077,7 @@ index bb1ee9834a02..2bbffe8aad40 100644
  #define MEI_DEV_ID_SPT_H_2    0xA13B  /* Sunrise Point H 2 */
  
 diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
-index 4299658d48d6..a13fc65bb8e1 100644
+index a66ebceea408..030e8f4294be 100644
 --- a/drivers/misc/mei/pci-me.c
 +++ b/drivers/misc/mei/pci-me.c
 @@ -86,6 +86,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@@ -6170,5 +6170,5 @@ index 000000000000..f329bbfb8079
 +
 +#endif // INTEL_IPTS_IF_H
 -- 
-2.22.0
+2.23.0
 

+ 6 - 6
patches/4.19/0006-hid.patch

@@ -1,4 +1,4 @@
-From 9ab8a37f4a5ab1aef8ab7d2405c40793e394a701 Mon Sep 17 00:00:00 2001
+From f31d20b0da3d3420b907df811b1f86098bf90377 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:42:50 +0200
 Subject: [PATCH 06/12] hid
@@ -11,10 +11,10 @@ Subject: [PATCH 06/12] hid
  4 files changed, 86 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 50b3c0d89c9c..d08c79a29402 100644
+index 2898bb061945..13bb280c4dc7 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -803,11 +803,22 @@
+@@ -804,11 +804,22 @@
  #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
  #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600  0x0750
  #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c
@@ -125,10 +125,10 @@ index 28b729c9d804..334afd3854a9 100644
  	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
  		MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
-index 91e86af44a04..4cc5821cc6a7 100644
+index d29c7c9cd185..351abb6cb197 100644
 --- a/drivers/hid/hid-quirks.c
 +++ b/drivers/hid/hid-quirks.c
-@@ -113,6 +113,17 @@ static const struct hid_device_id hid_quirks[] = {
+@@ -114,6 +114,17 @@ static const struct hid_device_id hid_quirks[] = {
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
@@ -147,5 +147,5 @@ index 91e86af44a04..4cc5821cc6a7 100644
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
 -- 
-2.22.0
+2.23.0
 

+ 4 - 4
patches/4.19/0007-sdcard-reader.patch

@@ -1,4 +1,4 @@
-From 4b8d1631e6c23f1c4802e613572ed09e4d1075ae Mon Sep 17 00:00:00 2001
+From d6508cabcf5266f488adfecc2f03cb37b7849aa1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:43:03 +0200
 Subject: [PATCH 07/12] sdcard-reader
@@ -8,10 +8,10 @@ Subject: [PATCH 07/12] sdcard-reader
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index eb24ec0e160d..8327ac3880c8 100644
+index 8018f813972e..4f7779c53ab2 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -4157,7 +4157,8 @@ void usb_enable_lpm(struct usb_device *udev)
+@@ -4164,7 +4164,8 @@ void usb_enable_lpm(struct usb_device *udev)
  	if (!udev || !udev->parent ||
  			udev->speed < USB_SPEED_SUPER ||
  			!udev->lpm_capable ||
@@ -22,5 +22,5 @@ index eb24ec0e160d..8327ac3880c8 100644
  
  	udev->lpm_disable_count--;
 -- 
-2.22.0
+2.23.0
 

+ 5 - 5
patches/4.19/0008-wifi.patch

@@ -1,4 +1,4 @@
-From 99b6b2846efa7c0cbfda3f08c95be73766f1b586 Mon Sep 17 00:00:00 2001
+From 5fdb2f335eedc98a627807162709d71b46df0c90 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:43:14 +0200
 Subject: [PATCH 08/12] wifi
@@ -173,10 +173,10 @@ index 20cee5c397fb..13e49a3ae812 100644
  		if ((adapter->ps_state == PS_STATE_SLEEP) &&
  		    (adapter->pm_wakeup_card_req &&
 diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
-index b025ba164412..d4027a803079 100644
+index e39bb5c42c9a..8ec3275dad6d 100644
 --- a/drivers/net/wireless/marvell/mwifiex/main.h
 +++ b/drivers/net/wireless/marvell/mwifiex/main.h
-@@ -908,6 +908,7 @@ struct mwifiex_adapter {
+@@ -909,6 +909,7 @@ struct mwifiex_adapter {
  	spinlock_t main_proc_lock;
  	u32 mwifiex_processing;
  	u8 more_task_flag;
@@ -184,7 +184,7 @@ index b025ba164412..d4027a803079 100644
  	u16 tx_buf_size;
  	u16 curr_tx_buf_size;
  	/* sdio single port rx aggregation capability */
-@@ -1694,6 +1695,7 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter);
+@@ -1695,6 +1696,7 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter);
  void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags);
  void mwifiex_fw_dump_event(struct mwifiex_private *priv);
  void mwifiex_queue_main_work(struct mwifiex_adapter *adapter);
@@ -266,5 +266,5 @@ diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
 old mode 100755
 new mode 100644
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/4.19/0009-surface3-power.patch

@@ -1,4 +1,4 @@
-From 2c3a0e3a9ff360e42bd7a1b221906588adf93a54 Mon Sep 17 00:00:00 2001
+From fd8e6225feee5a76333bafde5fd007c59a40867f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:43:27 +0200
 Subject: [PATCH 09/12] surface3-power
@@ -651,5 +651,5 @@ index 000000000000..e0af01a60302
 +MODULE_DESCRIPTION("mshw0011 driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/4.19/0010-mwlwifi.patch

@@ -1,4 +1,4 @@
-From 0e2d13af220261d9825456f4db741fb6c9e93f15 Mon Sep 17 00:00:00 2001
+From 5122e280ac379121c8b9eba81d6d5a91f2c8c981 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:43:45 +0200
 Subject: [PATCH 10/12] mwlwifi
@@ -19751,5 +19751,5 @@ index 000000000000..b6fdf70c22fb
 +
 +#endif /* _VENDOR_CMD_H_ */
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/4.19/0011-surface-lte.patch

@@ -1,4 +1,4 @@
-From d320c8ba0a4f2cd465f21eca08283faa816cafa9 Mon Sep 17 00:00:00 2001
+From 09b4ad8e1ab07dab21a341c200049bb45649e663 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:43:57 +0200
 Subject: [PATCH 11/12] 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.22.0
+2.23.0
 

+ 2 - 2
patches/4.19/0012-surfacebook2-dgpu.patch

@@ -1,4 +1,4 @@
-From da8c31d8130650ab76cd35ad74d63ff5ed337be0 Mon Sep 17 00:00:00 2001
+From 154df84d55d3aa7af762836ece1ed59866673744 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 03:44:10 +0200
 Subject: [PATCH 12/12] surfacebook2-dgpu
@@ -355,5 +355,5 @@ index 000000000000..7639fb0029d8
 +MODULE_DESCRIPTION("Surface Book 2 Hot-Plug System Driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.22.0
+2.23.0
 

+ 14 - 9
patches/5.1/0001-surface-acpi.patch

@@ -1,4 +1,4 @@
-From 04eb1901a55b1415f82999f186c8de231deb7f5c Mon Sep 17 00:00:00 2001
+From 64f3368a6822e2b9d031b6c372316b7e92206a23 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:10:38 +0200
 Subject: [PATCH 01/12] surface-acpi
@@ -8,9 +8,9 @@ Subject: [PATCH 01/12] surface-acpi
  drivers/acpi/acpica/exfield.c       |   12 +-
  drivers/platform/x86/Kconfig        |   97 +
  drivers/platform/x86/Makefile       |    1 +
- drivers/platform/x86/surface_acpi.c | 3908 +++++++++++++++++++++++++++
+ drivers/platform/x86/surface_acpi.c | 3913 +++++++++++++++++++++++++++
  drivers/tty/serdev/core.c           |   90 +-
- 6 files changed, 4104 insertions(+), 6 deletions(-)
+ 6 files changed, 4109 insertions(+), 6 deletions(-)
  create mode 100644 drivers/platform/x86/surface_acpi.c
 
 diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
@@ -180,10 +180,10 @@ index 86cb76677bc8..be1ce92a365d 100644
  obj-$(CONFIG_FUJITSU_TABLET)	+= fujitsu-tablet.o
 diff --git a/drivers/platform/x86/surface_acpi.c b/drivers/platform/x86/surface_acpi.c
 new file mode 100644
-index 000000000000..a17538905642
+index 000000000000..f62aecb0df69
 --- /dev/null
 +++ b/drivers/platform/x86/surface_acpi.c
-@@ -0,0 +1,3908 @@
+@@ -0,0 +1,3913 @@
 +#include <asm/unaligned.h>
 +#include <linux/acpi.h>
 +#include <linux/completion.h>
@@ -3975,7 +3975,12 @@ index 000000000000..a17538905642
 +	.lid_device = &lid_device_l17,
 +};
 +
-+static const struct si_device_info si_device_book = {
++static const struct si_device_info si_device_book_1 = {
++	.has_perf_mode = false,
++	.lid_device = &lid_device_l17,
++};
++
++static const struct si_device_info si_device_book_2 = {
 +	.has_perf_mode = true,
 +	.lid_device = &lid_device_l17,
 +};
@@ -3987,8 +3992,8 @@ index 000000000000..a17538905642
 +
 +static const struct acpi_device_id surfacegen5_acpi_sid_match[] = {
 +	{ "MSHW0081", (unsigned long)&si_device_pro },     /* Surface Pro 4 and 5 */
-+	{ "MSHW0080", (unsigned long)&si_device_book },    /* Surface Book 1 */
-+	{ "MSHW0107", (unsigned long)&si_device_book },    /* Surface Book 2 */
++	{ "MSHW0080", (unsigned long)&si_device_book_1 },  /* Surface Book 1 */
++	{ "MSHW0107", (unsigned long)&si_device_book_2 },  /* Surface Book 2 */
 +	{ "MSHW0086", (unsigned long)&si_device_laptop },  /* Surface Laptop 1 */
 +	{ "MSHW0112", (unsigned long)&si_device_laptop },  /* Surface Laptop 2 */
 +	{ },
@@ -4215,5 +4220,5 @@ index a0ac16ee6575..0dd242ff24d1 100644
  		return -ENODEV;
  
 -- 
-2.22.0
+2.23.0
 

+ 5 - 5
patches/5.1/0002-suspend.patch

@@ -1,4 +1,4 @@
-From 8f3f0b0111ce5bfa12a5c052ad6a04874dbdb95e Mon Sep 17 00:00:00 2001
+From 2291bc5ea806399d9c649bb8a889400ce8672ec3 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:11:02 +0200
 Subject: [PATCH 02/12] suspend
@@ -29,7 +29,7 @@ index 527d64545023..35840869c8d4 100644
  
  /*
 diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index 693f2a856200..5b976bcc2058 100644
+index 914eea2ea557..1d1ea00b43ac 100644
 --- a/drivers/nvme/host/pci.c
 +++ b/drivers/nvme/host/pci.c
 @@ -23,6 +23,7 @@
@@ -40,7 +40,7 @@ index 693f2a856200..5b976bcc2058 100644
  
  #include "trace.h"
  #include "nvme.h"
-@@ -2856,8 +2857,11 @@ static int nvme_suspend(struct device *dev)
+@@ -2864,8 +2865,11 @@ static int nvme_suspend(struct device *dev)
  {
  	struct pci_dev *pdev = to_pci_dev(dev);
  	struct nvme_dev *ndev = pci_get_drvdata(pdev);
@@ -53,7 +53,7 @@ index 693f2a856200..5b976bcc2058 100644
  	return 0;
  }
  
-@@ -2963,6 +2967,10 @@ static const struct pci_device_id nvme_id_table[] = {
+@@ -2971,6 +2975,10 @@ static const struct pci_device_id nvme_id_table[] = {
  		.driver_data = NVME_QUIRK_LIGHTNVM, },
  	{ PCI_DEVICE(0x1d1d, 0x2601),	/* CNEX Granby */
  		.driver_data = NVME_QUIRK_LIGHTNVM, },
@@ -141,5 +141,5 @@ index 387efbaf464a..f2762f5989a8 100644
  		.procname	= "sched_child_runs_first",
  		.data		= &sysctl_sched_child_runs_first,
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0003-buttons.patch

@@ -1,4 +1,4 @@
-From 5dae467afb5fda0c52463b4a915585302bdea08d Mon Sep 17 00:00:00 2001
+From ca1590dfcd342f0f1fb0a2fd4b262d067d2fd1fd Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:11:17 +0200
 Subject: [PATCH 03/12] buttons
@@ -263,5 +263,5 @@ index 1b491690ce07..96627627060e 100644
  	if (!button)
  		return -ENOMEM;
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0004-cameras.patch

@@ -1,4 +1,4 @@
-From 34ff8d7dd13d023bdfceeb519c4fdf454cfe4d64 Mon Sep 17 00:00:00 2001
+From 6a9467f92c3ea31879bb760a43dc950150641e5e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:11:26 +0200
 Subject: [PATCH 04/12] cameras
@@ -2749,5 +2749,5 @@ index 000000000000..79aef69666e8
 +};
 +#endif
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0005-ipts.patch

@@ -1,4 +1,4 @@
-From e9dd509a0c74e2182a46beaeaa5be6d0532a00de Mon Sep 17 00:00:00 2001
+From ccfb3ab207379ed7efafbb0f58298620a875b3f8 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:11:35 +0200
 Subject: [PATCH 05/12] ipts
@@ -6174,5 +6174,5 @@ index 000000000000..f329bbfb8079
 +
 +#endif // INTEL_IPTS_IF_H
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0006-hid.patch

@@ -1,4 +1,4 @@
-From f84b5e8deb61c010a6d9cfc1425ed9d80f12c207 Mon Sep 17 00:00:00 2001
+From 6b9b606e885ed534940baeba0b64122895c53c3d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:11:44 +0200
 Subject: [PATCH 06/12] hid
@@ -147,5 +147,5 @@ index 74c0ad21b267..dfe97c2a8278 100644
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
 -- 
-2.22.0
+2.23.0
 

+ 4 - 4
patches/5.1/0007-sdcard-reader.patch

@@ -1,4 +1,4 @@
-From 43ee881577207efc2e28f83a94b9658c1b19d890 Mon Sep 17 00:00:00 2001
+From ce4d18ba4bd76b7146e77a3dd147bffc73ef210e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:11:54 +0200
 Subject: [PATCH 07/12] sdcard-reader
@@ -8,10 +8,10 @@ Subject: [PATCH 07/12] sdcard-reader
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 310eef451db8..a896e86ca0d7 100644
+index b10d14af6416..300289c0dd98 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -4198,7 +4198,8 @@ void usb_enable_lpm(struct usb_device *udev)
+@@ -4201,7 +4201,8 @@ void usb_enable_lpm(struct usb_device *udev)
  	if (!udev || !udev->parent ||
  			udev->speed < USB_SPEED_SUPER ||
  			!udev->lpm_capable ||
@@ -22,5 +22,5 @@ index 310eef451db8..a896e86ca0d7 100644
  
  	udev->lpm_disable_count--;
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0008-wifi.patch

@@ -1,4 +1,4 @@
-From 739ec85fcd09682a775d5099849fee0f6b507d49 Mon Sep 17 00:00:00 2001
+From 95fbe06a2530048e1f2f75a60299f3a3828606cb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:12:05 +0200
 Subject: [PATCH 08/12] wifi
@@ -266,5 +266,5 @@ diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
 old mode 100755
 new mode 100644
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0009-surface3-power.patch

@@ -1,4 +1,4 @@
-From 02ed2332030abe58d010d28407176cb63d6ee3bc Mon Sep 17 00:00:00 2001
+From 6e04e0f2688b530aa942bd4a0041b267ffc483b2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:12:17 +0200
 Subject: [PATCH 09/12] surface3-power
@@ -651,5 +651,5 @@ index 000000000000..e0af01a60302
 +MODULE_DESCRIPTION("mshw0011 driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0010-mwlwifi.patch

@@ -1,4 +1,4 @@
-From 99eb35992068f60c06184ba7099a1e0a81b141e6 Mon Sep 17 00:00:00 2001
+From 9b956e130606d5c0e5e22b2b56028a9c106f83ce Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:12:32 +0200
 Subject: [PATCH 10/12] mwlwifi
@@ -19751,5 +19751,5 @@ index 000000000000..b6fdf70c22fb
 +
 +#endif /* _VENDOR_CMD_H_ */
 -- 
-2.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0011-surface-lte.patch

@@ -1,4 +1,4 @@
-From d47e3771140795d921008131954893e677ebd0ad Mon Sep 17 00:00:00 2001
+From b3402fa351f5e312e64d6c42270249039975d6da Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:12:45 +0200
 Subject: [PATCH 11/12] 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.22.0
+2.23.0
 

+ 2 - 2
patches/5.1/0012-surfacebook2-dgpu.patch

@@ -1,4 +1,4 @@
-From 5b746cb149fa5ad1719acd075bdad89923f0b8e3 Mon Sep 17 00:00:00 2001
+From bfa1d90d15122ae7696f80cd81eeaa801161c5e6 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 26 Jul 2019 04:12:57 +0200
 Subject: [PATCH 12/12] surfacebook2-dgpu
@@ -355,5 +355,5 @@ index 000000000000..7639fb0029d8
 +MODULE_DESCRIPTION("Surface Book 2 Hot-Plug System Driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.22.0
+2.23.0