acpi: refresh and doc rename

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 31 insertions, 32 deletions

diff --git a/queue/ACPI-sysfs-Provide-quirk-mechanism-to-prevent-GPE-fl.patch b/queue/ACPI-sysfs-Provide-quirk-mechanism-to-prevent-GPE-fl.patch
index 12c1541..7d2575f 100644
--- a/queue/ACPI-sysfs-Provide-quirk-mechanism-to-prevent-GPE-fl.patch
+++ b/queue/ACPI-sysfs-Provide-quirk-mechanism-to-prevent-GPE-fl.patch
@@ -1,4 +1,4 @@
-From 9c4aa1eecb48cfac18ed5e3aca9d9ae58fbafc11 Mon Sep 17 00:00:00 2001
+From b4caa38402577a7545c74f0166ec2fde942af556 Mon Sep 17 00:00:00 2001
 From: Lv Zheng <lv.zheng@intel.com>
 Date: Fri, 16 Dec 2016 12:07:57 +0800
 Subject: [PATCH] ACPI / sysfs: Provide quirk mechanism to prevent GPE flooding
@@ -30,12 +30,13 @@ Link: https://bugzilla.kernel.org/show_bug.cgi?id=117481
 Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/887793
 Signed-off-by: Lv Zheng <lv.zheng@intel.com>
 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 21e2d8863705..d1eec5ed1134 100644
---- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -106,6 +106,16 @@
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index f1d70571e716..dfc6beb3ba75 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -274,6 +274,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			use by PCI
  			Format: <irq>,<irq>...
  
@@ -53,7 +54,7 @@ index 21e2d8863705..d1eec5ed1134 100644
  			Disable auto-serialization of AML methods
  			AML control methods that contain the opcodes to create
 diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
-index 1b41a2739dac..0c452265c111 100644
+index 940218ff0193..63052a88ed45 100644
 --- a/drivers/acpi/internal.h
 +++ b/drivers/acpi/internal.h
 @@ -37,6 +37,7 @@ void acpi_amba_init(void);
@@ -65,22 +66,22 @@ index 1b41a2739dac..0c452265c111 100644
  void acpi_memory_hotplug_init(void);
  #ifdef	CONFIG_ACPI_HOTPLUG_IOAPIC
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 45dec874ea55..192691880d55 100644
+index e878fc799af7..adfe48a58d4a 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -2074,6 +2074,7 @@ int __init acpi_scan_init(void)
+@@ -2043,6 +2043,7 @@ int __init acpi_scan_init(void)
  		}
  	}
  
 +	acpi_gpe_apply_masked_gpes();
  	acpi_update_all_gpes();
- 	acpi_ec_ecdt_start();
  
+ 	acpi_scan_initialized = true;
 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
-index 703c26e7022c..cf05ae973381 100644
+index 358165e9f5b8..45bdfd7883b9 100644
 --- a/drivers/acpi/sysfs.c
 +++ b/drivers/acpi/sysfs.c
-@@ -708,6 +708,62 @@ end:
+@@ -685,6 +685,62 @@ end:
  	return result ? result : size;
  }
  
diff --git a/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch b/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch
index 106d520..3f5b4aa 100644
--- a/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch
+++ b/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch
@@ -1,4 +1,4 @@
-From 56d4a1866d748732fd8d690b2c2156bbc9c9eb02 Mon Sep 17 00:00:00 2001
+From 4a54eccc93c7394af236cb82dd4eeda1214cd7a3 Mon Sep 17 00:00:00 2001
 From: Subhash Jadavani <subhashj@codeaurora.org>
 Date: Mon, 5 Dec 2016 19:25:32 -0800
 Subject: [PATCH] scsi: ufs: add quirk to increase host PA_SaveConfigTime
@@ -16,9 +16,10 @@ PA_SaveConfigTime parameter.
 Reviewed-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
 Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
-index ff614613bf89..2943a68b6d69 100644
+index 3aedf73f1131..462bf42dd19c 100644
 --- a/drivers/scsi/ufs/ufs-qcom.c
 +++ b/drivers/scsi/ufs/ufs-qcom.c
 @@ -23,6 +23,7 @@
