Skip to contentSkip to conversation

Stable request: iwlwifi: mvm: fix non-ACPI function

PATCH Jason Andryuk 2 participants 3 messages Mar 29, 2020 – Mar 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

From: Johannes Berg <[email protected]>

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.

[Drop hunk removing iwl_mvm_get_ppag_table() since it doesn't exist in 5.4]

---
A 5.4 kernel can't "up" an iwlwifi interface when CONFIG_ACPI=n. wpa_supplicant or ip link set wlan0 up return "No such file or directory". The non-acpi stub iwl_mvm_ppag_init() always returns -ENOENT which means iwl_mvm_up() always fails. Backporting the commit lets iwl_mvm_up() succeed.

 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +1 -1
index c59cbb8cbdd7..c54fe6650018 100644
@@ -1181,7 +1181,7 @@ int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm)
 
 static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)
 {
-	return -ENOENT;
+	return 0;
 }
 #endif /* CONFIG_ACPI */
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 14 lines · Jason Andryuk

From: Johannes Berg <[email protected]>

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.

[Drop hunk removing iwl_mvm_get_ppag_table() since it doesn't exist in 5.4]

Quoted 7 lines

---
A 5.4 kernel can't "up" an iwlwifi interface when CONFIG_ACPI=n. wpa_supplicant or ip link set wlan0 up return "No such file or directory". The non-acpi stub iwl_mvm_ppag_init() always returns -ENOENT which means iwl_mvm_up() always fails. Backporting the commit lets iwl_mvm_up() succeed.

This stable request is only applicable to 5.4

Fixes 6ce1e5c0c207 "iwlwifi: support per-platform antenna gain"

-Jason

#2 lore raw
Quoted 23 lines · Jason Andryuk
Quoted 14 lines · Jason Andryuk

From: Johannes Berg <[email protected]>

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.

[Drop hunk removing iwl_mvm_get_ppag_table() since it doesn't exist in 5.4]

Quoted 7 lines

---
A 5.4 kernel can't "up" an iwlwifi interface when CONFIG_ACPI=n. wpa_supplicant or ip link set wlan0 up return "No such file or directory". The non-acpi stub iwl_mvm_ppag_init() always returns -ENOENT which means iwl_mvm_up() always fails. Backporting the commit lets iwl_mvm_up() succeed.

Quoted 3 lines

This stable request is only applicable to 5.4

Fixes 6ce1e5c0c207 "iwlwifi: support per-platform antenna gain"

Now queued up, thanks.

greg k-h