From 9460417c1ee18b1f060df6cc04ea428f77d2da36 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 30 Mar 2020 10:56:29 +0200 Subject: [PATCH] 5.4-stable patches added patches: iwlwifi-mvm-fix-non-acpi-function.patch --- ...ulate-debugfs-if-iommus-are-detected.patch | 17 +++------ .../iwlwifi-mvm-fix-non-acpi-function.patch | 36 +++++++++++++++++++ queue-5.4/series | 1 + 3 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 queue-5.4/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 e525fb71cd3..ca6b86d63f4 100644 --- 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 Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- - 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 index 00000000000..a16789f2f0b --- /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 +Date: Fri, 15 Nov 2019 09:28:31 +0200 +Subject: iwlwifi: mvm: fix non-ACPI function + +From: Johannes Berg + +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 +Signed-off-by: Luca Coelho +Signed-off-by: Kalle Valo +[Drop hunk removing iwl_mvm_get_ppag_table() since it doesn't exist in +5.4] +Signed-off-by: Jason Andryuk +Signed-off-by: Greg Kroah-Hartman + +--- + 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 b35fb139024..be3d8ac1f1b 100644 --- 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 -- 2.47.3