Commit fc7707a4 authored by Chaoming Li's avatar Chaoming Li Committed by John W. Linville

rtlwifi: rtl8192se: Remove need to disable ASPM

When this driver was initially submitted, the system would crash unless
ASPM was disabled. This problem has been fixed.

This patch also adds a printk that outputs the name of the firmware
file that is used.
Signed-off-by: default avatarChaoming_Li <chaoming_li@realsil.com.cn>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c84aa5af
...@@ -1611,6 +1611,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, ...@@ -1611,6 +1611,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
u16 irqline; u16 irqline;
u8 tmp; u8 tmp;
pcipriv->ndis_adapter.pcibridge_vendor = PCI_BRIDGE_VENDOR_UNKNOWN;
venderid = pdev->vendor; venderid = pdev->vendor;
deviceid = pdev->device; deviceid = pdev->device;
pci_read_config_byte(pdev, 0x8, &revisionid); pci_read_config_byte(pdev, 0x8, &revisionid);
......
...@@ -58,7 +58,7 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw) ...@@ -58,7 +58,7 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)
* 4 - Always Enable ASPM without Clock Req. * 4 - Always Enable ASPM without Clock Req.
* set defult to RTL8192CE:3 RTL8192E:2 * set defult to RTL8192CE:3 RTL8192E:2
* */ * */
rtlpci->const_pci_aspm = 0; /* changed from 2 due to crashes */ rtlpci->const_pci_aspm = 2;
/*Setting for PCI-E device */ /*Setting for PCI-E device */
rtlpci->const_devicepci_aspm_setting = 0x03; rtlpci->const_devicepci_aspm_setting = 0x03;
...@@ -183,6 +183,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw) ...@@ -183,6 +183,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
return 1; return 1;
} }
printk(KERN_INFO "rtl8192se: Driver for Realtek RTL8192SE/RTL8191SE\n"
" Loading firmware %s\n", rtlpriv->cfg->fw_name);
/* request fw */ /* request fw */
err = request_firmware(&firmware, rtlpriv->cfg->fw_name, err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
rtlpriv->io.dev); rtlpriv->io.dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment