From: Larry Finger <Larry.Finger@lwfinger.net>
To: Peter Wu <lekensteyn@gmail.com>,
Chaoming_Li <chaoming_li@realsil.com.cn>
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] rtlwifi: avoid accessing RCR directly
Date: Fri, 14 Feb 2014 15:28:44 -0600 [thread overview]
Message-ID: <52FE8A8C.6040407@lwfinger.net> (raw)
In-Reply-To: <1392401026-18417-2-git-send-email-lekensteyn@gmail.com>
On 02/14/2014 12:03 PM, Peter Wu wrote:
> The rtl*_set_check_bssid functions are mostly the same, but access the
> RCR register in different ways. Use the get_hw_reg abstraction layer
> (which reads rtlpci->receive_config for PCI devices and mac->rx_conf for
> USB).
>
> There is no functional change for cases where receive_config was
> accessed directly. For rtl8192ce, there is still no change because
> nothing modifies REG_RCR or receive_config. For rtl8192cu, it now also
> applies changes to rx_conf from configure_filter, but that can be
> considered a bug which is fixed later.
>
> Signed-off-by: Peter Wu <lekensteyn@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger>
With this change it will not take much work to move all the *_set_check_bssid
functions into a common version in rtlwifi. But that will have to wait as I have
one new driver submitted, but not merged, and two others that are not quite
ready for submission.
Thanks, Larry
> ---
> drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 5 +++--
> drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 4 +++-
> drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 4 +++-
> drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 6 ++++--
> drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 5 +++--
> drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 5 +++--
> 6 files changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
> index e06971b..ce2226c 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
> @@ -1235,12 +1235,13 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw,
> void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
> {
> struct rtl_priv *rtlpriv = rtl_priv(hw);
> - struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
> - u32 reg_rcr = rtlpci->receive_config;
> + u32 reg_rcr;
>
> if (rtlpriv->psc.rfpwr_state != ERFON)
> return;
>
> + rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> +
> if (check_bssid == true) {
> reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
> rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
> index a82b30a..25e178c 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
> @@ -1200,11 +1200,13 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
> void rtl92ce_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
> {
> struct rtl_priv *rtlpriv = rtl_priv(hw);
> - u32 reg_rcr = rtl_read_dword(rtlpriv, REG_RCR);
> + u32 reg_rcr;
>
> if (rtlpriv->psc.rfpwr_state != ERFON)
> return;
>
> + rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> +
> if (check_bssid) {
> reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
> rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> index 468bf73..49ad106 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> @@ -1379,11 +1379,13 @@ void rtl92cu_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
> {
> struct rtl_priv *rtlpriv = rtl_priv(hw);
> struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
> - u32 reg_rcr = rtl_read_dword(rtlpriv, REG_RCR);
> + u32 reg_rcr;
>
> if (rtlpriv->psc.rfpwr_state != ERFON)
> return;
>
> + rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> +
> if (check_bssid) {
> u8 tmp;
> if (IS_NORMAL_CHIP(rtlhal->version)) {
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
> index c4a7db9..c16aa6b 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
> @@ -1138,11 +1138,13 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw,
> void rtl92de_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
> {
> struct rtl_priv *rtlpriv = rtl_priv(hw);
> - struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
> - u32 reg_rcr = rtlpci->receive_config;
> + u32 reg_rcr;
>
> if (rtlpriv->psc.rfpwr_state != ERFON)
> return;
> +
> + rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> +
> if (check_bssid) {
> reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
> rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
> index 4f46178..5aa39ef 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
> @@ -1135,12 +1135,13 @@ void rtl92se_set_mac_addr(struct rtl_io *io, const u8 *addr)
> void rtl92se_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
> {
> struct rtl_priv *rtlpriv = rtl_priv(hw);
> - struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
> - u32 reg_rcr = rtlpci->receive_config;
> + u32 reg_rcr;
>
> if (rtlpriv->psc.rfpwr_state != ERFON)
> return;
>
> + rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> +
> if (check_bssid) {
> reg_rcr |= (RCR_CBSSID);
> rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
> index c333dfd..4680816 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
> @@ -1112,12 +1112,13 @@ static int _rtl8723ae_set_media_status(struct ieee80211_hw *hw,
> void rtl8723ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
> {
> struct rtl_priv *rtlpriv = rtl_priv(hw);
> - struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
> - u32 reg_rcr = rtlpci->receive_config;
> + u32 reg_rcr;
>
> if (rtlpriv->psc.rfpwr_state != ERFON)
> return;
>
> + rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr));
> +
> if (check_bssid == true) {
> reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
> rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
>
next prev parent reply other threads:[~2014-02-14 21:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 18:03 [PATCH 0/3] rtlwifi promiscious mode fix and cleanup Peter Wu
2014-02-14 18:03 ` [PATCH 1/3] rtlwifi: avoid accessing RCR directly Peter Wu
2014-02-14 21:28 ` Larry Finger [this message]
2014-02-14 21:46 ` Peter Wu
2014-02-14 18:03 ` [PATCH 2/3] rtlwifi: properly apply filter flags Peter Wu
2014-02-14 21:32 ` Larry Finger
2014-02-14 18:03 ` [PATCH 3/3] rtlwifi: remove unused allow_all_destaddr functions Peter Wu
2014-02-14 21:38 ` Larry Finger
2014-02-14 21:48 ` Peter Wu
2014-02-14 21:57 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52FE8A8C.6040407@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=chaoming_li@realsil.com.cn \
--cc=lekensteyn@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).