5.4-stable patches

added patches:
	iwlwifi-mvm-fix-non-acpi-function.patch

diff --git a/queue-5.4/iommu-vt-d-populate-debugfs-if-iommus-are-detected.patch b/queue-5.4/iommu-vt-d-populate-debugfs-if-iommus-are-detected.patch
index e525fb71cd3c11be426c0ecb7335644fea6b810d..ca6b86d63f4e863e82422e09b046422e65bf4c28 100644 (file)
--- a/queue-5.4/iommu-vt-d-populate-debugfs-if-iommus-are-detected.patch
+++ b/queue-5.4/iommu-vt-d-populate-debugfs-if-iommus-are-detected.patch
@@ -21,15 +21,13 @@ Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
 Signed-off-by: Joerg Roedel <jroedel@suse.de>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/iommu/intel-iommu-debugfs.c | 11 ++++++++++-
- drivers/iommu/intel-iommu.c         |  4 +++-
+ drivers/iommu/intel-iommu-debugfs.c |   11 ++++++++++-
+ drivers/iommu/intel-iommu.c         |    4 +++-
  2 files changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/iommu/intel-iommu-debugfs.c b/drivers/iommu/intel-iommu-debugfs.c
-index 80378c10dd77a..bdf095e9dbe03 100644
 --- a/drivers/iommu/intel-iommu-debugfs.c
 +++ b/drivers/iommu/intel-iommu-debugfs.c
-@@ -281,9 +281,16 @@ static int dmar_translation_struct_show(struct seq_file *m, void *unused)
+@@ -281,9 +281,16 @@ static int dmar_translation_struct_show(
  {
        struct dmar_drhd_unit *drhd;
        struct intel_iommu *iommu;
@@ -46,7 +44,7 @@ index 80378c10dd77a..bdf095e9dbe03 100644
                root_tbl_walk(m, iommu);
                seq_putc(m, '\n');
        }
-@@ -353,6 +360,7 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused)
+@@ -353,6 +360,7 @@ static int ir_translation_struct_show(st
        struct dmar_drhd_unit *drhd;
        struct intel_iommu *iommu;
        u64 irta;
@@ -54,7 +52,7 @@ index 80378c10dd77a..bdf095e9dbe03 100644
  
        rcu_read_lock();
        for_each_active_iommu(iommu, drhd) {
-@@ -362,7 +370,8 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused)
+@@ -362,7 +370,8 @@ static int ir_translation_struct_show(st
                seq_printf(m, "Remapped Interrupt supported on IOMMU: %s\n",
                           iommu->name);
  
@@ -64,8 +62,6 @@ index 80378c10dd77a..bdf095e9dbe03 100644
                        irta = virt_to_phys(iommu->ir_table->base);
                        seq_printf(m, " IR table address:%llx\n", irta);
                        ir_tbl_remap_entry_show(m, iommu);
-diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
-index 1c2b3e78056f4..9d47b227e5578 100644
 --- a/drivers/iommu/intel-iommu.c
 +++ b/drivers/iommu/intel-iommu.c
 @@ -4961,6 +4961,9 @@ int __init intel_iommu_init(void)
@@ -86,6 +82,3 @@ index 1c2b3e78056f4..9d47b227e5578 100644
  
        return 0;
  
--- 
-2.20.1
-

diff --git a/queue-5.4/iwlwifi-mvm-fix-non-acpi-function.patch b/queue-5.4/iwlwifi-mvm-fix-non-acpi-function.patch
new file mode 100644 (file)
index 0000000..a16789f
--- /dev/null
+++ b/queue-5.4/iwlwifi-mvm-fix-non-acpi-function.patch
@@ -0,0 +1,36 @@
+From 7937fd3227055892e169f4b34d21157e57d919e2 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Fri, 15 Nov 2019 09:28:31 +0200
+Subject: iwlwifi: mvm: fix non-ACPI function
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+commit 7937fd3227055892e169f4b34d21157e57d919e2 upstream.
+
+The code now compiles without ACPI, but there's a warning since
+iwl_mvm_get_ppag_table() isn't used, and iwl_mvm_ppag_init() must
+not unconditionally fail but return success instead.
+
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+[Drop hunk removing iwl_mvm_get_ppag_table() since it doesn't exist in
+5.4]
+Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+@@ -1181,7 +1181,7 @@ int iwl_mvm_ppag_send_cmd(struct iwl_mvm
+ 
+ static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)
+ {
+-      return -ENOENT;
++      return 0;
+ }
+ #endif /* CONFIG_ACPI */
+ 

diff --git a/queue-5.4/series b/queue-5.4/series
index b35fb1390240f4aa5d3b7aa48144c513874a6efa..be3d8ac1f1be7005d5522703724fb6537ab24962 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -72,3 +72,4 @@ sxgbe-fix-off-by-one-in-samsung-driver-strncpy-size-.patch
 net-hns3-fix-tc-qdisc-del-failed-issue.patch
 iommu-vt-d-fix-debugfs-register-reads.patch
 iommu-vt-d-populate-debugfs-if-iommus-are-detected.patch
+iwlwifi-mvm-fix-non-acpi-function.patch