Add patches for v5.17
Changes:
- Fix IOMMU errors with IPTS (@libanp)
- PR: https://github.com/linux-surface/kernel/pull/120
- Refactor support for Surface 3 buttons (@jwrdegoede)
- Rebase onto v5.17.4
Links:
- kernel: a48902e579
This commit is contained in:
parent
4789818ac6
commit
d6980ce55c
63
configs/surface-5.17.config
Normal file
63
configs/surface-5.17.config
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
#
|
||||||
|
# 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_KIP_TABLET_SWITCH=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
|
||||||
|
CONFIG_REGULATOR_TPS68470=m
|
||||||
|
CONFIG_COMMON_CLK_TPS68470=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.17/0001-surface3-oemb.patch
Normal file
101
patches/5.17/0001-surface3-oemb.patch
Normal file
|
@ -0,0 +1,101 @@
|
||||||
|
From ec6fa26f04034a252e606d4cdc8097282c59ab18 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 09ac9cfc40d8..c626109cf445 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 197c56047947..9893e9c3cdf7 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 c60a5e8e7bc9..e947133a2c36 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.36.0
|
||||||
|
|
704
patches/5.17/0002-mwifiex.patch
Normal file
704
patches/5.17/0002-mwifiex.patch
Normal file
|
@ -0,0 +1,704 @@
|
||||||
|
From 1395350fc7351ab5a75541dd444b9321ab51642a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||||
|
Date: Tue, 29 Sep 2020 17:32:22 +0900
|
||||||
|
Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
|
||||||
|
|
||||||
|
This commit adds reset_wsid quirk and uses this quirk for Surface 3 on
|
||||||
|
card reset.
|
||||||
|
|
||||||
|
To reset mwifiex on Surface 3, it seems that calling the _DSM method
|
||||||
|
exists in \_SB.WSID [1] device is required.
|
||||||
|
|
||||||
|
On Surface 3, calling the _DSM method removes/re-probes the card by
|
||||||
|
itself. So, need to place the reset function before performing FLR and
|
||||||
|
skip performing any other reset-related works.
|
||||||
|
|
||||||
|
Note that Surface Pro 3 also has the WSID device [2], but it seems to need
|
||||||
|
more work. This commit only supports Surface 3 yet.
|
||||||
|
|
||||||
|
[1] https://github.com/linux-surface/acpidumps/blob/05cba925f3a515f222acb5b3551a032ddde958fe/surface_3/dsdt.dsl#L11947-L12011
|
||||||
|
[2] https://github.com/linux-surface/acpidumps/blob/05cba925f3a515f222acb5b3551a032ddde958fe/surface_pro_3/dsdt.dsl#L12164-L12216
|
||||||
|
|
||||||
|
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||||
|
Patchset: mwifiex
|
||||||
|
---
|
||||||
|
drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +++
|
||||||
|
.../wireless/marvell/mwifiex/pcie_quirks.c | 83 +++++++++++++++++++
|
||||||
|
.../wireless/marvell/mwifiex/pcie_quirks.h | 6 ++
|
||||||
|
3 files changed, 99 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
index d5fb29400bad..033648526f16 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
@@ -2993,6 +2993,16 @@ static void mwifiex_pcie_card_reset_work(struct mwifiex_adapter *adapter)
|
||||||
|
{
|
||||||
|
struct pcie_service_card *card = adapter->card;
|
||||||
|
|
||||||
|
+ /* On Surface 3, reset_wsid method removes then re-probes card by
|
||||||
|
+ * itself. So, need to place it here and skip performing any other
|
||||||
|
+ * reset-related works.
|
||||||
|
+ */
|
||||||
|
+ if (card->quirks & QUIRK_FW_RST_WSID_S3) {
|
||||||
|
+ mwifiex_pcie_reset_wsid_quirk(card->dev);
|
||||||
|
+ /* skip performing any other reset-related works */
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* We can't afford to wait here; remove() might be waiting on us. If we
|
||||||
|
* can't grab the device lock, maybe we'll get another chance later.
|
||||||
|
*/
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
index 0234cf3c2974..563dd0d5ac79 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
@@ -15,10 +15,21 @@
|
||||||
|
* this warranty disclaimer.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#include <linux/acpi.h>
|
||||||
|
#include <linux/dmi.h>
|
||||||
|
|
||||||
|
#include "pcie_quirks.h"
|
||||||
|
|
||||||
|
+/* For reset_wsid quirk */
|
||||||
|
+#define ACPI_WSID_PATH "\\_SB.WSID"
|
||||||
|
+#define WSID_REV 0x0
|
||||||
|
+#define WSID_FUNC_WIFI_PWR_OFF 0x1
|
||||||
|
+#define WSID_FUNC_WIFI_PWR_ON 0x2
|
||||||
|
+/* WSID _DSM UUID: "534ea3bf-fcc2-4e7a-908f-a13978f0c7ef" */
|
||||||
|
+static const guid_t wsid_dsm_guid =
|
||||||
|
+ GUID_INIT(0x534ea3bf, 0xfcc2, 0x4e7a,
|
||||||
|
+ 0x90, 0x8f, 0xa1, 0x39, 0x78, 0xf0, 0xc7, 0xef);
|
||||||
|
+
|
||||||
|
/* quirk table based on DMI matching */
|
||||||
|
static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
{
|
||||||
|
@@ -87,6 +98,14 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
},
|
||||||
|
.driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .ident = "Surface 3",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||||
|
+ },
|
||||||
|
+ .driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||||
|
+ },
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -103,6 +122,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||||
|
dev_info(&pdev->dev, "no quirks enabled\n");
|
||||||
|
if (card->quirks & QUIRK_FW_RST_D3COLD)
|
||||||
|
dev_info(&pdev->dev, "quirk reset_d3cold enabled\n");
|
||||||
|
+ if (card->quirks & QUIRK_FW_RST_WSID_S3)
|
||||||
|
+ dev_info(&pdev->dev,
|
||||||
|
+ "quirk reset_wsid for Surface 3 enabled\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||||
|
@@ -159,3 +181,64 @@ int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev)
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev)
|
||||||
|
+{
|
||||||
|
+ acpi_handle handle;
|
||||||
|
+ union acpi_object *obj;
|
||||||
|
+ acpi_status status;
|
||||||
|
+
|
||||||
|
+ dev_info(&pdev->dev, "Using reset_wsid quirk to perform FW reset\n");
|
||||||
|
+
|
||||||
|
+ status = acpi_get_handle(NULL, ACPI_WSID_PATH, &handle);
|
||||||
|
+ if (ACPI_FAILURE(status)) {
|
||||||
|
+ dev_err(&pdev->dev, "No ACPI handle for path %s\n",
|
||||||
|
+ ACPI_WSID_PATH);
|
||||||
|
+ return -ENODEV;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!acpi_has_method(handle, "_DSM")) {
|
||||||
|
+ dev_err(&pdev->dev, "_DSM method not found\n");
|
||||||
|
+ return -ENODEV;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!acpi_check_dsm(handle, &wsid_dsm_guid,
|
||||||
|
+ WSID_REV, WSID_FUNC_WIFI_PWR_OFF)) {
|
||||||
|
+ dev_err(&pdev->dev,
|
||||||
|
+ "_DSM method doesn't support wifi power off func\n");
|
||||||
|
+ return -ENODEV;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!acpi_check_dsm(handle, &wsid_dsm_guid,
|
||||||
|
+ WSID_REV, WSID_FUNC_WIFI_PWR_ON)) {
|
||||||
|
+ dev_err(&pdev->dev,
|
||||||
|
+ "_DSM method doesn't support wifi power on func\n");
|
||||||
|
+ return -ENODEV;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* card will be removed immediately after this call on Surface 3 */
|
||||||
|
+ dev_info(&pdev->dev, "turning wifi off...\n");
|
||||||
|
+ obj = acpi_evaluate_dsm(handle, &wsid_dsm_guid,
|
||||||
|
+ WSID_REV, WSID_FUNC_WIFI_PWR_OFF,
|
||||||
|
+ NULL);
|
||||||
|
+ if (!obj) {
|
||||||
|
+ dev_err(&pdev->dev,
|
||||||
|
+ "device _DSM execution failed for turning wifi off\n");
|
||||||
|
+ return -EIO;
|
||||||
|
+ }
|
||||||
|
+ ACPI_FREE(obj);
|
||||||
|
+
|
||||||
|
+ /* card will be re-probed immediately after this call on Surface 3 */
|
||||||
|
+ dev_info(&pdev->dev, "turning wifi on...\n");
|
||||||
|
+ obj = acpi_evaluate_dsm(handle, &wsid_dsm_guid,
|
||||||
|
+ WSID_REV, WSID_FUNC_WIFI_PWR_ON,
|
||||||
|
+ NULL);
|
||||||
|
+ if (!obj) {
|
||||||
|
+ dev_err(&pdev->dev,
|
||||||
|
+ "device _DSM execution failed for turning wifi on\n");
|
||||||
|
+ return -EIO;
|
||||||
|
+ }
|
||||||
|
+ ACPI_FREE(obj);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
index 8ec4176d698f..25370c5a4f59 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
@@ -19,5 +19,11 @@
|
||||||
|
|
||||||
|
#define QUIRK_FW_RST_D3COLD BIT(0)
|
||||||
|
|
||||||
|
+/* Surface 3 and Surface Pro 3 have the same _DSM method but need to
|
||||||
|
+ * be handled differently. Currently, only S3 is supported.
|
||||||
|
+ */
|
||||||
|
+#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||||
|
+
|
||||||
|
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||||
|
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||||
|
+int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 312dfdce8be446cbe3fc1fb49754057218e2c7bd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||||
|
Date: Wed, 30 Sep 2020 18:08:24 +0900
|
||||||
|
Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
|
||||||
|
table
|
||||||
|
|
||||||
|
(made referring to http://git.osdn.net/view?p=android-x86/kernel.git;a=commitdiff;h=18e2e857c57633b25b3b4120f212224a108cd883)
|
||||||
|
|
||||||
|
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 info for the affected Surface 3.
|
||||||
|
|
||||||
|
On affected systems, DMI info 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: mwifiex
|
||||||
|
---
|
||||||
|
drivers/net/wireless/marvell/mwifiex/pcie_quirks.c | 9 +++++++++
|
||||||
|
1 file changed, 9 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
index 563dd0d5ac79..32e2f000e57b 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
@@ -106,6 +106,15 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
},
|
||||||
|
.driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .ident = "Surface 3",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_EXACT_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||||
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||||
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||||
|
+ },
|
||||||
|
+ .driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||||
|
+ },
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 91a301f7fd782acf695910c618edcb98c062ed99 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||||
|
Date: Sun, 4 Oct 2020 00:11:49 +0900
|
||||||
|
Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
|
||||||
|
|
||||||
|
Currently, mwifiex fw will crash after suspend on recent kernel series.
|
||||||
|
On Windows, it seems that the root port of wifi will never enter D3 state
|
||||||
|
(stay on D0 state). And on Linux, disabling the D3 state for the
|
||||||
|
bridge fixes fw crashing after suspend.
|
||||||
|
|
||||||
|
This commit disables the D3 state of root port on driver initialization
|
||||||
|
and fixes fw crashing after suspend.
|
||||||
|
|
||||||
|
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||||
|
Patchset: mwifiex
|
||||||
|
---
|
||||||
|
drivers/net/wireless/marvell/mwifiex/pcie.c | 7 +++++
|
||||||
|
.../wireless/marvell/mwifiex/pcie_quirks.c | 27 +++++++++++++------
|
||||||
|
.../wireless/marvell/mwifiex/pcie_quirks.h | 1 +
|
||||||
|
3 files changed, 27 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
index 033648526f16..ca6bcbe4794c 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
@@ -380,6 +380,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
||||||
|
const struct pci_device_id *ent)
|
||||||
|
{
|
||||||
|
struct pcie_service_card *card;
|
||||||
|
+ struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
pr_debug("info: vendor=0x%4.04X device=0x%4.04X rev=%d\n",
|
||||||
|
@@ -421,6 +422,12 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* disable bridge_d3 for Surface gen4+ devices to fix fw crashing
|
||||||
|
+ * after suspend
|
||||||
|
+ */
|
||||||
|
+ if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||||
|
+ parent_pdev->bridge_d3 = false;
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
index 32e2f000e57b..356401bab59c 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
@@ -38,7 +38,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Pro 5",
|
||||||
|
@@ -47,7 +48,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Pro 5 (LTE)",
|
||||||
|
@@ -56,7 +58,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Pro 6",
|
||||||
|
@@ -64,7 +67,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Book 1",
|
||||||
|
@@ -72,7 +76,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Book 2",
|
||||||
|
@@ -80,7 +85,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Laptop 1",
|
||||||
|
@@ -88,7 +94,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Laptop 2",
|
||||||
|
@@ -96,7 +103,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||||
|
},
|
||||||
|
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||||
|
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
+ QUIRK_NO_BRIDGE_D3),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface 3",
|
||||||
|
@@ -134,6 +142,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||||
|
if (card->quirks & QUIRK_FW_RST_WSID_S3)
|
||||||
|
dev_info(&pdev->dev,
|
||||||
|
"quirk reset_wsid for Surface 3 enabled\n");
|
||||||
|
+ if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||||
|
+ dev_info(&pdev->dev,
|
||||||
|
+ "quirk no_brigde_d3 enabled\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
index 25370c5a4f59..a1de111ad1db 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
@@ -23,6 +23,7 @@
|
||||||
|
* be handled differently. Currently, only S3 is supported.
|
||||||
|
*/
|
||||||
|
#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||||
|
+#define QUIRK_NO_BRIDGE_D3 BIT(2)
|
||||||
|
|
||||||
|
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||||
|
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 1febd99bd24be85092ba5ddbf04cac8d9deab2c0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||||
|
Date: Tue, 3 Nov 2020 13:28:04 +0100
|
||||||
|
Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
|
||||||
|
devices
|
||||||
|
|
||||||
|
The most recent firmware of the 88W8897 card reports a hardcoded LTR
|
||||||
|
value to the system during initialization, probably as an (unsuccessful)
|
||||||
|
attempt of the developers to fix firmware crashes. This LTR value
|
||||||
|
prevents most of the Microsoft Surface devices from entering deep
|
||||||
|
powersaving states (either platform C-State 10 or S0ix state), because
|
||||||
|
the exit latency of that state would be higher than what the card can
|
||||||
|
tolerate.
|
||||||
|
|
||||||
|
Turns out the card works just the same (including the firmware crashes)
|
||||||
|
no matter if that hardcoded LTR value is reported or not, so it's kind
|
||||||
|
of useless and only prevents us from saving power.
|
||||||
|
|
||||||
|
To get rid of those hardcoded LTR reports, it's possible to reset the
|
||||||
|
PCI bridge device after initializing the cards firmware. I'm not exactly
|
||||||
|
sure why that works, maybe the power management subsystem of the PCH
|
||||||
|
resets its stored LTR values when doing a function level reset of the
|
||||||
|
bridge device. Doing the reset once after starting the wifi firmware
|
||||||
|
works very well, probably because the firmware only reports that LTR
|
||||||
|
value a single time during firmware startup.
|
||||||
|
|
||||||
|
Patchset: mwifiex
|
||||||
|
---
|
||||||
|
drivers/net/wireless/marvell/mwifiex/pcie.c | 12 +++++++++
|
||||||
|
.../wireless/marvell/mwifiex/pcie_quirks.c | 26 +++++++++++++------
|
||||||
|
.../wireless/marvell/mwifiex/pcie_quirks.h | 1 +
|
||||||
|
3 files changed, 31 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
index ca6bcbe4794c..24bcd22a2618 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
@@ -1781,9 +1781,21 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
|
||||||
|
static int mwifiex_pcie_init_fw_port(struct mwifiex_adapter *adapter)
|
||||||
|
{
|
||||||
|
struct pcie_service_card *card = adapter->card;
|
||||||
|
+ struct pci_dev *pdev = card->dev;
|
||||||
|
+ struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
|
||||||
|
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
|
||||||
|
int tx_wrap = card->txbd_wrptr & reg->tx_wrap_mask;
|
||||||
|
|
||||||
|
+ /* Trigger a function level reset of the PCI bridge device, this makes
|
||||||
|
+ * the firmware of PCIe 88W8897 cards stop reporting a fixed LTR value
|
||||||
|
+ * that prevents the system from entering package C10 and S0ix powersaving
|
||||||
|
+ * states.
|
||||||
|
+ * We need to do it here because it must happen after firmware
|
||||||
|
+ * initialization and this function is called after that is done.
|
||||||
|
+ */
|
||||||
|
+ if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
|
||||||
|
+ pci_reset_function(parent_pdev);
|
||||||
|
+
|
||||||
|
/* Write the RX ring read pointer in to reg->rx_rdptr */
|
||||||
|
if (mwifiex_write_reg(adapter, reg->rx_rdptr, card->rxbd_rdptr |
|
||||||
|
tx_wrap)) {
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
index 356401bab59c..6437f067d07a 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||||
|
@@ -39,7 +39,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Pro 5",
|
||||||
|
@@ -49,7 +50,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Pro 5 (LTE)",
|
||||||
|
@@ -59,7 +61,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Pro 6",
|
||||||
|
@@ -68,7 +71,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Book 1",
|
||||||
|
@@ -77,7 +81,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Book 2",
|
||||||
|
@@ -86,7 +91,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Laptop 1",
|
||||||
|
@@ -95,7 +101,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface Laptop 2",
|
||||||
|
@@ -104,7 +111,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||||
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||||
|
},
|
||||||
|
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||||
|
- QUIRK_NO_BRIDGE_D3),
|
||||||
|
+ QUIRK_NO_BRIDGE_D3 |
|
||||||
|
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.ident = "Surface 3",
|
||||||
|
@@ -145,6 +153,8 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||||
|
if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||||
|
dev_info(&pdev->dev,
|
||||||
|
"quirk no_brigde_d3 enabled\n");
|
||||||
|
+ if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
|
||||||
|
+ dev_info(&pdev->dev, "quirk do_flr_on_bridge enabled\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
index a1de111ad1db..0e429779bb04 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
*/
|
||||||
|
#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||||
|
#define QUIRK_NO_BRIDGE_D3 BIT(2)
|
||||||
|
+#define QUIRK_DO_FLR_ON_BRIDGE BIT(3)
|
||||||
|
|
||||||
|
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||||
|
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 8c6862539a41224f764f06e5f0c7284770edc3f4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||||
|
Date: Thu, 25 Mar 2021 11:33:02 +0100
|
||||||
|
Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell
|
||||||
|
88W8897
|
||||||
|
|
||||||
|
The Marvell 88W8897 combined wifi and bluetooth card (pcie+usb version)
|
||||||
|
is used in a lot of Microsoft Surface devices, and all those devices
|
||||||
|
suffer from very low 2.4GHz wifi connection speeds while bluetooth is
|
||||||
|
enabled. The reason for that is that the default passive scanning
|
||||||
|
interval for Bluetooth Low Energy devices is quite high in Linux
|
||||||
|
(interval of 60 msec and scan window of 30 msec, see hci_core.c), and
|
||||||
|
the Marvell chip is known for its bad bt+wifi coexisting performance.
|
||||||
|
|
||||||
|
So decrease that passive scan interval and make the scan window shorter
|
||||||
|
on this particular device to allow for spending more time transmitting
|
||||||
|
wifi signals: The new scan interval is 250 msec (0x190 * 0.625 msec) and
|
||||||
|
the new scan window is 6.25 msec (0xa * 0,625 msec).
|
||||||
|
|
||||||
|
This change has a very large impact on the 2.4GHz wifi speeds and gets
|
||||||
|
it up to performance comparable with the Windows driver, which seems to
|
||||||
|
apply a similar quirk.
|
||||||
|
|
||||||
|
The interval and window length were tested and found to work very well
|
||||||
|
with a lot of Bluetooth Low Energy devices, including the Surface Pen, a
|
||||||
|
Bluetooth Speaker and two modern Bluetooth headphones. All devices were
|
||||||
|
discovered immediately after turning them on. Even lower values were
|
||||||
|
also tested, but they introduced longer delays until devices get
|
||||||
|
discovered.
|
||||||
|
|
||||||
|
Patchset: mwifiex
|
||||||
|
---
|
||||||
|
drivers/bluetooth/btusb.c | 15 +++++++++++++++
|
||||||
|
1 file changed, 15 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||||
|
index 42234d5f602d..72202a744564 100644
|
||||||
|
--- a/drivers/bluetooth/btusb.c
|
||||||
|
+++ b/drivers/bluetooth/btusb.c
|
||||||
|
@@ -63,6 +63,7 @@ static struct usb_driver btusb_driver;
|
||||||
|
#define BTUSB_INTEL_BROKEN_SHUTDOWN_LED 0x2000000
|
||||||
|
#define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000
|
||||||
|
#define BTUSB_INTEL_NO_WBS_SUPPORT 0x8000000
|
||||||
|
+#define BTUSB_LOWER_LESCAN_INTERVAL 0x10000000
|
||||||
|
|
||||||
|
static const struct usb_device_id btusb_table[] = {
|
||||||
|
/* Generic Bluetooth USB device */
|
||||||
|
@@ -377,6 +378,7 @@ static const struct usb_device_id blacklist_table[] = {
|
||||||
|
{ USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },
|
||||||
|
{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
|
||||||
|
{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
|
||||||
|
+ { USB_DEVICE(0x1286, 0x204c), .driver_info = BTUSB_LOWER_LESCAN_INTERVAL },
|
||||||
|
|
||||||
|
/* Intel Bluetooth devices */
|
||||||
|
{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
|
||||||
|
@@ -3751,6 +3753,19 @@ static int btusb_probe(struct usb_interface *intf,
|
||||||
|
if (id->driver_info & BTUSB_MARVELL)
|
||||||
|
hdev->set_bdaddr = btusb_set_bdaddr_marvell;
|
||||||
|
|
||||||
|
+ /* The Marvell 88W8897 combined wifi and bluetooth card is known for
|
||||||
|
+ * very bad bt+wifi coexisting performance.
|
||||||
|
+ *
|
||||||
|
+ * Decrease the passive BT Low Energy scan interval a bit
|
||||||
|
+ * (0x0190 * 0.625 msec = 250 msec) and make the scan window shorter
|
||||||
|
+ * (0x000a * 0,625 msec = 6.25 msec). This allows for significantly
|
||||||
|
+ * higher wifi throughput while passively scanning for BT LE devices.
|
||||||
|
+ */
|
||||||
|
+ if (id->driver_info & BTUSB_LOWER_LESCAN_INTERVAL) {
|
||||||
|
+ hdev->le_scan_interval = 0x0190;
|
||||||
|
+ hdev->le_scan_window = 0x000a;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (IS_ENABLED(CONFIG_BT_HCIBTUSB_MTK) &&
|
||||||
|
(id->driver_info & BTUSB_MEDIATEK)) {
|
||||||
|
hdev->setup = btusb_mtk_setup;
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 921b3bdd8d6d963f5ea108a699ef6f70a3709acd Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||||
|
Date: Tue, 10 Nov 2020 12:49:56 +0100
|
||||||
|
Subject: [PATCH] mwifiex: Use non-posted PCI register writes
|
||||||
|
|
||||||
|
On the 88W8897 card it's very important the TX ring write pointer is
|
||||||
|
updated correctly to its new value before setting the TX ready
|
||||||
|
interrupt, otherwise the firmware appears to crash (probably because
|
||||||
|
it's trying to DMA-read from the wrong place).
|
||||||
|
|
||||||
|
Since PCI uses "posted writes" when writing to a register, it's not
|
||||||
|
guaranteed that a write will happen immediately. That means the pointer
|
||||||
|
might be outdated when setting the TX ready interrupt, leading to
|
||||||
|
firmware crashes especially when ASPM L1 and L1 substates are enabled
|
||||||
|
(because of the higher link latency, the write will probably take
|
||||||
|
longer).
|
||||||
|
|
||||||
|
So fix those firmware crashes by always forcing non-posted writes. We do
|
||||||
|
that by simply reading back the register after writing it, just as a lot
|
||||||
|
of other drivers do.
|
||||||
|
|
||||||
|
There are two reproducers that are fixed with this patch:
|
||||||
|
|
||||||
|
1) During rx/tx traffic and with ASPM L1 substates enabled (the enabled
|
||||||
|
substates are platform dependent), the firmware crashes and eventually a
|
||||||
|
command timeout appears in the logs. That crash is fixed by using a
|
||||||
|
non-posted write in mwifiex_pcie_send_data().
|
||||||
|
|
||||||
|
2) When sending lots of commands to the card, waking it up from sleep in
|
||||||
|
very quick intervals, the firmware eventually crashes. That crash
|
||||||
|
appears to be fixed by some other non-posted write included here.
|
||||||
|
|
||||||
|
Patchset: mwifiex
|
||||||
|
---
|
||||||
|
drivers/net/wireless/marvell/mwifiex/pcie.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
index 24bcd22a2618..b4ad0113a035 100644
|
||||||
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||||
|
@@ -238,6 +238,12 @@ static int mwifiex_write_reg(struct mwifiex_adapter *adapter, int reg, u32 data)
|
||||||
|
|
||||||
|
iowrite32(data, card->pci_mmap1 + reg);
|
||||||
|
|
||||||
|
+ /* Do a read-back, which makes the write non-posted, ensuring the
|
||||||
|
+ * completion before returning.
|
||||||
|
+ * The firmware of the 88W8897 card is buggy and this avoids crashes.
|
||||||
|
+ */
|
||||||
|
+ ioread32(card->pci_mmap1 + reg);
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
121
patches/5.17/0003-ath10k.patch
Normal file
121
patches/5.17/0003-ath10k.patch
Normal file
|
@ -0,0 +1,121 @@
|
||||||
|
From 1e8468a42b52eb369a70003f99dde7b16846c5e2 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 8f5b8eb368fa..80c1bac732bc 100644
|
||||||
|
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||||
|
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||||
|
@@ -36,6 +36,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);
|
||||||
|
|
||||||
|
@@ -48,6 +51,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");
|
||||||
|
@@ -56,6 +62,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,
|
||||||
|
@@ -844,6 +853,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)
|
||||||
|
@@ -858,6 +903,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.36.0
|
||||||
|
|
1713
patches/5.17/0004-ipts.patch
Normal file
1713
patches/5.17/0004-ipts.patch
Normal file
File diff suppressed because it is too large
Load diff
1492
patches/5.17/0005-surface-sam.patch
Normal file
1492
patches/5.17/0005-surface-sam.patch
Normal file
File diff suppressed because it is too large
Load diff
335
patches/5.17/0006-surface-sam-over-hid.patch
Normal file
335
patches/5.17/0006-surface-sam-over-hid.patch
Normal file
|
@ -0,0 +1,335 @@
|
||||||
|
From 82ae885ad1824b149d18d7ac938988d9a5b279d5 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 85ed4c1d4924..942c1c9a4ea5 100644
|
||||||
|
--- a/drivers/i2c/i2c-core-acpi.c
|
||||||
|
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||||
|
@@ -624,6 +624,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,
|
||||||
|
@@ -725,6 +747,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.36.0
|
||||||
|
|
||||||
|
From 704aa16555465b0f83471aa84c3a5be3c7133d67 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 9c228090c35b..c6c3c9bd3b57 100644
|
||||||
|
--- a/drivers/platform/surface/Kconfig
|
||||||
|
+++ b/drivers/platform/surface/Kconfig
|
||||||
|
@@ -106,6 +106,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 6d9291c993c4..9eb3a7e6382c 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.36.0
|
||||||
|
|
37
patches/5.17/0007-surface-gpe.patch
Normal file
37
patches/5.17/0007-surface-gpe.patch
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
From 5a6d26ae3ff1334f0540aef76b28c596ebb67d81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Date: Wed, 27 Oct 2021 00:56:11 +0200
|
||||||
|
Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 8
|
||||||
|
|
||||||
|
The new Surface Pro 8 uses GPEs for lid events as well. Add an entry for
|
||||||
|
that so that the lid can be used to wake the device. Note that this is a
|
||||||
|
device with a keyboard type cover, where this acts as the "lid".
|
||||||
|
|
||||||
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Patchset: surface-gpe
|
||||||
|
---
|
||||||
|
drivers/platform/surface/surface_gpe.c | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
|
||||||
|
index c1775db29efb..ec66fde28e75 100644
|
||||||
|
--- a/drivers/platform/surface/surface_gpe.c
|
||||||
|
+++ b/drivers/platform/surface/surface_gpe.c
|
||||||
|
@@ -99,6 +99,14 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||||
|
},
|
||||||
|
.driver_data = (void *)lid_device_props_l4D,
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .ident = "Surface Pro 8",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 8"),
|
||||||
|
+ },
|
||||||
|
+ .driver_data = (void *)lid_device_props_l4B,
|
||||||
|
+ },
|
||||||
|
{
|
||||||
|
.ident = "Surface Book 1",
|
||||||
|
.matches = {
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
558
patches/5.17/0008-surface-button.patch
Normal file
558
patches/5.17/0008-surface-button.patch
Normal file
|
@ -0,0 +1,558 @@
|
||||||
|
From 8944aec8973646c474c14bd6763adee38f0430a3 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
|
||||||
|
|
||||||
|
The power button on the AMD variant of the Surface Laptop uses the
|
||||||
|
same MSHW0040 device ID as the 5th and later generation of Surface
|
||||||
|
devices, however they report 0 for their OEM platform revision. As the
|
||||||
|
_DSM does not exist on the devices requiring special casing, check for
|
||||||
|
the existance of the _DSM to determine if soc_button_array should be
|
||||||
|
loaded.
|
||||||
|
|
||||||
|
Fixes: c394159310d0 ("Input: soc_button_array - add support for newer surface devices")
|
||||||
|
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
|
||||||
|
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||||
|
Patchset: surface-button
|
||||||
|
---
|
||||||
|
drivers/input/misc/soc_button_array.c | 33 +++++++--------------------
|
||||||
|
1 file changed, 8 insertions(+), 25 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||||
|
index cb6ec59a045d..4e8944f59def 100644
|
||||||
|
--- a/drivers/input/misc/soc_button_array.c
|
||||||
|
+++ b/drivers/input/misc/soc_button_array.c
|
||||||
|
@@ -474,8 +474,8 @@ static const struct soc_device_data soc_device_INT33D3 = {
|
||||||
|
* Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
|
||||||
|
* devices use MSHW0040 for power and volume buttons, however the way they
|
||||||
|
* have to be addressed differs. Make sure that we only load this drivers
|
||||||
|
- * for the correct devices by checking the OEM Platform Revision provided by
|
||||||
|
- * the _DSM method.
|
||||||
|
+ * for the correct devices by checking if the OEM Platform Revision DSM call
|
||||||
|
+ * exists.
|
||||||
|
*/
|
||||||
|
#define MSHW0040_DSM_REVISION 0x01
|
||||||
|
#define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision
|
||||||
|
@@ -486,31 +486,14 @@ static const guid_t MSHW0040_DSM_UUID =
|
||||||
|
static int soc_device_check_MSHW0040(struct device *dev)
|
||||||
|
{
|
||||||
|
acpi_handle handle = ACPI_HANDLE(dev);
|
||||||
|
- union acpi_object *result;
|
||||||
|
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||||
|
-
|
||||||
|
- // get OEM platform revision
|
||||||
|
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||||
|
- MSHW0040_DSM_REVISION,
|
||||||
|
- MSHW0040_DSM_GET_OMPR, NULL,
|
||||||
|
- ACPI_TYPE_INTEGER);
|
||||||
|
-
|
||||||
|
- if (result) {
|
||||||
|
- oem_platform_rev = result->integer.value;
|
||||||
|
- ACPI_FREE(result);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- /*
|
||||||
|
- * If the revision is zero here, the _DSM evaluation has failed. This
|
||||||
|
- * indicates that we have a Pro 4 or Book 1 and this driver should not
|
||||||
|
- * be used.
|
||||||
|
- */
|
||||||
|
- if (oem_platform_rev == 0)
|
||||||
|
- return -ENODEV;
|
||||||
|
+ bool exists;
|
||||||
|
|
||||||
|
- dev_dbg(dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||||
|
+ // check if OEM platform revision DSM call exists
|
||||||
|
+ exists = acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||||
|
+ MSHW0040_DSM_REVISION,
|
||||||
|
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||||
|
|
||||||
|
- return 0;
|
||||||
|
+ return exists ? 0 : -ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 421af81b0297af32e058cd79dcf3073eb3cf51fa 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
|
||||||
|
variant
|
||||||
|
|
||||||
|
The AMD variant of the Surface Laptop report 0 for their OEM platform
|
||||||
|
revision. The Surface devices that require the surfacepro3_button
|
||||||
|
driver do not have the _DSM that gets the OEM platform revision. If the
|
||||||
|
method does not exist, load surfacepro3_button.
|
||||||
|
|
||||||
|
Fixes: 64dd243d7356 ("platform/x86: surfacepro3_button: Fix device check")
|
||||||
|
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
|
||||||
|
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||||
|
Patchset: surface-button
|
||||||
|
---
|
||||||
|
drivers/platform/surface/surfacepro3_button.c | 30 ++++---------------
|
||||||
|
1 file changed, 6 insertions(+), 24 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
|
||||||
|
index 242fb690dcaf..30eea54dbb47 100644
|
||||||
|
--- a/drivers/platform/surface/surfacepro3_button.c
|
||||||
|
+++ b/drivers/platform/surface/surfacepro3_button.c
|
||||||
|
@@ -149,7 +149,8 @@ static int surface_button_resume(struct device *dev)
|
||||||
|
/*
|
||||||
|
* Surface Pro 4 and Surface Book 2 / Surface Pro 2017 use the same device
|
||||||
|
* ID (MSHW0040) for the power/volume buttons. Make sure this is the right
|
||||||
|
- * device by checking for the _DSM method and OEM Platform Revision.
|
||||||
|
+ * device by checking for the _DSM method and OEM Platform Revision DSM
|
||||||
|
+ * function.
|
||||||
|
*
|
||||||
|
* Returns true if the driver should bind to this device, i.e. the device is
|
||||||
|
* either MSWH0028 (Pro 3) or MSHW0040 on a Pro 4 or Book 1.
|
||||||
|
@@ -157,30 +158,11 @@ static int surface_button_resume(struct device *dev)
|
||||||
|
static bool surface_button_check_MSHW0040(struct acpi_device *dev)
|
||||||
|
{
|
||||||
|
acpi_handle handle = dev->handle;
|
||||||
|
- union acpi_object *result;
|
||||||
|
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||||
|
-
|
||||||
|
- // get OEM platform revision
|
||||||
|
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||||
|
- MSHW0040_DSM_REVISION,
|
||||||
|
- MSHW0040_DSM_GET_OMPR,
|
||||||
|
- NULL, ACPI_TYPE_INTEGER);
|
||||||
|
-
|
||||||
|
- /*
|
||||||
|
- * If evaluating the _DSM fails, the method is not present. This means
|
||||||
|
- * that we have either MSHW0028 or MSHW0040 on Pro 4 or Book 1, so we
|
||||||
|
- * should use this driver. We use revision 0 indicating it is
|
||||||
|
- * unavailable.
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
- if (result) {
|
||||||
|
- oem_platform_rev = result->integer.value;
|
||||||
|
- ACPI_FREE(result);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- dev_dbg(&dev->dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||||
|
|
||||||
|
- return oem_platform_rev == 0;
|
||||||
|
+ // make sure that OEM platform revision DSM call does not exist
|
||||||
|
+ return !acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||||
|
+ MSHW0040_DSM_REVISION,
|
||||||
|
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 734da7d8f5beb9be996ba99a80f7e603b72130ab Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
Date: Thu, 24 Feb 2022 12:02:40 +0100
|
||||||
|
Subject: [PATCH] Input: soc_button_array - add support for Microsoft Surface 3
|
||||||
|
(MSHW0028) buttons
|
||||||
|
|
||||||
|
The drivers/platform/surface/surface3_button.c code is alsmost a 1:1 copy
|
||||||
|
of the soc_button_array code.
|
||||||
|
|
||||||
|
The only big difference is that it binds to an i2c_client rather then to
|
||||||
|
a platform_device. The cause of this is the ACPI resources for the MSHW0028
|
||||||
|
device containing a bogus I2cSerialBusV2 resource which causes the kernel
|
||||||
|
to instantiate an i2c_client for it instead of a platform_device.
|
||||||
|
|
||||||
|
Add "MSHW0028" to the ignore_serial_bus_ids[] list in drivers/apci/scan.c,
|
||||||
|
so that a platform_device will be instantiated and add support for
|
||||||
|
the MSHW0028 HID to soc_button_array.
|
||||||
|
|
||||||
|
This fully replaces surface3_button, which will be removed in a separate
|
||||||
|
commit (since it binds to the now no longer created i2c_client it no
|
||||||
|
longer does anyyhing after this commit).
|
||||||
|
|
||||||
|
Note the MSHW0028 id is used by Microsoft to describe the tablet buttons on
|
||||||
|
both the Surface 3 and the Surface 3 Pro and the actual API/implementation
|
||||||
|
for the Surface 3 Pro is quite different. The changes in this commit should
|
||||||
|
not impact the separate surfacepro3_button driver:
|
||||||
|
|
||||||
|
1. Because of the bogus I2cSerialBusV2 resource problem that driver binds
|
||||||
|
to the acpi_device itself, so instantiating a platform_device instead of
|
||||||
|
an i2c_client does not matter.
|
||||||
|
|
||||||
|
2. The soc_button_array driver will not bind to the MSHW0028 device on
|
||||||
|
the Surface 3 Pro, because it has no GPIO resources.
|
||||||
|
|
||||||
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com
|
||||||
|
Patchset: surface-button
|
||||||
|
---
|
||||||
|
drivers/acpi/scan.c | 5 +++++
|
||||||
|
drivers/input/misc/soc_button_array.c | 24 +++++++++++++++++++++++-
|
||||||
|
2 files changed, 28 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
||||||
|
index 8b2e5ef15559..c82b1bfa1c3d 100644
|
||||||
|
--- a/drivers/acpi/scan.c
|
||||||
|
+++ b/drivers/acpi/scan.c
|
||||||
|
@@ -1753,6 +1753,11 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
|
||||||
|
*/
|
||||||
|
{"BCM4752", },
|
||||||
|
{"LNV4752", },
|
||||||
|
+ /*
|
||||||
|
+ * Some ACPI devs contain SerialBus resources even though they are not
|
||||||
|
+ * attached to a serial bus at all.
|
||||||
|
+ */
|
||||||
|
+ {"MSHW0028", },
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||||
|
index 4e8944f59def..f044c731c6a9 100644
|
||||||
|
--- a/drivers/input/misc/soc_button_array.c
|
||||||
|
+++ b/drivers/input/misc/soc_button_array.c
|
||||||
|
@@ -469,6 +469,27 @@ static const struct soc_device_data soc_device_INT33D3 = {
|
||||||
|
.button_info = soc_button_INT33D3,
|
||||||
|
};
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * Button info for Microsoft Surface 3 (non pro), this is indentical to
|
||||||
|
+ * the PNP0C40 info except that the home button is active-high.
|
||||||
|
+ *
|
||||||
|
+ * The Surface 3 Pro also has a MSHW0028 ACPI device, but that uses a custom
|
||||||
|
+ * version of the drivers/platform/x86/intel/hid.c 5 button array ACPI API
|
||||||
|
+ * instead. A check() callback is not necessary though as the Surface 3 Pro
|
||||||
|
+ * MSHW0028 ACPI device's resource table does not contain any GPIOs.
|
||||||
|
+ */
|
||||||
|
+static const struct soc_button_info soc_button_MSHW0028[] = {
|
||||||
|
+ { "power", 0, EV_KEY, KEY_POWER, false, true, true },
|
||||||
|
+ { "home", 1, EV_KEY, KEY_LEFTMETA, false, true, false },
|
||||||
|
+ { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false, true },
|
||||||
|
+ { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false, true },
|
||||||
|
+ { }
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static const struct soc_device_data soc_device_MSHW0028 = {
|
||||||
|
+ .button_info = soc_button_MSHW0028,
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Special device check for Surface Book 2 and Surface Pro (2017).
|
||||||
|
* Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
|
||||||
|
@@ -518,7 +539,8 @@ static const struct acpi_device_id soc_button_acpi_match[] = {
|
||||||
|
{ "ID9001", (unsigned long)&soc_device_INT33D3 },
|
||||||
|
{ "ACPI0011", 0 },
|
||||||
|
|
||||||
|
- /* Microsoft Surface Devices (5th and 6th generation) */
|
||||||
|
+ /* Microsoft Surface Devices (3th, 5th and 6th generation) */
|
||||||
|
+ { "MSHW0028", (unsigned long)&soc_device_MSHW0028 },
|
||||||
|
{ "MSHW0040", (unsigned long)&soc_device_MSHW0040 },
|
||||||
|
|
||||||
|
{ }
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 33b3e3c489a43b4c71d5886e10af33473a939ca9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
Date: Thu, 24 Feb 2022 12:02:41 +0100
|
||||||
|
Subject: [PATCH] platform/surface: Remove Surface 3 Button driver
|
||||||
|
|
||||||
|
The Surface 3 buttons are now handled by the generic soc_button_array
|
||||||
|
driver. As part of adding support to soc_button_array the ACPI code
|
||||||
|
now instantiates a platform_device rather then an i2c_client so there
|
||||||
|
no longer is an i2c_client for this driver to bind to.
|
||||||
|
|
||||||
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com
|
||||||
|
Patchset: surface-button
|
||||||
|
---
|
||||||
|
drivers/platform/surface/Kconfig | 7 -
|
||||||
|
drivers/platform/surface/Makefile | 1 -
|
||||||
|
drivers/platform/surface/surface3_button.c | 247 ---------------------
|
||||||
|
3 files changed, 255 deletions(-)
|
||||||
|
delete mode 100644 drivers/platform/surface/surface3_button.c
|
||||||
|
|
||||||
|
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
|
||||||
|
index c6c3c9bd3b57..df387ac34a79 100644
|
||||||
|
--- a/drivers/platform/surface/Kconfig
|
||||||
|
+++ b/drivers/platform/surface/Kconfig
|
||||||
|
@@ -28,13 +28,6 @@ config SURFACE3_WMI
|
||||||
|
To compile this driver as a module, choose M here: the module will
|
||||||
|
be called surface3-wmi.
|
||||||
|
|
||||||
|
-config SURFACE_3_BUTTON
|
||||||
|
- tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"
|
||||||
|
- depends on ACPI
|
||||||
|
- depends on KEYBOARD_GPIO && I2C
|
||||||
|
- help
|
||||||
|
- This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.
|
||||||
|
-
|
||||||
|
config SURFACE_3_POWER_OPREGION
|
||||||
|
tristate "Surface 3 battery platform operation region support"
|
||||||
|
depends on ACPI
|
||||||
|
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||||
|
index 9eb3a7e6382c..e4791b47f561 100644
|
||||||
|
--- a/drivers/platform/surface/Makefile
|
||||||
|
+++ b/drivers/platform/surface/Makefile
|
||||||
|
@@ -5,7 +5,6 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
|
||||||
|
-obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||||
|
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||||
|
obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||||
|
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||||
|
diff --git a/drivers/platform/surface/surface3_button.c b/drivers/platform/surface/surface3_button.c
|
||||||
|
deleted file mode 100644
|
||||||
|
index 48d77e7aae76..000000000000
|
||||||
|
--- a/drivers/platform/surface/surface3_button.c
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,247 +0,0 @@
|
||||||
|
-// SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
-/*
|
||||||
|
- * Supports for the button array on the Surface tablets.
|
||||||
|
- *
|
||||||
|
- * (C) Copyright 2016 Red Hat, Inc
|
||||||
|
- *
|
||||||
|
- * Based on soc_button_array.c:
|
||||||
|
- *
|
||||||
|
- * {C} Copyright 2014 Intel Corporation
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
-#include <linux/module.h>
|
||||||
|
-#include <linux/input.h>
|
||||||
|
-#include <linux/init.h>
|
||||||
|
-#include <linux/kernel.h>
|
||||||
|
-#include <linux/i2c.h>
|
||||||
|
-#include <linux/slab.h>
|
||||||
|
-#include <linux/acpi.h>
|
||||||
|
-#include <linux/gpio/consumer.h>
|
||||||
|
-#include <linux/gpio_keys.h>
|
||||||
|
-#include <linux/gpio.h>
|
||||||
|
-#include <linux/platform_device.h>
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-#define SURFACE_BUTTON_OBJ_NAME "TEV2"
|
||||||
|
-#define MAX_NBUTTONS 4
|
||||||
|
-
|
||||||
|
-/*
|
||||||
|
- * Some of the buttons like volume up/down are auto repeat, while others
|
||||||
|
- * are not. To support both, we register two platform devices, and put
|
||||||
|
- * buttons into them based on whether the key should be auto repeat.
|
||||||
|
- */
|
||||||
|
-#define BUTTON_TYPES 2
|
||||||
|
-
|
||||||
|
-/*
|
||||||
|
- * Power button, Home button, Volume buttons support is supposed to
|
||||||
|
- * be covered by drivers/input/misc/soc_button_array.c, which is implemented
|
||||||
|
- * according to "Windows ACPI Design Guide for SoC Platforms".
|
||||||
|
- * However surface 3 seems not to obey the specs, instead it uses
|
||||||
|
- * device TEV2(MSHW0028) for declaring the GPIOs. The gpios are also slightly
|
||||||
|
- * different in which the Home button is active high.
|
||||||
|
- * Compared to surfacepro3_button.c which also handles MSHW0028, the Surface 3
|
||||||
|
- * is a reduce platform and thus uses GPIOs, not ACPI events.
|
||||||
|
- * We choose an I2C driver here because we need to access the resources
|
||||||
|
- * declared under the device node, while surfacepro3_button.c only needs
|
||||||
|
- * the ACPI companion node.
|
||||||
|
- */
|
||||||
|
-static const struct acpi_device_id surface3_acpi_match[] = {
|
||||||
|
- { "MSHW0028", 0 },
|
||||||
|
- { }
|
||||||
|
-};
|
||||||
|
-MODULE_DEVICE_TABLE(acpi, surface3_acpi_match);
|
||||||
|
-
|
||||||
|
-struct surface3_button_info {
|
||||||
|
- const char *name;
|
||||||
|
- int acpi_index;
|
||||||
|
- unsigned int event_type;
|
||||||
|
- unsigned int event_code;
|
||||||
|
- bool autorepeat;
|
||||||
|
- bool wakeup;
|
||||||
|
- bool active_low;
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-struct surface3_button_data {
|
||||||
|
- struct platform_device *children[BUTTON_TYPES];
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-/*
|
||||||
|
- * Get the Nth GPIO number from the ACPI object.
|
||||||
|
- */
|
||||||
|
-static int surface3_button_lookup_gpio(struct device *dev, int acpi_index)
|
||||||
|
-{
|
||||||
|
- struct gpio_desc *desc;
|
||||||
|
- int gpio;
|
||||||
|
-
|
||||||
|
- desc = gpiod_get_index(dev, NULL, acpi_index, GPIOD_ASIS);
|
||||||
|
- if (IS_ERR(desc))
|
||||||
|
- return PTR_ERR(desc);
|
||||||
|
-
|
||||||
|
- gpio = desc_to_gpio(desc);
|
||||||
|
-
|
||||||
|
- gpiod_put(desc);
|
||||||
|
-
|
||||||
|
- return gpio;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static struct platform_device *
|
||||||
|
-surface3_button_device_create(struct i2c_client *client,
|
||||||
|
- const struct surface3_button_info *button_info,
|
||||||
|
- bool autorepeat)
|
||||||
|
-{
|
||||||
|
- const struct surface3_button_info *info;
|
||||||
|
- struct platform_device *pd;
|
||||||
|
- struct gpio_keys_button *gpio_keys;
|
||||||
|
- struct gpio_keys_platform_data *gpio_keys_pdata;
|
||||||
|
- int n_buttons = 0;
|
||||||
|
- int gpio;
|
||||||
|
- int error;
|
||||||
|
-
|
||||||
|
- gpio_keys_pdata = devm_kzalloc(&client->dev,
|
||||||
|
- sizeof(*gpio_keys_pdata) +
|
||||||
|
- sizeof(*gpio_keys) * MAX_NBUTTONS,
|
||||||
|
- GFP_KERNEL);
|
||||||
|
- if (!gpio_keys_pdata)
|
||||||
|
- return ERR_PTR(-ENOMEM);
|
||||||
|
-
|
||||||
|
- gpio_keys = (void *)(gpio_keys_pdata + 1);
|
||||||
|
-
|
||||||
|
- for (info = button_info; info->name; info++) {
|
||||||
|
- if (info->autorepeat != autorepeat)
|
||||||
|
- continue;
|
||||||
|
-
|
||||||
|
- gpio = surface3_button_lookup_gpio(&client->dev,
|
||||||
|
- info->acpi_index);
|
||||||
|
- if (!gpio_is_valid(gpio))
|
||||||
|
- continue;
|
||||||
|
-
|
||||||
|
- gpio_keys[n_buttons].type = info->event_type;
|
||||||
|
- gpio_keys[n_buttons].code = info->event_code;
|
||||||
|
- gpio_keys[n_buttons].gpio = gpio;
|
||||||
|
- gpio_keys[n_buttons].active_low = info->active_low;
|
||||||
|
- gpio_keys[n_buttons].desc = info->name;
|
||||||
|
- gpio_keys[n_buttons].wakeup = info->wakeup;
|
||||||
|
- n_buttons++;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (n_buttons == 0) {
|
||||||
|
- error = -ENODEV;
|
||||||
|
- goto err_free_mem;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- gpio_keys_pdata->buttons = gpio_keys;
|
||||||
|
- gpio_keys_pdata->nbuttons = n_buttons;
|
||||||
|
- gpio_keys_pdata->rep = autorepeat;
|
||||||
|
-
|
||||||
|
- pd = platform_device_alloc("gpio-keys", PLATFORM_DEVID_AUTO);
|
||||||
|
- if (!pd) {
|
||||||
|
- error = -ENOMEM;
|
||||||
|
- goto err_free_mem;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- error = platform_device_add_data(pd, gpio_keys_pdata,
|
||||||
|
- sizeof(*gpio_keys_pdata));
|
||||||
|
- if (error)
|
||||||
|
- goto err_free_pdev;
|
||||||
|
-
|
||||||
|
- error = platform_device_add(pd);
|
||||||
|
- if (error)
|
||||||
|
- goto err_free_pdev;
|
||||||
|
-
|
||||||
|
- return pd;
|
||||||
|
-
|
||||||
|
-err_free_pdev:
|
||||||
|
- platform_device_put(pd);
|
||||||
|
-err_free_mem:
|
||||||
|
- devm_kfree(&client->dev, gpio_keys_pdata);
|
||||||
|
- return ERR_PTR(error);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static int surface3_button_remove(struct i2c_client *client)
|
||||||
|
-{
|
||||||
|
- struct surface3_button_data *priv = i2c_get_clientdata(client);
|
||||||
|
-
|
||||||
|
- int i;
|
||||||
|
-
|
||||||
|
- for (i = 0; i < BUTTON_TYPES; i++)
|
||||||
|
- if (priv->children[i])
|
||||||
|
- platform_device_unregister(priv->children[i]);
|
||||||
|
-
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static struct surface3_button_info surface3_button_surface3[] = {
|
||||||
|
- { "power", 0, EV_KEY, KEY_POWER, false, true, true },
|
||||||
|
- { "home", 1, EV_KEY, KEY_LEFTMETA, false, true, false },
|
||||||
|
- { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false, true },
|
||||||
|
- { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false, true },
|
||||||
|
- { }
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-static int surface3_button_probe(struct i2c_client *client,
|
||||||
|
- const struct i2c_device_id *id)
|
||||||
|
-{
|
||||||
|
- struct device *dev = &client->dev;
|
||||||
|
- struct surface3_button_data *priv;
|
||||||
|
- struct platform_device *pd;
|
||||||
|
- int i;
|
||||||
|
- int error;
|
||||||
|
-
|
||||||
|
- if (strncmp(acpi_device_bid(ACPI_COMPANION(&client->dev)),
|
||||||
|
- SURFACE_BUTTON_OBJ_NAME,
|
||||||
|
- strlen(SURFACE_BUTTON_OBJ_NAME)))
|
||||||
|
- return -ENODEV;
|
||||||
|
-
|
||||||
|
- error = gpiod_count(dev, NULL);
|
||||||
|
- if (error < 0) {
|
||||||
|
- dev_dbg(dev, "no GPIO attached, ignoring...\n");
|
||||||
|
- return error;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
||||||
|
- if (!priv)
|
||||||
|
- return -ENOMEM;
|
||||||
|
-
|
||||||
|
- i2c_set_clientdata(client, priv);
|
||||||
|
-
|
||||||
|
- for (i = 0; i < BUTTON_TYPES; i++) {
|
||||||
|
- pd = surface3_button_device_create(client,
|
||||||
|
- surface3_button_surface3,
|
||||||
|
- i == 0);
|
||||||
|
- if (IS_ERR(pd)) {
|
||||||
|
- error = PTR_ERR(pd);
|
||||||
|
- if (error != -ENODEV) {
|
||||||
|
- surface3_button_remove(client);
|
||||||
|
- return error;
|
||||||
|
- }
|
||||||
|
- continue;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- priv->children[i] = pd;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (!priv->children[0] && !priv->children[1])
|
||||||
|
- return -ENODEV;
|
||||||
|
-
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static const struct i2c_device_id surface3_id[] = {
|
||||||
|
- { }
|
||||||
|
-};
|
||||||
|
-MODULE_DEVICE_TABLE(i2c, surface3_id);
|
||||||
|
-
|
||||||
|
-static struct i2c_driver surface3_driver = {
|
||||||
|
- .probe = surface3_button_probe,
|
||||||
|
- .remove = surface3_button_remove,
|
||||||
|
- .id_table = surface3_id,
|
||||||
|
- .driver = {
|
||||||
|
- .name = "surface3",
|
||||||
|
- .acpi_match_table = ACPI_PTR(surface3_acpi_match),
|
||||||
|
- },
|
||||||
|
-};
|
||||||
|
-module_i2c_driver(surface3_driver);
|
||||||
|
-
|
||||||
|
-MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>");
|
||||||
|
-MODULE_DESCRIPTION("surface3 button array driver");
|
||||||
|
-MODULE_LICENSE("GPL v2");
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
233
patches/5.17/0009-surface-typecover.patch
Normal file
233
patches/5.17/0009-surface-typecover.patch
Normal file
|
@ -0,0 +1,233 @@
|
||||||
|
From 6854ba2ebc5761be240d5fd1d57555011f307f2c 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 99eabfb4145b..bbfcae39f375 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,
|
||||||
|
@@ -211,6 +220,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
|
||||||
|
@@ -386,6 +396,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
|
||||||
|
+ },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -1695,6 +1715,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;
|
||||||
|
@@ -1718,6 +1801,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);
|
||||||
|
|
||||||
|
@@ -1747,15 +1833,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)
|
||||||
|
@@ -1807,6 +1897,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);
|
||||||
|
@@ -2174,6 +2265,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.36.0
|
||||||
|
|
58
patches/5.17/0010-surface-battery.patch
Normal file
58
patches/5.17/0010-surface-battery.patch
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
From 48eab1c5e0d9fe67384d6c2e91efdf0ec3ff54b5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Date: Tue, 8 Feb 2022 01:29:48 +0100
|
||||||
|
Subject: [PATCH] ACPI: battery: Add "Not Charging" quirk for Microsoft Surface
|
||||||
|
devices
|
||||||
|
|
||||||
|
Microsoft Surface devices have a limiter that sets a fixed maximum
|
||||||
|
charge capacity for the battery. When that maximum capacity has been
|
||||||
|
reached, charging stops. In that case, _BST returns a battery state
|
||||||
|
field with both "charging" and "discharging" bits cleared. The battery
|
||||||
|
driver, however, returns "unknown" as status.
|
||||||
|
|
||||||
|
This seems to be the same behavior as observed on the ThinkPads, so
|
||||||
|
let's use the same quirk to handle that as well.
|
||||||
|
|
||||||
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
|
Patchset: surface-battery
|
||||||
|
|
||||||
|
---
|
||||||
|
For what it's worth, I don't think the ACPI spec explicitly states that
|
||||||
|
any of the status bits need to be set, or that there are only the
|
||||||
|
"charging" and "discharging" states. As far as I can tell, ACPI only
|
||||||
|
states:
|
||||||
|
|
||||||
|
Notice that the Charging bit and the Discharging bit are mutually
|
||||||
|
exclusive and must not both be set at the same time. Even in
|
||||||
|
critical state, hardware should report the corresponding
|
||||||
|
charging/discharging state.
|
||||||
|
|
||||||
|
But that does not exclude the case that no bit is set. So, strictly
|
||||||
|
going by spec, I don't think it's necessary to put all of this behind a
|
||||||
|
quirk.
|
||||||
|
---
|
||||||
|
drivers/acpi/battery.c | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
|
||||||
|
index dc208f5f5a1f..db2aa56c746a 100644
|
||||||
|
--- a/drivers/acpi/battery.c
|
||||||
|
+++ b/drivers/acpi/battery.c
|
||||||
|
@@ -1152,6 +1152,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
|
||||||
|
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
+ {
|
||||||
|
+ .callback = battery_quirk_not_charging,
|
||||||
|
+ .ident = "Microsoft Surface",
|
||||||
|
+ .matches = {
|
||||||
|
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||||
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface"),
|
||||||
|
+ },
|
||||||
|
+ },
|
||||||
|
{
|
||||||
|
/* Microsoft Surface Go 3 */
|
||||||
|
.callback = battery_notification_delay_quirk,
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
113
patches/5.17/0011-cameras.patch
Normal file
113
patches/5.17/0011-cameras.patch
Normal file
|
@ -0,0 +1,113 @@
|
||||||
|
From f31a3ad42c2c04a17f8675438a1b5a6500bafea5 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
|
||||||
|
INT3472 device
|
||||||
|
|
||||||
|
The clk and regulator frameworks expect clk/regulator consumer-devices
|
||||||
|
to have info about the consumed clks/regulators described in the device's
|
||||||
|
fw_node.
|
||||||
|
|
||||||
|
To work around cases where this info is not present in the firmware tables,
|
||||||
|
which is often the case on x86/ACPI devices, both frameworks allow the
|
||||||
|
provider-driver to attach info about consumers to the clks/regulators
|
||||||
|
when registering these.
|
||||||
|
|
||||||
|
This causes problems with the probe ordering wrt drivers for consumers
|
||||||
|
of these clks/regulators. Since the lookups are only registered when the
|
||||||
|
provider-driver binds, trying to get these clks/regulators before then
|
||||||
|
results in a -ENOENT error for clks and a dummy regulator for regulators.
|
||||||
|
|
||||||
|
One case where we hit this issue is camera sensors such as e.g. the OV8865
|
||||||
|
sensor found on the Microsoft Surface Go. The sensor uses clks, regulators
|
||||||
|
and GPIOs provided by a TPS68470 PMIC which is described in an INT3472
|
||||||
|
ACPI device. There is special platform code handling this and setting
|
||||||
|
platform_data with the necessary consumer info on the MFD cells
|
||||||
|
instantiated for the PMIC under: drivers/platform/x86/intel/int3472.
|
||||||
|
|
||||||
|
For this to work properly the ov8865 driver must not bind to the I2C-client
|
||||||
|
for the OV8865 sensor until after the TPS68470 PMIC gpio, regulator and
|
||||||
|
clk MFD cells have all been fully setup.
|
||||||
|
|
||||||
|
The OV8865 on the Microsoft Surface Go is just one example, all X86
|
||||||
|
devices using the Intel IPU3 camera block found on recent Intel SoCs
|
||||||
|
have similar issues where there is an INT3472 HID ACPI-device, which
|
||||||
|
describes the clks and regulators, and the driver for this INT3472 device
|
||||||
|
must be fully initialized before the sensor driver (any sensor driver)
|
||||||
|
binds for things to work properly.
|
||||||
|
|
||||||
|
On these devices the ACPI nodes describing the sensors all have a _DEP
|
||||||
|
dependency on the matching INT3472 ACPI device (there is one per sensor).
|
||||||
|
|
||||||
|
This allows solving the probe-ordering problem by delaying the enumeration
|
||||||
|
(instantiation of the I2C-client in the ov8865 example) of ACPI-devices
|
||||||
|
which have a _DEP dependency on an INT3472 device.
|
||||||
|
|
||||||
|
The new acpi_dev_ready_for_enumeration() helper used for this is also
|
||||||
|
exported because for devices, which have the enumeration_by_parent flag
|
||||||
|
set, the parent-driver will do its own scan of child ACPI devices and
|
||||||
|
it will try to enumerate those during its probe(). Code doing this such
|
||||||
|
as e.g. the i2c-core-acpi.c code must call this new helper to ensure
|
||||||
|
that it too delays the enumeration until all the _DEP dependencies are
|
||||||
|
met on devices which have the new honor_deps flag set.
|
||||||
|
|
||||||
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||||
|
Patchset: cameras
|
||||||
|
---
|
||||||
|
drivers/acpi/scan.c | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
||||||
|
index c82b1bfa1c3d..2227625202aa 100644
|
||||||
|
--- a/drivers/acpi/scan.c
|
||||||
|
+++ b/drivers/acpi/scan.c
|
||||||
|
@@ -2130,6 +2130,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
|
||||||
|
|
||||||
|
static void acpi_default_enumeration(struct acpi_device *device)
|
||||||
|
{
|
||||||
|
+ if (!acpi_dev_ready_for_enumeration(device))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Do not enumerate devices with enumeration_by_parent flag set as
|
||||||
|
* they will be enumerated by their respective parents.
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
||||||
|
From 3f7aa178a14b5cdaa3ca424743299d0c271fd202 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
|
||||||
|
|
||||||
|
The TPS68470 PMIC has an I2C passthrough mode through which I2C traffic
|
||||||
|
can be forwarded to a device connected to the PMIC as though it were
|
||||||
|
connected directly to the system bus. Enable this mode when the chip
|
||||||
|
is initialised.
|
||||||
|
|
||||||
|
Signed-off-by: Daniel Scally <djrscally@gmail.com>
|
||||||
|
Patchset: cameras
|
||||||
|
---
|
||||||
|
drivers/platform/x86/intel/int3472/tps68470.c | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
||||||
|
index 22f61b47f9e5..e1de1ff40bba 100644
|
||||||
|
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
||||||
|
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
||||||
|
@@ -45,6 +45,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* Enable I2C daisy chain */
|
||||||
|
+ ret = regmap_write(regmap, TPS68470_REG_S_I2C_CTL, 0x03);
|
||||||
|
+ if (ret) {
|
||||||
|
+ dev_err(dev, "Failed to enable i2c daisy chain\n");
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
dev_info(dev, "TPS68470 REVID: 0x%02x\n", version);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
109
patches/5.17/0012-amd-gpio.patch
Normal file
109
patches/5.17/0012-amd-gpio.patch
Normal file
|
@ -0,0 +1,109 @@
|
||||||
|
From 2bd2d24b1a9f413760ef333262833def4c4c7ab2 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 0d01e7f5078c..2b06cf5f2b1f 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>
|
||||||
|
@@ -1152,6 +1153,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
|
||||||
|
@@ -1207,6 +1219,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.36.0
|
||||||
|
|
||||||
|
From 4413582ad25091f1ff7c163c97f938550430834a 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 2b06cf5f2b1f..caaec200bea2 100644
|
||||||
|
--- a/arch/x86/kernel/acpi/boot.c
|
||||||
|
+++ b/arch/x86/kernel/acpi/boot.c
|
||||||
|
@@ -1155,12 +1155,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.36.0
|
||||||
|
|
Loading…
Reference in a new issue