Keep v5.2 patches around for now
This commit is contained in:
parent
ffbc925692
commit
293f8214f6
4340
patches/5.2/0001-surface-acpi.patch
Normal file
4340
patches/5.2/0001-surface-acpi.patch
Normal file
File diff suppressed because it is too large
Load diff
281
patches/5.2/0002-suspend.patch
Normal file
281
patches/5.2/0002-suspend.patch
Normal file
|
@ -0,0 +1,281 @@
|
|||
From 24a5a53250dc29d9356ba4b6ad9ba0df0d189897 Mon Sep 17 00:00:00 2001
|
||||
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
||||
Date: Wed, 31 Jul 2019 08:41:30 +0900
|
||||
Subject: [PATCH 02/12] suspend
|
||||
|
||||
Note:
|
||||
NVMe part will be merged into Linux 5.3. Remove the part in this
|
||||
patch when it arrives.
|
||||
---
|
||||
drivers/nvme/host/core.c | 24 ++++++++--
|
||||
drivers/nvme/host/nvme.h | 6 +++
|
||||
drivers/nvme/host/pci.c | 95 ++++++++++++++++++++++++++++++++++++++--
|
||||
kernel/power/suspend.c | 11 +++++
|
||||
kernel/sysctl.c | 9 ++++
|
||||
5 files changed, 139 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
|
||||
index 963b4c6309b9..4b8cf243c150 100644
|
||||
--- a/drivers/nvme/host/core.c
|
||||
+++ b/drivers/nvme/host/core.c
|
||||
@@ -1114,15 +1114,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)
|
||||
{
|
||||
struct nvme_command c;
|
||||
union nvme_result res;
|
||||
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);
|
||||
|
||||
@@ -1133,6 +1133,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);
|
||||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
|
||||
index 81215ca32671..9285d5f6437b 100644
|
||||
--- a/drivers/nvme/host/nvme.h
|
||||
+++ b/drivers/nvme/host/nvme.h
|
||||
@@ -459,6 +459,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, bool poll);
|
||||
+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 09ffd21d1809..3e22d5f14e93 100644
|
||||
--- a/drivers/nvme/host/pci.c
|
||||
+++ b/drivers/nvme/host/pci.c
|
||||
@@ -18,6 +18,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>
|
||||
@@ -116,6 +117,7 @@ struct nvme_dev {
|
||||
u32 cmbsz;
|
||||
u32 cmbloc;
|
||||
struct nvme_ctrl ctrl;
|
||||
+ u32 last_ps;
|
||||
|
||||
mempool_t *iod_mempool;
|
||||
|
||||
@@ -2849,16 +2851,94 @@ 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 (pm_resume_via_firmware() || !ctrl->npss ||
|
||||
+ 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;
|
||||
+
|
||||
+ /*
|
||||
+ * 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 (pm_suspend_via_firmware() || !ctrl->npss) {
|
||||
+ 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;
|
||||
+
|
||||
+ ndev->last_ps = 0;
|
||||
+ 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);
|
||||
@@ -2866,9 +2946,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)
|
||||
@@ -2975,9 +3062,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/kernel/power/suspend.c b/kernel/power/suspend.c
|
||||
index 096211299c07..0cb0fe170977 100644
|
||||
--- a/kernel/power/suspend.c
|
||||
+++ b/kernel/power/suspend.c
|
||||
@@ -533,6 +533,8 @@ int suspend_devices_and_enter(suspend_state_t state)
|
||||
goto Resume_devices;
|
||||
}
|
||||
|
||||
+unsigned int resume_delay = 3000;
|
||||
+
|
||||
/**
|
||||
* suspend_finish - Clean up before finishing the suspend sequence.
|
||||
*
|
||||
@@ -541,6 +543,15 @@ int suspend_devices_and_enter(suspend_state_t state)
|
||||
*/
|
||||
static void suspend_finish(void)
|
||||
{
|
||||
+ if (resume_delay) {
|
||||
+ /* Give kernel threads a head start, such that usb-storage
|
||||
+ * can detect devices before syslog attempts to write log
|
||||
+ * messages from the suspend code.
|
||||
+ */
|
||||
+ thaw_kernel_threads();
|
||||
+ pr_debug("PM: Sleeping for %d milliseconds.\n", resume_delay);
|
||||
+ msleep(resume_delay);
|
||||
+ }
|
||||
suspend_thaw_processes();
|
||||
pm_notifier_call_chain(PM_POST_SUSPEND);
|
||||
pm_restore_console();
|
||||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
||||
index 1beca96fb625..4b98db9bbc88 100644
|
||||
--- a/kernel/sysctl.c
|
||||
+++ b/kernel/sysctl.c
|
||||
@@ -318,7 +318,16 @@ static int min_extfrag_threshold;
|
||||
static int max_extfrag_threshold = 1000;
|
||||
#endif
|
||||
|
||||
+extern unsigned int resume_delay;
|
||||
+
|
||||
static struct ctl_table kern_table[] = {
|
||||
+ {
|
||||
+ .procname = "resume_delay",
|
||||
+ .data = &resume_delay,
|
||||
+ .maxlen = sizeof(unsigned int),
|
||||
+ .mode = 0644,
|
||||
+ .proc_handler = proc_dointvec,
|
||||
+ },
|
||||
{
|
||||
.procname = "sched_child_runs_first",
|
||||
.data = &sysctl_sched_child_runs_first,
|
||||
--
|
||||
2.23.0
|
||||
|
267
patches/5.2/0003-buttons.patch
Normal file
267
patches/5.2/0003-buttons.patch
Normal file
|
@ -0,0 +1,267 @@
|
|||
From 8c600ca2a62de8532b1197740228a86892b09f1a Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 04:45:10 +0200
|
||||
Subject: [PATCH 03/12] buttons
|
||||
|
||||
---
|
||||
drivers/input/misc/Kconfig | 6 +-
|
||||
drivers/input/misc/soc_button_array.c | 105 +++++++++++++++++++---
|
||||
drivers/platform/x86/surfacepro3_button.c | 47 ++++++++++
|
||||
3 files changed, 143 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
|
||||
index d07c1eb15aa6..7d9ae394e597 100644
|
||||
--- a/drivers/input/misc/Kconfig
|
||||
+++ b/drivers/input/misc/Kconfig
|
||||
@@ -813,10 +813,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 5e59f8e57f8e..6f0133fe1546 100644
|
||||
--- a/drivers/input/misc/soc_button_array.c
|
||||
+++ b/drivers/input/misc/soc_button_array.c
|
||||
@@ -25,6 +25,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
|
||||
@@ -87,8 +92,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 },
|
||||
+
|
||||
{ }
|
||||
};
|
||||
|
||||
diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c
|
||||
index 47c6d000465a..ec515223f654 100644
|
||||
--- a/drivers/platform/x86/surfacepro3_button.c
|
||||
+++ b/drivers/platform/x86/surfacepro3_button.c
|
||||
@@ -20,6 +20,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
|
||||
@@ -142,6 +148,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;
|
||||
@@ -154,6 +198,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.23.0
|
||||
|
2753
patches/5.2/0004-cameras.patch
Normal file
2753
patches/5.2/0004-cameras.patch
Normal file
File diff suppressed because it is too large
Load diff
6836
patches/5.2/0005-ipts.patch
Normal file
6836
patches/5.2/0005-ipts.patch
Normal file
File diff suppressed because it is too large
Load diff
151
patches/5.2/0006-hid.patch
Normal file
151
patches/5.2/0006-hid.patch
Normal file
|
@ -0,0 +1,151 @@
|
|||
From ab93baf2c5efed5993d4ae32f58c85c482bbb3c3 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 04:45:42 +0200
|
||||
Subject: [PATCH 06/12] hid
|
||||
|
||||
---
|
||||
drivers/hid/hid-ids.h | 21 +++++++++----
|
||||
drivers/hid/hid-microsoft.c | 3 +-
|
||||
drivers/hid/hid-multitouch.c | 57 ++++++++++++++++++++++++++++++++++++
|
||||
drivers/hid/hid-quirks.c | 11 +++++++
|
||||
4 files changed, 86 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 76aa474e92c1..2ce782095c63 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -822,11 +822,22 @@
|
||||
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
|
||||
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750
|
||||
#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
|
||||
-#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
|
||||
-#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
|
||||
-#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
|
||||
-#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
|
||||
-#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
||||
+#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
|
||||
+#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1 0x07de
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e8
|
||||
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1 0x07e4
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_BOOK 0x07cd
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_BOOK_2 0x0922
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_GO 0x096f
|
||||
+#define USB_DEVICE_ID_MS_SURFACE_VHF 0xf001
|
||||
+#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
||||
#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd
|
||||
#define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb
|
||||
|
||||
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
|
||||
index 8b3a922bdad3..0290a16881e5 100644
|
||||
--- a/drivers/hid/hid-microsoft.c
|
||||
+++ b/drivers/hid/hid-microsoft.c
|
||||
@@ -438,7 +438,8 @@ static const struct hid_device_id ms_devices[] = {
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
|
||||
.driver_data = MS_ERGONOMY},
|
||||
-
|
||||
+ { HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF),
|
||||
+ .driver_data = MS_HIDINPUT},
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
|
||||
.driver_data = MS_PRESENTER },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),
|
||||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
||||
index 03448d3a29f2..09ca4b1f2797 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -1983,6 +1983,63 @@ static const struct hid_device_id mt_devices[] = {
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_LG,
|
||||
USB_DEVICE_ID_LG_MELFAS_MT) },
|
||||
|
||||
+ /* Microsoft Touch Cover */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TOUCH_COVER_2) },
|
||||
+
|
||||
+ /* Microsoft Type Cover */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_2) },
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_3) },
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1) },
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1) },
|
||||
+
|
||||
+ /* Microsoft Surface Book */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_SURFACE_BOOK) },
|
||||
+
|
||||
+ /* Microsoft Surface Book 2 */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
|
||||
+
|
||||
+ /* Microsoft Surface Go */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_SURFACE_GO) },
|
||||
+
|
||||
+ /* Microsoft Surface Laptop */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||
+ USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_SURFACE_VHF) },
|
||||
+
|
||||
+ /* Microsoft Power Cover */
|
||||
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||||
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||||
+ USB_DEVICE_ID_MS_POWER_COVER) },
|
||||
+
|
||||
/* MosArt panels */
|
||||
{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
|
||||
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
|
||||
index 4fe2c3ab76f9..c9feb3f76e78 100644
|
||||
--- a/drivers/hid/hid-quirks.c
|
||||
+++ b/drivers/hid/hid-quirks.c
|
||||
@@ -112,6 +112,17 @@ static const struct hid_device_id hid_quirks[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_GO), HID_QUIRK_NO_INIT_REPORTS },
|
||||
+ { HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF), HID_QUIRK_ALWAYS_POLL },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER), HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
|
||||
--
|
||||
2.23.0
|
||||
|
26
patches/5.2/0007-sdcard-reader.patch
Normal file
26
patches/5.2/0007-sdcard-reader.patch
Normal file
|
@ -0,0 +1,26 @@
|
|||
From c584af00246c55160bcc5fe9c1cf8827c0a8bdda Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 04:45:55 +0200
|
||||
Subject: [PATCH 07/12] sdcard-reader
|
||||
|
||||
---
|
||||
drivers/usb/core/hub.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
||||
index 2844366dc173..989fabd6ab39 100644
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -4205,7 +4205,8 @@ void usb_enable_lpm(struct usb_device *udev)
|
||||
if (!udev || !udev->parent ||
|
||||
udev->speed < USB_SPEED_SUPER ||
|
||||
!udev->lpm_capable ||
|
||||
- udev->state < USB_STATE_DEFAULT)
|
||||
+ udev->state < USB_STATE_DEFAULT ||
|
||||
+ !udev->bos || !udev->bos->ss_cap)
|
||||
return;
|
||||
|
||||
udev->lpm_disable_count--;
|
||||
--
|
||||
2.23.0
|
||||
|
270
patches/5.2/0008-wifi.patch
Normal file
270
patches/5.2/0008-wifi.patch
Normal file
|
@ -0,0 +1,270 @@
|
|||
From fb22bff82caa7decb84e373acbbb436c7c1d1eb3 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 04:46:16 +0200
|
||||
Subject: [PATCH 08/12] wifi
|
||||
|
||||
---
|
||||
drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 3 +--
|
||||
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 5 ++++-
|
||||
drivers/net/wireless/marvell/mwifiex/cmdevt.c | 10 ++++++----
|
||||
drivers/net/wireless/marvell/mwifiex/fw.h | 1 +
|
||||
drivers/net/wireless/marvell/mwifiex/main.c | 17 +++++++++++++----
|
||||
drivers/net/wireless/marvell/mwifiex/main.h | 2 ++
|
||||
drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +++++++++
|
||||
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 ++--
|
||||
.../net/wireless/marvell/mwifiex/sta_cmdresp.c | 11 ++++++++---
|
||||
drivers/net/wireless/marvell/mwifiex/usb.c | 2 ++
|
||||
scripts/leaking_addresses.pl | 0
|
||||
11 files changed, 48 insertions(+), 16 deletions(-)
|
||||
mode change 100755 => 100644 scripts/leaking_addresses.pl
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
|
||||
index 042a1d07f686..fc9041f58e9f 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
|
||||
@@ -200,8 +200,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
|
||||
|
||||
do {
|
||||
/* Check if AMSDU can accommodate this MSDU */
|
||||
- if ((skb_aggr->len + skb_src->len + LLC_SNAP_LEN) >
|
||||
- adapter->tx_buf_size)
|
||||
+ if (skb_tailroom(skb_aggr) < (skb_src->len + LLC_SNAP_LEN))
|
||||
break;
|
||||
|
||||
skb_src = skb_dequeue(&pra_list->skb_head);
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
|
||||
index e11a4bb67172..c3461a203deb 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
|
||||
@@ -437,7 +437,10 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
|
||||
mwifiex_dbg(priv->adapter, INFO,
|
||||
"info: ignore timeout value for IEEE Power Save\n");
|
||||
|
||||
- ps_mode = enabled;
|
||||
+ //ps_mode = enabled;
|
||||
+
|
||||
+ mwifiex_dbg(priv->adapter, INFO, "overriding ps_mode to false\n");
|
||||
+ ps_mode = 0;
|
||||
|
||||
return mwifiex_drv_set_power(priv, &ps_mode);
|
||||
}
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
|
||||
index 8c35441fd9b7..71872139931e 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
|
||||
@@ -1006,6 +1006,7 @@ mwifiex_cmd_timeout_func(struct timer_list *t)
|
||||
if (cmd_node->wait_q_enabled) {
|
||||
adapter->cmd_wait_q.status = -ETIMEDOUT;
|
||||
mwifiex_cancel_pending_ioctl(adapter);
|
||||
+ adapter->cmd_sent = false;
|
||||
}
|
||||
}
|
||||
if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
|
||||
@@ -1013,11 +1014,11 @@ mwifiex_cmd_timeout_func(struct timer_list *t)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (adapter->if_ops.device_dump)
|
||||
- adapter->if_ops.device_dump(adapter);
|
||||
+ //if (adapter->if_ops.device_dump)
|
||||
+ // adapter->if_ops.device_dump(adapter);
|
||||
|
||||
- if (adapter->if_ops.card_reset)
|
||||
- adapter->if_ops.card_reset(adapter);
|
||||
+ //if (adapter->if_ops.card_reset)
|
||||
+ // adapter->if_ops.card_reset(adapter);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1583,6 +1584,7 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
|
||||
adapter->key_api_minor_ver);
|
||||
break;
|
||||
case FW_API_VER_ID:
|
||||
+ case FW_KEY_API_VER_ID:
|
||||
adapter->fw_api_ver =
|
||||
api_rev->major_ver;
|
||||
mwifiex_dbg(adapter, INFO,
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
|
||||
index 1fb76d2f5d3f..fb32379da99d 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
|
||||
@@ -1052,6 +1052,7 @@ struct host_cmd_ds_802_11_ps_mode_enh {
|
||||
enum API_VER_ID {
|
||||
KEY_API_VER_ID = 1,
|
||||
FW_API_VER_ID = 2,
|
||||
+ FW_KEY_API_VER_ID = 4,
|
||||
};
|
||||
|
||||
struct hw_spec_api_rev {
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
index f6da8edab7f1..51a65f26206b 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
@@ -163,6 +163,7 @@ void mwifiex_queue_main_work(struct mwifiex_adapter *adapter)
|
||||
spin_lock_irqsave(&adapter->main_proc_lock, flags);
|
||||
if (adapter->mwifiex_processing) {
|
||||
adapter->more_task_flag = true;
|
||||
+ adapter->more_rx_task_flag = true;
|
||||
spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
|
||||
} else {
|
||||
spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
|
||||
@@ -171,18 +172,20 @@ void mwifiex_queue_main_work(struct mwifiex_adapter *adapter)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mwifiex_queue_main_work);
|
||||
|
||||
-static void mwifiex_queue_rx_work(struct mwifiex_adapter *adapter)
|
||||
+void mwifiex_queue_rx_work(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&adapter->rx_proc_lock, flags);
|
||||
if (adapter->rx_processing) {
|
||||
+ adapter->more_rx_task_flag = true;
|
||||
spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
|
||||
} else {
|
||||
spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
|
||||
queue_work(adapter->rx_workqueue, &adapter->rx_work);
|
||||
}
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(mwifiex_queue_rx_work);
|
||||
|
||||
static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
|
||||
{
|
||||
@@ -192,6 +195,7 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
|
||||
|
||||
spin_lock_irqsave(&adapter->rx_proc_lock, flags);
|
||||
if (adapter->rx_processing || adapter->rx_locked) {
|
||||
+ adapter->more_rx_task_flag = true;
|
||||
spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
|
||||
goto exit_rx_proc;
|
||||
} else {
|
||||
@@ -199,6 +203,7 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
|
||||
spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
|
||||
}
|
||||
|
||||
+rx_process_start:
|
||||
/* Check for Rx data */
|
||||
while ((skb = skb_dequeue(&adapter->rx_data_q))) {
|
||||
atomic_dec(&adapter->rx_pending);
|
||||
@@ -220,6 +225,11 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
|
||||
}
|
||||
}
|
||||
spin_lock_irqsave(&adapter->rx_proc_lock, flags);
|
||||
+ if (adapter->more_rx_task_flag) {
|
||||
+ adapter->more_rx_task_flag = false;
|
||||
+ spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
|
||||
+ goto rx_process_start;
|
||||
+ }
|
||||
adapter->rx_processing = false;
|
||||
spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);
|
||||
|
||||
@@ -283,11 +293,10 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
|
||||
mwifiex_process_hs_config(adapter);
|
||||
if (adapter->if_ops.process_int_status)
|
||||
adapter->if_ops.process_int_status(adapter);
|
||||
+ if (adapter->rx_work_enabled && adapter->data_received)
|
||||
+ mwifiex_queue_rx_work(adapter);
|
||||
}
|
||||
|
||||
- if (adapter->rx_work_enabled && adapter->data_received)
|
||||
- mwifiex_queue_rx_work(adapter);
|
||||
-
|
||||
/* Need to wake up the card ? */
|
||||
if ((adapter->ps_state == PS_STATE_SLEEP) &&
|
||||
(adapter->pm_wakeup_card_req &&
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
|
||||
index e39bb5c42c9a..8ec3275dad6d 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/main.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
|
||||
@@ -909,6 +909,7 @@ struct mwifiex_adapter {
|
||||
spinlock_t main_proc_lock;
|
||||
u32 mwifiex_processing;
|
||||
u8 more_task_flag;
|
||||
+ u8 more_rx_task_flag;
|
||||
u16 tx_buf_size;
|
||||
u16 curr_tx_buf_size;
|
||||
/* sdio single port rx aggregation capability */
|
||||
@@ -1695,6 +1696,7 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter);
|
||||
void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags);
|
||||
void mwifiex_fw_dump_event(struct mwifiex_private *priv);
|
||||
void mwifiex_queue_main_work(struct mwifiex_adapter *adapter);
|
||||
+void mwifiex_queue_rx_work(struct mwifiex_adapter *adapter);
|
||||
int mwifiex_get_wakeup_reason(struct mwifiex_private *priv, u16 action,
|
||||
int cmd_type,
|
||||
struct mwifiex_ds_wakeup_reason *wakeup_reason);
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index 3fe81b2a929a..6e734a83e6bf 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -1743,6 +1743,15 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
|
||||
}
|
||||
|
||||
rx_len = get_unaligned_le16(skb->data);
|
||||
+
|
||||
+ if (rx_len == 0) {
|
||||
+ mwifiex_dbg(adapter, ERROR,
|
||||
+ "0 byte cmdrsp\n");
|
||||
+ mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
|
||||
+ PCI_DMA_FROMDEVICE);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
skb_put(skb, MWIFIEX_UPLD_SIZE - skb->len);
|
||||
skb_trim(skb, rx_len);
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||
index 4ed10cf82f9a..485360e8534b 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
|
||||
@@ -30,8 +30,8 @@ static bool drcs;
|
||||
module_param(drcs, bool, 0644);
|
||||
MODULE_PARM_DESC(drcs, "multi-channel operation:1, single-channel operation:0");
|
||||
|
||||
-static bool disable_auto_ds;
|
||||
-module_param(disable_auto_ds, bool, 0);
|
||||
+static bool disable_auto_ds = 1;
|
||||
+module_param(disable_auto_ds, bool, 0644);
|
||||
MODULE_PARM_DESC(disable_auto_ds,
|
||||
"deepsleep enabled=0(default), deepsleep disabled=1");
|
||||
/*
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
||||
index 24b33e20e7a9..51d0f34625e1 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
||||
@@ -48,9 +48,14 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv,
|
||||
struct host_cmd_ds_802_11_ps_mode_enh *pm;
|
||||
unsigned long flags;
|
||||
|
||||
- mwifiex_dbg(adapter, ERROR,
|
||||
- "CMD_RESP: cmd %#x error, result=%#x\n",
|
||||
- resp->command, resp->result);
|
||||
+ if (resp->command == 271 && resp->result == 2){
|
||||
+ // ignore this command as the firmware does not support it
|
||||
+ }
|
||||
+ else {
|
||||
+ mwifiex_dbg(adapter, ERROR,
|
||||
+ "CMD_RESP: cmd %#x error, result=%#x\n",
|
||||
+ resp->command, resp->result);
|
||||
+ }
|
||||
|
||||
if (adapter->curr_cmd->wait_q_enabled)
|
||||
adapter->cmd_wait_q.status = -1;
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
|
||||
index d445acc4786b..ae8e60cc17cb 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
|
||||
@@ -144,6 +144,8 @@ static int mwifiex_usb_recv(struct mwifiex_adapter *adapter,
|
||||
skb_queue_tail(&adapter->rx_data_q, skb);
|
||||
adapter->data_received = true;
|
||||
atomic_inc(&adapter->rx_pending);
|
||||
+ if (adapter->rx_work_enabled)
|
||||
+ mwifiex_queue_rx_work(adapter);
|
||||
break;
|
||||
default:
|
||||
mwifiex_dbg(adapter, ERROR,
|
||||
diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
--
|
||||
2.23.0
|
||||
|
655
patches/5.2/0009-surface3-power.patch
Normal file
655
patches/5.2/0009-surface3-power.patch
Normal file
|
@ -0,0 +1,655 @@
|
|||
From f16718cfdc5daec9edca5b69324346e777ccc19a Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 04:46:48 +0200
|
||||
Subject: [PATCH 09/12] 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 c00cb830914a..04421fe566ba 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -1301,6 +1301,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 8b12c19dc165..58b07217c3cf 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -85,6 +85,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.23.0
|
||||
|
19755
patches/5.2/0010-mwlwifi.patch
Normal file
19755
patches/5.2/0010-mwlwifi.patch
Normal file
File diff suppressed because it is too large
Load diff
24
patches/5.2/0011-surface-lte.patch
Normal file
24
patches/5.2/0011-surface-lte.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
From ea492a4ac56c5067471996b591f4fe571ba6217d Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 04:47:13 +0200
|
||||
Subject: [PATCH 11/12] surface-lte
|
||||
|
||||
---
|
||||
drivers/usb/serial/qcserial.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
|
||||
index 613f91add03d..e1428222dd73 100644
|
||||
--- a/drivers/usb/serial/qcserial.c
|
||||
+++ b/drivers/usb/serial/qcserial.c
|
||||
@@ -177,6 +177,7 @@ static const struct usb_device_id id_table[] = {
|
||||
{DEVICE_SWI(0x413c, 0x81d0)}, /* Dell Wireless 5819 */
|
||||
{DEVICE_SWI(0x413c, 0x81d1)}, /* Dell Wireless 5818 */
|
||||
{DEVICE_SWI(0x413c, 0x81d2)}, /* Dell Wireless 5818 */
|
||||
+ {DEVICE_SWI(0x045e, 0x096e)}, /* Microsoft Surface Go LTE */
|
||||
|
||||
/* Huawei devices */
|
||||
{DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */
|
||||
--
|
||||
2.23.0
|
||||
|
359
patches/5.2/0012-surfacebook2-dgpu.patch
Normal file
359
patches/5.2/0012-surfacebook2-dgpu.patch
Normal file
|
@ -0,0 +1,359 @@
|
|||
From c9afd00a82ac9123a4c064f35407e207a28b329a Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 04:47:27 +0200
|
||||
Subject: [PATCH 12/12] surfacebook2-dgpu
|
||||
|
||||
---
|
||||
drivers/platform/x86/Kconfig | 9 +
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/surfacebook2_dgpu_hps.c | 306 +++++++++++++++++++
|
||||
3 files changed, 316 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/surfacebook2_dgpu_hps.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index 04421fe566ba..cb0a53da4de1 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -484,6 +484,15 @@ config SURFACE3_WMI
|
||||
To compile this driver as a module, choose M here: the module will
|
||||
be called surface3-wmi.
|
||||
|
||||
+config SURFACE_BOOK2_DGPU_HPS
|
||||
+ tristate "Surface Book 2 dGPU Hot-Plug System Driver"
|
||||
+ depends on ACPI
|
||||
+ ---help---
|
||||
+ This is an experimetnal driver to control the power-state of the
|
||||
+ Surface Book 2 dGPU.
|
||||
+
|
||||
+ If you have a Surface Book 2, say Y or M here.
|
||||
+
|
||||
config THINKPAD_ACPI
|
||||
tristate "ThinkPad ACPI Laptop Extras"
|
||||
depends on ACPI
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index 58b07217c3cf..d18d3dcc5749 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -49,6 +49,7 @@ obj-$(CONFIG_ACPI_WMI) += wmi.o
|
||||
obj-$(CONFIG_MSI_WMI) += msi-wmi.o
|
||||
obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o
|
||||
obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK2_DGPU_HPS) += surfacebook2_dgpu_hps.o
|
||||
obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o
|
||||
obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o
|
||||
obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
|
||||
diff --git a/drivers/platform/x86/surfacebook2_dgpu_hps.c b/drivers/platform/x86/surfacebook2_dgpu_hps.c
|
||||
new file mode 100644
|
||||
index 000000000000..7639fb0029d8
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/surfacebook2_dgpu_hps.c
|
||||
@@ -0,0 +1,306 @@
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/gpio.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/moduleparam.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/sysfs.h>
|
||||
+
|
||||
+#include <linux/uaccess.h>
|
||||
+
|
||||
+
|
||||
+#define SB2_SHPS_DSM_REVISION 1
|
||||
+#define SB2_SHPS_DSM_GPU_STATE 0x05
|
||||
+
|
||||
+static const guid_t SB2_SHPS_DSM_UUID =
|
||||
+ GUID_INIT(0x5515a847, 0xed55, 0x4b27, 0x83, 0x52, 0xcd,
|
||||
+ 0x32, 0x0e, 0x10, 0x36, 0x0a);
|
||||
+
|
||||
+#define SB2_PARAM_PERM (S_IRUGO | S_IWUSR)
|
||||
+
|
||||
+
|
||||
+static const struct acpi_gpio_params gpio_base_presence_int = { 0, 0, false };
|
||||
+static const struct acpi_gpio_params gpio_base_presence = { 1, 0, false };
|
||||
+static const struct acpi_gpio_params gpio_dgpu_power_int = { 2, 0, false };
|
||||
+static const struct acpi_gpio_params gpio_dgpu_power = { 3, 0, false };
|
||||
+static const struct acpi_gpio_params gpio_dgpu_presence_int = { 4, 0, false };
|
||||
+static const struct acpi_gpio_params gpio_dgpu_presence = { 5, 0, false };
|
||||
+
|
||||
+static const struct acpi_gpio_mapping sb2_mshw0153_acpi_gpios[] = {
|
||||
+ { "base_presence-int-gpio", &gpio_base_presence_int, 1 },
|
||||
+ { "base_presence-gpio", &gpio_base_presence, 1 },
|
||||
+ { "dgpu_power-int-gpio", &gpio_dgpu_power_int, 1 },
|
||||
+ { "dgpu_power-gpio", &gpio_dgpu_power, 1 },
|
||||
+ { "dgpu_presence-int-gpio", &gpio_dgpu_presence_int, 1 },
|
||||
+ { "dgpu_presence-gpio", &gpio_dgpu_presence, 1 },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+
|
||||
+enum sb2_dgpu_power {
|
||||
+ SB2_DGPU_POWER_OFF = 0,
|
||||
+ SB2_DGPU_POWER_ON = 1,
|
||||
+
|
||||
+ __SB2_DGPU_POWER__START = 0,
|
||||
+ __SB2_DGPU_POWER__END = 1,
|
||||
+};
|
||||
+
|
||||
+enum sb2_param_dgpu_power {
|
||||
+ SB2_PARAM_DGPU_POWER_OFF = SB2_DGPU_POWER_OFF,
|
||||
+ SB2_PARAM_DGPU_POWER_ON = SB2_DGPU_POWER_ON,
|
||||
+ SB2_PARAM_DGPU_POWER_AS_IS = 2,
|
||||
+
|
||||
+ __SB2_PARAM_DGPU_POWER__START = 0,
|
||||
+ __SB2_PARAM_DGPU_POWER__END = 2,
|
||||
+};
|
||||
+
|
||||
+static const char* sb2_dgpu_power_str(enum sb2_dgpu_power power) {
|
||||
+ if (power == SB2_DGPU_POWER_OFF) {
|
||||
+ return "off";
|
||||
+ } else if (power == SB2_DGPU_POWER_ON) {
|
||||
+ return "on";
|
||||
+ } else {
|
||||
+ return "<invalid>";
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+struct sb2_shps_driver_data {
|
||||
+ struct mutex dgpu_power_lock;
|
||||
+ enum sb2_dgpu_power dgpu_power;
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int __sb2_shps_dgpu_set_power(struct platform_device *pdev, enum sb2_dgpu_power power)
|
||||
+{
|
||||
+ struct sb2_shps_driver_data *drvdata = platform_get_drvdata(pdev);
|
||||
+ acpi_handle handle = ACPI_HANDLE(&pdev->dev);
|
||||
+ union acpi_object *result;
|
||||
+ union acpi_object param;
|
||||
+
|
||||
+ param.type = ACPI_TYPE_INTEGER;
|
||||
+ param.integer.value = power == SB2_DGPU_POWER_ON;
|
||||
+
|
||||
+ result = acpi_evaluate_dsm_typed(handle, &SB2_SHPS_DSM_UUID, SB2_SHPS_DSM_REVISION,
|
||||
+ SB2_SHPS_DSM_GPU_STATE, ¶m, ACPI_TYPE_BUFFER);
|
||||
+
|
||||
+ if (IS_ERR_OR_NULL(result)) {
|
||||
+ return result ? PTR_ERR(result) : -EFAULT;
|
||||
+ }
|
||||
+
|
||||
+ if (result->buffer.length != 1 || result->buffer.pointer[0] != 0) {
|
||||
+ return -EIO;
|
||||
+ }
|
||||
+
|
||||
+ drvdata->dgpu_power = power;
|
||||
+
|
||||
+ printk(KERN_INFO "sb2_shps: dGPU power state set to \'%s\'\n", sb2_dgpu_power_str(power));
|
||||
+
|
||||
+ ACPI_FREE(result);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb2_shps_dgpu_set_power(struct platform_device *pdev, enum sb2_dgpu_power power)
|
||||
+{
|
||||
+ struct sb2_shps_driver_data *drvdata = platform_get_drvdata(pdev);
|
||||
+ int status = 0;
|
||||
+
|
||||
+ if (power < __SB2_DGPU_POWER__START || power > __SB2_DGPU_POWER__END) {
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ mutex_lock(&drvdata->dgpu_power_lock);
|
||||
+ if (power != drvdata->dgpu_power) {
|
||||
+ status = __sb2_shps_dgpu_set_power(pdev, power);
|
||||
+ }
|
||||
+ mutex_unlock(&drvdata->dgpu_power_lock);
|
||||
+
|
||||
+ return status;
|
||||
+}
|
||||
+
|
||||
+static int sb2_shps_dgpu_force_power(struct platform_device *pdev, enum sb2_dgpu_power power)
|
||||
+{
|
||||
+ struct sb2_shps_driver_data *drvdata = platform_get_drvdata(pdev);
|
||||
+ int status;
|
||||
+
|
||||
+ if (power < __SB2_DGPU_POWER__START || power > __SB2_DGPU_POWER__END) {
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ mutex_lock(&drvdata->dgpu_power_lock);
|
||||
+ status = __sb2_shps_dgpu_set_power(pdev, power);
|
||||
+ mutex_unlock(&drvdata->dgpu_power_lock);
|
||||
+
|
||||
+ return status;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static int param_dgpu_power_set(const char *val, const struct kernel_param *kp)
|
||||
+{
|
||||
+ int power = SB2_PARAM_DGPU_POWER_OFF;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtoint(val, 0, &power);
|
||||
+ if (status) {
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
+ if (power < __SB2_PARAM_DGPU_POWER__START || power > __SB2_PARAM_DGPU_POWER__END) {
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ return param_set_int(val, kp);
|
||||
+}
|
||||
+
|
||||
+static const struct kernel_param_ops param_dgpu_power_ops = {
|
||||
+ .set = param_dgpu_power_set,
|
||||
+ .get = param_get_int,
|
||||
+};
|
||||
+
|
||||
+static int param_dgpu_power_init = SB2_PARAM_DGPU_POWER_OFF;
|
||||
+static int param_dgpu_power_exit = SB2_PARAM_DGPU_POWER_OFF;
|
||||
+
|
||||
+module_param_cb(dgpu_power_init, ¶m_dgpu_power_ops, ¶m_dgpu_power_init, SB2_PARAM_PERM);
|
||||
+module_param_cb(dgpu_power_exit, ¶m_dgpu_power_ops, ¶m_dgpu_power_exit, SB2_PARAM_PERM);
|
||||
+
|
||||
+MODULE_PARM_DESC(dgpu_power_init, "dGPU power state to be set on init (0: off / 1: on / 2: as-is)");
|
||||
+MODULE_PARM_DESC(dgpu_power_exit, "dGPU power state to be set on exit (0: off / 1: on / 2: as-is)");
|
||||
+
|
||||
+
|
||||
+static ssize_t dgpu_power_show(struct device *dev, struct device_attribute *attr, char *data)
|
||||
+{
|
||||
+ struct platform_device *pdev = container_of(dev, struct platform_device, dev);
|
||||
+ struct sb2_shps_driver_data *drvdata = platform_get_drvdata(pdev);
|
||||
+
|
||||
+ return sprintf(data, "%s\n", sb2_dgpu_power_str(drvdata->dgpu_power));
|
||||
+}
|
||||
+
|
||||
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *data, size_t count)
|
||||
+{
|
||||
+ struct platform_device *pdev = container_of(dev, struct platform_device, dev);
|
||||
+ bool power = false;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtobool(data, &power);
|
||||
+ if (status) {
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
+ if (power) {
|
||||
+ status = sb2_shps_dgpu_set_power(pdev, SB2_DGPU_POWER_ON);
|
||||
+ } else {
|
||||
+ status = sb2_shps_dgpu_set_power(pdev, SB2_DGPU_POWER_OFF);
|
||||
+ }
|
||||
+
|
||||
+ return status < 0 ? status : count;
|
||||
+}
|
||||
+
|
||||
+const static DEVICE_ATTR_RW(dgpu_power);
|
||||
+
|
||||
+
|
||||
+#ifdef CONFIG_PM
|
||||
+
|
||||
+static int sb2_shps_resume(struct device *dev)
|
||||
+{
|
||||
+ struct platform_device *pdev = container_of(dev, struct platform_device, dev);
|
||||
+ struct sb2_shps_driver_data *drvdata = platform_get_drvdata(pdev);
|
||||
+
|
||||
+ return sb2_shps_dgpu_force_power(pdev, drvdata->dgpu_power);
|
||||
+}
|
||||
+
|
||||
+static SIMPLE_DEV_PM_OPS(sb2_shps_pm_ops, NULL, sb2_shps_resume);
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+static int sb2_shps_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct sb2_shps_driver_data *drvdata;
|
||||
+ struct acpi_device *shps_dev = ACPI_COMPANION(&pdev->dev);
|
||||
+ int status = 0;
|
||||
+
|
||||
+ if (gpiod_count(&pdev->dev, NULL) < 0) {
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ status = acpi_dev_add_driver_gpios(shps_dev, sb2_mshw0153_acpi_gpios);
|
||||
+ if (status) {
|
||||
+ return status;
|
||||
+ }
|
||||
+
|
||||
+ drvdata = kzalloc(sizeof(struct sb2_shps_driver_data), GFP_KERNEL);
|
||||
+ if (!drvdata) {
|
||||
+ status = -ENOMEM;
|
||||
+ goto err_alloc_drvdata;
|
||||
+ }
|
||||
+
|
||||
+ mutex_init(&drvdata->dgpu_power_lock);
|
||||
+ drvdata->dgpu_power = SB2_DGPU_POWER_OFF;
|
||||
+ platform_set_drvdata(pdev, drvdata);
|
||||
+
|
||||
+ if (param_dgpu_power_init != SB2_PARAM_DGPU_POWER_AS_IS) {
|
||||
+ status = sb2_shps_dgpu_force_power(pdev, param_dgpu_power_init);
|
||||
+ if (status) {
|
||||
+ goto err_set_power;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ status = sysfs_create_file(&pdev->dev.kobj, &dev_attr_dgpu_power.attr);
|
||||
+ if (status) {
|
||||
+ goto err_sysfs;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+err_sysfs:
|
||||
+ sb2_shps_dgpu_force_power(pdev, SB2_DGPU_POWER_OFF);
|
||||
+err_set_power:
|
||||
+ platform_set_drvdata(pdev, NULL);
|
||||
+ kfree(drvdata);
|
||||
+err_alloc_drvdata:
|
||||
+ acpi_dev_remove_driver_gpios(shps_dev);
|
||||
+ return status;
|
||||
+}
|
||||
+
|
||||
+static int sb2_shps_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct sb2_shps_driver_data *drvdata = platform_get_drvdata(pdev);
|
||||
+ struct acpi_device *shps_dev = ACPI_COMPANION(&pdev->dev);
|
||||
+
|
||||
+ sysfs_remove_file(&pdev->dev.kobj, &dev_attr_dgpu_power.attr);
|
||||
+
|
||||
+ if (param_dgpu_power_exit != SB2_PARAM_DGPU_POWER_AS_IS) {
|
||||
+ sb2_shps_dgpu_set_power(pdev, param_dgpu_power_exit);
|
||||
+ }
|
||||
+ acpi_dev_remove_driver_gpios(shps_dev);
|
||||
+
|
||||
+ platform_set_drvdata(pdev, NULL);
|
||||
+ kfree(drvdata);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static const struct acpi_device_id sb2_shps_acpi_match[] = {
|
||||
+ { "MSHW0153", 0 },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sb2_shps_acpi_match);
|
||||
+
|
||||
+static struct platform_driver sb2_shps_driver = {
|
||||
+ .probe = sb2_shps_probe,
|
||||
+ .remove = sb2_shps_remove,
|
||||
+ .driver = {
|
||||
+ .name = "sb2_shps",
|
||||
+ .acpi_match_table = ACPI_PTR(sb2_shps_acpi_match),
|
||||
+#ifdef CONFIG_PM
|
||||
+ .pm = &sb2_shps_pm_ops,
|
||||
+#endif
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb2_shps_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Surface Book 2 Hot-Plug System Driver");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
--
|
||||
2.23.0
|
||||
|
Loading…
Reference in a new issue