Add patches for 6.7
Derived from latest 6.6 patches
Links:
- kernel: 4e36132e27
- tree-devel: https://github.com/linux-surface/kernel/tree/v6.7-surface-devel
- tree-patches: https://github.com/linux-surface/kernel/tree/v6.7-surface
This commit is contained in:
parent
c58cae4193
commit
b49ed6d04d
75
configs/surface-6.7.config
Normal file
75
configs/surface-6.7.config
Normal file
|
@ -0,0 +1,75 @@
|
|||
##
|
||||
## Surface Aggregator Module
|
||||
##
|
||||
CONFIG_SURFACE_AGGREGATOR=m
|
||||
# CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION is not set
|
||||
CONFIG_SURFACE_AGGREGATOR_BUS=y
|
||||
CONFIG_SURFACE_AGGREGATOR_CDEV=m
|
||||
CONFIG_SURFACE_AGGREGATOR_HUB=m
|
||||
CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
|
||||
CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
|
||||
|
||||
CONFIG_SURFACE_ACPI_NOTIFY=m
|
||||
CONFIG_SURFACE_DTX=m
|
||||
CONFIG_SURFACE_PLATFORM_PROFILE=m
|
||||
|
||||
CONFIG_SURFACE_HID=m
|
||||
CONFIG_SURFACE_KBD=m
|
||||
|
||||
CONFIG_BATTERY_SURFACE=m
|
||||
CONFIG_CHARGER_SURFACE=m
|
||||
|
||||
CONFIG_SENSORS_SURFACE_TEMP=m
|
||||
CONFIG_SENSORS_SURFACE_FAN=m
|
||||
|
||||
##
|
||||
## Surface Hotplug
|
||||
##
|
||||
CONFIG_SURFACE_HOTPLUG=m
|
||||
|
||||
##
|
||||
## IPTS and ITHC touchscreen
|
||||
##
|
||||
## This only enables the user interface for IPTS/ITHC data.
|
||||
## For the touchscreen to work, you need to install iptsd.
|
||||
##
|
||||
CONFIG_HID_IPTS=m
|
||||
CONFIG_HID_ITHC=m
|
||||
|
||||
##
|
||||
## Cameras: IPU3
|
||||
##
|
||||
CONFIG_VIDEO_DW9719=m
|
||||
CONFIG_VIDEO_IPU3_IMGU=m
|
||||
CONFIG_VIDEO_IPU3_CIO2=m
|
||||
CONFIG_IPU_BRIDGE=m
|
||||
CONFIG_INTEL_SKL_INT3472=m
|
||||
CONFIG_REGULATOR_TPS68470=m
|
||||
CONFIG_COMMON_CLK_TPS68470=m
|
||||
CONFIG_LEDS_TPS68470=m
|
||||
|
||||
##
|
||||
## Cameras: Sensor drivers
|
||||
##
|
||||
CONFIG_VIDEO_OV5693=m
|
||||
CONFIG_VIDEO_OV7251=m
|
||||
CONFIG_VIDEO_OV8865=m
|
||||
|
||||
##
|
||||
## Surface 3: atomisp causes problems (see issue #1095). Disable it for now.
|
||||
##
|
||||
# CONFIG_INTEL_ATOMISP is not set
|
||||
|
||||
##
|
||||
## 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_POWER_OPREGION=m
|
||||
CONFIG_SURFACE_PRO3_BUTTON=m
|
||||
CONFIG_SURFACE_GPE=m
|
||||
CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
|
101
patches/6.7/0001-surface3-oemb.patch
Normal file
101
patches/6.7/0001-surface3-oemb.patch
Normal file
|
@ -0,0 +1,101 @@
|
|||
From c9479d2ee549e4b5392c5f788d9905244404e207 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 c15ed7a12784..1ec8edb5aafa 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 edcb85bd8ea7..cea19fa3fa56 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3753,6 +3753,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 5e2ec60e2954..207868c699f2 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.43.0
|
||||
|
400
patches/6.7/0002-mwifiex.patch
Normal file
400
patches/6.7/0002-mwifiex.patch
Normal file
|
@ -0,0 +1,400 @@
|
|||
From 38181ea8d1f9130ce6d677d306f819d2fa3b5f57 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 5f997becdbaa..9a9929424513 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -1702,9 +1702,21 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
|
||||
static void 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 */
|
||||
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 dd6d21f1dbfd..f46b06f8d643 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -13,7 +13,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5",
|
||||
@@ -22,7 +23,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5 (LTE)",
|
||||
@@ -31,7 +33,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 6",
|
||||
@@ -39,7 +42,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
@@ -47,7 +51,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 2",
|
||||
@@ -55,7 +60,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 1",
|
||||
@@ -63,7 +69,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 2",
|
||||
@@ -71,7 +78,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_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{}
|
||||
};
|
||||
@@ -89,6 +97,8 @@ 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_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 d6ff964aec5b..5d30ae39d65e 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "pcie.h"
|
||||
|
||||
#define QUIRK_FW_RST_D3COLD BIT(0)
|
||||
+#define QUIRK_DO_FLR_ON_BRIDGE BIT(1)
|
||||
|
||||
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 86149f1c99b17f67d717419af83f3ec76315e35b 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 9a9929424513..2273e3029776 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -377,6 +377,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",
|
||||
@@ -418,6 +419,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 f46b06f8d643..99b024ecbade 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -14,7 +14,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5",
|
||||
@@ -24,7 +25,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5 (LTE)",
|
||||
@@ -34,7 +36,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 6",
|
||||
@@ -43,7 +46,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
@@ -52,7 +56,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 2",
|
||||
@@ -61,7 +66,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 1",
|
||||
@@ -70,7 +76,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 2",
|
||||
@@ -79,7 +86,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_DO_FLR_ON_BRIDGE),
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{}
|
||||
};
|
||||
@@ -99,6 +107,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||
dev_info(&pdev->dev, "quirk reset_d3cold enabled\n");
|
||||
if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
|
||||
dev_info(&pdev->dev, "quirk do_flr_on_bridge 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 5d30ae39d65e..c14eb56eb911 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#define QUIRK_FW_RST_D3COLD BIT(0)
|
||||
#define QUIRK_DO_FLR_ON_BRIDGE 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.43.0
|
||||
|
||||
From 23775dc0be26e58d04574ab75768cedd8b0076f8 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 b8e9de887b5d..66a418ae9584 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -65,6 +65,7 @@ static struct usb_driver btusb_driver;
|
||||
#define BTUSB_INTEL_BROKEN_INITIAL_NCMD BIT(25)
|
||||
#define BTUSB_INTEL_NO_WBS_SUPPORT BIT(26)
|
||||
#define BTUSB_ACTIONS_SEMI BIT(27)
|
||||
+#define BTUSB_LOWER_LESCAN_INTERVAL BIT(28)
|
||||
|
||||
static const struct usb_device_id btusb_table[] = {
|
||||
/* Generic Bluetooth USB device */
|
||||
@@ -468,6 +469,7 @@ static const struct usb_device_id quirks_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 },
|
||||
@@ -4399,6 +4401,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.43.0
|
||||
|
121
patches/6.7/0003-ath10k.patch
Normal file
121
patches/6.7/0003-ath10k.patch
Normal file
|
@ -0,0 +1,121 @@
|
|||
From 825328cce718ba6de0fce529e8fd1f4cd6b94dde 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 6cdb225b7eac..19c036751fb1 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -38,6 +38,9 @@ static bool fw_diag_log;
|
||||
/* frame mode values are mapped as per enum ath10k_hw_txrx_mode */
|
||||
unsigned int ath10k_frame_mode = ATH10K_HW_TXRX_NATIVE_WIFI;
|
||||
|
||||
+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);
|
||||
|
||||
@@ -50,6 +53,9 @@ module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(frame_mode, ath10k_frame_mode, uint, 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");
|
||||
@@ -59,6 +65,9 @@ MODULE_PARM_DESC(frame_mode,
|
||||
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,
|
||||
@@ -911,6 +920,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)
|
||||
@@ -925,6 +970,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.43.0
|
||||
|
3230
patches/6.7/0004-ipts.patch
Normal file
3230
patches/6.7/0004-ipts.patch
Normal file
File diff suppressed because it is too large
Load diff
1820
patches/6.7/0005-ithc.patch
Normal file
1820
patches/6.7/0005-ithc.patch
Normal file
File diff suppressed because it is too large
Load diff
837
patches/6.7/0006-surface-sam.patch
Normal file
837
patches/6.7/0006-surface-sam.patch
Normal file
|
@ -0,0 +1,837 @@
|
|||
From fb7e9294f3970a450b891c2cc7b2195861d454e3 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 22 Oct 2023 14:57:11 +0200
|
||||
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
||||
Surface Laptop Go 3
|
||||
|
||||
Add SAM client device nodes for the Surface Laptop Go 3. It seems to use
|
||||
the same SAM client devices as the Surface Laptop Go 1 and 2, so re-use
|
||||
their node group.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam
|
||||
---
|
||||
drivers/platform/surface/surface_aggregator_registry.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
index aeb3feae40ff..2bc4977037fc 100644
|
||||
--- a/drivers/platform/surface/surface_aggregator_registry.c
|
||||
+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
@@ -367,6 +367,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
||||
/* Surface Laptop Go 2 */
|
||||
{ "MSHW0290", (unsigned long)ssam_node_group_slg1 },
|
||||
|
||||
+ /* Surface Laptop Go 3 */
|
||||
+ { "MSHW0440", (unsigned long)ssam_node_group_slg1 },
|
||||
+
|
||||
/* Surface Laptop Studio */
|
||||
{ "MSHW0123", (unsigned long)ssam_node_group_sls },
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 2de16abc5d0d2334e2935b1bdb3667a95d0009f2 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Mon, 20 Nov 2023 19:47:00 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
||||
Surface Laptop Studio 2
|
||||
|
||||
Add SAM client device nodes for the Surface Laptop Studio 2 (SLS2). The
|
||||
SLS2 is quite similar to the SLS1, but it does not provide the touchpad
|
||||
as a SAM-HID device. Therefore, add a new node group for the SLS2 and
|
||||
update the comments accordingly
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam
|
||||
---
|
||||
.../surface/surface_aggregator_registry.c | 25 ++++++++++++++++---
|
||||
1 file changed, 21 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
index 2bc4977037fc..26cb6229ad16 100644
|
||||
--- a/drivers/platform/surface/surface_aggregator_registry.c
|
||||
+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
@@ -247,8 +247,8 @@ static const struct software_node *ssam_node_group_sl5[] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
-/* Devices for Surface Laptop Studio. */
|
||||
-static const struct software_node *ssam_node_group_sls[] = {
|
||||
+/* Devices for Surface Laptop Studio 1. */
|
||||
+static const struct software_node *ssam_node_group_sls1[] = {
|
||||
&ssam_node_root,
|
||||
&ssam_node_bat_ac,
|
||||
&ssam_node_bat_main,
|
||||
@@ -263,6 +263,20 @@ static const struct software_node *ssam_node_group_sls[] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
+/* Devices for Surface Laptop Studio 2. */
|
||||
+static const struct software_node *ssam_node_group_sls2[] = {
|
||||
+ &ssam_node_root,
|
||||
+ &ssam_node_bat_ac,
|
||||
+ &ssam_node_bat_main,
|
||||
+ &ssam_node_tmp_pprof,
|
||||
+ &ssam_node_pos_tablet_switch,
|
||||
+ &ssam_node_hid_sam_keyboard,
|
||||
+ &ssam_node_hid_sam_penstash,
|
||||
+ &ssam_node_hid_sam_sensors,
|
||||
+ &ssam_node_hid_sam_ucm_ucsi,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
/* Devices for Surface Laptop Go. */
|
||||
static const struct software_node *ssam_node_group_slg1[] = {
|
||||
&ssam_node_root,
|
||||
@@ -370,8 +384,11 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
||||
/* Surface Laptop Go 3 */
|
||||
{ "MSHW0440", (unsigned long)ssam_node_group_slg1 },
|
||||
|
||||
- /* Surface Laptop Studio */
|
||||
- { "MSHW0123", (unsigned long)ssam_node_group_sls },
|
||||
+ /* Surface Laptop Studio 1 */
|
||||
+ { "MSHW0123", (unsigned long)ssam_node_group_sls1 },
|
||||
+
|
||||
+ /* Surface Laptop Studio 2 */
|
||||
+ { "MSHW0360", (unsigned long)ssam_node_group_sls2 },
|
||||
|
||||
{ },
|
||||
};
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From c06e370b5ed873b603aa0dc2faafe24a9e63b3e8 Mon Sep 17 00:00:00 2001
|
||||
From: Ivor Wanders <ivor@iwanders.net>
|
||||
Date: Mon, 18 Dec 2023 19:21:32 -0500
|
||||
Subject: [PATCH] platform/surface: aggregator_registry: add entry for fan
|
||||
speed
|
||||
|
||||
Add an entry for the fan speed function.
|
||||
Add this new entry to the Surface Pro 9 group.
|
||||
|
||||
Signed-off-by: Ivor Wanders <ivor@iwanders.net>
|
||||
Link: https://github.com/linux-surface/kernel/pull/144
|
||||
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam
|
||||
---
|
||||
drivers/platform/surface/surface_aggregator_registry.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
index 26cb6229ad16..f02a933160ff 100644
|
||||
--- a/drivers/platform/surface/surface_aggregator_registry.c
|
||||
+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
@@ -74,6 +74,12 @@ static const struct software_node ssam_node_tmp_pprof = {
|
||||
.parent = &ssam_node_root,
|
||||
};
|
||||
|
||||
+/* Fan speed function. */
|
||||
+static const struct software_node ssam_node_fan_speed = {
|
||||
+ .name = "ssam:01:05:01:01:01",
|
||||
+ .parent = &ssam_node_root,
|
||||
+};
|
||||
+
|
||||
/* Tablet-mode switch via KIP subsystem. */
|
||||
static const struct software_node ssam_node_kip_tablet_switch = {
|
||||
.name = "ssam:01:0e:01:00:01",
|
||||
@@ -319,6 +325,7 @@ static const struct software_node *ssam_node_group_sp9[] = {
|
||||
&ssam_node_bat_ac,
|
||||
&ssam_node_bat_main,
|
||||
&ssam_node_tmp_pprof,
|
||||
+ &ssam_node_fan_speed,
|
||||
&ssam_node_pos_tablet_switch,
|
||||
&ssam_node_hid_kip_keyboard,
|
||||
&ssam_node_hid_kip_penstash,
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 63dcbbcad69219e1487db46a5c26c1ebdd9ef6be Mon Sep 17 00:00:00 2001
|
||||
From: Ivor Wanders <ivor@iwanders.net>
|
||||
Date: Thu, 30 Nov 2023 20:20:24 -0500
|
||||
Subject: [PATCH] hwmon: add fan speed monitoring driver for Surface devices
|
||||
|
||||
Adds a driver that provides read only access to the fan speed for Microsoft
|
||||
Surface Pro devices. The fan speed is always regulated by the EC and cannot
|
||||
be influenced directly.
|
||||
|
||||
Signed-off-by: Ivor Wanders <ivor@iwanders.net>
|
||||
Link: https://github.com/linux-surface/kernel/pull/144
|
||||
Patchset: surface-sam
|
||||
---
|
||||
Documentation/hwmon/index.rst | 1 +
|
||||
Documentation/hwmon/surface_fan.rst | 25 ++++++++
|
||||
MAINTAINERS | 8 +++
|
||||
drivers/hwmon/Kconfig | 13 ++++
|
||||
drivers/hwmon/Makefile | 1 +
|
||||
drivers/hwmon/surface_fan.c | 93 +++++++++++++++++++++++++++++
|
||||
6 files changed, 141 insertions(+)
|
||||
create mode 100644 Documentation/hwmon/surface_fan.rst
|
||||
create mode 100644 drivers/hwmon/surface_fan.c
|
||||
|
||||
diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst
|
||||
index 72f4e6065bae..7c254562abd6 100644
|
||||
--- a/Documentation/hwmon/index.rst
|
||||
+++ b/Documentation/hwmon/index.rst
|
||||
@@ -204,6 +204,7 @@ Hardware Monitoring Kernel Drivers
|
||||
smsc47m1
|
||||
sparx5-temp
|
||||
stpddc60
|
||||
+ surface_fan
|
||||
sy7636a-hwmon
|
||||
tc654
|
||||
tc74
|
||||
diff --git a/Documentation/hwmon/surface_fan.rst b/Documentation/hwmon/surface_fan.rst
|
||||
new file mode 100644
|
||||
index 000000000000..07942574c4f0
|
||||
--- /dev/null
|
||||
+++ b/Documentation/hwmon/surface_fan.rst
|
||||
@@ -0,0 +1,25 @@
|
||||
+.. SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+
|
||||
+Kernel driver surface_fan
|
||||
+=========================
|
||||
+
|
||||
+Supported Devices:
|
||||
+
|
||||
+ * Microsoft Surface Pro 9
|
||||
+
|
||||
+Author: Ivor Wanders <ivor@iwanders.net>
|
||||
+
|
||||
+Description
|
||||
+-----------
|
||||
+
|
||||
+This provides monitoring of the fan found in some Microsoft Surface Pro devices,
|
||||
+like the Surface Pro 9. The fan is always controlled by the onboard controller.
|
||||
+
|
||||
+Sysfs interface
|
||||
+---------------
|
||||
+
|
||||
+======================= ======= =========================================
|
||||
+Name Perm Description
|
||||
+======================= ======= =========================================
|
||||
+``fan1_input`` RO Current fan speed in RPM.
|
||||
+======================= ======= =========================================
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index a7c4cf8201e0..77eb076e77da 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -14331,6 +14331,14 @@ F: Documentation/driver-api/surface_aggregator/clients/dtx.rst
|
||||
F: drivers/platform/surface/surface_dtx.c
|
||||
F: include/uapi/linux/surface_aggregator/dtx.h
|
||||
|
||||
+MICROSOFT SURFACE SENSOR FAN DRIVER
|
||||
+M: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+M: Ivor Wanders <ivor@iwanders.net>
|
||||
+L: linux-hwmon@vger.kernel.org
|
||||
+S: Maintained
|
||||
+F: Documentation/hwmon/surface_fan.rst
|
||||
+F: drivers/hwmon/surface_fan.c
|
||||
+
|
||||
MICROSOFT SURFACE GPE LID SUPPORT DRIVER
|
||||
M: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
L: platform-driver-x86@vger.kernel.org
|
||||
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
||||
index cf27523eed5a..1cef428c79ea 100644
|
||||
--- a/drivers/hwmon/Kconfig
|
||||
+++ b/drivers/hwmon/Kconfig
|
||||
@@ -1983,6 +1983,19 @@ config SENSORS_SFCTEMP
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called sfctemp.
|
||||
|
||||
+config SENSORS_SURFACE_FAN
|
||||
+ tristate "Surface Fan Driver"
|
||||
+ depends on SURFACE_AGGREGATOR
|
||||
+ help
|
||||
+ Driver that provides monitoring of the fan on Surface Pro devices that
|
||||
+ have a fan, like the Surface Pro 9.
|
||||
+
|
||||
+ This makes the fan's current speed accessible through the hwmon
|
||||
+ system. It does not provide control over the fan, the firmware is
|
||||
+ responsible for that, this driver merely provides monitoring.
|
||||
+
|
||||
+ Select M or Y here, if you want to be able to read the fan's speed.
|
||||
+
|
||||
config SENSORS_ADC128D818
|
||||
tristate "Texas Instruments ADC128D818"
|
||||
depends on I2C
|
||||
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
|
||||
index e84bd9685b5c..30a284fc5ab6 100644
|
||||
--- a/drivers/hwmon/Makefile
|
||||
+++ b/drivers/hwmon/Makefile
|
||||
@@ -200,6 +200,7 @@ obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
|
||||
obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
|
||||
obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o
|
||||
obj-$(CONFIG_SENSORS_STTS751) += stts751.o
|
||||
+obj-$(CONFIG_SENSORS_SURFACE_FAN)+= surface_fan.o
|
||||
obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o
|
||||
obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o
|
||||
obj-$(CONFIG_SENSORS_TC74) += tc74.o
|
||||
diff --git a/drivers/hwmon/surface_fan.c b/drivers/hwmon/surface_fan.c
|
||||
new file mode 100644
|
||||
index 000000000000..7c2e3ae3eb40
|
||||
--- /dev/null
|
||||
+++ b/drivers/hwmon/surface_fan.c
|
||||
@@ -0,0 +1,93 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Surface Fan driver for Surface System Aggregator Module. It provides access
|
||||
+ * to the fan's rpm through the hwmon system.
|
||||
+ *
|
||||
+ * Copyright (C) 2023 Ivor Wanders <ivor@iwanders.net>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/hwmon.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/surface_aggregator/device.h>
|
||||
+#include <linux/types.h>
|
||||
+
|
||||
+// SSAM
|
||||
+SSAM_DEFINE_SYNC_REQUEST_CL_R(__ssam_fan_rpm_get, __le16, {
|
||||
+ .target_category = SSAM_SSH_TC_FAN,
|
||||
+ .command_id = 0x01,
|
||||
+});
|
||||
+
|
||||
+// hwmon
|
||||
+umode_t surface_fan_hwmon_is_visible(const void *drvdata,
|
||||
+ enum hwmon_sensor_types type, u32 attr,
|
||||
+ int channel)
|
||||
+{
|
||||
+ return 0444;
|
||||
+}
|
||||
+
|
||||
+static int surface_fan_hwmon_read(struct device *dev,
|
||||
+ enum hwmon_sensor_types type, u32 attr,
|
||||
+ int channel, long *val)
|
||||
+{
|
||||
+ struct ssam_device *sdev = dev_get_drvdata(dev);
|
||||
+ int ret;
|
||||
+ __le16 value;
|
||||
+
|
||||
+ ret = __ssam_fan_rpm_get(sdev, &value);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ *val = le16_to_cpu(value);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static const struct hwmon_channel_info *const surface_fan_info[] = {
|
||||
+ HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT),
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
+static const struct hwmon_ops surface_fan_hwmon_ops = {
|
||||
+ .is_visible = surface_fan_hwmon_is_visible,
|
||||
+ .read = surface_fan_hwmon_read,
|
||||
+};
|
||||
+
|
||||
+static const struct hwmon_chip_info surface_fan_chip_info = {
|
||||
+ .ops = &surface_fan_hwmon_ops,
|
||||
+ .info = surface_fan_info,
|
||||
+};
|
||||
+
|
||||
+static int surface_fan_probe(struct ssam_device *sdev)
|
||||
+{
|
||||
+ struct device *hdev;
|
||||
+
|
||||
+ hdev = devm_hwmon_device_register_with_info(&sdev->dev,
|
||||
+ "surface_fan", sdev,
|
||||
+ &surface_fan_chip_info,
|
||||
+ NULL);
|
||||
+ if (IS_ERR(hdev))
|
||||
+ return PTR_ERR(hdev);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct ssam_device_id ssam_fan_match[] = {
|
||||
+ { SSAM_SDEV(FAN, SAM, 0x01, 0x01) },
|
||||
+ {},
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(ssam, ssam_fan_match);
|
||||
+
|
||||
+static struct ssam_device_driver surface_fan = {
|
||||
+ .probe = surface_fan_probe,
|
||||
+ .match_table = ssam_fan_match,
|
||||
+ .driver = {
|
||||
+ .name = "surface_fan",
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_ssam_device_driver(surface_fan);
|
||||
+
|
||||
+MODULE_AUTHOR("Ivor Wanders <ivor@iwanders.net>");
|
||||
+MODULE_DESCRIPTION("Fan Driver for Surface System Aggregator Module");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 5f549c253e4df330fa8f311fe151df80e199bec4 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 30 Dec 2023 18:07:54 +0100
|
||||
Subject: [PATCH] hwmon: Add thermal sensor driver for Surface Aggregator
|
||||
Module
|
||||
|
||||
Some of the newer Microsoft Surface devices (such as the Surface Book
|
||||
3 and Pro 9) have thermal sensors connected via the Surface Aggregator
|
||||
Module (the embedded controller on those devices). Add a basic driver
|
||||
to read out the temperature values of those sensors.
|
||||
|
||||
Link: https://github.com/linux-surface/surface-aggregator-module/issues/59
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam
|
||||
---
|
||||
drivers/hwmon/Kconfig | 10 +++
|
||||
drivers/hwmon/Makefile | 1 +
|
||||
drivers/hwmon/surface_temp.c | 165 +++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 176 insertions(+)
|
||||
create mode 100644 drivers/hwmon/surface_temp.c
|
||||
|
||||
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
||||
index 1cef428c79ea..ca20716911ad 100644
|
||||
--- a/drivers/hwmon/Kconfig
|
||||
+++ b/drivers/hwmon/Kconfig
|
||||
@@ -1996,6 +1996,16 @@ config SENSORS_SURFACE_FAN
|
||||
|
||||
Select M or Y here, if you want to be able to read the fan's speed.
|
||||
|
||||
+config SENSORS_SURFACE_TEMP
|
||||
+ tristate "Microsoft Surface Thermal Sensor Driver"
|
||||
+ depends on SURFACE_AGGREGATOR
|
||||
+ help
|
||||
+ Driver for monitoring thermal sensors connected via the Surface
|
||||
+ Aggregator Module (embedded controller) on Microsoft Surface devices.
|
||||
+
|
||||
+ This driver can also be built as a module. If so, the module
|
||||
+ will be called surface_temp.
|
||||
+
|
||||
config SENSORS_ADC128D818
|
||||
tristate "Texas Instruments ADC128D818"
|
||||
depends on I2C
|
||||
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
|
||||
index 30a284fc5ab6..a6bcde6b4843 100644
|
||||
--- a/drivers/hwmon/Makefile
|
||||
+++ b/drivers/hwmon/Makefile
|
||||
@@ -201,6 +201,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
|
||||
obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o
|
||||
obj-$(CONFIG_SENSORS_STTS751) += stts751.o
|
||||
obj-$(CONFIG_SENSORS_SURFACE_FAN)+= surface_fan.o
|
||||
+obj-$(CONFIG_SENSORS_SURFACE_TEMP)+= surface_temp.o
|
||||
obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o
|
||||
obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o
|
||||
obj-$(CONFIG_SENSORS_TC74) += tc74.o
|
||||
diff --git a/drivers/hwmon/surface_temp.c b/drivers/hwmon/surface_temp.c
|
||||
new file mode 100644
|
||||
index 000000000000..48c3e826713f
|
||||
--- /dev/null
|
||||
+++ b/drivers/hwmon/surface_temp.c
|
||||
@@ -0,0 +1,165 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Thermal sensor subsystem driver for Surface System Aggregator Module (SSAM).
|
||||
+ *
|
||||
+ * Copyright (C) 2022-2023 Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/bitops.h>
|
||||
+#include <linux/hwmon.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/types.h>
|
||||
+
|
||||
+#include <linux/surface_aggregator/controller.h>
|
||||
+#include <linux/surface_aggregator/device.h>
|
||||
+
|
||||
+
|
||||
+/* -- SAM interface. -------------------------------------------------------- */
|
||||
+
|
||||
+SSAM_DEFINE_SYNC_REQUEST_CL_R(__ssam_tmp_get_available_sensors, __le16, {
|
||||
+ .target_category = SSAM_SSH_TC_TMP,
|
||||
+ .command_id = 0x04,
|
||||
+});
|
||||
+
|
||||
+SSAM_DEFINE_SYNC_REQUEST_MD_R(__ssam_tmp_get_temperature, __le16, {
|
||||
+ .target_category = SSAM_SSH_TC_TMP,
|
||||
+ .command_id = 0x01,
|
||||
+});
|
||||
+
|
||||
+static int ssam_tmp_get_available_sensors(struct ssam_device *sdev, s16 *sensors)
|
||||
+{
|
||||
+ __le16 sensors_le;
|
||||
+ int status;
|
||||
+
|
||||
+ status = __ssam_tmp_get_available_sensors(sdev, &sensors_le);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ *sensors = le16_to_cpu(sensors_le);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int ssam_tmp_get_temperature(struct ssam_device *sdev, u8 iid, long *temperature)
|
||||
+{
|
||||
+ __le16 temp_le;
|
||||
+ int status;
|
||||
+
|
||||
+ status = __ssam_tmp_get_temperature(sdev->ctrl, sdev->uid.target, iid, &temp_le);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ /* Convert 1/10 °K to 1/1000 °C */
|
||||
+ *temperature = (le16_to_cpu(temp_le) - 2731) * 100L;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/* -- Driver.---------------------------------------------------------------- */
|
||||
+
|
||||
+struct ssam_temp {
|
||||
+ struct ssam_device *sdev;
|
||||
+ s16 sensors;
|
||||
+};
|
||||
+
|
||||
+static umode_t ssam_temp_hwmon_is_visible(const void *data,
|
||||
+ enum hwmon_sensor_types type,
|
||||
+ u32 attr, int channel)
|
||||
+{
|
||||
+ const struct ssam_temp *ssam_temp = data;
|
||||
+
|
||||
+ if (!(ssam_temp->sensors & BIT(channel)))
|
||||
+ return 0;
|
||||
+
|
||||
+ return 0444;
|
||||
+}
|
||||
+
|
||||
+static int ssam_temp_hwmon_read(struct device *dev,
|
||||
+ enum hwmon_sensor_types type,
|
||||
+ u32 attr, int channel, long *value)
|
||||
+{
|
||||
+ const struct ssam_temp *ssam_temp = dev_get_drvdata(dev);
|
||||
+
|
||||
+ return ssam_tmp_get_temperature(ssam_temp->sdev, channel + 1, value);
|
||||
+}
|
||||
+
|
||||
+static const struct hwmon_channel_info * const ssam_temp_hwmon_info[] = {
|
||||
+ HWMON_CHANNEL_INFO(chip,
|
||||
+ HWMON_C_REGISTER_TZ),
|
||||
+ /* We have at most 16 thermal sensor channels. */
|
||||
+ HWMON_CHANNEL_INFO(temp,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT,
|
||||
+ HWMON_T_INPUT),
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
+static const struct hwmon_ops ssam_temp_hwmon_ops = {
|
||||
+ .is_visible = ssam_temp_hwmon_is_visible,
|
||||
+ .read = ssam_temp_hwmon_read,
|
||||
+};
|
||||
+
|
||||
+static const struct hwmon_chip_info ssam_temp_hwmon_chip_info = {
|
||||
+ .ops = &ssam_temp_hwmon_ops,
|
||||
+ .info = ssam_temp_hwmon_info,
|
||||
+};
|
||||
+
|
||||
+static int ssam_temp_probe(struct ssam_device *sdev)
|
||||
+{
|
||||
+ struct ssam_temp *ssam_temp;
|
||||
+ struct device *hwmon_dev;
|
||||
+ s16 sensors;
|
||||
+ int status;
|
||||
+
|
||||
+ status = ssam_tmp_get_available_sensors(sdev, &sensors);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ ssam_temp = devm_kzalloc(&sdev->dev, sizeof(*ssam_temp), GFP_KERNEL);
|
||||
+ if (!ssam_temp)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ ssam_temp->sdev = sdev;
|
||||
+ ssam_temp->sensors = sensors;
|
||||
+
|
||||
+ hwmon_dev = devm_hwmon_device_register_with_info(&sdev->dev,
|
||||
+ "surface_thermal", ssam_temp, &ssam_temp_hwmon_chip_info,
|
||||
+ NULL);
|
||||
+ if (IS_ERR(hwmon_dev))
|
||||
+ return PTR_ERR(hwmon_dev);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct ssam_device_id ssam_temp_match[] = {
|
||||
+ { SSAM_SDEV(TMP, SAM, 0x00, 0x02) },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(ssam, ssam_temp_match);
|
||||
+
|
||||
+static struct ssam_device_driver ssam_temp = {
|
||||
+ .probe = ssam_temp_probe,
|
||||
+ .match_table = ssam_temp_match,
|
||||
+ .driver = {
|
||||
+ .name = "surface_temp",
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_ssam_device_driver(ssam_temp);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Thermal sensor subsystem driver for Surface System Aggregator Module");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 3ccfa3b6be4794f247488f7e665ba91793ec09c7 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 30 Dec 2023 18:12:23 +0100
|
||||
Subject: [PATCH] hwmon: surface_temp: Add support for sensor names
|
||||
|
||||
The thermal subsystem of the Surface Aggregator Module allows us to
|
||||
query the names of the respective thermal sensors. Forward those to
|
||||
userspace.
|
||||
|
||||
Signed-off-by: Ivor Wanders <ivor@iwanders.net>
|
||||
Co-Developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam
|
||||
---
|
||||
drivers/hwmon/surface_temp.c | 113 +++++++++++++++++++++++++++++------
|
||||
1 file changed, 96 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/drivers/hwmon/surface_temp.c b/drivers/hwmon/surface_temp.c
|
||||
index 48c3e826713f..4c08926139db 100644
|
||||
--- a/drivers/hwmon/surface_temp.c
|
||||
+++ b/drivers/hwmon/surface_temp.c
|
||||
@@ -17,6 +17,27 @@
|
||||
|
||||
/* -- SAM interface. -------------------------------------------------------- */
|
||||
|
||||
+/*
|
||||
+ * Available sensors are indicated by a 16-bit bitfield, where a 1 marks the
|
||||
+ * presence of a sensor. So we have at most 16 possible sensors/channels.
|
||||
+ */
|
||||
+#define SSAM_TMP_SENSOR_MAX_COUNT 16
|
||||
+
|
||||
+/*
|
||||
+ * All names observed so far are 6 characters long, but there's only
|
||||
+ * zeros after the name, so perhaps they can be longer. This number reflects
|
||||
+ * the maximum zero-padded space observed in the returned buffer.
|
||||
+ */
|
||||
+#define SSAM_TMP_SENSOR_NAME_LENGTH 18
|
||||
+
|
||||
+struct ssam_tmp_get_name_rsp {
|
||||
+ __le16 unknown1;
|
||||
+ char unknown2;
|
||||
+ char name[SSAM_TMP_SENSOR_NAME_LENGTH];
|
||||
+} __packed;
|
||||
+
|
||||
+static_assert(sizeof(struct ssam_tmp_get_name_rsp) == 21);
|
||||
+
|
||||
SSAM_DEFINE_SYNC_REQUEST_CL_R(__ssam_tmp_get_available_sensors, __le16, {
|
||||
.target_category = SSAM_SSH_TC_TMP,
|
||||
.command_id = 0x04,
|
||||
@@ -27,6 +48,11 @@ SSAM_DEFINE_SYNC_REQUEST_MD_R(__ssam_tmp_get_temperature, __le16, {
|
||||
.command_id = 0x01,
|
||||
});
|
||||
|
||||
+SSAM_DEFINE_SYNC_REQUEST_MD_R(__ssam_tmp_get_name, struct ssam_tmp_get_name_rsp, {
|
||||
+ .target_category = SSAM_SSH_TC_TMP,
|
||||
+ .command_id = 0x0e,
|
||||
+});
|
||||
+
|
||||
static int ssam_tmp_get_available_sensors(struct ssam_device *sdev, s16 *sensors)
|
||||
{
|
||||
__le16 sensors_le;
|
||||
@@ -54,12 +80,37 @@ static int ssam_tmp_get_temperature(struct ssam_device *sdev, u8 iid, long *temp
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int ssam_tmp_get_name(struct ssam_device *sdev, u8 iid, char *buf, size_t buf_len)
|
||||
+{
|
||||
+ struct ssam_tmp_get_name_rsp name_rsp;
|
||||
+ int status;
|
||||
+
|
||||
+ status = __ssam_tmp_get_name(sdev->ctrl, sdev->uid.target, iid, &name_rsp);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ /*
|
||||
+ * This should not fail unless the name in the returned struct is not
|
||||
+ * null-terminated or someone changed something in the struct
|
||||
+ * definitions above, since our buffer and struct have the same
|
||||
+ * capacity by design. So if this fails blow this up with a warning.
|
||||
+ * Since the more likely cause is that the returned string isn't
|
||||
+ * null-terminated, we might have received garbage (as opposed to just
|
||||
+ * an incomplete string), so also fail the function.
|
||||
+ */
|
||||
+ status = strscpy(buf, name_rsp.name, buf_len);
|
||||
+ WARN_ON(status < 0);
|
||||
+
|
||||
+ return status < 0 ? status : 0;
|
||||
+}
|
||||
+
|
||||
|
||||
/* -- Driver.---------------------------------------------------------------- */
|
||||
|
||||
struct ssam_temp {
|
||||
struct ssam_device *sdev;
|
||||
s16 sensors;
|
||||
+ char names[SSAM_TMP_SENSOR_MAX_COUNT][SSAM_TMP_SENSOR_NAME_LENGTH];
|
||||
};
|
||||
|
||||
static umode_t ssam_temp_hwmon_is_visible(const void *data,
|
||||
@@ -83,33 +134,47 @@ static int ssam_temp_hwmon_read(struct device *dev,
|
||||
return ssam_tmp_get_temperature(ssam_temp->sdev, channel + 1, value);
|
||||
}
|
||||
|
||||
+static int ssam_temp_hwmon_read_string(struct device *dev,
|
||||
+ enum hwmon_sensor_types type,
|
||||
+ u32 attr, int channel, const char **str)
|
||||
+{
|
||||
+ const struct ssam_temp *ssam_temp = dev_get_drvdata(dev);
|
||||
+
|
||||
+ *str = ssam_temp->names[channel];
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static const struct hwmon_channel_info * const ssam_temp_hwmon_info[] = {
|
||||
HWMON_CHANNEL_INFO(chip,
|
||||
HWMON_C_REGISTER_TZ),
|
||||
- /* We have at most 16 thermal sensor channels. */
|
||||
+ /*
|
||||
+ * We have at most SSAM_TMP_SENSOR_MAX_COUNT = 16 thermal sensor
|
||||
+ * channels.
|
||||
+ */
|
||||
HWMON_CHANNEL_INFO(temp,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT,
|
||||
- HWMON_T_INPUT),
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL,
|
||||
+ HWMON_T_INPUT | HWMON_T_LABEL),
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct hwmon_ops ssam_temp_hwmon_ops = {
|
||||
.is_visible = ssam_temp_hwmon_is_visible,
|
||||
.read = ssam_temp_hwmon_read,
|
||||
+ .read_string = ssam_temp_hwmon_read_string,
|
||||
};
|
||||
|
||||
static const struct hwmon_chip_info ssam_temp_hwmon_chip_info = {
|
||||
@@ -122,6 +187,7 @@ static int ssam_temp_probe(struct ssam_device *sdev)
|
||||
struct ssam_temp *ssam_temp;
|
||||
struct device *hwmon_dev;
|
||||
s16 sensors;
|
||||
+ int channel;
|
||||
int status;
|
||||
|
||||
status = ssam_tmp_get_available_sensors(sdev, &sensors);
|
||||
@@ -135,6 +201,19 @@ static int ssam_temp_probe(struct ssam_device *sdev)
|
||||
ssam_temp->sdev = sdev;
|
||||
ssam_temp->sensors = sensors;
|
||||
|
||||
+ /* Retrieve the name for each available sensor. */
|
||||
+ for (channel = 0; channel < SSAM_TMP_SENSOR_MAX_COUNT; channel++)
|
||||
+ {
|
||||
+ if (!(sensors & BIT(channel)))
|
||||
+ continue;
|
||||
+
|
||||
+ status = ssam_tmp_get_name(sdev, channel + 1,
|
||||
+ ssam_temp->names[channel],
|
||||
+ SSAM_TMP_SENSOR_NAME_LENGTH);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
hwmon_dev = devm_hwmon_device_register_with_info(&sdev->dev,
|
||||
"surface_thermal", ssam_temp, &ssam_temp_hwmon_chip_info,
|
||||
NULL);
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 8ccf7b86ad270655bd1e8cd0ab8d2ff475ad0ea7 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 30 Dec 2023 18:21:12 +0100
|
||||
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
||||
thermal sensors on the Surface Pro 9
|
||||
|
||||
The Surface Pro 9 has thermal sensors connected via the Surface
|
||||
Aggregator Module. Add a device node to support those.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam
|
||||
---
|
||||
drivers/platform/surface/surface_aggregator_registry.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
index f02a933160ff..67686042e009 100644
|
||||
--- a/drivers/platform/surface/surface_aggregator_registry.c
|
||||
+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
||||
@@ -74,6 +74,12 @@ static const struct software_node ssam_node_tmp_pprof = {
|
||||
.parent = &ssam_node_root,
|
||||
};
|
||||
|
||||
+/* Thermal sensors. */
|
||||
+static const struct software_node ssam_node_tmp_sensors = {
|
||||
+ .name = "ssam:01:03:01:00:02",
|
||||
+ .parent = &ssam_node_root,
|
||||
+};
|
||||
+
|
||||
/* Fan speed function. */
|
||||
static const struct software_node ssam_node_fan_speed = {
|
||||
.name = "ssam:01:05:01:01:01",
|
||||
@@ -325,6 +331,7 @@ static const struct software_node *ssam_node_group_sp9[] = {
|
||||
&ssam_node_bat_ac,
|
||||
&ssam_node_bat_main,
|
||||
&ssam_node_tmp_pprof,
|
||||
+ &ssam_node_tmp_sensors,
|
||||
&ssam_node_fan_speed,
|
||||
&ssam_node_pos_tablet_switch,
|
||||
&ssam_node_hid_kip_keyboard,
|
||||
--
|
||||
2.43.0
|
||||
|
335
patches/6.7/0007-surface-sam-over-hid.patch
Normal file
335
patches/6.7/0007-surface-sam-over-hid.patch
Normal file
|
@ -0,0 +1,335 @@
|
|||
From 38a76c85dee37facde40f245d994c4209ccddd15 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 d6037a328669..a290ebc77aea 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -628,6 +628,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,
|
||||
@@ -729,6 +751,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.43.0
|
||||
|
||||
From f4ad3e5c368c11503d8b7af6a703f3972ebd5e98 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 b629e82af97c..68656e8f309e 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -149,6 +149,13 @@ config SURFACE_AGGREGATOR_TABLET_SWITCH
|
||||
Select M or Y here, if you want to provide tablet-mode switch input
|
||||
events on the Surface Pro 8, Surface Pro X, and Surface Laptop Studio.
|
||||
|
||||
+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 53344330939b..7efcd0cdb532 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_HUB) += surface_aggregator_hub.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_REGISTRY) += surface_aggregator_registry.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH) += surface_aggregator_tabletsw.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.43.0
|
||||
|
149
patches/6.7/0008-surface-button.patch
Normal file
149
patches/6.7/0008-surface-button.patch
Normal file
|
@ -0,0 +1,149 @@
|
|||
From 96cb53fd556f88f97d61b237c6015cec946865d5 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 f6d060377d18..b8603f74eb28 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -540,8 +540,8 @@ static const struct soc_device_data soc_device_MSHW0028 = {
|
||||
* 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
|
||||
@@ -552,31 +552,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.43.0
|
||||
|
||||
From 7909f30b15796e8df43a6d4ea32cbbd40627c410 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 2755601f979c..4240c98ca226 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.43.0
|
||||
|
573
patches/6.7/0009-surface-typecover.patch
Normal file
573
patches/6.7/0009-surface-typecover.patch
Normal file
|
@ -0,0 +1,573 @@
|
|||
From 28ea3660b6680bfd528ca05c543e69b8a2ad412c Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 18 Feb 2023 01:02:49 +0100
|
||||
Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3
|
||||
Type-Cover
|
||||
|
||||
The touchpad on the Type-Cover of the Surface Go 3 is sometimes not
|
||||
being initialized properly. Apply USB_QUIRK_DELAY_INIT to fix this
|
||||
issue.
|
||||
|
||||
More specifically, the device in question is a fairly standard modern
|
||||
touchpad with pointer and touchpad input modes. During setup, the device
|
||||
needs to be switched from pointer- to touchpad-mode (which is done in
|
||||
hid-multitouch) to fully utilize it as intended. Unfortunately, however,
|
||||
this seems to occasionally fail silently, leaving the device in
|
||||
pointer-mode. Applying USB_QUIRK_DELAY_INIT seems to fix this.
|
||||
|
||||
Link: https://github.com/linux-surface/linux-surface/issues/1059
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-typecover
|
||||
---
|
||||
drivers/usb/core/quirks.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
||||
index 15e9bd180a1d..0d70461d01e1 100644
|
||||
--- a/drivers/usb/core/quirks.c
|
||||
+++ b/drivers/usb/core/quirks.c
|
||||
@@ -220,6 +220,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
||||
/* Microsoft Surface Dock Ethernet (RTL8153 GigE) */
|
||||
{ USB_DEVICE(0x045e, 0x07c6), .driver_info = USB_QUIRK_NO_LPM },
|
||||
|
||||
+ /* Microsoft Surface Go 3 Type-Cover */
|
||||
+ { USB_DEVICE(0x045e, 0x09b5), .driver_info = USB_QUIRK_DELAY_INIT },
|
||||
+
|
||||
/* Cherry Stream G230 2.0 (G85-231) and 3.0 (G85-232) */
|
||||
{ USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 039ed906cfe0578e78c40d786433e9b144c56785 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 fd5b0637dad6..0f49d8fa6333 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)
|
||||
@@ -72,12 +76,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||
#define MT_QUIRK_ORIENTATION_INVERT BIT(22)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(23)
|
||||
|
||||
#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,
|
||||
@@ -169,6 +176,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,
|
||||
@@ -213,6 +222,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
|
||||
@@ -397,6 +407,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
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1721,6 +1741,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit_unlock(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;
|
||||
@@ -1744,6 +1827,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);
|
||||
|
||||
@@ -1782,15 +1868,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)
|
||||
@@ -1840,6 +1930,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);
|
||||
@@ -2226,6 +2317,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.43.0
|
||||
|
||||
From 97419c9be08b7b3e4311aa989fa8f91d0549a469 Mon Sep 17 00:00:00 2001
|
||||
From: PJungkamp <p.jungkamp@gmail.com>
|
||||
Date: Fri, 25 Feb 2022 12:04:25 +0100
|
||||
Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet
|
||||
switch
|
||||
|
||||
The Surface Pro Type Cover has several non standard HID usages in it's
|
||||
hid report descriptor.
|
||||
I noticed that, upon folding the typecover back, a vendor specific range
|
||||
of 4 32 bit integer hid usages is transmitted.
|
||||
Only the first byte of the message seems to convey reliable information
|
||||
about the keyboard state.
|
||||
|
||||
0x22 => Normal (keys enabled)
|
||||
0x33 => Folded back (keys disabled)
|
||||
0x53 => Rotated left/right side up (keys disabled)
|
||||
0x13 => Cover closed (keys disabled)
|
||||
0x43 => Folded back and Tablet upside down (keys disabled)
|
||||
This list may not be exhaustive.
|
||||
|
||||
The tablet mode switch will be disabled for a value of 0x22 and enabled
|
||||
on any other value.
|
||||
|
||||
Patchset: surface-typecover
|
||||
---
|
||||
drivers/hid/hid-multitouch.c | 148 +++++++++++++++++++++++++++++------
|
||||
1 file changed, 122 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
||||
index 0f49d8fa6333..1fad1199775b 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -77,6 +77,7 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||
#define MT_QUIRK_ORIENTATION_INVERT BIT(22)
|
||||
#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(23)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH BIT(24)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
@@ -84,6 +85,8 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+#define MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE 0xff050072
|
||||
+#define MS_TYPE_COVER_APPLICATION 0xff050050
|
||||
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
@@ -409,6 +412,7 @@ static const struct mt_class mt_classes[] = {
|
||||
},
|
||||
{ .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
.quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||
+ MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH |
|
||||
MT_QUIRK_ALWAYS_VALID |
|
||||
MT_QUIRK_IGNORE_DUPLICATES |
|
||||
MT_QUIRK_HOVERING |
|
||||
@@ -1390,6 +1394,9 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
||||
field->application != HID_CP_CONSUMER_CONTROL &&
|
||||
field->application != HID_GD_WIRELESS_RADIO_CTLS &&
|
||||
field->application != HID_GD_SYSTEM_MULTIAXIS &&
|
||||
+ !(field->application == MS_TYPE_COVER_APPLICATION &&
|
||||
+ application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
||||
+ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) &&
|
||||
!(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
|
||||
application->quirks & MT_QUIRK_ASUS_CUSTOM_UP))
|
||||
return -1;
|
||||
@@ -1417,6 +1424,21 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
||||
return 1;
|
||||
}
|
||||
|
||||
+ /*
|
||||
+ * The Microsoft Surface Pro Typecover has a non-standard HID
|
||||
+ * tablet mode switch on a vendor specific usage page with vendor
|
||||
+ * specific usage.
|
||||
+ */
|
||||
+ if (field->application == MS_TYPE_COVER_APPLICATION &&
|
||||
+ application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
||||
+ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) {
|
||||
+ usage->type = EV_SW;
|
||||
+ usage->code = SW_TABLET_MODE;
|
||||
+ *max = SW_MAX;
|
||||
+ *bit = hi->input->swbit;
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
if (rdata->is_mt_collection)
|
||||
return mt_touch_input_mapping(hdev, hi, field, usage, bit, max,
|
||||
application);
|
||||
@@ -1438,6 +1460,7 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
|
||||
{
|
||||
struct mt_device *td = hid_get_drvdata(hdev);
|
||||
struct mt_report_data *rdata;
|
||||
+ struct input_dev *input;
|
||||
|
||||
rdata = mt_find_report_data(td, field->report);
|
||||
if (rdata && rdata->is_mt_collection) {
|
||||
@@ -1445,6 +1468,19 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
|
||||
return -1;
|
||||
}
|
||||
|
||||
+ /*
|
||||
+ * We own an input device which acts as a tablet mode switch for
|
||||
+ * the Surface Pro Typecover.
|
||||
+ */
|
||||
+ if (field->application == MS_TYPE_COVER_APPLICATION &&
|
||||
+ rdata->application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
||||
+ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) {
|
||||
+ input = hi->input;
|
||||
+ input_set_capability(input, EV_SW, SW_TABLET_MODE);
|
||||
+ input_report_switch(input, SW_TABLET_MODE, 0);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
/* let hid-core decide for the others */
|
||||
return 0;
|
||||
}
|
||||
@@ -1454,11 +1490,21 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
|
||||
{
|
||||
struct mt_device *td = hid_get_drvdata(hid);
|
||||
struct mt_report_data *rdata;
|
||||
+ struct input_dev *input;
|
||||
|
||||
rdata = mt_find_report_data(td, field->report);
|
||||
if (rdata && rdata->is_mt_collection)
|
||||
return mt_touch_event(hid, field, usage, value);
|
||||
|
||||
+ if (field->application == MS_TYPE_COVER_APPLICATION &&
|
||||
+ rdata->application->quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH &&
|
||||
+ usage->hid == MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE) {
|
||||
+ input = field->hidinput->input;
|
||||
+ input_report_switch(input, SW_TABLET_MODE, (value & 0xFF) != 0x22);
|
||||
+ input_sync(input);
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1611,6 +1657,42 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app)
|
||||
app->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;
|
||||
}
|
||||
|
||||
+static int get_type_cover_field(struct hid_report_enum *rep_enum,
|
||||
+ struct hid_field **field, int usage)
|
||||
+{
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+ if (cur_field->application != MS_TYPE_COVER_APPLICATION)
|
||||
+ continue;
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid == usage) {
|
||||
+ *field = cur_field;
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+static void request_type_cover_tablet_mode_switch(struct hid_device *hdev)
|
||||
+{
|
||||
+ struct hid_field *field;
|
||||
+
|
||||
+ if (get_type_cover_field(&hdev->report_enum[HID_INPUT_REPORT],
|
||||
+ &field,
|
||||
+ MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE)) {
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_GET_REPORT);
|
||||
+ } else {
|
||||
+ hid_err(hdev, "couldn't find tablet mode field\n");
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
||||
{
|
||||
struct mt_device *td = hid_get_drvdata(hdev);
|
||||
@@ -1659,6 +1741,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
||||
/* force BTN_STYLUS to allow tablet matching in udev */
|
||||
__set_bit(BTN_STYLUS, hi->input->keybit);
|
||||
break;
|
||||
+ case MS_TYPE_COVER_APPLICATION:
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH) {
|
||||
+ suffix = "Tablet Mode Switch";
|
||||
+ request_type_cover_tablet_mode_switch(hdev);
|
||||
+ break;
|
||||
+ }
|
||||
+ fallthrough;
|
||||
default:
|
||||
suffix = "UNKNOWN";
|
||||
break;
|
||||
@@ -1741,30 +1830,6 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit_unlock(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);
|
||||
@@ -1773,8 +1838,9 @@ static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
/* 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) {
|
||||
+ if (!get_type_cover_field(&hdev->report_enum[HID_FEATURE_REPORT],
|
||||
+ &field,
|
||||
+ MS_TYPE_COVER_FEATURE_REPORT_USAGE)) {
|
||||
hid_err(hdev, "couldn't find backlight field\n");
|
||||
goto out;
|
||||
}
|
||||
@@ -1908,13 +1974,24 @@ static int mt_suspend(struct hid_device *hdev, pm_message_t state)
|
||||
|
||||
static int mt_reset_resume(struct hid_device *hdev)
|
||||
{
|
||||
+ struct mt_device *td = hid_get_drvdata(hdev);
|
||||
+
|
||||
mt_release_contacts(hdev);
|
||||
mt_set_modes(hdev, HID_LATENCY_NORMAL, true, true);
|
||||
+
|
||||
+ /* Request an update on the typecover folding state on resume
|
||||
+ * after reset.
|
||||
+ */
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH)
|
||||
+ request_type_cover_tablet_mode_switch(hdev);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mt_resume(struct hid_device *hdev)
|
||||
{
|
||||
+ struct mt_device *td = hid_get_drvdata(hdev);
|
||||
+
|
||||
/* Some Elan legacy devices require SET_IDLE to be set on resume.
|
||||
* It should be safe to send it to other devices too.
|
||||
* Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */
|
||||
@@ -1923,12 +2000,31 @@ static int mt_resume(struct hid_device *hdev)
|
||||
|
||||
mt_set_modes(hdev, HID_LATENCY_NORMAL, true, true);
|
||||
|
||||
+ /* Request an update on the typecover folding state on resume. */
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH)
|
||||
+ request_type_cover_tablet_mode_switch(hdev);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mt_remove(struct hid_device *hdev)
|
||||
{
|
||||
struct mt_device *td = hid_get_drvdata(hdev);
|
||||
+ struct hid_field *field;
|
||||
+ struct input_dev *input;
|
||||
+
|
||||
+ /* Reset tablet mode switch on disconnect. */
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH) {
|
||||
+ if (get_type_cover_field(&hdev->report_enum[HID_INPUT_REPORT],
|
||||
+ &field,
|
||||
+ MS_TYPE_COVER_TABLET_MODE_SWITCH_USAGE)) {
|
||||
+ input = field->hidinput->input;
|
||||
+ input_report_switch(input, SW_TABLET_MODE, 0);
|
||||
+ input_sync(input);
|
||||
+ } else {
|
||||
+ hid_err(hdev, "couldn't find tablet mode field\n");
|
||||
+ }
|
||||
+ }
|
||||
|
||||
unregister_pm_notifier(&td->pm_notifier);
|
||||
del_timer_sync(&td->release_timer);
|
||||
--
|
||||
2.43.0
|
||||
|
97
patches/6.7/0010-surface-shutdown.patch
Normal file
97
patches/6.7/0010-surface-shutdown.patch
Normal file
|
@ -0,0 +1,97 @@
|
|||
From 3854d7e575b1091a994c58ef8ee2a89f4efced12 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 19 Feb 2023 22:12:24 +0100
|
||||
Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod
|
||||
|
||||
Work around buggy EFI firmware: On some Microsoft Surface devices
|
||||
(Surface Pro 9 and Surface Laptop 5) the EFI ResetSystem call with
|
||||
EFI_RESET_SHUTDOWN doesn't function properly. Instead of shutting the
|
||||
system down, it returns and the system stays on.
|
||||
|
||||
It turns out that this only happens after PCI shutdown callbacks ran for
|
||||
specific devices. Excluding those devices from the shutdown process
|
||||
makes the ResetSystem call work as expected.
|
||||
|
||||
TODO: Maybe we can find a better way or the root cause of this?
|
||||
|
||||
Not-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-shutdown
|
||||
---
|
||||
drivers/pci/pci-driver.c | 3 +++
|
||||
drivers/pci/quirks.c | 36 ++++++++++++++++++++++++++++++++++++
|
||||
include/linux/pci.h | 1 +
|
||||
3 files changed, 40 insertions(+)
|
||||
|
||||
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
|
||||
index 51ec9e7e784f..40554890d721 100644
|
||||
--- a/drivers/pci/pci-driver.c
|
||||
+++ b/drivers/pci/pci-driver.c
|
||||
@@ -507,6 +507,9 @@ static void pci_device_shutdown(struct device *dev)
|
||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
||||
struct pci_driver *drv = pci_dev->driver;
|
||||
|
||||
+ if (pci_dev->no_shutdown)
|
||||
+ return;
|
||||
+
|
||||
pm_runtime_resume(dev);
|
||||
|
||||
if (drv && drv->shutdown)
|
||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||
index d55a3ffae4b8..e8614d8476fe 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -6227,3 +6227,39 @@ static void pci_fixup_d3cold_delay_1sec(struct pci_dev *pdev)
|
||||
pdev->d3cold_delay = 1000;
|
||||
}
|
||||
DECLARE_PCI_FIXUP_FINAL(0x5555, 0x0004, pci_fixup_d3cold_delay_1sec);
|
||||
+
|
||||
+static const struct dmi_system_id no_shutdown_dmi_table[] = {
|
||||
+ /*
|
||||
+ * Systems on which some devices should not be touched during shutdown.
|
||||
+ */
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Pro 9",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface Pro 9"),
|
||||
+ },
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 5",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 5"),
|
||||
+ },
|
||||
+ },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static void quirk_no_shutdown(struct pci_dev *dev)
|
||||
+{
|
||||
+ if (!dmi_check_system(no_shutdown_dmi_table))
|
||||
+ return;
|
||||
+
|
||||
+ dev->no_shutdown = 1;
|
||||
+ pci_info(dev, "disabling shutdown ops for [%04x:%04x]\n",
|
||||
+ dev->vendor, dev->device);
|
||||
+}
|
||||
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x461e, quirk_no_shutdown); // Thunderbolt 4 USB Controller
|
||||
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x461f, quirk_no_shutdown); // Thunderbolt 4 PCI Express Root Port
|
||||
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x462f, quirk_no_shutdown); // Thunderbolt 4 PCI Express Root Port
|
||||
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x466d, quirk_no_shutdown); // Thunderbolt 4 NHI
|
||||
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x46a8, quirk_no_shutdown); // GPU
|
||||
diff --git a/include/linux/pci.h b/include/linux/pci.h
|
||||
index bc80960fad7c..eec5704d1000 100644
|
||||
--- a/include/linux/pci.h
|
||||
+++ b/include/linux/pci.h
|
||||
@@ -465,6 +465,7 @@ struct pci_dev {
|
||||
unsigned int no_command_memory:1; /* No PCI_COMMAND_MEMORY */
|
||||
unsigned int rom_bar_overlap:1; /* ROM BAR disable broken */
|
||||
unsigned int rom_attr_enabled:1; /* Display of ROM attribute enabled? */
|
||||
+ unsigned int no_shutdown:1; /* Do not touch device on shutdown */
|
||||
pci_dev_flags_t dev_flags;
|
||||
atomic_t enable_cnt; /* pci_enable_device has been called */
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
51
patches/6.7/0011-surface-gpe.patch
Normal file
51
patches/6.7/0011-surface-gpe.patch
Normal file
|
@ -0,0 +1,51 @@
|
|||
From d9ddc9ae99c11ebc912a1a8dde46d783e873508b Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 12 Mar 2023 01:41:57 +0100
|
||||
Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9
|
||||
|
||||
Add the lid GPE used by the Surface Pro 9.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/surface/surface_gpe.c | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
|
||||
index 62fd4004db31..103fc4468262 100644
|
||||
--- a/drivers/platform/surface/surface_gpe.c
|
||||
+++ b/drivers/platform/surface/surface_gpe.c
|
||||
@@ -41,6 +41,11 @@ static const struct property_entry lid_device_props_l4F[] = {
|
||||
{},
|
||||
};
|
||||
|
||||
+static const struct property_entry lid_device_props_l52[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x52),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
static const struct property_entry lid_device_props_l57[] = {
|
||||
PROPERTY_ENTRY_U32("gpe", 0x57),
|
||||
{},
|
||||
@@ -107,6 +112,18 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
},
|
||||
.driver_data = (void *)lid_device_props_l4B,
|
||||
},
|
||||
+ {
|
||||
+ /*
|
||||
+ * We match for SKU here due to product name clash with the ARM
|
||||
+ * version.
|
||||
+ */
|
||||
+ .ident = "Surface Pro 9",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_9_2038"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l52,
|
||||
+ },
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
.matches = {
|
||||
--
|
||||
2.43.0
|
||||
|
708
patches/6.7/0012-cameras.patch
Normal file
708
patches/6.7/0012-cameras.patch
Normal file
|
@ -0,0 +1,708 @@
|
|||
From 5fdcd780891777ef73585adf610593e6e097e6d6 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 02bb2cce423f..b123138d3dc0 100644
|
||||
--- a/drivers/acpi/scan.c
|
||||
+++ b/drivers/acpi/scan.c
|
||||
@@ -2114,6 +2114,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.43.0
|
||||
|
||||
From eb19f5e13f14a8973920d406125f205945558fb9 Mon Sep 17 00:00:00 2001
|
||||
From: zouxiaoh <xiaohong.zou@intel.com>
|
||||
Date: Fri, 25 Jun 2021 08:52:59 +0800
|
||||
Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
|
||||
|
||||
Intel IPU(Image Processing Unit) has its own (IO)MMU hardware,
|
||||
The IPU driver allocates its own page table that is not mapped
|
||||
via the DMA, and thus the Intel IOMMU driver blocks access giving
|
||||
this error: DMAR: DRHD: handling fault status reg 3 DMAR:
|
||||
[DMA Read] Request device [00:05.0] PASID ffffffff
|
||||
fault addr 76406000 [fault reason 06] PTE Read access is not set
|
||||
As IPU is not an external facing device which is not risky, so use
|
||||
IOMMU passthrough mode for Intel IPUs.
|
||||
|
||||
Change-Id: I6dcccdadac308cf42e20a18e1b593381391e3e6b
|
||||
Depends-On: Iacd67578e8c6a9b9ac73285f52b4081b72fb68a6
|
||||
Tracked-On: #JIITL8-411
|
||||
Signed-off-by: Bingbu Cao <bingbu.cao@intel.com>
|
||||
Signed-off-by: zouxiaoh <xiaohong.zou@intel.com>
|
||||
Signed-off-by: Xu Chongyang <chongyang.xu@intel.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
drivers/iommu/intel/iommu.c | 30 ++++++++++++++++++++++++++++++
|
||||
1 file changed, 30 insertions(+)
|
||||
|
||||
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
||||
index cc6569613255..8a532d32efdd 100644
|
||||
--- a/drivers/iommu/intel/iommu.c
|
||||
+++ b/drivers/iommu/intel/iommu.c
|
||||
@@ -38,6 +38,12 @@
|
||||
#define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
|
||||
#define IS_USB_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_SERIAL_USB)
|
||||
#define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
|
||||
+#define IS_INTEL_IPU(pdev) ((pdev)->vendor == PCI_VENDOR_ID_INTEL && \
|
||||
+ ((pdev)->device == 0x9a19 || \
|
||||
+ (pdev)->device == 0x9a39 || \
|
||||
+ (pdev)->device == 0x4e19 || \
|
||||
+ (pdev)->device == 0x465d || \
|
||||
+ (pdev)->device == 0x1919))
|
||||
#define IS_IPTS(pdev) ((pdev)->vendor == PCI_VENDOR_ID_INTEL && \
|
||||
((pdev)->device == 0x9d3e))
|
||||
#define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
|
||||
@@ -294,12 +300,14 @@ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
|
||||
|
||||
static int dmar_map_gfx = 1;
|
||||
static int dmar_map_ipts = 1;
|
||||
+static int dmar_map_ipu = 1;
|
||||
static int intel_iommu_superpage = 1;
|
||||
static int iommu_identity_mapping;
|
||||
static int iommu_skip_te_disable;
|
||||
|
||||
#define IDENTMAP_GFX 2
|
||||
#define IDENTMAP_AZALIA 4
|
||||
+#define IDENTMAP_IPU 8
|
||||
#define IDENTMAP_IPTS 16
|
||||
|
||||
const struct iommu_ops intel_iommu_ops;
|
||||
@@ -2553,6 +2561,9 @@ static int device_def_domain_type(struct device *dev)
|
||||
if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
|
||||
return IOMMU_DOMAIN_IDENTITY;
|
||||
|
||||
+ if ((iommu_identity_mapping & IDENTMAP_IPU) && IS_INTEL_IPU(pdev))
|
||||
+ return IOMMU_DOMAIN_IDENTITY;
|
||||
+
|
||||
if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev))
|
||||
return IOMMU_DOMAIN_IDENTITY;
|
||||
}
|
||||
@@ -2862,6 +2873,9 @@ static int __init init_dmars(void)
|
||||
if (!dmar_map_gfx)
|
||||
iommu_identity_mapping |= IDENTMAP_GFX;
|
||||
|
||||
+ if (!dmar_map_ipu)
|
||||
+ iommu_identity_mapping |= IDENTMAP_IPU;
|
||||
+
|
||||
if (!dmar_map_ipts)
|
||||
iommu_identity_mapping |= IDENTMAP_IPTS;
|
||||
|
||||
@@ -4987,6 +5001,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
|
||||
dmar_map_gfx = 0;
|
||||
}
|
||||
|
||||
+static void quirk_iommu_ipu(struct pci_dev *dev)
|
||||
+{
|
||||
+ if (!IS_INTEL_IPU(dev))
|
||||
+ return;
|
||||
+
|
||||
+ if (risky_device(dev))
|
||||
+ return;
|
||||
+
|
||||
+ pci_info(dev, "Passthrough IOMMU for integrated Intel IPU\n");
|
||||
+ dmar_map_ipu = 0;
|
||||
+}
|
||||
+
|
||||
static void quirk_iommu_ipts(struct pci_dev *dev)
|
||||
{
|
||||
if (!IS_IPTS(dev))
|
||||
@@ -4998,6 +5024,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
|
||||
pci_info(dev, "Passthrough IOMMU for IPTS\n");
|
||||
dmar_map_ipts = 0;
|
||||
}
|
||||
+
|
||||
/* G4x/GM45 integrated gfx dmar support is totally busted. */
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
|
||||
@@ -5033,6 +5060,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
|
||||
|
||||
+/* disable IPU dmar support */
|
||||
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_iommu_ipu);
|
||||
+
|
||||
/* disable IPTS dmar support */
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 1b16e7cbcbf699e4d841424568e0de1cee048d93 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 1e107fd49f82..e3e1696e7f0e 100644
|
||||
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
||||
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
||||
@@ -46,6 +46,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.43.0
|
||||
|
||||
From a856e6ec1aa1ce0e88abdd423a151f2bbddb8134 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Date: Thu, 2 Mar 2023 12:59:39 +0000
|
||||
Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
|
||||
|
||||
ACPI _HID INT347E represents the OmniVision 7251 camera sensor. The
|
||||
driver for this sensor expects a single pin named "enable", but on
|
||||
some Microsoft Surface platforms the sensor is assigned a single
|
||||
GPIO who's type flag is INT3472_GPIO_TYPE_RESET.
|
||||
|
||||
Remap the GPIO pin's function from "reset" to "enable". This is done
|
||||
outside of the existing remap table since it is a more widespread
|
||||
discrepancy than that method is designed for. Additionally swap the
|
||||
polarity of the pin to match the driver's expectation.
|
||||
|
||||
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
drivers/platform/x86/intel/int3472/discrete.c | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
|
||||
index 07b302e09340..1d3097bc7e48 100644
|
||||
--- a/drivers/platform/x86/intel/int3472/discrete.c
|
||||
+++ b/drivers/platform/x86/intel/int3472/discrete.c
|
||||
@@ -83,12 +83,26 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
|
||||
const char *func, u32 polarity)
|
||||
{
|
||||
int ret;
|
||||
+ const struct acpi_device_id ov7251_ids[] = {
|
||||
+ { "INT347E" },
|
||||
+ };
|
||||
|
||||
if (int3472->n_sensor_gpios >= INT3472_MAX_SENSOR_GPIOS) {
|
||||
dev_warn(int3472->dev, "Too many GPIOs mapped\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+ /*
|
||||
+ * In addition to the function remap table we need to bulk remap the
|
||||
+ * "reset" GPIO for the OmniVision 7251 sensor, as the driver for that
|
||||
+ * expects its only GPIO pin to be called "enable" (and to have the
|
||||
+ * opposite polarity).
|
||||
+ */
|
||||
+ if (!strcmp(func, "reset") && !acpi_match_device_ids(int3472->sensor, ov7251_ids)) {
|
||||
+ func = "enable";
|
||||
+ polarity = GPIO_ACTIVE_HIGH;
|
||||
+ }
|
||||
+
|
||||
ret = skl_int3472_fill_gpiod_lookup(&int3472->gpios.table[int3472->n_sensor_gpios],
|
||||
agpio, func, polarity);
|
||||
if (ret)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From a7a10c4493fe0a381f12fd6a20a024e7797bd37c Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Date: Tue, 21 Mar 2023 13:45:26 +0000
|
||||
Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251
|
||||
|
||||
Update the control ID for the gain control in the ov7251 driver to
|
||||
V4L2_CID_ANALOGUE_GAIN.
|
||||
|
||||
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
drivers/media/i2c/ov7251.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
|
||||
index 6582cc0e2384..fd0796b6e07e 100644
|
||||
--- a/drivers/media/i2c/ov7251.c
|
||||
+++ b/drivers/media/i2c/ov7251.c
|
||||
@@ -1051,7 +1051,7 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl)
|
||||
case V4L2_CID_EXPOSURE:
|
||||
ret = ov7251_set_exposure(ov7251, ctrl->val);
|
||||
break;
|
||||
- case V4L2_CID_GAIN:
|
||||
+ case V4L2_CID_ANALOGUE_GAIN:
|
||||
ret = ov7251_set_gain(ov7251, ctrl->val);
|
||||
break;
|
||||
case V4L2_CID_TEST_PATTERN:
|
||||
@@ -1553,7 +1553,7 @@ static int ov7251_init_ctrls(struct ov7251 *ov7251)
|
||||
ov7251->exposure = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
||||
V4L2_CID_EXPOSURE, 1, 32, 1, 32);
|
||||
ov7251->gain = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
||||
- V4L2_CID_GAIN, 16, 1023, 1, 16);
|
||||
+ V4L2_CID_ANALOGUE_GAIN, 16, 1023, 1, 16);
|
||||
v4l2_ctrl_new_std_menu_items(&ov7251->ctrls, &ov7251_ctrl_ops,
|
||||
V4L2_CID_TEST_PATTERN,
|
||||
ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From e96fa67c9172fac9aa6e68199cf7e29d074c21e6 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Date: Wed, 22 Mar 2023 11:01:42 +0000
|
||||
Subject: [PATCH] media: v4l2-core: Acquire privacy led in
|
||||
v4l2_async_register_subdev()
|
||||
|
||||
The current call to v4l2_subdev_get_privacy_led() is contained in
|
||||
v4l2_async_register_subdev_sensor(), but that function isn't used by
|
||||
all the sensor drivers. Move the acquisition of the privacy led to
|
||||
v4l2_async_register_subdev() instead.
|
||||
|
||||
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
drivers/media/v4l2-core/v4l2-async.c | 4 ++++
|
||||
drivers/media/v4l2-core/v4l2-fwnode.c | 4 ----
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
|
||||
index 8cfd593d293d..c32f0d1b29d4 100644
|
||||
--- a/drivers/media/v4l2-core/v4l2-async.c
|
||||
+++ b/drivers/media/v4l2-core/v4l2-async.c
|
||||
@@ -796,6 +796,10 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
|
||||
|
||||
INIT_LIST_HEAD(&sd->asc_list);
|
||||
|
||||
+ ret = v4l2_subdev_get_privacy_led(sd);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
/*
|
||||
* No reference taken. The reference is held by the device (struct
|
||||
* v4l2_subdev.dev), and async sub-device does not exist independently
|
||||
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
|
||||
index 7f181fbbb140..1c0347de4e21 100644
|
||||
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
|
||||
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
|
||||
@@ -1217,10 +1217,6 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd)
|
||||
|
||||
v4l2_async_subdev_nf_init(notifier, sd);
|
||||
|
||||
- ret = v4l2_subdev_get_privacy_led(sd);
|
||||
- if (ret < 0)
|
||||
- goto out_cleanup;
|
||||
-
|
||||
ret = v4l2_async_nf_parse_fwnode_sensor(sd->dev, notifier);
|
||||
if (ret < 0)
|
||||
goto out_cleanup;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 68dac72bec1c99890d35d6bfd1b1f66e0cf8789c Mon Sep 17 00:00:00 2001
|
||||
From: Kate Hsuan <hpa@redhat.com>
|
||||
Date: Tue, 21 Mar 2023 23:37:16 +0800
|
||||
Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED
|
||||
|
||||
Add MFD cell for tps68470-led.
|
||||
|
||||
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Signed-off-by: Kate Hsuan <hpa@redhat.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
drivers/platform/x86/intel/int3472/tps68470.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
||||
index e3e1696e7f0e..423dc555093f 100644
|
||||
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
||||
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
||||
@@ -17,7 +17,7 @@
|
||||
#define DESIGNED_FOR_CHROMEOS 1
|
||||
#define DESIGNED_FOR_WINDOWS 2
|
||||
|
||||
-#define TPS68470_WIN_MFD_CELL_COUNT 3
|
||||
+#define TPS68470_WIN_MFD_CELL_COUNT 4
|
||||
|
||||
static const struct mfd_cell tps68470_cros[] = {
|
||||
{ .name = "tps68470-gpio" },
|
||||
@@ -200,7 +200,8 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)
|
||||
cells[1].name = "tps68470-regulator";
|
||||
cells[1].platform_data = (void *)board_data->tps68470_regulator_pdata;
|
||||
cells[1].pdata_size = sizeof(struct tps68470_regulator_platform_data);
|
||||
- cells[2].name = "tps68470-gpio";
|
||||
+ cells[2].name = "tps68470-led";
|
||||
+ cells[3].name = "tps68470-gpio";
|
||||
|
||||
for (i = 0; i < board_data->n_gpiod_lookups; i++)
|
||||
gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From 3f446f24aecaba808693f0173e28972e651fa87d Mon Sep 17 00:00:00 2001
|
||||
From: Kate Hsuan <hpa@redhat.com>
|
||||
Date: Tue, 21 Mar 2023 23:37:17 +0800
|
||||
Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB
|
||||
|
||||
Add flags for both LEDA(TPS68470_ILEDCTL_ENA), LEDB
|
||||
(TPS68470_ILEDCTL_ENB), and current control mask for LEDB
|
||||
(TPS68470_ILEDCTL_CTRLB)
|
||||
|
||||
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Signed-off-by: Kate Hsuan <hpa@redhat.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
include/linux/mfd/tps68470.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/include/linux/mfd/tps68470.h b/include/linux/mfd/tps68470.h
|
||||
index 7807fa329db0..2d2abb25b944 100644
|
||||
--- a/include/linux/mfd/tps68470.h
|
||||
+++ b/include/linux/mfd/tps68470.h
|
||||
@@ -34,6 +34,7 @@
|
||||
#define TPS68470_REG_SGPO 0x22
|
||||
#define TPS68470_REG_GPDI 0x26
|
||||
#define TPS68470_REG_GPDO 0x27
|
||||
+#define TPS68470_REG_ILEDCTL 0x28
|
||||
#define TPS68470_REG_VCMVAL 0x3C
|
||||
#define TPS68470_REG_VAUX1VAL 0x3D
|
||||
#define TPS68470_REG_VAUX2VAL 0x3E
|
||||
@@ -94,4 +95,8 @@
|
||||
#define TPS68470_GPIO_MODE_OUT_CMOS 2
|
||||
#define TPS68470_GPIO_MODE_OUT_ODRAIN 3
|
||||
|
||||
+#define TPS68470_ILEDCTL_ENA BIT(2)
|
||||
+#define TPS68470_ILEDCTL_ENB BIT(6)
|
||||
+#define TPS68470_ILEDCTL_CTRLB GENMASK(5, 4)
|
||||
+
|
||||
#endif /* __LINUX_MFD_TPS68470_H */
|
||||
--
|
||||
2.43.0
|
||||
|
||||
From a0fe4ec438c5edb9f4360c8a2a5f5269d05c44ef Mon Sep 17 00:00:00 2001
|
||||
From: Kate Hsuan <hpa@redhat.com>
|
||||
Date: Tue, 21 Mar 2023 23:37:18 +0800
|
||||
Subject: [PATCH] leds: tps68470: Add LED control for tps68470
|
||||
|
||||
There are two LED controllers, LEDA indicator LED and LEDB flash LED for
|
||||
tps68470. LEDA can be enabled by setting TPS68470_ILEDCTL_ENA. Moreover,
|
||||
tps68470 provides four levels of power status for LEDB. If the
|
||||
properties called "ti,ledb-current" can be found, the current will be
|
||||
set according to the property values. These two LEDs can be controlled
|
||||
through the LED class of sysfs (tps68470-leda and tps68470-ledb).
|
||||
|
||||
Signed-off-by: Kate Hsuan <hpa@redhat.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: cameras
|
||||
---
|
||||
drivers/leds/Kconfig | 12 +++
|
||||
drivers/leds/Makefile | 1 +
|
||||
drivers/leds/leds-tps68470.c | 185 +++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 198 insertions(+)
|
||||
create mode 100644 drivers/leds/leds-tps68470.c
|
||||
|
||||
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
||||
index a3a9ac5b5338..0bc6845b5d29 100644
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -875,6 +875,18 @@ config LEDS_TPS6105X
|
||||
It is a single boost converter primarily for white LEDs and
|
||||
audio amplifiers.
|
||||
|
||||
+config LEDS_TPS68470
|
||||
+ tristate "LED support for TI TPS68470"
|
||||
+ depends on LEDS_CLASS
|
||||
+ depends on INTEL_SKL_INT3472
|
||||
+ help
|
||||
+ This driver supports TPS68470 PMIC with LED chip.
|
||||
+ It provides two LED controllers, with the ability to drive 2
|
||||
+ indicator LEDs and 2 flash LEDs.
|
||||
+
|
||||
+ To compile this driver as a module, choose M and it will be
|
||||
+ called leds-tps68470
|
||||
+
|
||||
config LEDS_IP30
|
||||
tristate "LED support for SGI Octane machines"
|
||||
depends on LEDS_CLASS
|
||||
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
|
||||
index d7348e8bc019..10caea4e7c61 100644
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -84,6 +84,7 @@ obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o
|
||||
obj-$(CONFIG_LEDS_TI_LMU_COMMON) += leds-ti-lmu-common.o
|
||||
obj-$(CONFIG_LEDS_TLC591XX) += leds-tlc591xx.o
|
||||
obj-$(CONFIG_LEDS_TPS6105X) += leds-tps6105x.o
|
||||
+obj-$(CONFIG_LEDS_TPS68470) += leds-tps68470.o
|
||||
obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o
|
||||
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
|
||||
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
|
||||
diff --git a/drivers/leds/leds-tps68470.c b/drivers/leds/leds-tps68470.c
|
||||
new file mode 100644
|
||||
index 000000000000..35aeb5db89c8
|
||||
--- /dev/null
|
||||
+++ b/drivers/leds/leds-tps68470.c
|
||||
@@ -0,0 +1,185 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
+ * LED driver for TPS68470 PMIC
|
||||
+ *
|
||||
+ * Copyright (C) 2023 Red Hat
|
||||
+ *
|
||||
+ * Authors:
|
||||
+ * Kate Hsuan <hpa@redhat.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/leds.h>
|
||||
+#include <linux/mfd/tps68470.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/property.h>
|
||||
+#include <linux/regmap.h>
|
||||
+
|
||||
+
|
||||
+#define lcdev_to_led(led_cdev) \
|
||||
+ container_of(led_cdev, struct tps68470_led, lcdev)
|
||||
+
|
||||
+#define led_to_tps68470(led, index) \
|
||||
+ container_of(led, struct tps68470_device, leds[index])
|
||||
+
|
||||
+enum tps68470_led_ids {
|
||||
+ TPS68470_ILED_A,
|
||||
+ TPS68470_ILED_B,
|
||||
+ TPS68470_NUM_LEDS
|
||||
+};
|
||||
+
|
||||
+static const char *tps68470_led_names[] = {
|
||||
+ [TPS68470_ILED_A] = "tps68470-iled_a",
|
||||
+ [TPS68470_ILED_B] = "tps68470-iled_b",
|
||||
+};
|
||||
+
|
||||
+struct tps68470_led {
|
||||
+ unsigned int led_id;
|
||||
+ struct led_classdev lcdev;
|
||||
+};
|
||||
+
|
||||
+struct tps68470_device {
|
||||
+ struct device *dev;
|
||||
+ struct regmap *regmap;
|
||||
+ struct tps68470_led leds[TPS68470_NUM_LEDS];
|
||||
+};
|
||||
+
|
||||
+enum ctrlb_current {
|
||||
+ CTRLB_2MA = 0,
|
||||
+ CTRLB_4MA = 1,
|
||||
+ CTRLB_8MA = 2,
|
||||
+ CTRLB_16MA = 3,
|
||||
+};
|
||||
+
|
||||
+static int tps68470_brightness_set(struct led_classdev *led_cdev, enum led_brightness brightness)
|
||||
+{
|
||||
+ struct tps68470_led *led = lcdev_to_led(led_cdev);
|
||||
+ struct tps68470_device *tps68470 = led_to_tps68470(led, led->led_id);
|
||||
+ struct regmap *regmap = tps68470->regmap;
|
||||
+
|
||||
+ switch (led->led_id) {
|
||||
+ case TPS68470_ILED_A:
|
||||
+ return regmap_update_bits(regmap, TPS68470_REG_ILEDCTL, TPS68470_ILEDCTL_ENA,
|
||||
+ brightness ? TPS68470_ILEDCTL_ENA : 0);
|
||||
+ case TPS68470_ILED_B:
|
||||
+ return regmap_update_bits(regmap, TPS68470_REG_ILEDCTL, TPS68470_ILEDCTL_ENB,
|
||||
+ brightness ? TPS68470_ILEDCTL_ENB : 0);
|
||||
+ }
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
+static enum led_brightness tps68470_brightness_get(struct led_classdev *led_cdev)
|
||||
+{
|
||||
+ struct tps68470_led *led = lcdev_to_led(led_cdev);
|
||||
+ struct tps68470_device *tps68470 = led_to_tps68470(led, led->led_id);
|
||||
+ struct regmap *regmap = tps68470->regmap;
|
||||
+ int ret = 0;
|
||||
+ int value = 0;
|
||||
+
|
||||
+ ret = regmap_read(regmap, TPS68470_REG_ILEDCTL, &value);
|
||||
+ if (ret)
|
||||
+ return dev_err_probe(led_cdev->dev, -EINVAL, "failed on reading register\n");
|
||||
+
|
||||
+ switch (led->led_id) {
|
||||
+ case TPS68470_ILED_A:
|
||||
+ value = value & TPS68470_ILEDCTL_ENA;
|
||||
+ break;
|
||||
+ case TPS68470_ILED_B:
|
||||
+ value = value & TPS68470_ILEDCTL_ENB;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return value ? LED_ON : LED_OFF;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static int tps68470_ledb_current_init(struct platform_device *pdev,
|
||||
+ struct tps68470_device *tps68470)
|
||||
+{
|
||||
+ int ret = 0;
|
||||
+ unsigned int curr;
|
||||
+
|
||||
+ /* configure LEDB current if the properties can be got */
|
||||
+ if (!device_property_read_u32(&pdev->dev, "ti,ledb-current", &curr)) {
|
||||
+ if (curr > CTRLB_16MA) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "Invalid LEDB current value: %d\n",
|
||||
+ curr);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ ret = regmap_update_bits(tps68470->regmap, TPS68470_REG_ILEDCTL,
|
||||
+ TPS68470_ILEDCTL_CTRLB, curr);
|
||||
+ }
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int tps68470_leds_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ int i = 0;
|
||||
+ int ret = 0;
|
||||
+ struct tps68470_device *tps68470;
|
||||
+ struct tps68470_led *led;
|
||||
+ struct led_classdev *lcdev;
|
||||
+
|
||||
+ tps68470 = devm_kzalloc(&pdev->dev, sizeof(struct tps68470_device),
|
||||
+ GFP_KERNEL);
|
||||
+ if (!tps68470)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ tps68470->dev = &pdev->dev;
|
||||
+ tps68470->regmap = dev_get_drvdata(pdev->dev.parent);
|
||||
+
|
||||
+ for (i = 0; i < TPS68470_NUM_LEDS; i++) {
|
||||
+ led = &tps68470->leds[i];
|
||||
+ lcdev = &led->lcdev;
|
||||
+
|
||||
+ led->led_id = i;
|
||||
+
|
||||
+ lcdev->name = devm_kasprintf(tps68470->dev, GFP_KERNEL, "%s::%s",
|
||||
+ tps68470_led_names[i], LED_FUNCTION_INDICATOR);
|
||||
+ if (!lcdev->name)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ lcdev->max_brightness = 1;
|
||||
+ lcdev->brightness = 0;
|
||||
+ lcdev->brightness_set_blocking = tps68470_brightness_set;
|
||||
+ lcdev->brightness_get = tps68470_brightness_get;
|
||||
+ lcdev->dev = &pdev->dev;
|
||||
+
|
||||
+ ret = devm_led_classdev_register(tps68470->dev, lcdev);
|
||||
+ if (ret) {
|
||||
+ dev_err_probe(tps68470->dev, ret,
|
||||
+ "error registering led\n");
|
||||
+ goto err_exit;
|
||||
+ }
|
||||
+
|
||||
+ if (i == TPS68470_ILED_B) {
|
||||
+ ret = tps68470_ledb_current_init(pdev, tps68470);
|
||||
+ if (ret)
|
||||
+ goto err_exit;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+err_exit:
|
||||
+ if (ret) {
|
||||
+ for (i = 0; i < TPS68470_NUM_LEDS; i++) {
|
||||
+ if (tps68470->leds[i].lcdev.name)
|
||||
+ devm_led_classdev_unregister(&pdev->dev,
|
||||
+ &tps68470->leds[i].lcdev);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+static struct platform_driver tps68470_led_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "tps68470-led",
|
||||
+ },
|
||||
+ .probe = tps68470_leds_probe,
|
||||
+};
|
||||
+
|
||||
+module_platform_driver(tps68470_led_driver);
|
||||
+
|
||||
+MODULE_ALIAS("platform:tps68470-led");
|
||||
+MODULE_DESCRIPTION("LED driver for TPS68470 PMIC");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
--
|
||||
2.43.0
|
||||
|
109
patches/6.7/0013-amd-gpio.patch
Normal file
109
patches/6.7/0013-amd-gpio.patch
Normal file
|
@ -0,0 +1,109 @@
|
|||
From 04069751b144350632ec45b5b25c2cc01d5f34ef 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 85a3ce2a3666..2c0e04a3a697 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>
|
||||
@@ -1251,6 +1252,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
|
||||
@@ -1306,6 +1318,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.43.0
|
||||
|
||||
From 8e2f2b852776fca1dd0ab8728be2303051cb19e1 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 2c0e04a3a697..b0e1dab3d2ec 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -1254,12 +1254,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.43.0
|
||||
|
110
patches/6.7/0014-rtc.patch
Normal file
110
patches/6.7/0014-rtc.patch
Normal file
|
@ -0,0 +1,110 @@
|
|||
From 4e36132e272de3d84833b799be56c2b460db08b6 Mon Sep 17 00:00:00 2001
|
||||
From: "Bart Groeneveld | GPX Solutions B.V" <bart@gpxbv.nl>
|
||||
Date: Mon, 5 Dec 2022 16:08:46 +0100
|
||||
Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms
|
||||
|
||||
The specification [1] allows so-called HW-reduced platforms,
|
||||
which do not implement everything, especially the wakeup related stuff.
|
||||
|
||||
In that case, it is still usable as a RTC. This is helpful for [2]
|
||||
and [3], which is about a device with no other working RTC,
|
||||
but it does have an HW-reduced TAD, which can be used as a RTC instead.
|
||||
|
||||
[1]: https://uefi.org/specs/ACPI/6.5/09_ACPI_Defined_Devices_and_Device_Specific_Objects.html#time-and-alarm-device
|
||||
[2]: https://bugzilla.kernel.org/show_bug.cgi?id=212313
|
||||
[3]: https://github.com/linux-surface/linux-surface/issues/415
|
||||
|
||||
Signed-off-by: Bart Groeneveld | GPX Solutions B.V. <bart@gpxbv.nl>
|
||||
Patchset: rtc
|
||||
---
|
||||
drivers/acpi/acpi_tad.c | 36 ++++++++++++++++++++++++------------
|
||||
1 file changed, 24 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c
|
||||
index 33c3b16af556..900445d06623 100644
|
||||
--- a/drivers/acpi/acpi_tad.c
|
||||
+++ b/drivers/acpi/acpi_tad.c
|
||||
@@ -432,6 +432,14 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
|
||||
|
||||
static DEVICE_ATTR_RO(caps);
|
||||
|
||||
+static struct attribute *acpi_tad_attrs[] = {
|
||||
+ &dev_attr_caps.attr,
|
||||
+ NULL,
|
||||
+};
|
||||
+static const struct attribute_group acpi_tad_attr_group = {
|
||||
+ .attrs = acpi_tad_attrs,
|
||||
+};
|
||||
+
|
||||
static ssize_t ac_alarm_store(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
@@ -480,15 +488,14 @@ static ssize_t ac_status_show(struct device *dev, struct device_attribute *attr,
|
||||
|
||||
static DEVICE_ATTR_RW(ac_status);
|
||||
|
||||
-static struct attribute *acpi_tad_attrs[] = {
|
||||
- &dev_attr_caps.attr,
|
||||
+static struct attribute *acpi_tad_ac_attrs[] = {
|
||||
&dev_attr_ac_alarm.attr,
|
||||
&dev_attr_ac_policy.attr,
|
||||
&dev_attr_ac_status.attr,
|
||||
NULL,
|
||||
};
|
||||
-static const struct attribute_group acpi_tad_attr_group = {
|
||||
- .attrs = acpi_tad_attrs,
|
||||
+static const struct attribute_group acpi_tad_ac_attr_group = {
|
||||
+ .attrs = acpi_tad_ac_attrs,
|
||||
};
|
||||
|
||||
static ssize_t dc_alarm_store(struct device *dev, struct device_attribute *attr,
|
||||
@@ -564,13 +571,18 @@ static int acpi_tad_remove(struct platform_device *pdev)
|
||||
|
||||
pm_runtime_get_sync(dev);
|
||||
|
||||
+ if (dd->capabilities & ACPI_TAD_AC_WAKE)
|
||||
+ sysfs_remove_group(&dev->kobj, &acpi_tad_ac_attr_group);
|
||||
+
|
||||
if (dd->capabilities & ACPI_TAD_DC_WAKE)
|
||||
sysfs_remove_group(&dev->kobj, &acpi_tad_dc_attr_group);
|
||||
|
||||
sysfs_remove_group(&dev->kobj, &acpi_tad_attr_group);
|
||||
|
||||
- acpi_tad_disable_timer(dev, ACPI_TAD_AC_TIMER);
|
||||
- acpi_tad_clear_status(dev, ACPI_TAD_AC_TIMER);
|
||||
+ if (dd->capabilities & ACPI_TAD_AC_WAKE) {
|
||||
+ acpi_tad_disable_timer(dev, ACPI_TAD_AC_TIMER);
|
||||
+ acpi_tad_clear_status(dev, ACPI_TAD_AC_TIMER);
|
||||
+ }
|
||||
if (dd->capabilities & ACPI_TAD_DC_WAKE) {
|
||||
acpi_tad_disable_timer(dev, ACPI_TAD_DC_TIMER);
|
||||
acpi_tad_clear_status(dev, ACPI_TAD_DC_TIMER);
|
||||
@@ -613,12 +625,6 @@ static int acpi_tad_probe(struct platform_device *pdev)
|
||||
goto remove_handler;
|
||||
}
|
||||
|
||||
- if (!acpi_has_method(handle, "_PRW")) {
|
||||
- dev_info(dev, "Missing _PRW\n");
|
||||
- ret = -ENODEV;
|
||||
- goto remove_handler;
|
||||
- }
|
||||
-
|
||||
dd = devm_kzalloc(dev, sizeof(*dd), GFP_KERNEL);
|
||||
if (!dd) {
|
||||
ret = -ENOMEM;
|
||||
@@ -649,6 +655,12 @@ static int acpi_tad_probe(struct platform_device *pdev)
|
||||
if (ret)
|
||||
goto fail;
|
||||
|
||||
+ if (caps & ACPI_TAD_AC_WAKE) {
|
||||
+ ret = sysfs_create_group(&dev->kobj, &acpi_tad_ac_attr_group);
|
||||
+ if (ret)
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
if (caps & ACPI_TAD_DC_WAKE) {
|
||||
ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group);
|
||||
if (ret)
|
||||
--
|
||||
2.43.0
|
||||
|
Loading…
Reference in a new issue