public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: rtlwifi: Convert to use PCIe capability accessors

Browse source 
The rtlwifi driver accesses PCIe capabilities through custom config
offsets. Convert the accesses to use the normal PCIe capability
accessors.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231124084725.12738-4-ilpo.jarvinen@linux.intel.com
This commit is contained in:
Ilpo Järvinen 2023-11-24 10:47:18 +02:00 • committed by Kalle Valo
parent 5894d0089c
commit a4fcac11a2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/wireless/realtek/rtlwifi/pci.c
View file

@ -64,7 +64,7 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw)
struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor; u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor;
u8 init_aspm; u16 init_aspm;
ppsc->reg_rfps_level = 0; ppsc->reg_rfps_level = 0;
ppsc->support_aspm = false; ppsc->support_aspm = false;
@ -150,9 +150,10 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw)
/* toshiba aspm issue, toshiba will set aspm selfly /* toshiba aspm issue, toshiba will set aspm selfly
* so we should not set aspm in driver * so we should not set aspm in driver
*/ */
pci_read_config_byte(rtlpci->pdev, 0x80, &init_aspm); pcie_capability_read_word(rtlpci->pdev, PCI_EXP_LNKCTL, &init_aspm);
if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8192SE && if (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8192SE &&
init_aspm == 0x43) ((u8)init_aspm) == (PCI_EXP_LNKCTL_ASPM_L0S |
PCI_EXP_LNKCTL_ASPM_L1 | PCI_EXP_LNKCTL_CCC))
ppsc->support_aspm = false; ppsc->support_aspm = false;
} }
@ -202,7 +203,7 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
/*Retrieve original configuration settings. */ /*Retrieve original configuration settings. */
u8 linkctrl_reg = pcipriv->ndis_adapter.linkctrl_reg; u8 linkctrl_reg = pcipriv->ndis_adapter.linkctrl_reg;
u16 aspmlevel = 0; u16 aspmlevel = 0;
u8 tmp_u1b = 0; u16 tmp_u1b = 0;
if (!ppsc->support_aspm) if (!ppsc->support_aspm)
return; return;
@ -220,10 +221,10 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
} }
/*for promising device will in L0 state after an I/O. */ /*for promising device will in L0 state after an I/O. */
pci_read_config_byte(rtlpci->pdev, 0x80, &tmp_u1b); pcie_capability_read_word(rtlpci->pdev, PCI_EXP_LNKCTL, &tmp_u1b);
/*Set corresponding value. */ /*Set corresponding value. */
aspmlevel |= BIT(0) | BIT(1); aspmlevel |= PCI_EXP_LNKCTL_ASPM_L0S | PCI_EXP_LNKCTL_ASPM_L1;
linkctrl_reg &= ~aspmlevel; linkctrl_reg &= ~aspmlevel;
_rtl_pci_platform_switch_device_pci_aspm(hw, linkctrl_reg); _rtl_pci_platform_switch_device_pci_aspm(hw, linkctrl_reg);
@ -350,9 +351,8 @@ static void rtl_pci_parse_configuration(struct pci_dev *pdev,
rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Link Control Register =%x\n", rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, "Link Control Register =%x\n",
pcipriv->ndis_adapter.linkctrl_reg); pcipriv->ndis_adapter.linkctrl_reg);
pci_read_config_byte(pdev, 0x98, &tmp); pcie_capability_set_word(pdev, PCI_EXP_DEVCTL2,
tmp |= BIT(4); PCI_EXP_DEVCTL2_COMP_TMOUT_DIS);
pci_write_config_byte(pdev, 0x98, tmp);
tmp = 0x17; tmp = 0x17;
pci_write_config_byte(pdev, 0x70f, tmp); pci_write_config_byte(pdev, 0x70f, tmp);