Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84efbad4 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: Add module parameter ASPM 



On some platforms, enable ASPM will cause AER error to be logged, thus
we use a parameter to selectively turn on ASPM.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 1d22b177

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c

+5 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


static void rtl88e_init_aspm_vars(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));



	/*close ASPM for AMD defaultly */
@@ -77,7 +78,7 @@ static void rtl88e_init_aspm_vars(struct ieee80211_hw *hw) 
	 * 1 - Support ASPM,

	 * 2 - According to chipset.

	 */

	rtlpci->const_support_pciaspm = 1;

	rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;

}



int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
@@ -276,6 +277,7 @@ static struct rtl_mod_params rtl88ee_mod_params = { 
	.swctrl_lps = false,

	.fwctrl_lps = false,

	.msi_support = true,

	.aspm_support = 1,

	.debug_level = 0,

	.debug_mask = 0,

};
@@ -399,6 +401,7 @@ module_param_named(ips, rtl88ee_mod_params.inactiveps, bool, 0444); 
module_param_named(swlps, rtl88ee_mod_params.swctrl_lps, bool, 0444);

module_param_named(fwlps, rtl88ee_mod_params.fwctrl_lps, bool, 0444);

module_param_named(msi, rtl88ee_mod_params.msi_support, bool, 0444);

module_param_named(aspm, rtl88ee_mod_params.aspm_support, int, 0444);

module_param_named(disable_watchdog, rtl88ee_mod_params.disable_watchdog,

		   bool, 0444);

MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
@@ -406,6 +409,7 @@ MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n"); 
MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");

MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");

MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");

MODULE_PARM_DESC(aspm, "Set to 1 to enable ASPM (default 1)\n");

MODULE_PARM_DESC(debug_level, "Set debug level (0-5) (default 0)");

MODULE_PARM_DESC(debug_mask, "Set debug mask (default 0)");

MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c

+5 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 


static void rtl92c_init_aspm_vars(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));



	/*close ASPM for AMD defaultly */
@@ -83,7 +84,7 @@ static void rtl92c_init_aspm_vars(struct ieee80211_hw *hw) 
	 * 1 - Support ASPM,

	 * 2 - According to chipset.

	 */

	rtlpci->const_support_pciaspm = 1;

	rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;

}



int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
@@ -252,6 +253,7 @@ static struct rtl_mod_params rtl92ce_mod_params = { 
	.inactiveps = true,

	.swctrl_lps = false,

	.fwctrl_lps = true,

	.aspm_support = 1,

	.debug_level = 0,

	.debug_mask = 0,

};
@@ -375,10 +377,12 @@ module_param_named(debug_mask, rtl92ce_mod_params.debug_mask, ullong, 0644); 
module_param_named(ips, rtl92ce_mod_params.inactiveps, bool, 0444);

module_param_named(swlps, rtl92ce_mod_params.swctrl_lps, bool, 0444);

module_param_named(fwlps, rtl92ce_mod_params.fwctrl_lps, bool, 0444);

module_param_named(aspm, rtl92ce_mod_params.aspm_support, int, 0444);

MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");

MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");

MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");

MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");

MODULE_PARM_DESC(aspm, "Set to 1 to enable ASPM (default 1)\n");

MODULE_PARM_DESC(debug_level, "Set debug level (0-5) (default 0)");

MODULE_PARM_DESC(debug_mask, "Set debug mask (default 0)");

drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c

+5 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


static void rtl92d_init_aspm_vars(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));



	/*close ASPM for AMD defaultly */
@@ -79,7 +80,7 @@ static void rtl92d_init_aspm_vars(struct ieee80211_hw *hw) 
	 * 1 - Support ASPM,

	 * 2 - According to chipset.

	 */

	rtlpci->const_support_pciaspm = 1;

	rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;

}



static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
@@ -254,6 +255,7 @@ static struct rtl_mod_params rtl92de_mod_params = { 
	.inactiveps = true,

	.swctrl_lps = true,

	.fwctrl_lps = false,

	.aspm_support = 1,

	.debug_level = 0,

	.debug_mask = 0,

};
@@ -369,11 +371,13 @@ module_param_named(debug_level, rtl92de_mod_params.debug_level, int, 0644); 
module_param_named(ips, rtl92de_mod_params.inactiveps, bool, 0444);

