update ACPI _DEP patch with Lan's latest version

2 files changed, 51 insertions, 43 deletions

diff --git a/RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch b/V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
index 55524f9a6..658d266c7 100644
--- a/RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
+++ b/V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
@@ -1,17 +1,19 @@
-From patchwork Mon Oct 27 15:09:44 2014
+From patchwork Thu Nov 20 14:12:12 2014
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
-Subject: [RFC, V2] ACPI: Add _DEP(Operation Region Dependencies) support to fix
+Subject: [V2] ACPI: Add _DEP(Operation Region Dependencies) support to fix
 	battery issue on the Asus T100TA
 From: "lan,Tianyu" <tianyu.lan@intel.com>
-X-Patchwork-Id: 5161621
-Message-Id: <1414422584-2638-1-git-send-email-tianyu.lan@intel.com>
+X-Patchwork-Id: 5348511
+Message-Id: <1416492733-18597-1-git-send-email-tianyu.lan@intel.com>
 To: rjw@rjwysocki.net, lenb@kernel.org, wsa@the-dreams.de,
-	robert.moore@intel.com, lv.zheng@intel.com
+	robert.moore@intel.com, lv.zheng@intel.com, shigorin@gmail.com,
+	adamw@happyassassin.net, jan.brummer@tabos.org,
+	mika.westerberg@linux.intel.com
 Cc: Lan Tianyu <tianyu.lan@intel.com>, linux-acpi@vger.kernel.org,
 	linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, devel@acpica.org
-Date: Mon, 27 Oct 2014 23:09:44 +0800
+Date: Thu, 20 Nov 2014 22:12:12 +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
@@ -28,28 +30,48 @@ acpi_device. During ACPI namespace scan, create struct acpi_dep_data for a
 valid pair of master (device pointed to by _DEP)/slave(device with _DEP), record
 master's and slave's ACPI handle in it and put it into acpi_dep_list. The dep_unmet
 count will increase by one if there is a device under its _DEP. Driver's probe() should
-return EPROBE_DEFER when find dep_unmet larger than 0. When I2C operation
+return EPROBE_DEFER when find dep_unmet is larger than 0. When I2C operation
 region handler is installed, remove all struct acpi_dep_data on the acpi_dep_list
 whose master is pointed to I2C host controller and decrease slave's dep_unmet.
 When dep_unmet decreases to 0, all _DEP conditions are met and then do acpi_bus_attach()
 for the device in order to resolve battery _STA issue on the Asus T100TA.
 
+Reference: https://bugzilla.kernel.org/show_bug.cgi?id=69011
+Tested-by: Jan-Michael Brummer <jan.brummer@tabos.org>
+Tested-by: Adam Williamson <adamw@happyassassin.net>
+Tested-by: Michael Shigorin <shigorin@gmail.com>
+Acked-by: Wolfram Sang <wsa@the-dreams.de>
 Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
+Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
 
 ---
 Change since V1:
-	Rework struct acpi_dep_data, record master and slave's ACPI handle.
-Rename dep_present with dep_unmet and make it as a count. Increase dep_unmet
-during bootup and decrease it when associated operation region is installed.
-
- drivers/acpi/scan.c     | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
+	Remove redundant blank line and some coding style fixs.
+       
+ drivers/acpi/battery.c  |  4 +++
+ drivers/acpi/scan.c     | 86 +++++++++++++++++++++++++++++++++++++++++++++++++
  drivers/i2c/i2c-core.c  |  1 +
  include/acpi/acpi_bus.h |  1 +
- include/linux/acpi.h    |  3 ++
- 4 files changed, 96 insertions(+)
+ include/linux/acpi.h    |  1 +
+ 5 files changed, 93 insertions(+)
 
+diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
+index 8ec8a89..d98ba43 100644
+--- a/drivers/acpi/battery.c
++++ b/drivers/acpi/battery.c
+@@ -1180,6 +1180,10 @@ static int acpi_battery_add(struct acpi_device *device)
+ 
+ 	if (!device)
+ 		return -EINVAL;
++
++	if (device->dep_unmet)
++		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 4da55d8..bfa9c77 100644
+index 9cb5cca..54a4102 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
 @@ -36,6 +36,8 @@ bool acpi_force_hot_remove;
@@ -74,7 +96,7 @@ index 4da55d8..bfa9c77 100644
  struct acpi_device_bus_id{
  	char bus_id[15];
  	unsigned int instance_no;
-@@ -2121,6 +2129,63 @@ static void acpi_scan_init_hotplug(struct acpi_device *adev)
+@@ -2193,6 +2201,60 @@ static void acpi_scan_init_hotplug(struct acpi_device *adev)
  	}
  }
  
