| Message ID | 1450132478-2386-2-git-send-email-Larry.Finger@lwfinger.net (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
> This driver has a number of errors in the module initialization. These > include the following: > > Parameter msi_support is stored in two places - one is removed. > Paramters sw_crypto and disable_watchdog were never stored in the final > locations, nor were they initialized properly. > > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> > Cc: Stable <stable@vger.kernel.org> Thanks, 8 patches applied to wireless-drivers-next.git: 7079604ddb83 rtlwifi: rtl8723be: Fix module parameter initialization 793b09994211 rtlwifi: rtl8723ae: Fix initialization of module parameters 78bae1de422a rtlwifi: rtl8821ae: Fix errors in parameter initialization 06f34572c611 rtlwifi: rtl8188ee: Fix module parameter initialization d4d60b4caaa5 rtlwifi: rtl8192de: Fix incorrect module parameter descriptions 7503efbd82c1 rtlwifi: rtl8192se: Fix module parameter initialization b24f19f16b9e rtlwifi: rtl8192ce: Fix handling of module parameters b68d0ae7e586 rtlwifi: rtl8192cu: Add missing parameter setup Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 14, 2015 at 04:34:31PM -0600, Larry Finger wrote: > This driver has a number of errors in the module initialization. These > include the following: > > Parameter msi_support is stored in two places - one is removed. > Paramters sw_crypto and disable_watchdog were never stored in the final > locations, nor were they initialized properly. > > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> > Cc: Stable <stable@vger.kernel.org> > --- > drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c > index d091f1d..a78eaed 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c > @@ -93,7 +93,6 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw) > struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); > > rtl8723be_bt_reg_init(hw); > - rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support; > rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer(); > > rtlpriv->dm.dm_initialgain_enable = 1; > @@ -151,6 +150,10 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw) > 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; > + rtlpriv->cfg->mod_params->sw_crypto = > + rtlpriv->cfg->mod_params->sw_crypto; > + rtlpriv->cfg->mod_params->disable_watchdog = > + rtlpriv->cfg->mod_params->disable_watchdog; Ok, I give up and just ask: are the above hw mapped registers that actually need to be read/written? Or am I missing something here, as the 2 statements above don't seem to make sense. The same for other patches in this series. Cheers, -- Luís > if (rtlpriv->cfg->mod_params->disable_watchdog) > pr_info("watchdog disabled\n"); > rtlpriv->psc.reg_fwctrl_lps = 3; > @@ -267,6 +270,9 @@ static struct rtl_mod_params rtl8723be_mod_params = { > .inactiveps = true, > .swctrl_lps = false, > .fwctrl_lps = true, > + .msi_support = false, > + .disable_watchdog = false, > + .debug = DBG_EMERG, > }; > > static struct rtl_hal_cfg rtl8723be_hal_cfg = { > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c index d091f1d..a78eaed 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c @@ -93,7 +93,6 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw) struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); rtl8723be_bt_reg_init(hw); - rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support; rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer(); rtlpriv->dm.dm_initialgain_enable = 1; @@ -151,6 +150,10 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw) 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; + 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; @@ -267,6 +270,9 @@ static struct rtl_mod_params rtl8723be_mod_params = { .inactiveps = true, .swctrl_lps = false, .fwctrl_lps = true, + .msi_support = false, + .disable_watchdog = false, + .debug = DBG_EMERG, }; static struct rtl_hal_cfg rtl8723be_hal_cfg = {
This driver has a number of errors in the module initialization. These include the following: Parameter msi_support is stored in two places - one is removed. Paramters sw_crypto and disable_watchdog were never stored in the final locations, nor were they initialized properly. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@vger.kernel.org> --- drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)