module_param_named(swlps, rtl92de_mod_params.swctrl_lps, bool, 0444);

module_param_named(fwlps, rtl92de_mod_params.fwctrl_lps, bool, 0444);

module_param_named(aspm, rtl92de_mod_params.aspm_support, int, 0444);

module_param_named(debug_mask, rtl92de_mod_params.debug_mask, ullong, 0644);

MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");

MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");

MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 1)\n");

MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 0)\n");

MODULE_PARM_DESC(aspm, "Set to 1 to enable ASPM (default 1)\n");

MODULE_PARM_DESC(debug_level, "Set debug level (0-5) (default 0)");

MODULE_PARM_DESC(debug_mask, "Set debug mask (default 0)");

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c

+5 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 


static void rtl92ee_init_aspm_vars(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));



	/*close ASPM for AMD defaultly */
@@ -83,7 +84,7 @@ static void rtl92ee_init_aspm_vars(struct ieee80211_hw *hw) 
	 * 1 - Support ASPM,

	 * 2 - According to chipset.

	 */

	rtlpci->const_support_pciaspm = 1;

	rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;

}



int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
@@ -260,6 +261,7 @@ static struct rtl_mod_params rtl92ee_mod_params = { 
	.fwctrl_lps = true,

	.msi_support = true,

	.dma64 = false,

	.aspm_support = 1,

	.debug_level = 0,

	.debug_mask = 0,

};
@@ -378,6 +380,7 @@ module_param_named(swlps, rtl92ee_mod_params.swctrl_lps, bool, 0444); 
module_param_named(fwlps, rtl92ee_mod_params.fwctrl_lps, bool, 0444);

module_param_named(msi, rtl92ee_mod_params.msi_support, bool, 0444);

module_param_named(dma64, rtl92ee_mod_params.dma64, bool, 0444);

module_param_named(aspm, rtl92ee_mod_params.aspm_support, int, 0444);

module_param_named(disable_watchdog, rtl92ee_mod_params.disable_watchdog,

		   bool, 0444);

MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
@@ -386,6 +389,7 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); 
MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");

MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");

MODULE_PARM_DESC(dma64, "Set to 1 to use DMA 64 (default 0)\n");

MODULE_PARM_DESC(aspm, "Set to 1 to enable ASPM (default 1)\n");

MODULE_PARM_DESC(debug_level, "Set debug level (0-5) (default 0)");

MODULE_PARM_DESC(debug_mask, "Set debug mask (default 0)");

MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");

drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c

+5 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));



	/*close ASPM for AMD defaultly */
@@ -77,7 +78,7 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw) 
	 * 1 - Support ASPM,

	 * 2 - According to chipset.

	 */

	rtlpci->const_support_pciaspm = 2;

	rtlpci->const_support_pciaspm = rtlpriv->cfg->mod_params->aspm_support;

}



static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
@@ -297,6 +298,7 @@ static struct rtl_mod_params rtl92se_mod_params = { 
	.inactiveps = true,

	.swctrl_lps = true,

	.fwctrl_lps = false,

	.aspm_support = 2,

	.debug_level = 0,

	.debug_mask = 0,

};
@@ -422,10 +424,12 @@ module_param_named(debug_mask, rtl92se_mod_params.debug_mask, ullong, 0644); 
module_param_named(ips, rtl92se_mod_params.inactiveps, bool, 0444);

module_param_named(swlps, rtl92se_mod_params.swctrl_lps, bool, 0444);

module_param_named(fwlps, rtl92se_mod_params.fwctrl_lps, bool, 0444);

module_param_named(aspm, rtl92se_mod_params.aspm_support, int, 0444);

MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");

MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");

MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 1)\n");

MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 0)\n");

MODULE_PARM_DESC(aspm, "Set to 1 to enable ASPM (default 1)\n");

MODULE_PARM_DESC(debug_level, "Set debug level (0-5) (default 0)");

MODULE_PARM_DESC(debug_mask, "Set debug mask (default 0)");