Add patches for v5.14
This commit is contained in:
parent
270d404053
commit
37d7a5ded8
60
configs/surface-5.14.config
Normal file
60
configs/surface-5.14.config
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
#
|
||||||
|
# Surface Aggregator Module
|
||||||
|
#
|
||||||
|
CONFIG_SURFACE_AGGREGATOR=m
|
||||||
|
CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION=n
|
||||||
|
CONFIG_SURFACE_AGGREGATOR_BUS=y
|
||||||
|
CONFIG_SURFACE_AGGREGATOR_CDEV=m
|
||||||
|
CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
|
||||||
|
|
||||||
|
CONFIG_SURFACE_ACPI_NOTIFY=m
|
||||||
|
CONFIG_SURFACE_DTX=m
|
||||||
|
CONFIG_SURFACE_PLATFORM_PROFILE=m
|
||||||
|
|
||||||
|
CONFIG_SURFACE_HID=m
|
||||||
|
CONFIG_SURFACE_KBD=m
|
||||||
|
|
||||||
|
CONFIG_BATTERY_SURFACE=m
|
||||||
|
CONFIG_CHARGER_SURFACE=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Surface Hotplug
|
||||||
|
#
|
||||||
|
CONFIG_SURFACE_HOTPLUG=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# IPTS touchscreen
|
||||||
|
#
|
||||||
|
# This only enables the user interface for IPTS data.
|
||||||
|
# For the touchscreen to work, you need to install iptsd.
|
||||||
|
#
|
||||||
|
CONFIG_MISC_IPTS=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Cameras: IPU3
|
||||||
|
#
|
||||||
|
CONFIG_VIDEO_IPU3_IMGU=m
|
||||||
|
CONFIG_VIDEO_IPU3_CIO2=m
|
||||||
|
CONFIG_CIO2_BRIDGE=y
|
||||||
|
CONFIG_INTEL_SKL_INT3472=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Cameras: Sensor drivers
|
||||||
|
#
|
||||||
|
CONFIG_VIDEO_OV5693=m
|
||||||
|
CONFIG_VIDEO_OV8865=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
|
||||||
|
#
|
||||||
|
CONFIG_APDS9960=m
|
||||||
|
|
||||||
|
#
|
||||||
|
# Other Drivers
|
||||||
|
#
|
||||||
|
CONFIG_INPUT_SOC_BUTTON_ARRAY=m
|
||||||
|
CONFIG_SURFACE_3_BUTTON=m
|
||||||
|
CONFIG_SURFACE_3_POWER_OPREGION=m
|
||||||
|
CONFIG_SURFACE_PRO3_BUTTON=m
|
||||||
|
CONFIG_SURFACE_GPE=m
|
||||||
|
CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
|
101
patches/5.14/0001-surface3-oemb.patch
Normal file
101
patches/5.14/0001-surface3-oemb.patch
Normal file
|
@ -0,0 +1,101 @@
|
||||||
|
From f24f1aec7ef199d87ba3153c05ac1f84ea2bf147 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
|
||||||
|
table
|
||||||
|
|
||||||
|
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||||
|
and breaks existing DMI matching used for device-specific quirks.
|
||||||
|
|
||||||
|
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||||
|
for quirks so that each driver can enable quirks even on the affected
|
||||||
|
systems.
|
||||||
|
|
||||||
|
On affected systems, DMI data will look like this:
|
||||||
|
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||||
|
chassis_vendor,product_name,sys_vendor}
|
||||||
|
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||||
|
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||||
|
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||||
|
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||||
|
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||||
|
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||||
|
|
||||||
|
Expected:
|
||||||
|
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||||
|
chassis_vendor,product_name,sys_vendor}
|
||||||
|
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||||
|
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||||
|
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||||
|
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||||
|
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||||
|
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||||
|
|
||||||
|
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||||
|
Patchset: surface3-oemb
|
||||||
|
---
|
||||||
|
drivers/platform/surface/surface3-wmi.c | 7 +++++++
|
||||||
|
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||||
|
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||||
|
3 files changed, 24 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
|
||||||
|
index fcd1d4fb94d5..ee26a5998b07 100644
|
||||||
|
--- a/drivers/platform/surface/surface3-wmi.c
|
||||||
|
+++ b/drivers/platform/surface/surface3-wmi.c
|
||||||
|
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||||
|
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
#endif
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||||
|
index 9408ee63cb26..5cac83953901 100644
|
||||||
|
--- a/sound/soc/codecs/rt5645.c
|
||||||
|
+++ b/sound/soc/codecs/rt5645.c
|
||||||
|
@@ -3718,6 +3718,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||||
|
},
|
||||||
|
.driver_data = (void *)&intel_braswell_platform_data,
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .ident = "Microsoft Surface 3",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||||
|
+ },
|
||||||
|
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||||
|
+ },
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Match for the GPDwin which unfortunately uses somewhat
|
||||||
|
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||||
|
index 227424236fd5..1013a57be89a 100644
|
||||||
|
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||||
|
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||||
|
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||||
|
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .callback = cht_surface_quirk_cb,
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
2472
patches/5.14/0002-mwifiex.patch
Normal file
2472
patches/5.14/0002-mwifiex.patch
Normal file
File diff suppressed because it is too large
Load diff
121
patches/5.14/0003-ath10k.patch
Normal file
121
patches/5.14/0003-ath10k.patch
Normal file
|
@ -0,0 +1,121 @@
|
||||||
|
From bdf0dd48728975c0697bb6e9b5242457abc7874f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Date: Sat, 27 Feb 2021 00:45:52 +0100
|
||||||
|
Subject: [PATCH] ath10k: Add module parameters to override board files
|
||||||
|
|
||||||
|
Some Surface devices, specifically the Surface Go and AMD version of the
|
||||||
|
Surface Laptop 3 (wich both come with QCA6174 WiFi chips), work better
|
||||||
|
with a different board file, as it seems that the firmeware included
|
||||||
|
upstream is buggy.
|
||||||
|
|
||||||
|
As it is generally not a good idea to randomly overwrite files, let
|
||||||
|
alone doing so via packages, we add module parameters to override those
|
||||||
|
file names in the driver. This allows us to package/deploy the override
|
||||||
|
via a modprobe.d config.
|
||||||
|
|
||||||
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Patchset: ath10k
|
||||||
|
---
|
||||||
|
drivers/net/wireless/ath/ath10k/core.c | 58 ++++++++++++++++++++++++++
|
||||||
|
1 file changed, 58 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
|
||||||
|
index 2f9be182fbfb..84ae17af3f98 100644
|
||||||
|
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||||
|
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||||
|
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||||
|
static bool rawmode;
|
||||||
|
static bool fw_diag_log;
|
||||||
|
|
||||||
|
+static char *override_board = "";
|
||||||
|
+static char *override_board2 = "";
|
||||||
|
+
|
||||||
|
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||||
|
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||||
|
|
||||||
|
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||||
|
module_param(fw_diag_log, bool, 0644);
|
||||||
|
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||||
|
|
||||||
|
+module_param(override_board, charp, 0644);
|
||||||
|
+module_param(override_board2, charp, 0644);
|
||||||
|
+
|
||||||
|
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||||
|
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||||
|
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||||
|
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||||
|
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||||
|
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||||
|
|
||||||
|
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||||
|
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||||
|
+
|
||||||
|
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||||
|
{
|
||||||
|
.id = QCA988X_HW_2_0_VERSION,
|
||||||
|
@@ -826,6 +835,42 @@ static int ath10k_init_configure_target(struct ath10k *ar)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static const char *ath10k_override_board_fw_file(struct ath10k *ar,
|
||||||
|
+ const char *file)
|
||||||
|
+{
|
||||||
|
+ if (strcmp(file, "board.bin") == 0) {
|
||||||
|
+ if (strcmp(override_board, "") == 0)
|
||||||
|
+ return file;
|
||||||
|
+
|
||||||
|
+ if (strcmp(override_board, "none") == 0) {
|
||||||
|
+ dev_info(ar->dev, "firmware override: pretending 'board.bin' does not exist\n");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ dev_info(ar->dev, "firmware override: replacing 'board.bin' with '%s'\n",
|
||||||
|
+ override_board);
|
||||||
|
+
|
||||||
|
+ return override_board;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (strcmp(file, "board-2.bin") == 0) {
|
||||||
|
+ if (strcmp(override_board2, "") == 0)
|
||||||
|
+ return file;
|
||||||
|
+
|
||||||
|
+ if (strcmp(override_board2, "none") == 0) {
|
||||||
|
+ dev_info(ar->dev, "firmware override: pretending 'board-2.bin' does not exist\n");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ dev_info(ar->dev, "firmware override: replacing 'board-2.bin' with '%s'\n",
|
||||||
|
+ override_board2);
|
||||||
|
+
|
||||||
|
+ return override_board2;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return file;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||||
|
const char *dir,
|
||||||
|
const char *file)
|
||||||
|
@@ -840,6 +885,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||||
|
if (dir == NULL)
|
||||||
|
dir = ".";
|
||||||
|
|
||||||
|
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||||
|
+ *
|
||||||
|
+ * Some Surface devices perform better with a different board
|
||||||
|
+ * configuration. To this end, one would need to replace the board.bin
|
||||||
|
+ * file with the modified config and remove the board-2.bin file.
|
||||||
|
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||||
|
+ * we add module options to perform these overrides here.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ file = ath10k_override_board_fw_file(ar, file);
|
||||||
|
+ if (!file)
|
||||||
|
+ return ERR_PTR(-ENOENT);
|
||||||
|
+
|
||||||
|
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||||
|
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||||
|
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
1503
patches/5.14/0004-ipts.patch
Normal file
1503
patches/5.14/0004-ipts.patch
Normal file
File diff suppressed because it is too large
Load diff
335
patches/5.14/0005-surface-sam-over-hid.patch
Normal file
335
patches/5.14/0005-surface-sam-over-hid.patch
Normal file
|
@ -0,0 +1,335 @@
|
||||||
|
From e371cd58c1b3300a032f218e941b89b757b9be59 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
|
||||||
|
|
||||||
|
Microsoft Surface Pro 4 and Book 1 devices access the MSHW0030 I2C
|
||||||
|
device via a generic serial bus operation region and RawBytes read
|
||||||
|
access. On the Surface Book 1, this access is required to turn on (and
|
||||||
|
off) the discrete GPU.
|
||||||
|
|
||||||
|
Multiple things are to note here:
|
||||||
|
|
||||||
|
a) The RawBytes access is device/driver dependent. The ACPI
|
||||||
|
specification states:
|
||||||
|
|
||||||
|
> Raw accesses assume that the writer has knowledge of the bus that
|
||||||
|
> the access is made over and the device that is being accessed. The
|
||||||
|
> protocol may only ensure that the buffer is transmitted to the
|
||||||
|
> appropriate driver, but the driver must be able to interpret the
|
||||||
|
> buffer to communicate to a register.
|
||||||
|
|
||||||
|
Thus this implementation may likely not work on other devices
|
||||||
|
accessing I2C via the RawBytes accessor type.
|
||||||
|
|
||||||
|
b) The MSHW0030 I2C device is an HID-over-I2C device which seems to
|
||||||
|
serve multiple functions:
|
||||||
|
|
||||||
|
1. It is the main access point for the legacy-type Surface Aggregator
|
||||||
|
Module (also referred to as SAM-over-HID, as opposed to the newer
|
||||||
|
SAM-over-SSH/UART). It has currently not been determined on how
|
||||||
|
support for the legacy SAM should be implemented. Likely via a
|
||||||
|
custom HID driver.
|
||||||
|
|
||||||
|
2. It seems to serve as the HID device for the Integrated Sensor Hub.
|
||||||
|
This might complicate matters with regards to implementing a
|
||||||
|
SAM-over-HID driver required by legacy SAM.
|
||||||
|
|
||||||
|
In light of this, the simplest approach has been chosen for now.
|
||||||
|
However, it may make more sense regarding breakage and compatibility to
|
||||||
|
either provide functionality for replacing or enhancing the default
|
||||||
|
operation region handler via some additional API functions, or even to
|
||||||
|
completely blacklist MSHW0030 from the I2C core and provide a custom
|
||||||
|
driver for it.
|
||||||
|
|
||||||
|
Replacing/enhancing the default operation region handler would, however,
|
||||||
|
either require some sort of secondary driver and access point for it,
|
||||||
|
from which the new API functions would be called and the new handler
|
||||||
|
(part) would be installed, or hard-coding them via some sort of
|
||||||
|
quirk-like interface into the I2C core.
|
||||||
|
|
||||||
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Patchset: surface-sam-over-hid
|
||||||
|
---
|
||||||
|
drivers/i2c/i2c-core-acpi.c | 35 +++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 35 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
|
||||||
|
index 6f0aa0ed3241..13eb5ac82729 100644
|
||||||
|
--- a/drivers/i2c/i2c-core-acpi.c
|
||||||
|
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||||
|
@@ -570,6 +570,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
|
||||||
|
return (ret == 1) ? 0 : -EIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int acpi_gsb_i2c_write_raw_bytes(struct i2c_client *client,
|
||||||
|
+ u8 *data, u8 data_len)
|
||||||
|
+{
|
||||||
|
+ struct i2c_msg msgs[1];
|
||||||
|
+ int ret = AE_OK;
|
||||||
|
+
|
||||||
|
+ msgs[0].addr = client->addr;
|
||||||
|
+ msgs[0].flags = client->flags;
|
||||||
|
+ msgs[0].len = data_len + 1;
|
||||||
|
+ msgs[0].buf = data;
|
||||||
|
+
|
||||||
|
+ ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
|
||||||
|
+
|
||||||
|
+ if (ret < 0) {
|
||||||
|
+ dev_err(&client->adapter->dev, "i2c write failed: %d\n", ret);
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* 1 transfer must have completed successfully */
|
||||||
|
+ return (ret == 1) ? 0 : -EIO;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static acpi_status
|
||||||
|
i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||||
|
u32 bits, u64 *value64,
|
||||||
|
@@ -671,6 +693,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
|
||||||
|
+ if (action == ACPI_READ) {
|
||||||
|
+ dev_warn(&adapter->dev,
|
||||||
|
+ "protocol 0x%02x not supported for client 0x%02x\n",
|
||||||
|
+ accessor_type, client->addr);
|
||||||
|
+ ret = AE_BAD_PARAMETER;
|
||||||
|
+ goto err;
|
||||||
|
+ } else {
|
||||||
|
+ status = acpi_gsb_i2c_write_raw_bytes(client,
|
||||||
|
+ gsb->data, info->access_length);
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
default:
|
||||||
|
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
|
||||||
|
accessor_type, client->addr);
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
|
From b502e53c1952ef1e31b5ca207527009073ea172d 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
|
||||||
|
|
||||||
|
Add driver exposing the discrete GPU power-switch of the Microsoft
|
||||||
|
Surface Book 1 to user-space.
|
||||||
|
|
||||||
|
On the Surface Book 1, the dGPU power is controlled via the Surface
|
||||||
|
System Aggregator Module (SAM). The specific SAM-over-HID command for
|
||||||
|
this is exposed via ACPI. This module provides a simple driver exposing
|
||||||
|
the ACPI call via a sysfs parameter to user-space, so that users can
|
||||||
|
easily power-on/-off the dGPU.
|
||||||
|
|
||||||
|
Patchset: surface-sam-over-hid
|
||||||
|
---
|
||||||
|
drivers/platform/surface/Kconfig | 7 +
|
||||||
|
drivers/platform/surface/Makefile | 1 +
|
||||||
|
.../surface/surfacebook1_dgpu_switch.c | 162 ++++++++++++++++++
|
||||||
|
3 files changed, 170 insertions(+)
|
||||||
|
create mode 100644 drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||||
|
|
||||||
|
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
|
||||||
|
index 3105f651614f..53beaedefdd1 100644
|
||||||
|
--- a/drivers/platform/surface/Kconfig
|
||||||
|
+++ b/drivers/platform/surface/Kconfig
|
||||||
|
@@ -104,6 +104,13 @@ config SURFACE_AGGREGATOR_REGISTRY
|
||||||
|
the respective client devices. Drivers for these devices still need to
|
||||||
|
be selected via the other options.
|
||||||
|
|
||||||
|
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||||
|
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||||
|
+ depends on SYSFS
|
||||||
|
+ help
|
||||||
|
+ This driver provides a sysfs switch to set the power-state of the
|
||||||
|
+ discrete GPU found on the Microsoft Surface Book 1.
|
||||||
|
+
|
||||||
|
config SURFACE_DTX
|
||||||
|
tristate "Surface DTX (Detachment System) Driver"
|
||||||
|
depends on SURFACE_AGGREGATOR
|
||||||
|
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||||
|
index 32889482de55..0cc63440328d 100644
|
||||||
|
--- a/drivers/platform/surface/Makefile
|
||||||
|
+++ b/drivers/platform/surface/Makefile
|
||||||
|
@@ -11,6 +11,7 @@ obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||||
|
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||||
|
obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
|
||||||
|
obj-$(CONFIG_SURFACE_AGGREGATOR_REGISTRY) += surface_aggregator_registry.o
|
||||||
|
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||||
|
obj-$(CONFIG_SURFACE_DTX) += surface_dtx.o
|
||||||
|
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||||
|
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||||
|
diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000..8b816ed8f35c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||||
|
@@ -0,0 +1,162 @@
|
||||||
|
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
+
|
||||||
|
+#include <linux/kernel.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
+#include <linux/acpi.h>
|
||||||
|
+#include <linux/platform_device.h>
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#ifdef pr_fmt
|
||||||
|
+#undef pr_fmt
|
||||||
|
+#endif
|
||||||
|
+#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static const guid_t dgpu_sw_guid = GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4,
|
||||||
|
+ 0x95, 0xed, 0xab, 0x16, 0x65, 0x49, 0x80, 0x35);
|
||||||
|
+
|
||||||
|
+#define DGPUSW_ACPI_PATH_DSM "\\_SB_.PCI0.LPCB.EC0_.VGBI"
|
||||||
|
+#define DGPUSW_ACPI_PATH_HGON "\\_SB_.PCI0.RP05.HGON"
|
||||||
|
+#define DGPUSW_ACPI_PATH_HGOF "\\_SB_.PCI0.RP05.HGOF"
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static int sb1_dgpu_sw_dsmcall(void)
|
||||||
|
+{
|
||||||
|
+ union acpi_object *ret;
|
||||||
|
+ acpi_handle handle;
|
||||||
|
+ acpi_status status;
|
||||||
|
+
|
||||||
|
+ status = acpi_get_handle(NULL, DGPUSW_ACPI_PATH_DSM, &handle);
|
||||||
|
+ if (status)
|
||||||
|
+ return -EINVAL;
|
||||||
|
+
|
||||||
|
+ ret = acpi_evaluate_dsm_typed(handle, &dgpu_sw_guid, 1, 1, NULL, ACPI_TYPE_BUFFER);
|
||||||
|
+ if (!ret)
|
||||||
|
+ return -EINVAL;
|
||||||
|
+
|
||||||
|
+ ACPI_FREE(ret);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int sb1_dgpu_sw_hgon(void)
|
||||||
|
+{
|
||||||
|
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||||
|
+ acpi_status status;
|
||||||
|
+
|
||||||
|
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGON, NULL, &buf);
|
||||||
|
+ if (status) {
|
||||||
|
+ pr_err("failed to run HGON: %d\n", status);
|
||||||
|
+ return -EINVAL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (buf.pointer)
|
||||||
|
+ ACPI_FREE(buf.pointer);
|
||||||
|
+
|
||||||
|
+ pr_info("turned-on dGPU via HGON\n");
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int sb1_dgpu_sw_hgof(void)
|
||||||
|
+{
|
||||||
|
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||||
|
+ acpi_status status;
|
||||||
|
+
|
||||||
|
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGOF, NULL, &buf);
|
||||||
|
+ if (status) {
|
||||||
|
+ pr_err("failed to run HGOF: %d\n", status);
|
||||||
|
+ return -EINVAL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (buf.pointer)
|
||||||
|
+ ACPI_FREE(buf.pointer);
|
||||||
|
+
|
||||||
|
+ pr_info("turned-off dGPU via HGOF\n");
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static ssize_t dgpu_dsmcall_store(struct device *dev, struct device_attribute *attr,
|
||||||
|
+ const char *buf, size_t len)
|
||||||
|
+{
|
||||||
|
+ int status, value;
|
||||||
|
+
|
||||||
|
+ status = kstrtoint(buf, 0, &value);
|
||||||
|
+ if (status < 0)
|
||||||
|
+ return status;
|
||||||
|
+
|
||||||
|
+ if (value != 1)
|
||||||
|
+ return -EINVAL;
|
||||||
|
+
|
||||||
|
+ status = sb1_dgpu_sw_dsmcall();
|
||||||
|
+
|
||||||
|
+ return status < 0 ? status : len;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||||
|
+ const char *buf, size_t len)
|
||||||
|
+{
|
||||||
|
+ bool power;
|
||||||
|
+ int status;
|
||||||
|
+
|
||||||
|
+ status = kstrtobool(buf, &power);
|
||||||
|
+ if (status < 0)
|
||||||
|
+ return status;
|
||||||
|
+
|
||||||
|
+ if (power)
|
||||||
|
+ status = sb1_dgpu_sw_hgon();
|
||||||
|
+ else
|
||||||
|
+ status = sb1_dgpu_sw_hgof();
|
||||||
|
+
|
||||||
|
+ return status < 0 ? status : len;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static DEVICE_ATTR_WO(dgpu_dsmcall);
|
||||||
|
+static DEVICE_ATTR_WO(dgpu_power);
|
||||||
|
+
|
||||||
|
+static struct attribute *sb1_dgpu_sw_attrs[] = {
|
||||||
|
+ &dev_attr_dgpu_dsmcall.attr,
|
||||||
|
+ &dev_attr_dgpu_power.attr,
|
||||||
|
+ NULL,
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static const struct attribute_group sb1_dgpu_sw_attr_group = {
|
||||||
|
+ .attrs = sb1_dgpu_sw_attrs,
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static int sb1_dgpu_sw_probe(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ return sysfs_create_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int sb1_dgpu_sw_remove(struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ sysfs_remove_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * The dGPU power seems to be actually handled by MSHW0040. However, that is
|
||||||
|
+ * also the power-/volume-button device with a mainline driver. So let's use
|
||||||
|
+ * MSHW0041 instead for now, which seems to be the LTCH (latch/DTX) device.
|
||||||
|
+ */
|
||||||
|
+static const struct acpi_device_id sb1_dgpu_sw_match[] = {
|
||||||
|
+ { "MSHW0041", },
|
||||||
|
+ { },
|
||||||
|
+};
|
||||||
|
+MODULE_DEVICE_TABLE(acpi, sb1_dgpu_sw_match);
|
||||||
|
+
|
||||||
|
+static struct platform_driver sb1_dgpu_sw = {
|
||||||
|
+ .probe = sb1_dgpu_sw_probe,
|
||||||
|
+ .remove = sb1_dgpu_sw_remove,
|
||||||
|
+ .driver = {
|
||||||
|
+ .name = "surfacebook1_dgpu_switch",
|
||||||
|
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||||
|
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||||
|
+ },
|
||||||
|
+};
|
||||||
|
+module_platform_driver(sb1_dgpu_sw);
|
||||||
|
+
|
||||||
|
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||||
|
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||||
|
+MODULE_LICENSE("GPL");
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
50
patches/5.14/0006-surface-hotplug.patch
Normal file
50
patches/5.14/0006-surface-hotplug.patch
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
From c31a8baf7ee53cfd6df6cc215e598cabbd7d9926 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
|
||||||
|
Date: Thu, 8 Jul 2021 15:25:06 +0200
|
||||||
|
Subject: [PATCH] PCI: Use pci_update_current_state() in
|
||||||
|
pci_enable_device_flags()
|
||||||
|
|
||||||
|
Updating the current_state field of struct pci_dev the way it is done
|
||||||
|
in pci_enable_device_flags() before calling do_pci_enable_device() may
|
||||||
|
not work. For example, if the given PCI device depends on an ACPI
|
||||||
|
power resource whose _STA method initially returns 0 ("off"), but the
|
||||||
|
config space of the PCI device is accessible and the power state
|
||||||
|
retrieved from the PCI_PM_CTRL register is D0, the current_state
|
||||||
|
field in the struct pci_dev representing that device will get out of
|
||||||
|
sync with the power.state of its ACPI companion object and that will
|
||||||
|
lead to power management issues going forward.
|
||||||
|
|
||||||
|
To avoid such issues, make pci_enable_device_flags() call
|
||||||
|
pci_update_current_state() which takes ACPI device power management
|
||||||
|
into account, if present, to retrieve the current power state of the
|
||||||
|
device.
|
||||||
|
|
||||||
|
Link: https://lore.kernel.org/lkml/20210314000439.3138941-1-luzmaximilian@gmail.com/
|
||||||
|
Reported-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
||||||
|
Tested-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Patchset: surface-hotplug
|
||||||
|
---
|
||||||
|
drivers/pci/pci.c | 6 +-----
|
||||||
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||||
|
index 3f353572588d..a5e6759c407b 100644
|
||||||
|
--- a/drivers/pci/pci.c
|
||||||
|
+++ b/drivers/pci/pci.c
|
||||||
|
@@ -1906,11 +1906,7 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
|
||||||
|
* so that things like MSI message writing will behave as expected
|
||||||
|
* (e.g. if the device really is in D0 at enable time).
|
||||||
|
*/
|
||||||
|
- if (dev->pm_cap) {
|
||||||
|
- u16 pmcsr;
|
||||||
|
- pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
|
||||||
|
- dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
|
||||||
|
- }
|
||||||
|
+ pci_update_current_state(dev, dev->current_state);
|
||||||
|
|
||||||
|
if (atomic_inc_return(&dev->enable_cnt) > 1)
|
||||||
|
return 0; /* already enabled */
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
233
patches/5.14/0007-surface-typecover.patch
Normal file
233
patches/5.14/0007-surface-typecover.patch
Normal file
|
@ -0,0 +1,233 @@
|
||||||
|
From 81abe9beae0fa64d2646e44f8e7cdf77480ce9de 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
|
||||||
|
suspending
|
||||||
|
|
||||||
|
The Type Cover for Microsoft Surface devices supports a special usb
|
||||||
|
control request to disable or enable the built-in keyboard backlight.
|
||||||
|
On Windows, this request happens when putting the device into suspend or
|
||||||
|
resuming it, without it the backlight of the Type Cover will remain
|
||||||
|
enabled for some time even though the computer is suspended, which looks
|
||||||
|
weird to the user.
|
||||||
|
|
||||||
|
So add support for this special usb control request to hid-multitouch,
|
||||||
|
which is the driver that's handling the Type Cover.
|
||||||
|
|
||||||
|
The reason we have to use a pm_notifier for this instead of the usual
|
||||||
|
suspend/resume methods is that those won't get called in case the usb
|
||||||
|
device is already autosuspended.
|
||||||
|
|
||||||
|
Also, if the device is autosuspended, we have to briefly autoresume it
|
||||||
|
in order to send the request. Doing that should be fine, the usb-core
|
||||||
|
driver does something similar during suspend inside choose_wakeup().
|
||||||
|
|
||||||
|
To make sure we don't send that request to every device but only to
|
||||||
|
devices which support it, add a new quirk
|
||||||
|
MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER to hid-multitouch. For now this quirk
|
||||||
|
is only enabled for the usb id of the Surface Pro 2017 Type Cover, which
|
||||||
|
is where I confirmed that it's working.
|
||||||
|
|
||||||
|
Patchset: surface-typecover
|
||||||
|
---
|
||||||
|
drivers/hid/hid-multitouch.c | 100 ++++++++++++++++++++++++++++++++++-
|
||||||
|
1 file changed, 98 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
||||||
|
index 3ea7cb1cda84..92fb053e0dd2 100644
|
||||||
|
--- a/drivers/hid/hid-multitouch.c
|
||||||
|
+++ b/drivers/hid/hid-multitouch.c
|
||||||
|
@@ -34,7 +34,10 @@
|
||||||
|
#include <linux/device.h>
|
||||||
|
#include <linux/hid.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
+#include <linux/pm_runtime.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
+#include <linux/suspend.h>
|
||||||
|
+#include <linux/usb.h>
|
||||||
|
#include <linux/input/mt.h>
|
||||||
|
#include <linux/jiffies.h>
|
||||||
|
#include <linux/string.h>
|
||||||
|
@@ -47,6 +50,7 @@ MODULE_DESCRIPTION("HID multitouch panels");
|
||||||
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
|
#include "hid-ids.h"
|
||||||
|
+#include "usbhid/usbhid.h"
|
||||||
|
|
||||||
|
/* quirks to control the device */
|
||||||
|
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
|
||||||
|
@@ -71,12 +75,15 @@ MODULE_LICENSE("GPL");
|
||||||
|
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||||
|
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||||
|
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||||
|
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(22)
|
||||||
|
|
||||||
|
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||||
|
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||||
|
|
||||||
|
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||||
|
|
||||||
|
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||||
|
+
|
||||||
|
enum latency_mode {
|
||||||
|
HID_LATENCY_NORMAL = 0,
|
||||||
|
HID_LATENCY_HIGH = 1,
|
||||||
|
@@ -168,6 +175,8 @@ struct mt_device {
|
||||||
|
|
||||||
|
struct list_head applications;
|
||||||
|
struct list_head reports;
|
||||||
|
+
|
||||||
|
+ struct notifier_block pm_notifier;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||||
|
@@ -210,6 +219,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||||
|
#define MT_CLS_GOOGLE 0x0111
|
||||||
|
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||||
|
#define MT_CLS_SMART_TECH 0x0113
|
||||||
|
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||||
|
|
||||||
|
#define MT_DEFAULT_MAXCONTACT 10
|
||||||
|
#define MT_MAX_MAXCONTACT 250
|
||||||
|
@@ -378,6 +388,16 @@ static const struct mt_class mt_classes[] = {
|
||||||
|
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||||
|
MT_QUIRK_SEPARATE_APP_REPORT,
|
||||||
|
},
|
||||||
|
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||||
|
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||||
|
+ MT_QUIRK_ALWAYS_VALID |
|
||||||
|
+ MT_QUIRK_IGNORE_DUPLICATES |
|
||||||
|
+ MT_QUIRK_HOVERING |
|
||||||
|
+ MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||||
|
+ MT_QUIRK_STICKY_FINGERS |
|
||||||
|
+ MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||||
|
+ .export_all_inputs = true
|
||||||
|
+ },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -1690,6 +1710,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||||
|
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||||
|
+ struct hid_field **field)
|
||||||
|
+{
|
||||||
|
+ struct hid_report_enum *rep_enum;
|
||||||
|
+ struct hid_report *rep;
|
||||||
|
+ struct hid_field *cur_field;
|
||||||
|
+ int i, j;
|
||||||
|
+
|
||||||
|
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||||
|
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||||
|
+ for (i = 0; i < rep->maxfield; i++) {
|
||||||
|
+ cur_field = rep->field[i];
|
||||||
|
+
|
||||||
|
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||||
|
+ if (cur_field->usage[j].hid
|
||||||
|
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||||
|
+ *field = cur_field;
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||||
|
+{
|
||||||
|
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||||
|
+ struct hid_field *field = NULL;
|
||||||
|
+
|
||||||
|
+ /* Wake up the device in case it's already suspended */
|
||||||
|
+ pm_runtime_get_sync(&udev->dev);
|
||||||
|
+
|
||||||
|
+ get_type_cover_backlight_field(hdev, &field);
|
||||||
|
+ if (!field) {
|
||||||
|
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||||
|
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ pm_runtime_put_sync(&udev->dev);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||||
|
+ unsigned long pm_event,
|
||||||
|
+ void *unused)
|
||||||
|
+{
|
||||||
|
+ struct mt_device *td =
|
||||||
|
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||||
|
+ struct hid_device *hdev = td->hdev;
|
||||||
|
+
|
||||||
|
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||||
|
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||||
|
+ update_keyboard_backlight(hdev, 0);
|
||||||
|
+ else if (pm_event == PM_POST_SUSPEND)
|
||||||
|
+ update_keyboard_backlight(hdev, 1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NOTIFY_DONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||||
|
{
|
||||||
|
int ret, i;
|
||||||
|
@@ -1713,6 +1796,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||||
|
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
|
||||||
|
hid_set_drvdata(hdev, td);
|
||||||
|
|
||||||
|
+ td->pm_notifier.notifier_call = mt_pm_notifier;
|
||||||
|
+ register_pm_notifier(&td->pm_notifier);
|
||||||
|
+
|
||||||
|
INIT_LIST_HEAD(&td->applications);
|
||||||
|
INIT_LIST_HEAD(&td->reports);
|
||||||
|
|
||||||
|
@@ -1742,15 +1828,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||||
|
timer_setup(&td->release_timer, mt_expired_timeout, 0);
|
||||||
|
|
||||||
|
ret = hid_parse(hdev);
|
||||||
|
- if (ret != 0)
|
||||||
|
+ if (ret != 0) {
|
||||||
|
+ unregister_pm_notifier(&td->pm_notifier);
|
||||||
|
return ret;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID)
|
||||||
|
mt_fix_const_fields(hdev, HID_DG_CONTACTID);
|
||||||
|
|
||||||
|
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
||||||
|
- if (ret)
|
||||||
|
+ if (ret) {
|
||||||
|
+ unregister_pm_notifier(&td->pm_notifier);
|
||||||
|
return ret;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||||
|
if (ret)
|
||||||
|
@@ -1802,6 +1892,7 @@ static void mt_remove(struct hid_device *hdev)
|
||||||
|
{
|
||||||
|
struct mt_device *td = hid_get_drvdata(hdev);
|
||||||
|
|
||||||
|
+ unregister_pm_notifier(&td->pm_notifier);
|
||||||
|
del_timer_sync(&td->release_timer);
|
||||||
|
|
||||||
|
sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||||
|
@@ -2159,6 +2250,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||||
|
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
||||||
|
USB_DEVICE_ID_XIROKU_CSR2) },
|
||||||
|
|
||||||
|
+ /* Microsoft Surface type cover */
|
||||||
|
+ { .driver_data = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||||
|
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||||
|
+ USB_VENDOR_ID_MICROSOFT, 0x09c0) },
|
||||||
|
+
|
||||||
|
/* Google MT devices */
|
||||||
|
{ .driver_data = MT_CLS_GOOGLE,
|
||||||
|
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
3288
patches/5.14/0008-cameras.patch
Normal file
3288
patches/5.14/0008-cameras.patch
Normal file
File diff suppressed because it is too large
Load diff
109
patches/5.14/0009-amd-gpio.patch
Normal file
109
patches/5.14/0009-amd-gpio.patch
Normal file
|
@ -0,0 +1,109 @@
|
||||||
|
From b6b6a3cb43adec1b0f9951fd421fe55623f8c2a4 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
|
||||||
|
override
|
||||||
|
|
||||||
|
This patch is the work of Thomas Gleixner <tglx@linutronix.de> and is
|
||||||
|
copied from:
|
||||||
|
https://lore.kernel.org/lkml/87lf8ddjqx.ffs@nanos.tec.linutronix.de/
|
||||||
|
|
||||||
|
This patch adds a quirk to the ACPI setup to patch in the the irq 7 pin
|
||||||
|
setup that is missing in the laptops ACPI table.
|
||||||
|
|
||||||
|
This patch was used for validation of the issue, and is not a proper
|
||||||
|
fix, but is probably a better temporary hack than continuing to probe
|
||||||
|
the Legacy PIC and run with the PIC in an unknown state.
|
||||||
|
|
||||||
|
Patchset: amd-gpio
|
||||||
|
---
|
||||||
|
arch/x86/kernel/acpi/boot.c | 17 +++++++++++++++++
|
||||||
|
1 file changed, 17 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
|
||||||
|
index e55e0c1fad8c..46dfad41b401 100644
|
||||||
|
--- a/arch/x86/kernel/acpi/boot.c
|
||||||
|
+++ b/arch/x86/kernel/acpi/boot.c
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include <linux/efi-bgrt.h>
|
||||||
|
#include <linux/serial_core.h>
|
||||||
|
#include <linux/pgtable.h>
|
||||||
|
+#include <linux/dmi.h>
|
||||||
|
|
||||||
|
#include <asm/e820/api.h>
|
||||||
|
#include <asm/irqdomain.h>
|
||||||
|
@@ -1143,6 +1144,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||||
|
+ {
|
||||||
|
+ .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
+ {}
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Parse IOAPIC related entries in MADT
|
||||||
|
* returns 0 on success, < 0 on error
|
||||||
|
@@ -1198,6 +1210,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
|
||||||
|
acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0,
|
||||||
|
acpi_gbl_FADT.sci_interrupt);
|
||||||
|
|
||||||
|
+ if (dmi_check_system(surface_quirk)) {
|
||||||
|
+ pr_warn("Surface hack: Override irq 7\n");
|
||||||
|
+ mp_override_legacy_irq(7, 3, 3, 7);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* Fill in identity legacy mappings where no override */
|
||||||
|
mp_config_acpi_legacy_irqs();
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
|
From d99c891ab3b5956ef33ab6e821ab8183496279bc 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
|
||||||
|
quirk
|
||||||
|
|
||||||
|
The 13" version of the Surface Laptop 4 has the same problem as the 15"
|
||||||
|
version, but uses a different SKU. Add that SKU to the quirk as well.
|
||||||
|
|
||||||
|
Patchset: amd-gpio
|
||||||
|
---
|
||||||
|
arch/x86/kernel/acpi/boot.c | 9 ++++++++-
|
||||||
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
|
||||||
|
index 46dfad41b401..78bf6a097dc5 100644
|
||||||
|
--- a/arch/x86/kernel/acpi/boot.c
|
||||||
|
+++ b/arch/x86/kernel/acpi/boot.c
|
||||||
|
@@ -1146,12 +1146,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||||
|
|
||||||
|
static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||||
|
{
|
||||||
|
- .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||||
|
+ .ident = "Microsoft Surface Laptop 4 (AMD 15\")",
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||||
|
},
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .ident = "Microsoft Surface Laptop 4 (AMD 13\")",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1958:1959")
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
33
patches/5.14/0010-amd-s0ix.patch
Normal file
33
patches/5.14/0010-amd-s0ix.patch
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
From d5e180201380b2ec10f34229eabcfa2fb8e85895 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sachi King <nakato@nakato.io>
|
||||||
|
Date: Sat, 29 May 2021 22:27:25 +1000
|
||||||
|
Subject: [PATCH] platform/x86: amd-pmc: Add device HID for AMD PMC
|
||||||
|
|
||||||
|
The Surface Laptop 4 appears to have used AMD0005 for the PMC instead of
|
||||||
|
the AMDI0005 which would match the ACPI ID Registry.
|
||||||
|
|
||||||
|
AMD appears to have previously used "AMD" in a number of IDs in the past,
|
||||||
|
and AMD is not allocated to any other entity as an ID, so adding this ID
|
||||||
|
should not cause any harm.
|
||||||
|
|
||||||
|
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||||
|
Patchset: amd-s0ix
|
||||||
|
---
|
||||||
|
drivers/platform/x86/amd-pmc.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
||||||
|
index 3481479a2942..1f4a1cd1f58d 100644
|
||||||
|
--- a/drivers/platform/x86/amd-pmc.c
|
||||||
|
+++ b/drivers/platform/x86/amd-pmc.c
|
||||||
|
@@ -476,6 +476,7 @@ static const struct acpi_device_id amd_pmc_acpi_ids[] = {
|
||||||
|
{"AMDI0006", 0},
|
||||||
|
{"AMDI0007", 0},
|
||||||
|
{"AMD0004", 0},
|
||||||
|
+ {"AMD0005", 0},
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(acpi, amd_pmc_acpi_ids);
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
Loading…
Reference in a new issue