[kernel: 74/85] new acpi dep patch, couple misc fixes from jan-michael brummer
Adam Williamson
adamwill at fedoraproject.org
Wed Nov 26 20:54:58 UTC 2014
commit 670c7e5d7f283da8ab23350b41d4c71f08aee3d9
Author: Adam Williamson <awilliam at redhat.com>
Date: Sat Sep 27 15:06:12 2014 -0700
new acpi dep patch, couple misc fixes from jan-michael brummer
...t-to-fix-battery-issue-on-the-Asus-T100TA.patch | 229 ++++++++++++++++++++
kernel.spec | 21 ++-
rt5640_enable_mic.patch | 13 ++
soc_button_use_leftmeta.patch | 14 ++
4 files changed, 272 insertions(+), 5 deletions(-)
---
diff --git a/RFC-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch b/RFC-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
new file mode 100644
index 0000000..cd635be
--- /dev/null
+++ b/RFC-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
@@ -0,0 +1,229 @@
+From patchwork Tue Sep 23 07:06:43 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [RFC] ACPI: Add _DEP(Operation Region Dependencies) support to fix
+ battery issue on the Asus T100TA
+From: "lan,Tianyu" <tianyu.lan at intel.com>
+X-Patchwork-Id: 4953801
+Message-Id: <1411456003-29541-1-git-send-email-tianyu.lan at intel.com>
+To: rjw at rjwysocki.net, lenb at kernel.org,
+ mika.westerberg at linux.intel.com, wsa at the-dreams.de,
+ robert.moore at intel.com, lv.zheng at intel.com
+Cc: Lan Tianyu <tianyu.lan at intel.com>, linux-acpi at vger.kernel.org,
+ linux-kernel at vger.kernel.org, linux-i2c at vger.kernel.org, devel at acpica.org
+Date: Tue, 23 Sep 2014 15:06:43 +0800
+
+ACPI 5.0 introduces _DEP to designate device objects that OSPM should
+assign a higher priority in start ordering due to future operation region
+accesses.
+
+On Asus T100TA, ACPI battery info are read from a I2C slave device via
+I2C operation region. Before I2C operation region handler is installed,
+battery _STA always returns 0. There is a _DEP method of designating
+start order under battery device node.
+
+This patch is to implement _DEP feature to fix battery issue on the Asus T100TA.
+Introducing acpi_bus_dep_device_list and adding dep_present flags in the struct
+acpi_device. During ACPI namespace scan, all devices with _DEP support will be put
+into the new list and those devices' dep_present flag will be set. Driver's probe()
+should return EPROBE_DEFER when find dep_present is set. When I2C operation
+region handler is installed, check all devices on the new list. Remove the one from
+list if _DEP condition is met and clear its dep_present flag and do acpi_bus_attch()
+for the device in order to resolve battery _STA issue on the Asus T100TA.
+
+Signed-off-by: Lan Tianyu <tianyu.lan at intel.com>
+
+---
+drivers/acpi/battery.c | 4 +++
+ drivers/acpi/scan.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/i2c/i2c-acpi.c | 1 +
+ include/acpi/acpi_bus.h | 2 ++
+ include/linux/acpi.h | 3 ++
+ 5 files changed, 94 insertions(+)
+
+diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
+index 1c162e7..c0a68ce 100644
+--- a/drivers/acpi/battery.c
++++ b/drivers/acpi/battery.c
+@@ -1194,6 +1194,10 @@ static int acpi_battery_add(struct acpi_device *device)
+
+ if (!device)
+ return -EINVAL;
++
++ if (device->dep_present)
++ return -EPROBE_DEFER;
++
+ battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
+ if (!battery)
+ return -ENOMEM;
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index 3bf7764..a26dbb3 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -36,6 +36,7 @@ bool acpi_force_hot_remove;
+
+ static const char *dummy_hid = "device";
+
++static LIST_HEAD(acpi_bus_dep_device_list);
+ static LIST_HEAD(acpi_bus_id_list);
+ static DEFINE_MUTEX(acpi_scan_lock);
+ static LIST_HEAD(acpi_scan_handlers_list);
+@@ -43,6 +44,11 @@ DEFINE_MUTEX(acpi_device_lock);
+ LIST_HEAD(acpi_wakeup_device_list);
+ static DEFINE_MUTEX(acpi_hp_context_lock);
+
++struct acpi_dep_data {
++ struct list_head node;
++ struct acpi_device *adev;
++};
++
+ struct acpi_device_bus_id{
+ char bus_id[15];
+ unsigned int instance_no;
+@@ -2048,6 +2054,32 @@ static void acpi_scan_init_hotplug(struct acpi_device *adev)
+ }
+ }
+
++static void acpi_device_dep_initialize(struct acpi_device * adev)
++{
++ struct acpi_dep_data *dep;
++ acpi_status status;
++
++ if (!acpi_has_method(adev->handle, "_DEP"))
++ return;
++
++ status = acpi_evaluate_reference(adev->handle, "_DEP", NULL,
++ &adev->dep_devices);
++ if (ACPI_FAILURE(status)) {
++ dev_err(&adev->dev, "Fail to evaluate _DEP.\n");
++ return;
++ }
++
++ dep = kzalloc(sizeof(struct acpi_dep_data), GFP_KERNEL);
++ if (!dep) {
++ dev_err(&adev->dev, "Memory allocation error.\n");
++ return;
++ }
++
++ dep->adev = adev;
++ adev->dep_present = true;
++ list_add_tail(&dep->node , &acpi_bus_dep_device_list);
++}
++
+ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ void *not_used, void **return_value)
+ {
+@@ -2074,6 +2106,7 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+ return AE_CTRL_DEPTH;
+
+ acpi_scan_init_hotplug(device);
++ acpi_device_dep_initialize(device);
+
+ out:
+ if (!*return_value)
+@@ -2191,6 +2224,57 @@ static void acpi_bus_attach(struct acpi_device *device)
+ acpi_bus_attach(child);
+ }
+
++static int acpi_device_dep_check(struct acpi_device *adev)
++{
++ struct acpi_device *dep_adev;
++ struct acpi_device_physical_node *pn;
++ int i;
++
++ for (i = 0; i < adev->dep_devices.count; i++) {
++ dep_adev = acpi_bus_get_acpi_device(
++ adev->dep_devices.handles[i]);
++
++ if (!dep_adev)
++ return -ENODEV;
++
++ /* Check acpi device driver probing */
++ if (dep_adev->dev.driver)
++ continue;
++
++ if (!dep_adev->physical_node_count)
++ return -ENODEV;
++
++ /* Check physcial device node driver probing */
++ mutex_lock(&dep_adev->physical_node_lock);
++ list_for_each_entry(pn, &dep_adev->physical_node_list, node) {
++ if (pn->dev->driver) {
++ mutex_unlock(&dep_adev->physical_node_lock);
++ continue;
++ }
++ }
++ mutex_unlock(&dep_adev->physical_node_lock);
++ return -EFAULT;
++ }
++
++ return 0;
++}
++
++int acpi_walk_dep_device_list(void)
++{
++ struct acpi_dep_data *dep, *tmp;
++
++ list_for_each_entry_safe(dep, tmp, &acpi_bus_dep_device_list, node) {
++ if (!acpi_device_dep_check(dep->adev)) {
++ dep->adev->dep_present = false;
++ acpi_bus_attach(dep->adev);
++ list_del(&dep->node);
++ kfree(dep);
++ }
++ }
++ return 0;
++}
++EXPORT_SYMBOL_GPL(acpi_walk_dep_device_list);
++
+ /**
+ * acpi_bus_scan - Add ACPI device node objects in a given namespace scope.
+ * @handle: Root of the namespace scope to scan.
+diff --git a/drivers/i2c/i2c-acpi.c b/drivers/i2c/i2c-acpi.c
+index 0dbc18c..fdc8dc8 100644
+--- a/drivers/i2c/i2c-acpi.c
++++ b/drivers/i2c/i2c-acpi.c
+@@ -339,6 +339,7 @@ int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
+ return -ENOMEM;
+ }
+
++ acpi_walk_dep_device_list();
+ return 0;
+ }
+
+diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
+index c1c9de1..c1e7055 100644
+--- a/include/acpi/acpi_bus.h
++++ b/include/acpi/acpi_bus.h
+@@ -357,7 +357,9 @@ struct acpi_device {
+ struct acpi_hotplug_context *hp;
+ struct acpi_driver *driver;
+ void *driver_data;
++ bool dep_present;
+ struct device dev;
++ struct acpi_handle_list dep_devices;
+ unsigned int physical_node_count;
+ struct list_head physical_node_list;
+ struct mutex physical_node_lock;
+diff --git a/include/linux/acpi.h b/include/linux/acpi.h
+index 807cbc4..c9a504b 100644
+--- a/include/linux/acpi.h
++++ b/include/linux/acpi.h
+@@ -431,6 +431,7 @@ static inline bool acpi_driver_match_device(struct device *dev,
+
+ int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
+ int acpi_device_modalias(struct device *, char *, int);
++int acpi_walk_dep_device_list(void);
+
+ #define ACPI_PTR(_ptr) (_ptr)
+
+@@ -449,6 +450,8 @@ static inline const char *acpi_dev_name(struct acpi_device *adev)
+
+ static inline void acpi_early_init(void) { }
+
++static inline int acpi_walk_dep_device_list(void) { }
++
+ static inline int early_acpi_boot_init(void)
+ {
+ return 0;
diff --git a/kernel.spec b/kernel.spec
index 7bd0529..f172a54 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -632,15 +632,24 @@ Patch30000: kernel-arm64.patch
# AWB PATCH DEFINITIONS (BAYTRAIL)
-# http://www.spinics.net/lists/linux-i2c/msg15201.html
-Patch31010: 0001-ACPI-temporary-dep-solution-for-battery-support.patch
+# https://patchwork.kernel.org/patch/4953801/
+# https://bugzilla.kernel.org/show_bug.cgi?id=69011
+Patch31010: RFC-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
# Add SDIO ID for the V8P wireless adapter to ath6kl driver
-Patch31200: support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
+Patch31011: support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
# UEFI boot fixes from Matt Fleming, try to fix
# https://bugzilla.kernel.org/show_bug.cgi?id=84241
-Patch21203: UEFI-big-arse-revert.patch
+Patch31012: UEFI-big-arse-revert.patch
+
+# Map 'Home' button on Venue 8 Pro to left meta key (i.e. "Start")
+# from Jan-Michael Brummer
+Patch31013: soc_button_use_leftmeta.patch
+
+# Enable mic on RT5640 (i.e. lots of Baytrail hardware, we hope)
+# from Jan-Michael Brummer
+Patch31014: rt5640_enable_mic.patch
# END OF AWB PATCH DEFINITIONS
@@ -1386,9 +1395,11 @@ ApplyPatch kernel-arm64.patch -R
# END OF FEDORA PATCH APPLICATIONS
# AWB (BAYTRAIL) PATCH APPLICATIONS
-ApplyPatch 0001-ACPI-temporary-dep-solution-for-battery-support.patch
+ApplyPatch RFC-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
ApplyPatch support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
ApplyPatch UEFI-big-arse-revert.patch
+ApplyPatch rt5640_enable_mic.patch
+ApplyPatch soc_button_use_leftmeta.patch
# END OF AWB (BAYTRAIL) PATCH APPLICATIONS
diff --git a/rt5640_enable_mic.patch b/rt5640_enable_mic.patch
new file mode 100644
index 0000000..cfb8718
--- /dev/null
+++ b/rt5640_enable_mic.patch
@@ -0,0 +1,13 @@
+diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
+index f1ec6e6..e7e480d 100644
+--- a/sound/soc/codecs/rt5640.c
++++ b/sound/soc/codecs/rt5640.c
+@@ -2195,6 +2195,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
+ regmap_update_bits(rt5640->regmap, RT5640_IN3_IN4,
+ RT5640_IN_DF2, RT5640_IN_DF2);
+
++ rt5640->pdata.dmic_en = 1;
+ if (rt5640->pdata.dmic_en) {
+ regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+ RT5640_GP2_PIN_MASK, RT5640_GP2_PIN_DMIC1_SCL);
+
\ No newline at end of file
diff --git a/soc_button_use_leftmeta.patch b/soc_button_use_leftmeta.patch
new file mode 100644
index 0000000..605a823
--- /dev/null
+++ b/soc_button_use_leftmeta.patch
@@ -0,0 +1,14 @@
+diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
+index e34dfc2..0472e3a 100644
+--- a/drivers/input/misc/soc_button_array.c
++++ b/drivers/input/misc/soc_button_array.c
+@@ -185,7 +185,7 @@ static int soc_button_pnp_probe(struct pnp_dev *pdev,
+
+ static struct soc_button_info soc_button_PNP0C40[] = {
+ { "power", 0, EV_KEY, KEY_POWER, false, true },
+- { "home", 1, EV_KEY, KEY_HOME, false, true },
++ { "home", 1, EV_KEY, KEY_LEFTMETA, false, true },
+ { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false },
+ { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false },
+ { "rotation_lock", 4, EV_SW, SW_ROTATE_LOCK, false, false },
+
\ No newline at end of file
More information about the scm-commits
mailing list