@@ -64,7 +65,7 @@ index ff614613bf89..2943a68b6d69 100644
  static u32 ufs_qcom_get_ufs_hci_version(struct ufs_hba *hba)
  {
  	struct ufs_qcom_host *host = ufshcd_get_variant(hba);
-@@ -1618,6 +1647,7 @@ static struct ufs_hba_variant_ops ufs_hba_qcom_vops = {
+@@ -1616,6 +1645,7 @@ static struct ufs_hba_variant_ops ufs_hba_qcom_vops = {
  	.hce_enable_notify      = ufs_qcom_hce_enable_notify,
  	.link_startup_notify    = ufs_qcom_link_startup_notify,
  	.pwr_change_notify	= ufs_qcom_pwr_change_notify,
@@ -128,10 +129,10 @@ index f7983058f3f7..08b799d4efcc 100644
 -};
  #endif /* UFS_QUIRKS_H_ */
 diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
-index 7af70aa0b750..af7e0285f004 100644
+index b2440abf4a23..bf4498f7900e 100644
 --- a/drivers/scsi/ufs/ufshcd.c
 +++ b/drivers/scsi/ufs/ufshcd.c
-@@ -185,6 +185,30 @@ ufs_get_pm_lvl_to_link_pwr_state(enum ufs_pm_level lvl)
+@@ -188,6 +188,30 @@ ufs_get_pm_lvl_to_link_pwr_state(enum ufs_pm_level lvl)
  	return ufs_pm_lvl_states[lvl].link_state;
  }
  
@@ -162,7 +163,7 @@ index 7af70aa0b750..af7e0285f004 100644
  static void ufshcd_tmc_handler(struct ufs_hba *hba);
  static void ufshcd_async_scan(void *data, async_cookie_t cookie);
  static int ufshcd_reset_and_restore(struct ufs_hba *hba);
-@@ -5213,6 +5237,8 @@ static void ufshcd_tune_unipro_params(struct ufs_hba *hba)
+@@ -5059,6 +5083,8 @@ static void ufshcd_tune_unipro_params(struct ufs_hba *hba)
  
  	if (hba->dev_quirks & UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE)
  		ufshcd_quirk_tune_host_pa_tactivate(hba);
@@ -172,30 +173,27 @@ index 7af70aa0b750..af7e0285f004 100644
  
  /**
 diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
-index 7d9ff22acfea..08cd26ed2382 100644
+index 5b65441110fa..04509827fe64 100644
 --- a/drivers/scsi/ufs/ufshcd.h
 +++ b/drivers/scsi/ufs/ufshcd.h
-@@ -266,7 +266,7 @@ struct ufs_pwr_mode_info {
-  * @setup_task_mgmt: called before any task management request is issued
-  *                  to set some things
-  * @hibern8_notify: called around hibern8 enter/exit
-- *		    to configure some things
+@@ -261,6 +261,7 @@ struct ufs_pwr_mode_info {
+  * @pwr_change_notify: called before and after a power mode change
+  *			is carried out to allow vendor spesific capabilities
+  *			to be set.
 + * @apply_dev_quirks: called to apply device specific quirks
   * @suspend: called during host controller PM callback
   * @resume: called during host controller PM callback
   * @dbg_register_dump: used to dump controller debug information
-@@ -293,7 +293,8 @@ struct ufs_hba_variant_ops {
- 	void	(*setup_xfer_req)(struct ufs_hba *, int, bool);
- 	void	(*setup_task_mgmt)(struct ufs_hba *, int, u8);
- 	void    (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,
--				       enum ufs_notify_change_status);
-+					enum ufs_notify_change_status);
+@@ -283,6 +284,7 @@ struct ufs_hba_variant_ops {
+ 					enum ufs_notify_change_status status,
+ 					struct ufs_pa_layer_attr *,
+ 					struct ufs_pa_layer_attr *);
 +	int	(*apply_dev_quirks)(struct ufs_hba *);
  	int     (*suspend)(struct ufs_hba *, enum ufs_pm_op);
  	int     (*resume)(struct ufs_hba *, enum ufs_pm_op);
  	void	(*dbg_register_dump)(struct ufs_hba *hba);
-@@ -839,6 +840,13 @@ static inline void ufshcd_vops_hibern8_notify(struct ufs_hba *hba,
- 		return hba->vops->hibern8_notify(hba, cmd, status);
+@@ -805,6 +807,13 @@ static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba,
+ 	return -ENOTSUPP;
  }
  
 +static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba)