Remove outdated patches
We currently carry some horrendously outdated patches, that nobody should use any more. Old kernel sources will still be kept in the respective branches at https://github.com/linux-surface/kernel/ if you need to have a look at them.
This commit is contained in:
parent
ba6b04ef93
commit
7e722c4088
|
@ -1,657 +0,0 @@
|
|||
From a9919478a89a940a0e8a546c369c6d7c2559ee63 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 28 Sep 2019 18:00:43 +0200
|
||||
Subject: [PATCH] platform/x86: Surface 3 battery platform operation region
|
||||
support
|
||||
|
||||
Patchset: surface3-power
|
||||
---
|
||||
drivers/platform/x86/Kconfig | 7 +
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/surface3_power.c | 604 ++++++++++++++++++++++++++
|
||||
3 files changed, 612 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/surface3_power.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index a13bb4ddd0cf..0d20ffdb5a67 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -1161,6 +1161,13 @@ config SURFACE_3_BUTTON
|
||||
---help---
|
||||
This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.
|
||||
|
||||
+config SURFACE_3_POWER_OPREGION
|
||||
+ tristate "Surface 3 battery platform operation region support"
|
||||
+ depends on ACPI && I2C
|
||||
+ help
|
||||
+ Select this option to enable support for ACPI operation
|
||||
+ region of the Surface 3 battery platform driver.
|
||||
+
|
||||
config INTEL_PUNIT_IPC
|
||||
tristate "Intel P-Unit IPC Driver"
|
||||
---help---
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index dc29af4d8e2f..2ea90039a3e4 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -81,6 +81,7 @@ obj-$(CONFIG_INTEL_PMC_IPC) += intel_pmc_ipc.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
+obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
|
||||
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
|
||||
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
|
||||
diff --git a/drivers/platform/x86/surface3_power.c b/drivers/platform/x86/surface3_power.c
|
||||
new file mode 100644
|
||||
index 000000000000..e0af01a60302
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/surface3_power.c
|
||||
@@ -0,0 +1,604 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+
|
||||
+/*
|
||||
+ * Supports for the power IC on the Surface 3 tablet.
|
||||
+ *
|
||||
+ * (C) Copyright 2016-2018 Red Hat, Inc
|
||||
+ * (C) Copyright 2016-2018 Benjamin Tissoires <benjamin.tissoires@gmail.com>
|
||||
+ * (C) Copyright 2016 Stephen Just <stephenjust@gmail.com>
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * This driver has been reverse-engineered by parsing the DSDT of the Surface 3
|
||||
+ * and looking at the registers of the chips.
|
||||
+ *
|
||||
+ * The DSDT allowed to find out that:
|
||||
+ * - the driver is required for the ACPI BAT0 device to communicate to the chip
|
||||
+ * through an operation region.
|
||||
+ * - the various defines for the operation region functions to communicate with
|
||||
+ * this driver
|
||||
+ * - the DSM 3f99e367-6220-4955-8b0f-06ef2ae79412 allows to trigger ACPI
|
||||
+ * events to BAT0 (the code is all available in the DSDT).
|
||||
+ *
|
||||
+ * Further findings regarding the 2 chips declared in the MSHW0011 are:
|
||||
+ * - there are 2 chips declared:
|
||||
+ * . 0x22 seems to control the ADP1 line status (and probably the charger)
|
||||
+ * . 0x55 controls the battery directly
|
||||
+ * - the battery chip uses a SMBus protocol (using plain SMBus allows non
|
||||
+ * destructive commands):
|
||||
+ * . the commands/registers used are in the range 0x00..0x7F
|
||||
+ * . if bit 8 (0x80) is set in the SMBus command, the returned value is the
|
||||
+ * same as when it is not set. There is a high chance this bit is the
|
||||
+ * read/write
|
||||
+ * . the various registers semantic as been deduced by observing the register
|
||||
+ * dumps.
|
||||
+ */
|
||||
+
|
||||
+#include <asm/unaligned.h>
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/freezer.h>
|
||||
+#include <linux/i2c.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/kthread.h>
|
||||
+#include <linux/slab.h>
|
||||
+#include <linux/uuid.h>
|
||||
+
|
||||
+#define POLL_INTERVAL (2 * HZ)
|
||||
+
|
||||
+struct mshw0011_data {
|
||||
+ struct i2c_client *adp1;
|
||||
+ struct i2c_client *bat0;
|
||||
+ unsigned short notify_mask;
|
||||
+ struct task_struct *poll_task;
|
||||
+ bool kthread_running;
|
||||
+
|
||||
+ bool charging;
|
||||
+ bool bat_charging;
|
||||
+ u8 trip_point;
|
||||
+ s32 full_capacity;
|
||||
+};
|
||||
+
|
||||
+struct mshw0011_lookup {
|
||||
+ struct mshw0011_data *cdata;
|
||||
+ unsigned int n;
|
||||
+ unsigned int index;
|
||||
+ int addr;
|
||||
+};
|
||||
+
|
||||
+struct mshw0011_handler_data {
|
||||
+ struct acpi_connection_info info;
|
||||
+ struct i2c_client *client;
|
||||
+};
|
||||
+
|
||||
+struct bix {
|
||||
+ u32 revision;
|
||||
+ u32 power_unit;
|
||||
+ u32 design_capacity;
|
||||
+ u32 last_full_charg_capacity;
|
||||
+ u32 battery_technology;
|
||||
+ u32 design_voltage;
|
||||
+ u32 design_capacity_of_warning;
|
||||
+ u32 design_capacity_of_low;
|
||||
+ u32 cycle_count;
|
||||
+ u32 measurement_accuracy;
|
||||
+ u32 max_sampling_time;
|
||||
+ u32 min_sampling_time;
|
||||
+ u32 max_average_interval;
|
||||
+ u32 min_average_interval;
|
||||
+ u32 battery_capacity_granularity_1;
|
||||
+ u32 battery_capacity_granularity_2;
|
||||
+ char model[10];
|
||||
+ char serial[10];
|
||||
+ char type[10];
|
||||
+ char OEM[10];
|
||||
+} __packed;
|
||||
+
|
||||
+struct bst {
|
||||
+ u32 battery_state;
|
||||
+ s32 battery_present_rate;
|
||||
+ u32 battery_remaining_capacity;
|
||||
+ u32 battery_present_voltage;
|
||||
+} __packed;
|
||||
+
|
||||
+struct gsb_command {
|
||||
+ u8 arg0;
|
||||
+ u8 arg1;
|
||||
+ u8 arg2;
|
||||
+} __packed;
|
||||
+
|
||||
+struct gsb_buffer {
|
||||
+ u8 status;
|
||||
+ u8 len;
|
||||
+ u8 ret;
|
||||
+ union {
|
||||
+ struct gsb_command cmd;
|
||||
+ struct bst bst;
|
||||
+ struct bix bix;
|
||||
+ } __packed;
|
||||
+} __packed;
|
||||
+
|
||||
+
|
||||
+#define ACPI_BATTERY_STATE_DISCHARGING BIT(0)
|
||||
+#define ACPI_BATTERY_STATE_CHARGING BIT(1)
|
||||
+#define ACPI_BATTERY_STATE_CRITICAL BIT(2)
|
||||
+
|
||||
+#define MSHW0011_CMD_DEST_BAT0 0x01
|
||||
+#define MSHW0011_CMD_DEST_ADP1 0x03
|
||||
+
|
||||
+#define MSHW0011_CMD_BAT0_STA 0x01
|
||||
+#define MSHW0011_CMD_BAT0_BIX 0x02
|
||||
+#define MSHW0011_CMD_BAT0_BCT 0x03
|
||||
+#define MSHW0011_CMD_BAT0_BTM 0x04
|
||||
+#define MSHW0011_CMD_BAT0_BST 0x05
|
||||
+#define MSHW0011_CMD_BAT0_BTP 0x06
|
||||
+#define MSHW0011_CMD_ADP1_PSR 0x07
|
||||
+#define MSHW0011_CMD_BAT0_PSOC 0x09
|
||||
+#define MSHW0011_CMD_BAT0_PMAX 0x0a
|
||||
+#define MSHW0011_CMD_BAT0_PSRC 0x0b
|
||||
+#define MSHW0011_CMD_BAT0_CHGI 0x0c
|
||||
+#define MSHW0011_CMD_BAT0_ARTG 0x0d
|
||||
+
|
||||
+#define MSHW0011_NOTIFY_GET_VERSION 0x00
|
||||
+#define MSHW0011_NOTIFY_ADP1 0x01
|
||||
+#define MSHW0011_NOTIFY_BAT0_BST 0x02
|
||||
+#define MSHW0011_NOTIFY_BAT0_BIX 0x05
|
||||
+
|
||||
+#define MSHW0011_ADP1_REG_PSR 0x04
|
||||
+
|
||||
+#define MSHW0011_BAT0_REG_CAPACITY 0x0c
|
||||
+#define MSHW0011_BAT0_REG_FULL_CHG_CAPACITY 0x0e
|
||||
+#define MSHW0011_BAT0_REG_DESIGN_CAPACITY 0x40
|
||||
+#define MSHW0011_BAT0_REG_VOLTAGE 0x08
|
||||
+#define MSHW0011_BAT0_REG_RATE 0x14
|
||||
+#define MSHW0011_BAT0_REG_OEM 0x45
|
||||
+#define MSHW0011_BAT0_REG_TYPE 0x4e
|
||||
+#define MSHW0011_BAT0_REG_SERIAL_NO 0x56
|
||||
+#define MSHW0011_BAT0_REG_CYCLE_CNT 0x6e
|
||||
+
|
||||
+#define MSHW0011_EV_2_5 0x1ff
|
||||
+
|
||||
+static int
|
||||
+mshw0011_notify(struct mshw0011_data *cdata, u8 arg1, u8 arg2,
|
||||
+ unsigned int *ret_value)
|
||||
+{
|
||||
+ static const guid_t mshw0011_guid =
|
||||
+ GUID_INIT(0x3F99E367, 0x6220, 0x4955,
|
||||
+ 0x8B, 0x0F, 0x06, 0xEF, 0x2A, 0xE7, 0x94, 0x12);
|
||||
+ union acpi_object *obj;
|
||||
+ struct acpi_device *adev;
|
||||
+ acpi_handle handle;
|
||||
+ unsigned int i;
|
||||
+
|
||||
+ handle = ACPI_HANDLE(&cdata->adp1->dev);
|
||||
+ if (!handle || acpi_bus_get_device(handle, &adev))
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ obj = acpi_evaluate_dsm_typed(handle, &mshw0011_guid, arg1, arg2, NULL,
|
||||
+ ACPI_TYPE_BUFFER);
|
||||
+ if (!obj) {
|
||||
+ dev_err(&cdata->adp1->dev, "device _DSM execution failed\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ *ret_value = 0;
|
||||
+ for (i = 0; i < obj->buffer.length; i++)
|
||||
+ *ret_value |= obj->buffer.pointer[i] << (i * 8);
|
||||
+
|
||||
+ ACPI_FREE(obj);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct bix default_bix = {
|
||||
+ .revision = 0x00,
|
||||
+ .power_unit = 0x01,
|
||||
+ .design_capacity = 0x1dca,
|
||||
+ .last_full_charg_capacity = 0x1dca,
|
||||
+ .battery_technology = 0x01,
|
||||
+ .design_voltage = 0x10df,
|
||||
+ .design_capacity_of_warning = 0x8f,
|
||||
+ .design_capacity_of_low = 0x47,
|
||||
+ .cycle_count = 0xffffffff,
|
||||
+ .measurement_accuracy = 0x00015f90,
|
||||
+ .max_sampling_time = 0x03e8,
|
||||
+ .min_sampling_time = 0x03e8,
|
||||
+ .max_average_interval = 0x03e8,
|
||||
+ .min_average_interval = 0x03e8,
|
||||
+ .battery_capacity_granularity_1 = 0x45,
|
||||
+ .battery_capacity_granularity_2 = 0x11,
|
||||
+ .model = "P11G8M",
|
||||
+ .serial = "",
|
||||
+ .type = "LION",
|
||||
+ .OEM = "",
|
||||
+};
|
||||
+
|
||||
+static int mshw0011_bix(struct mshw0011_data *cdata, struct bix *bix)
|
||||
+{
|
||||
+ struct i2c_client *client = cdata->bat0;
|
||||
+ char buf[10];
|
||||
+ int ret;
|
||||
+
|
||||
+ *bix = default_bix;
|
||||
+
|
||||
+ /* get design capacity */
|
||||
+ ret = i2c_smbus_read_word_data(client,
|
||||
+ MSHW0011_BAT0_REG_DESIGN_CAPACITY);
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&client->dev, "Error reading design capacity: %d\n",
|
||||
+ ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+ bix->design_capacity = ret;
|
||||
+
|
||||
+ /* get last full charge capacity */
|
||||
+ ret = i2c_smbus_read_word_data(client,
|
||||
+ MSHW0011_BAT0_REG_FULL_CHG_CAPACITY);
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&client->dev,
|
||||
+ "Error reading last full charge capacity: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+ bix->last_full_charg_capacity = ret;
|
||||
+
|
||||
+ /* get serial number */
|
||||
+ ret = i2c_smbus_read_i2c_block_data(client, MSHW0011_BAT0_REG_SERIAL_NO,
|
||||
+ 10, buf);
|
||||
+ if (ret != 10) {
|
||||
+ dev_err(&client->dev, "Error reading serial no: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+ snprintf(bix->serial, ARRAY_SIZE(bix->serial),
|
||||
+ "%*pE%*pE", 3, buf + 7, 6, buf);
|
||||
+
|
||||
+ /* get cycle count */
|
||||
+ ret = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_CYCLE_CNT);
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&client->dev, "Error reading cycle count: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+ bix->cycle_count = ret;
|
||||
+
|
||||
+ /* get OEM name */
|
||||
+ ret = i2c_smbus_read_i2c_block_data(client, MSHW0011_BAT0_REG_OEM,
|
||||
+ 4, buf);
|
||||
+ if (ret != 4) {
|
||||
+ dev_err(&client->dev, "Error reading cycle count: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+ snprintf(bix->OEM, ARRAY_SIZE(bix->OEM), "%*pE", 3, buf);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int mshw0011_bst(struct mshw0011_data *cdata, struct bst *bst)
|
||||
+{
|
||||
+ struct i2c_client *client = cdata->bat0;
|
||||
+ int rate, capacity, voltage, state;
|
||||
+ s16 tmp;
|
||||
+
|
||||
+ rate = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_RATE);
|
||||
+ if (rate < 0)
|
||||
+ return rate;
|
||||
+
|
||||
+ capacity = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_CAPACITY);
|
||||
+ if (capacity < 0)
|
||||
+ return capacity;
|
||||
+
|
||||
+ voltage = i2c_smbus_read_word_data(client, MSHW0011_BAT0_REG_VOLTAGE);
|
||||
+ if (voltage < 0)
|
||||
+ return voltage;
|
||||
+
|
||||
+ tmp = rate;
|
||||
+ bst->battery_present_rate = abs((s32)tmp);
|
||||
+
|
||||
+ state = 0;
|
||||
+ if ((s32) tmp > 0)
|
||||
+ state |= ACPI_BATTERY_STATE_CHARGING;
|
||||
+ else if ((s32) tmp < 0)
|
||||
+ state |= ACPI_BATTERY_STATE_DISCHARGING;
|
||||
+ bst->battery_state = state;
|
||||
+
|
||||
+ bst->battery_remaining_capacity = capacity;
|
||||
+ bst->battery_present_voltage = voltage;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int mshw0011_adp_psr(struct mshw0011_data *cdata)
|
||||
+{
|
||||
+ struct i2c_client *client = cdata->adp1;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = i2c_smbus_read_byte_data(client, MSHW0011_ADP1_REG_PSR);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int mshw0011_isr(struct mshw0011_data *cdata)
|
||||
+{
|
||||
+ struct bst bst;
|
||||
+ struct bix bix;
|
||||
+ int ret;
|
||||
+ bool status, bat_status;
|
||||
+
|
||||
+ ret = mshw0011_adp_psr(cdata);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ status = ret;
|
||||
+
|
||||
+ if (status != cdata->charging)
|
||||
+ mshw0011_notify(cdata, cdata->notify_mask,
|
||||
+ MSHW0011_NOTIFY_ADP1, &ret);
|
||||
+
|
||||
+ cdata->charging = status;
|
||||
+
|
||||
+ ret = mshw0011_bst(cdata, &bst);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ bat_status = bst.battery_state;
|
||||
+
|
||||
+ if (bat_status != cdata->bat_charging)
|
||||
+ mshw0011_notify(cdata, cdata->notify_mask,
|
||||
+ MSHW0011_NOTIFY_BAT0_BST, &ret);
|
||||
+
|
||||
+ cdata->bat_charging = bat_status;
|
||||
+
|
||||
+ ret = mshw0011_bix(cdata, &bix);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+ if (bix.last_full_charg_capacity != cdata->full_capacity)
|
||||
+ mshw0011_notify(cdata, cdata->notify_mask,
|
||||
+ MSHW0011_NOTIFY_BAT0_BIX, &ret);
|
||||
+
|
||||
+ cdata->full_capacity = bix.last_full_charg_capacity;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int mshw0011_poll_task(void *data)
|
||||
+{
|
||||
+ struct mshw0011_data *cdata = data;
|
||||
+ int ret = 0;
|
||||
+
|
||||
+ cdata->kthread_running = true;
|
||||
+
|
||||
+ set_freezable();
|
||||
+
|
||||
+ while (!kthread_should_stop()) {
|
||||
+ schedule_timeout_interruptible(POLL_INTERVAL);
|
||||
+ try_to_freeze();
|
||||
+ ret = mshw0011_isr(data);
|
||||
+ if (ret)
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ cdata->kthread_running = false;
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static acpi_status
|
||||
+mshw0011_space_handler(u32 function, acpi_physical_address command,
|
||||
+ u32 bits, u64 *value64,
|
||||
+ void *handler_context, void *region_context)
|
||||
+{
|
||||
+ struct gsb_buffer *gsb = (struct gsb_buffer *)value64;
|
||||
+ struct mshw0011_handler_data *data = handler_context;
|
||||
+ struct acpi_connection_info *info = &data->info;
|
||||
+ struct acpi_resource_i2c_serialbus *sb;
|
||||
+ struct i2c_client *client = data->client;
|
||||
+ struct mshw0011_data *cdata = i2c_get_clientdata(client);
|
||||
+ struct acpi_resource *ares;
|
||||
+ u32 accessor_type = function >> 16;
|
||||
+ acpi_status ret;
|
||||
+ int status = 1;
|
||||
+
|
||||
+ ret = acpi_buffer_to_resource(info->connection, info->length, &ares);
|
||||
+ if (ACPI_FAILURE(ret))
|
||||
+ return ret;
|
||||
+
|
||||
+ if (!value64 || ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS) {
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
+ sb = &ares->data.i2c_serial_bus;
|
||||
+ if (sb->type != ACPI_RESOURCE_SERIAL_TYPE_I2C) {
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
+ if (accessor_type != ACPI_GSB_ACCESS_ATTRIB_RAW_PROCESS) {
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
+ if (gsb->cmd.arg0 == MSHW0011_CMD_DEST_ADP1 &&
|
||||
+ gsb->cmd.arg1 == MSHW0011_CMD_ADP1_PSR) {
|
||||
+ ret = mshw0011_adp_psr(cdata);
|
||||
+ if (ret >= 0) {
|
||||
+ status = ret;
|
||||
+ ret = 0;
|
||||
+ }
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ if (gsb->cmd.arg0 != MSHW0011_CMD_DEST_BAT0) {
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
+ switch (gsb->cmd.arg1) {
|
||||
+ case MSHW0011_CMD_BAT0_STA:
|
||||
+ break;
|
||||
+ case MSHW0011_CMD_BAT0_BIX:
|
||||
+ ret = mshw0011_bix(cdata, &gsb->bix);
|
||||
+ break;
|
||||
+ case MSHW0011_CMD_BAT0_BTP:
|
||||
+ cdata->trip_point = gsb->cmd.arg2;
|
||||
+ break;
|
||||
+ case MSHW0011_CMD_BAT0_BST:
|
||||
+ ret = mshw0011_bst(cdata, &gsb->bst);
|
||||
+ break;
|
||||
+ default:
|
||||
+ pr_info("command(0x%02x) is not supported.\n", gsb->cmd.arg1);
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
+ out:
|
||||
+ gsb->ret = status;
|
||||
+ gsb->status = 0;
|
||||
+
|
||||
+ err:
|
||||
+ ACPI_FREE(ares);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int mshw0011_install_space_handler(struct i2c_client *client)
|
||||
+{
|
||||
+ acpi_handle handle;
|
||||
+ struct mshw0011_handler_data *data;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ handle = ACPI_HANDLE(&client->dev);
|
||||
+
|
||||
+ if (!handle)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ data = kzalloc(sizeof(struct mshw0011_handler_data),
|
||||
+ GFP_KERNEL);
|
||||
+ if (!data)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ data->client = client;
|
||||
+ status = acpi_bus_attach_private_data(handle, (void *)data);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ kfree(data);
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+
|
||||
+ status = acpi_install_address_space_handler(handle,
|
||||
+ ACPI_ADR_SPACE_GSBUS,
|
||||
+ &mshw0011_space_handler,
|
||||
+ NULL,
|
||||
+ data);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(&client->dev, "Error installing i2c space handler\n");
|
||||
+ acpi_bus_detach_private_data(handle);
|
||||
+ kfree(data);
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+
|
||||
+ acpi_walk_dep_device_list(handle);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void mshw0011_remove_space_handler(struct i2c_client *client)
|
||||
+{
|
||||
+ acpi_handle handle = ACPI_HANDLE(&client->dev);
|
||||
+ struct mshw0011_handler_data *data;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ if (!handle)
|
||||
+ return;
|
||||
+
|
||||
+ acpi_remove_address_space_handler(handle,
|
||||
+ ACPI_ADR_SPACE_GSBUS,
|
||||
+ &mshw0011_space_handler);
|
||||
+
|
||||
+ status = acpi_bus_get_private_data(handle, (void **)&data);
|
||||
+ if (ACPI_SUCCESS(status))
|
||||
+ kfree(data);
|
||||
+
|
||||
+ acpi_bus_detach_private_data(handle);
|
||||
+}
|
||||
+
|
||||
+static int mshw0011_probe(struct i2c_client *client)
|
||||
+{
|
||||
+ struct i2c_board_info board_info;
|
||||
+ struct device *dev = &client->dev;
|
||||
+ struct i2c_client *bat0;
|
||||
+
|
||||
+ struct mshw0011_data *data;
|
||||
+ int error, mask;
|
||||
+
|
||||
+ data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
||||
+ if (!data)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ data->adp1 = client;
|
||||
+ i2c_set_clientdata(client, data);
|
||||
+
|
||||
+ memset(&board_info, 0, sizeof(board_info));
|
||||
+ strlcpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE);
|
||||
+
|
||||
+ bat0 = i2c_acpi_new_device(dev, 1, &board_info);
|
||||
+ if (!bat0)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ data->bat0 = bat0;
|
||||
+ i2c_set_clientdata(bat0, data);
|
||||
+
|
||||
+ error = mshw0011_notify(data, 1, MSHW0011_NOTIFY_GET_VERSION, &mask);
|
||||
+ if (error)
|
||||
+ goto out_err;
|
||||
+
|
||||
+ data->notify_mask = mask == MSHW0011_EV_2_5;
|
||||
+
|
||||
+ data->poll_task = kthread_run(mshw0011_poll_task, data, "mshw0011_adp");
|
||||
+ if (IS_ERR(data->poll_task)) {
|
||||
+ error = PTR_ERR(data->poll_task);
|
||||
+ dev_err(&client->dev, "Unable to run kthread err %d\n", error);
|
||||
+ goto out_err;
|
||||
+ }
|
||||
+
|
||||
+ error = mshw0011_install_space_handler(client);
|
||||
+ if (error)
|
||||
+ goto out_err;
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+out_err:
|
||||
+ if (data->kthread_running)
|
||||
+ kthread_stop(data->poll_task);
|
||||
+ i2c_unregister_device(data->bat0);
|
||||
+ return error;
|
||||
+}
|
||||
+
|
||||
+static int mshw0011_remove(struct i2c_client *client)
|
||||
+{
|
||||
+ struct mshw0011_data *cdata = i2c_get_clientdata(client);
|
||||
+
|
||||
+ mshw0011_remove_space_handler(client);
|
||||
+
|
||||
+ if (cdata->kthread_running)
|
||||
+ kthread_stop(cdata->poll_task);
|
||||
+
|
||||
+ i2c_unregister_device(cdata->bat0);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct acpi_device_id mshw0011_acpi_match[] = {
|
||||
+ { "MSHW0011", 0 },
|
||||
+ { }
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, mshw0011_acpi_match);
|
||||
+
|
||||
+static struct i2c_driver mshw0011_driver = {
|
||||
+ .probe_new = mshw0011_probe,
|
||||
+ .remove = mshw0011_remove,
|
||||
+ .driver = {
|
||||
+ .name = "mshw0011",
|
||||
+ .acpi_match_table = ACPI_PTR(mshw0011_acpi_match),
|
||||
+ },
|
||||
+};
|
||||
+module_i2c_driver(mshw0011_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>");
|
||||
+MODULE_DESCRIPTION("mshw0011 driver");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
From a6ecb122a7a0d8ad93890cd3a1e5bd5f44de614a Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
Date: Sun, 5 Jul 2020 14:56:20 +0300
|
||||
Subject: [PATCH] dmaengine: dw: Initialize channel before each transfer
|
||||
|
||||
In some cases DMA can be used only with a consumer which does runtime power
|
||||
management and on the platforms, that have DMA auto power gating logic
|
||||
(see comments in the drivers/acpi/acpi_lpss.c), may result in DMA losing
|
||||
its context. Simple mitigation of this issue is to initialize channel
|
||||
each time the consumer initiates a transfer.
|
||||
|
||||
Fixes: cfdf5b6cc598 ("dw_dmac: add support for Lynxpoint DMA controllers")
|
||||
Reported-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
|
||||
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206403
|
||||
Link: https://lore.kernel.org/r/20200705115620.51929-1-andriy.shevchenko@linux.intel.com
|
||||
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
|
||||
(cherry picked from commit 99ba8b9b0d9780e9937eb1d488d120e9e5c2533d)
|
||||
[Reason for cherry-picking this commit:
|
||||
This commit fixes touch input when using DMA mode on Surface 3's
|
||||
touchscreen.
|
||||
Note: this commit was not backported to v4.19 by upstream. For now,
|
||||
backport this patch ourselves.]
|
||||
[ Conflicts:
|
||||
drivers/dma/dw/core.c
|
||||
Resolved conflict by accepting current change then removed
|
||||
DW_DMA_IS_INITIALIZED lines]
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-touchscreen-dma-fix
|
||||
---
|
||||
drivers/dma/dw/core.c | 12 ------------
|
||||
1 file changed, 12 deletions(-)
|
||||
|
||||
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
|
||||
index 055d83b6cb68..acf64302a2b2 100644
|
||||
--- a/drivers/dma/dw/core.c
|
||||
+++ b/drivers/dma/dw/core.c
|
||||
@@ -180,9 +180,6 @@ static void dwc_initialize(struct dw_dma_chan *dwc)
|
||||
{
|
||||
struct dw_dma *dw = to_dw_dma(dwc->chan.device);
|
||||
|
||||
- if (test_bit(DW_DMA_IS_INITIALIZED, &dwc->flags))
|
||||
- return;
|
||||
-
|
||||
if (dw->pdata->is_idma32)
|
||||
dwc_initialize_chan_idma32(dwc);
|
||||
else
|
||||
@@ -191,8 +188,6 @@ static void dwc_initialize(struct dw_dma_chan *dwc)
|
||||
/* Enable interrupts */
|
||||
channel_set_bit(dw, MASK.XFER, dwc->mask);
|
||||
channel_set_bit(dw, MASK.ERROR, dwc->mask);
|
||||
-
|
||||
- set_bit(DW_DMA_IS_INITIALIZED, &dwc->flags);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
@@ -1091,8 +1086,6 @@ static void idma32_fifo_partition(struct dw_dma *dw)
|
||||
|
||||
static void dw_dma_off(struct dw_dma *dw)
|
||||
{
|
||||
- unsigned int i;
|
||||
-
|
||||
dma_writel(dw, CFG, 0);
|
||||
|
||||
channel_clear_bit(dw, MASK.XFER, dw->all_chan_mask);
|
||||
@@ -1103,9 +1096,6 @@ static void dw_dma_off(struct dw_dma *dw)
|
||||
|
||||
while (dma_readl(dw, CFG) & DW_CFG_DMA_EN)
|
||||
cpu_relax();
|
||||
-
|
||||
- for (i = 0; i < dw->dma.chancnt; i++)
|
||||
- clear_bit(DW_DMA_IS_INITIALIZED, &dw->chan[i].flags);
|
||||
}
|
||||
|
||||
static void dw_dma_on(struct dw_dma *dw)
|
||||
@@ -1170,8 +1160,6 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
|
||||
/* Clear custom channel configuration */
|
||||
memset(&dwc->dws, 0, sizeof(struct dw_dma_slave));
|
||||
|
||||
- clear_bit(DW_DMA_IS_INITIALIZED, &dwc->flags);
|
||||
-
|
||||
/* Disable interrupts */
|
||||
channel_clear_bit(dw, MASK.XFER, dwc->mask);
|
||||
channel_clear_bit(dw, MASK.BLOCK, dwc->mask);
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From f2ac73a1a6535648da848404aa571779dfcf66e4 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/x86/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/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c
|
||||
index 25b176996cb7..58d11877677f 100644
|
||||
--- a/drivers/platform/x86/surface3-wmi.c
|
||||
+++ b/drivers/platform/x86/surface3-wmi.c
|
||||
@@ -41,6 +41,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 9185bd7c5a6d..a514d03ae58f 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3712,6 +3712,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 91bb99b69601..8418938b32ad 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -36,6 +36,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,440 +0,0 @@
|
|||
From be8bb5f93d32d3ac7f918cdbfb04b412673ff80b Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 27 Jul 2019 17:51:37 +0200
|
||||
Subject: [PATCH] platform/x86: surfacepro3_button: Fix device check
|
||||
|
||||
Do not use the surfacepro3_button driver on newer Microsoft Surface
|
||||
models, only use it on the Surface Pro 3 and 4. Newer models (5th, 6th
|
||||
and possibly future generations) use the same device as the Surface Pro
|
||||
4 to represent their volume and power buttons (MSHW0040), but their
|
||||
actual implementation is significantly different. This patch ensures
|
||||
that the surfacepro3_button driver is only used on the Pro 3 and 4
|
||||
models, allowing a different driver to bind on other models.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-buttons
|
||||
---
|
||||
drivers/platform/x86/surfacepro3_button.c | 47 +++++++++++++++++++++++
|
||||
1 file changed, 47 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c
|
||||
index 1b491690ce07..96627627060e 100644
|
||||
--- a/drivers/platform/x86/surfacepro3_button.c
|
||||
+++ b/drivers/platform/x86/surfacepro3_button.c
|
||||
@@ -24,6 +24,12 @@
|
||||
#define SURFACE_BUTTON_OBJ_NAME "VGBI"
|
||||
#define SURFACE_BUTTON_DEVICE_NAME "Surface Pro 3/4 Buttons"
|
||||
|
||||
+#define MSHW0040_DSM_REVISION 0x01
|
||||
+#define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision
|
||||
+static const guid_t MSHW0040_DSM_UUID =
|
||||
+ GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4, 0x95, 0xed, 0xab, 0x16, 0x65,
|
||||
+ 0x49, 0x80, 0x35);
|
||||
+
|
||||
#define SURFACE_BUTTON_NOTIFY_TABLET_MODE 0xc8
|
||||
|
||||
#define SURFACE_BUTTON_NOTIFY_PRESS_POWER 0xc6
|
||||
@@ -146,6 +152,44 @@ static int surface_button_resume(struct device *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * 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.
|
||||
+ *
|
||||
+ * 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.
|
||||
+ */
|
||||
+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;
|
||||
+}
|
||||
+
|
||||
+
|
||||
static int surface_button_add(struct acpi_device *device)
|
||||
{
|
||||
struct surface_button *button;
|
||||
@@ -158,6 +202,9 @@ static int surface_button_add(struct acpi_device *device)
|
||||
strlen(SURFACE_BUTTON_OBJ_NAME)))
|
||||
return -ENODEV;
|
||||
|
||||
+ if (!surface_button_check_MSHW0040(device))
|
||||
+ return -ENODEV;
|
||||
+
|
||||
button = kzalloc(sizeof(struct surface_button), GFP_KERNEL);
|
||||
if (!button)
|
||||
return -ENOMEM;
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From dc6c755a5867401c03cb7ca17396f8d9b05df58d Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 27 Jul 2019 17:52:01 +0200
|
||||
Subject: [PATCH] Input: soc_button_array - Add support for newer surface
|
||||
devices
|
||||
|
||||
Power and volume button support for 5th and 6th generation Microsoft
|
||||
Surface devices via soc_button_array.
|
||||
|
||||
Note that these devices use the same MSHW0040 device as on the Surface
|
||||
Pro 4, however the implementation is different (GPIOs vs. ACPI
|
||||
notifications). Thus some checking is required to ensure we only load
|
||||
this driver on the correct devices.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-buttons
|
||||
---
|
||||
drivers/input/misc/Kconfig | 6 +-
|
||||
drivers/input/misc/soc_button_array.c | 105 +++++++++++++++++++++++---
|
||||
2 files changed, 96 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
|
||||
index ca59a2be9bc5..ea69610370e8 100644
|
||||
--- a/drivers/input/misc/Kconfig
|
||||
+++ b/drivers/input/misc/Kconfig
|
||||
@@ -781,10 +781,10 @@ config INPUT_IDEAPAD_SLIDEBAR
|
||||
|
||||
config INPUT_SOC_BUTTON_ARRAY
|
||||
tristate "Windows-compatible SoC Button Array"
|
||||
- depends on KEYBOARD_GPIO
|
||||
+ depends on KEYBOARD_GPIO && ACPI
|
||||
help
|
||||
- Say Y here if you have a SoC-based tablet that originally
|
||||
- runs Windows 8.
|
||||
+ Say Y here if you have a SoC-based tablet that originally runs
|
||||
+ Windows 8 or a Microsoft Surface Book 2, Pro 5, Laptop 1 or later.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called soc_button_array.
|
||||
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||
index 55cd6e0b409c..8f21c062c85d 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -29,6 +29,11 @@ struct soc_button_info {
|
||||
bool wakeup;
|
||||
};
|
||||
|
||||
+struct soc_device_data {
|
||||
+ const struct soc_button_info *button_info;
|
||||
+ int (*check)(struct device *dev);
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Some of the buttons like volume up/down are auto repeat, while others
|
||||
* are not. To support both, we register two platform devices, and put
|
||||
@@ -91,8 +96,13 @@ soc_button_device_create(struct platform_device *pdev,
|
||||
continue;
|
||||
|
||||
gpio = soc_button_lookup_gpio(&pdev->dev, info->acpi_index);
|
||||
- if (!gpio_is_valid(gpio))
|
||||
+ if (gpio < 0 && gpio != -ENOENT) {
|
||||
+ error = gpio;
|
||||
+ goto err_free_mem;
|
||||
+ } else if (!gpio_is_valid(gpio)) {
|
||||
+ /* Skip GPIO if not present */
|
||||
continue;
|
||||
+ }
|
||||
|
||||
gpio_keys[n_buttons].type = info->event_type;
|
||||
gpio_keys[n_buttons].code = info->event_code;
|
||||
@@ -309,23 +319,26 @@ static int soc_button_remove(struct platform_device *pdev)
|
||||
static int soc_button_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
- const struct acpi_device_id *id;
|
||||
- struct soc_button_info *button_info;
|
||||
+ const struct soc_device_data *device_data;
|
||||
+ const struct soc_button_info *button_info;
|
||||
struct soc_button_data *priv;
|
||||
struct platform_device *pd;
|
||||
int i;
|
||||
int error;
|
||||
|
||||
- id = acpi_match_device(dev->driver->acpi_match_table, dev);
|
||||
- if (!id)
|
||||
- return -ENODEV;
|
||||
+ device_data = acpi_device_get_match_data(dev);
|
||||
+ if (device_data && device_data->check) {
|
||||
+ error = device_data->check(dev);
|
||||
+ if (error)
|
||||
+ return error;
|
||||
+ }
|
||||
|
||||
- if (!id->driver_data) {
|
||||
+ if (device_data && device_data->button_info) {
|
||||
+ button_info = device_data->button_info;
|
||||
+ } else {
|
||||
button_info = soc_button_get_button_info(dev);
|
||||
if (IS_ERR(button_info))
|
||||
return PTR_ERR(button_info);
|
||||
- } else {
|
||||
- button_info = (struct soc_button_info *)id->driver_data;
|
||||
}
|
||||
|
||||
error = gpiod_count(dev, NULL);
|
||||
@@ -357,7 +370,7 @@ static int soc_button_probe(struct platform_device *pdev)
|
||||
if (!priv->children[0] && !priv->children[1])
|
||||
return -ENODEV;
|
||||
|
||||
- if (!id->driver_data)
|
||||
+ if (!device_data || !device_data->button_info)
|
||||
devm_kfree(dev, button_info);
|
||||
|
||||
return 0;
|
||||
@@ -368,7 +381,7 @@ static int soc_button_probe(struct platform_device *pdev)
|
||||
* is defined in section 2.8.7.2 of "Windows ACPI Design Guide for SoC
|
||||
* Platforms"
|
||||
*/
|
||||
-static struct soc_button_info soc_button_PNP0C40[] = {
|
||||
+static const struct soc_button_info soc_button_PNP0C40[] = {
|
||||
{ "power", 0, EV_KEY, KEY_POWER, false, true },
|
||||
{ "home", 1, EV_KEY, KEY_LEFTMETA, false, true },
|
||||
{ "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false },
|
||||
@@ -377,9 +390,77 @@ static struct soc_button_info soc_button_PNP0C40[] = {
|
||||
{ }
|
||||
};
|
||||
|
||||
+static const struct soc_device_data soc_device_PNP0C40 = {
|
||||
+ .button_info = soc_button_PNP0C40,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Special device check for Surface Book 2 and Surface Pro (2017).
|
||||
+ * 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.
|
||||
+ */
|
||||
+#define MSHW0040_DSM_REVISION 0x01
|
||||
+#define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision
|
||||
+static const guid_t MSHW0040_DSM_UUID =
|
||||
+ GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4, 0x95, 0xed, 0xab, 0x16, 0x65,
|
||||
+ 0x49, 0x80, 0x35);
|
||||
+
|
||||
+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;
|
||||
+
|
||||
+ dev_dbg(dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Button infos for Microsoft Surface Book 2 and Surface Pro (2017).
|
||||
+ * Obtained from DSDT/testing.
|
||||
+ */
|
||||
+static const struct soc_button_info soc_button_MSHW0040[] = {
|
||||
+ { "power", 0, EV_KEY, KEY_POWER, false, true },
|
||||
+ { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false },
|
||||
+ { "volume_down", 4, EV_KEY, KEY_VOLUMEDOWN, true, false },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static const struct soc_device_data soc_device_MSHW0040 = {
|
||||
+ .button_info = soc_button_MSHW0040,
|
||||
+ .check = soc_device_check_MSHW0040,
|
||||
+};
|
||||
+
|
||||
static const struct acpi_device_id soc_button_acpi_match[] = {
|
||||
- { "PNP0C40", (unsigned long)soc_button_PNP0C40 },
|
||||
+ { "PNP0C40", (unsigned long)&soc_device_PNP0C40 },
|
||||
{ "ACPI0011", 0 },
|
||||
+
|
||||
+ /* Microsoft Surface Devices (5th and 6th generation) */
|
||||
+ { "MSHW0040", (unsigned long)&soc_device_MSHW0040 },
|
||||
+
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 3495e149d8dc07d035fc87d0820b2e0938ed097b Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoide@redhat.com>
|
||||
Date: Sat, 5 Oct 2019 14:11:58 +0200
|
||||
Subject: [PATCH] Input: soc_button_array - partial revert of support for newer
|
||||
surface devices
|
||||
|
||||
Commit c394159310d0 ("Input: soc_button_array - add support for newer
|
||||
surface devices") not only added support for the MSHW0040 ACPI HID,
|
||||
but for some reason it also makes changes to the error handling of the
|
||||
soc_button_lookup_gpio() call in soc_button_device_create(). Note ideally
|
||||
this seamingly unrelated change would have been made in a separate commit,
|
||||
with a message explaining the what and why of this change.
|
||||
|
||||
I guess this change may have been added to deal with -EPROBE_DEFER errors,
|
||||
but in case of the existing support for PNP0C40 devices, treating
|
||||
-EPROBE_DEFER as any other error is deliberate, see the comment this
|
||||
commit adds for why.
|
||||
|
||||
The actual returning of -EPROBE_DEFER to the caller of soc_button_probe()
|
||||
introduced by the new error checking causes a serious regression:
|
||||
|
||||
On devices with so called virtual GPIOs soc_button_lookup_gpio() will
|
||||
always return -EPROBE_DEFER for these fake GPIOs, when this happens
|
||||
during the second call of soc_button_device_create() we already have
|
||||
successfully registered our first child. This causes the kernel to think
|
||||
we are making progress with probing things even though we unregister the
|
||||
child before again before we return the -EPROBE_DEFER. Since we are making
|
||||
progress the kernel will retry deferred-probes again immediately ending
|
||||
up stuck in a loop with the following showing in dmesg:
|
||||
|
||||
[ 124.022697] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6537
|
||||
[ 124.040764] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6538
|
||||
[ 124.056967] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6539
|
||||
[ 124.072143] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6540
|
||||
[ 124.092373] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6541
|
||||
[ 124.108065] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6542
|
||||
[ 124.128483] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6543
|
||||
[ 124.147141] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6544
|
||||
[ 124.165070] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6545
|
||||
[ 124.179775] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6546
|
||||
[ 124.202726] input: gpio-keys as /devices/platform/INTCFD9:00/gpio-keys.0.auto/input/input6547
|
||||
<continues on and on and on>
|
||||
|
||||
And 1 CPU core being stuck at 100% and udev hanging since it is waiting
|
||||
for the modprobe of soc_button_array to return.
|
||||
|
||||
This patch reverts the soc_button_lookup_gpio() error handling changes,
|
||||
fixing this regression.
|
||||
|
||||
Fixes: c394159310d0 ("Input: soc_button_array - add support for newer surface devices")
|
||||
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=205031
|
||||
Cc: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: surface-buttons
|
||||
---
|
||||
drivers/input/misc/soc_button_array.c | 17 ++++++++++++-----
|
||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||
index 8f21c062c85d..5983733d78dd 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -96,11 +96,18 @@ soc_button_device_create(struct platform_device *pdev,
|
||||
continue;
|
||||
|
||||
gpio = soc_button_lookup_gpio(&pdev->dev, info->acpi_index);
|
||||
- if (gpio < 0 && gpio != -ENOENT) {
|
||||
- error = gpio;
|
||||
- goto err_free_mem;
|
||||
- } else if (!gpio_is_valid(gpio)) {
|
||||
- /* Skip GPIO if not present */
|
||||
+ if (!gpio_is_valid(gpio)) {
|
||||
+ /*
|
||||
+ * Skip GPIO if not present. Note we deliberately
|
||||
+ * ignore -EPROBE_DEFER errors here. On some devices
|
||||
+ * Intel is using so called virtual GPIOs which are not
|
||||
+ * GPIOs at all but some way for AML code to check some
|
||||
+ * random status bits without need a custom opregion.
|
||||
+ * In some cases the resources table we parse points to
|
||||
+ * such a virtual GPIO, since these are not real GPIOs
|
||||
+ * we do not have a driver for these so they will never
|
||||
+ * show up, therefor we ignore -EPROBE_DEFER.
|
||||
+ */
|
||||
continue;
|
||||
}
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 97852be9f07614c8f49c9aaa7308d550d952207d Mon Sep 17 00:00:00 2001
|
||||
From: "Tsuchiya Yuto (kitakar5525)" <kitakar@gmail.com>
|
||||
Date: Mon, 11 May 2020 17:40:21 +0900
|
||||
Subject: [PATCH] Input: soc_button_array - fix Wdiscarded-qualifiers for
|
||||
kernels below 4.20
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
There is a warning from compiler when building v4.19-surface kernel that
|
||||
backported button patches from newer kernels.
|
||||
|
||||
drivers/input/misc/soc_button_array.c: In function ‘soc_button_probe’:
|
||||
drivers/input/misc/soc_button_array.c:381:19: warning: passing argument 2 of ‘devm_kfree’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
|
||||
381 | devm_kfree(dev, button_info);
|
||||
| ^~~~~~~~~~~
|
||||
In file included from ./include/linux/input.h:22,
|
||||
from drivers/input/misc/soc_button_array.c:14:
|
||||
./include/linux/device.h:695:50: note: expected ‘void *’ but argument is of type ‘const struct soc_button_info *’
|
||||
695 | extern void devm_kfree(struct device *dev, void *p);
|
||||
| ~~~~~~^
|
||||
|
||||
This warning happens bacause commit 0571967dfb5d25 ("devres: constify p
|
||||
in devm_kfree()") has not been applied to v4.19 series (available after
|
||||
v4.20-rc1).
|
||||
|
||||
This commit casts button_info to (void *) when calling devm_kfree() to
|
||||
avoid compiler warning.
|
||||
|
||||
Fixes: b892fc124285ba ("Input: soc_button_array - Add support for newer surface devices")
|
||||
Signed-off-by: Tsuchiya Yuto (kitakar5525) <kitakar@gmail.com>
|
||||
Patchset: surface-buttons
|
||||
---
|
||||
drivers/input/misc/soc_button_array.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||
index 5983733d78dd..c564ea99f47d 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -378,7 +378,7 @@ static int soc_button_probe(struct platform_device *pdev)
|
||||
return -ENODEV;
|
||||
|
||||
if (!device_data || !device_data->button_info)
|
||||
- devm_kfree(dev, button_info);
|
||||
+ devm_kfree(dev, (void *)button_info);
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,334 +0,0 @@
|
|||
From 393a9f9995f490d4b17ef4713aa370111b67efeb Mon Sep 17 00:00:00 2001
|
||||
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
||||
Date: Sat, 28 Sep 2019 17:48:21 +0200
|
||||
Subject: [PATCH] nvme: Backport changes for suspend
|
||||
|
||||
Backported commits are:
|
||||
|
||||
- torvalds/linux@4eaefe8c621c6195c91044396ed8060c179f7aae
|
||||
(nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled)
|
||||
|
||||
- torvalds/linux@accd2dd72c8f087441d725dd916688171519e4e6
|
||||
(PCI/ASPM: Add pcie_aspm_enabled())
|
||||
|
||||
- torvalds/linux@d916b1be94b6dc8d293abed2451f3062f6af7551
|
||||
(nvme-pci: use host managed power state for suspend)
|
||||
|
||||
- torvalds/linux@1a87ee657c530bb2f3e39e4ac184d48f5f959cda
|
||||
(nvme: export get and set features)
|
||||
|
||||
- torvalds/linux@d6135c3a1ec0cddda7b8b8e1b5b4abeeafd98289
|
||||
(nvme-pci: Sync queues on reset)
|
||||
|
||||
Patchset: suspend
|
||||
---
|
||||
drivers/nvme/host/core.c | 36 ++++++++++++--
|
||||
drivers/nvme/host/nvme.h | 7 +++
|
||||
drivers/nvme/host/pci.c | 103 +++++++++++++++++++++++++++++++++++++--
|
||||
drivers/pci/pcie/aspm.c | 20 ++++++++
|
||||
include/linux/pci.h | 2 +
|
||||
5 files changed, 162 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
||||
index e64310f2296f..2a46419c5820 100644
|
||||
--- a/drivers/nvme/host/core.c
|
||||
+++ b/drivers/nvme/host/core.c
|
||||
@@ -1065,15 +1065,15 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
|
||||
return id;
|
||||
}
|
||||
|
||||
-static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
|
||||
- void *buffer, size_t buflen, u32 *result)
|
||||
+static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid,
|
||||
+ unsigned int dword11, void *buffer, size_t buflen, u32 *result)
|
||||
{
|
||||
union nvme_result res = { 0 };
|
||||
struct nvme_command c;
|
||||
int ret;
|
||||
|
||||
memset(&c, 0, sizeof(c));
|
||||
- c.features.opcode = nvme_admin_set_features;
|
||||
+ c.features.opcode = op;
|
||||
c.features.fid = cpu_to_le32(fid);
|
||||
c.features.dword11 = cpu_to_le32(dword11);
|
||||
|
||||
@@ -1084,6 +1084,24 @@ static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword
|
||||
return ret;
|
||||
}
|
||||
|
||||
+int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||
+ u32 *result)
|
||||
+{
|
||||
+ return nvme_features(dev, nvme_admin_set_features, fid, dword11, buffer,
|
||||
+ buflen, result);
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(nvme_set_features);
|
||||
+
|
||||
+int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||
+ u32 *result)
|
||||
+{
|
||||
+ return nvme_features(dev, nvme_admin_get_features, fid, dword11, buffer,
|
||||
+ buflen, result);
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(nvme_get_features);
|
||||
+
|
||||
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
|
||||
{
|
||||
u32 q_count = (*count - 1) | ((*count - 1) << 16);
|
||||
@@ -3630,6 +3648,18 @@ static void nvme_free_ctrl(struct device *dev)
|
||||
nvme_put_subsystem(subsys);
|
||||
}
|
||||
|
||||
+
|
||||
+void nvme_sync_queues(struct nvme_ctrl *ctrl)
|
||||
+{
|
||||
+ struct nvme_ns *ns;
|
||||
+
|
||||
+ down_read(&ctrl->namespaces_rwsem);
|
||||
+ list_for_each_entry(ns, &ctrl->namespaces, list)
|
||||
+ blk_sync_queue(ns->queue);
|
||||
+ up_read(&ctrl->namespaces_rwsem);
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(nvme_sync_queues);
|
||||
+
|
||||
/*
|
||||
* Initialize a NVMe controller structures. This needs to be called during
|
||||
* earliest initialization so that we have the initialized structured around
|
||||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
||||
index 276975506709..29e062d29c04 100644
|
||||
--- a/drivers/nvme/host/nvme.h
|
||||
+++ b/drivers/nvme/host/nvme.h
|
||||
@@ -437,6 +437,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
|
||||
void nvme_stop_queues(struct nvme_ctrl *ctrl);
|
||||
void nvme_start_queues(struct nvme_ctrl *ctrl);
|
||||
void nvme_kill_queues(struct nvme_ctrl *ctrl);
|
||||
+void nvme_sync_queues(struct nvme_ctrl *ctrl);
|
||||
void nvme_unfreeze(struct nvme_ctrl *ctrl);
|
||||
void nvme_wait_freeze(struct nvme_ctrl *ctrl);
|
||||
void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);
|
||||
@@ -454,6 +455,12 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
|
||||
union nvme_result *result, void *buffer, unsigned bufflen,
|
||||
unsigned timeout, int qid, int at_head,
|
||||
blk_mq_req_flags_t flags);
|
||||
+int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||
+ u32 *result);
|
||||
+int nvme_get_features(struct nvme_ctrl *dev, unsigned int fid,
|
||||
+ unsigned int dword11, void *buffer, size_t buflen,
|
||||
+ u32 *result);
|
||||
int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count);
|
||||
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);
|
||||
int nvme_reset_ctrl(struct nvme_ctrl *ctrl);
|
||||
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
||||
index d7cf3202cdd3..bdafe953c9a9 100644
|
||||
--- a/drivers/nvme/host/pci.c
|
||||
+++ b/drivers/nvme/host/pci.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/once.h>
|
||||
#include <linux/pci.h>
|
||||
+#include <linux/suspend.h>
|
||||
#include <linux/t10-pi.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/io-64-nonatomic-lo-hi.h>
|
||||
@@ -106,6 +107,7 @@ struct nvme_dev {
|
||||
u32 cmbloc;
|
||||
struct nvme_ctrl ctrl;
|
||||
struct completion ioq_wait;
|
||||
+ u32 last_ps;
|
||||
|
||||
mempool_t *iod_mempool;
|
||||
|
||||
@@ -2286,6 +2288,7 @@ static void nvme_reset_work(struct work_struct *work)
|
||||
*/
|
||||
if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)
|
||||
nvme_dev_disable(dev, false);
|
||||
+ nvme_sync_queues(&dev->ctrl);
|
||||
|
||||
mutex_lock(&dev->shutdown_lock);
|
||||
result = nvme_pci_enable(dev);
|
||||
@@ -2624,16 +2627,101 @@ static void nvme_remove(struct pci_dev *pdev)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
+static int nvme_get_power_state(struct nvme_ctrl *ctrl, u32 *ps)
|
||||
+{
|
||||
+ return nvme_get_features(ctrl, NVME_FEAT_POWER_MGMT, 0, NULL, 0, ps);
|
||||
+}
|
||||
+
|
||||
+static int nvme_set_power_state(struct nvme_ctrl *ctrl, u32 ps)
|
||||
+{
|
||||
+ return nvme_set_features(ctrl, NVME_FEAT_POWER_MGMT, ps, NULL, 0, NULL);
|
||||
+}
|
||||
+
|
||||
+static int nvme_resume(struct device *dev)
|
||||
+{
|
||||
+ struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
|
||||
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
||||
+
|
||||
+ if (ndev->last_ps == U32_MAX ||
|
||||
+ nvme_set_power_state(ctrl, ndev->last_ps) != 0)
|
||||
+ nvme_reset_ctrl(ctrl);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int nvme_suspend(struct device *dev)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(dev);
|
||||
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
||||
+ struct nvme_ctrl *ctrl = &ndev->ctrl;
|
||||
+ int ret = -EBUSY;
|
||||
+
|
||||
+ ndev->last_ps = U32_MAX;
|
||||
+
|
||||
+ /*
|
||||
+ * The platform does not remove power for a kernel managed suspend so
|
||||
+ * use host managed nvme power settings for lowest idle power if
|
||||
+ * possible. This should have quicker resume latency than a full device
|
||||
+ * shutdown. But if the firmware is involved after the suspend or the
|
||||
+ * device does not support any non-default power states, shut down the
|
||||
+ * device fully.
|
||||
+ *
|
||||
+ * If ASPM is not enabled for the device, shut down the device and allow
|
||||
+ * the PCI bus layer to put it into D3 in order to take the PCIe link
|
||||
+ * down, so as to allow the platform to achieve its minimum low-power
|
||||
+ * state (which may not be possible if the link is up).
|
||||
+ */
|
||||
+ if (pm_suspend_via_firmware() || !ctrl->npss ||
|
||||
+ !pcie_aspm_enabled(pdev)) {
|
||||
+ nvme_dev_disable(ndev, true);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ nvme_start_freeze(ctrl);
|
||||
+ nvme_wait_freeze(ctrl);
|
||||
+ nvme_sync_queues(ctrl);
|
||||
+
|
||||
+ if (ctrl->state != NVME_CTRL_LIVE &&
|
||||
+ ctrl->state != NVME_CTRL_ADMIN_ONLY)
|
||||
+ goto unfreeze;
|
||||
+
|
||||
+ ret = nvme_get_power_state(ctrl, &ndev->last_ps);
|
||||
+ if (ret < 0)
|
||||
+ goto unfreeze;
|
||||
+
|
||||
+ ret = nvme_set_power_state(ctrl, ctrl->npss);
|
||||
+ if (ret < 0)
|
||||
+ goto unfreeze;
|
||||
+
|
||||
+ if (ret) {
|
||||
+ /*
|
||||
+ * Clearing npss forces a controller reset on resume. The
|
||||
+ * correct value will be resdicovered then.
|
||||
+ */
|
||||
+ nvme_dev_disable(ndev, true);
|
||||
+ ctrl->npss = 0;
|
||||
+ ret = 0;
|
||||
+ goto unfreeze;
|
||||
+ }
|
||||
+ /*
|
||||
+ * A saved state prevents pci pm from generically controlling the
|
||||
+ * device's power. If we're using protocol specific settings, we don't
|
||||
+ * want pci interfering.
|
||||
+ */
|
||||
+ pci_save_state(pdev);
|
||||
+unfreeze:
|
||||
+ nvme_unfreeze(ctrl);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int nvme_simple_suspend(struct device *dev)
|
||||
+{
|
||||
+ struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
|
||||
|
||||
nvme_dev_disable(ndev, true);
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int nvme_resume(struct device *dev)
|
||||
+static int nvme_simple_resume(struct device *dev)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(dev);
|
||||
struct nvme_dev *ndev = pci_get_drvdata(pdev);
|
||||
@@ -2641,9 +2729,16 @@ static int nvme_resume(struct device *dev)
|
||||
nvme_reset_ctrl(&ndev->ctrl);
|
||||
return 0;
|
||||
}
|
||||
-#endif
|
||||
|
||||
-static SIMPLE_DEV_PM_OPS(nvme_dev_pm_ops, nvme_suspend, nvme_resume);
|
||||
+const struct dev_pm_ops nvme_dev_pm_ops = {
|
||||
+ .suspend = nvme_suspend,
|
||||
+ .resume = nvme_resume,
|
||||
+ .freeze = nvme_simple_suspend,
|
||||
+ .thaw = nvme_simple_resume,
|
||||
+ .poweroff = nvme_simple_suspend,
|
||||
+ .restore = nvme_simple_resume,
|
||||
+};
|
||||
+#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
static pci_ers_result_t nvme_error_detected(struct pci_dev *pdev,
|
||||
pci_channel_state_t state)
|
||||
@@ -2748,9 +2843,11 @@ static struct pci_driver nvme_driver = {
|
||||
.probe = nvme_probe,
|
||||
.remove = nvme_remove,
|
||||
.shutdown = nvme_shutdown,
|
||||
+#ifdef CONFIG_PM_SLEEP
|
||||
.driver = {
|
||||
.pm = &nvme_dev_pm_ops,
|
||||
},
|
||||
+#endif
|
||||
.sriov_configure = pci_sriov_configure_simple,
|
||||
.err_handler = &nvme_err_handler,
|
||||
};
|
||||
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
|
||||
index 279f9f0197b0..cb474338f39d 100644
|
||||
--- a/drivers/pci/pcie/aspm.c
|
||||
+++ b/drivers/pci/pcie/aspm.c
|
||||
@@ -1171,6 +1171,26 @@ static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp)
|
||||
module_param_call(policy, pcie_aspm_set_policy, pcie_aspm_get_policy,
|
||||
NULL, 0644);
|
||||
|
||||
+/**
|
||||
+ * pcie_aspm_enabled - Check if PCIe ASPM has been enabled for a device.
|
||||
+ * @pdev: Target device.
|
||||
+ */
|
||||
+bool pcie_aspm_enabled(struct pci_dev *pdev)
|
||||
+{
|
||||
+ struct pci_dev *bridge = pci_upstream_bridge(pdev);
|
||||
+ bool ret;
|
||||
+
|
||||
+ if (!bridge)
|
||||
+ return false;
|
||||
+
|
||||
+ mutex_lock(&aspm_lock);
|
||||
+ ret = bridge->link_state ? !!bridge->link_state->aspm_enabled : false;
|
||||
+ mutex_unlock(&aspm_lock);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(pcie_aspm_enabled);
|
||||
+
|
||||
#ifdef CONFIG_PCIEASPM_DEBUG
|
||||
static ssize_t link_state_show(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
diff --git a/include/linux/pci.h b/include/linux/pci.h
|
||||
index 2fda9893962d..ec6c48ecd7d5 100644
|
||||
--- a/include/linux/pci.h
|
||||
+++ b/include/linux/pci.h
|
||||
@@ -1488,8 +1488,10 @@ extern bool pcie_ports_native;
|
||||
|
||||
#ifdef CONFIG_PCIEASPM
|
||||
bool pcie_aspm_support_enabled(void);
|
||||
+bool pcie_aspm_enabled(struct pci_dev *pdev);
|
||||
#else
|
||||
static inline bool pcie_aspm_support_enabled(void) { return false; }
|
||||
+static inline bool pcie_aspm_enabled(struct pci_dev *pdev) { return false; }
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PCIEAER
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,394 +0,0 @@
|
|||
From 92deae5f20757e35b3ce78a80845649bb880d2cf Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 16 Aug 2020 23:39:56 +0200
|
||||
Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface
|
||||
device
|
||||
|
||||
Conventionally, wake-up events for a specific device, in our case the
|
||||
lid device, are managed via the ACPI _PRW field. While this does not
|
||||
seem strictly necessary based on ACPI spec, the kernel disables GPE
|
||||
wakeups to avoid non-wakeup interrupts preventing suspend by default and
|
||||
only enables GPEs associated via the _PRW field with a wake-up capable
|
||||
device. This behavior has been introduced in commit
|
||||
|
||||
f941d3e41da7f86bdb9dcc1977c2bcc6b89bfe47
|
||||
ACPI: EC / PM: Disable non-wakeup GPEs for suspend-to-idle
|
||||
|
||||
and is described in more detail in its commit message.
|
||||
|
||||
Unfortunately, on MS Surface devices, there is no _PRW field present on
|
||||
the lid device, thus no GPE is associated with it, and therefore the GPE
|
||||
responsible for sending the status-change notification to the lid gets
|
||||
disabled during suspend, making it impossible to wake the device via the
|
||||
lid.
|
||||
|
||||
This patch introduces a pseudo-device and respective driver which, based
|
||||
on some DMI matching, mark the corresponding GPE of the lid device for
|
||||
wake and enable it during suspend. The behavior of this driver models
|
||||
the behavior of the ACPI/PM core for normal wakeup GPEs, properly
|
||||
declared via the _PRW field.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/x86/Kconfig | 10 +
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/surface_gpe.c | 313 +++++++++++++++++++++++++++++
|
||||
3 files changed, 324 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/surface_gpe.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index 0d20ffdb5a67..4321ec171bcd 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -1168,6 +1168,16 @@ config SURFACE_3_POWER_OPREGION
|
||||
Select this option to enable support for ACPI operation
|
||||
region of the Surface 3 battery platform driver.
|
||||
|
||||
+config SURFACE_GPE
|
||||
+ tristate "Surface GPE/Lid Support Driver"
|
||||
+ depends on ACPI
|
||||
+ depends on DMI
|
||||
+ help
|
||||
+ This driver marks the GPEs related to the ACPI lid device found on
|
||||
+ Microsoft Surface devices as wakeup sources and prepares them
|
||||
+ accordingly. It is required on those devices to allow wake-ups from
|
||||
+ suspend by opening the lid.
|
||||
+
|
||||
config INTEL_PUNIT_IPC
|
||||
tristate "Intel P-Unit IPC Driver"
|
||||
---help---
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index 2ea90039a3e4..49238e9d4abf 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -82,6 +82,7 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
+obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
|
||||
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
|
||||
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
|
||||
diff --git a/drivers/platform/x86/surface_gpe.c b/drivers/platform/x86/surface_gpe.c
|
||||
new file mode 100644
|
||||
index 000000000000..7eaaeacbf408
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/surface_gpe.c
|
||||
@@ -0,0 +1,313 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+/*
|
||||
+ * Surface GPE/Lid driver to enable wakeup from suspend via the lid by
|
||||
+ * properly configuring the respective GPEs. Required for wakeup via lid on
|
||||
+ * newer Intel-based Microsoft Surface devices.
|
||||
+ *
|
||||
+ * Copyright (C) 2020 Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/dmi.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+
|
||||
+struct surface_lid_device {
|
||||
+ u32 gpe_number;
|
||||
+};
|
||||
+
|
||||
+static const struct surface_lid_device lid_device_l17 = {
|
||||
+ .gpe_number = 0x17,
|
||||
+};
|
||||
+
|
||||
+static const struct surface_lid_device lid_device_l4D = {
|
||||
+ .gpe_number = 0x4D,
|
||||
+};
|
||||
+
|
||||
+static const struct surface_lid_device lid_device_l4F = {
|
||||
+ .gpe_number = 0x4F,
|
||||
+};
|
||||
+
|
||||
+static const struct surface_lid_device lid_device_l57 = {
|
||||
+ .gpe_number = 0x57,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+// Note: When changing this don't forget to change the MODULE_ALIAS below.
|
||||
+static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
+ {
|
||||
+ .ident = "Surface Pro 4",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l17,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 5",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to generic product name
|
||||
+ * "Surface Pro".
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l4F,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 5 (LTE)",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to generic product name
|
||||
+ * "Surface Pro"
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l4F,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 6",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l4F,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 7",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 7"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l4D,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Book 1",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l17,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Book 2",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l17,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Book 3",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 3"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l4D,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 1",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l57,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 2",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l57,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 3 (Intel 13\")",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to different variants: The
|
||||
+ * AMD (15") version does not rely on GPEs.
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_3_1867:1868"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l4D,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 3 (Intel 15\")",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to different variants: The
|
||||
+ * AMD (15") version does not rely on GPEs.
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_3_1872"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&lid_device_l4D,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int surface_lid_enable_wakeup(struct device *dev,
|
||||
+ const struct surface_lid_device *lid,
|
||||
+ bool enable)
|
||||
+{
|
||||
+ int action = enable ? ACPI_GPE_ENABLE : ACPI_GPE_DISABLE;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_set_gpe_wake_mask(NULL, lid->gpe_number, action);
|
||||
+ if (status) {
|
||||
+ dev_err(dev, "failed to set GPE wake mask: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int __maybe_unused surface_gpe_suspend(struct device *dev)
|
||||
+{
|
||||
+ const struct surface_lid_device *lid;
|
||||
+
|
||||
+ lid = dev_get_platdata(dev);
|
||||
+ return surface_lid_enable_wakeup(dev, lid, true);
|
||||
+}
|
||||
+
|
||||
+static int __maybe_unused surface_gpe_resume(struct device *dev)
|
||||
+{
|
||||
+ const struct surface_lid_device *lid;
|
||||
+
|
||||
+ lid = dev_get_platdata(dev);
|
||||
+ return surface_lid_enable_wakeup(dev, lid, false);
|
||||
+}
|
||||
+
|
||||
+static SIMPLE_DEV_PM_OPS(surface_gpe_pm, surface_gpe_suspend, surface_gpe_resume);
|
||||
+
|
||||
+
|
||||
+static int surface_gpe_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ const struct surface_lid_device *lid;
|
||||
+ int status;
|
||||
+
|
||||
+ lid = dev_get_platdata(&pdev->dev);
|
||||
+ if (!lid)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ status = acpi_mark_gpe_for_wake(NULL, lid->gpe_number);
|
||||
+ if (status) {
|
||||
+ dev_err(&pdev->dev, "failed to mark GPE for wake: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ status = acpi_enable_gpe(NULL, lid->gpe_number);
|
||||
+ if (status) {
|
||||
+ dev_err(&pdev->dev, "failed to enable GPE: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ status = surface_lid_enable_wakeup(&pdev->dev, lid, false);
|
||||
+ if (status) {
|
||||
+ acpi_disable_gpe(NULL, lid->gpe_number);
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_gpe_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct surface_lid_device *lid = dev_get_platdata(&pdev->dev);
|
||||
+
|
||||
+ /* restore default behavior without this module */
|
||||
+ surface_lid_enable_wakeup(&pdev->dev, lid, false);
|
||||
+ acpi_disable_gpe(NULL, lid->gpe_number);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static struct platform_driver surface_gpe_driver = {
|
||||
+ .probe = surface_gpe_probe,
|
||||
+ .remove = surface_gpe_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surface_gpe",
|
||||
+ .pm = &surface_gpe_pm,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static struct platform_device *surface_gpe_device;
|
||||
+
|
||||
+static int __init surface_gpe_init(void)
|
||||
+{
|
||||
+ const struct dmi_system_id *match;
|
||||
+ const struct surface_lid_device *lid;
|
||||
+ struct platform_device *pdev;
|
||||
+ int status;
|
||||
+
|
||||
+ match = dmi_first_match(dmi_lid_device_table);
|
||||
+ if (!match) {
|
||||
+ pr_info(KBUILD_MODNAME": no device detected, exiting\n");
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ lid = match->driver_data;
|
||||
+
|
||||
+ status = platform_driver_register(&surface_gpe_driver);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ pdev = platform_device_alloc("surface_gpe", PLATFORM_DEVID_NONE);
|
||||
+ if (!pdev) {
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+
|
||||
+ status = platform_device_add_data(pdev, lid, sizeof(*lid));
|
||||
+ if (status) {
|
||||
+ platform_device_put(pdev);
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
+ status = platform_device_add(pdev);
|
||||
+ if (status) {
|
||||
+ platform_device_put(pdev);
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
+ surface_gpe_device = pdev;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void __exit surface_gpe_exit(void)
|
||||
+{
|
||||
+ if (!surface_gpe_device)
|
||||
+ return;
|
||||
+
|
||||
+ platform_device_unregister(surface_gpe_device);
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+}
|
||||
+
|
||||
+module_init(surface_gpe_init);
|
||||
+module_exit(surface_gpe_exit);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Surface GPE/Lid Driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro4:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro6:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro7:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceBook:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceBook2:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceBook3:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop2:*");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop3:*");
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,334 +0,0 @@
|
|||
From 8cacfd20df4e1f52549e7a24c4eafca9f000486b 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.
|
||||
|
||||
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 8ba4122fb340..f9a24b56fec0 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -542,6 +542,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,
|
||||
@@ -649,6 +671,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
}
|
||||
break;
|
||||
|
||||
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
|
||||
+ if (action == ACPI_READ) {
|
||||
+ dev_warn(&adapter->dev,
|
||||
+ "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
+ accessor_type, client->addr);
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ } else {
|
||||
+ status = acpi_gsb_i2c_write_raw_bytes(client,
|
||||
+ gsb->data, info->access_length);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
accessor_type, client->addr);
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From d624ae9e8be201ef02ccd2656acba516ccffd2fa Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 6 Sep 2020 04:01:19 +0200
|
||||
Subject: [PATCH] platform/x86: 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/x86/Kconfig | 7 ++
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/sb1_dgpu_sw.c | 162 +++++++++++++++++++++++++++++
|
||||
3 files changed, 170 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/sb1_dgpu_sw.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index 4321ec171bcd..d1d9ebaecf1c 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -1178,6 +1178,13 @@ config SURFACE_GPE
|
||||
accordingly. It is required on those devices to allow wake-ups from
|
||||
suspend by opening the lid.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on ACPI && 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 INTEL_PUNIT_IPC
|
||||
tristate "Intel P-Unit IPC Driver"
|
||||
---help---
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index 49238e9d4abf..6b028d1ee802 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -83,6 +83,7 @@ obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += sb1_dgpu_sw.o
|
||||
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
|
||||
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
|
||||
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
|
||||
diff --git a/drivers/platform/x86/sb1_dgpu_sw.c b/drivers/platform/x86/sb1_dgpu_sw.c
|
||||
new file mode 100644
|
||||
index 000000000000..8c66ed5110fd
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/sb1_dgpu_sw.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 = "sb1_dgpu_sw",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,233 +0,0 @@
|
|||
From 9fd224cfa2a52560fed23cbdf9272ac08d9c2e0f 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 c20945ed1dc1..93a93f991649 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -38,7 +38,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>
|
||||
@@ -51,6 +54,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_STICKY_FINGERS BIT(16)
|
||||
#define MT_QUIRK_ASUS_CUSTOM_UP BIT(17)
|
||||
#define MT_QUIRK_WIN8_PTP_BUTTONS BIT(18)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(21)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
HID_LATENCY_HIGH = 1,
|
||||
@@ -168,6 +175,8 @@ struct mt_device {
|
||||
|
||||
struct list_head applications;
|
||||
struct list_head reports;
|
||||
+
|
||||
+ struct notifier_block pm_notifier;
|
||||
};
|
||||
|
||||
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||
@@ -207,6 +216,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||
#define MT_CLS_VTL 0x0110
|
||||
#define MT_CLS_GOOGLE 0x0111
|
||||
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
#define MT_MAX_MAXCONTACT 250
|
||||
@@ -357,6 +367,16 @@ static const struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||
},
|
||||
+ { .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
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1669,6 +1689,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1692,6 +1775,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);
|
||||
|
||||
@@ -1716,15 +1802,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)
|
||||
@@ -1760,6 +1850,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);
|
||||
@@ -2107,6 +2198,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
||||
USB_DEVICE_ID_XIROKU_CSR2) },
|
||||
|
||||
+ /* Microsoft Surface type cover */
|
||||
+ { .driver_data = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||
+ USB_VENDOR_ID_MICROSOFT, 0x09c0) },
|
||||
+
|
||||
/* Google MT devices */
|
||||
{ .driver_data = MT_CLS_GOOGLE,
|
||||
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From c90c887eb22ee2a3cc30abb4ca87e41bc45614a9 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Tamas Vajda <zoltan.tamas.vajda@gmail.com>
|
||||
Date: Thu, 3 Jun 2021 10:50:55 +0200
|
||||
Subject: [PATCH] Added quirk for Surface Go touchscreen
|
||||
|
||||
Patchset: surface-go-touchscreen
|
||||
---
|
||||
drivers/hid/hid-ids.h | 1 +
|
||||
drivers/hid/hid-input.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index ee5dce862a21..17a27c2389ff 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -388,6 +388,7 @@
|
||||
#define USB_DEVICE_ID_HP_X2 0x074d
|
||||
#define USB_DEVICE_ID_HP_X2_10_COVER 0x0755
|
||||
#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN 0x2706
|
||||
+#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN 0x261A
|
||||
|
||||
#define USB_VENDOR_ID_ELECOM 0x056e
|
||||
#define USB_DEVICE_ID_ELECOM_BM084 0x0061
|
||||
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
|
||||
index 4dd151b2924e..4f5e58a9b19e 100644
|
||||
--- a/drivers/hid/hid-input.c
|
||||
+++ b/drivers/hid/hid-input.c
|
||||
@@ -336,6 +336,8 @@ static const struct hid_device_id hid_battery_quirks[] = {
|
||||
HID_BATTERY_QUIRK_IGNORE },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN),
|
||||
HID_BATTERY_QUIRK_IGNORE },
|
||||
+ { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),
|
||||
+ HID_BATTERY_QUIRK_IGNORE },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
From df9ba74e96a8e1818028ea6f4a066a2388075377 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-firmware-override
|
||||
---
|
||||
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 436eac342b62..c9028d59bfe2 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -41,6 +41,9 @@ static bool uart_print;
|
||||
static bool skip_otp;
|
||||
static bool rawmode;
|
||||
|
||||
+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);
|
||||
|
||||
@@ -52,6 +55,9 @@ module_param(skip_otp, bool, 0644);
|
||||
module_param(rawmode, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -59,6 +65,9 @@ MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");
|
||||
MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
|
||||
+MODULE_PARM_DESC(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,
|
||||
@@ -705,6 +714,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)
|
||||
@@ -719,6 +764,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
if (dir == NULL)
|
||||
dir = ".";
|
||||
|
||||
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||
+ *
|
||||
+ * Some Surface devices perform better with a different board
|
||||
+ * configuration. To this end, one would need to replace the board.bin
|
||||
+ * file with the modified config and remove the board-2.bin file.
|
||||
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||
+ * we add module options to perform these overrides here.
|
||||
+ */
|
||||
+
|
||||
+ file = ath10k_override_board_fw_file(ar, file);
|
||||
+ if (!file)
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
+
|
||||
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From 06b4da28555fb1498f0c657190f9453841d096bb 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/x86/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/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c
|
||||
index 130b6f52a600..801083aa56d6 100644
|
||||
--- a/drivers/platform/x86/surface3-wmi.c
|
||||
+++ b/drivers/platform/x86/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 420003d062c7..217e488cd4fa 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3687,6 +3687,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 2752dc955733..ef36a316e2ed 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,401 +0,0 @@
|
|||
From c8e815dba673cb2bee346f332dc1ddd5aae837e3 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 16 Aug 2020 23:39:56 +0200
|
||||
Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface
|
||||
device
|
||||
|
||||
Conventionally, wake-up events for a specific device, in our case the
|
||||
lid device, are managed via the ACPI _PRW field. While this does not
|
||||
seem strictly necessary based on ACPI spec, the kernel disables GPE
|
||||
wakeups to avoid non-wakeup interrupts preventing suspend by default and
|
||||
only enables GPEs associated via the _PRW field with a wake-up capable
|
||||
device. This behavior has been introduced in commit
|
||||
|
||||
f941d3e41da7f86bdb9dcc1977c2bcc6b89bfe47
|
||||
ACPI: EC / PM: Disable non-wakeup GPEs for suspend-to-idle
|
||||
|
||||
and is described in more detail in its commit message.
|
||||
|
||||
Unfortunately, on MS Surface devices, there is no _PRW field present on
|
||||
the lid device, thus no GPE is associated with it, and therefore the GPE
|
||||
responsible for sending the status-change notification to the lid gets
|
||||
disabled during suspend, making it impossible to wake the device via the
|
||||
lid.
|
||||
|
||||
This patch introduces a pseudo-device and respective driver which, based
|
||||
on some DMI matching, mark the corresponding GPE of the lid device for
|
||||
wake and enable it during suspend. The behavior of this driver models
|
||||
the behavior of the ACPI/PM core for normal wakeup GPEs, properly
|
||||
declared via the _PRW field.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/x86/Kconfig | 9 +
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/surface_gpe.c | 321 +++++++++++++++++++++++++++++
|
||||
3 files changed, 331 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/surface_gpe.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index a1858689d6e1..11327030b721 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -901,6 +901,15 @@ config SURFACE_PRO3_BUTTON
|
||||
help
|
||||
This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet.
|
||||
|
||||
+config SURFACE_GPE
|
||||
+ tristate "Surface GPE/Lid Driver"
|
||||
+ depends on ACPI
|
||||
+ help
|
||||
+ This driver marks the GPEs related to the ACPI lid device found on
|
||||
+ Microsoft Surface devices as wakeup sources and prepares them
|
||||
+ accordingly. It is required on those devices to allow wake-ups from
|
||||
+ suspend by opening the lid.
|
||||
+
|
||||
config MSI_LAPTOP
|
||||
tristate "MSI Laptop Extras"
|
||||
depends on ACPI
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index 5f823f7eff45..c0d1c753eb3c 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -86,6 +86,7 @@ obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
|
||||
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
+obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
|
||||
# MSI
|
||||
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
|
||||
diff --git a/drivers/platform/x86/surface_gpe.c b/drivers/platform/x86/surface_gpe.c
|
||||
new file mode 100644
|
||||
index 000000000000..86f6991b1215
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/surface_gpe.c
|
||||
@@ -0,0 +1,321 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+/*
|
||||
+ * Surface GPE/Lid driver to enable wakeup from suspend via the lid by
|
||||
+ * properly configuring the respective GPEs. Required for wakeup via lid on
|
||||
+ * newer Intel-based Microsoft Surface devices.
|
||||
+ *
|
||||
+ * Copyright (C) 2020 Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+ */
|
||||
+
|
||||
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
+
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/dmi.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+/*
|
||||
+ * Note: The GPE numbers for the lid devices found below have been obtained
|
||||
+ * from ACPI/the DSDT table, specifically from the GPE handler for the
|
||||
+ * lid.
|
||||
+ */
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l17[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x17),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l4D[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x4D),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l4F[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x4F),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l57[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x57),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Note: When changing this, don't forget to check that the MODULE_ALIAS below
|
||||
+ * still fits.
|
||||
+ */
|
||||
+static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
+ {
|
||||
+ .ident = "Surface Pro 4",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l17,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 5",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to generic product name
|
||||
+ * "Surface Pro".
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4F,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 5 (LTE)",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to generic product name
|
||||
+ * "Surface Pro"
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4F,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 6",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4F,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Pro 7",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 7"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4D,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Book 1",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l17,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Book 2",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l17,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Book 3",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 3"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4D,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 1",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l57,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 2",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l57,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 3 (Intel 13\")",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to different variants: The
|
||||
+ * AMD (15") version does not rely on GPEs.
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_3_1867:1868"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4D,
|
||||
+ },
|
||||
+ {
|
||||
+ .ident = "Surface Laptop 3 (Intel 15\")",
|
||||
+ .matches = {
|
||||
+ /*
|
||||
+ * We match for SKU here due to different variants: The
|
||||
+ * AMD (15") version does not rely on GPEs.
|
||||
+ */
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_3_1872"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4D,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+struct surface_lid_device {
|
||||
+ u32 gpe_number;
|
||||
+};
|
||||
+
|
||||
+static int surface_lid_enable_wakeup(struct device *dev, bool enable)
|
||||
+{
|
||||
+ const struct surface_lid_device *lid = dev_get_drvdata(dev);
|
||||
+ int action = enable ? ACPI_GPE_ENABLE : ACPI_GPE_DISABLE;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_set_gpe_wake_mask(NULL, lid->gpe_number, action);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(dev, "failed to set GPE wake mask: %s\n",
|
||||
+ acpi_format_exception(status));
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int __maybe_unused surface_gpe_suspend(struct device *dev)
|
||||
+{
|
||||
+ return surface_lid_enable_wakeup(dev, true);
|
||||
+}
|
||||
+
|
||||
+static int __maybe_unused surface_gpe_resume(struct device *dev)
|
||||
+{
|
||||
+ return surface_lid_enable_wakeup(dev, false);
|
||||
+}
|
||||
+
|
||||
+static SIMPLE_DEV_PM_OPS(surface_gpe_pm, surface_gpe_suspend, surface_gpe_resume);
|
||||
+
|
||||
+static int surface_gpe_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct surface_lid_device *lid;
|
||||
+ u32 gpe_number;
|
||||
+ acpi_status status;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = device_property_read_u32(&pdev->dev, "gpe", &gpe_number);
|
||||
+ if (ret) {
|
||||
+ dev_err(&pdev->dev, "failed to read 'gpe' property: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ lid = devm_kzalloc(&pdev->dev, sizeof(*lid), GFP_KERNEL);
|
||||
+ if (!lid)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ lid->gpe_number = gpe_number;
|
||||
+ platform_set_drvdata(pdev, lid);
|
||||
+
|
||||
+ status = acpi_mark_gpe_for_wake(NULL, gpe_number);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(&pdev->dev, "failed to mark GPE for wake: %s\n",
|
||||
+ acpi_format_exception(status));
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ status = acpi_enable_gpe(NULL, gpe_number);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(&pdev->dev, "failed to enable GPE: %s\n",
|
||||
+ acpi_format_exception(status));
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ ret = surface_lid_enable_wakeup(&pdev->dev, false);
|
||||
+ if (ret)
|
||||
+ acpi_disable_gpe(NULL, gpe_number);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int surface_gpe_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct surface_lid_device *lid = dev_get_drvdata(&pdev->dev);
|
||||
+
|
||||
+ /* restore default behavior without this module */
|
||||
+ surface_lid_enable_wakeup(&pdev->dev, false);
|
||||
+ acpi_disable_gpe(NULL, lid->gpe_number);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static struct platform_driver surface_gpe_driver = {
|
||||
+ .probe = surface_gpe_probe,
|
||||
+ .remove = surface_gpe_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surface_gpe",
|
||||
+ .pm = &surface_gpe_pm,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct platform_device *surface_gpe_device;
|
||||
+
|
||||
+static int __init surface_gpe_init(void)
|
||||
+{
|
||||
+ const struct dmi_system_id *match;
|
||||
+ struct platform_device *pdev;
|
||||
+ struct fwnode_handle *fwnode;
|
||||
+ int status;
|
||||
+
|
||||
+ match = dmi_first_match(dmi_lid_device_table);
|
||||
+ if (!match) {
|
||||
+ pr_info("no compatible Microsoft Surface device found, exiting\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ status = platform_driver_register(&surface_gpe_driver);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ fwnode = fwnode_create_software_node(match->driver_data, NULL);
|
||||
+ if (IS_ERR(fwnode)) {
|
||||
+ status = PTR_ERR(fwnode);
|
||||
+ goto err_node;
|
||||
+ }
|
||||
+
|
||||
+ pdev = platform_device_alloc("surface_gpe", PLATFORM_DEVID_NONE);
|
||||
+ if (!pdev) {
|
||||
+ status = -ENOMEM;
|
||||
+ goto err_alloc;
|
||||
+ }
|
||||
+
|
||||
+ pdev->dev.fwnode = fwnode;
|
||||
+
|
||||
+ status = platform_device_add(pdev);
|
||||
+ if (status)
|
||||
+ goto err_add;
|
||||
+
|
||||
+ surface_gpe_device = pdev;
|
||||
+ return 0;
|
||||
+
|
||||
+err_add:
|
||||
+ platform_device_put(pdev);
|
||||
+err_alloc:
|
||||
+ fwnode_remove_software_node(fwnode);
|
||||
+err_node:
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+ return status;
|
||||
+}
|
||||
+module_init(surface_gpe_init);
|
||||
+
|
||||
+static void __exit surface_gpe_exit(void)
|
||||
+{
|
||||
+ struct fwnode_handle *fwnode = surface_gpe_device->dev.fwnode;
|
||||
+
|
||||
+ platform_device_unregister(surface_gpe_device);
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+ fwnode_remove_software_node(fwnode);
|
||||
+}
|
||||
+module_exit(surface_gpe_exit);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Surface GPE/Lid Driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurface*:*");
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,335 +0,0 @@
|
|||
From 4d4a140ae77897688918e39798fbb9745f653155 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 37c510d9347a..aed579942436 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -574,6 +574,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,
|
||||
@@ -675,6 +697,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
}
|
||||
break;
|
||||
|
||||
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
|
||||
+ if (action == ACPI_READ) {
|
||||
+ dev_warn(&adapter->dev,
|
||||
+ "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
+ accessor_type, client->addr);
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ } else {
|
||||
+ status = acpi_gsb_i2c_write_raw_bytes(client,
|
||||
+ gsb->data, info->access_length);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
accessor_type, client->addr);
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From d3d2e299bab6c49cd10a49c4f745277a9247dd7a Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 6 Sep 2020 04:01:19 +0200
|
||||
Subject: [PATCH] platform/x86: 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/x86/Kconfig | 7 ++
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/sb1_dgpu_sw.c | 162 +++++++++++++++++++++++++++++
|
||||
3 files changed, 170 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/sb1_dgpu_sw.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index 11327030b721..6a53f63bde62 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -910,6 +910,13 @@ config SURFACE_GPE
|
||||
accordingly. It is required on those devices to allow wake-ups from
|
||||
suspend by opening the lid.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on ACPI && 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 MSI_LAPTOP
|
||||
tristate "MSI Laptop Extras"
|
||||
depends on ACPI
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index c0d1c753eb3c..562d83940e7b 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -87,6 +87,7 @@ obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += sb1_dgpu_sw.o
|
||||
|
||||
# MSI
|
||||
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
|
||||
diff --git a/drivers/platform/x86/sb1_dgpu_sw.c b/drivers/platform/x86/sb1_dgpu_sw.c
|
||||
new file mode 100644
|
||||
index 000000000000..8c66ed5110fd
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/sb1_dgpu_sw.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 = "sb1_dgpu_sw",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,470 +0,0 @@
|
|||
From f255f201f64e16da9651393a9906956d6dcc89d7 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 31 Oct 2020 20:46:33 +0100
|
||||
Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
|
||||
|
||||
While most PCI power-states can be queried from user-space via lspci,
|
||||
this has some limits. Specifically, lspci fails to provide an accurate
|
||||
value when the device is in D3cold as it has to resume the device before
|
||||
it can access its power state via the configuration space, leading to it
|
||||
reporting D0 or another on-state. Thus lspci can, for example, not be
|
||||
used to diagnose power-consumption issues for devices that can enter
|
||||
D3cold or to ensure that devices properly enter D3cold at all.
|
||||
|
||||
To alleviate this issue, introduce a new sysfs device attribute for the
|
||||
PCI power state, showing the current power state as seen by the kernel.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
Documentation/ABI/testing/sysfs-bus-pci | 9 +++++++++
|
||||
drivers/pci/pci-sysfs.c | 12 ++++++++++++
|
||||
2 files changed, 21 insertions(+)
|
||||
|
||||
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
|
||||
index 77ad9ec3c801..25c9c39770c6 100644
|
||||
--- a/Documentation/ABI/testing/sysfs-bus-pci
|
||||
+++ b/Documentation/ABI/testing/sysfs-bus-pci
|
||||
@@ -366,3 +366,12 @@ Contact: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
Description: If ASPM is supported for an endpoint, these files can be
|
||||
used to disable or enable the individual power management
|
||||
states. Write y/1/on to enable, n/0/off to disable.
|
||||
+
|
||||
+What: /sys/bus/pci/devices/.../power_state
|
||||
+Date: November 2020
|
||||
+Contact: Linux PCI developers <linux-pci@vger.kernel.org>
|
||||
+Description:
|
||||
+ This file contains the current PCI power state of the device.
|
||||
+ The value comes from the PCI kernel device state and can be one
|
||||
+ of: "unknown", "error", "D0", D1", "D2", "D3hot", "D3cold".
|
||||
+ The file is read only.
|
||||
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
|
||||
index d15c881e2e7e..b15f754e6346 100644
|
||||
--- a/drivers/pci/pci-sysfs.c
|
||||
+++ b/drivers/pci/pci-sysfs.c
|
||||
@@ -124,6 +124,17 @@ static ssize_t cpulistaffinity_show(struct device *dev,
|
||||
}
|
||||
static DEVICE_ATTR_RO(cpulistaffinity);
|
||||
|
||||
+/* PCI power state */
|
||||
+static ssize_t power_state_show(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ struct pci_dev *pci_dev = to_pci_dev(dev);
|
||||
+ pci_power_t state = READ_ONCE(pci_dev->current_state);
|
||||
+
|
||||
+ return sprintf(buf, "%s\n", pci_power_name(state));
|
||||
+}
|
||||
+static DEVICE_ATTR_RO(power_state);
|
||||
+
|
||||
/* show resources */
|
||||
static ssize_t resource_show(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
@@ -581,6 +592,7 @@ static ssize_t driver_override_show(struct device *dev,
|
||||
static DEVICE_ATTR_RW(driver_override);
|
||||
|
||||
static struct attribute *pci_dev_attrs[] = {
|
||||
+ &dev_attr_power_state.attr,
|
||||
&dev_attr_resource.attr,
|
||||
&dev_attr_vendor.attr,
|
||||
&dev_attr_device.attr,
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From cd1bedb6ac1c78f328d474774dcdaabdc385c409 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Mon, 14 Dec 2020 20:50:59 +0100
|
||||
Subject: [PATCH] platform/x86: Add Surface Hotplug driver
|
||||
|
||||
Add a driver to handle out-of-band hot-plug signaling for the discrete
|
||||
GPU (dGPU) on Microsoft Surface Book 2 and 3 devices. This driver is
|
||||
required to properly detect hot-plugging of the dGPU and relay the
|
||||
appropriate signal to the PCIe hot-plug driver core.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/platform/x86/Kconfig | 20 ++
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/surface_hotplug.c | 282 +++++++++++++++++++++++++
|
||||
3 files changed, 303 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/surface_hotplug.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index d44d3fb9ca72..533998040530 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -1012,6 +1012,26 @@ config SURFACE_GPE
|
||||
accordingly. It is required on those devices to allow wake-ups from
|
||||
suspend by opening the lid.
|
||||
|
||||
+config SURFACE_HOTPLUG
|
||||
+ tristate "Surface Hot-Plug System Driver"
|
||||
+ depends on ACPI
|
||||
+ default m
|
||||
+ help
|
||||
+ Driver for out-of-band hot-plug event signaling on Microsoft Surface
|
||||
+ devices with hot-pluggable PCIe cards.
|
||||
+
|
||||
+ This driver is used on Surface Book (2 and 3) devices with a
|
||||
+ hot-pluggable discrete GPU (dGPU). When not in use, the dGPU on those
|
||||
+ devices can enter D3cold, which prevents in-band (standard) PCIe
|
||||
+ hot-plug signaling. Thus, without this driver, detaching the base
|
||||
+ containing the dGPU will not correctly update the state of the
|
||||
+ corresponding PCIe device if it is in D3cold. This driver adds support
|
||||
+ for out-of-band hot-plug notifications, ensuring that the device state
|
||||
+ is properly updated even when the device in question is in D3cold.
|
||||
+
|
||||
+ Select M or Y here, if you want to (fully) support hot-plugging of
|
||||
+ dGPU devices on the Surface Book 2 and/or 3 during D3cold.
|
||||
+
|
||||
config SURFACE_BOOK1_DGPU_SWITCH
|
||||
tristate "Surface Book 1 dGPU Switch Driver"
|
||||
depends on ACPI && SYSFS
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index 2e0a2896c78d..f552cbfb7914 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -94,6 +94,7 @@ obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
+obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += sb1_dgpu_sw.o
|
||||
|
||||
# MSI
|
||||
diff --git a/drivers/platform/x86/surface_hotplug.c b/drivers/platform/x86/surface_hotplug.c
|
||||
new file mode 100644
|
||||
index 000000000000..cfcc15cfbacb
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/surface_hotplug.c
|
||||
@@ -0,0 +1,282 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Surface Book (2 and later) hot-plug driver.
|
||||
+ *
|
||||
+ * Surface Book devices (can) have a hot-pluggable discrete GPU (dGPU). This
|
||||
+ * driver is responsible for out-of-band hot-plug event signaling on these
|
||||
+ * devices. It is specifically required when the hot-plug device is in D3cold
|
||||
+ * and can thus not generate PCIe hot-plug events itself.
|
||||
+ *
|
||||
+ * Event signaling is handled via ACPI, which will generate the appropriate
|
||||
+ * device-check notifications to be picked up by the PCIe hot-plug driver.
|
||||
+ *
|
||||
+ * Copyright (C) 2019-2021 Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/gpio.h>
|
||||
+#include <linux/interrupt.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/mutex.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+static const struct acpi_gpio_params shps_base_presence_int = { 0, 0, false };
|
||||
+static const struct acpi_gpio_params shps_base_presence = { 1, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_power_int = { 2, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_power = { 3, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_presence_int = { 4, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_presence = { 5, 0, false };
|
||||
+
|
||||
+static const struct acpi_gpio_mapping shps_acpi_gpios[] = {
|
||||
+ { "base_presence-int-gpio", &shps_base_presence_int, 1 },
|
||||
+ { "base_presence-gpio", &shps_base_presence, 1 },
|
||||
+ { "device_power-int-gpio", &shps_device_power_int, 1 },
|
||||
+ { "device_power-gpio", &shps_device_power, 1 },
|
||||
+ { "device_presence-int-gpio", &shps_device_presence_int, 1 },
|
||||
+ { "device_presence-gpio", &shps_device_presence, 1 },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+/* 5515a847-ed55-4b27-8352-cd320e10360a */
|
||||
+static const guid_t shps_dsm_guid =
|
||||
+ GUID_INIT(0x5515a847, 0xed55, 0x4b27, 0x83, 0x52, 0xcd, 0x32, 0x0e, 0x10, 0x36, 0x0a);
|
||||
+
|
||||
+#define SHPS_DSM_REVISION 1
|
||||
+
|
||||
+enum shps_dsm_fn {
|
||||
+ SHPS_DSM_FN_PCI_NUM_ENTRIES = 0x01,
|
||||
+ SHPS_DSM_FN_PCI_GET_ENTRIES = 0x02,
|
||||
+ SHPS_DSM_FN_IRQ_BASE_PRESENCE = 0x03,
|
||||
+ SHPS_DSM_FN_IRQ_DEVICE_POWER = 0x04,
|
||||
+ SHPS_DSM_FN_IRQ_DEVICE_PRESENCE = 0x05,
|
||||
+};
|
||||
+
|
||||
+enum shps_irq_type {
|
||||
+ /* NOTE: Must be in order of enum shps_dsm_fn above. */
|
||||
+ SHPS_IRQ_TYPE_BASE_PRESENCE = 0,
|
||||
+ SHPS_IRQ_TYPE_DEVICE_POWER = 1,
|
||||
+ SHPS_IRQ_TYPE_DEVICE_PRESENCE = 2,
|
||||
+ SHPS_NUM_IRQS,
|
||||
+};
|
||||
+
|
||||
+static const char *const shps_gpio_names[] = {
|
||||
+ [SHPS_IRQ_TYPE_BASE_PRESENCE] = "base_presence",
|
||||
+ [SHPS_IRQ_TYPE_DEVICE_POWER] = "device_power",
|
||||
+ [SHPS_IRQ_TYPE_DEVICE_PRESENCE] = "device_presence",
|
||||
+};
|
||||
+
|
||||
+struct shps_device {
|
||||
+ struct mutex lock[SHPS_NUM_IRQS]; /* Protects update in shps_dsm_notify_irq() */
|
||||
+ struct gpio_desc *gpio[SHPS_NUM_IRQS];
|
||||
+ unsigned int irq[SHPS_NUM_IRQS];
|
||||
+};
|
||||
+
|
||||
+#define SHPS_IRQ_NOT_PRESENT ((unsigned int)-1)
|
||||
+
|
||||
+static enum shps_dsm_fn shps_dsm_fn_for_irq(enum shps_irq_type type)
|
||||
+{
|
||||
+ return SHPS_DSM_FN_IRQ_BASE_PRESENCE + type;
|
||||
+}
|
||||
+
|
||||
+static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type type)
|
||||
+{
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ acpi_handle handle = ACPI_HANDLE(&pdev->dev);
|
||||
+ union acpi_object *result;
|
||||
+ union acpi_object param;
|
||||
+ int value;
|
||||
+
|
||||
+ mutex_lock(&sdev->lock[type]);
|
||||
+
|
||||
+ value = gpiod_get_value_cansleep(sdev->gpio[type]);
|
||||
+ if (value < 0) {
|
||||
+ mutex_unlock(&sdev->lock[type]);
|
||||
+ dev_err(&pdev->dev, "failed to get gpio: %d (irq=%d)\n", type, value);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ dev_dbg(&pdev->dev, "IRQ notification via DSM (irq=%d, value=%d)\n", type, value);
|
||||
+
|
||||
+ param.type = ACPI_TYPE_INTEGER;
|
||||
+ param.integer.value = value;
|
||||
+
|
||||
+ result = acpi_evaluate_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION,
|
||||
+ shps_dsm_fn_for_irq(type), ¶m);
|
||||
+
|
||||
+ if (!result) {
|
||||
+ dev_err(&pdev->dev, "IRQ notification via DSM failed (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+
|
||||
+ } else if (result->type != ACPI_TYPE_BUFFER) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "IRQ notification via DSM failed: unexpected result type (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+
|
||||
+ } else if (result->buffer.length != 1 || result->buffer.pointer[0] != 0) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "IRQ notification via DSM failed: unexpected result value (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+ }
|
||||
+
|
||||
+ mutex_unlock(&sdev->lock[type]);
|
||||
+
|
||||
+ if (result)
|
||||
+ ACPI_FREE(result);
|
||||
+}
|
||||
+
|
||||
+static irqreturn_t shps_handle_irq(int irq, void *data)
|
||||
+{
|
||||
+ struct platform_device *pdev = data;
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ int type;
|
||||
+
|
||||
+ /* Figure out which IRQ we're handling. */
|
||||
+ for (type = 0; type < SHPS_NUM_IRQS; type++)
|
||||
+ if (irq == sdev->irq[type])
|
||||
+ break;
|
||||
+
|
||||
+ /* We should have found our interrupt, if not: this is a bug. */
|
||||
+ if (WARN(type >= SHPS_NUM_IRQS, "invalid IRQ number: %d\n", irq))
|
||||
+ return IRQ_HANDLED;
|
||||
+
|
||||
+ /* Forward interrupt to ACPI via DSM. */
|
||||
+ shps_dsm_notify_irq(pdev, type);
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+static int shps_setup_irq(struct platform_device *pdev, enum shps_irq_type type)
|
||||
+{
|
||||
+ unsigned long flags = IRQF_ONESHOT | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING;
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ struct gpio_desc *gpiod;
|
||||
+ acpi_handle handle = ACPI_HANDLE(&pdev->dev);
|
||||
+ const char *irq_name;
|
||||
+ const int dsm = shps_dsm_fn_for_irq(type);
|
||||
+ int status, irq;
|
||||
+
|
||||
+ /*
|
||||
+ * Only set up interrupts that we actually need: The Surface Book 3
|
||||
+ * does not have a DSM for base presence, so don't set up an interrupt
|
||||
+ * for that.
|
||||
+ */
|
||||
+ if (!acpi_check_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION, BIT(dsm))) {
|
||||
+ dev_dbg(&pdev->dev, "IRQ notification via DSM not present (irq=%d)\n", type);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ gpiod = devm_gpiod_get(&pdev->dev, shps_gpio_names[type], GPIOD_ASIS);
|
||||
+ if (IS_ERR(gpiod))
|
||||
+ return PTR_ERR(gpiod);
|
||||
+
|
||||
+ irq = gpiod_to_irq(gpiod);
|
||||
+ if (irq < 0)
|
||||
+ return irq;
|
||||
+
|
||||
+ irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "shps-irq-%d", type);
|
||||
+ if (!irq_name)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ status = devm_request_threaded_irq(&pdev->dev, irq, NULL, shps_handle_irq,
|
||||
+ flags, irq_name, pdev);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ dev_dbg(&pdev->dev, "set up irq %d as type %d\n", irq, type);
|
||||
+
|
||||
+ sdev->gpio[type] = gpiod;
|
||||
+ sdev->irq[type] = irq;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_hotplug_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ int i;
|
||||
+
|
||||
+ /* Ensure that IRQs have been fully handled and won't trigger any more. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++) {
|
||||
+ if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
|
||||
+ disable_irq(sdev->irq[i]);
|
||||
+
|
||||
+ mutex_destroy(&sdev->lock[i]);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_hotplug_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct shps_device *sdev;
|
||||
+ int status, i;
|
||||
+
|
||||
+ /*
|
||||
+ * The MSHW0153 device is also present on the Surface Laptop 3,
|
||||
+ * however that doesn't have a hot-pluggable PCIe device. It also
|
||||
+ * doesn't have any GPIO interrupts/pins under the MSHW0153, so filter
|
||||
+ * it out here.
|
||||
+ */
|
||||
+ if (gpiod_count(&pdev->dev, NULL) < 0)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ status = devm_acpi_dev_add_driver_gpios(&pdev->dev, shps_acpi_gpios);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL);
|
||||
+ if (!sdev)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ platform_set_drvdata(pdev, sdev);
|
||||
+
|
||||
+ /*
|
||||
+ * Initialize IRQs so that we can safely call surface_hotplug_remove()
|
||||
+ * on errors.
|
||||
+ */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++)
|
||||
+ sdev->irq[i] = SHPS_IRQ_NOT_PRESENT;
|
||||
+
|
||||
+ /* Set up IRQs. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++) {
|
||||
+ mutex_init(&sdev->lock[i]);
|
||||
+
|
||||
+ status = shps_setup_irq(pdev, i);
|
||||
+ if (status) {
|
||||
+ dev_err(&pdev->dev, "failed to set up IRQ %d: %d\n", i, status);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Ensure everything is up-to-date. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++)
|
||||
+ if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
|
||||
+ shps_dsm_notify_irq(pdev, i);
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+err:
|
||||
+ surface_hotplug_remove(pdev);
|
||||
+ return status;
|
||||
+}
|
||||
+
|
||||
+static const struct acpi_device_id surface_hotplug_acpi_match[] = {
|
||||
+ { "MSHW0153", 0 },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, surface_hotplug_acpi_match);
|
||||
+
|
||||
+static struct platform_driver surface_hotplug_driver = {
|
||||
+ .probe = surface_hotplug_probe,
|
||||
+ .remove = surface_hotplug_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surface_hotplug",
|
||||
+ .acpi_match_table = surface_hotplug_acpi_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(surface_hotplug_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 4a19147e3089c339a35adf8babad555cda52cb2e Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 2 Jul 2021 14:35:43 +0200
|
||||
Subject: [PATCH] Revert "Revert "PCI: PM: Do not read power state in
|
||||
pci_enable_device_flags()""
|
||||
|
||||
This reverts commit f11f9ff8a7c97b2a3990c7322304627d9b58d362.
|
||||
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/pci/pci.c | 16 +++-------------
|
||||
1 file changed, 3 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||
index 29f5d699fa06..c73fcdff0c16 100644
|
||||
--- a/drivers/pci/pci.c
|
||||
+++ b/drivers/pci/pci.c
|
||||
@@ -1874,20 +1874,10 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
|
||||
int err;
|
||||
int i, bars = 0;
|
||||
|
||||
- /*
|
||||
- * Power state could be unknown at this point, either due to a fresh
|
||||
- * boot or a device removal call. So get the current power state
|
||||
- * so that things like MSI message writing will behave as expected
|
||||
- * (e.g. if the device really is in D0 at enable time).
|
||||
- */
|
||||
- if (dev->pm_cap) {
|
||||
- u16 pmcsr;
|
||||
- pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
|
||||
- dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
|
||||
- }
|
||||
-
|
||||
- if (atomic_inc_return(&dev->enable_cnt) > 1)
|
||||
+ if (atomic_inc_return(&dev->enable_cnt) > 1) {
|
||||
+ pci_update_current_state(dev, dev->current_state);
|
||||
return 0; /* already enabled */
|
||||
+ }
|
||||
|
||||
bridge = pci_upstream_bridge(dev);
|
||||
if (bridge)
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From 780663211d7d594890a6d386e40ce8d11b98cc9c 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 e5a3704b9fe8..14910d6b7e24 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)
|
||||
@@ -70,12 +74,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_WIN8_PTP_BUTTONS BIT(18)
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(21)
|
||||
|
||||
#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,
|
||||
@@ -167,6 +174,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,
|
||||
@@ -208,6 +217,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
|
||||
@@ -367,6 +377,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
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1678,6 +1698,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1701,6 +1784,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);
|
||||
|
||||
@@ -1730,15 +1816,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)
|
||||
@@ -1774,6 +1864,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);
|
||||
@@ -2125,6 +2216,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
||||
USB_DEVICE_ID_XIROKU_CSR2) },
|
||||
|
||||
+ /* Microsoft Surface type cover */
|
||||
+ { .driver_data = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||
+ USB_VENDOR_ID_MICROSOFT, 0x09c0) },
|
||||
+
|
||||
/* Google MT devices */
|
||||
{ .driver_data = MT_CLS_GOOGLE,
|
||||
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From f1dc20f48a1c7581e9b48b3d606356ce7516d9ce Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Tamas Vajda <zoltan.tamas.vajda@gmail.com>
|
||||
Date: Thu, 3 Jun 2021 10:50:55 +0200
|
||||
Subject: [PATCH] Added quirk for Surface Go touchscreen
|
||||
|
||||
Patchset: surface-go-touchscreen
|
||||
---
|
||||
drivers/hid/hid-ids.h | 1 +
|
||||
drivers/hid/hid-input.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 136b58a91c04..28150a359970 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -390,6 +390,7 @@
|
||||
#define USB_DEVICE_ID_HP_X2 0x074d
|
||||
#define USB_DEVICE_ID_HP_X2_10_COVER 0x0755
|
||||
#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN 0x2706
|
||||
+#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN 0x261A
|
||||
|
||||
#define USB_VENDOR_ID_ELECOM 0x056e
|
||||
#define USB_DEVICE_ID_ELECOM_BM084 0x0061
|
||||
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
|
||||
index d1ab2dccf6fd..4548eace4d9f 100644
|
||||
--- a/drivers/hid/hid-input.c
|
||||
+++ b/drivers/hid/hid-input.c
|
||||
@@ -324,6 +324,8 @@ static const struct hid_device_id hid_battery_quirks[] = {
|
||||
HID_BATTERY_QUIRK_IGNORE },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN),
|
||||
HID_BATTERY_QUIRK_IGNORE },
|
||||
+ { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),
|
||||
+ HID_BATTERY_QUIRK_IGNORE },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From 76b74003480901a745b19c4a28ccd4dcabdbe42f Mon Sep 17 00:00:00 2001
|
||||
From: Max Leiter <maxwell.leiter@gmail.com>
|
||||
Date: Sat, 19 Dec 2020 17:50:55 -0800
|
||||
Subject: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in
|
||||
apds9960 driver
|
||||
|
||||
The device is used in the Microsoft Surface Book 3 and Surface Pro 7
|
||||
|
||||
Signed-off-by: Max Leiter <maxwell.leiter@gmail.com>
|
||||
Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
|
||||
Link: https://lore.kernel.org/r/20201220015057.107246-1-maxwell.leiter@gmail.com
|
||||
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
|
||||
Patchset: surface-sensors
|
||||
---
|
||||
drivers/iio/light/apds9960.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
|
||||
index 9afb3fcc74e6..20719141c03a 100644
|
||||
--- a/drivers/iio/light/apds9960.c
|
||||
+++ b/drivers/iio/light/apds9960.c
|
||||
@@ -8,6 +8,7 @@
|
||||
* TODO: gesture + proximity calib offsets
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
@@ -1113,6 +1114,12 @@ static const struct i2c_device_id apds9960_id[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, apds9960_id);
|
||||
|
||||
+static const struct acpi_device_id apds9960_acpi_match[] = {
|
||||
+ { "MSHW0184" },
|
||||
+ { }
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, apds9960_acpi_match);
|
||||
+
|
||||
static const struct of_device_id apds9960_of_match[] = {
|
||||
{ .compatible = "avago,apds9960" },
|
||||
{ }
|
||||
@@ -1124,6 +1131,7 @@ static struct i2c_driver apds9960_driver = {
|
||||
.name = APDS9960_DRV_NAME,
|
||||
.of_match_table = apds9960_of_match,
|
||||
.pm = &apds9960_pm_ops,
|
||||
+ .acpi_match_table = apds9960_acpi_match,
|
||||
},
|
||||
.probe = apds9960_probe,
|
||||
.remove = apds9960_remove,
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,121 +0,0 @@
|
|||
From f1a7edd0afcfe48655860b056f689dae10dd46f9 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-firmware-override
|
||||
---
|
||||
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 d73ad60b571c..f242fd4b81a6 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -809,6 +818,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)
|
||||
@@ -823,6 +868,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
if (dir == NULL)
|
||||
dir = ".";
|
||||
|
||||
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||
+ *
|
||||
+ * Some Surface devices perform better with a different board
|
||||
+ * configuration. To this end, one would need to replace the board.bin
|
||||
+ * file with the modified config and remove the board-2.bin file.
|
||||
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||
+ * we add module options to perform these overrides here.
|
||||
+ */
|
||||
+
|
||||
+ file = ath10k_override_board_fw_file(ar, file);
|
||||
+ if (!file)
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
+
|
||||
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From e6d25f7538426bd45706329a13c6ec2523f5899b 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 130b6f52a600..801083aa56d6 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 420003d062c7..217e488cd4fa 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3687,6 +3687,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 2752dc955733..ef36a316e2ed 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.31.1
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,334 +0,0 @@
|
|||
From 0067d01f09367874f590189dcb2260ad9f6b4bda 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 37c510d9347a..aed579942436 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -574,6 +574,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,
|
||||
@@ -675,6 +697,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.31.1
|
||||
|
||||
From 51f8d840fd9411b02204f964ede35356fc4e001f 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 2c941cdac9ee..b5dc9148066c 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -41,6 +41,13 @@ config SURFACE_3_POWER_OPREGION
|
||||
This driver provides support for ACPI operation
|
||||
region of the Surface 3 battery platform driver.
|
||||
|
||||
+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_GPE
|
||||
tristate "Surface GPE/Lid Support Driver"
|
||||
depends on DMI
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index cedfb027ded1..3d5fa0daa56b 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -7,5 +7,6 @@
|
||||
obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
|
||||
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.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.31.1
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,386 +0,0 @@
|
|||
From cd52292158d7d66780db63a93606d7ba6a84e96d Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 5 Feb 2021 02:26:57 +0100
|
||||
Subject: [PATCH] platform/surface: Add Surface Hot-Plug driver
|
||||
|
||||
Some Surface Book 2 and 3 models have a discrete GPU (dGPU) that is
|
||||
hot-pluggable. On those devices, the dGPU is contained in the base,
|
||||
which can be separated from the tablet part (containing CPU and
|
||||
touchscreen) while the device is running.
|
||||
|
||||
It (in general) is presented as/behaves like a standard PCIe hot-plug
|
||||
capable device, however, this device can also be put into D3cold. In
|
||||
D3cold, the device itself is turned off and can thus not submit any
|
||||
standard PCIe hot-plug events. To properly detect hot-(un)plugging while
|
||||
the dGPU is in D3cold, out-of-band signaling is required. Without this,
|
||||
the device state will only get updated during the next bus-check, eg.
|
||||
via a manually issued lspci call.
|
||||
|
||||
This commit adds a driver to handle out-of-band PCIe hot-(un)plug events
|
||||
on Microsoft Surface devices. On those devices, said events can be
|
||||
detected via GPIO interrupts, which are then forwarded to the
|
||||
corresponding ACPI DSM calls by this driver. The DSM then takes care of
|
||||
issuing the appropriate bus-/device-check, causing the PCI core to
|
||||
properly pick up the device change.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Link: https://lore.kernel.org/r/20210205012657.1951753-1-luzmaximilian@gmail.com
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
MAINTAINERS | 6 +
|
||||
drivers/platform/surface/Kconfig | 19 ++
|
||||
drivers/platform/surface/Makefile | 1 +
|
||||
drivers/platform/surface/surface_hotplug.c | 282 +++++++++++++++++++++
|
||||
4 files changed, 308 insertions(+)
|
||||
create mode 100644 drivers/platform/surface/surface_hotplug.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 3d57740df499..d1b36e222cd1 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -11823,6 +11823,12 @@ L: platform-driver-x86@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/hid/surface-hid/
|
||||
|
||||
+MICROSOFT SURFACE HOT-PLUG DRIVER
|
||||
+M: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+L: platform-driver-x86@vger.kernel.org
|
||||
+S: Maintained
|
||||
+F: drivers/platform/surface/surface_hotplug.c
|
||||
+
|
||||
MICROSOFT SURFACE PRO 3 BUTTON DRIVER
|
||||
M: Chen Yu <yu.c.chen@intel.com>
|
||||
L: platform-driver-x86@vger.kernel.org
|
||||
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
|
||||
index 3ceeb316d56e..2784a480f310 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -140,6 +140,25 @@ config SURFACE_GPE
|
||||
accordingly. It is required on those devices to allow wake-ups from
|
||||
suspend by opening the lid.
|
||||
|
||||
+config SURFACE_HOTPLUG
|
||||
+ tristate "Surface Hot-Plug Driver"
|
||||
+ depends on GPIOLIB
|
||||
+ help
|
||||
+ Driver for out-of-band hot-plug event signaling on Microsoft Surface
|
||||
+ devices with hot-pluggable PCIe cards.
|
||||
+
|
||||
+ This driver is used on Surface Book (2 and 3) devices with a
|
||||
+ hot-pluggable discrete GPU (dGPU). When not in use, the dGPU on those
|
||||
+ devices can enter D3cold, which prevents in-band (standard) PCIe
|
||||
+ hot-plug signaling. Thus, without this driver, detaching the base
|
||||
+ containing the dGPU will not correctly update the state of the
|
||||
+ corresponding PCIe device if it is in D3cold. This driver adds support
|
||||
+ for out-of-band hot-plug notifications, ensuring that the device state
|
||||
+ is properly updated even when the device in question is in D3cold.
|
||||
+
|
||||
+ Select M or Y here, if you want to (fully) support hot-plugging of
|
||||
+ dGPU devices on the Surface Book 2 and/or 3 during D3cold.
|
||||
+
|
||||
config SURFACE_PERFMODE
|
||||
tristate "Surface Performance-Mode Driver"
|
||||
depends on SURFACE_AGGREGATOR_BUS
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index 31098983decc..a103fdb3ef1a 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -14,5 +14,6 @@ obj-$(CONFIG_SURFACE_AGGREGATOR_REGISTRY) += surface_aggregator_registry.o
|
||||
obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_DTX) += surface_dtx.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
+obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
obj-$(CONFIG_SURFACE_PERFMODE) += surface_perfmode.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
diff --git a/drivers/platform/surface/surface_hotplug.c b/drivers/platform/surface/surface_hotplug.c
|
||||
new file mode 100644
|
||||
index 000000000000..cfcc15cfbacb
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/surface/surface_hotplug.c
|
||||
@@ -0,0 +1,282 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Surface Book (2 and later) hot-plug driver.
|
||||
+ *
|
||||
+ * Surface Book devices (can) have a hot-pluggable discrete GPU (dGPU). This
|
||||
+ * driver is responsible for out-of-band hot-plug event signaling on these
|
||||
+ * devices. It is specifically required when the hot-plug device is in D3cold
|
||||
+ * and can thus not generate PCIe hot-plug events itself.
|
||||
+ *
|
||||
+ * Event signaling is handled via ACPI, which will generate the appropriate
|
||||
+ * device-check notifications to be picked up by the PCIe hot-plug driver.
|
||||
+ *
|
||||
+ * Copyright (C) 2019-2021 Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/gpio.h>
|
||||
+#include <linux/interrupt.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/mutex.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+static const struct acpi_gpio_params shps_base_presence_int = { 0, 0, false };
|
||||
+static const struct acpi_gpio_params shps_base_presence = { 1, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_power_int = { 2, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_power = { 3, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_presence_int = { 4, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_presence = { 5, 0, false };
|
||||
+
|
||||
+static const struct acpi_gpio_mapping shps_acpi_gpios[] = {
|
||||
+ { "base_presence-int-gpio", &shps_base_presence_int, 1 },
|
||||
+ { "base_presence-gpio", &shps_base_presence, 1 },
|
||||
+ { "device_power-int-gpio", &shps_device_power_int, 1 },
|
||||
+ { "device_power-gpio", &shps_device_power, 1 },
|
||||
+ { "device_presence-int-gpio", &shps_device_presence_int, 1 },
|
||||
+ { "device_presence-gpio", &shps_device_presence, 1 },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+/* 5515a847-ed55-4b27-8352-cd320e10360a */
|
||||
+static const guid_t shps_dsm_guid =
|
||||
+ GUID_INIT(0x5515a847, 0xed55, 0x4b27, 0x83, 0x52, 0xcd, 0x32, 0x0e, 0x10, 0x36, 0x0a);
|
||||
+
|
||||
+#define SHPS_DSM_REVISION 1
|
||||
+
|
||||
+enum shps_dsm_fn {
|
||||
+ SHPS_DSM_FN_PCI_NUM_ENTRIES = 0x01,
|
||||
+ SHPS_DSM_FN_PCI_GET_ENTRIES = 0x02,
|
||||
+ SHPS_DSM_FN_IRQ_BASE_PRESENCE = 0x03,
|
||||
+ SHPS_DSM_FN_IRQ_DEVICE_POWER = 0x04,
|
||||
+ SHPS_DSM_FN_IRQ_DEVICE_PRESENCE = 0x05,
|
||||
+};
|
||||
+
|
||||
+enum shps_irq_type {
|
||||
+ /* NOTE: Must be in order of enum shps_dsm_fn above. */
|
||||
+ SHPS_IRQ_TYPE_BASE_PRESENCE = 0,
|
||||
+ SHPS_IRQ_TYPE_DEVICE_POWER = 1,
|
||||
+ SHPS_IRQ_TYPE_DEVICE_PRESENCE = 2,
|
||||
+ SHPS_NUM_IRQS,
|
||||
+};
|
||||
+
|
||||
+static const char *const shps_gpio_names[] = {
|
||||
+ [SHPS_IRQ_TYPE_BASE_PRESENCE] = "base_presence",
|
||||
+ [SHPS_IRQ_TYPE_DEVICE_POWER] = "device_power",
|
||||
+ [SHPS_IRQ_TYPE_DEVICE_PRESENCE] = "device_presence",
|
||||
+};
|
||||
+
|
||||
+struct shps_device {
|
||||
+ struct mutex lock[SHPS_NUM_IRQS]; /* Protects update in shps_dsm_notify_irq() */
|
||||
+ struct gpio_desc *gpio[SHPS_NUM_IRQS];
|
||||
+ unsigned int irq[SHPS_NUM_IRQS];
|
||||
+};
|
||||
+
|
||||
+#define SHPS_IRQ_NOT_PRESENT ((unsigned int)-1)
|
||||
+
|
||||
+static enum shps_dsm_fn shps_dsm_fn_for_irq(enum shps_irq_type type)
|
||||
+{
|
||||
+ return SHPS_DSM_FN_IRQ_BASE_PRESENCE + type;
|
||||
+}
|
||||
+
|
||||
+static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type type)
|
||||
+{
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ acpi_handle handle = ACPI_HANDLE(&pdev->dev);
|
||||
+ union acpi_object *result;
|
||||
+ union acpi_object param;
|
||||
+ int value;
|
||||
+
|
||||
+ mutex_lock(&sdev->lock[type]);
|
||||
+
|
||||
+ value = gpiod_get_value_cansleep(sdev->gpio[type]);
|
||||
+ if (value < 0) {
|
||||
+ mutex_unlock(&sdev->lock[type]);
|
||||
+ dev_err(&pdev->dev, "failed to get gpio: %d (irq=%d)\n", type, value);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ dev_dbg(&pdev->dev, "IRQ notification via DSM (irq=%d, value=%d)\n", type, value);
|
||||
+
|
||||
+ param.type = ACPI_TYPE_INTEGER;
|
||||
+ param.integer.value = value;
|
||||
+
|
||||
+ result = acpi_evaluate_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION,
|
||||
+ shps_dsm_fn_for_irq(type), ¶m);
|
||||
+
|
||||
+ if (!result) {
|
||||
+ dev_err(&pdev->dev, "IRQ notification via DSM failed (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+
|
||||
+ } else if (result->type != ACPI_TYPE_BUFFER) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "IRQ notification via DSM failed: unexpected result type (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+
|
||||
+ } else if (result->buffer.length != 1 || result->buffer.pointer[0] != 0) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "IRQ notification via DSM failed: unexpected result value (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+ }
|
||||
+
|
||||
+ mutex_unlock(&sdev->lock[type]);
|
||||
+
|
||||
+ if (result)
|
||||
+ ACPI_FREE(result);
|
||||
+}
|
||||
+
|
||||
+static irqreturn_t shps_handle_irq(int irq, void *data)
|
||||
+{
|
||||
+ struct platform_device *pdev = data;
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ int type;
|
||||
+
|
||||
+ /* Figure out which IRQ we're handling. */
|
||||
+ for (type = 0; type < SHPS_NUM_IRQS; type++)
|
||||
+ if (irq == sdev->irq[type])
|
||||
+ break;
|
||||
+
|
||||
+ /* We should have found our interrupt, if not: this is a bug. */
|
||||
+ if (WARN(type >= SHPS_NUM_IRQS, "invalid IRQ number: %d\n", irq))
|
||||
+ return IRQ_HANDLED;
|
||||
+
|
||||
+ /* Forward interrupt to ACPI via DSM. */
|
||||
+ shps_dsm_notify_irq(pdev, type);
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+static int shps_setup_irq(struct platform_device *pdev, enum shps_irq_type type)
|
||||
+{
|
||||
+ unsigned long flags = IRQF_ONESHOT | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING;
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ struct gpio_desc *gpiod;
|
||||
+ acpi_handle handle = ACPI_HANDLE(&pdev->dev);
|
||||
+ const char *irq_name;
|
||||
+ const int dsm = shps_dsm_fn_for_irq(type);
|
||||
+ int status, irq;
|
||||
+
|
||||
+ /*
|
||||
+ * Only set up interrupts that we actually need: The Surface Book 3
|
||||
+ * does not have a DSM for base presence, so don't set up an interrupt
|
||||
+ * for that.
|
||||
+ */
|
||||
+ if (!acpi_check_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION, BIT(dsm))) {
|
||||
+ dev_dbg(&pdev->dev, "IRQ notification via DSM not present (irq=%d)\n", type);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ gpiod = devm_gpiod_get(&pdev->dev, shps_gpio_names[type], GPIOD_ASIS);
|
||||
+ if (IS_ERR(gpiod))
|
||||
+ return PTR_ERR(gpiod);
|
||||
+
|
||||
+ irq = gpiod_to_irq(gpiod);
|
||||
+ if (irq < 0)
|
||||
+ return irq;
|
||||
+
|
||||
+ irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "shps-irq-%d", type);
|
||||
+ if (!irq_name)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ status = devm_request_threaded_irq(&pdev->dev, irq, NULL, shps_handle_irq,
|
||||
+ flags, irq_name, pdev);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ dev_dbg(&pdev->dev, "set up irq %d as type %d\n", irq, type);
|
||||
+
|
||||
+ sdev->gpio[type] = gpiod;
|
||||
+ sdev->irq[type] = irq;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_hotplug_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ int i;
|
||||
+
|
||||
+ /* Ensure that IRQs have been fully handled and won't trigger any more. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++) {
|
||||
+ if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
|
||||
+ disable_irq(sdev->irq[i]);
|
||||
+
|
||||
+ mutex_destroy(&sdev->lock[i]);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_hotplug_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct shps_device *sdev;
|
||||
+ int status, i;
|
||||
+
|
||||
+ /*
|
||||
+ * The MSHW0153 device is also present on the Surface Laptop 3,
|
||||
+ * however that doesn't have a hot-pluggable PCIe device. It also
|
||||
+ * doesn't have any GPIO interrupts/pins under the MSHW0153, so filter
|
||||
+ * it out here.
|
||||
+ */
|
||||
+ if (gpiod_count(&pdev->dev, NULL) < 0)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ status = devm_acpi_dev_add_driver_gpios(&pdev->dev, shps_acpi_gpios);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL);
|
||||
+ if (!sdev)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ platform_set_drvdata(pdev, sdev);
|
||||
+
|
||||
+ /*
|
||||
+ * Initialize IRQs so that we can safely call surface_hotplug_remove()
|
||||
+ * on errors.
|
||||
+ */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++)
|
||||
+ sdev->irq[i] = SHPS_IRQ_NOT_PRESENT;
|
||||
+
|
||||
+ /* Set up IRQs. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++) {
|
||||
+ mutex_init(&sdev->lock[i]);
|
||||
+
|
||||
+ status = shps_setup_irq(pdev, i);
|
||||
+ if (status) {
|
||||
+ dev_err(&pdev->dev, "failed to set up IRQ %d: %d\n", i, status);
|
||||
+ goto err;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Ensure everything is up-to-date. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++)
|
||||
+ if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
|
||||
+ shps_dsm_notify_irq(pdev, i);
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+err:
|
||||
+ surface_hotplug_remove(pdev);
|
||||
+ return status;
|
||||
+}
|
||||
+
|
||||
+static const struct acpi_device_id surface_hotplug_acpi_match[] = {
|
||||
+ { "MSHW0153", 0 },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, surface_hotplug_acpi_match);
|
||||
+
|
||||
+static struct platform_driver surface_hotplug_driver = {
|
||||
+ .probe = surface_hotplug_probe,
|
||||
+ .remove = surface_hotplug_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surface_hotplug",
|
||||
+ .acpi_match_table = surface_hotplug_acpi_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(surface_hotplug_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.31.1
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From ebb46023cfc40d73efe0fdf42f2e072728c9de6c 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 8429ebe7097e..44d48e8bbe1a 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)
|
||||
@@ -70,12 +74,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_WIN8_PTP_BUTTONS BIT(18)
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(21)
|
||||
|
||||
#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,
|
||||
@@ -167,6 +174,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,
|
||||
@@ -208,6 +217,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
|
||||
@@ -367,6 +377,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
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1674,6 +1694,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1697,6 +1780,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);
|
||||
|
||||
@@ -1726,15 +1812,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)
|
||||
@@ -1770,6 +1860,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);
|
||||
@@ -2121,6 +2212,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.31.1
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From e6521f48502703660d850535e61356da31f4d058 Mon Sep 17 00:00:00 2001
|
||||
From: Max Leiter <maxwell.leiter@gmail.com>
|
||||
Date: Sat, 19 Dec 2020 17:50:55 -0800
|
||||
Subject: [PATCH] iio:light:apds9960 add detection for MSHW0184 ACPI device in
|
||||
apds9960 driver
|
||||
|
||||
The device is used in the Microsoft Surface Book 3 and Surface Pro 7
|
||||
|
||||
Signed-off-by: Max Leiter <maxwell.leiter@gmail.com>
|
||||
Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
|
||||
Link: https://lore.kernel.org/r/20201220015057.107246-1-maxwell.leiter@gmail.com
|
||||
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
|
||||
Patchset: surface-sensors
|
||||
---
|
||||
drivers/iio/light/apds9960.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
|
||||
index 547e7f9d6920..df0647856e5d 100644
|
||||
--- a/drivers/iio/light/apds9960.c
|
||||
+++ b/drivers/iio/light/apds9960.c
|
||||
@@ -8,6 +8,7 @@
|
||||
* TODO: gesture + proximity calib offsets
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
@@ -1113,6 +1114,12 @@ static const struct i2c_device_id apds9960_id[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, apds9960_id);
|
||||
|
||||
+static const struct acpi_device_id apds9960_acpi_match[] = {
|
||||
+ { "MSHW0184" },
|
||||
+ { }
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, apds9960_acpi_match);
|
||||
+
|
||||
static const struct of_device_id apds9960_of_match[] = {
|
||||
{ .compatible = "avago,apds9960" },
|
||||
{ }
|
||||
@@ -1124,6 +1131,7 @@ static struct i2c_driver apds9960_driver = {
|
||||
.name = APDS9960_DRV_NAME,
|
||||
.of_match_table = apds9960_of_match,
|
||||
.pm = &apds9960_pm_ops,
|
||||
+ .acpi_match_table = apds9960_acpi_match,
|
||||
},
|
||||
.probe = apds9960_probe,
|
||||
.remove = apds9960_remove,
|
||||
--
|
||||
2.31.1
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,121 +0,0 @@
|
|||
From e798d41f1c6b8ac7aa1ac1d522ba766b4e05d5b7 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-firmware-override
|
||||
---
|
||||
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 a419ec7130f9..b2c21bf5995e 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -810,6 +819,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)
|
||||
@@ -824,6 +869,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.31.1
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From 6e0788e583a88850a4694aa5fd034e1271ee13d6 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 18 Oct 2020 16:42:44 +0900
|
||||
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||
for quirks so that each driver can enable quirks even on the affected
|
||||
systems.
|
||||
|
||||
On affected systems, DMI data will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-oemb
|
||||
---
|
||||
drivers/platform/surface/surface3-wmi.c | 7 +++++++
|
||||
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||
3 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
|
||||
index fcd1d4fb94d5..ee26a5998b07 100644
|
||||
--- a/drivers/platform/surface/surface3-wmi.c
|
||||
+++ b/drivers/platform/surface/surface3-wmi.c
|
||||
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
#endif
|
||||
{ }
|
||||
};
|
||||
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||
index 63a7e052eaa0..9806fd800020 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3694,6 +3694,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||
},
|
||||
.driver_data = (void *)&intel_braswell_platform_data,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||
+ },
|
||||
{
|
||||
/*
|
||||
* Match for the GPDwin which unfortunately uses somewhat
|
||||
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
index 227424236fd5..1013a57be89a 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.32.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,121 +0,0 @@
|
|||
From aac49442ea6beab80251e92f1debcf760d2f34e0 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 27 Feb 2021 00:45:52 +0100
|
||||
Subject: [PATCH] ath10k: Add module parameters to override board files
|
||||
|
||||
Some Surface devices, specifically the Surface Go and AMD version of the
|
||||
Surface Laptop 3 (wich both come with QCA6174 WiFi chips), work better
|
||||
with a different board file, as it seems that the firmeware included
|
||||
upstream is buggy.
|
||||
|
||||
As it is generally not a good idea to randomly overwrite files, let
|
||||
alone doing so via packages, we add module parameters to override those
|
||||
file names in the driver. This allows us to package/deploy the override
|
||||
via a modprobe.d config.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: ath10k
|
||||
---
|
||||
drivers/net/wireless/ath/ath10k/core.c | 58 ++++++++++++++++++++++++++
|
||||
1 file changed, 58 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
|
||||
index 2f9be182fbfb..84ae17af3f98 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -826,6 +835,42 @@ static int ath10k_init_configure_target(struct ath10k *ar)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static const char *ath10k_override_board_fw_file(struct ath10k *ar,
|
||||
+ const char *file)
|
||||
+{
|
||||
+ if (strcmp(file, "board.bin") == 0) {
|
||||
+ if (strcmp(override_board, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board.bin' with '%s'\n",
|
||||
+ override_board);
|
||||
+
|
||||
+ return override_board;
|
||||
+ }
|
||||
+
|
||||
+ if (strcmp(file, "board-2.bin") == 0) {
|
||||
+ if (strcmp(override_board2, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board2, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board-2.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board-2.bin' with '%s'\n",
|
||||
+ override_board2);
|
||||
+
|
||||
+ return override_board2;
|
||||
+ }
|
||||
+
|
||||
+ return file;
|
||||
+}
|
||||
+
|
||||
static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
const char *dir,
|
||||
const char *file)
|
||||
@@ -840,6 +885,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
if (dir == NULL)
|
||||
dir = ".";
|
||||
|
||||
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||
+ *
|
||||
+ * Some Surface devices perform better with a different board
|
||||
+ * configuration. To this end, one would need to replace the board.bin
|
||||
+ * file with the modified config and remove the board-2.bin file.
|
||||
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||
+ * we add module options to perform these overrides here.
|
||||
+ */
|
||||
+
|
||||
+ file = ath10k_override_board_fw_file(ar, file);
|
||||
+ if (!file)
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
+
|
||||
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||
--
|
||||
2.32.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,335 +0,0 @@
|
|||
From 2bf5d7b498510c16129bc2ee593cad09cef7d54d 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 8ceaa88dd78f..deceed0d76c6 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -570,6 +570,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
|
||||
return (ret == 1) ? 0 : -EIO;
|
||||
}
|
||||
|
||||
+static int acpi_gsb_i2c_write_raw_bytes(struct i2c_client *client,
|
||||
+ u8 *data, u8 data_len)
|
||||
+{
|
||||
+ struct i2c_msg msgs[1];
|
||||
+ int ret = AE_OK;
|
||||
+
|
||||
+ msgs[0].addr = client->addr;
|
||||
+ msgs[0].flags = client->flags;
|
||||
+ msgs[0].len = data_len + 1;
|
||||
+ msgs[0].buf = data;
|
||||
+
|
||||
+ ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
|
||||
+
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&client->adapter->dev, "i2c write failed: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ /* 1 transfer must have completed successfully */
|
||||
+ return (ret == 1) ? 0 : -EIO;
|
||||
+}
|
||||
+
|
||||
static acpi_status
|
||||
i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
u32 bits, u64 *value64,
|
||||
@@ -671,6 +693,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
}
|
||||
break;
|
||||
|
||||
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
|
||||
+ if (action == ACPI_READ) {
|
||||
+ dev_warn(&adapter->dev,
|
||||
+ "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
+ accessor_type, client->addr);
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ } else {
|
||||
+ status = acpi_gsb_i2c_write_raw_bytes(client,
|
||||
+ gsb->data, info->access_length);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
accessor_type, client->addr);
|
||||
--
|
||||
2.32.0
|
||||
|
||||
From 600c757e1f753768656742ccc1ef6fe6cf5ee689 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 0847b2dc97bf..fd45940ab6ce 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -77,6 +77,13 @@ config SURFACE_AGGREGATOR_CDEV
|
||||
The provided interface is intended for debugging and development only,
|
||||
and should not be used otherwise.
|
||||
|
||||
+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_GPE
|
||||
tristate "Surface GPE/Lid Support Driver"
|
||||
depends on DMI
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index 990424c5f0c9..6b69175598ab 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -10,6 +10,7 @@ obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.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.32.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,44 +0,0 @@
|
|||
From 0e803e7c36a7486f1b9ebf3dee79bda3f38b6086 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 2 Jul 2021 14:27:14 +0200
|
||||
Subject: [PATCH] Revert "Revert "PCI: PM: Do not read power state in
|
||||
pci_enable_device_flags()""
|
||||
|
||||
This reverts commit 133ad06e0419eea137cce7b0c453b9c9622de161.
|
||||
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/pci/pci.c | 16 +++-------------
|
||||
1 file changed, 3 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||
index 16a17215f633..e4d4e399004b 100644
|
||||
--- a/drivers/pci/pci.c
|
||||
+++ b/drivers/pci/pci.c
|
||||
@@ -1870,20 +1870,10 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
|
||||
int err;
|
||||
int i, bars = 0;
|
||||
|
||||
- /*
|
||||
- * Power state could be unknown at this point, either due to a fresh
|
||||
- * boot or a device removal call. So get the current power state
|
||||
- * so that things like MSI message writing will behave as expected
|
||||
- * (e.g. if the device really is in D0 at enable time).
|
||||
- */
|
||||
- if (dev->pm_cap) {
|
||||
- u16 pmcsr;
|
||||
- pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
|
||||
- dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
|
||||
- }
|
||||
-
|
||||
- if (atomic_inc_return(&dev->enable_cnt) > 1)
|
||||
+ if (atomic_inc_return(&dev->enable_cnt) > 1) {
|
||||
+ pci_update_current_state(dev, dev->current_state);
|
||||
return 0; /* already enabled */
|
||||
+ }
|
||||
|
||||
bridge = pci_upstream_bridge(dev);
|
||||
if (bridge)
|
||||
--
|
||||
2.32.0
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From e0891ad134ca2f90f2e47e070ce83992932f410a 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 2e4fb76c45f3..d7a27d891fba 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -34,7 +34,10 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/hid.h>
|
||||
#include <linux/module.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/suspend.h>
|
||||
+#include <linux/usb.h>
|
||||
#include <linux/input/mt.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/string.h>
|
||||
@@ -47,6 +50,7 @@ MODULE_DESCRIPTION("HID multitouch panels");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#include "hid-ids.h"
|
||||
+#include "usbhid/usbhid.h"
|
||||
|
||||
/* quirks to control the device */
|
||||
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
|
||||
@@ -71,12 +75,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(22)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
HID_LATENCY_HIGH = 1,
|
||||
@@ -168,6 +175,8 @@ struct mt_device {
|
||||
|
||||
struct list_head applications;
|
||||
struct list_head reports;
|
||||
+
|
||||
+ struct notifier_block pm_notifier;
|
||||
};
|
||||
|
||||
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||
@@ -210,6 +219,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||
#define MT_CLS_GOOGLE 0x0111
|
||||
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||
#define MT_CLS_SMART_TECH 0x0113
|
||||
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
#define MT_MAX_MAXCONTACT 250
|
||||
@@ -378,6 +388,16 @@ static const struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
MT_QUIRK_SEPARATE_APP_REPORT,
|
||||
},
|
||||
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||
+ MT_QUIRK_ALWAYS_VALID |
|
||||
+ MT_QUIRK_IGNORE_DUPLICATES |
|
||||
+ MT_QUIRK_HOVERING |
|
||||
+ MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
+ MT_QUIRK_STICKY_FINGERS |
|
||||
+ MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||
+ .export_all_inputs = true
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1690,6 +1710,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1713,6 +1796,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
|
||||
hid_set_drvdata(hdev, td);
|
||||
|
||||
+ td->pm_notifier.notifier_call = mt_pm_notifier;
|
||||
+ register_pm_notifier(&td->pm_notifier);
|
||||
+
|
||||
INIT_LIST_HEAD(&td->applications);
|
||||
INIT_LIST_HEAD(&td->reports);
|
||||
|
||||
@@ -1742,15 +1828,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
timer_setup(&td->release_timer, mt_expired_timeout, 0);
|
||||
|
||||
ret = hid_parse(hdev);
|
||||
- if (ret != 0)
|
||||
+ if (ret != 0) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID)
|
||||
mt_fix_const_fields(hdev, HID_DG_CONTACTID);
|
||||
|
||||
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
||||
- if (ret)
|
||||
+ if (ret) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||
if (ret)
|
||||
@@ -1801,6 +1891,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);
|
||||
@@ -2158,6 +2249,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.32.0
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From 9d6d54b56cca35c8c1b8c8671397f711e4751870 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Tamas Vajda <zoltan.tamas.vajda@gmail.com>
|
||||
Date: Thu, 3 Jun 2021 10:50:55 +0200
|
||||
Subject: [PATCH] Added quirk for Surface Go touchscreen
|
||||
|
||||
Patchset: surface-go-touchscreen
|
||||
---
|
||||
drivers/hid/hid-ids.h | 1 +
|
||||
drivers/hid/hid-input.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 03978111d944..06168f485722 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -397,6 +397,7 @@
|
||||
#define USB_DEVICE_ID_HP_X2_10_COVER 0x0755
|
||||
#define I2C_DEVICE_ID_HP_SPECTRE_X360_15 0x2817
|
||||
#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN 0x2706
|
||||
+#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN 0x261A
|
||||
|
||||
#define USB_VENDOR_ID_ELECOM 0x056e
|
||||
#define USB_DEVICE_ID_ELECOM_BM084 0x0061
|
||||
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
|
||||
index e982d8173c9c..f7d482619dfd 100644
|
||||
--- a/drivers/hid/hid-input.c
|
||||
+++ b/drivers/hid/hid-input.c
|
||||
@@ -326,6 +326,8 @@ static const struct hid_device_id hid_battery_quirks[] = {
|
||||
HID_BATTERY_QUIRK_IGNORE },
|
||||
{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_15),
|
||||
HID_BATTERY_QUIRK_IGNORE },
|
||||
+ { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),
|
||||
+ HID_BATTERY_QUIRK_IGNORE },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.32.0
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,101 +0,0 @@
|
|||
From 9e9d5df989333ccfa23e32fee0bc15fb3dfbad85 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 18 Oct 2020 16:42:44 +0900
|
||||
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||
for quirks so that each driver can enable quirks even on the affected
|
||||
systems.
|
||||
|
||||
On affected systems, DMI data will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-oemb
|
||||
---
|
||||
drivers/platform/surface/surface3-wmi.c | 7 +++++++
|
||||
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||
3 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
|
||||
index fcd1d4fb94d5..ee26a5998b07 100644
|
||||
--- a/drivers/platform/surface/surface3-wmi.c
|
||||
+++ b/drivers/platform/surface/surface3-wmi.c
|
||||
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
#endif
|
||||
{ }
|
||||
};
|
||||
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||
index 9408ee63cb26..5cac83953901 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3718,6 +3718,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||
},
|
||||
.driver_data = (void *)&intel_braswell_platform_data,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||
+ },
|
||||
{
|
||||
/*
|
||||
* Match for the GPDwin which unfortunately uses somewhat
|
||||
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
index 227424236fd5..1013a57be89a 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,121 +0,0 @@
|
|||
From 90951c54a948f49883041a01d7bb9d7f2df45b2d Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 27 Feb 2021 00:45:52 +0100
|
||||
Subject: [PATCH] ath10k: Add module parameters to override board files
|
||||
|
||||
Some Surface devices, specifically the Surface Go and AMD version of the
|
||||
Surface Laptop 3 (wich both come with QCA6174 WiFi chips), work better
|
||||
with a different board file, as it seems that the firmeware included
|
||||
upstream is buggy.
|
||||
|
||||
As it is generally not a good idea to randomly overwrite files, let
|
||||
alone doing so via packages, we add module parameters to override those
|
||||
file names in the driver. This allows us to package/deploy the override
|
||||
via a modprobe.d config.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: ath10k
|
||||
---
|
||||
drivers/net/wireless/ath/ath10k/core.c | 58 ++++++++++++++++++++++++++
|
||||
1 file changed, 58 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
|
||||
index 2f9be182fbfb..84ae17af3f98 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -826,6 +835,42 @@ static int ath10k_init_configure_target(struct ath10k *ar)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static const char *ath10k_override_board_fw_file(struct ath10k *ar,
|
||||
+ const char *file)
|
||||
+{
|
||||
+ if (strcmp(file, "board.bin") == 0) {
|
||||
+ if (strcmp(override_board, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board.bin' with '%s'\n",
|
||||
+ override_board);
|
||||
+
|
||||
+ return override_board;
|
||||
+ }
|
||||
+
|
||||
+ if (strcmp(file, "board-2.bin") == 0) {
|
||||
+ if (strcmp(override_board2, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board2, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board-2.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board-2.bin' with '%s'\n",
|
||||
+ override_board2);
|
||||
+
|
||||
+ return override_board2;
|
||||
+ }
|
||||
+
|
||||
+ return file;
|
||||
+}
|
||||
+
|
||||
static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
const char *dir,
|
||||
const char *file)
|
||||
@@ -840,6 +885,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
if (dir == NULL)
|
||||
dir = ".";
|
||||
|
||||
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||
+ *
|
||||
+ * Some Surface devices perform better with a different board
|
||||
+ * configuration. To this end, one would need to replace the board.bin
|
||||
+ * file with the modified config and remove the board-2.bin file.
|
||||
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||
+ * we add module options to perform these overrides here.
|
||||
+ */
|
||||
+
|
||||
+ file = ath10k_override_board_fw_file(ar, file);
|
||||
+ if (!file)
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
+
|
||||
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,335 +0,0 @@
|
|||
From 8b986b04304762d5bec137018886cfe6eb43b29a 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 8ceaa88dd78f..deceed0d76c6 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -570,6 +570,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
|
||||
return (ret == 1) ? 0 : -EIO;
|
||||
}
|
||||
|
||||
+static int acpi_gsb_i2c_write_raw_bytes(struct i2c_client *client,
|
||||
+ u8 *data, u8 data_len)
|
||||
+{
|
||||
+ struct i2c_msg msgs[1];
|
||||
+ int ret = AE_OK;
|
||||
+
|
||||
+ msgs[0].addr = client->addr;
|
||||
+ msgs[0].flags = client->flags;
|
||||
+ msgs[0].len = data_len + 1;
|
||||
+ msgs[0].buf = data;
|
||||
+
|
||||
+ ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
|
||||
+
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&client->adapter->dev, "i2c write failed: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ /* 1 transfer must have completed successfully */
|
||||
+ return (ret == 1) ? 0 : -EIO;
|
||||
+}
|
||||
+
|
||||
static acpi_status
|
||||
i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
u32 bits, u64 *value64,
|
||||
@@ -671,6 +693,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
}
|
||||
break;
|
||||
|
||||
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
|
||||
+ if (action == ACPI_READ) {
|
||||
+ dev_warn(&adapter->dev,
|
||||
+ "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
+ accessor_type, client->addr);
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ } else {
|
||||
+ status = acpi_gsb_i2c_write_raw_bytes(client,
|
||||
+ gsb->data, info->access_length);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
accessor_type, client->addr);
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 1de17517b1103d792ee6169813ec30380fcdceda Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 13 Feb 2021 16:41:18 +0100
|
||||
Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch
|
||||
|
||||
Add driver exposing the discrete GPU power-switch of the Microsoft
|
||||
Surface Book 1 to user-space.
|
||||
|
||||
On the Surface Book 1, the dGPU power is controlled via the Surface
|
||||
System Aggregator Module (SAM). The specific SAM-over-HID command for
|
||||
this is exposed via ACPI. This module provides a simple driver exposing
|
||||
the ACPI call via a sysfs parameter to user-space, so that users can
|
||||
easily power-on/-off the dGPU.
|
||||
|
||||
Patchset: surface-sam-over-hid
|
||||
---
|
||||
drivers/platform/surface/Kconfig | 7 +
|
||||
drivers/platform/surface/Makefile | 1 +
|
||||
.../surface/surfacebook1_dgpu_switch.c | 162 ++++++++++++++++++
|
||||
3 files changed, 170 insertions(+)
|
||||
create mode 100644 drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
|
||||
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
|
||||
index 3105f651614f..53beaedefdd1 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -104,6 +104,13 @@ config SURFACE_AGGREGATOR_REGISTRY
|
||||
the respective client devices. Drivers for these devices still need to
|
||||
be selected via the other options.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on SYSFS
|
||||
+ help
|
||||
+ This driver provides a sysfs switch to set the power-state of the
|
||||
+ discrete GPU found on the Microsoft Surface Book 1.
|
||||
+
|
||||
config SURFACE_DTX
|
||||
tristate "Surface DTX (Detachment System) Driver"
|
||||
depends on SURFACE_AGGREGATOR
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index 32889482de55..0cc63440328d 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -11,6 +11,7 @@ obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_REGISTRY) += surface_aggregator_registry.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_DTX) += surface_dtx.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
new file mode 100644
|
||||
index 000000000000..8b816ed8f35c
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
@@ -0,0 +1,162 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+
|
||||
+#ifdef pr_fmt
|
||||
+#undef pr_fmt
|
||||
+#endif
|
||||
+#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
|
||||
+
|
||||
+
|
||||
+static const guid_t dgpu_sw_guid = GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4,
|
||||
+ 0x95, 0xed, 0xab, 0x16, 0x65, 0x49, 0x80, 0x35);
|
||||
+
|
||||
+#define DGPUSW_ACPI_PATH_DSM "\\_SB_.PCI0.LPCB.EC0_.VGBI"
|
||||
+#define DGPUSW_ACPI_PATH_HGON "\\_SB_.PCI0.RP05.HGON"
|
||||
+#define DGPUSW_ACPI_PATH_HGOF "\\_SB_.PCI0.RP05.HGOF"
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_dsmcall(void)
|
||||
+{
|
||||
+ union acpi_object *ret;
|
||||
+ acpi_handle handle;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, DGPUSW_ACPI_PATH_DSM, &handle);
|
||||
+ if (status)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ret = acpi_evaluate_dsm_typed(handle, &dgpu_sw_guid, 1, 1, NULL, ACPI_TYPE_BUFFER);
|
||||
+ if (!ret)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ACPI_FREE(ret);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgon(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGON, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGON: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-on dGPU via HGON\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgof(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGOF, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGOF: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-off dGPU via HGOF\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static ssize_t dgpu_dsmcall_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ int status, value;
|
||||
+
|
||||
+ status = kstrtoint(buf, 0, &value);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (value != 1)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ status = sb1_dgpu_sw_dsmcall();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ bool power;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtobool(buf, &power);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (power)
|
||||
+ status = sb1_dgpu_sw_hgon();
|
||||
+ else
|
||||
+ status = sb1_dgpu_sw_hgof();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR_WO(dgpu_dsmcall);
|
||||
+static DEVICE_ATTR_WO(dgpu_power);
|
||||
+
|
||||
+static struct attribute *sb1_dgpu_sw_attrs[] = {
|
||||
+ &dev_attr_dgpu_dsmcall.attr,
|
||||
+ &dev_attr_dgpu_power.attr,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+static const struct attribute_group sb1_dgpu_sw_attr_group = {
|
||||
+ .attrs = sb1_dgpu_sw_attrs,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ return sysfs_create_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ sysfs_remove_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * The dGPU power seems to be actually handled by MSHW0040. However, that is
|
||||
+ * also the power-/volume-button device with a mainline driver. So let's use
|
||||
+ * MSHW0041 instead for now, which seems to be the LTCH (latch/DTX) device.
|
||||
+ */
|
||||
+static const struct acpi_device_id sb1_dgpu_sw_match[] = {
|
||||
+ { "MSHW0041", },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sb1_dgpu_sw_match);
|
||||
+
|
||||
+static struct platform_driver sb1_dgpu_sw = {
|
||||
+ .probe = sb1_dgpu_sw_probe,
|
||||
+ .remove = sb1_dgpu_sw_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surfacebook1_dgpu_switch",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,44 +0,0 @@
|
|||
From 5ff5180cf53f8b2218cabfb209006eb48a3e6a75 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 2 Jul 2021 15:51:07 +0200
|
||||
Subject: [PATCH] Revert "Revert "PCI: PM: Do not read power state in
|
||||
pci_enable_device_flags()""
|
||||
|
||||
This reverts commit 4d6035f9bf4ea12776322746a216e856dfe46698.
|
||||
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/pci/pci.c | 16 +++-------------
|
||||
1 file changed, 3 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||
index 8d4ebe095d0c..b717680377a9 100644
|
||||
--- a/drivers/pci/pci.c
|
||||
+++ b/drivers/pci/pci.c
|
||||
@@ -1900,20 +1900,10 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
|
||||
int err;
|
||||
int i, bars = 0;
|
||||
|
||||
- /*
|
||||
- * Power state could be unknown at this point, either due to a fresh
|
||||
- * boot or a device removal call. So get the current power state
|
||||
- * so that things like MSI message writing will behave as expected
|
||||
- * (e.g. if the device really is in D0 at enable time).
|
||||
- */
|
||||
- if (dev->pm_cap) {
|
||||
- u16 pmcsr;
|
||||
- pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
|
||||
- dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
|
||||
- }
|
||||
-
|
||||
- if (atomic_inc_return(&dev->enable_cnt) > 1)
|
||||
+ if (atomic_inc_return(&dev->enable_cnt) > 1) {
|
||||
+ pci_update_current_state(dev, dev->current_state);
|
||||
return 0; /* already enabled */
|
||||
+ }
|
||||
|
||||
bridge = pci_upstream_bridge(dev);
|
||||
if (bridge)
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From 58bfc8f855dba9bcf3864e85430002bf744f76e6 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 2e4fb76c45f3..d7a27d891fba 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -34,7 +34,10 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/hid.h>
|
||||
#include <linux/module.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/suspend.h>
|
||||
+#include <linux/usb.h>
|
||||
#include <linux/input/mt.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/string.h>
|
||||
@@ -47,6 +50,7 @@ MODULE_DESCRIPTION("HID multitouch panels");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#include "hid-ids.h"
|
||||
+#include "usbhid/usbhid.h"
|
||||
|
||||
/* quirks to control the device */
|
||||
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
|
||||
@@ -71,12 +75,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(22)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
HID_LATENCY_HIGH = 1,
|
||||
@@ -168,6 +175,8 @@ struct mt_device {
|
||||
|
||||
struct list_head applications;
|
||||
struct list_head reports;
|
||||
+
|
||||
+ struct notifier_block pm_notifier;
|
||||
};
|
||||
|
||||
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||
@@ -210,6 +219,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||
#define MT_CLS_GOOGLE 0x0111
|
||||
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||
#define MT_CLS_SMART_TECH 0x0113
|
||||
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
#define MT_MAX_MAXCONTACT 250
|
||||
@@ -378,6 +388,16 @@ static const struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
MT_QUIRK_SEPARATE_APP_REPORT,
|
||||
},
|
||||
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||
+ MT_QUIRK_ALWAYS_VALID |
|
||||
+ MT_QUIRK_IGNORE_DUPLICATES |
|
||||
+ MT_QUIRK_HOVERING |
|
||||
+ MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
+ MT_QUIRK_STICKY_FINGERS |
|
||||
+ MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||
+ .export_all_inputs = true
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1690,6 +1710,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1713,6 +1796,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
|
||||
hid_set_drvdata(hdev, td);
|
||||
|
||||
+ td->pm_notifier.notifier_call = mt_pm_notifier;
|
||||
+ register_pm_notifier(&td->pm_notifier);
|
||||
+
|
||||
INIT_LIST_HEAD(&td->applications);
|
||||
INIT_LIST_HEAD(&td->reports);
|
||||
|
||||
@@ -1742,15 +1828,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
timer_setup(&td->release_timer, mt_expired_timeout, 0);
|
||||
|
||||
ret = hid_parse(hdev);
|
||||
- if (ret != 0)
|
||||
+ if (ret != 0) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID)
|
||||
mt_fix_const_fields(hdev, HID_DG_CONTACTID);
|
||||
|
||||
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
||||
- if (ret)
|
||||
+ if (ret) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||
if (ret)
|
||||
@@ -1801,6 +1891,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);
|
||||
@@ -2158,6 +2249,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
||||
USB_DEVICE_ID_XIROKU_CSR2) },
|
||||
|
||||
+ /* Microsoft Surface type cover */
|
||||
+ { .driver_data = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||
+ USB_VENDOR_ID_MICROSOFT, 0x09c0) },
|
||||
+
|
||||
/* Google MT devices */
|
||||
{ .driver_data = MT_CLS_GOOGLE,
|
||||
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
||||
--
|
||||
2.33.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,109 +0,0 @@
|
|||
From 56d3c1a06f0647c53df57bf5105571ed20559ce0 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 e90310cbe73a..d89aebf69ce1 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -21,6 +21,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>
|
||||
@@ -1155,6 +1156,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
|
||||
@@ -1212,6 +1224,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
|
||||
acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0,
|
||||
acpi_gbl_FADT.sci_interrupt);
|
||||
|
||||
+ if (dmi_check_system(surface_quirk)) {
|
||||
+ pr_warn("Surface hack: Override irq 7\n");
|
||||
+ mp_override_legacy_irq(7, 3, 3, 7);
|
||||
+ }
|
||||
+
|
||||
/* Fill in identity legacy mappings where no override */
|
||||
mp_config_acpi_legacy_irqs();
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 75fe508808f39af24f60f2d0899e771270fe016a 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 d89aebf69ce1..b18a1dc69b9b 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -1158,12 +1158,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||
|
||||
static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||
{
|
||||
- .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 15\")",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 13\")",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1958:1959")
|
||||
+ },
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,905 +0,0 @@
|
|||
From 79d369222dfb0dd242bdc7e1f3d5d8d39f1b58df Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Sat, 29 May 2021 22:27:25 +1000
|
||||
Subject: [PATCH] platform/x86: amd-pmc: Add device HID for AMD PMC
|
||||
|
||||
The Surface Laptop 4 appears to have used AMD0005 for the PMC instead of
|
||||
the AMDI0005 which would match the ACPI ID Registry.
|
||||
|
||||
AMD appears to have previously used "AMD" in a number of IDs in the past,
|
||||
and AMD is not allocated to any other entity as an ID, so adding this ID
|
||||
should not cause any harm.
|
||||
|
||||
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/platform/x86/amd-pmc.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
||||
index ca95c2a52e26..65a81d295beb 100644
|
||||
--- a/drivers/platform/x86/amd-pmc.c
|
||||
+++ b/drivers/platform/x86/amd-pmc.c
|
||||
@@ -299,6 +299,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
|
||||
static const struct acpi_device_id amd_pmc_acpi_ids[] = {
|
||||
{"AMDI0005", 0},
|
||||
{"AMD0004", 0},
|
||||
+ {"AMD0005", 0},
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(acpi, amd_pmc_acpi_ids);
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 0c8847a9028c612cf05bbe0e49e8d24b57e48dac Mon Sep 17 00:00:00 2001
|
||||
From: Mario Limonciello <mario.limonciello@amd.com>
|
||||
Date: Wed, 9 Jun 2021 13:40:17 -0500
|
||||
Subject: [PATCH] ACPI: Check StorageD3Enable _DSD property in ACPI code
|
||||
|
||||
Although first implemented for NVME, this check may be usable by
|
||||
other drivers as well. Microsoft's specification explicitly mentions
|
||||
that is may be usable by SATA and AHCI devices. Google also indicates
|
||||
that they have used this with SDHCI in a downstream kernel tree that
|
||||
a user can plug a storage device into.
|
||||
|
||||
Link: https://docs.microsoft.com/en-us/windows-hardware/design/component-guidelines/power-management-for-storage-hardware-devices-intro
|
||||
Suggested-by: Keith Busch <kbusch@kernel.org>
|
||||
CC: Shyam-sundar S-k <Shyam-sundar.S-k@amd.com>
|
||||
CC: Alexander Deucher <Alexander.Deucher@amd.com>
|
||||
CC: Rafael J. Wysocki <rjw@rjwysocki.net>
|
||||
CC: Prike Liang <prike.liang@amd.com>
|
||||
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
||||
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/acpi/device_pm.c | 29 +++++++++++++++++++++++++++++
|
||||
drivers/nvme/host/pci.c | 28 +---------------------------
|
||||
include/linux/acpi.h | 5 +++++
|
||||
3 files changed, 35 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
|
||||
index 9d2d3b9bb8b5..b20ae93415f0 100644
|
||||
--- a/drivers/acpi/device_pm.c
|
||||
+++ b/drivers/acpi/device_pm.c
|
||||
@@ -1338,4 +1338,33 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
|
||||
return 1;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
|
||||
+
|
||||
+/**
|
||||
+ * acpi_storage_d3 - Check if D3 should be used in the suspend path
|
||||
+ * @dev: Device to check
|
||||
+ *
|
||||
+ * Return %true if the platform firmware wants @dev to be programmed
|
||||
+ * into D3hot or D3cold (if supported) in the suspend path, or %false
|
||||
+ * when there is no specific preference. On some platforms, if this
|
||||
+ * hint is ignored, @dev may remain unresponsive after suspending the
|
||||
+ * platform as a whole.
|
||||
+ *
|
||||
+ * Although the property has storage in the name it actually is
|
||||
+ * applied to the PCIe slot and plugging in a non-storage device the
|
||||
+ * same platform restrictions will likely apply.
|
||||
+ */
|
||||
+bool acpi_storage_d3(struct device *dev)
|
||||
+{
|
||||
+ struct acpi_device *adev = ACPI_COMPANION(dev);
|
||||
+ u8 val;
|
||||
+
|
||||
+ if (!adev)
|
||||
+ return false;
|
||||
+ if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
|
||||
+ &val))
|
||||
+ return false;
|
||||
+ return val == 1;
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(acpi_storage_d3);
|
||||
+
|
||||
#endif /* CONFIG_PM */
|
||||
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
|
||||
index d963f25fc7ae..66455e2261d0 100644
|
||||
--- a/drivers/nvme/host/pci.c
|
||||
+++ b/drivers/nvme/host/pci.c
|
||||
@@ -2880,32 +2880,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-#ifdef CONFIG_ACPI
|
||||
-static bool nvme_acpi_storage_d3(struct pci_dev *dev)
|
||||
-{
|
||||
- struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
|
||||
- u8 val;
|
||||
-
|
||||
- /*
|
||||
- * Look for _DSD property specifying that the storage device on the port
|
||||
- * must use D3 to support deep platform power savings during
|
||||
- * suspend-to-idle.
|
||||
- */
|
||||
-
|
||||
- if (!adev)
|
||||
- return false;
|
||||
- if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
|
||||
- &val))
|
||||
- return false;
|
||||
- return val == 1;
|
||||
-}
|
||||
-#else
|
||||
-static inline bool nvme_acpi_storage_d3(struct pci_dev *dev)
|
||||
-{
|
||||
- return false;
|
||||
-}
|
||||
-#endif /* CONFIG_ACPI */
|
||||
-
|
||||
static void nvme_async_probe(void *data, async_cookie_t cookie)
|
||||
{
|
||||
struct nvme_dev *dev = data;
|
||||
@@ -2955,7 +2929,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
|
||||
quirks |= check_vendor_combination_bug(pdev);
|
||||
|
||||
- if (!noacpi && nvme_acpi_storage_d3(pdev)) {
|
||||
+ if (!noacpi && acpi_storage_d3(&pdev->dev)) {
|
||||
/*
|
||||
* Some systems use a bios work around to ask for D3 on
|
||||
* platforms that support kernel managed suspend.
|
||||
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
|
||||
index e8ba7063c000..66c43abef4a4 100644
|
||||
--- a/include/linux/acpi.h
|
||||
+++ b/include/linux/acpi.h
|
||||
@@ -1006,6 +1006,7 @@ int acpi_dev_resume(struct device *dev);
|
||||
int acpi_subsys_runtime_suspend(struct device *dev);
|
||||
int acpi_subsys_runtime_resume(struct device *dev);
|
||||
int acpi_dev_pm_attach(struct device *dev, bool power_on);
|
||||
+bool acpi_storage_d3(struct device *dev);
|
||||
#else
|
||||
static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; }
|
||||
static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
|
||||
@@ -1013,6 +1014,10 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
+static inline bool acpi_storage_d3(struct device *dev)
|
||||
+{
|
||||
+ return false;
|
||||
+}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 50a89b7d7b3e72b75858a55d396ecafea907d098 Mon Sep 17 00:00:00 2001
|
||||
From: Mario Limonciello <mario.limonciello@amd.com>
|
||||
Date: Wed, 9 Jun 2021 13:40:18 -0500
|
||||
Subject: [PATCH] ACPI: Add quirks for AMD Renoir/Lucienne CPUs to force the D3
|
||||
hint
|
||||
|
||||
AMD systems from Renoir and Lucienne require that the NVME controller
|
||||
is put into D3 over a Modern Standby / suspend-to-idle
|
||||
cycle. This is "typically" accomplished using the `StorageD3Enable`
|
||||
property in the _DSD, but this property was introduced after many
|
||||
of these systems launched and most OEM systems don't have it in
|
||||
their BIOS.
|
||||
|
||||
On AMD Renoir without these drives going into D3 over suspend-to-idle
|
||||
the resume will fail with the NVME controller being reset and a trace
|
||||
like this in the kernel logs:
|
||||
```
|
||||
[ 83.556118] nvme nvme0: I/O 161 QID 2 timeout, aborting
|
||||
[ 83.556178] nvme nvme0: I/O 162 QID 2 timeout, aborting
|
||||
[ 83.556187] nvme nvme0: I/O 163 QID 2 timeout, aborting
|
||||
[ 83.556196] nvme nvme0: I/O 164 QID 2 timeout, aborting
|
||||
[ 95.332114] nvme nvme0: I/O 25 QID 0 timeout, reset controller
|
||||
[ 95.332843] nvme nvme0: Abort status: 0x371
|
||||
[ 95.332852] nvme nvme0: Abort status: 0x371
|
||||
[ 95.332856] nvme nvme0: Abort status: 0x371
|
||||
[ 95.332859] nvme nvme0: Abort status: 0x371
|
||||
[ 95.332909] PM: dpm_run_callback(): pci_pm_resume+0x0/0xe0 returns -16
|
||||
[ 95.332936] nvme 0000:03:00.0: PM: failed to resume async: error -16
|
||||
```
|
||||
|
||||
The Microsoft documentation for StorageD3Enable mentioned that Windows has
|
||||
a hardcoded allowlist for D3 support, which was used for these platforms.
|
||||
Introduce quirks to hardcode them for Linux as well.
|
||||
|
||||
As this property is now "standardized", OEM systems using AMD Cezanne and
|
||||
newer APU's have adopted this property, and quirks like this should not be
|
||||
necessary.
|
||||
|
||||
CC: Shyam-sundar S-k <Shyam-sundar.S-k@amd.com>
|
||||
CC: Alexander Deucher <Alexander.Deucher@amd.com>
|
||||
CC: Prike Liang <prike.liang@amd.com>
|
||||
Link: https://docs.microsoft.com/en-us/windows-hardware/design/component-guidelines/power-management-for-storage-hardware-devices-intro
|
||||
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
||||
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
||||
Tested-by: Julian Sikorski <belegdol@gmail.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/acpi/device_pm.c | 3 +++
|
||||
drivers/acpi/internal.h | 9 +++++++++
|
||||
drivers/acpi/x86/utils.c | 25 +++++++++++++++++++++++++
|
||||
3 files changed, 37 insertions(+)
|
||||
|
||||
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
|
||||
index b20ae93415f0..0cfdef2fc3ad 100644
|
||||
--- a/drivers/acpi/device_pm.c
|
||||
+++ b/drivers/acpi/device_pm.c
|
||||
@@ -1358,6 +1358,9 @@ bool acpi_storage_d3(struct device *dev)
|
||||
struct acpi_device *adev = ACPI_COMPANION(dev);
|
||||
u8 val;
|
||||
|
||||
+ if (force_storage_d3())
|
||||
+ return true;
|
||||
+
|
||||
if (!adev)
|
||||
return false;
|
||||
if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
|
||||
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
|
||||
index e21611c9a170..7ac01b03ba67 100644
|
||||
--- a/drivers/acpi/internal.h
|
||||
+++ b/drivers/acpi/internal.h
|
||||
@@ -236,6 +236,15 @@ static inline int suspend_nvs_save(void) { return 0; }
|
||||
static inline void suspend_nvs_restore(void) {}
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_X86
|
||||
+bool force_storage_d3(void);
|
||||
+#else
|
||||
+static inline bool force_storage_d3(void)
|
||||
+{
|
||||
+ return false;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/*--------------------------------------------------------------------------
|
||||
Device properties
|
||||
-------------------------------------------------------------------------- */
|
||||
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
|
||||
index bdc1ba00aee9..5298bb4d81fe 100644
|
||||
--- a/drivers/acpi/x86/utils.c
|
||||
+++ b/drivers/acpi/x86/utils.c
|
||||
@@ -135,3 +135,28 @@ bool acpi_device_always_present(struct acpi_device *adev)
|
||||
|
||||
return ret;
|
||||
}
|
||||
+
|
||||
+/*
|
||||
+ * AMD systems from Renoir and Lucienne *require* that the NVME controller
|
||||
+ * is put into D3 over a Modern Standby / suspend-to-idle cycle.
|
||||
+ *
|
||||
+ * This is "typically" accomplished using the `StorageD3Enable`
|
||||
+ * property in the _DSD that is checked via the `acpi_storage_d3` function
|
||||
+ * but this property was introduced after many of these systems launched
|
||||
+ * and most OEM systems don't have it in their BIOS.
|
||||
+ *
|
||||
+ * The Microsoft documentation for StorageD3Enable mentioned that Windows has
|
||||
+ * a hardcoded allowlist for D3 support, which was used for these platforms.
|
||||
+ *
|
||||
+ * This allows quirking on Linux in a similar fashion.
|
||||
+ */
|
||||
+const struct x86_cpu_id storage_d3_cpu_ids[] = {
|
||||
+ X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL), /* Renoir */
|
||||
+ X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL), /* Lucienne */
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+bool force_storage_d3(void)
|
||||
+{
|
||||
+ return x86_match_cpu(storage_d3_cpu_ids);
|
||||
+}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 7ca60620bd771b2fb7a05b3418bf758fa77d21b5 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Deucher <alexander.deucher@amd.com>
|
||||
Date: Wed, 17 Mar 2021 10:38:42 -0400
|
||||
Subject: [PATCH] platform/x86: force LPS0 functions for AMD
|
||||
|
||||
ACPI_LPS0_ENTRY_AMD/ACPI_LPS0_EXIT_AMD are supposedly not
|
||||
required for AMD platforms, and on some platforms they are
|
||||
not even listed in the function mask but at least some HP
|
||||
laptops seem to require it to properly support s0ix.
|
||||
|
||||
Based on a patch from Marcin Bachry <hegel666@gmail.com>.
|
||||
|
||||
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1230
|
||||
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
Cc: Marcin Bachry <hegel666@gmail.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/acpi/x86/s2idle.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
|
||||
index 2d7ddb8a8cb6..482e6b23b21a 100644
|
||||
--- a/drivers/acpi/x86/s2idle.c
|
||||
+++ b/drivers/acpi/x86/s2idle.c
|
||||
@@ -368,6 +368,13 @@ static int lps0_device_attach(struct acpi_device *adev,
|
||||
|
||||
ACPI_FREE(out_obj);
|
||||
|
||||
+ /*
|
||||
+ * Some HP laptops require ACPI_LPS0_ENTRY_AMD/ACPI_LPS0_EXIT_AMD for proper
|
||||
+ * S0ix, but don't set the function mask correctly. Fix that up here.
|
||||
+ */
|
||||
+ if (acpi_s2idle_vendor_amd())
|
||||
+ lps0_dsm_func_mask |= (1 << ACPI_LPS0_ENTRY_AMD) | (1 << ACPI_LPS0_EXIT_AMD);
|
||||
+
|
||||
acpi_handle_debug(adev->handle, "_DSM function mask: 0x%x\n",
|
||||
lps0_dsm_func_mask);
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 87679fb3dc27b52a355e38fcc93be82fa9c8b032 Mon Sep 17 00:00:00 2001
|
||||
From: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
|
||||
Date: Thu, 17 Jun 2021 11:42:08 -0500
|
||||
Subject: [PATCH] ACPI: PM: s2idle: Use correct revision id
|
||||
|
||||
AMD spec mentions only revision 0. With this change,
|
||||
device constraint list is populated properly.
|
||||
|
||||
Signed-off-by: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/acpi/x86/s2idle.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
|
||||
index 482e6b23b21a..4339e6da0dd6 100644
|
||||
--- a/drivers/acpi/x86/s2idle.c
|
||||
+++ b/drivers/acpi/x86/s2idle.c
|
||||
@@ -96,7 +96,7 @@ static void lpi_device_get_constraints_amd(void)
|
||||
int i, j, k;
|
||||
|
||||
out_obj = acpi_evaluate_dsm_typed(lps0_device_handle, &lps0_dsm_guid,
|
||||
- 1, ACPI_LPS0_GET_DEVICE_CONSTRAINTS,
|
||||
+ rev_id, ACPI_LPS0_GET_DEVICE_CONSTRAINTS,
|
||||
NULL, ACPI_TYPE_PACKAGE);
|
||||
|
||||
if (!out_obj)
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 009c715526355925f0eef04947a4002da05f6741 Mon Sep 17 00:00:00 2001
|
||||
From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Date: Tue, 29 Jun 2021 14:17:59 +0530
|
||||
Subject: [PATCH] platform/x86: amd-pmc: call dump registers only once
|
||||
|
||||
Currently amd_pmc_dump_registers() routine is being called at
|
||||
multiple places. The best to call it is after command submission
|
||||
to SMU.
|
||||
|
||||
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/platform/x86/amd-pmc.c | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
||||
index 65a81d295beb..d08ff5907e4c 100644
|
||||
--- a/drivers/platform/x86/amd-pmc.c
|
||||
+++ b/drivers/platform/x86/amd-pmc.c
|
||||
@@ -182,6 +182,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
|
||||
|
||||
out_unlock:
|
||||
mutex_unlock(&dev->lock);
|
||||
+ amd_pmc_dump_registers(dev);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -194,7 +195,6 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev)
|
||||
if (rc)
|
||||
dev_err(pdev->dev, "suspend failed\n");
|
||||
|
||||
- amd_pmc_dump_registers(pdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -207,7 +207,6 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
|
||||
if (rc)
|
||||
dev_err(pdev->dev, "resume failed\n");
|
||||
|
||||
- amd_pmc_dump_registers(pdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -279,8 +278,6 @@ static int amd_pmc_probe(struct platform_device *pdev)
|
||||
if (!dev->regbase)
|
||||
return -ENOMEM;
|
||||
|
||||
- amd_pmc_dump_registers(dev);
|
||||
-
|
||||
mutex_init(&dev->lock);
|
||||
platform_set_drvdata(pdev, dev);
|
||||
amd_pmc_dbgfs_register(dev);
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 2f215688e66e9621ea6fbef1eed55edc9d7833cf Mon Sep 17 00:00:00 2001
|
||||
From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Date: Tue, 29 Jun 2021 14:18:00 +0530
|
||||
Subject: [PATCH] platform/x86: amd-pmc: Add support for logging SMU metrics
|
||||
|
||||
SMU provides a way to dump the s0ix debug statistics in the form of a
|
||||
metrics table via a of set special mailbox commands.
|
||||
|
||||
Add support to the driver which can send these commands to SMU and expose
|
||||
the information received via debugfs. The information contains the s0ix
|
||||
entry/exit, active time of each IP block etc.
|
||||
|
||||
As a side note, SMU subsystem logging is not supported on Picasso based
|
||||
SoC's.
|
||||
|
||||
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/platform/x86/amd-pmc.c | 147 +++++++++++++++++++++++++++++++--
|
||||
1 file changed, 139 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
||||
index d08ff5907e4c..cfa5c44bb170 100644
|
||||
--- a/drivers/platform/x86/amd-pmc.c
|
||||
+++ b/drivers/platform/x86/amd-pmc.c
|
||||
@@ -46,6 +46,14 @@
|
||||
#define AMD_PMC_RESULT_CMD_UNKNOWN 0xFE
|
||||
#define AMD_PMC_RESULT_FAILED 0xFF
|
||||
|
||||
+/* SMU Message Definations */
|
||||
+#define SMU_MSG_GETSMUVERSION 0x02
|
||||
+#define SMU_MSG_LOG_GETDRAM_ADDR_HI 0x04
|
||||
+#define SMU_MSG_LOG_GETDRAM_ADDR_LO 0x05
|
||||
+#define SMU_MSG_LOG_START 0x06
|
||||
+#define SMU_MSG_LOG_RESET 0x07
|
||||
+#define SMU_MSG_LOG_DUMP_DATA 0x08
|
||||
+#define SMU_MSG_GET_SUP_CONSTRAINTS 0x09
|
||||
/* List of supported CPU ids */
|
||||
#define AMD_CPU_ID_RV 0x15D0
|
||||
#define AMD_CPU_ID_RN 0x1630
|
||||
@@ -55,17 +63,42 @@
|
||||
#define PMC_MSG_DELAY_MIN_US 100
|
||||
#define RESPONSE_REGISTER_LOOP_MAX 200
|
||||
|
||||
+#define SOC_SUBSYSTEM_IP_MAX 12
|
||||
+#define DELAY_MIN_US 2000
|
||||
+#define DELAY_MAX_US 3000
|
||||
enum amd_pmc_def {
|
||||
MSG_TEST = 0x01,
|
||||
MSG_OS_HINT_PCO,
|
||||
MSG_OS_HINT_RN,
|
||||
};
|
||||
|
||||
+struct amd_pmc_bit_map {
|
||||
+ const char *name;
|
||||
+ u32 bit_mask;
|
||||
+};
|
||||
+
|
||||
+static const struct amd_pmc_bit_map soc15_ip_blk[] = {
|
||||
+ {"DISPLAY", BIT(0)},
|
||||
+ {"CPU", BIT(1)},
|
||||
+ {"GFX", BIT(2)},
|
||||
+ {"VDD", BIT(3)},
|
||||
+ {"ACP", BIT(4)},
|
||||
+ {"VCN", BIT(5)},
|
||||
+ {"ISP", BIT(6)},
|
||||
+ {"NBIO", BIT(7)},
|
||||
+ {"DF", BIT(8)},
|
||||
+ {"USB0", BIT(9)},
|
||||
+ {"USB1", BIT(10)},
|
||||
+ {"LAPIC", BIT(11)},
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
struct amd_pmc_dev {
|
||||
void __iomem *regbase;
|
||||
- void __iomem *smu_base;
|
||||
+ void __iomem *smu_virt_addr;
|
||||
u32 base_addr;
|
||||
u32 cpu_id;
|
||||
+ u32 active_ips;
|
||||
struct device *dev;
|
||||
struct mutex lock; /* generic mutex lock */
|
||||
#if IS_ENABLED(CONFIG_DEBUG_FS)
|
||||
@@ -74,6 +107,7 @@ struct amd_pmc_dev {
|
||||
};
|
||||
|
||||
static struct amd_pmc_dev pmc;
|
||||
+static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg, bool ret);
|
||||
|
||||
static inline u32 amd_pmc_reg_read(struct amd_pmc_dev *dev, int reg_offset)
|
||||
{
|
||||
@@ -85,9 +119,49 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3
|
||||
iowrite32(val, dev->regbase + reg_offset);
|
||||
}
|
||||
|
||||
+struct smu_metrics {
|
||||
+ u32 table_version;
|
||||
+ u32 hint_count;
|
||||
+ u32 s0i3_cyclecount;
|
||||
+ u32 timein_s0i2;
|
||||
+ u64 timeentering_s0i3_lastcapture;
|
||||
+ u64 timeentering_s0i3_totaltime;
|
||||
+ u64 timeto_resume_to_os_lastcapture;
|
||||
+ u64 timeto_resume_to_os_totaltime;
|
||||
+ u64 timein_s0i3_lastcapture;
|
||||
+ u64 timein_s0i3_totaltime;
|
||||
+ u64 timein_swdrips_lastcapture;
|
||||
+ u64 timein_swdrips_totaltime;
|
||||
+ u64 timecondition_notmet_lastcapture[SOC_SUBSYSTEM_IP_MAX];
|
||||
+ u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX];
|
||||
+} __packed;
|
||||
+
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
static int smu_fw_info_show(struct seq_file *s, void *unused)
|
||||
{
|
||||
+ struct amd_pmc_dev *dev = s->private;
|
||||
+ struct smu_metrics table;
|
||||
+ int idx;
|
||||
+
|
||||
+ if (dev->cpu_id == AMD_CPU_ID_PCO)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ memcpy_fromio(&table, dev->smu_virt_addr, sizeof(struct smu_metrics));
|
||||
+
|
||||
+ seq_puts(s, "\n=== SMU Statistics ===\n");
|
||||
+ seq_printf(s, "Table Version: %d\n", table.table_version);
|
||||
+ seq_printf(s, "Hint Count: %d\n", table.hint_count);
|
||||
+ seq_printf(s, "S0i3 Cycle Count: %d\n", table.s0i3_cyclecount);
|
||||
+ seq_printf(s, "Time (in us) to S0i3: %lld\n", table.timeentering_s0i3_lastcapture);
|
||||
+ seq_printf(s, "Time (in us) in S0i3: %lld\n", table.timein_s0i3_lastcapture);
|
||||
+
|
||||
+ seq_puts(s, "\n=== Active time (in us) ===\n");
|
||||
+ for (idx = 0 ; idx < SOC_SUBSYSTEM_IP_MAX ; idx++) {
|
||||
+ if (soc15_ip_blk[idx].bit_mask & dev->active_ips)
|
||||
+ seq_printf(s, "%-8s : %lld\n", soc15_ip_blk[idx].name,
|
||||
+ table.timecondition_notmet_lastcapture[idx]);
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
DEFINE_SHOW_ATTRIBUTE(smu_fw_info);
|
||||
@@ -113,6 +187,32 @@ static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
|
||||
}
|
||||
#endif /* CONFIG_DEBUG_FS */
|
||||
|
||||
+static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev)
|
||||
+{
|
||||
+ u32 phys_addr_low, phys_addr_hi;
|
||||
+ u64 smu_phys_addr;
|
||||
+
|
||||
+ if (dev->cpu_id == AMD_CPU_ID_PCO)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ /* Get Active devices list from SMU */
|
||||
+ amd_pmc_send_cmd(dev, 0, &dev->active_ips, SMU_MSG_GET_SUP_CONSTRAINTS, 1);
|
||||
+
|
||||
+ /* Get dram address */
|
||||
+ amd_pmc_send_cmd(dev, 0, &phys_addr_low, SMU_MSG_LOG_GETDRAM_ADDR_LO, 1);
|
||||
+ amd_pmc_send_cmd(dev, 0, &phys_addr_hi, SMU_MSG_LOG_GETDRAM_ADDR_HI, 1);
|
||||
+ smu_phys_addr = ((u64)phys_addr_hi << 32 | phys_addr_low);
|
||||
+
|
||||
+ dev->smu_virt_addr = devm_ioremap(dev->dev, smu_phys_addr, sizeof(struct smu_metrics));
|
||||
+ if (!dev->smu_virt_addr)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ /* Start the logging */
|
||||
+ amd_pmc_send_cmd(dev, 0, NULL, SMU_MSG_LOG_START, 0);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
|
||||
{
|
||||
u32 value;
|
||||
@@ -127,10 +227,9 @@ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
|
||||
dev_dbg(dev->dev, "AMD_PMC_REGISTER_MESSAGE:%x\n", value);
|
||||
}
|
||||
|
||||
-static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
|
||||
+static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg, bool ret)
|
||||
{
|
||||
int rc;
|
||||
- u8 msg;
|
||||
u32 val;
|
||||
|
||||
mutex_lock(&dev->lock);
|
||||
@@ -150,8 +249,8 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
|
||||
amd_pmc_reg_write(dev, AMD_PMC_REGISTER_ARGUMENT, set);
|
||||
|
||||
/* Write message ID to message ID register */
|
||||
- msg = (dev->cpu_id == AMD_CPU_ID_RN) ? MSG_OS_HINT_RN : MSG_OS_HINT_PCO;
|
||||
amd_pmc_reg_write(dev, AMD_PMC_REGISTER_MESSAGE, msg);
|
||||
+
|
||||
/* Wait until we get a valid response */
|
||||
rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE,
|
||||
val, val != 0, PMC_MSG_DELAY_MIN_US,
|
||||
@@ -163,6 +262,11 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
|
||||
|
||||
switch (val) {
|
||||
case AMD_PMC_RESULT_OK:
|
||||
+ if (ret) {
|
||||
+ /* PMFW may take longer time to return back the data */
|
||||
+ usleep_range(DELAY_MIN_US, 10 * DELAY_MAX_US);
|
||||
+ *data = amd_pmc_reg_read(dev, AMD_PMC_REGISTER_ARGUMENT);
|
||||
+ }
|
||||
break;
|
||||
case AMD_PMC_RESULT_CMD_REJECT_BUSY:
|
||||
dev_err(dev->dev, "SMU not ready. err: 0x%x\n", val);
|
||||
@@ -186,12 +290,29 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
|
||||
return rc;
|
||||
}
|
||||
|
||||
+static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
|
||||
+{
|
||||
+ switch (dev->cpu_id) {
|
||||
+ case AMD_CPU_ID_PCO:
|
||||
+ return MSG_OS_HINT_PCO;
|
||||
+ case AMD_CPU_ID_RN:
|
||||
+ return MSG_OS_HINT_RN;
|
||||
+ }
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
static int __maybe_unused amd_pmc_suspend(struct device *dev)
|
||||
{
|
||||
struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
|
||||
int rc;
|
||||
+ u8 msg;
|
||||
|
||||
- rc = amd_pmc_send_cmd(pdev, 1);
|
||||
+ /* Reset and Start SMU logging - to monitor the s0i3 stats */
|
||||
+ amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_RESET, 0);
|
||||
+ amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_START, 0);
|
||||
+
|
||||
+ msg = amd_pmc_get_os_hint(pdev);
|
||||
+ rc = amd_pmc_send_cmd(pdev, 1, NULL, msg, 0);
|
||||
if (rc)
|
||||
dev_err(pdev->dev, "suspend failed\n");
|
||||
|
||||
@@ -202,8 +323,13 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
|
||||
{
|
||||
struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
|
||||
int rc;
|
||||
+ u8 msg;
|
||||
|
||||
- rc = amd_pmc_send_cmd(pdev, 0);
|
||||
+ /* Let SMU know that we are looking for stats */
|
||||
+ amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0);
|
||||
+
|
||||
+ msg = amd_pmc_get_os_hint(pdev);
|
||||
+ rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, 0);
|
||||
if (rc)
|
||||
dev_err(pdev->dev, "resume failed\n");
|
||||
|
||||
@@ -226,8 +352,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct amd_pmc_dev *dev = &pmc;
|
||||
struct pci_dev *rdev;
|
||||
- u32 base_addr_lo;
|
||||
- u32 base_addr_hi;
|
||||
+ u32 base_addr_lo, base_addr_hi;
|
||||
u64 base_addr;
|
||||
int err;
|
||||
u32 val;
|
||||
@@ -279,6 +404,12 @@ static int amd_pmc_probe(struct platform_device *pdev)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_init(&dev->lock);
|
||||
+
|
||||
+ /* Use SMU to get the s0i3 debug stats */
|
||||
+ err = amd_pmc_setup_smu_logging(dev);
|
||||
+ if (err)
|
||||
+ dev_err(dev->dev, "SMU debugging info not supported on this platform\n");
|
||||
+
|
||||
platform_set_drvdata(pdev, dev);
|
||||
amd_pmc_dbgfs_register(dev);
|
||||
return 0;
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 1e7d8f464c1fed48df76d81f811cfa26d5aef0c6 Mon Sep 17 00:00:00 2001
|
||||
From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Date: Tue, 29 Jun 2021 14:18:01 +0530
|
||||
Subject: [PATCH] amd-pmc: Add support for logging s0ix counters
|
||||
|
||||
Even the FCH SSC registers provides certain level of information
|
||||
about the s0ix entry and exit times which comes handy when the SMU
|
||||
fails to report the statistics via the mailbox communication.
|
||||
|
||||
This information is captured via a new debugfs file "s0ix_stats".
|
||||
A non-zero entry in this counters would mean that the system entered
|
||||
the s0ix state.
|
||||
|
||||
If s0ix entry time and exit time don't change during suspend to idle,
|
||||
the silicon has not entered the deepest state.
|
||||
|
||||
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/platform/x86/amd-pmc.c | 45 +++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 44 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
||||
index cfa5c44bb170..d1db12e28b32 100644
|
||||
--- a/drivers/platform/x86/amd-pmc.c
|
||||
+++ b/drivers/platform/x86/amd-pmc.c
|
||||
@@ -46,6 +46,15 @@
|
||||
#define AMD_PMC_RESULT_CMD_UNKNOWN 0xFE
|
||||
#define AMD_PMC_RESULT_FAILED 0xFF
|
||||
|
||||
+/* FCH SSC Registers */
|
||||
+#define FCH_S0I3_ENTRY_TIME_L_OFFSET 0x30
|
||||
+#define FCH_S0I3_ENTRY_TIME_H_OFFSET 0x34
|
||||
+#define FCH_S0I3_EXIT_TIME_L_OFFSET 0x38
|
||||
+#define FCH_S0I3_EXIT_TIME_H_OFFSET 0x3C
|
||||
+#define FCH_SSC_MAPPING_SIZE 0x800
|
||||
+#define FCH_BASE_PHY_ADDR_LOW 0xFED81100
|
||||
+#define FCH_BASE_PHY_ADDR_HIGH 0x00000000
|
||||
+
|
||||
/* SMU Message Definations */
|
||||
#define SMU_MSG_GETSMUVERSION 0x02
|
||||
#define SMU_MSG_LOG_GETDRAM_ADDR_HI 0x04
|
||||
@@ -96,6 +105,7 @@ static const struct amd_pmc_bit_map soc15_ip_blk[] = {
|
||||
struct amd_pmc_dev {
|
||||
void __iomem *regbase;
|
||||
void __iomem *smu_virt_addr;
|
||||
+ void __iomem *fch_virt_addr;
|
||||
u32 base_addr;
|
||||
u32 cpu_id;
|
||||
u32 active_ips;
|
||||
@@ -166,6 +176,29 @@ static int smu_fw_info_show(struct seq_file *s, void *unused)
|
||||
}
|
||||
DEFINE_SHOW_ATTRIBUTE(smu_fw_info);
|
||||
|
||||
+static int s0ix_stats_show(struct seq_file *s, void *unused)
|
||||
+{
|
||||
+ struct amd_pmc_dev *dev = s->private;
|
||||
+ u64 entry_time, exit_time, residency;
|
||||
+
|
||||
+ entry_time = ioread32(dev->fch_virt_addr + FCH_S0I3_ENTRY_TIME_H_OFFSET);
|
||||
+ entry_time = entry_time << 32 | ioread32(dev->fch_virt_addr + FCH_S0I3_ENTRY_TIME_L_OFFSET);
|
||||
+
|
||||
+ exit_time = ioread32(dev->fch_virt_addr + FCH_S0I3_EXIT_TIME_H_OFFSET);
|
||||
+ exit_time = exit_time << 32 | ioread32(dev->fch_virt_addr + FCH_S0I3_EXIT_TIME_L_OFFSET);
|
||||
+
|
||||
+ /* It's in 48MHz. We need to convert it */
|
||||
+ residency = (exit_time - entry_time) / 48;
|
||||
+
|
||||
+ seq_puts(s, "=== S0ix statistics ===\n");
|
||||
+ seq_printf(s, "S0ix Entry Time: %lld\n", entry_time);
|
||||
+ seq_printf(s, "S0ix Exit Time: %lld\n", exit_time);
|
||||
+ seq_printf(s, "Residency Time: %lld\n", residency);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+DEFINE_SHOW_ATTRIBUTE(s0ix_stats);
|
||||
+
|
||||
static void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
|
||||
{
|
||||
debugfs_remove_recursive(dev->dbgfs_dir);
|
||||
@@ -176,6 +209,8 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
|
||||
dev->dbgfs_dir = debugfs_create_dir("amd_pmc", NULL);
|
||||
debugfs_create_file("smu_fw_info", 0644, dev->dbgfs_dir, dev,
|
||||
&smu_fw_info_fops);
|
||||
+ debugfs_create_file("s0ix_stats", 0644, dev->dbgfs_dir, dev,
|
||||
+ &s0ix_stats_fops);
|
||||
}
|
||||
#else
|
||||
static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
|
||||
@@ -353,7 +388,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
|
||||
struct amd_pmc_dev *dev = &pmc;
|
||||
struct pci_dev *rdev;
|
||||
u32 base_addr_lo, base_addr_hi;
|
||||
- u64 base_addr;
|
||||
+ u64 base_addr, fch_phys_addr;
|
||||
int err;
|
||||
u32 val;
|
||||
|
||||
@@ -405,6 +440,14 @@ static int amd_pmc_probe(struct platform_device *pdev)
|
||||
|
||||
mutex_init(&dev->lock);
|
||||
|
||||
+ /* Use FCH registers to get the S0ix stats */
|
||||
+ base_addr_lo = FCH_BASE_PHY_ADDR_LOW;
|
||||
+ base_addr_hi = FCH_BASE_PHY_ADDR_HIGH;
|
||||
+ fch_phys_addr = ((u64)base_addr_hi << 32 | base_addr_lo);
|
||||
+ dev->fch_virt_addr = devm_ioremap(dev->dev, fch_phys_addr, FCH_SSC_MAPPING_SIZE);
|
||||
+ if (!dev->fch_virt_addr)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
/* Use SMU to get the s0i3 debug stats */
|
||||
err = amd_pmc_setup_smu_logging(dev);
|
||||
if (err)
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From 7fb74e20ab2dca5d8f03c77c6d9e3bbdb7e9db81 Mon Sep 17 00:00:00 2001
|
||||
From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Date: Tue, 29 Jun 2021 14:18:02 +0530
|
||||
Subject: [PATCH] platform/x86: amd-pmc: Add support for ACPI ID AMDI0006
|
||||
|
||||
Some newer BIOSes have added another ACPI ID for the uPEP device.
|
||||
SMU statistics behave identically on this device.
|
||||
|
||||
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/platform/x86/amd-pmc.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
||||
index d1db12e28b32..b8740daecd7b 100644
|
||||
--- a/drivers/platform/x86/amd-pmc.c
|
||||
+++ b/drivers/platform/x86/amd-pmc.c
|
||||
@@ -469,6 +469,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
|
||||
|
||||
static const struct acpi_device_id amd_pmc_acpi_ids[] = {
|
||||
{"AMDI0005", 0},
|
||||
+ {"AMDI0006", 0},
|
||||
{"AMD0004", 0},
|
||||
{"AMD0005", 0},
|
||||
{ }
|
||||
--
|
||||
2.33.0
|
||||
|
||||
From acfa4cdf28630a705fa2df3ad9c6ea0fa7e03352 Mon Sep 17 00:00:00 2001
|
||||
From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Date: Tue, 29 Jun 2021 14:18:03 +0530
|
||||
Subject: [PATCH] platform/x86: amd-pmc: Add new acpi id for future PMC
|
||||
controllers
|
||||
|
||||
The upcoming PMC controller would have a newer acpi id, add that to
|
||||
the supported acpid device list.
|
||||
|
||||
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Patchset: amd-s0ix
|
||||
---
|
||||
drivers/platform/x86/amd-pmc.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
||||
index b8740daecd7b..267173b142c1 100644
|
||||
--- a/drivers/platform/x86/amd-pmc.c
|
||||
+++ b/drivers/platform/x86/amd-pmc.c
|
||||
@@ -68,6 +68,7 @@
|
||||
#define AMD_CPU_ID_RN 0x1630
|
||||
#define AMD_CPU_ID_PCO AMD_CPU_ID_RV
|
||||
#define AMD_CPU_ID_CZN AMD_CPU_ID_RN
|
||||
+#define AMD_CPU_ID_YC 0x14B5
|
||||
|
||||
#define PMC_MSG_DELAY_MIN_US 100
|
||||
#define RESPONSE_REGISTER_LOOP_MAX 200
|
||||
@@ -331,6 +332,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
|
||||
case AMD_CPU_ID_PCO:
|
||||
return MSG_OS_HINT_PCO;
|
||||
case AMD_CPU_ID_RN:
|
||||
+ case AMD_CPU_ID_YC:
|
||||
return MSG_OS_HINT_RN;
|
||||
}
|
||||
return -EINVAL;
|
||||
@@ -376,6 +378,7 @@ static const struct dev_pm_ops amd_pmc_pm_ops = {
|
||||
};
|
||||
|
||||
static const struct pci_device_id pmc_pci_ids[] = {
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_YC) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_CZN) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RN) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PCO) },
|
||||
@@ -470,6 +473,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
|
||||
static const struct acpi_device_id amd_pmc_acpi_ids[] = {
|
||||
{"AMDI0005", 0},
|
||||
{"AMDI0006", 0},
|
||||
+ {"AMDI0007", 0},
|
||||
{"AMD0004", 0},
|
||||
{"AMD0005", 0},
|
||||
{ }
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From 0af29705fc39c579ece3a4985b27db35ae260487 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 18 Oct 2020 16:42:44 +0900
|
||||
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||
for quirks so that each driver can enable quirks even on the affected
|
||||
systems.
|
||||
|
||||
On affected systems, DMI data will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-oemb
|
||||
---
|
||||
drivers/platform/surface/surface3-wmi.c | 7 +++++++
|
||||
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||
3 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
|
||||
index fcd1d4fb94d5..ee26a5998b07 100644
|
||||
--- a/drivers/platform/surface/surface3-wmi.c
|
||||
+++ b/drivers/platform/surface/surface3-wmi.c
|
||||
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
#endif
|
||||
{ }
|
||||
};
|
||||
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||
index 9408ee63cb26..5cac83953901 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3718,6 +3718,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||
},
|
||||
.driver_data = (void *)&intel_braswell_platform_data,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||
+ },
|
||||
{
|
||||
/*
|
||||
* Match for the GPDwin which unfortunately uses somewhat
|
||||
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
index 227424236fd5..1013a57be89a 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.34.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,121 +0,0 @@
|
|||
From 261da92e38fd3bd003c1e724edcc9322cc9b194f 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 64c7145b51a2..1e71a60cfb11 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -826,6 +835,42 @@ static int ath10k_init_configure_target(struct ath10k *ar)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static const char *ath10k_override_board_fw_file(struct ath10k *ar,
|
||||
+ const char *file)
|
||||
+{
|
||||
+ if (strcmp(file, "board.bin") == 0) {
|
||||
+ if (strcmp(override_board, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board.bin' with '%s'\n",
|
||||
+ override_board);
|
||||
+
|
||||
+ return override_board;
|
||||
+ }
|
||||
+
|
||||
+ if (strcmp(file, "board-2.bin") == 0) {
|
||||
+ if (strcmp(override_board2, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board2, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board-2.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board-2.bin' with '%s'\n",
|
||||
+ override_board2);
|
||||
+
|
||||
+ return override_board2;
|
||||
+ }
|
||||
+
|
||||
+ return file;
|
||||
+}
|
||||
+
|
||||
static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
const char *dir,
|
||||
const char *file)
|
||||
@@ -840,6 +885,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
if (dir == NULL)
|
||||
dir = ".";
|
||||
|
||||
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||
+ *
|
||||
+ * Some Surface devices perform better with a different board
|
||||
+ * configuration. To this end, one would need to replace the board.bin
|
||||
+ * file with the modified config and remove the board-2.bin file.
|
||||
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||
+ * we add module options to perform these overrides here.
|
||||
+ */
|
||||
+
|
||||
+ file = ath10k_override_board_fw_file(ar, file);
|
||||
+ if (!file)
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
+
|
||||
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||
--
|
||||
2.34.0
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,335 +0,0 @@
|
|||
From 93a1213b90b28361a0df7a96b087aa0ab2ff105f 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 74925621f239..169713964358 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -571,6 +571,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,
|
||||
@@ -672,6 +694,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.34.0
|
||||
|
||||
From 6cbc6203a8929aacd63257100c9b7a2160adf7fd 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 3c0ee0cdaef5..e5eedb85d471 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -104,6 +104,13 @@ config SURFACE_AGGREGATOR_REGISTRY
|
||||
the respective client devices. Drivers for these devices still need to
|
||||
be selected via the other options.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on SYSFS
|
||||
+ help
|
||||
+ This driver provides a sysfs switch to set the power-state of the
|
||||
+ discrete GPU found on the Microsoft Surface Book 1.
|
||||
+
|
||||
config SURFACE_DTX
|
||||
tristate "Surface DTX (Detachment System) Driver"
|
||||
depends on SURFACE_AGGREGATOR
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index 6d9291c993c4..9eb3a7e6382c 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -11,6 +11,7 @@ obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_REGISTRY) += surface_aggregator_registry.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_DTX) += surface_dtx.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
new file mode 100644
|
||||
index 000000000000..8b816ed8f35c
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
@@ -0,0 +1,162 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+
|
||||
+#ifdef pr_fmt
|
||||
+#undef pr_fmt
|
||||
+#endif
|
||||
+#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
|
||||
+
|
||||
+
|
||||
+static const guid_t dgpu_sw_guid = GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4,
|
||||
+ 0x95, 0xed, 0xab, 0x16, 0x65, 0x49, 0x80, 0x35);
|
||||
+
|
||||
+#define DGPUSW_ACPI_PATH_DSM "\\_SB_.PCI0.LPCB.EC0_.VGBI"
|
||||
+#define DGPUSW_ACPI_PATH_HGON "\\_SB_.PCI0.RP05.HGON"
|
||||
+#define DGPUSW_ACPI_PATH_HGOF "\\_SB_.PCI0.RP05.HGOF"
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_dsmcall(void)
|
||||
+{
|
||||
+ union acpi_object *ret;
|
||||
+ acpi_handle handle;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, DGPUSW_ACPI_PATH_DSM, &handle);
|
||||
+ if (status)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ret = acpi_evaluate_dsm_typed(handle, &dgpu_sw_guid, 1, 1, NULL, ACPI_TYPE_BUFFER);
|
||||
+ if (!ret)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ACPI_FREE(ret);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgon(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGON, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGON: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-on dGPU via HGON\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgof(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGOF, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGOF: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-off dGPU via HGOF\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static ssize_t dgpu_dsmcall_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ int status, value;
|
||||
+
|
||||
+ status = kstrtoint(buf, 0, &value);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (value != 1)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ status = sb1_dgpu_sw_dsmcall();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ bool power;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtobool(buf, &power);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (power)
|
||||
+ status = sb1_dgpu_sw_hgon();
|
||||
+ else
|
||||
+ status = sb1_dgpu_sw_hgof();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR_WO(dgpu_dsmcall);
|
||||
+static DEVICE_ATTR_WO(dgpu_power);
|
||||
+
|
||||
+static struct attribute *sb1_dgpu_sw_attrs[] = {
|
||||
+ &dev_attr_dgpu_dsmcall.attr,
|
||||
+ &dev_attr_dgpu_power.attr,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+static const struct attribute_group sb1_dgpu_sw_attr_group = {
|
||||
+ .attrs = sb1_dgpu_sw_attrs,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ return sysfs_create_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ sysfs_remove_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * The dGPU power seems to be actually handled by MSHW0040. However, that is
|
||||
+ * also the power-/volume-button device with a mainline driver. So let's use
|
||||
+ * MSHW0041 instead for now, which seems to be the LTCH (latch/DTX) device.
|
||||
+ */
|
||||
+static const struct acpi_device_id sb1_dgpu_sw_match[] = {
|
||||
+ { "MSHW0041", },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sb1_dgpu_sw_match);
|
||||
+
|
||||
+static struct platform_driver sb1_dgpu_sw = {
|
||||
+ .probe = sb1_dgpu_sw_probe,
|
||||
+ .remove = sb1_dgpu_sw_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surfacebook1_dgpu_switch",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.34.0
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
From 7e5f221e11e90bb48db72531ac144d7bdfc9e9a1 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 10 Oct 2021 00:02:44 +0200
|
||||
Subject: [PATCH] platform/surface: gpe: Add support for Surface Laptop Studio
|
||||
|
||||
The new Surface Laptop Studio uses GPEs for lid events as well. Add an
|
||||
entry for that so that the lid can be used to wake the device.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/surface/surface_gpe.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
|
||||
index 86f6991b1215..c1775db29efb 100644
|
||||
--- a/drivers/platform/surface/surface_gpe.c
|
||||
+++ b/drivers/platform/surface/surface_gpe.c
|
||||
@@ -26,6 +26,11 @@ static const struct property_entry lid_device_props_l17[] = {
|
||||
{},
|
||||
};
|
||||
|
||||
+static const struct property_entry lid_device_props_l4B[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x4B),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
static const struct property_entry lid_device_props_l4D[] = {
|
||||
PROPERTY_ENTRY_U32("gpe", 0x4D),
|
||||
{},
|
||||
@@ -158,6 +163,14 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
},
|
||||
.driver_data = (void *)lid_device_props_l4D,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface Laptop Studio",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop Studio"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4B,
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.34.0
|
||||
|
||||
From c91d2440570c52e33c4a5c518452413d25e2cb21 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Wed, 27 Oct 2021 00:56:11 +0200
|
||||
Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 8
|
||||
|
||||
The new Surface Pro 8 uses GPEs for lid events as well. Add an entry for
|
||||
that so that the lid can be used to wake the device. Note that this is a
|
||||
device with a keyboard type cover, where this acts as the "lid".
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/surface/surface_gpe.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
|
||||
index c1775db29efb..ec66fde28e75 100644
|
||||
--- a/drivers/platform/surface/surface_gpe.c
|
||||
+++ b/drivers/platform/surface/surface_gpe.c
|
||||
@@ -99,6 +99,14 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
},
|
||||
.driver_data = (void *)lid_device_props_l4D,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface Pro 8",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 8"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4B,
|
||||
+ },
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
.matches = {
|
||||
--
|
||||
2.34.0
|
||||
|
|
@ -1,149 +0,0 @@
|
|||
From 49d6cd6417adf1df985e7b90c5e48a743162333f Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Tue, 5 Oct 2021 00:05:09 +1100
|
||||
Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
|
||||
|
||||
The power button on the AMD variant of the Surface Laptop uses the
|
||||
same MSHW0040 device ID as the 5th and later generation of Surface
|
||||
devices, however they report 0 for their OEM platform revision. As the
|
||||
_DSM does not exist on the devices requiring special casing, check for
|
||||
the existance of the _DSM to determine if soc_button_array should be
|
||||
loaded.
|
||||
|
||||
Fixes: c394159310d0 ("Input: soc_button_array - add support for newer surface devices")
|
||||
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
|
||||
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/input/misc/soc_button_array.c | 33 +++++++--------------------
|
||||
1 file changed, 8 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||
index cb6ec59a045d..4e8944f59def 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -474,8 +474,8 @@ static const struct soc_device_data soc_device_INT33D3 = {
|
||||
* Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
|
||||
* devices use MSHW0040 for power and volume buttons, however the way they
|
||||
* have to be addressed differs. Make sure that we only load this drivers
|
||||
- * for the correct devices by checking the OEM Platform Revision provided by
|
||||
- * the _DSM method.
|
||||
+ * for the correct devices by checking if the OEM Platform Revision DSM call
|
||||
+ * exists.
|
||||
*/
|
||||
#define MSHW0040_DSM_REVISION 0x01
|
||||
#define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision
|
||||
@@ -486,31 +486,14 @@ static const guid_t MSHW0040_DSM_UUID =
|
||||
static int soc_device_check_MSHW0040(struct device *dev)
|
||||
{
|
||||
acpi_handle handle = ACPI_HANDLE(dev);
|
||||
- union acpi_object *result;
|
||||
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||
-
|
||||
- // get OEM platform revision
|
||||
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||
- MSHW0040_DSM_REVISION,
|
||||
- MSHW0040_DSM_GET_OMPR, NULL,
|
||||
- ACPI_TYPE_INTEGER);
|
||||
-
|
||||
- if (result) {
|
||||
- oem_platform_rev = result->integer.value;
|
||||
- ACPI_FREE(result);
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * If the revision is zero here, the _DSM evaluation has failed. This
|
||||
- * indicates that we have a Pro 4 or Book 1 and this driver should not
|
||||
- * be used.
|
||||
- */
|
||||
- if (oem_platform_rev == 0)
|
||||
- return -ENODEV;
|
||||
+ bool exists;
|
||||
|
||||
- dev_dbg(dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||
+ // check if OEM platform revision DSM call exists
|
||||
+ exists = acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||
+ MSHW0040_DSM_REVISION,
|
||||
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||
|
||||
- return 0;
|
||||
+ return exists ? 0 : -ENODEV;
|
||||
}
|
||||
|
||||
/*
|
||||
--
|
||||
2.34.0
|
||||
|
||||
From c97966112f5fe77962a750b70c7899dcd535cc01 Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Tue, 5 Oct 2021 00:22:57 +1100
|
||||
Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
|
||||
variant
|
||||
|
||||
The AMD variant of the Surface Laptop report 0 for their OEM platform
|
||||
revision. The Surface devices that require the surfacepro3_button
|
||||
driver do not have the _DSM that gets the OEM platform revision. If the
|
||||
method does not exist, load surfacepro3_button.
|
||||
|
||||
Fixes: 64dd243d7356 ("platform/x86: surfacepro3_button: Fix device check")
|
||||
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
|
||||
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/platform/surface/surfacepro3_button.c | 30 ++++---------------
|
||||
1 file changed, 6 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
|
||||
index 242fb690dcaf..30eea54dbb47 100644
|
||||
--- a/drivers/platform/surface/surfacepro3_button.c
|
||||
+++ b/drivers/platform/surface/surfacepro3_button.c
|
||||
@@ -149,7 +149,8 @@ static int surface_button_resume(struct device *dev)
|
||||
/*
|
||||
* Surface Pro 4 and Surface Book 2 / Surface Pro 2017 use the same device
|
||||
* ID (MSHW0040) for the power/volume buttons. Make sure this is the right
|
||||
- * device by checking for the _DSM method and OEM Platform Revision.
|
||||
+ * device by checking for the _DSM method and OEM Platform Revision DSM
|
||||
+ * function.
|
||||
*
|
||||
* Returns true if the driver should bind to this device, i.e. the device is
|
||||
* either MSWH0028 (Pro 3) or MSHW0040 on a Pro 4 or Book 1.
|
||||
@@ -157,30 +158,11 @@ static int surface_button_resume(struct device *dev)
|
||||
static bool surface_button_check_MSHW0040(struct acpi_device *dev)
|
||||
{
|
||||
acpi_handle handle = dev->handle;
|
||||
- union acpi_object *result;
|
||||
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||
-
|
||||
- // get OEM platform revision
|
||||
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||
- MSHW0040_DSM_REVISION,
|
||||
- MSHW0040_DSM_GET_OMPR,
|
||||
- NULL, ACPI_TYPE_INTEGER);
|
||||
-
|
||||
- /*
|
||||
- * If evaluating the _DSM fails, the method is not present. This means
|
||||
- * that we have either MSHW0028 or MSHW0040 on Pro 4 or Book 1, so we
|
||||
- * should use this driver. We use revision 0 indicating it is
|
||||
- * unavailable.
|
||||
- */
|
||||
-
|
||||
- if (result) {
|
||||
- oem_platform_rev = result->integer.value;
|
||||
- ACPI_FREE(result);
|
||||
- }
|
||||
-
|
||||
- dev_dbg(&dev->dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||
|
||||
- return oem_platform_rev == 0;
|
||||
+ // make sure that OEM platform revision DSM call does not exist
|
||||
+ return !acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||
+ MSHW0040_DSM_REVISION,
|
||||
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.34.0
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From da5a9a75b947342ff8695abb61ecc90d4f71f03b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Thu, 5 Nov 2020 13:09:45 +0100
|
||||
Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
|
||||
suspending
|
||||
|
||||
The Type Cover for Microsoft Surface devices supports a special usb
|
||||
control request to disable or enable the built-in keyboard backlight.
|
||||
On Windows, this request happens when putting the device into suspend or
|
||||
resuming it, without it the backlight of the Type Cover will remain
|
||||
enabled for some time even though the computer is suspended, which looks
|
||||
weird to the user.
|
||||
|
||||
So add support for this special usb control request to hid-multitouch,
|
||||
which is the driver that's handling the Type Cover.
|
||||
|
||||
The reason we have to use a pm_notifier for this instead of the usual
|
||||
suspend/resume methods is that those won't get called in case the usb
|
||||
device is already autosuspended.
|
||||
|
||||
Also, if the device is autosuspended, we have to briefly autoresume it
|
||||
in order to send the request. Doing that should be fine, the usb-core
|
||||
driver does something similar during suspend inside choose_wakeup().
|
||||
|
||||
To make sure we don't send that request to every device but only to
|
||||
devices which support it, add a new quirk
|
||||
MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER to hid-multitouch. For now this quirk
|
||||
is only enabled for the usb id of the Surface Pro 2017 Type Cover, which
|
||||
is where I confirmed that it's working.
|
||||
|
||||
Patchset: surface-typecover
|
||||
---
|
||||
drivers/hid/hid-multitouch.c | 100 ++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 98 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
||||
index 3ea7cb1cda84..92fb053e0dd2 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -34,7 +34,10 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/hid.h>
|
||||
#include <linux/module.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/suspend.h>
|
||||
+#include <linux/usb.h>
|
||||
#include <linux/input/mt.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/string.h>
|
||||
@@ -47,6 +50,7 @@ MODULE_DESCRIPTION("HID multitouch panels");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#include "hid-ids.h"
|
||||
+#include "usbhid/usbhid.h"
|
||||
|
||||
/* quirks to control the device */
|
||||
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
|
||||
@@ -71,12 +75,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(22)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
HID_LATENCY_HIGH = 1,
|
||||
@@ -168,6 +175,8 @@ struct mt_device {
|
||||
|
||||
struct list_head applications;
|
||||
struct list_head reports;
|
||||
+
|
||||
+ struct notifier_block pm_notifier;
|
||||
};
|
||||
|
||||
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||
@@ -210,6 +219,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||
#define MT_CLS_GOOGLE 0x0111
|
||||
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||
#define MT_CLS_SMART_TECH 0x0113
|
||||
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
#define MT_MAX_MAXCONTACT 250
|
||||
@@ -378,6 +388,16 @@ static const struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
MT_QUIRK_SEPARATE_APP_REPORT,
|
||||
},
|
||||
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||
+ MT_QUIRK_ALWAYS_VALID |
|
||||
+ MT_QUIRK_IGNORE_DUPLICATES |
|
||||
+ MT_QUIRK_HOVERING |
|
||||
+ MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
+ MT_QUIRK_STICKY_FINGERS |
|
||||
+ MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||
+ .export_all_inputs = true
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1690,6 +1710,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1713,6 +1796,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
|
||||
hid_set_drvdata(hdev, td);
|
||||
|
||||
+ td->pm_notifier.notifier_call = mt_pm_notifier;
|
||||
+ register_pm_notifier(&td->pm_notifier);
|
||||
+
|
||||
INIT_LIST_HEAD(&td->applications);
|
||||
INIT_LIST_HEAD(&td->reports);
|
||||
|
||||
@@ -1742,15 +1828,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
timer_setup(&td->release_timer, mt_expired_timeout, 0);
|
||||
|
||||
ret = hid_parse(hdev);
|
||||
- if (ret != 0)
|
||||
+ if (ret != 0) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID)
|
||||
mt_fix_const_fields(hdev, HID_DG_CONTACTID);
|
||||
|
||||
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
||||
- if (ret)
|
||||
+ if (ret) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||
if (ret)
|
||||
@@ -1802,6 +1892,7 @@ static void mt_remove(struct hid_device *hdev)
|
||||
{
|
||||
struct mt_device *td = hid_get_drvdata(hdev);
|
||||
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
del_timer_sync(&td->release_timer);
|
||||
|
||||
sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||
@@ -2159,6 +2250,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
||||
USB_DEVICE_ID_XIROKU_CSR2) },
|
||||
|
||||
+ /* Microsoft Surface type cover */
|
||||
+ { .driver_data = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||
+ USB_VENDOR_ID_MICROSOFT, 0x09c0) },
|
||||
+
|
||||
/* Google MT devices */
|
||||
{ .driver_data = MT_CLS_GOOGLE,
|
||||
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
||||
--
|
||||
2.34.0
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,109 +0,0 @@
|
|||
From 67dc820f8128554bf33bf737be1b28a9fb7178a3 Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Sat, 29 May 2021 17:47:38 +1000
|
||||
Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
|
||||
override
|
||||
|
||||
This patch is the work of Thomas Gleixner <tglx@linutronix.de> and is
|
||||
copied from:
|
||||
https://lore.kernel.org/lkml/87lf8ddjqx.ffs@nanos.tec.linutronix.de/
|
||||
|
||||
This patch adds a quirk to the ACPI setup to patch in the the irq 7 pin
|
||||
setup that is missing in the laptops ACPI table.
|
||||
|
||||
This patch was used for validation of the issue, and is not a proper
|
||||
fix, but is probably a better temporary hack than continuing to probe
|
||||
the Legacy PIC and run with the PIC in an unknown state.
|
||||
|
||||
Patchset: amd-gpio
|
||||
---
|
||||
arch/x86/kernel/acpi/boot.c | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
|
||||
index e55e0c1fad8c..46dfad41b401 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/efi-bgrt.h>
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/pgtable.h>
|
||||
+#include <linux/dmi.h>
|
||||
|
||||
#include <asm/e820/api.h>
|
||||
#include <asm/irqdomain.h>
|
||||
@@ -1143,6 +1144,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||
}
|
||||
}
|
||||
|
||||
+static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||
+ },
|
||||
+ },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Parse IOAPIC related entries in MADT
|
||||
* returns 0 on success, < 0 on error
|
||||
@@ -1198,6 +1210,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
|
||||
acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0,
|
||||
acpi_gbl_FADT.sci_interrupt);
|
||||
|
||||
+ if (dmi_check_system(surface_quirk)) {
|
||||
+ pr_warn("Surface hack: Override irq 7\n");
|
||||
+ mp_override_legacy_irq(7, 3, 3, 7);
|
||||
+ }
|
||||
+
|
||||
/* Fill in identity legacy mappings where no override */
|
||||
mp_config_acpi_legacy_irqs();
|
||||
|
||||
--
|
||||
2.34.0
|
||||
|
||||
From 203d2a88203f6e8648ec869f9a017dc21c17cab8 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Thu, 3 Jun 2021 14:04:26 +0200
|
||||
Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override
|
||||
quirk
|
||||
|
||||
The 13" version of the Surface Laptop 4 has the same problem as the 15"
|
||||
version, but uses a different SKU. Add that SKU to the quirk as well.
|
||||
|
||||
Patchset: amd-gpio
|
||||
---
|
||||
arch/x86/kernel/acpi/boot.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
|
||||
index 46dfad41b401..78bf6a097dc5 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -1146,12 +1146,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||
|
||||
static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||
{
|
||||
- .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 15\")",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 13\")",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1958:1959")
|
||||
+ },
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.34.0
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
From 417141a5157f7982f13fdd717ef4e1e7ebec6dbf Mon Sep 17 00:00:00 2001
|
||||
From: Mathias Nyman <mathias.nyman@linux.intel.com>
|
||||
Date: Fri, 29 Oct 2021 15:51:54 +0300
|
||||
Subject: [PATCH] xhci: Fix commad ring abort, write all 64 bits to CRCR
|
||||
register.
|
||||
|
||||
Turns out some xHC controllers require all 64 bits in the CRCR register
|
||||
to be written to execute a command abort.
|
||||
|
||||
The lower 32 bits containing the command abort bit is written first.
|
||||
In case the command ring stops before we write the upper 32 bits then
|
||||
hardware may use these upper bits to set the commnd ring dequeue pointer.
|
||||
|
||||
Solve this by making sure the upper 32 bits contain a valid command
|
||||
ring dequeue pointer.
|
||||
|
||||
The original patch that only wrote the first 32 to stop the ring went
|
||||
to stable, so this fix should go there as well.
|
||||
|
||||
Fixes: ff0e50d3564f ("xhci: Fix command ring pointer corruption while aborting a command")
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
|
||||
Patchset: misc-fixes
|
||||
---
|
||||
drivers/usb/host/xhci-ring.c | 21 ++++++++++++++-------
|
||||
1 file changed, 14 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
|
||||
index 8fedf1bf292b..3dd5929b67f0 100644
|
||||
--- a/drivers/usb/host/xhci-ring.c
|
||||
+++ b/drivers/usb/host/xhci-ring.c
|
||||
@@ -366,7 +366,9 @@ static void xhci_handle_stopped_cmd_ring(struct xhci_hcd *xhci,
|
||||
/* Must be called with xhci->lock held, releases and aquires lock back */
|
||||
static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
|
||||
{
|
||||
- u32 temp_32;
|
||||
+ struct xhci_segment *new_seg = xhci->cmd_ring->deq_seg;
|
||||
+ union xhci_trb *new_deq = xhci->cmd_ring->dequeue;
|
||||
+ u64 crcr;
|
||||
int ret;
|
||||
|
||||
xhci_dbg(xhci, "Abort command ring\n");
|
||||
@@ -375,13 +377,18 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
|
||||
|
||||
/*
|
||||
* The control bits like command stop, abort are located in lower
|
||||
- * dword of the command ring control register. Limit the write
|
||||
- * to the lower dword to avoid corrupting the command ring pointer
|
||||
- * in case if the command ring is stopped by the time upper dword
|
||||
- * is written.
|
||||
+ * dword of the command ring control register.
|
||||
+ * Some controllers require all 64 bits to be written to abort the ring.
|
||||
+ * Make sure the upper dword is valid, pointing to the next command,
|
||||
+ * avoiding corrupting the command ring pointer in case the command ring
|
||||
+ * is stopped by the time the upper dword is written.
|
||||
*/
|
||||
- temp_32 = readl(&xhci->op_regs->cmd_ring);
|
||||
- writel(temp_32 | CMD_RING_ABORT, &xhci->op_regs->cmd_ring);
|
||||
+ next_trb(xhci, NULL, &new_seg, &new_deq);
|
||||
+ if (trb_is_link(new_deq))
|
||||
+ next_trb(xhci, NULL, &new_seg, &new_deq);
|
||||
+
|
||||
+ crcr = xhci_trb_virt_to_dma(new_seg, new_deq);
|
||||
+ xhci_write_64(xhci, crcr | CMD_RING_ABORT, &xhci->op_regs->cmd_ring);
|
||||
|
||||
/* Section 4.6.1.2 of xHCI 1.0 spec says software should also time the
|
||||
* completion of the Command Abort operation. If CRR is not negated in 5
|
||||
--
|
||||
2.34.0
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From 221e1d5986c085f98f4487d48bd222d5c050b568 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 18 Oct 2020 16:42:44 +0900
|
||||
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||
for quirks so that each driver can enable quirks even on the affected
|
||||
systems.
|
||||
|
||||
On affected systems, DMI data will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-oemb
|
||||
---
|
||||
drivers/platform/surface/surface3-wmi.c | 7 +++++++
|
||||
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||
3 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
|
||||
index fcd1d4fb94d5..ee26a5998b07 100644
|
||||
--- a/drivers/platform/surface/surface3-wmi.c
|
||||
+++ b/drivers/platform/surface/surface3-wmi.c
|
||||
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
#endif
|
||||
{ }
|
||||
};
|
||||
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||
index 9408ee63cb26..5cac83953901 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3718,6 +3718,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||
},
|
||||
.driver_data = (void *)&intel_braswell_platform_data,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||
+ },
|
||||
{
|
||||
/*
|
||||
* Match for the GPDwin which unfortunately uses somewhat
|
||||
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
index 227424236fd5..1013a57be89a 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,121 +0,0 @@
|
|||
From 884f7715d516d67b71fdbb7f7a6849473ae30faf 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 64c7145b51a2..1e71a60cfb11 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -826,6 +835,42 @@ static int ath10k_init_configure_target(struct ath10k *ar)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static const char *ath10k_override_board_fw_file(struct ath10k *ar,
|
||||
+ const char *file)
|
||||
+{
|
||||
+ if (strcmp(file, "board.bin") == 0) {
|
||||
+ if (strcmp(override_board, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board.bin' with '%s'\n",
|
||||
+ override_board);
|
||||
+
|
||||
+ return override_board;
|
||||
+ }
|
||||
+
|
||||
+ if (strcmp(file, "board-2.bin") == 0) {
|
||||
+ if (strcmp(override_board2, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board2, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board-2.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board-2.bin' with '%s'\n",
|
||||
+ override_board2);
|
||||
+
|
||||
+ return override_board2;
|
||||
+ }
|
||||
+
|
||||
+ return file;
|
||||
+}
|
||||
+
|
||||
static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
const char *dir,
|
||||
const char *file)
|
||||
@@ -840,6 +885,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
if (dir == NULL)
|
||||
dir = ".";
|
||||
|
||||
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||
+ *
|
||||
+ * Some Surface devices perform better with a different board
|
||||
+ * configuration. To this end, one would need to replace the board.bin
|
||||
+ * file with the modified config and remove the board-2.bin file.
|
||||
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||
+ * we add module options to perform these overrides here.
|
||||
+ */
|
||||
+
|
||||
+ file = ath10k_override_board_fw_file(ar, file);
|
||||
+ if (!file)
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
+
|
||||
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||
--
|
||||
2.34.1
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,335 +0,0 @@
|
|||
From 281fae27184e6db9262441a46f1f4d29426c74e6 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 546cc935e035..006e25a1b0d5 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -603,6 +603,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,
|
||||
@@ -704,6 +726,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.34.1
|
||||
|
||||
From 2f900b5bbfbcca95220ec243ade1cf29727cca7e 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 3c0ee0cdaef5..e5eedb85d471 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -104,6 +104,13 @@ config SURFACE_AGGREGATOR_REGISTRY
|
||||
the respective client devices. Drivers for these devices still need to
|
||||
be selected via the other options.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on SYSFS
|
||||
+ help
|
||||
+ This driver provides a sysfs switch to set the power-state of the
|
||||
+ discrete GPU found on the Microsoft Surface Book 1.
|
||||
+
|
||||
config SURFACE_DTX
|
||||
tristate "Surface DTX (Detachment System) Driver"
|
||||
depends on SURFACE_AGGREGATOR
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index 6d9291c993c4..9eb3a7e6382c 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -11,6 +11,7 @@ obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_REGISTRY) += surface_aggregator_registry.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_DTX) += surface_dtx.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
new file mode 100644
|
||||
index 000000000000..8b816ed8f35c
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
@@ -0,0 +1,162 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+
|
||||
+#ifdef pr_fmt
|
||||
+#undef pr_fmt
|
||||
+#endif
|
||||
+#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
|
||||
+
|
||||
+
|
||||
+static const guid_t dgpu_sw_guid = GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4,
|
||||
+ 0x95, 0xed, 0xab, 0x16, 0x65, 0x49, 0x80, 0x35);
|
||||
+
|
||||
+#define DGPUSW_ACPI_PATH_DSM "\\_SB_.PCI0.LPCB.EC0_.VGBI"
|
||||
+#define DGPUSW_ACPI_PATH_HGON "\\_SB_.PCI0.RP05.HGON"
|
||||
+#define DGPUSW_ACPI_PATH_HGOF "\\_SB_.PCI0.RP05.HGOF"
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_dsmcall(void)
|
||||
+{
|
||||
+ union acpi_object *ret;
|
||||
+ acpi_handle handle;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, DGPUSW_ACPI_PATH_DSM, &handle);
|
||||
+ if (status)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ret = acpi_evaluate_dsm_typed(handle, &dgpu_sw_guid, 1, 1, NULL, ACPI_TYPE_BUFFER);
|
||||
+ if (!ret)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ACPI_FREE(ret);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgon(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGON, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGON: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-on dGPU via HGON\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgof(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGOF, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGOF: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-off dGPU via HGOF\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static ssize_t dgpu_dsmcall_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ int status, value;
|
||||
+
|
||||
+ status = kstrtoint(buf, 0, &value);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (value != 1)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ status = sb1_dgpu_sw_dsmcall();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ bool power;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtobool(buf, &power);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (power)
|
||||
+ status = sb1_dgpu_sw_hgon();
|
||||
+ else
|
||||
+ status = sb1_dgpu_sw_hgof();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR_WO(dgpu_dsmcall);
|
||||
+static DEVICE_ATTR_WO(dgpu_power);
|
||||
+
|
||||
+static struct attribute *sb1_dgpu_sw_attrs[] = {
|
||||
+ &dev_attr_dgpu_dsmcall.attr,
|
||||
+ &dev_attr_dgpu_power.attr,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+static const struct attribute_group sb1_dgpu_sw_attr_group = {
|
||||
+ .attrs = sb1_dgpu_sw_attrs,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ return sysfs_create_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ sysfs_remove_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * The dGPU power seems to be actually handled by MSHW0040. However, that is
|
||||
+ * also the power-/volume-button device with a mainline driver. So let's use
|
||||
+ * MSHW0041 instead for now, which seems to be the LTCH (latch/DTX) device.
|
||||
+ */
|
||||
+static const struct acpi_device_id sb1_dgpu_sw_match[] = {
|
||||
+ { "MSHW0041", },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sb1_dgpu_sw_match);
|
||||
+
|
||||
+static struct platform_driver sb1_dgpu_sw = {
|
||||
+ .probe = sb1_dgpu_sw_probe,
|
||||
+ .remove = sb1_dgpu_sw_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surfacebook1_dgpu_switch",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
From 6d69e602cc56f2de7e9b3ef002bd1b6b42fcfa59 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 10 Oct 2021 00:02:44 +0200
|
||||
Subject: [PATCH] platform/surface: gpe: Add support for Surface Laptop Studio
|
||||
|
||||
The new Surface Laptop Studio uses GPEs for lid events as well. Add an
|
||||
entry for that so that the lid can be used to wake the device.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/surface/surface_gpe.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
|
||||
index 86f6991b1215..c1775db29efb 100644
|
||||
--- a/drivers/platform/surface/surface_gpe.c
|
||||
+++ b/drivers/platform/surface/surface_gpe.c
|
||||
@@ -26,6 +26,11 @@ static const struct property_entry lid_device_props_l17[] = {
|
||||
{},
|
||||
};
|
||||
|
||||
+static const struct property_entry lid_device_props_l4B[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x4B),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
static const struct property_entry lid_device_props_l4D[] = {
|
||||
PROPERTY_ENTRY_U32("gpe", 0x4D),
|
||||
{},
|
||||
@@ -158,6 +163,14 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
},
|
||||
.driver_data = (void *)lid_device_props_l4D,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface Laptop Studio",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop Studio"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4B,
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
From b01cc41a1f5eda6e0964b6eca3b221c2aac6597f Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Wed, 27 Oct 2021 00:56:11 +0200
|
||||
Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 8
|
||||
|
||||
The new Surface Pro 8 uses GPEs for lid events as well. Add an entry for
|
||||
that so that the lid can be used to wake the device. Note that this is a
|
||||
device with a keyboard type cover, where this acts as the "lid".
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/surface/surface_gpe.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
|
||||
index c1775db29efb..ec66fde28e75 100644
|
||||
--- a/drivers/platform/surface/surface_gpe.c
|
||||
+++ b/drivers/platform/surface/surface_gpe.c
|
||||
@@ -99,6 +99,14 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
},
|
||||
.driver_data = (void *)lid_device_props_l4D,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface Pro 8",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 8"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4B,
|
||||
+ },
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
.matches = {
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,149 +0,0 @@
|
|||
From ab51b1549415b29b55a403adb603d8222574650d Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Tue, 5 Oct 2021 00:05:09 +1100
|
||||
Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
|
||||
|
||||
The power button on the AMD variant of the Surface Laptop uses the
|
||||
same MSHW0040 device ID as the 5th and later generation of Surface
|
||||
devices, however they report 0 for their OEM platform revision. As the
|
||||
_DSM does not exist on the devices requiring special casing, check for
|
||||
the existance of the _DSM to determine if soc_button_array should be
|
||||
loaded.
|
||||
|
||||
Fixes: c394159310d0 ("Input: soc_button_array - add support for newer surface devices")
|
||||
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
|
||||
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/input/misc/soc_button_array.c | 33 +++++++--------------------
|
||||
1 file changed, 8 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||
index cb6ec59a045d..4e8944f59def 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -474,8 +474,8 @@ static const struct soc_device_data soc_device_INT33D3 = {
|
||||
* Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
|
||||
* devices use MSHW0040 for power and volume buttons, however the way they
|
||||
* have to be addressed differs. Make sure that we only load this drivers
|
||||
- * for the correct devices by checking the OEM Platform Revision provided by
|
||||
- * the _DSM method.
|
||||
+ * for the correct devices by checking if the OEM Platform Revision DSM call
|
||||
+ * exists.
|
||||
*/
|
||||
#define MSHW0040_DSM_REVISION 0x01
|
||||
#define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision
|
||||
@@ -486,31 +486,14 @@ static const guid_t MSHW0040_DSM_UUID =
|
||||
static int soc_device_check_MSHW0040(struct device *dev)
|
||||
{
|
||||
acpi_handle handle = ACPI_HANDLE(dev);
|
||||
- union acpi_object *result;
|
||||
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||
-
|
||||
- // get OEM platform revision
|
||||
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||
- MSHW0040_DSM_REVISION,
|
||||
- MSHW0040_DSM_GET_OMPR, NULL,
|
||||
- ACPI_TYPE_INTEGER);
|
||||
-
|
||||
- if (result) {
|
||||
- oem_platform_rev = result->integer.value;
|
||||
- ACPI_FREE(result);
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * If the revision is zero here, the _DSM evaluation has failed. This
|
||||
- * indicates that we have a Pro 4 or Book 1 and this driver should not
|
||||
- * be used.
|
||||
- */
|
||||
- if (oem_platform_rev == 0)
|
||||
- return -ENODEV;
|
||||
+ bool exists;
|
||||
|
||||
- dev_dbg(dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||
+ // check if OEM platform revision DSM call exists
|
||||
+ exists = acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||
+ MSHW0040_DSM_REVISION,
|
||||
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||
|
||||
- return 0;
|
||||
+ return exists ? 0 : -ENODEV;
|
||||
}
|
||||
|
||||
/*
|
||||
--
|
||||
2.34.1
|
||||
|
||||
From f0ad3ea54d4d370a357f076ee9600809506a52ed Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Tue, 5 Oct 2021 00:22:57 +1100
|
||||
Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
|
||||
variant
|
||||
|
||||
The AMD variant of the Surface Laptop report 0 for their OEM platform
|
||||
revision. The Surface devices that require the surfacepro3_button
|
||||
driver do not have the _DSM that gets the OEM platform revision. If the
|
||||
method does not exist, load surfacepro3_button.
|
||||
|
||||
Fixes: 64dd243d7356 ("platform/x86: surfacepro3_button: Fix device check")
|
||||
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
|
||||
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/platform/surface/surfacepro3_button.c | 30 ++++---------------
|
||||
1 file changed, 6 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
|
||||
index 242fb690dcaf..30eea54dbb47 100644
|
||||
--- a/drivers/platform/surface/surfacepro3_button.c
|
||||
+++ b/drivers/platform/surface/surfacepro3_button.c
|
||||
@@ -149,7 +149,8 @@ static int surface_button_resume(struct device *dev)
|
||||
/*
|
||||
* Surface Pro 4 and Surface Book 2 / Surface Pro 2017 use the same device
|
||||
* ID (MSHW0040) for the power/volume buttons. Make sure this is the right
|
||||
- * device by checking for the _DSM method and OEM Platform Revision.
|
||||
+ * device by checking for the _DSM method and OEM Platform Revision DSM
|
||||
+ * function.
|
||||
*
|
||||
* Returns true if the driver should bind to this device, i.e. the device is
|
||||
* either MSWH0028 (Pro 3) or MSHW0040 on a Pro 4 or Book 1.
|
||||
@@ -157,30 +158,11 @@ static int surface_button_resume(struct device *dev)
|
||||
static bool surface_button_check_MSHW0040(struct acpi_device *dev)
|
||||
{
|
||||
acpi_handle handle = dev->handle;
|
||||
- union acpi_object *result;
|
||||
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||
-
|
||||
- // get OEM platform revision
|
||||
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||
- MSHW0040_DSM_REVISION,
|
||||
- MSHW0040_DSM_GET_OMPR,
|
||||
- NULL, ACPI_TYPE_INTEGER);
|
||||
-
|
||||
- /*
|
||||
- * If evaluating the _DSM fails, the method is not present. This means
|
||||
- * that we have either MSHW0028 or MSHW0040 on Pro 4 or Book 1, so we
|
||||
- * should use this driver. We use revision 0 indicating it is
|
||||
- * unavailable.
|
||||
- */
|
||||
-
|
||||
- if (result) {
|
||||
- oem_platform_rev = result->integer.value;
|
||||
- ACPI_FREE(result);
|
||||
- }
|
||||
-
|
||||
- dev_dbg(&dev->dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||
|
||||
- return oem_platform_rev == 0;
|
||||
+ // make sure that OEM platform revision DSM call does not exist
|
||||
+ return !acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||
+ MSHW0040_DSM_REVISION,
|
||||
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From a4e37266855a261d3128a24f92ade3376016b38b 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 e1afddb7b33d..c15600b04b28 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -34,7 +34,10 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/hid.h>
|
||||
#include <linux/module.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/suspend.h>
|
||||
+#include <linux/usb.h>
|
||||
#include <linux/input/mt.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/string.h>
|
||||
@@ -47,6 +50,7 @@ MODULE_DESCRIPTION("HID multitouch panels");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#include "hid-ids.h"
|
||||
+#include "usbhid/usbhid.h"
|
||||
|
||||
/* quirks to control the device */
|
||||
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
|
||||
@@ -71,12 +75,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(22)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
HID_LATENCY_HIGH = 1,
|
||||
@@ -168,6 +175,8 @@ struct mt_device {
|
||||
|
||||
struct list_head applications;
|
||||
struct list_head reports;
|
||||
+
|
||||
+ struct notifier_block pm_notifier;
|
||||
};
|
||||
|
||||
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||
@@ -211,6 +220,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||
#define MT_CLS_GOOGLE 0x0111
|
||||
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||
#define MT_CLS_SMART_TECH 0x0113
|
||||
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
#define MT_MAX_MAXCONTACT 250
|
||||
@@ -386,6 +396,16 @@ static const struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
MT_QUIRK_SEPARATE_APP_REPORT,
|
||||
},
|
||||
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||
+ MT_QUIRK_ALWAYS_VALID |
|
||||
+ MT_QUIRK_IGNORE_DUPLICATES |
|
||||
+ MT_QUIRK_HOVERING |
|
||||
+ MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
+ MT_QUIRK_STICKY_FINGERS |
|
||||
+ MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||
+ .export_all_inputs = true
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1698,6 +1718,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1721,6 +1804,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);
|
||||
|
||||
@@ -1750,15 +1836,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)
|
||||
@@ -1810,6 +1900,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);
|
||||
@@ -2172,6 +2263,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.34.1
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,109 +0,0 @@
|
|||
From 1fa47c006afddaf5d0feefd7aa753dadb180cb0b 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 14bcd59bcdee..159d26a664ca 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/efi-bgrt.h>
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/pgtable.h>
|
||||
+#include <linux/dmi.h>
|
||||
|
||||
#include <asm/e820/api.h>
|
||||
#include <asm/irqdomain.h>
|
||||
@@ -1143,6 +1144,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||
}
|
||||
}
|
||||
|
||||
+static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||
+ },
|
||||
+ },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Parse IOAPIC related entries in MADT
|
||||
* returns 0 on success, < 0 on error
|
||||
@@ -1198,6 +1210,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
|
||||
acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0,
|
||||
acpi_gbl_FADT.sci_interrupt);
|
||||
|
||||
+ if (dmi_check_system(surface_quirk)) {
|
||||
+ pr_warn("Surface hack: Override irq 7\n");
|
||||
+ mp_override_legacy_irq(7, 3, 3, 7);
|
||||
+ }
|
||||
+
|
||||
/* Fill in identity legacy mappings where no override */
|
||||
mp_config_acpi_legacy_irqs();
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
From 9894d200ff30a74831e7e0bab9528c7cabadadb0 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 159d26a664ca..77cd54849a8b 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -1146,12 +1146,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||
|
||||
static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||
{
|
||||
- .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 15\")",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 13\")",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1958:1959")
|
||||
+ },
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From 7f6b73f659673d6bb91d148354c96d47a5b25af5 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Wed, 8 Dec 2021 16:22:50 +0100
|
||||
Subject: [PATCH] acpi/battery: Add device HID and quirk for Microsoft Surface
|
||||
Go 3
|
||||
|
||||
For some reason, the Microsoft Surface Go 3 uses the standard ACPI
|
||||
interface for battery information, but does not use the standard PNP0C0A
|
||||
HID. Instead it uses MSHW0146 as identifier. Add that ID to the driver
|
||||
as this seems to work well.
|
||||
|
||||
Additionally, the power state is not updated immediately after the AC
|
||||
has been (un-)plugged, so add the respective quirk for that.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: misc-fixes
|
||||
---
|
||||
drivers/acpi/battery.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
|
||||
index 8afa85d6eb6a..65882cb791a5 100644
|
||||
--- a/drivers/acpi/battery.c
|
||||
+++ b/drivers/acpi/battery.c
|
||||
@@ -59,6 +59,10 @@ MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
|
||||
|
||||
static const struct acpi_device_id battery_device_ids[] = {
|
||||
{"PNP0C0A", 0},
|
||||
+
|
||||
+ /* Microsoft Surface Go 3 */
|
||||
+ {"MSHW0146", 0},
|
||||
+
|
||||
{"", 0},
|
||||
};
|
||||
|
||||
@@ -1155,6 +1159,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
|
||||
DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ /* Microsoft Surface Go 3 */
|
||||
+ .callback = battery_notification_delay_quirk,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 3"),
|
||||
+ },
|
||||
+ },
|
||||
{},
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From b281caed8c64e4995e940b6392e343f9de430a78 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 18 Oct 2020 16:42:44 +0900
|
||||
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||
for quirks so that each driver can enable quirks even on the affected
|
||||
systems.
|
||||
|
||||
On affected systems, DMI data will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-oemb
|
||||
---
|
||||
drivers/platform/surface/surface3-wmi.c | 7 +++++++
|
||||
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||
3 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
|
||||
index 09ac9cfc40d8..c626109cf445 100644
|
||||
--- a/drivers/platform/surface/surface3-wmi.c
|
||||
+++ b/drivers/platform/surface/surface3-wmi.c
|
||||
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
#endif
|
||||
{ }
|
||||
};
|
||||
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||
index 197c56047947..9893e9c3cdf7 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3718,6 +3718,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||
},
|
||||
.driver_data = (void *)&intel_braswell_platform_data,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||
+ },
|
||||
{
|
||||
/*
|
||||
* Match for the GPDwin which unfortunately uses somewhat
|
||||
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
index c60a5e8e7bc9..e947133a2c36 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
|
@ -1,845 +0,0 @@
|
|||
From 6a027f5c058e37000185b232ebbf80e8d69d1140 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Tue, 29 Sep 2020 17:32:22 +0900
|
||||
Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
|
||||
|
||||
This commit adds reset_wsid quirk and uses this quirk for Surface 3 on
|
||||
card reset.
|
||||
|
||||
To reset mwifiex on Surface 3, it seems that calling the _DSM method
|
||||
exists in \_SB.WSID [1] device is required.
|
||||
|
||||
On Surface 3, calling the _DSM method removes/re-probes the card by
|
||||
itself. So, need to place the reset function before performing FLR and
|
||||
skip performing any other reset-related works.
|
||||
|
||||
Note that Surface Pro 3 also has the WSID device [2], but it seems to need
|
||||
more work. This commit only supports Surface 3 yet.
|
||||
|
||||
[1] https://github.com/linux-surface/acpidumps/blob/05cba925f3a515f222acb5b3551a032ddde958fe/surface_3/dsdt.dsl#L11947-L12011
|
||||
[2] https://github.com/linux-surface/acpidumps/blob/05cba925f3a515f222acb5b3551a032ddde958fe/surface_pro_3/dsdt.dsl#L12164-L12216
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +++
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.c | 83 +++++++++++++++++++
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.h | 6 ++
|
||||
3 files changed, 99 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index c3f5583ea70d..3f5138008594 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -2993,6 +2993,16 @@ static void mwifiex_pcie_card_reset_work(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
struct pcie_service_card *card = adapter->card;
|
||||
|
||||
+ /* On Surface 3, reset_wsid method removes then re-probes card by
|
||||
+ * itself. So, need to place it here and skip performing any other
|
||||
+ * reset-related works.
|
||||
+ */
|
||||
+ if (card->quirks & QUIRK_FW_RST_WSID_S3) {
|
||||
+ mwifiex_pcie_reset_wsid_quirk(card->dev);
|
||||
+ /* skip performing any other reset-related works */
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
/* We can't afford to wait here; remove() might be waiting on us. If we
|
||||
* can't grab the device lock, maybe we'll get another chance later.
|
||||
*/
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 0234cf3c2974..563dd0d5ac79 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -15,10 +15,21 @@
|
||||
* this warranty disclaimer.
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/dmi.h>
|
||||
|
||||
#include "pcie_quirks.h"
|
||||
|
||||
+/* For reset_wsid quirk */
|
||||
+#define ACPI_WSID_PATH "\\_SB.WSID"
|
||||
+#define WSID_REV 0x0
|
||||
+#define WSID_FUNC_WIFI_PWR_OFF 0x1
|
||||
+#define WSID_FUNC_WIFI_PWR_ON 0x2
|
||||
+/* WSID _DSM UUID: "534ea3bf-fcc2-4e7a-908f-a13978f0c7ef" */
|
||||
+static const guid_t wsid_dsm_guid =
|
||||
+ GUID_INIT(0x534ea3bf, 0xfcc2, 0x4e7a,
|
||||
+ 0x90, 0x8f, 0xa1, 0x39, 0x78, 0xf0, 0xc7, 0xef);
|
||||
+
|
||||
/* quirk table based on DMI matching */
|
||||
static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
{
|
||||
@@ -87,6 +98,14 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
},
|
||||
.driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
+ },
|
||||
+ .driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -103,6 +122,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||
dev_info(&pdev->dev, "no quirks enabled\n");
|
||||
if (card->quirks & QUIRK_FW_RST_D3COLD)
|
||||
dev_info(&pdev->dev, "quirk reset_d3cold enabled\n");
|
||||
+ if (card->quirks & QUIRK_FW_RST_WSID_S3)
|
||||
+ dev_info(&pdev->dev,
|
||||
+ "quirk reset_wsid for Surface 3 enabled\n");
|
||||
}
|
||||
|
||||
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||
@@ -159,3 +181,64 @@ int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev)
|
||||
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
+int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev)
|
||||
+{
|
||||
+ acpi_handle handle;
|
||||
+ union acpi_object *obj;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ dev_info(&pdev->dev, "Using reset_wsid quirk to perform FW reset\n");
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, ACPI_WSID_PATH, &handle);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(&pdev->dev, "No ACPI handle for path %s\n",
|
||||
+ ACPI_WSID_PATH);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ if (!acpi_has_method(handle, "_DSM")) {
|
||||
+ dev_err(&pdev->dev, "_DSM method not found\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ if (!acpi_check_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_OFF)) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "_DSM method doesn't support wifi power off func\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ if (!acpi_check_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_ON)) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "_DSM method doesn't support wifi power on func\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ /* card will be removed immediately after this call on Surface 3 */
|
||||
+ dev_info(&pdev->dev, "turning wifi off...\n");
|
||||
+ obj = acpi_evaluate_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_OFF,
|
||||
+ NULL);
|
||||
+ if (!obj) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "device _DSM execution failed for turning wifi off\n");
|
||||
+ return -EIO;
|
||||
+ }
|
||||
+ ACPI_FREE(obj);
|
||||
+
|
||||
+ /* card will be re-probed immediately after this call on Surface 3 */
|
||||
+ dev_info(&pdev->dev, "turning wifi on...\n");
|
||||
+ obj = acpi_evaluate_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_ON,
|
||||
+ NULL);
|
||||
+ if (!obj) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "device _DSM execution failed for turning wifi on\n");
|
||||
+ return -EIO;
|
||||
+ }
|
||||
+ ACPI_FREE(obj);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
index 8ec4176d698f..25370c5a4f59 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -19,5 +19,11 @@
|
||||
|
||||
#define QUIRK_FW_RST_D3COLD BIT(0)
|
||||
|
||||
+/* Surface 3 and Surface Pro 3 have the same _DSM method but need to
|
||||
+ * be handled differently. Currently, only S3 is supported.
|
||||
+ */
|
||||
+#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||
+
|
||||
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||
+int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From 8f7a59af7ea9a70bc220b4456dad4697db24a8a4 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Wed, 30 Sep 2020 18:08:24 +0900
|
||||
Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
(made referring to http://git.osdn.net/view?p=android-x86/kernel.git;a=commitdiff;h=18e2e857c57633b25b3b4120f212224a108cd883)
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI info for the affected Surface 3.
|
||||
|
||||
On affected systems, DMI info will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie_quirks.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 563dd0d5ac79..32e2f000e57b 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -106,6 +106,15 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
},
|
||||
.driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From 9d264868c3bf477498608c96af9d37b03d361e92 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 3f5138008594..372dde99725c 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -380,6 +380,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct pcie_service_card *card;
|
||||
+ struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
|
||||
int ret;
|
||||
|
||||
pr_debug("info: vendor=0x%4.04X device=0x%4.04X rev=%d\n",
|
||||
@@ -421,6 +422,12 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
||||
return -1;
|
||||
}
|
||||
|
||||
+ /* disable bridge_d3 for Surface gen4+ devices to fix fw crashing
|
||||
+ * after suspend
|
||||
+ */
|
||||
+ if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||
+ parent_pdev->bridge_d3 = false;
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 32e2f000e57b..356401bab59c 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -38,7 +38,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5",
|
||||
@@ -47,7 +48,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5 (LTE)",
|
||||
@@ -56,7 +58,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 6",
|
||||
@@ -64,7 +67,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
@@ -72,7 +76,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 2",
|
||||
@@ -80,7 +85,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 1",
|
||||
@@ -88,7 +94,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 2",
|
||||
@@ -96,7 +103,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface 3",
|
||||
@@ -134,6 +142,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||
if (card->quirks & QUIRK_FW_RST_WSID_S3)
|
||||
dev_info(&pdev->dev,
|
||||
"quirk reset_wsid for Surface 3 enabled\n");
|
||||
+ if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||
+ dev_info(&pdev->dev,
|
||||
+ "quirk no_brigde_d3 enabled\n");
|
||||
}
|
||||
|
||||
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
index 25370c5a4f59..a1de111ad1db 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -23,6 +23,7 @@
|
||||
* be handled differently. Currently, only S3 is supported.
|
||||
*/
|
||||
#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||
+#define QUIRK_NO_BRIDGE_D3 BIT(2)
|
||||
|
||||
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From c6c76184cea6e3dfd665006a46f6ebca65f094a5 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 372dde99725c..586c79dc0a98 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -1781,9 +1781,21 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
|
||||
static int mwifiex_pcie_init_fw_port(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
struct pcie_service_card *card = adapter->card;
|
||||
+ struct pci_dev *pdev = card->dev;
|
||||
+ struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
|
||||
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
|
||||
int tx_wrap = card->txbd_wrptr & reg->tx_wrap_mask;
|
||||
|
||||
+ /* Trigger a function level reset of the PCI bridge device, this makes
|
||||
+ * the firmware of PCIe 88W8897 cards stop reporting a fixed LTR value
|
||||
+ * that prevents the system from entering package C10 and S0ix powersaving
|
||||
+ * states.
|
||||
+ * We need to do it here because it must happen after firmware
|
||||
+ * initialization and this function is called after that is done.
|
||||
+ */
|
||||
+ if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
|
||||
+ pci_reset_function(parent_pdev);
|
||||
+
|
||||
/* Write the RX ring read pointer in to reg->rx_rdptr */
|
||||
if (mwifiex_write_reg(adapter, reg->rx_rdptr, card->rxbd_rdptr |
|
||||
tx_wrap)) {
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 356401bab59c..6437f067d07a 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -39,7 +39,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5",
|
||||
@@ -49,7 +50,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5 (LTE)",
|
||||
@@ -59,7 +61,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 6",
|
||||
@@ -68,7 +71,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
@@ -77,7 +81,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 2",
|
||||
@@ -86,7 +91,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 1",
|
||||
@@ -95,7 +101,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 2",
|
||||
@@ -104,7 +111,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface 3",
|
||||
@@ -145,6 +153,8 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||
if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||
dev_info(&pdev->dev,
|
||||
"quirk no_brigde_d3 enabled\n");
|
||||
+ if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
|
||||
+ dev_info(&pdev->dev, "quirk do_flr_on_bridge enabled\n");
|
||||
}
|
||||
|
||||
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
index a1de111ad1db..0e429779bb04 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -24,6 +24,7 @@
|
||||
*/
|
||||
#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||
#define QUIRK_NO_BRIDGE_D3 BIT(2)
|
||||
+#define QUIRK_DO_FLR_ON_BRIDGE BIT(3)
|
||||
|
||||
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From 187231fc2e26b2321f904dd43f83fff761b37356 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 ea72afb7abea..dc0d1d8e0daa 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -61,6 +61,7 @@ static struct usb_driver btusb_driver;
|
||||
#define BTUSB_QCA_WCN6855 0x1000000
|
||||
#define BTUSB_INTEL_BROKEN_SHUTDOWN_LED 0x2000000
|
||||
#define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000
|
||||
+#define BTUSB_LOWER_LESCAN_INTERVAL 0x8000000
|
||||
|
||||
static const struct usb_device_id btusb_table[] = {
|
||||
/* Generic Bluetooth USB device */
|
||||
@@ -375,6 +376,7 @@ static const struct usb_device_id blacklist_table[] = {
|
||||
{ USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },
|
||||
{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
|
||||
{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
|
||||
+ { USB_DEVICE(0x1286, 0x204c), .driver_info = BTUSB_LOWER_LESCAN_INTERVAL },
|
||||
|
||||
/* Intel Bluetooth devices */
|
||||
{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
|
||||
@@ -3908,6 +3910,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.35.1
|
||||
|
||||
From 65e0f3a3dfa02dffa631e5bdeed93e993aa6130b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Tue, 10 Nov 2020 12:49:56 +0100
|
||||
Subject: [PATCH] mwifiex: Use non-posted PCI register writes
|
||||
|
||||
On the 88W8897 card it's very important the TX ring write pointer is
|
||||
updated correctly to its new value before setting the TX ready
|
||||
interrupt, otherwise the firmware appears to crash (probably because
|
||||
it's trying to DMA-read from the wrong place).
|
||||
|
||||
Since PCI uses "posted writes" when writing to a register, it's not
|
||||
guaranteed that a write will happen immediately. That means the pointer
|
||||
might be outdated when setting the TX ready interrupt, leading to
|
||||
firmware crashes especially when ASPM L1 and L1 substates are enabled
|
||||
(because of the higher link latency, the write will probably take
|
||||
longer).
|
||||
|
||||
So fix those firmware crashes by always forcing non-posted writes. We do
|
||||
that by simply reading back the register after writing it, just as a lot
|
||||
of other drivers do.
|
||||
|
||||
There are two reproducers that are fixed with this patch:
|
||||
|
||||
1) During rx/tx traffic and with ASPM L1 substates enabled (the enabled
|
||||
substates are platform dependent), the firmware crashes and eventually a
|
||||
command timeout appears in the logs. That crash is fixed by using a
|
||||
non-posted write in mwifiex_pcie_send_data().
|
||||
|
||||
2) When sending lots of commands to the card, waking it up from sleep in
|
||||
very quick intervals, the firmware eventually crashes. That crash
|
||||
appears to be fixed by some other non-posted write included here.
|
||||
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index 586c79dc0a98..f87bc9bdfba7 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -238,6 +238,12 @@ static int mwifiex_write_reg(struct mwifiex_adapter *adapter, int reg, u32 data)
|
||||
|
||||
iowrite32(data, card->pci_mmap1 + reg);
|
||||
|
||||
+ /* Do a read-back, which makes the write non-posted, ensuring the
|
||||
+ * completion before returning.
|
||||
+ * The firmware of the 88W8897 card is buggy and this avoids crashes.
|
||||
+ */
|
||||
+ ioread32(card->pci_mmap1 + reg);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From 64651de263b769378a255cdab1e18468c0b03ad0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Tue, 13 Apr 2021 14:23:05 +0200
|
||||
Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain
|
||||
hardware revision
|
||||
|
||||
The 88W8897 pcie card with the hardware revision 20 apparently has a
|
||||
hardware issue where the card wakes up from deep sleep randomly and very
|
||||
often, somewhat depending on the card activity, maybe the hardware has a
|
||||
floating wakeup pin or something.
|
||||
|
||||
Those continuous wakeups prevent the card from entering host sleep when
|
||||
the computer suspends. And because the host won't answer to events from
|
||||
the card anymore while it's suspended, the firmwares internal
|
||||
powersaving state machine seems to get confused and the card can't sleep
|
||||
anymore at all after that.
|
||||
|
||||
Since we can't work around that hardware bug in the firmware, let's
|
||||
get the hardware revision string from the firmware and match it with
|
||||
known bad revisions. Then disable auto deep sleep for those revisions,
|
||||
which makes sure we no longer get those spurious wakeups.
|
||||
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/main.c | 14 ++++++++++++++
|
||||
drivers/net/wireless/marvell/mwifiex/main.h | 1 +
|
||||
.../net/wireless/marvell/mwifiex/sta_cmdresp.c | 16 ++++++++++++++++
|
||||
3 files changed, 31 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
index 19b996c6a260..5ab2ad4c7006 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
@@ -226,6 +226,19 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static void maybe_quirk_fw_disable_ds(struct mwifiex_adapter *adapter)
|
||||
+{
|
||||
+ struct mwifiex_private *priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
|
||||
+ struct mwifiex_ver_ext ver_ext;
|
||||
+
|
||||
+ set_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &adapter->work_flags);
|
||||
+
|
||||
+ memset(&ver_ext, 0, sizeof(ver_ext));
|
||||
+ ver_ext.version_str_sel = 1;
|
||||
+ mwifiex_send_cmd(priv, HostCmd_CMD_VERSION_EXT,
|
||||
+ HostCmd_ACT_GEN_GET, 0, &ver_ext, false);
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* The main process.
|
||||
*
|
||||
@@ -356,6 +369,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
|
||||
if (adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE) {
|
||||
adapter->hw_status = MWIFIEX_HW_STATUS_READY;
|
||||
mwifiex_init_fw_complete(adapter);
|
||||
+ maybe_quirk_fw_disable_ds(adapter);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
|
||||
index 90012cbcfd15..1e829d84b1f6 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/main.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
|
||||
@@ -524,6 +524,7 @@ enum mwifiex_adapter_work_flags {
|
||||
MWIFIEX_IS_SUSPENDED,
|
||||
MWIFIEX_IS_HS_CONFIGURED,
|
||||
MWIFIEX_IS_HS_ENABLING,
|
||||
+ MWIFIEX_IS_REQUESTING_FW_VEREXT,
|
||||
};
|
||||
|
||||
struct mwifiex_band_config {
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
||||
index 6b5d35d9e69f..8e49ebca1847 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
||||
@@ -708,6 +708,22 @@ static int mwifiex_ret_ver_ext(struct mwifiex_private *priv,
|
||||
{
|
||||
struct host_cmd_ds_version_ext *ver_ext = &resp->params.verext;
|
||||
|
||||
+ if (test_and_clear_bit(MWIFIEX_IS_REQUESTING_FW_VEREXT, &priv->adapter->work_flags)) {
|
||||
+ if (strncmp(ver_ext->version_str, "ChipRev:20, BB:9b(10.00), RF:40(21)", 128) == 0) {
|
||||
+ struct mwifiex_ds_auto_ds auto_ds = {
|
||||
+ .auto_ds = DEEP_SLEEP_OFF,
|
||||
+ };
|
||||
+
|
||||
+ mwifiex_dbg(priv->adapter, MSG,
|
||||
+ "Bad HW revision detected, disabling deep sleep\n");
|
||||
+
|
||||
+ mwifiex_send_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH,
|
||||
+ DIS_AUTO_PS, BITMAP_AUTO_DS, &auto_ds, false);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
if (version_ext) {
|
||||
version_ext->version_str_sel = ver_ext->version_str_sel;
|
||||
memcpy(version_ext->version_str, ver_ext->version_str,
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From bea9eeec098b4cd62d2fc9ab6612d97fce3ace56 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Tue, 13 Apr 2021 12:57:41 +0200
|
||||
Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware
|
||||
|
||||
The firmware of the pcie 88W8897 chip sends those events very
|
||||
unreliably, which means we sometimes end up actually capping the window
|
||||
size while bluetooth is disabled, artifically limiting wifi speeds even
|
||||
though it's not needed.
|
||||
|
||||
Since we can't fix the firmware, let's just ignore those events, it
|
||||
seems that the Windows driver also doesn't change the rx/tx block ack
|
||||
buffer sizes when bluetooth gets enabled or disabled, so this is
|
||||
consistent with the Windows driver.
|
||||
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/sta_event.c | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
|
||||
index 2b2e6e0166e1..e9e2d4b86acb 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
|
||||
@@ -1061,9 +1061,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
|
||||
adapter->event_skb);
|
||||
break;
|
||||
case EVENT_BT_COEX_WLAN_PARA_CHANGE:
|
||||
- dev_dbg(adapter->dev, "EVENT: BT coex wlan param update\n");
|
||||
- mwifiex_bt_coex_wlan_param_update_event(priv,
|
||||
- adapter->event_skb);
|
||||
+ dev_dbg(adapter->dev, "EVENT: ignoring BT coex wlan param update\n");
|
||||
break;
|
||||
case EVENT_RXBA_SYNC:
|
||||
dev_dbg(adapter->dev, "EVENT: RXBA_SYNC\n");
|
||||
--
|
||||
2.35.1
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
From ddd1f30f0a41ae8229d875d6f3d1ef8fb8eb59f2 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 5e3b4d10c1a9..2475eeab9c98 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -35,6 +35,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -47,6 +50,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -55,6 +61,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -843,6 +852,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)
|
||||
@@ -857,6 +902,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.35.1
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,335 +0,0 @@
|
|||
From a586f227220ffc968942b304242ffb85a4ad738a 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 92c1cc07ed46..3b688cea8e00 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -609,6 +609,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,
|
||||
@@ -710,6 +732,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.35.1
|
||||
|
||||
From 21496a214799137c6188bf65c90869af0d90ca21 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 3c0ee0cdaef5..e5eedb85d471 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -104,6 +104,13 @@ config SURFACE_AGGREGATOR_REGISTRY
|
||||
the respective client devices. Drivers for these devices still need to
|
||||
be selected via the other options.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on SYSFS
|
||||
+ help
|
||||
+ This driver provides a sysfs switch to set the power-state of the
|
||||
+ discrete GPU found on the Microsoft Surface Book 1.
|
||||
+
|
||||
config SURFACE_DTX
|
||||
tristate "Surface DTX (Detachment System) Driver"
|
||||
depends on SURFACE_AGGREGATOR
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index 6d9291c993c4..9eb3a7e6382c 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -11,6 +11,7 @@ obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR_REGISTRY) += surface_aggregator_registry.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_DTX) += surface_dtx.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
new file mode 100644
|
||||
index 000000000000..8b816ed8f35c
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
@@ -0,0 +1,162 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+
|
||||
+#ifdef pr_fmt
|
||||
+#undef pr_fmt
|
||||
+#endif
|
||||
+#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
|
||||
+
|
||||
+
|
||||
+static const guid_t dgpu_sw_guid = GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4,
|
||||
+ 0x95, 0xed, 0xab, 0x16, 0x65, 0x49, 0x80, 0x35);
|
||||
+
|
||||
+#define DGPUSW_ACPI_PATH_DSM "\\_SB_.PCI0.LPCB.EC0_.VGBI"
|
||||
+#define DGPUSW_ACPI_PATH_HGON "\\_SB_.PCI0.RP05.HGON"
|
||||
+#define DGPUSW_ACPI_PATH_HGOF "\\_SB_.PCI0.RP05.HGOF"
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_dsmcall(void)
|
||||
+{
|
||||
+ union acpi_object *ret;
|
||||
+ acpi_handle handle;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, DGPUSW_ACPI_PATH_DSM, &handle);
|
||||
+ if (status)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ret = acpi_evaluate_dsm_typed(handle, &dgpu_sw_guid, 1, 1, NULL, ACPI_TYPE_BUFFER);
|
||||
+ if (!ret)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ACPI_FREE(ret);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgon(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGON, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGON: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-on dGPU via HGON\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgof(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGOF, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGOF: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-off dGPU via HGOF\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static ssize_t dgpu_dsmcall_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ int status, value;
|
||||
+
|
||||
+ status = kstrtoint(buf, 0, &value);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (value != 1)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ status = sb1_dgpu_sw_dsmcall();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ bool power;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtobool(buf, &power);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (power)
|
||||
+ status = sb1_dgpu_sw_hgon();
|
||||
+ else
|
||||
+ status = sb1_dgpu_sw_hgof();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR_WO(dgpu_dsmcall);
|
||||
+static DEVICE_ATTR_WO(dgpu_power);
|
||||
+
|
||||
+static struct attribute *sb1_dgpu_sw_attrs[] = {
|
||||
+ &dev_attr_dgpu_dsmcall.attr,
|
||||
+ &dev_attr_dgpu_power.attr,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+static const struct attribute_group sb1_dgpu_sw_attr_group = {
|
||||
+ .attrs = sb1_dgpu_sw_attrs,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ return sysfs_create_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ sysfs_remove_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * The dGPU power seems to be actually handled by MSHW0040. However, that is
|
||||
+ * also the power-/volume-button device with a mainline driver. So let's use
|
||||
+ * MSHW0041 instead for now, which seems to be the LTCH (latch/DTX) device.
|
||||
+ */
|
||||
+static const struct acpi_device_id sb1_dgpu_sw_match[] = {
|
||||
+ { "MSHW0041", },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sb1_dgpu_sw_match);
|
||||
+
|
||||
+static struct platform_driver sb1_dgpu_sw = {
|
||||
+ .probe = sb1_dgpu_sw_probe,
|
||||
+ .remove = sb1_dgpu_sw_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surfacebook1_dgpu_switch",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.35.1
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From e7a76b51f9f78f4887e07ba09c949e50db7afdb6 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Wed, 27 Oct 2021 00:56:11 +0200
|
||||
Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 8
|
||||
|
||||
The new Surface Pro 8 uses GPEs for lid events as well. Add an entry for
|
||||
that so that the lid can be used to wake the device. Note that this is a
|
||||
device with a keyboard type cover, where this acts as the "lid".
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-gpe
|
||||
---
|
||||
drivers/platform/surface/surface_gpe.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
|
||||
index c1775db29efb..ec66fde28e75 100644
|
||||
--- a/drivers/platform/surface/surface_gpe.c
|
||||
+++ b/drivers/platform/surface/surface_gpe.c
|
||||
@@ -99,6 +99,14 @@ static const struct dmi_system_id dmi_lid_device_table[] = {
|
||||
},
|
||||
.driver_data = (void *)lid_device_props_l4D,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface Pro 8",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 8"),
|
||||
+ },
|
||||
+ .driver_data = (void *)lid_device_props_l4B,
|
||||
+ },
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
.matches = {
|
||||
--
|
||||
2.35.1
|
||||
|
|
@ -1,557 +0,0 @@
|
|||
From b66d19a4dcc7a4173c82640c9a1be2532c819ea0 Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Tue, 5 Oct 2021 00:05:09 +1100
|
||||
Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
|
||||
|
||||
The power button on the AMD variant of the Surface Laptop uses the
|
||||
same MSHW0040 device ID as the 5th and later generation of Surface
|
||||
devices, however they report 0 for their OEM platform revision. As the
|
||||
_DSM does not exist on the devices requiring special casing, check for
|
||||
the existance of the _DSM to determine if soc_button_array should be
|
||||
loaded.
|
||||
|
||||
Fixes: c394159310d0 ("Input: soc_button_array - add support for newer surface devices")
|
||||
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
|
||||
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/input/misc/soc_button_array.c | 33 +++++++--------------------
|
||||
1 file changed, 8 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||
index cb6ec59a045d..4e8944f59def 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -474,8 +474,8 @@ static const struct soc_device_data soc_device_INT33D3 = {
|
||||
* Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
|
||||
* devices use MSHW0040 for power and volume buttons, however the way they
|
||||
* have to be addressed differs. Make sure that we only load this drivers
|
||||
- * for the correct devices by checking the OEM Platform Revision provided by
|
||||
- * the _DSM method.
|
||||
+ * for the correct devices by checking if the OEM Platform Revision DSM call
|
||||
+ * exists.
|
||||
*/
|
||||
#define MSHW0040_DSM_REVISION 0x01
|
||||
#define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision
|
||||
@@ -486,31 +486,14 @@ static const guid_t MSHW0040_DSM_UUID =
|
||||
static int soc_device_check_MSHW0040(struct device *dev)
|
||||
{
|
||||
acpi_handle handle = ACPI_HANDLE(dev);
|
||||
- union acpi_object *result;
|
||||
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||
-
|
||||
- // get OEM platform revision
|
||||
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||
- MSHW0040_DSM_REVISION,
|
||||
- MSHW0040_DSM_GET_OMPR, NULL,
|
||||
- ACPI_TYPE_INTEGER);
|
||||
-
|
||||
- if (result) {
|
||||
- oem_platform_rev = result->integer.value;
|
||||
- ACPI_FREE(result);
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * If the revision is zero here, the _DSM evaluation has failed. This
|
||||
- * indicates that we have a Pro 4 or Book 1 and this driver should not
|
||||
- * be used.
|
||||
- */
|
||||
- if (oem_platform_rev == 0)
|
||||
- return -ENODEV;
|
||||
+ bool exists;
|
||||
|
||||
- dev_dbg(dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||
+ // check if OEM platform revision DSM call exists
|
||||
+ exists = acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||
+ MSHW0040_DSM_REVISION,
|
||||
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||
|
||||
- return 0;
|
||||
+ return exists ? 0 : -ENODEV;
|
||||
}
|
||||
|
||||
/*
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From bc80832636dd4fb85653d81cc51bb836aacfabc4 Mon Sep 17 00:00:00 2001
|
||||
From: Sachi King <nakato@nakato.io>
|
||||
Date: Tue, 5 Oct 2021 00:22:57 +1100
|
||||
Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
|
||||
variant
|
||||
|
||||
The AMD variant of the Surface Laptop report 0 for their OEM platform
|
||||
revision. The Surface devices that require the surfacepro3_button
|
||||
driver do not have the _DSM that gets the OEM platform revision. If the
|
||||
method does not exist, load surfacepro3_button.
|
||||
|
||||
Fixes: 64dd243d7356 ("platform/x86: surfacepro3_button: Fix device check")
|
||||
Co-developed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
|
||||
Signed-off-by: Sachi King <nakato@nakato.io>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/platform/surface/surfacepro3_button.c | 30 ++++---------------
|
||||
1 file changed, 6 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
|
||||
index 242fb690dcaf..30eea54dbb47 100644
|
||||
--- a/drivers/platform/surface/surfacepro3_button.c
|
||||
+++ b/drivers/platform/surface/surfacepro3_button.c
|
||||
@@ -149,7 +149,8 @@ static int surface_button_resume(struct device *dev)
|
||||
/*
|
||||
* Surface Pro 4 and Surface Book 2 / Surface Pro 2017 use the same device
|
||||
* ID (MSHW0040) for the power/volume buttons. Make sure this is the right
|
||||
- * device by checking for the _DSM method and OEM Platform Revision.
|
||||
+ * device by checking for the _DSM method and OEM Platform Revision DSM
|
||||
+ * function.
|
||||
*
|
||||
* Returns true if the driver should bind to this device, i.e. the device is
|
||||
* either MSWH0028 (Pro 3) or MSHW0040 on a Pro 4 or Book 1.
|
||||
@@ -157,30 +158,11 @@ static int surface_button_resume(struct device *dev)
|
||||
static bool surface_button_check_MSHW0040(struct acpi_device *dev)
|
||||
{
|
||||
acpi_handle handle = dev->handle;
|
||||
- union acpi_object *result;
|
||||
- u64 oem_platform_rev = 0; // valid revisions are nonzero
|
||||
-
|
||||
- // get OEM platform revision
|
||||
- result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID,
|
||||
- MSHW0040_DSM_REVISION,
|
||||
- MSHW0040_DSM_GET_OMPR,
|
||||
- NULL, ACPI_TYPE_INTEGER);
|
||||
-
|
||||
- /*
|
||||
- * If evaluating the _DSM fails, the method is not present. This means
|
||||
- * that we have either MSHW0028 or MSHW0040 on Pro 4 or Book 1, so we
|
||||
- * should use this driver. We use revision 0 indicating it is
|
||||
- * unavailable.
|
||||
- */
|
||||
-
|
||||
- if (result) {
|
||||
- oem_platform_rev = result->integer.value;
|
||||
- ACPI_FREE(result);
|
||||
- }
|
||||
-
|
||||
- dev_dbg(&dev->dev, "OEM Platform Revision %llu\n", oem_platform_rev);
|
||||
|
||||
- return oem_platform_rev == 0;
|
||||
+ // make sure that OEM platform revision DSM call does not exist
|
||||
+ return !acpi_check_dsm(handle, &MSHW0040_DSM_UUID,
|
||||
+ MSHW0040_DSM_REVISION,
|
||||
+ BIT(MSHW0040_DSM_GET_OMPR));
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From 19e6f67c7b640286a1a8d451c9234b41bc7d118c Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Thu, 24 Feb 2022 12:02:40 +0100
|
||||
Subject: [PATCH] Input: soc_button_array - add support for Microsoft Surface 3
|
||||
(MSHW0028) buttons
|
||||
|
||||
The drivers/platform/surface/surface3_button.c code is alsmost a 1:1 copy
|
||||
of the soc_button_array code.
|
||||
|
||||
The only big difference is that it binds to an i2c_client rather then to
|
||||
a platform_device. The cause of this is the ACPI resources for the MSHW0028
|
||||
device containing a bogus I2cSerialBusV2 resource which causes the kernel
|
||||
to instantiate an i2c_client for it instead of a platform_device.
|
||||
|
||||
Add "MSHW0028" to the ignore_serial_bus_ids[] list in drivers/apci/scan.c,
|
||||
so that a platform_device will be instantiated and add support for
|
||||
the MSHW0028 HID to soc_button_array.
|
||||
|
||||
This fully replaces surface3_button, which will be removed in a separate
|
||||
commit (since it binds to the now no longer created i2c_client it no
|
||||
longer does anyyhing after this commit).
|
||||
|
||||
Note the MSHW0028 id is used by Microsoft to describe the tablet buttons on
|
||||
both the Surface 3 and the Surface 3 Pro and the actual API/implementation
|
||||
for the Surface 3 Pro is quite different. The changes in this commit should
|
||||
not impact the separate surfacepro3_button driver:
|
||||
|
||||
1. Because of the bogus I2cSerialBusV2 resource problem that driver binds
|
||||
to the acpi_device itself, so instantiating a platform_device instead of
|
||||
an i2c_client does not matter.
|
||||
|
||||
2. The soc_button_array driver will not bind to the MSHW0028 device on
|
||||
the Surface 3 Pro, because it has no GPIO resources.
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/acpi/scan.c | 5 +++++
|
||||
drivers/input/misc/soc_button_array.c | 24 +++++++++++++++++++++++-
|
||||
2 files changed, 28 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
||||
index 25d9f04f1995..608e83f07b48 100644
|
||||
--- a/drivers/acpi/scan.c
|
||||
+++ b/drivers/acpi/scan.c
|
||||
@@ -1708,6 +1708,11 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
|
||||
{"BSG2150", },
|
||||
{"INT33FE", },
|
||||
{"INT3515", },
|
||||
+ /*
|
||||
+ * Some ACPI devs contain SerialBus resources even though they are not
|
||||
+ * attached to a serial bus at all.
|
||||
+ */
|
||||
+ {"MSHW0028", },
|
||||
/*
|
||||
* HIDs of device with an UartSerialBusV2 resource for which userspace
|
||||
* expects a regular tty cdev to be created (instead of the in kernel
|
||||
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
||||
index 4e8944f59def..f044c731c6a9 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -469,6 +469,27 @@ static const struct soc_device_data soc_device_INT33D3 = {
|
||||
.button_info = soc_button_INT33D3,
|
||||
};
|
||||
|
||||
+/*
|
||||
+ * Button info for Microsoft Surface 3 (non pro), this is indentical to
|
||||
+ * the PNP0C40 info except that the home button is active-high.
|
||||
+ *
|
||||
+ * The Surface 3 Pro also has a MSHW0028 ACPI device, but that uses a custom
|
||||
+ * version of the drivers/platform/x86/intel/hid.c 5 button array ACPI API
|
||||
+ * instead. A check() callback is not necessary though as the Surface 3 Pro
|
||||
+ * MSHW0028 ACPI device's resource table does not contain any GPIOs.
|
||||
+ */
|
||||
+static const struct soc_button_info soc_button_MSHW0028[] = {
|
||||
+ { "power", 0, EV_KEY, KEY_POWER, false, true, true },
|
||||
+ { "home", 1, EV_KEY, KEY_LEFTMETA, false, true, false },
|
||||
+ { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false, true },
|
||||
+ { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false, true },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static const struct soc_device_data soc_device_MSHW0028 = {
|
||||
+ .button_info = soc_button_MSHW0028,
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Special device check for Surface Book 2 and Surface Pro (2017).
|
||||
* Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned
|
||||
@@ -518,7 +539,8 @@ static const struct acpi_device_id soc_button_acpi_match[] = {
|
||||
{ "ID9001", (unsigned long)&soc_device_INT33D3 },
|
||||
{ "ACPI0011", 0 },
|
||||
|
||||
- /* Microsoft Surface Devices (5th and 6th generation) */
|
||||
+ /* Microsoft Surface Devices (3th, 5th and 6th generation) */
|
||||
+ { "MSHW0028", (unsigned long)&soc_device_MSHW0028 },
|
||||
{ "MSHW0040", (unsigned long)&soc_device_MSHW0040 },
|
||||
|
||||
{ }
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From 0e894d02855d203d67b600a1c23eceee939f43f7 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Thu, 24 Feb 2022 12:02:41 +0100
|
||||
Subject: [PATCH] platform/surface: Remove Surface 3 Button driver
|
||||
|
||||
The Surface 3 buttons are now handled by the generic soc_button_array
|
||||
driver. As part of adding support to soc_button_array the ACPI code
|
||||
now instantiates a platform_device rather then an i2c_client so there
|
||||
no longer is an i2c_client for this driver to bind to.
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-button
|
||||
---
|
||||
drivers/platform/surface/Kconfig | 6 -
|
||||
drivers/platform/surface/Makefile | 1 -
|
||||
drivers/platform/surface/surface3_button.c | 247 ---------------------
|
||||
3 files changed, 254 deletions(-)
|
||||
delete mode 100644 drivers/platform/surface/surface3_button.c
|
||||
|
||||
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
|
||||
index e5eedb85d471..d13cf8d63cc3 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -28,12 +28,6 @@ config SURFACE3_WMI
|
||||
To compile this driver as a module, choose M here: the module will
|
||||
be called surface3-wmi.
|
||||
|
||||
-config SURFACE_3_BUTTON
|
||||
- tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"
|
||||
- depends on KEYBOARD_GPIO && I2C
|
||||
- help
|
||||
- This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.
|
||||
-
|
||||
config SURFACE_3_POWER_OPREGION
|
||||
tristate "Surface 3 battery platform operation region support"
|
||||
depends on I2C
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index 9eb3a7e6382c..e4791b47f561 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -5,7 +5,6 @@
|
||||
#
|
||||
|
||||
obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
|
||||
-obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_ACPI_NOTIFY) += surface_acpi_notify.o
|
||||
obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||
diff --git a/drivers/platform/surface/surface3_button.c b/drivers/platform/surface/surface3_button.c
|
||||
deleted file mode 100644
|
||||
index 48d77e7aae76..000000000000
|
||||
--- a/drivers/platform/surface/surface3_button.c
|
||||
+++ /dev/null
|
||||
@@ -1,247 +0,0 @@
|
||||
-// SPDX-License-Identifier: GPL-2.0-only
|
||||
-/*
|
||||
- * Supports for the button array on the Surface tablets.
|
||||
- *
|
||||
- * (C) Copyright 2016 Red Hat, Inc
|
||||
- *
|
||||
- * Based on soc_button_array.c:
|
||||
- *
|
||||
- * {C} Copyright 2014 Intel Corporation
|
||||
- */
|
||||
-
|
||||
-#include <linux/module.h>
|
||||
-#include <linux/input.h>
|
||||
-#include <linux/init.h>
|
||||
-#include <linux/kernel.h>
|
||||
-#include <linux/i2c.h>
|
||||
-#include <linux/slab.h>
|
||||
-#include <linux/acpi.h>
|
||||
-#include <linux/gpio/consumer.h>
|
||||
-#include <linux/gpio_keys.h>
|
||||
-#include <linux/gpio.h>
|
||||
-#include <linux/platform_device.h>
|
||||
-
|
||||
-
|
||||
-#define SURFACE_BUTTON_OBJ_NAME "TEV2"
|
||||
-#define MAX_NBUTTONS 4
|
||||
-
|
||||
-/*
|
||||
- * Some of the buttons like volume up/down are auto repeat, while others
|
||||
- * are not. To support both, we register two platform devices, and put
|
||||
- * buttons into them based on whether the key should be auto repeat.
|
||||
- */
|
||||
-#define BUTTON_TYPES 2
|
||||
-
|
||||
-/*
|
||||
- * Power button, Home button, Volume buttons support is supposed to
|
||||
- * be covered by drivers/input/misc/soc_button_array.c, which is implemented
|
||||
- * according to "Windows ACPI Design Guide for SoC Platforms".
|
||||
- * However surface 3 seems not to obey the specs, instead it uses
|
||||
- * device TEV2(MSHW0028) for declaring the GPIOs. The gpios are also slightly
|
||||
- * different in which the Home button is active high.
|
||||
- * Compared to surfacepro3_button.c which also handles MSHW0028, the Surface 3
|
||||
- * is a reduce platform and thus uses GPIOs, not ACPI events.
|
||||
- * We choose an I2C driver here because we need to access the resources
|
||||
- * declared under the device node, while surfacepro3_button.c only needs
|
||||
- * the ACPI companion node.
|
||||
- */
|
||||
-static const struct acpi_device_id surface3_acpi_match[] = {
|
||||
- { "MSHW0028", 0 },
|
||||
- { }
|
||||
-};
|
||||
-MODULE_DEVICE_TABLE(acpi, surface3_acpi_match);
|
||||
-
|
||||
-struct surface3_button_info {
|
||||
- const char *name;
|
||||
- int acpi_index;
|
||||
- unsigned int event_type;
|
||||
- unsigned int event_code;
|
||||
- bool autorepeat;
|
||||
- bool wakeup;
|
||||
- bool active_low;
|
||||
-};
|
||||
-
|
||||
-struct surface3_button_data {
|
||||
- struct platform_device *children[BUTTON_TYPES];
|
||||
-};
|
||||
-
|
||||
-/*
|
||||
- * Get the Nth GPIO number from the ACPI object.
|
||||
- */
|
||||
-static int surface3_button_lookup_gpio(struct device *dev, int acpi_index)
|
||||
-{
|
||||
- struct gpio_desc *desc;
|
||||
- int gpio;
|
||||
-
|
||||
- desc = gpiod_get_index(dev, NULL, acpi_index, GPIOD_ASIS);
|
||||
- if (IS_ERR(desc))
|
||||
- return PTR_ERR(desc);
|
||||
-
|
||||
- gpio = desc_to_gpio(desc);
|
||||
-
|
||||
- gpiod_put(desc);
|
||||
-
|
||||
- return gpio;
|
||||
-}
|
||||
-
|
||||
-static struct platform_device *
|
||||
-surface3_button_device_create(struct i2c_client *client,
|
||||
- const struct surface3_button_info *button_info,
|
||||
- bool autorepeat)
|
||||
-{
|
||||
- const struct surface3_button_info *info;
|
||||
- struct platform_device *pd;
|
||||
- struct gpio_keys_button *gpio_keys;
|
||||
- struct gpio_keys_platform_data *gpio_keys_pdata;
|
||||
- int n_buttons = 0;
|
||||
- int gpio;
|
||||
- int error;
|
||||
-
|
||||
- gpio_keys_pdata = devm_kzalloc(&client->dev,
|
||||
- sizeof(*gpio_keys_pdata) +
|
||||
- sizeof(*gpio_keys) * MAX_NBUTTONS,
|
||||
- GFP_KERNEL);
|
||||
- if (!gpio_keys_pdata)
|
||||
- return ERR_PTR(-ENOMEM);
|
||||
-
|
||||
- gpio_keys = (void *)(gpio_keys_pdata + 1);
|
||||
-
|
||||
- for (info = button_info; info->name; info++) {
|
||||
- if (info->autorepeat != autorepeat)
|
||||
- continue;
|
||||
-
|
||||
- gpio = surface3_button_lookup_gpio(&client->dev,
|
||||
- info->acpi_index);
|
||||
- if (!gpio_is_valid(gpio))
|
||||
- continue;
|
||||
-
|
||||
- gpio_keys[n_buttons].type = info->event_type;
|
||||
- gpio_keys[n_buttons].code = info->event_code;
|
||||
- gpio_keys[n_buttons].gpio = gpio;
|
||||
- gpio_keys[n_buttons].active_low = info->active_low;
|
||||
- gpio_keys[n_buttons].desc = info->name;
|
||||
- gpio_keys[n_buttons].wakeup = info->wakeup;
|
||||
- n_buttons++;
|
||||
- }
|
||||
-
|
||||
- if (n_buttons == 0) {
|
||||
- error = -ENODEV;
|
||||
- goto err_free_mem;
|
||||
- }
|
||||
-
|
||||
- gpio_keys_pdata->buttons = gpio_keys;
|
||||
- gpio_keys_pdata->nbuttons = n_buttons;
|
||||
- gpio_keys_pdata->rep = autorepeat;
|
||||
-
|
||||
- pd = platform_device_alloc("gpio-keys", PLATFORM_DEVID_AUTO);
|
||||
- if (!pd) {
|
||||
- error = -ENOMEM;
|
||||
- goto err_free_mem;
|
||||
- }
|
||||
-
|
||||
- error = platform_device_add_data(pd, gpio_keys_pdata,
|
||||
- sizeof(*gpio_keys_pdata));
|
||||
- if (error)
|
||||
- goto err_free_pdev;
|
||||
-
|
||||
- error = platform_device_add(pd);
|
||||
- if (error)
|
||||
- goto err_free_pdev;
|
||||
-
|
||||
- return pd;
|
||||
-
|
||||
-err_free_pdev:
|
||||
- platform_device_put(pd);
|
||||
-err_free_mem:
|
||||
- devm_kfree(&client->dev, gpio_keys_pdata);
|
||||
- return ERR_PTR(error);
|
||||
-}
|
||||
-
|
||||
-static int surface3_button_remove(struct i2c_client *client)
|
||||
-{
|
||||
- struct surface3_button_data *priv = i2c_get_clientdata(client);
|
||||
-
|
||||
- int i;
|
||||
-
|
||||
- for (i = 0; i < BUTTON_TYPES; i++)
|
||||
- if (priv->children[i])
|
||||
- platform_device_unregister(priv->children[i]);
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-static struct surface3_button_info surface3_button_surface3[] = {
|
||||
- { "power", 0, EV_KEY, KEY_POWER, false, true, true },
|
||||
- { "home", 1, EV_KEY, KEY_LEFTMETA, false, true, false },
|
||||
- { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false, true },
|
||||
- { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false, true },
|
||||
- { }
|
||||
-};
|
||||
-
|
||||
-static int surface3_button_probe(struct i2c_client *client,
|
||||
- const struct i2c_device_id *id)
|
||||
-{
|
||||
- struct device *dev = &client->dev;
|
||||
- struct surface3_button_data *priv;
|
||||
- struct platform_device *pd;
|
||||
- int i;
|
||||
- int error;
|
||||
-
|
||||
- if (strncmp(acpi_device_bid(ACPI_COMPANION(&client->dev)),
|
||||
- SURFACE_BUTTON_OBJ_NAME,
|
||||
- strlen(SURFACE_BUTTON_OBJ_NAME)))
|
||||
- return -ENODEV;
|
||||
-
|
||||
- error = gpiod_count(dev, NULL);
|
||||
- if (error < 0) {
|
||||
- dev_dbg(dev, "no GPIO attached, ignoring...\n");
|
||||
- return error;
|
||||
- }
|
||||
-
|
||||
- priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
||||
- if (!priv)
|
||||
- return -ENOMEM;
|
||||
-
|
||||
- i2c_set_clientdata(client, priv);
|
||||
-
|
||||
- for (i = 0; i < BUTTON_TYPES; i++) {
|
||||
- pd = surface3_button_device_create(client,
|
||||
- surface3_button_surface3,
|
||||
- i == 0);
|
||||
- if (IS_ERR(pd)) {
|
||||
- error = PTR_ERR(pd);
|
||||
- if (error != -ENODEV) {
|
||||
- surface3_button_remove(client);
|
||||
- return error;
|
||||
- }
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- priv->children[i] = pd;
|
||||
- }
|
||||
-
|
||||
- if (!priv->children[0] && !priv->children[1])
|
||||
- return -ENODEV;
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-static const struct i2c_device_id surface3_id[] = {
|
||||
- { }
|
||||
-};
|
||||
-MODULE_DEVICE_TABLE(i2c, surface3_id);
|
||||
-
|
||||
-static struct i2c_driver surface3_driver = {
|
||||
- .probe = surface3_button_probe,
|
||||
- .remove = surface3_button_remove,
|
||||
- .id_table = surface3_id,
|
||||
- .driver = {
|
||||
- .name = "surface3",
|
||||
- .acpi_match_table = ACPI_PTR(surface3_acpi_match),
|
||||
- },
|
||||
-};
|
||||
-module_i2c_driver(surface3_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>");
|
||||
-MODULE_DESCRIPTION("surface3 button array driver");
|
||||
-MODULE_LICENSE("GPL v2");
|
||||
--
|
||||
2.35.1
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From 6810c61094611fdb7fabfdc62ac51f207a923de9 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 082376a6cb3d..cfc2e684a22c 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -34,7 +34,10 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/hid.h>
|
||||
#include <linux/module.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/suspend.h>
|
||||
+#include <linux/usb.h>
|
||||
#include <linux/input/mt.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/string.h>
|
||||
@@ -47,6 +50,7 @@ MODULE_DESCRIPTION("HID multitouch panels");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#include "hid-ids.h"
|
||||
+#include "usbhid/usbhid.h"
|
||||
|
||||
/* quirks to control the device */
|
||||
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
|
||||
@@ -71,12 +75,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
#define MT_QUIRK_DISABLE_WAKEUP BIT(21)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(22)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
HID_LATENCY_HIGH = 1,
|
||||
@@ -168,6 +175,8 @@ struct mt_device {
|
||||
|
||||
struct list_head applications;
|
||||
struct list_head reports;
|
||||
+
|
||||
+ struct notifier_block pm_notifier;
|
||||
};
|
||||
|
||||
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||
@@ -211,6 +220,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||
#define MT_CLS_GOOGLE 0x0111
|
||||
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||
#define MT_CLS_SMART_TECH 0x0113
|
||||
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
#define MT_MAX_MAXCONTACT 250
|
||||
@@ -386,6 +396,16 @@ static const struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
MT_QUIRK_SEPARATE_APP_REPORT,
|
||||
},
|
||||
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||
+ MT_QUIRK_ALWAYS_VALID |
|
||||
+ MT_QUIRK_IGNORE_DUPLICATES |
|
||||
+ MT_QUIRK_HOVERING |
|
||||
+ MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
+ MT_QUIRK_STICKY_FINGERS |
|
||||
+ MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||
+ .export_all_inputs = true
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1698,6 +1718,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1721,6 +1804,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);
|
||||
|
||||
@@ -1750,15 +1836,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)
|
||||
@@ -1810,6 +1900,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);
|
||||
@@ -2177,6 +2268,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.35.1
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,109 +0,0 @@
|
|||
From 5f73c0ef09d059062b1596eb22b9f8ba6625f3c5 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 5b6d1a95776f..0a05e196419a 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/efi-bgrt.h>
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/pgtable.h>
|
||||
+#include <linux/dmi.h>
|
||||
|
||||
#include <asm/e820/api.h>
|
||||
#include <asm/irqdomain.h>
|
||||
@@ -1152,6 +1153,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||
}
|
||||
}
|
||||
|
||||
+static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||
+ },
|
||||
+ },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Parse IOAPIC related entries in MADT
|
||||
* returns 0 on success, < 0 on error
|
||||
@@ -1207,6 +1219,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
|
||||
acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0,
|
||||
acpi_gbl_FADT.sci_interrupt);
|
||||
|
||||
+ if (dmi_check_system(surface_quirk)) {
|
||||
+ pr_warn("Surface hack: Override irq 7\n");
|
||||
+ mp_override_legacy_irq(7, 3, 3, 7);
|
||||
+ }
|
||||
+
|
||||
/* Fill in identity legacy mappings where no override */
|
||||
mp_config_acpi_legacy_irqs();
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From 1d96852a8adf322ce139bbf7e850a8f076d88dd6 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 0a05e196419a..35de5613980a 100644
|
||||
--- a/arch/x86/kernel/acpi/boot.c
|
||||
+++ b/arch/x86/kernel/acpi/boot.c
|
||||
@@ -1155,12 +1155,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
|
||||
|
||||
static const struct dmi_system_id surface_quirk[] __initconst = {
|
||||
{
|
||||
- .ident = "Microsoft Surface Laptop 4 (AMD)",
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 15\")",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1952:1953")
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface Laptop 4 (AMD 13\")",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_4_1958:1959")
|
||||
+ },
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
|
@ -1,111 +0,0 @@
|
|||
From 0169488e6792b0939ec350c59b608e744faf3fc4 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Wed, 8 Dec 2021 16:22:50 +0100
|
||||
Subject: [PATCH] acpi/battery: Add device HID and quirk for Microsoft Surface
|
||||
Go 3
|
||||
|
||||
For some reason, the Microsoft Surface Go 3 uses the standard ACPI
|
||||
interface for battery information, but does not use the standard PNP0C0A
|
||||
HID. Instead it uses MSHW0146 as identifier. Add that ID to the driver
|
||||
as this seems to work well.
|
||||
|
||||
Additionally, the power state is not updated immediately after the AC
|
||||
has been (un-)plugged, so add the respective quirk for that.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: misc-fixes
|
||||
---
|
||||
drivers/acpi/battery.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
|
||||
index ead0114f27c9..56db7b4da514 100644
|
||||
--- a/drivers/acpi/battery.c
|
||||
+++ b/drivers/acpi/battery.c
|
||||
@@ -60,6 +60,10 @@ MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
|
||||
|
||||
static const struct acpi_device_id battery_device_ids[] = {
|
||||
{"PNP0C0A", 0},
|
||||
+
|
||||
+ /* Microsoft Surface Go 3 */
|
||||
+ {"MSHW0146", 0},
|
||||
+
|
||||
{"", 0},
|
||||
};
|
||||
|
||||
@@ -1177,6 +1181,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
|
||||
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ /* Microsoft Surface Go 3 */
|
||||
+ .callback = battery_notification_delay_quirk,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 3"),
|
||||
+ },
|
||||
+ },
|
||||
{},
|
||||
};
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
From ed246dbe6d9a05f195f78fb1b325b088add2321a Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Tue, 8 Feb 2022 01:29:48 +0100
|
||||
Subject: [PATCH] ACPI: battery: Add "Not Charging" quirk for Microsoft Surface
|
||||
devices
|
||||
|
||||
Microsoft Surface devices have a limiter that sets a fixed maximum
|
||||
charge capacity for the battery. When that maximum capacity has been
|
||||
reached, charging stops. In that case, _BST returns a battery state
|
||||
field with both "charging" and "discharging" bits cleared. The battery
|
||||
driver, however, returns "unknown" as status.
|
||||
|
||||
This seems to be the same behavior as observed on the ThinkPads, so
|
||||
let's use the same quirk to handle that as well.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: misc-fixes
|
||||
|
||||
---
|
||||
For what it's worth, I don't think the ACPI spec explicitly states that
|
||||
any of the status bits need to be set, or that there are only the
|
||||
"charging" and "discharging" states. As far as I can tell, ACPI only
|
||||
states:
|
||||
|
||||
Notice that the Charging bit and the Discharging bit are mutually
|
||||
exclusive and must not both be set at the same time. Even in
|
||||
critical state, hardware should report the corresponding
|
||||
charging/discharging state.
|
||||
|
||||
But that does not exclude the case that no bit is set. So, strictly
|
||||
going by spec, I don't think it's necessary to put all of this behind a
|
||||
quirk.
|
||||
---
|
||||
drivers/acpi/battery.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
|
||||
index 56db7b4da514..8edaa3020af3 100644
|
||||
--- a/drivers/acpi/battery.c
|
||||
+++ b/drivers/acpi/battery.c
|
||||
@@ -1181,6 +1181,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
|
||||
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = battery_quirk_not_charging,
|
||||
+ .ident = "Microsoft Surface",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface"),
|
||||
+ },
|
||||
+ },
|
||||
{
|
||||
/* Microsoft Surface Go 3 */
|
||||
.callback = battery_notification_delay_quirk,
|
||||
--
|
||||
2.35.1
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From d71e66bf8025abea7306b59ce5c27bc4384dc199 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 18 Oct 2020 16:42:44 +0900
|
||||
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||
for quirks so that each driver can enable quirks even on the affected
|
||||
systems.
|
||||
|
||||
On affected systems, DMI data will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-oemb
|
||||
---
|
||||
drivers/platform/surface/surface3-wmi.c | 7 +++++++
|
||||
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||
3 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
|
||||
index 09ac9cfc40d8..c626109cf445 100644
|
||||
--- a/drivers/platform/surface/surface3-wmi.c
|
||||
+++ b/drivers/platform/surface/surface3-wmi.c
|
||||
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
#endif
|
||||
{ }
|
||||
};
|
||||
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||
index 4b2e027c1033..dc96ec7bcbd5 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3718,6 +3718,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||
},
|
||||
.driver_data = (void *)&intel_braswell_platform_data,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||
+ },
|
||||
{
|
||||
/*
|
||||
* Match for the GPDwin which unfortunately uses somewhat
|
||||
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
index c60a5e8e7bc9..e947133a2c36 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
|
@ -1,704 +0,0 @@
|
|||
From 3598ab0e8f35bdfac671a9a7193b77dce8b08abb Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Tue, 29 Sep 2020 17:32:22 +0900
|
||||
Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
|
||||
|
||||
This commit adds reset_wsid quirk and uses this quirk for Surface 3 on
|
||||
card reset.
|
||||
|
||||
To reset mwifiex on Surface 3, it seems that calling the _DSM method
|
||||
exists in \_SB.WSID [1] device is required.
|
||||
|
||||
On Surface 3, calling the _DSM method removes/re-probes the card by
|
||||
itself. So, need to place the reset function before performing FLR and
|
||||
skip performing any other reset-related works.
|
||||
|
||||
Note that Surface Pro 3 also has the WSID device [2], but it seems to need
|
||||
more work. This commit only supports Surface 3 yet.
|
||||
|
||||
[1] https://github.com/linux-surface/acpidumps/blob/05cba925f3a515f222acb5b3551a032ddde958fe/surface_3/dsdt.dsl#L11947-L12011
|
||||
[2] https://github.com/linux-surface/acpidumps/blob/05cba925f3a515f222acb5b3551a032ddde958fe/surface_pro_3/dsdt.dsl#L12164-L12216
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +++
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.c | 83 +++++++++++++++++++
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.h | 6 ++
|
||||
3 files changed, 99 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index d5fb29400bad..033648526f16 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -2993,6 +2993,16 @@ static void mwifiex_pcie_card_reset_work(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
struct pcie_service_card *card = adapter->card;
|
||||
|
||||
+ /* On Surface 3, reset_wsid method removes then re-probes card by
|
||||
+ * itself. So, need to place it here and skip performing any other
|
||||
+ * reset-related works.
|
||||
+ */
|
||||
+ if (card->quirks & QUIRK_FW_RST_WSID_S3) {
|
||||
+ mwifiex_pcie_reset_wsid_quirk(card->dev);
|
||||
+ /* skip performing any other reset-related works */
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
/* We can't afford to wait here; remove() might be waiting on us. If we
|
||||
* can't grab the device lock, maybe we'll get another chance later.
|
||||
*/
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 0234cf3c2974..563dd0d5ac79 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -15,10 +15,21 @@
|
||||
* this warranty disclaimer.
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/dmi.h>
|
||||
|
||||
#include "pcie_quirks.h"
|
||||
|
||||
+/* For reset_wsid quirk */
|
||||
+#define ACPI_WSID_PATH "\\_SB.WSID"
|
||||
+#define WSID_REV 0x0
|
||||
+#define WSID_FUNC_WIFI_PWR_OFF 0x1
|
||||
+#define WSID_FUNC_WIFI_PWR_ON 0x2
|
||||
+/* WSID _DSM UUID: "534ea3bf-fcc2-4e7a-908f-a13978f0c7ef" */
|
||||
+static const guid_t wsid_dsm_guid =
|
||||
+ GUID_INIT(0x534ea3bf, 0xfcc2, 0x4e7a,
|
||||
+ 0x90, 0x8f, 0xa1, 0x39, 0x78, 0xf0, 0xc7, 0xef);
|
||||
+
|
||||
/* quirk table based on DMI matching */
|
||||
static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
{
|
||||
@@ -87,6 +98,14 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
},
|
||||
.driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
+ },
|
||||
+ .driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -103,6 +122,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||
dev_info(&pdev->dev, "no quirks enabled\n");
|
||||
if (card->quirks & QUIRK_FW_RST_D3COLD)
|
||||
dev_info(&pdev->dev, "quirk reset_d3cold enabled\n");
|
||||
+ if (card->quirks & QUIRK_FW_RST_WSID_S3)
|
||||
+ dev_info(&pdev->dev,
|
||||
+ "quirk reset_wsid for Surface 3 enabled\n");
|
||||
}
|
||||
|
||||
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||
@@ -159,3 +181,64 @@ int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev)
|
||||
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
+int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev)
|
||||
+{
|
||||
+ acpi_handle handle;
|
||||
+ union acpi_object *obj;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ dev_info(&pdev->dev, "Using reset_wsid quirk to perform FW reset\n");
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, ACPI_WSID_PATH, &handle);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(&pdev->dev, "No ACPI handle for path %s\n",
|
||||
+ ACPI_WSID_PATH);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ if (!acpi_has_method(handle, "_DSM")) {
|
||||
+ dev_err(&pdev->dev, "_DSM method not found\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ if (!acpi_check_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_OFF)) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "_DSM method doesn't support wifi power off func\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ if (!acpi_check_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_ON)) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "_DSM method doesn't support wifi power on func\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ /* card will be removed immediately after this call on Surface 3 */
|
||||
+ dev_info(&pdev->dev, "turning wifi off...\n");
|
||||
+ obj = acpi_evaluate_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_OFF,
|
||||
+ NULL);
|
||||
+ if (!obj) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "device _DSM execution failed for turning wifi off\n");
|
||||
+ return -EIO;
|
||||
+ }
|
||||
+ ACPI_FREE(obj);
|
||||
+
|
||||
+ /* card will be re-probed immediately after this call on Surface 3 */
|
||||
+ dev_info(&pdev->dev, "turning wifi on...\n");
|
||||
+ obj = acpi_evaluate_dsm(handle, &wsid_dsm_guid,
|
||||
+ WSID_REV, WSID_FUNC_WIFI_PWR_ON,
|
||||
+ NULL);
|
||||
+ if (!obj) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "device _DSM execution failed for turning wifi on\n");
|
||||
+ return -EIO;
|
||||
+ }
|
||||
+ ACPI_FREE(obj);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
index 8ec4176d698f..25370c5a4f59 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -19,5 +19,11 @@
|
||||
|
||||
#define QUIRK_FW_RST_D3COLD BIT(0)
|
||||
|
||||
+/* Surface 3 and Surface Pro 3 have the same _DSM method but need to
|
||||
+ * be handled differently. Currently, only S3 is supported.
|
||||
+ */
|
||||
+#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||
+
|
||||
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||
+int mwifiex_pcie_reset_wsid_quirk(struct pci_dev *pdev);
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From 8b9aac712c20f228f3e99c0583a31bcbbdec28a3 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Wed, 30 Sep 2020 18:08:24 +0900
|
||||
Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
(made referring to http://git.osdn.net/view?p=android-x86/kernel.git;a=commitdiff;h=18e2e857c57633b25b3b4120f212224a108cd883)
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI info for the affected Surface 3.
|
||||
|
||||
On affected systems, DMI info will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie_quirks.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 563dd0d5ac79..32e2f000e57b 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -106,6 +106,15 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
},
|
||||
.driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)QUIRK_FW_RST_WSID_S3,
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From 8dbbbf65898f70d4f76e031f2f67b0093ad1998f Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 4 Oct 2020 00:11:49 +0900
|
||||
Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
|
||||
|
||||
Currently, mwifiex fw will crash after suspend on recent kernel series.
|
||||
On Windows, it seems that the root port of wifi will never enter D3 state
|
||||
(stay on D0 state). And on Linux, disabling the D3 state for the
|
||||
bridge fixes fw crashing after suspend.
|
||||
|
||||
This commit disables the D3 state of root port on driver initialization
|
||||
and fixes fw crashing after suspend.
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 7 +++++
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.c | 27 +++++++++++++------
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.h | 1 +
|
||||
3 files changed, 27 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index 033648526f16..ca6bcbe4794c 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -380,6 +380,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct pcie_service_card *card;
|
||||
+ struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
|
||||
int ret;
|
||||
|
||||
pr_debug("info: vendor=0x%4.04X device=0x%4.04X rev=%d\n",
|
||||
@@ -421,6 +422,12 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
||||
return -1;
|
||||
}
|
||||
|
||||
+ /* disable bridge_d3 for Surface gen4+ devices to fix fw crashing
|
||||
+ * after suspend
|
||||
+ */
|
||||
+ if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||
+ parent_pdev->bridge_d3 = false;
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 32e2f000e57b..356401bab59c 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -38,7 +38,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5",
|
||||
@@ -47,7 +48,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5 (LTE)",
|
||||
@@ -56,7 +58,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 6",
|
||||
@@ -64,7 +67,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
@@ -72,7 +76,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 2",
|
||||
@@ -80,7 +85,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 1",
|
||||
@@ -88,7 +94,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 2",
|
||||
@@ -96,7 +103,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||
},
|
||||
- .driver_data = (void *)QUIRK_FW_RST_D3COLD,
|
||||
+ .driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
+ QUIRK_NO_BRIDGE_D3),
|
||||
},
|
||||
{
|
||||
.ident = "Surface 3",
|
||||
@@ -134,6 +142,9 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||
if (card->quirks & QUIRK_FW_RST_WSID_S3)
|
||||
dev_info(&pdev->dev,
|
||||
"quirk reset_wsid for Surface 3 enabled\n");
|
||||
+ if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||
+ dev_info(&pdev->dev,
|
||||
+ "quirk no_brigde_d3 enabled\n");
|
||||
}
|
||||
|
||||
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
index 25370c5a4f59..a1de111ad1db 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -23,6 +23,7 @@
|
||||
* be handled differently. Currently, only S3 is supported.
|
||||
*/
|
||||
#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||
+#define QUIRK_NO_BRIDGE_D3 BIT(2)
|
||||
|
||||
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From 2c4af6971faa65871724e80bdd774091a066baf0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Tue, 3 Nov 2020 13:28:04 +0100
|
||||
Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
|
||||
devices
|
||||
|
||||
The most recent firmware of the 88W8897 card reports a hardcoded LTR
|
||||
value to the system during initialization, probably as an (unsuccessful)
|
||||
attempt of the developers to fix firmware crashes. This LTR value
|
||||
prevents most of the Microsoft Surface devices from entering deep
|
||||
powersaving states (either platform C-State 10 or S0ix state), because
|
||||
the exit latency of that state would be higher than what the card can
|
||||
tolerate.
|
||||
|
||||
Turns out the card works just the same (including the firmware crashes)
|
||||
no matter if that hardcoded LTR value is reported or not, so it's kind
|
||||
of useless and only prevents us from saving power.
|
||||
|
||||
To get rid of those hardcoded LTR reports, it's possible to reset the
|
||||
PCI bridge device after initializing the cards firmware. I'm not exactly
|
||||
sure why that works, maybe the power management subsystem of the PCH
|
||||
resets its stored LTR values when doing a function level reset of the
|
||||
bridge device. Doing the reset once after starting the wifi firmware
|
||||
works very well, probably because the firmware only reports that LTR
|
||||
value a single time during firmware startup.
|
||||
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 12 +++++++++
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.c | 26 +++++++++++++------
|
||||
.../wireless/marvell/mwifiex/pcie_quirks.h | 1 +
|
||||
3 files changed, 31 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index ca6bcbe4794c..24bcd22a2618 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -1781,9 +1781,21 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
|
||||
static int mwifiex_pcie_init_fw_port(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
struct pcie_service_card *card = adapter->card;
|
||||
+ struct pci_dev *pdev = card->dev;
|
||||
+ struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
|
||||
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
|
||||
int tx_wrap = card->txbd_wrptr & reg->tx_wrap_mask;
|
||||
|
||||
+ /* Trigger a function level reset of the PCI bridge device, this makes
|
||||
+ * the firmware of PCIe 88W8897 cards stop reporting a fixed LTR value
|
||||
+ * that prevents the system from entering package C10 and S0ix powersaving
|
||||
+ * states.
|
||||
+ * We need to do it here because it must happen after firmware
|
||||
+ * initialization and this function is called after that is done.
|
||||
+ */
|
||||
+ if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
|
||||
+ pci_reset_function(parent_pdev);
|
||||
+
|
||||
/* Write the RX ring read pointer in to reg->rx_rdptr */
|
||||
if (mwifiex_write_reg(adapter, reg->rx_rdptr, card->rxbd_rdptr |
|
||||
tx_wrap)) {
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
index 356401bab59c..6437f067d07a 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
||||
@@ -39,7 +39,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5",
|
||||
@@ -49,7 +50,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 5 (LTE)",
|
||||
@@ -59,7 +61,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Pro 6",
|
||||
@@ -68,7 +71,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 1",
|
||||
@@ -77,7 +81,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Book 2",
|
||||
@@ -86,7 +91,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 1",
|
||||
@@ -95,7 +101,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface Laptop 2",
|
||||
@@ -104,7 +111,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
||||
},
|
||||
.driver_data = (void *)(QUIRK_FW_RST_D3COLD |
|
||||
- QUIRK_NO_BRIDGE_D3),
|
||||
+ QUIRK_NO_BRIDGE_D3 |
|
||||
+ QUIRK_DO_FLR_ON_BRIDGE),
|
||||
},
|
||||
{
|
||||
.ident = "Surface 3",
|
||||
@@ -145,6 +153,8 @@ void mwifiex_initialize_quirks(struct pcie_service_card *card)
|
||||
if (card->quirks & QUIRK_NO_BRIDGE_D3)
|
||||
dev_info(&pdev->dev,
|
||||
"quirk no_brigde_d3 enabled\n");
|
||||
+ if (card->quirks & QUIRK_DO_FLR_ON_BRIDGE)
|
||||
+ dev_info(&pdev->dev, "quirk do_flr_on_bridge enabled\n");
|
||||
}
|
||||
|
||||
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
index a1de111ad1db..0e429779bb04 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
||||
@@ -24,6 +24,7 @@
|
||||
*/
|
||||
#define QUIRK_FW_RST_WSID_S3 BIT(1)
|
||||
#define QUIRK_NO_BRIDGE_D3 BIT(2)
|
||||
+#define QUIRK_DO_FLR_ON_BRIDGE BIT(3)
|
||||
|
||||
void mwifiex_initialize_quirks(struct pcie_service_card *card);
|
||||
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From 2124e045c2e4c17db97bb1cd8ac6d3aa085d6e52 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 304351d2cfdf..e5d9fcd03f98 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -63,6 +63,7 @@ static struct usb_driver btusb_driver;
|
||||
#define BTUSB_INTEL_BROKEN_SHUTDOWN_LED 0x2000000
|
||||
#define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000
|
||||
#define BTUSB_INTEL_NO_WBS_SUPPORT 0x8000000
|
||||
+#define BTUSB_LOWER_LESCAN_INTERVAL 0x10000000
|
||||
|
||||
static const struct usb_device_id btusb_table[] = {
|
||||
/* Generic Bluetooth USB device */
|
||||
@@ -377,6 +378,7 @@ static const struct usb_device_id blacklist_table[] = {
|
||||
{ USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },
|
||||
{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
|
||||
{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
|
||||
+ { USB_DEVICE(0x1286, 0x204c), .driver_info = BTUSB_LOWER_LESCAN_INTERVAL },
|
||||
|
||||
/* Intel Bluetooth devices */
|
||||
{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
|
||||
@@ -3757,6 +3759,19 @@ static int btusb_probe(struct usb_interface *intf,
|
||||
if (id->driver_info & BTUSB_MARVELL)
|
||||
hdev->set_bdaddr = btusb_set_bdaddr_marvell;
|
||||
|
||||
+ /* The Marvell 88W8897 combined wifi and bluetooth card is known for
|
||||
+ * very bad bt+wifi coexisting performance.
|
||||
+ *
|
||||
+ * Decrease the passive BT Low Energy scan interval a bit
|
||||
+ * (0x0190 * 0.625 msec = 250 msec) and make the scan window shorter
|
||||
+ * (0x000a * 0,625 msec = 6.25 msec). This allows for significantly
|
||||
+ * higher wifi throughput while passively scanning for BT LE devices.
|
||||
+ */
|
||||
+ if (id->driver_info & BTUSB_LOWER_LESCAN_INTERVAL) {
|
||||
+ hdev->le_scan_interval = 0x0190;
|
||||
+ hdev->le_scan_window = 0x000a;
|
||||
+ }
|
||||
+
|
||||
if (IS_ENABLED(CONFIG_BT_HCIBTUSB_MTK) &&
|
||||
(id->driver_info & BTUSB_MEDIATEK)) {
|
||||
hdev->setup = btusb_mtk_setup;
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From 58e2ebec3bd715b4a68be78a7d3dd4fb52b63d8b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Tue, 10 Nov 2020 12:49:56 +0100
|
||||
Subject: [PATCH] mwifiex: Use non-posted PCI register writes
|
||||
|
||||
On the 88W8897 card it's very important the TX ring write pointer is
|
||||
updated correctly to its new value before setting the TX ready
|
||||
interrupt, otherwise the firmware appears to crash (probably because
|
||||
it's trying to DMA-read from the wrong place).
|
||||
|
||||
Since PCI uses "posted writes" when writing to a register, it's not
|
||||
guaranteed that a write will happen immediately. That means the pointer
|
||||
might be outdated when setting the TX ready interrupt, leading to
|
||||
firmware crashes especially when ASPM L1 and L1 substates are enabled
|
||||
(because of the higher link latency, the write will probably take
|
||||
longer).
|
||||
|
||||
So fix those firmware crashes by always forcing non-posted writes. We do
|
||||
that by simply reading back the register after writing it, just as a lot
|
||||
of other drivers do.
|
||||
|
||||
There are two reproducers that are fixed with this patch:
|
||||
|
||||
1) During rx/tx traffic and with ASPM L1 substates enabled (the enabled
|
||||
substates are platform dependent), the firmware crashes and eventually a
|
||||
command timeout appears in the logs. That crash is fixed by using a
|
||||
non-posted write in mwifiex_pcie_send_data().
|
||||
|
||||
2) When sending lots of commands to the card, waking it up from sleep in
|
||||
very quick intervals, the firmware eventually crashes. That crash
|
||||
appears to be fixed by some other non-posted write included here.
|
||||
|
||||
Patchset: mwifiex
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index 24bcd22a2618..b4ad0113a035 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -238,6 +238,12 @@ static int mwifiex_write_reg(struct mwifiex_adapter *adapter, int reg, u32 data)
|
||||
|
||||
iowrite32(data, card->pci_mmap1 + reg);
|
||||
|
||||
+ /* Do a read-back, which makes the write non-posted, ensuring the
|
||||
+ * completion before returning.
|
||||
+ * The firmware of the 88W8897 card is buggy and this avoids crashes.
|
||||
+ */
|
||||
+ ioread32(card->pci_mmap1 + reg);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
From 123a2db32336c887b0c1354eccfa9f0cbbc09ce0 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 27 Feb 2021 00:45:52 +0100
|
||||
Subject: [PATCH] ath10k: Add module parameters to override board files
|
||||
|
||||
Some Surface devices, specifically the Surface Go and AMD version of the
|
||||
Surface Laptop 3 (wich both come with QCA6174 WiFi chips), work better
|
||||
with a different board file, as it seems that the firmeware included
|
||||
upstream is buggy.
|
||||
|
||||
As it is generally not a good idea to randomly overwrite files, let
|
||||
alone doing so via packages, we add module parameters to override those
|
||||
file names in the driver. This allows us to package/deploy the override
|
||||
via a modprobe.d config.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: ath10k
|
||||
---
|
||||
drivers/net/wireless/ath/ath10k/core.c | 58 ++++++++++++++++++++++++++
|
||||
1 file changed, 58 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
|
||||
index 8f5b8eb368fa..80c1bac732bc 100644
|
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -36,6 +36,9 @@ static bool skip_otp;
|
||||
static bool rawmode;
|
||||
static bool fw_diag_log;
|
||||
|
||||
+static char *override_board = "";
|
||||
+static char *override_board2 = "";
|
||||
+
|
||||
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
|
||||
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
|
||||
|
||||
@@ -48,6 +51,9 @@ module_param(rawmode, bool, 0644);
|
||||
module_param(fw_diag_log, bool, 0644);
|
||||
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
|
||||
|
||||
+module_param(override_board, charp, 0644);
|
||||
+module_param(override_board2, charp, 0644);
|
||||
+
|
||||
MODULE_PARM_DESC(debug_mask, "Debugging mask");
|
||||
MODULE_PARM_DESC(uart_print, "Uart target debugging");
|
||||
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
|
||||
@@ -56,6 +62,9 @@ MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
|
||||
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");
|
||||
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
|
||||
|
||||
+MODULE_PARM_DESC(override_board, "Override for board.bin file");
|
||||
+MODULE_PARM_DESC(override_board2, "Override for board-2.bin file");
|
||||
+
|
||||
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
||||
{
|
||||
.id = QCA988X_HW_2_0_VERSION,
|
||||
@@ -844,6 +853,42 @@ static int ath10k_init_configure_target(struct ath10k *ar)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static const char *ath10k_override_board_fw_file(struct ath10k *ar,
|
||||
+ const char *file)
|
||||
+{
|
||||
+ if (strcmp(file, "board.bin") == 0) {
|
||||
+ if (strcmp(override_board, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board.bin' with '%s'\n",
|
||||
+ override_board);
|
||||
+
|
||||
+ return override_board;
|
||||
+ }
|
||||
+
|
||||
+ if (strcmp(file, "board-2.bin") == 0) {
|
||||
+ if (strcmp(override_board2, "") == 0)
|
||||
+ return file;
|
||||
+
|
||||
+ if (strcmp(override_board2, "none") == 0) {
|
||||
+ dev_info(ar->dev, "firmware override: pretending 'board-2.bin' does not exist\n");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(ar->dev, "firmware override: replacing 'board-2.bin' with '%s'\n",
|
||||
+ override_board2);
|
||||
+
|
||||
+ return override_board2;
|
||||
+ }
|
||||
+
|
||||
+ return file;
|
||||
+}
|
||||
+
|
||||
static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
const char *dir,
|
||||
const char *file)
|
||||
@@ -858,6 +903,19 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,
|
||||
if (dir == NULL)
|
||||
dir = ".";
|
||||
|
||||
+ /* HACK: Override board.bin and board-2.bin files if specified.
|
||||
+ *
|
||||
+ * Some Surface devices perform better with a different board
|
||||
+ * configuration. To this end, one would need to replace the board.bin
|
||||
+ * file with the modified config and remove the board-2.bin file.
|
||||
+ * Unfortunately, that's not a solution that we can easily package. So
|
||||
+ * we add module options to perform these overrides here.
|
||||
+ */
|
||||
+
|
||||
+ file = ath10k_override_board_fw_file(ar, file);
|
||||
+ if (!file)
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
+
|
||||
snprintf(filename, sizeof(filename), "%s/%s", dir, file);
|
||||
ret = firmware_request_nowarn(&fw, filename, ar->dev);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
|
||||
--
|
||||
2.36.1
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,335 +0,0 @@
|
|||
From ae12ad46087b4206ccc2869efefab2eb2a340230 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 25 Jul 2020 17:19:53 +0200
|
||||
Subject: [PATCH] i2c: acpi: Implement RawBytes read access
|
||||
|
||||
Microsoft Surface Pro 4 and Book 1 devices access the MSHW0030 I2C
|
||||
device via a generic serial bus operation region and RawBytes read
|
||||
access. On the Surface Book 1, this access is required to turn on (and
|
||||
off) the discrete GPU.
|
||||
|
||||
Multiple things are to note here:
|
||||
|
||||
a) The RawBytes access is device/driver dependent. The ACPI
|
||||
specification states:
|
||||
|
||||
> Raw accesses assume that the writer has knowledge of the bus that
|
||||
> the access is made over and the device that is being accessed. The
|
||||
> protocol may only ensure that the buffer is transmitted to the
|
||||
> appropriate driver, but the driver must be able to interpret the
|
||||
> buffer to communicate to a register.
|
||||
|
||||
Thus this implementation may likely not work on other devices
|
||||
accessing I2C via the RawBytes accessor type.
|
||||
|
||||
b) The MSHW0030 I2C device is an HID-over-I2C device which seems to
|
||||
serve multiple functions:
|
||||
|
||||
1. It is the main access point for the legacy-type Surface Aggregator
|
||||
Module (also referred to as SAM-over-HID, as opposed to the newer
|
||||
SAM-over-SSH/UART). It has currently not been determined on how
|
||||
support for the legacy SAM should be implemented. Likely via a
|
||||
custom HID driver.
|
||||
|
||||
2. It seems to serve as the HID device for the Integrated Sensor Hub.
|
||||
This might complicate matters with regards to implementing a
|
||||
SAM-over-HID driver required by legacy SAM.
|
||||
|
||||
In light of this, the simplest approach has been chosen for now.
|
||||
However, it may make more sense regarding breakage and compatibility to
|
||||
either provide functionality for replacing or enhancing the default
|
||||
operation region handler via some additional API functions, or even to
|
||||
completely blacklist MSHW0030 from the I2C core and provide a custom
|
||||
driver for it.
|
||||
|
||||
Replacing/enhancing the default operation region handler would, however,
|
||||
either require some sort of secondary driver and access point for it,
|
||||
from which the new API functions would be called and the new handler
|
||||
(part) would be installed, or hard-coding them via some sort of
|
||||
quirk-like interface into the I2C core.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam-over-hid
|
||||
---
|
||||
drivers/i2c/i2c-core-acpi.c | 35 +++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 35 insertions(+)
|
||||
|
||||
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
|
||||
index 85ed4c1d4924..942c1c9a4ea5 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -624,6 +624,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
|
||||
return (ret == 1) ? 0 : -EIO;
|
||||
}
|
||||
|
||||
+static int acpi_gsb_i2c_write_raw_bytes(struct i2c_client *client,
|
||||
+ u8 *data, u8 data_len)
|
||||
+{
|
||||
+ struct i2c_msg msgs[1];
|
||||
+ int ret = AE_OK;
|
||||
+
|
||||
+ msgs[0].addr = client->addr;
|
||||
+ msgs[0].flags = client->flags;
|
||||
+ msgs[0].len = data_len + 1;
|
||||
+ msgs[0].buf = data;
|
||||
+
|
||||
+ ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
|
||||
+
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&client->adapter->dev, "i2c write failed: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ /* 1 transfer must have completed successfully */
|
||||
+ return (ret == 1) ? 0 : -EIO;
|
||||
+}
|
||||
+
|
||||
static acpi_status
|
||||
i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
u32 bits, u64 *value64,
|
||||
@@ -725,6 +747,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
}
|
||||
break;
|
||||
|
||||
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
|
||||
+ if (action == ACPI_READ) {
|
||||
+ dev_warn(&adapter->dev,
|
||||
+ "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
+ accessor_type, client->addr);
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ } else {
|
||||
+ status = acpi_gsb_i2c_write_raw_bytes(client,
|
||||
+ gsb->data, info->access_length);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
accessor_type, client->addr);
|
||||
--
|
||||
2.36.1
|
||||
|
||||
From d0ce33c5890a6301827426a0c8df1a882e22182a 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 c685ec440535..3d3659b87ba4 100644
|
||||
--- a/drivers/platform/surface/Kconfig
|
||||
+++ b/drivers/platform/surface/Kconfig
|
||||
@@ -133,6 +133,13 @@ config SURFACE_AGGREGATOR_REGISTRY
|
||||
the respective client devices. Drivers for these devices still need to
|
||||
be selected via the other options.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on SYSFS
|
||||
+ help
|
||||
+ This driver provides a sysfs switch to set the power-state of the
|
||||
+ discrete GPU found on the Microsoft Surface Book 1.
|
||||
+
|
||||
config SURFACE_DTX
|
||||
tristate "Surface DTX (Detachment System) Driver"
|
||||
depends on SURFACE_AGGREGATOR
|
||||
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
|
||||
index fccd33e6780d..20408730f425 100644
|
||||
--- a/drivers/platform/surface/Makefile
|
||||
+++ b/drivers/platform/surface/Makefile
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_SURFACE_AGGREGATOR) += aggregator/
|
||||
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_BOOK1_DGPU_SWITCH) += surfacebook1_dgpu_switch.o
|
||||
obj-$(CONFIG_SURFACE_DTX) += surface_dtx.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
new file mode 100644
|
||||
index 000000000000..8b816ed8f35c
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
|
||||
@@ -0,0 +1,162 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+
|
||||
+#ifdef pr_fmt
|
||||
+#undef pr_fmt
|
||||
+#endif
|
||||
+#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
|
||||
+
|
||||
+
|
||||
+static const guid_t dgpu_sw_guid = GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4,
|
||||
+ 0x95, 0xed, 0xab, 0x16, 0x65, 0x49, 0x80, 0x35);
|
||||
+
|
||||
+#define DGPUSW_ACPI_PATH_DSM "\\_SB_.PCI0.LPCB.EC0_.VGBI"
|
||||
+#define DGPUSW_ACPI_PATH_HGON "\\_SB_.PCI0.RP05.HGON"
|
||||
+#define DGPUSW_ACPI_PATH_HGOF "\\_SB_.PCI0.RP05.HGOF"
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_dsmcall(void)
|
||||
+{
|
||||
+ union acpi_object *ret;
|
||||
+ acpi_handle handle;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, DGPUSW_ACPI_PATH_DSM, &handle);
|
||||
+ if (status)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ret = acpi_evaluate_dsm_typed(handle, &dgpu_sw_guid, 1, 1, NULL, ACPI_TYPE_BUFFER);
|
||||
+ if (!ret)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ACPI_FREE(ret);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgon(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGON, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGON: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-on dGPU via HGON\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgof(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGOF, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGOF: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-off dGPU via HGOF\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static ssize_t dgpu_dsmcall_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ int status, value;
|
||||
+
|
||||
+ status = kstrtoint(buf, 0, &value);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (value != 1)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ status = sb1_dgpu_sw_dsmcall();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ bool power;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtobool(buf, &power);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (power)
|
||||
+ status = sb1_dgpu_sw_hgon();
|
||||
+ else
|
||||
+ status = sb1_dgpu_sw_hgof();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR_WO(dgpu_dsmcall);
|
||||
+static DEVICE_ATTR_WO(dgpu_power);
|
||||
+
|
||||
+static struct attribute *sb1_dgpu_sw_attrs[] = {
|
||||
+ &dev_attr_dgpu_dsmcall.attr,
|
||||
+ &dev_attr_dgpu_power.attr,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+static const struct attribute_group sb1_dgpu_sw_attr_group = {
|
||||
+ .attrs = sb1_dgpu_sw_attrs,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ return sysfs_create_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ sysfs_remove_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * The dGPU power seems to be actually handled by MSHW0040. However, that is
|
||||
+ * also the power-/volume-button device with a mainline driver. So let's use
|
||||
+ * MSHW0041 instead for now, which seems to be the LTCH (latch/DTX) device.
|
||||
+ */
|
||||
+static const struct acpi_device_id sb1_dgpu_sw_match[] = {
|
||||
+ { "MSHW0041", },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sb1_dgpu_sw_match);
|
||||
+
|
||||
+static struct platform_driver sb1_dgpu_sw = {
|
||||
+ .probe = sb1_dgpu_sw_probe,
|
||||
+ .remove = sb1_dgpu_sw_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surfacebook1_dgpu_switch",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.36.1
|
||||
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue