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

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

[Jason Andryuk]

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>
---
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(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index c59cbb8cbdd7..c54fe6650018 100644
--- 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 *mvm)
 
 static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)
 {
-	return -ENOENT;
+	return 0;
 }
 #endif /* CONFIG_ACPI */
 
-- 
2.25.1

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

[Jason Andryuk]

On Sun, Mar 29, 2020 at 2:41 PM Jason Andryuk <jandryuk@gmail.com> wrote:
>
> 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>
> ---
> 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

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

[Greg KH]

On Sun, Mar 29, 2020 at 03:17:32PM -0400, Jason Andryuk wrote:
> On Sun, Mar 29, 2020 at 2:41 PM Jason Andryuk <jandryuk@gmail.com> wrote:
> >
> > 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>
> > ---
> > 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"

Now queued up, thanks.

greg k-h