@@ -97,7 +119,6 @@ index 4da55d8..bfa9c77 100644
 +	}
 +
 +	for (i = 0; i < dep_devices.count; i++) {
-+
 +		status = acpi_get_object_info(dep_devices.handles[i], &info);
 +		if (ACPI_FAILURE(status)) {
 +			dev_err(&adev->dev, "Error reading device info\n");
@@ -120,10 +141,8 @@ index 4da55d8..bfa9c77 100644
 +			continue;
 +
 +		dep = kzalloc(sizeof(struct acpi_dep_data), GFP_KERNEL);
-+		if (!dep) {
-+			dev_err(&adev->dev, "Not enough memory for _DEP list entry.\n");
++		if (!dep)
 +			return;
-+		}
 +
 +		dep->master = dep_devices.handles[i];
 +		dep->slave  = adev->handle;
@@ -138,7 +157,7 @@ index 4da55d8..bfa9c77 100644
  static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
  				      void *not_used, void **return_value)
  {
-@@ -2147,6 +2212,7 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
+@@ -2219,6 +2281,7 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
  		return AE_CTRL_DEPTH;
  
  	acpi_scan_init_hotplug(device);
@@ -146,11 +165,11 @@ index 4da55d8..bfa9c77 100644
  
   out:
  	if (!*return_value)
-@@ -2267,6 +2333,31 @@ static void acpi_bus_attach(struct acpi_device *device)
+@@ -2339,6 +2402,29 @@ static void acpi_bus_attach(struct acpi_device *device)
  		device->handler->hotplug.notify_online(device);
  }
  
-+int acpi_walk_dep_device_list(acpi_handle handle)
++void acpi_walk_dep_device_list(acpi_handle handle)
 +{
 +	struct acpi_dep_data *dep, *tmp;
 +	struct acpi_device *adev;
@@ -170,8 +189,6 @@ index 4da55d8..bfa9c77 100644
 +		}
 +	}
 +	mutex_unlock(&acpi_dep_list_lock);
-+
-+	return 0;
 +}
 +EXPORT_SYMBOL_GPL(acpi_walk_dep_device_list);
 +
@@ -179,10 +196,10 @@ index 4da55d8..bfa9c77 100644
   * 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-core.c b/drivers/i2c/i2c-core.c
-index 126e182..d5495ca 100644
+index f43b4e1..68aeb8e 100644
 --- a/drivers/i2c/i2c-core.c
 +++ b/drivers/i2c/i2c-core.c
-@@ -402,6 +402,7 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
+@@ -403,6 +403,7 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
  		return -ENOMEM;
  	}
  
@@ -191,10 +208,10 @@ index 126e182..d5495ca 100644
  }
  
 diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
-index 98cd723..269f068 100644
+index 7d1ce40..d539084 100644
 --- a/include/acpi/acpi_bus.h
 +++ b/include/acpi/acpi_bus.h
-@@ -367,6 +367,7 @@ struct acpi_device {
+@@ -372,6 +372,7 @@ struct acpi_device {
  	void *driver_data;
  	struct device dev;
  	unsigned int physical_node_count;
@@ -203,23 +220,14 @@ index 98cd723..269f068 100644
  	struct mutex physical_node_lock;
  	void (*remove)(struct acpi_device *);
 diff --git a/include/linux/acpi.h b/include/linux/acpi.h
-index 2b9c235..cec5f55 100644
+index 10f2ed9..e09f7f4 100644
 --- a/include/linux/acpi.h
 +++ b/include/linux/acpi.h
 @@ -428,6 +428,7 @@ extern bool acpi_driver_match_device(struct device *dev,
- 
+ 				     const struct device_driver *drv);
  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(acpi_handle handle);
++void acpi_walk_dep_device_list(acpi_handle handle);
  
  struct platform_device *acpi_create_platform_device(struct acpi_device *);
  #define ACPI_PTR(_ptr)	(_ptr)
-@@ -446,6 +447,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(acpi_handle handle) { }
-+
- static inline int early_acpi_boot_init(void)
- {
- 	return 0;
diff --git a/kernel.spec b/kernel.spec
index 9d139fcc1..32dbef088 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -625,7 +625,7 @@ Patch30000: kernel-arm64.patch
 # https://patchwork.kernel.org/patch/5161621/(minor rediff required)
 # https://bugzilla.kernel.org/show_bug.cgi?id=69011
 # Fixes battery status
-Patch31010: RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
+Patch31010: V2-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
 Patch31011: support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
@@ -1373,7 +1373,7 @@ ApplyPatch kernel-arm64.patch -R
 # END OF FEDORA PATCH APPLICATIONS
 
 # AWB (BAYTRAIL) PATCH APPLICATIONS
-ApplyPatch RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
+ApplyPatch V2-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 rt5640_enable_mic.patch
 ApplyPatch soc_button_use_leftmeta.patch