Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1333988 > unrolled thread

[PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization

Started byGreg Kroah-Hartman <gregkh@linuxfoundation.org>
First post2016-02-15 01:30 +0100
Last post2016-02-18 03:40 +0100
Articles 4 — 4 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 01:30 +0100
    Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter  initialization Ben Hutchings <ben@decadent.org.uk> - 2016-02-16 19:50 +0100
      Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter  initialization Luis Henriques <luis.henriques@canonical.com> - 2016-02-16 21:30 +0100
        Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter  initialization Larry Finger <Larry.Finger@lwfinger.net> - 2016-02-18 03:40 +0100

#1333988 — [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2016-02-15 01:30 +0100
Subject[PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization
Message-ID<r2fd8-1KG-21@gated-at.bofh.it>
4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Larry Finger <Larry.Finger@lwfinger.net>

commit 78bae1de422a7f6f2b4b61f6a5c379e3d7f96f44 upstream.

This driver failed to copy parameters sw_crypto and disable_watchdog into
the locations actually used by the driver. In addition, msi_support was
initialized three times and one of them used the wrong variable. The
initialization of parameter int_clear was moved so that it is near that
of the rest of the parameters.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -95,8 +95,6 @@ int rtl8821ae_init_sw_vars(struct ieee80
 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
 	rtl8821ae_bt_reg_init(hw);
-	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
-	rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;
 	rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
 
 	rtlpriv->dm.dm_initialgain_enable = 1;
@@ -168,12 +166,15 @@ int rtl8821ae_init_sw_vars(struct ieee80
 	rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
 	rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
 	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
-	rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear;
+	rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;
+	rtlpriv->cfg->mod_params->sw_crypto =
+		rtlpriv->cfg->mod_params->sw_crypto;
+	rtlpriv->cfg->mod_params->disable_watchdog =
+		rtlpriv->cfg->mod_params->disable_watchdog;
 	if (rtlpriv->cfg->mod_params->disable_watchdog)
 		pr_info("watchdog disabled\n");
 	rtlpriv->psc.reg_fwctrl_lps = 3;
 	rtlpriv->psc.reg_max_lps_awakeintvl = 5;
-	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
 
 	/* for ASPM, you can close aspm through
 	 * set const_support_pciaspm = 0

[toc] | [next] | [standalone]

#1335725 — Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization

FromBen Hutchings <ben@decadent.org.uk>
Date2016-02-16 19:50 +0100
SubjectRe: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization
Message-ID<r2SRc-3dV-17@gated-at.bofh.it>
In reply to#1333988

[Multipart message — attachments visible in raw view] — view raw

On Sun, 2016-02-14 at 14:22 -0800, Greg Kroah-Hartman wrote:

> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Larry Finger <Larry.Finger@lwfinger.net>
> 
> commit 78bae1de422a7f6f2b4b61f6a5c379e3d7f96f44 upstream.
> 
> This driver failed to copy parameters sw_crypto and disable_watchdog into
> the locations actually used by the driver. In addition, msi_support was
> initialized three times and one of them used the wrong variable. The
> initialization of parameter int_clear was moved so that it is near that
> of the rest of the parameters.
> 
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> ---
>  drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c |    9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
[...]
> @@ -168,12 +166,15 @@ int rtl8821ae_init_sw_vars(struct ieee80
>  	rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
>  	rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
>  	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
> -	rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear;
> +	rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;
> +	rtlpriv->cfg->mod_params->sw_crypto =
> +		rtlpriv->cfg->mod_params->sw_crypto;
> +	rtlpriv->cfg->mod_params->disable_watchdog =
> +		rtlpriv->cfg->mod_params->disable_watchdog;
[...]

This is self-assignment.  How is that going to help?

Ben.

-- 
Ben Hutchings
Life is what happens to you while you're busy making other plans.
                                                               - John Lennon

[toc] | [prev] | [next] | [standalone]

#1335791 — Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization

FromLuis Henriques <luis.henriques@canonical.com>
Date2016-02-16 21:30 +0100
SubjectRe: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization
Message-ID<r2UpX-4mk-1@gated-at.bofh.it>
In reply to#1335725
On Tue, Feb 16, 2016 at 06:46:04PM +0000, Ben Hutchings wrote:
> On Sun, 2016-02-14 at 14:22 -0800, Greg Kroah-Hartman wrote:
> 
> > 4.4-stable review patch.  If anyone has any objections, please let me know.
> > 
> > ------------------
> > 
> > From: Larry Finger <Larry.Finger@lwfinger.net>
> > 
> > commit 78bae1de422a7f6f2b4b61f6a5c379e3d7f96f44 upstream.
> > 
> > This driver failed to copy parameters sw_crypto and disable_watchdog into
> > the locations actually used by the driver. In addition, msi_support was
> > initialized three times and one of them used the wrong variable. The
> > initialization of parameter int_clear was moved so that it is near that
> > of the rest of the parameters.
> > 
> > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > 
> > ---
> >  drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c |    9 +++++----
> >  1 file changed, 5 insertions(+), 4 deletions(-)
> > 
> > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
> > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
> [...]
> > @@ -168,12 +166,15 @@ int rtl8821ae_init_sw_vars(struct ieee80
> >  	rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
> >  	rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
> >  	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
> > -	rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear;
> > +	rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;
> > +	rtlpriv->cfg->mod_params->sw_crypto =
> > +		rtlpriv->cfg->mod_params->sw_crypto;
> > +	rtlpriv->cfg->mod_params->disable_watchdog =
> > +		rtlpriv->cfg->mod_params->disable_watchdog;
> [...]
> 
> This is self-assignment.  How is that going to help?
> 

Yeah, I did asked that question on the original patchset[1] but never
actually got any reply.

[1] https://marc.info/?l=linux-wireless&m=145437005409037&w=2

Cheers,
--
Luís

> Ben.
> 
> -- 
> Ben Hutchings
> Life is what happens to you while you're busy making other plans.
>                                                                - John Lennon

[toc] | [prev] | [next] | [standalone]

#1336981 — Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization

FromLarry Finger <Larry.Finger@lwfinger.net>
Date2016-02-18 03:40 +0100
SubjectRe: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization
Message-ID<r3mFA-7hh-1@gated-at.bofh.it>
In reply to#1335791
On 02/16/2016 02:21 PM, Luis Henriques wrote:
> On Tue, Feb 16, 2016 at 06:46:04PM +0000, Ben Hutchings wrote:
>> On Sun, 2016-02-14 at 14:22 -0800, Greg Kroah-Hartman wrote:
>>
>>> 4.4-stable review patch.  If anyone has any objections, please let me know.
>>>
>>> ------------------
>>>
>>> From: Larry Finger <Larry.Finger@lwfinger.net>
>>>
>>> commit 78bae1de422a7f6f2b4b61f6a5c379e3d7f96f44 upstream.
>>>
>>> This driver failed to copy parameters sw_crypto and disable_watchdog into
>>> the locations actually used by the driver. In addition, msi_support was
>>> initialized three times and one of them used the wrong variable. The
>>> initialization of parameter int_clear was moved so that it is near that
>>> of the rest of the parameters.
>>>
>>> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
>>> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
>>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>>>
>>> ---
>>>   drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c |    9 +++++----
>>>   1 file changed, 5 insertions(+), 4 deletions(-)
>>>
>>> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
>>> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
>> [...]
>>> @@ -168,12 +166,15 @@ int rtl8821ae_init_sw_vars(struct ieee80
>>>   	rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
>>>   	rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
>>>   	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
>>> -	rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear;
>>> +	rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;
>>> +	rtlpriv->cfg->mod_params->sw_crypto =
>>> +		rtlpriv->cfg->mod_params->sw_crypto;
>>> +	rtlpriv->cfg->mod_params->disable_watchdog =
>>> +		rtlpriv->cfg->mod_params->disable_watchdog;
>> [...]
>>
>> This is self-assignment.  How is that going to help?
>>
>
> Yeah, I did asked that question on the original patchset[1] but never
> actually got any reply.
>
> [1] https://marc.info/?l=linux-wireless&m=145437005409037&w=2
>
> Cheers,
> --
> Luís
>
>> Ben.
>>
>> --
>> Ben Hutchings
>> Life is what happens to you while you're busy making other plans.
>>                                                                 - John Lennon

It is not going to help. I found some places in the drivers where the module 
parameters were not being transferred to their final locations. While fixing 
them, I add this atrocious code. It was a case of having a new hammer, and the 
whole world looked like a nail. As the original patches were being sent through 
stable, I did not send remedial patches immediately so as not to generate any 
confusion. I think these have now propagated through the system, and I will 
remove those self-assignment lines of code.

Larry

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web