* [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig
@ 2011-03-06 6:36 Larry Finger
2011-03-06 20:14 ` François Valenduc
0 siblings, 1 reply; 7+ messages in thread
From: Larry Finger @ 2011-03-06 6:36 UTC (permalink / raw)
To: John W Linville; +Cc: chaoming_li, linux-wireless
From: Chaoming Li <chaoming_li@realsil.com.cn>
Merge routines trx.c and trx.h for RTL8192SE.
Signed-off-by: Chaoming_Li <chaoming_li@realsil.com.cn>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
Index: wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
===================================================================
--- /dev/null
+++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -0,0 +1,978 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2010 Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+
+#include "../wifi.h"
+#include "../pci.h"
+#include "../base.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "fw.h"
+#include "trx.h"
+#include "led.h"
+
+static u8 _rtl92se_map_hwqueue_to_fwqueue(__le16 fc, unsigned int skb_queue)
+{
+ u8 qsel;
+
+ if (unlikely(ieee80211_is_beacon(fc)))
+ return QSLT_BEACON;
+
+ if (ieee80211_is_mgmt(fc))
+ return QSLT_MGNT;
+
+ if (ieee80211_is_nullfunc(fc))
+ return QSLT_HIGH;
+
+ switch (skb_queue) {
+ case VO_QUEUE:
+ qsel = QSLT_VO;
+ break;
+ case VI_QUEUE:
+ qsel = QSLT_VI;
+ break;
+ case BE_QUEUE:
+ qsel = QSLT_BE;
+ break;
+ case BK_QUEUE:
+ qsel = QSLT_BK;
+ break;
+ default:
+ qsel = QSLT_BE;
+ RT_ASSERT(false, ("BE queue, skb_queue:%d, set qsel = 0x%X\n",
+ skb_queue, QSLT_BE));
+ break;
+ }
+ return qsel;
+}
+
+static int _rtl92se_rate_mapping(bool isht, u8 desc_rate, bool first_ampdu)
+{
+ int rate_idx = 0;
+
+ if (first_ampdu) {
+ if (false == isht) {
+ switch (desc_rate) {
+ case DESC92S_RATE1M:
+ rate_idx = 0;
+ break;
+ case DESC92S_RATE2M:
+ rate_idx = 1;
+ break;
+ case DESC92S_RATE5_5M:
+ rate_idx = 2;
+ break;
+ case DESC92S_RATE11M:
+ rate_idx = 3;
+ break;
+ case DESC92S_RATE6M:
+ rate_idx = 4;
+ break;
+ case DESC92S_RATE9M:
+ rate_idx = 5;
+ break;
+ case DESC92S_RATE12M:
+ rate_idx = 6;
+ break;
+ case DESC92S_RATE18M:
+ rate_idx = 7;
+ break;
+ case DESC92S_RATE24M:
+ rate_idx = 8;
+ break;
+ case DESC92S_RATE36M:
+ rate_idx = 9;
+ break;
+ case DESC92S_RATE48M:
+ rate_idx = 10;
+ break;
+ case DESC92S_RATE54M:
+ rate_idx = 11;
+ break;
+ default:
+ rate_idx = 0;
+ break;
+ }
+ } else {
+ rate_idx = 11;
+ }
+
+ return rate_idx;
+ }
+
+ switch (desc_rate) {
+ case DESC92S_RATE1M:
+ rate_idx = 0;
+ break;
+ case DESC92S_RATE2M:
+ rate_idx = 1;
+ break;
+ case DESC92S_RATE5_5M:
+ rate_idx = 2;
+ break;
+ case DESC92S_RATE11M:
+ rate_idx = 3;
+ break;
+ case DESC92S_RATE6M:
+ rate_idx = 4;
+ break;
+ case DESC92S_RATE9M:
+ rate_idx = 5;
+ break;
+ case DESC92S_RATE12M:
+ rate_idx = 6;
+ break;
+ case DESC92S_RATE18M:
+ rate_idx = 7;
+ break;
+ case DESC92S_RATE24M:
+ rate_idx = 8;
+ break;
+ case DESC92S_RATE36M:
+ rate_idx = 9;
+ break;
+ case DESC92S_RATE48M:
+ rate_idx = 10;
+ break;
+ case DESC92S_RATE54M:
+ rate_idx = 11;
+ break;
+ default:
+ rate_idx = 11;
+ break;
+ }
+ return rate_idx;
+}
+
+static u8 _rtl92s_query_rxpwrpercentage(char antpower)
+{
+ if ((antpower <= -100) || (antpower >= 20))
+ return 0;
+ else if (antpower >= 0)
+ return 100;
+ else
+ return 100 + antpower;
+}
+
+static u8 _rtl92s_evm_db_to_percentage(char value)
+{
+ char ret_val;
+ ret_val = value;
+
+ if (ret_val >= 0)
+ ret_val = 0;
+
+ if (ret_val <= -33)
+ ret_val = -33;
+
+ ret_val = 0 - ret_val;
+ ret_val *= 3;
+
+ if (ret_val == 99)
+ ret_val = 100;
+
+ return ret_val;
+}
+
+static long _rtl92se_translate_todbm(struct ieee80211_hw *hw,
+ u8 signal_strength_index)
+{
+ long signal_power;
+
+ signal_power = (long)((signal_strength_index + 1) >> 1);
+ signal_power -= 95;
+ return signal_power;
+}
+
+static long _rtl92se_signal_scale_mapping(struct ieee80211_hw *hw,
+ long currsig)
+{
+ long retsig = 0;
+
+ /* Step 1. Scale mapping. */
+ if (currsig > 47)
+ retsig = 100;
+ else if (currsig > 14 && currsig <= 47)
+ retsig = 100 - ((47 - currsig) * 3) / 2;
+ else if (currsig > 2 && currsig <= 14)
+ retsig = 48 - ((14 - currsig) * 15) / 7;
+ else if (currsig >= 0)
+ retsig = currsig * 9 + 1;
+
+ return retsig;
+}
+
+
+static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
+ struct rtl_stats *pstats, u8 *pdesc,
+ struct rx_fwinfo *p_drvinfo,
+ bool packet_match_bssid, bool packet_toself,
+ bool packet_beacon)
+{
+ struct rtl_priv *rtlpriv = rtl_priv(hw);
+ struct phy_sts_cck_8192s_t *cck_buf;
+ s8 rx_pwr_all = 0, rx_pwr[4];
+ u8 rf_rx_num = 0, evm, pwdb_all;
+ u8 i, max_spatial_stream;
+ u32 rssi, total_rssi = 0;
+ bool in_powersavemode = false;
+ bool is_cck_rate;
+
+ is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc);
+ pstats->packet_matchbssid = packet_match_bssid;
+ pstats->packet_toself = packet_toself;
+ pstats->is_cck = is_cck_rate;
+ pstats->packet_beacon = packet_beacon;
+ pstats->is_cck = is_cck_rate;
+ pstats->rx_mimo_signalquality[0] = -1;
+ pstats->rx_mimo_signalquality[1] = -1;
+
+ if (is_cck_rate) {
+ u8 report, cck_highpwr;
+ cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
+
+ if (!in_powersavemode)
+ cck_highpwr = (u8) rtl_get_bbreg(hw,
+ RFPGA0_XA_HSSIPARAMETER2,
+ 0x200);
+ else
+ cck_highpwr = false;
+
+ if (!cck_highpwr) {
+ u8 cck_agc_rpt = cck_buf->cck_agc_rpt;
+ report = cck_buf->cck_agc_rpt & 0xc0;
+ report = report >> 6;
+ switch (report) {
+ case 0x3:
+ rx_pwr_all = -40 - (cck_agc_rpt & 0x3e);
+ break;
+ case 0x2:
+ rx_pwr_all = -20 - (cck_agc_rpt & 0x3e);
+ break;
+ case 0x1:
+ rx_pwr_all = -2 - (cck_agc_rpt & 0x3e);
+ break;
+ case 0x0:
+ rx_pwr_all = 14 - (cck_agc_rpt & 0x3e);
+ break;
+ }
+ } else {
+ u8 cck_agc_rpt = cck_buf->cck_agc_rpt;
+ report = p_drvinfo->cfosho[0] & 0x60;
+ report = report >> 5;
+ switch (report) {
+ case 0x3:
+ rx_pwr_all = -40 - ((cck_agc_rpt & 0x1f) << 1);
+ break;
+ case 0x2:
+ rx_pwr_all = -20 - ((cck_agc_rpt & 0x1f) << 1);
+ break;
+ case 0x1:
+ rx_pwr_all = -2 - ((cck_agc_rpt & 0x1f) << 1);
+ break;
+ case 0x0:
+ rx_pwr_all = 14 - ((cck_agc_rpt & 0x1f) << 1);
+ break;
+ }
+ }
+
+ pwdb_all = _rtl92s_query_rxpwrpercentage(rx_pwr_all);
+
+ /* CCK gain is smaller than OFDM/MCS gain, */
+ /* so we add gain diff by experiences, the val is 6 */
+ pwdb_all += 6;
+ if (pwdb_all > 100)
+ pwdb_all = 100;
+ /* modify the offset to make the same gain index with OFDM. */
+ if (pwdb_all > 34 && pwdb_all <= 42)
+ pwdb_all -= 2;
+ else if (pwdb_all > 26 && pwdb_all <= 34)
+ pwdb_all -= 6;
+ else if (pwdb_all > 14 && pwdb_all <= 26)
+ pwdb_all -= 8;
+ else if (pwdb_all > 4 && pwdb_all <= 14)
+ pwdb_all -= 4;
+
+ pstats->rx_pwdb_all = pwdb_all;
+ pstats->recvsignalpower = rx_pwr_all;
+
+ if (packet_match_bssid) {
+ u8 sq;
+ if (pstats->rx_pwdb_all > 40) {
+ sq = 100;
+ } else {
+ sq = cck_buf->sq_rpt;
+ if (sq > 64)
+ sq = 0;
+ else if (sq < 20)
+ sq = 100;
+ else
+ sq = ((64 - sq) * 100) / 44;
+ }
+
+ pstats->signalquality = sq;
+ pstats->rx_mimo_signalquality[0] = sq;
+ pstats->rx_mimo_signalquality[1] = -1;
+ }
+ } else {
+ rtlpriv->dm.rfpath_rxenable[0] =
+ rtlpriv->dm.rfpath_rxenable[1] = true;
+ for (i = RF90_PATH_A; i < RF90_PATH_MAX; i++) {
+ if (rtlpriv->dm.rfpath_rxenable[i])
+ rf_rx_num++;
+
+ rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2) -
+ 110;
+ rssi = _rtl92s_query_rxpwrpercentage(rx_pwr[i]);
+ total_rssi += rssi;
+ rtlpriv->stats.rx_snr_db[i] = (long)(p_drvinfo->rxsnr[i]
+ / 2);
+
+ if (packet_match_bssid)
+ pstats->rx_mimo_signalstrength[i] = (u8) rssi;
+ }
+
+ rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
+ pwdb_all = _rtl92s_query_rxpwrpercentage(rx_pwr_all);
+ pstats->rx_pwdb_all = pwdb_all;
+ pstats->rxpower = rx_pwr_all;
+ pstats->recvsignalpower = rx_pwr_all;
+
+ if (GET_RX_STATUS_DESC_RX_HT(pdesc) &&
+ GET_RX_STATUS_DESC_RX_MCS(pdesc) >= DESC92S_RATEMCS8 &&
+ GET_RX_STATUS_DESC_RX_MCS(pdesc) <= DESC92S_RATEMCS15)
+ max_spatial_stream = 2;
+ else
+ max_spatial_stream = 1;
+
+ for (i = 0; i < max_spatial_stream; i++) {
+ evm = _rtl92s_evm_db_to_percentage(p_drvinfo->rxevm[i]);
+
+ if (packet_match_bssid) {
+ if (i == 0)
+ pstats->signalquality = (u8)(evm&0xff);
+ pstats->rx_mimo_signalquality[i] =
+ (u8)(evm & 0xff);
+ }
+ }
+ }
+
+ if (is_cck_rate)
+ pstats->signalstrength = (u8)(_rtl92se_signal_scale_mapping(hw,
+ pwdb_all));
+ else if (rf_rx_num != 0)
+ pstats->signalstrength = (u8) (_rtl92se_signal_scale_mapping(hw,
+ total_rssi /= rf_rx_num));
+}
+
+static void _rtl92se_process_ui_rssi(struct ieee80211_hw *hw,
+ struct rtl_stats *pstats)
+{
+ struct rtl_priv *rtlpriv = rtl_priv(hw);
+ struct rtl_phy *rtlphy = &(rtlpriv->phy);
+ u8 rfpath;
+ u32 last_rssi, tmpval;
+
+ if (pstats->packet_toself || pstats->packet_beacon) {
+ rtlpriv->stats.rssi_calculate_cnt++;
+
+ if (rtlpriv->stats.ui_rssi.total_num++ >=
+ PHY_RSSI_SLID_WIN_MAX) {
+ rtlpriv->stats.ui_rssi.total_num =
+ PHY_RSSI_SLID_WIN_MAX;
+ last_rssi = rtlpriv->stats.ui_rssi.elements[
+ rtlpriv->stats.ui_rssi.index];
+ rtlpriv->stats.ui_rssi.total_val -= last_rssi;
+ }
+
+ rtlpriv->stats.ui_rssi.total_val += pstats->signalstrength;
+ rtlpriv->stats.ui_rssi.elements[rtlpriv->stats.ui_rssi.index++]
+ = pstats->signalstrength;
+
+ if (rtlpriv->stats.ui_rssi.index >= PHY_RSSI_SLID_WIN_MAX)
+ rtlpriv->stats.ui_rssi.index = 0;
+
+ tmpval = rtlpriv->stats.ui_rssi.total_val /
+ rtlpriv->stats.ui_rssi.total_num;
+ rtlpriv->stats.signal_strength = _rtl92se_translate_todbm(hw,
+ (u8) tmpval);
+ pstats->rssi = rtlpriv->stats.signal_strength;
+ }
+
+ if (!pstats->is_cck && pstats->packet_toself) {
+ for (rfpath = RF90_PATH_A; rfpath < rtlphy->num_total_rfpath;
+ rfpath++) {
+ if (rtlpriv->stats.rx_rssi_percentage[rfpath] == 0) {
+ rtlpriv->stats.rx_rssi_percentage[rfpath] =
+ pstats->rx_mimo_signalstrength[rfpath];
+
+ }
+
+ if (pstats->rx_mimo_signalstrength[rfpath] >
+ rtlpriv->stats.rx_rssi_percentage[rfpath]) {
+ rtlpriv->stats.rx_rssi_percentage[rfpath] =
+ ((rtlpriv->stats.rx_rssi_percentage[rfpath]
+ * (RX_SMOOTH_FACTOR - 1)) +
+ (pstats->rx_mimo_signalstrength[rfpath])) /
+ (RX_SMOOTH_FACTOR);
+
+ rtlpriv->stats.rx_rssi_percentage[rfpath]++;
+ } else {
+ rtlpriv->stats.rx_rssi_percentage[rfpath] =
+ ((rtlpriv->stats.rx_rssi_percentage[rfpath]
+ * (RX_SMOOTH_FACTOR - 1)) +
+ (pstats->rx_mimo_signalstrength[rfpath])) /
+ (RX_SMOOTH_FACTOR);
+ }
+
+ }
+ }
+}
+
+static void _rtl92se_update_rxsignalstatistics(struct ieee80211_hw *hw,
+ struct rtl_stats *pstats)
+{
+ struct rtl_priv *rtlpriv = rtl_priv(hw);
+ int weighting = 0;
+
+ if (rtlpriv->stats.recv_signal_power == 0)
+ rtlpriv->stats.recv_signal_power = pstats->recvsignalpower;
+
+ if (pstats->recvsignalpower > rtlpriv->stats.recv_signal_power)
+ weighting = 5;
+ else if (pstats->recvsignalpower < rtlpriv->stats.recv_signal_power)
+ weighting = -5;
+
+ rtlpriv->stats.recv_signal_power = (rtlpriv->stats.recv_signal_power * 5
+ + pstats->recvsignalpower + weighting) / 6;
+}
+
+static void _rtl92se_process_pwdb(struct ieee80211_hw *hw,
+ struct rtl_stats *pstats)
+{
+ struct rtl_priv *rtlpriv = rtl_priv(hw);
+ struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+ long undecorated_smoothed_pwdb = 0;
+
+ if (mac->opmode == NL80211_IFTYPE_ADHOC) {
+ return;
+ } else {
+ undecorated_smoothed_pwdb =
+ rtlpriv->dm.undecorated_smoothed_pwdb;
+ }
+
+ if (pstats->packet_toself || pstats->packet_beacon) {
+ if (undecorated_smoothed_pwdb < 0)
+ undecorated_smoothed_pwdb = pstats->rx_pwdb_all;
+
+ if (pstats->rx_pwdb_all > (u32) undecorated_smoothed_pwdb) {
+ undecorated_smoothed_pwdb =
+ (((undecorated_smoothed_pwdb) * (RX_SMOOTH_FACTOR
+ - 1)) +
+ (pstats->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
+
+ undecorated_smoothed_pwdb = undecorated_smoothed_pwdb
+ + 1;
+ } else {
+ undecorated_smoothed_pwdb =
+ (((undecorated_smoothed_pwdb) *
+ (RX_SMOOTH_FACTOR - 1)) + (pstats->rx_pwdb_all)) /
+ (RX_SMOOTH_FACTOR);
+ }
+
+ rtlpriv->dm.undecorated_smoothed_pwdb =
+ undecorated_smoothed_pwdb;
+ _rtl92se_update_rxsignalstatistics(hw, pstats);
+ }
+}
+
+static void _rtl92se_process_ui_link_quality(struct ieee80211_hw *hw,
+ struct rtl_stats *pstats)
+{
+ struct rtl_priv *rtlpriv = rtl_priv(hw);
+ u32 last_evm = 0, n, tmpval;
+
+ if (pstats->signalquality != 0) {
+ if (pstats->packet_toself || pstats->packet_beacon) {
+
+ if (rtlpriv->stats.ui_link_quality.total_num++ >=
+ PHY_LINKQUALITY_SLID_WIN_MAX) {
+ rtlpriv->stats.ui_link_quality.total_num =
+ PHY_LINKQUALITY_SLID_WIN_MAX;
+ last_evm = rtlpriv->stats.ui_link_quality.
+ elements
+ [rtlpriv->stats.ui_link_quality.index];
+ rtlpriv->stats.ui_link_quality.total_val -=
+ last_evm;
+ }
+
+ rtlpriv->stats.ui_link_quality.total_val +=
+ pstats->signalquality;
+ rtlpriv->stats.ui_link_quality.elements[
+ rtlpriv->stats.ui_link_quality.index++] =
+ pstats->signalquality;
+
+ if (rtlpriv->stats.ui_link_quality.index >=
+ PHY_LINKQUALITY_SLID_WIN_MAX)
+ rtlpriv->stats.ui_link_quality.index = 0;
+
+ tmpval = rtlpriv->stats.ui_link_quality.total_val /
+ rtlpriv->stats.ui_link_quality.total_num;
+ rtlpriv->stats.signal_quality = tmpval;
+
+ rtlpriv->stats.last_sigstrength_inpercent = tmpval;
+
+ for (n = 0; n < 2; n++) {
+ if (pstats->rx_mimo_signalquality[n] != -1) {
+ if (rtlpriv->stats.rx_evm_percentage[n]
+ == 0) {
+ rtlpriv->stats.rx_evm_percentage
+ [n] =
+ pstats->rx_mimo_signalquality
+ [n];
+ }
+
+ rtlpriv->stats.rx_evm_percentage[n] =
+ ((rtlpriv->stats.rx_evm_percentage
+ [n] * (RX_SMOOTH_FACTOR - 1))
+ + (pstats->rx_mimo_signalquality
+ [n] * 1)) /
+ (RX_SMOOTH_FACTOR);
+ }
+ }
+ }
+ }
+}
+
+static void _rtl92se_process_phyinfo(struct ieee80211_hw *hw,
+ u8 *buffer,
+ struct rtl_stats *pcurrent_stats)
+{
+ if (!pcurrent_stats->packet_matchbssid &&
+ !pcurrent_stats->packet_beacon)
+ return;
+
+ _rtl92se_process_ui_rssi(hw, pcurrent_stats);
+ _rtl92se_process_pwdb(hw, pcurrent_stats);
+ _rtl92se_process_ui_link_quality(hw, pcurrent_stats);
+}
+
+static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
+ struct sk_buff *skb, struct rtl_stats *pstats,
+ u8 *pdesc, struct rx_fwinfo *p_drvinfo)
+{
+ struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+ struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+
+ struct ieee80211_hdr *hdr;
+ u8 *tmp_buf;
+ u8 *praddr;
+ u8 *psaddr;
+ __le16 fc;
+ u16 u_fc, type;
+ bool packet_matchbssid, packet_toself, packet_beacon;
+
+ tmp_buf = skb->data + pstats->rx_drvinfo_size + pstats->rx_bufshift;
+ hdr = (struct ieee80211_hdr *)tmp_buf;
+ fc = hdr->frame_control;
+ u_fc = le16_to_cpu(fc);
+ type = WLAN_FC_GET_TYPE(fc);
+ praddr = hdr->addr1;
+ psaddr = hdr->addr2;
+
+ packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
+ (!compare_ether_addr(mac->bssid, (u_fc & IEEE80211_FCTL_TODS) ?
+ hdr->addr1 : (u_fc & IEEE80211_FCTL_FROMDS) ?
+ hdr->addr2 : hdr->addr3)) && (!pstats->hwerror) &&
+ (!pstats->crc) && (!pstats->icv));
+
+ packet_toself = packet_matchbssid &&
+ (!compare_ether_addr(praddr, rtlefuse->dev_addr));
+
+ if (ieee80211_is_beacon(fc))
+ packet_beacon = true;
+
+ _rtl92se_query_rxphystatus(hw, pstats, pdesc, p_drvinfo,
+ packet_matchbssid, packet_toself, packet_beacon);
+ _rtl92se_process_phyinfo(hw, tmp_buf, pstats);
+}
+
+bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
+ struct ieee80211_rx_status *rx_status, u8 *pdesc,
+ struct sk_buff *skb)
+{
+ struct rx_fwinfo *p_drvinfo;
+ u32 phystatus = (u32)GET_RX_STATUS_DESC_PHY_STATUS(pdesc);
+
+ stats->length = (u16)GET_RX_STATUS_DESC_PKT_LEN(pdesc);
+ stats->rx_drvinfo_size = (u8)GET_RX_STATUS_DESC_DRVINFO_SIZE(pdesc) * 8;
+ stats->rx_bufshift = (u8)(GET_RX_STATUS_DESC_SHIFT(pdesc) & 0x03);
+ stats->icv = (u16)GET_RX_STATUS_DESC_ICV(pdesc);
+ stats->crc = (u16)GET_RX_STATUS_DESC_CRC32(pdesc);
+ stats->hwerror = (u16)(stats->crc | stats->icv);
+ stats->decrypted = !GET_RX_STATUS_DESC_SWDEC(pdesc);
+
+ stats->rate = (u8)GET_RX_STATUS_DESC_RX_MCS(pdesc);
+ stats->shortpreamble = (u16)GET_RX_STATUS_DESC_SPLCP(pdesc);
+ stats->isampdu = (bool)(GET_RX_STATUS_DESC_PAGGR(pdesc) == 1);
+ stats->timestamp_low = GET_RX_STATUS_DESC_TSFL(pdesc);
+ stats->rx_is40Mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc);
+
+ if (stats->hwerror)
+ return false;
+
+ rx_status->freq = hw->conf.channel->center_freq;
+ rx_status->band = hw->conf.channel->band;
+
+ if (GET_RX_STATUS_DESC_CRC32(pdesc))
+ rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
+
+ if (!GET_RX_STATUS_DESC_SWDEC(pdesc))
+ rx_status->flag |= RX_FLAG_DECRYPTED;
+
+ if (GET_RX_STATUS_DESC_BW(pdesc))
+ rx_status->flag |= RX_FLAG_40MHZ;
+
+ if (GET_RX_STATUS_DESC_RX_HT(pdesc))
+ rx_status->flag |= RX_FLAG_HT;
+
+ rx_status->flag |= RX_FLAG_MACTIME_MPDU;
+
+ if (stats->decrypted)
+ rx_status->flag |= RX_FLAG_DECRYPTED;
+
+ rx_status->rate_idx = _rtl92se_rate_mapping((bool)
+ GET_RX_STATUS_DESC_RX_HT(pdesc),
+ (u8)GET_RX_STATUS_DESC_RX_MCS(pdesc),
+ (bool)GET_RX_STATUS_DESC_PAGGR(pdesc));
+
+
+ rx_status->mactime = GET_RX_STATUS_DESC_TSFL(pdesc);
+ if (phystatus == true) {
+ p_drvinfo = (struct rx_fwinfo *)(skb->data +
+ stats->rx_bufshift);
+ _rtl92se_translate_rx_signal_stuff(hw, skb, stats, pdesc,
+ p_drvinfo);
+ }
+
+ rx_status->signal = stats->rssi + 10;
+
+ return true;
+}
+
+void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
+ struct ieee80211_hdr *hdr, u8 *pdesc_tx,
+ struct ieee80211_tx_info *info, struct sk_buff *skb,
+ unsigned int queue_index, struct rtl_tcb_desc *ptcb_desc)
+{
+ struct rtl_priv *rtlpriv = rtl_priv(hw);
+ struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+ struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+ struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+
+ u8 *pdesc = (u8 *) pdesc_tx;
+ u8 *qc = ieee80211_get_qos_ctl(hdr);
+ u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
+ u16 seq_number;
+ __le16 fc = hdr->frame_control;
+ u8 ReservedMacID = 0;
+ u8 fw_qsel = _rtl92se_map_hwqueue_to_fwqueue(fc, queue_index);
+ bool firstseg = (!(hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG)));
+ bool lastseg = (!(hdr->frame_control &
+ cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)));
+ dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
+ PCI_DMA_TODEVICE);
+
+ seq_number = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
+
+ rtl_get_tcb_desc(hw, info, skb, ptcb_desc);
+
+ CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE_RTL8192S);
+
+ if (firstseg) {
+ if (rtlpriv->dm.useramask) {
+ /* set txdesc macId */
+ if (ptcb_desc->mac_id < 32) {
+ SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
+ ReservedMacID |= ptcb_desc->mac_id;
+ }
+ }
+ SET_TX_DESC_RSVD_MACID(pdesc, ReservedMacID);
+
+ SET_TX_DESC_TXHT(pdesc, ((ptcb_desc->hw_rate >=
+ DESC92S_RATEMCS0) ? 1 : 0));
+
+ if (rtlhal->version == VERSION_8192S_ACUT) {
+ if (ptcb_desc->hw_rate == DESC92S_RATE1M ||
+ ptcb_desc->hw_rate == DESC92S_RATE2M ||
+ ptcb_desc->hw_rate == DESC92S_RATE5_5M ||
+ ptcb_desc->hw_rate == DESC92S_RATE11M) {
+ ptcb_desc->hw_rate = DESC92S_RATE12M;
+ }
+ }
+
+ SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
+
+ if (ptcb_desc->use_shortgi || ptcb_desc->use_shortpreamble)
+ SET_TX_DESC_TX_SHORT(pdesc, 0);
+
+ /* Aggregation related */
+ if (mac->tids[tid].agg.agg_state == RTL_AGG_ON &&
+ info->flags & IEEE80211_TX_CTL_AMPDU)
+ SET_TX_DESC_AGG_ENABLE(pdesc, 1);
+
+ /* For AMPDU, we must insert SSN into TX_DESC */
+ SET_TX_DESC_SEQ(pdesc, seq_number);
+
+ /* Protection mode related */
+ /* For 92S, if RTS/CTS are set, HW will execute RTS. */
+ /* We choose only one protection mode to execute */
+ SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable &&
+ !ptcb_desc->cts_enable) ? 1 : 0));
+ SET_TX_DESC_CTS_ENABLE(pdesc, ((ptcb_desc->cts_enable) ?
+ 1 : 0));
+ SET_TX_DESC_RTS_STBC(pdesc, ((ptcb_desc->rts_stbc) ? 1 : 0));
+
+ SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
+ SET_TX_DESC_RTS_BANDWIDTH(pdesc, 0);
+ SET_TX_DESC_RTS_SUB_CARRIER(pdesc, ptcb_desc->rts_sc);
+ SET_TX_DESC_RTS_SHORT(pdesc, ((ptcb_desc->rts_rate <=
+ DESC92S_RATE54M) ?
+ (ptcb_desc->rts_use_shortpreamble ?
+ 1 : 0)
+ : (ptcb_desc->rts_use_shortgi ? 1 : 0)));
+
+
+ /* Set Bandwidth and sub-channel settings. */
+ if (mac->bw_40) {
+ if (ptcb_desc->packet_bw) {
+ SET_TX_DESC_TX_BANDWIDTH(pdesc, 1);
+ /* use duplicated mode */
+ SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
+ } else {
+ SET_TX_DESC_TX_BANDWIDTH(pdesc, 0);
+ SET_TX_DESC_TX_SUB_CARRIER(pdesc,
+ mac->cur_40_prime_sc);
+ }
+ } else {
+ SET_TX_DESC_TX_BANDWIDTH(pdesc, 0);
+ SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
+ }
+
+ /* 3 Fill necessary field in First Descriptor */
+ /*DWORD 0*/
+ SET_TX_DESC_LINIP(pdesc, 0);
+ SET_TX_DESC_OFFSET(pdesc, 32);
+ SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb->len);
+
+ /*DWORD 1*/
+ SET_TX_DESC_RA_BRSR_ID(pdesc, ptcb_desc->ratr_index);
+
+ /* Fill security related */
+ if (info->control.hw_key) {
+ struct ieee80211_key_conf *keyconf =
+ info->control.hw_key;
+
+ switch (keyconf->cipher) {
+ case WLAN_CIPHER_SUITE_WEP40:
+ case WLAN_CIPHER_SUITE_WEP104:
+ SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
+ break;
+ case WLAN_CIPHER_SUITE_TKIP:
+ SET_TX_DESC_SEC_TYPE(pdesc, 0x2);
+ break;
+ case WLAN_CIPHER_SUITE_CCMP:
+ SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
+ break;
+ default:
+ SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
+ break;
+
+ }
+ }
+
+ /* Set Packet ID */
+ SET_TX_DESC_PACKET_ID(pdesc, 0);
+
+ /* We will assign magement queue to BK. */
+ SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
+
+ /* Alwasy enable all rate fallback range */
+ SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
+
+ /* Fix: I don't kown why hw use 6.5M to tx when set it */
+ SET_TX_DESC_USER_RATE(pdesc,
+ ptcb_desc->use_driver_rate ? 1 : 0);
+
+ /* Set NON_QOS bit. */
+ if (!ieee80211_is_data_qos(fc))
+ SET_TX_DESC_NON_QOS(pdesc, 1);
+
+ }
+
+ /* Fill fields that are required to be initialized
+ * in all of the descriptors */
+ /*DWORD 0 */
+ SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
+ SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
+
+ /* DWORD 7 */
+ SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) skb->len);
+
+ /* DOWRD 8 */
+ SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+
+ RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
+}
+
+void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
+ bool firstseg, bool lastseg, struct sk_buff *skb)
+{
+ struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+ struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+ struct rtl_tcb_desc *tcb_desc = (struct rtl_tcb_desc *)(skb->cb);
+
+ dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
+ PCI_DMA_TODEVICE);
+
+ /* Clear all status */
+ CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_CMDDESC_SIZE_RTL8192S);
+
+ /* This bit indicate this packet is used for FW download. */
+ if (tcb_desc->cmd_or_init == DESC_PACKET_TYPE_INIT) {
+ /* For firmware downlaod we only need to set LINIP */
+ SET_TX_DESC_LINIP(pdesc, tcb_desc->last_inipkt);
+
+ /* 92SE must set as 1 for firmware download HW DMA error */
+ SET_TX_DESC_FIRST_SEG(pdesc, 1);
+ SET_TX_DESC_LAST_SEG(pdesc, 1);
+
+ /* 92SE need not to set TX packet size when firmware download */
+ SET_TX_DESC_PKT_SIZE(pdesc, (u16)(skb->len));
+ SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
+ SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+
+ SET_TX_DESC_OWN(pdesc, 1);
+ } else { /* H2C Command Desc format (Host TXCMD) */
+ /* 92SE must set as 1 for firmware download HW DMA error */
+ SET_TX_DESC_FIRST_SEG(pdesc, 1);
+ SET_TX_DESC_LAST_SEG(pdesc, 1);
+
+ SET_TX_DESC_OFFSET(pdesc, 0x20);
+
+ /* Buffer size + command header */
+ SET_TX_DESC_PKT_SIZE(pdesc, (u16)(skb->len));
+ /* Fixed queue of H2C command */
+ SET_TX_DESC_QUEUE_SEL(pdesc, 0x13);
+
+ SET_BITS_TO_LE_4BYTE(skb->data, 24, 7, rtlhal->h2c_txcmd_seq);
+
+ SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
+ SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
+ SET_TX_DESC_OWN(pdesc, 1);
+ }
+}
+
+void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
+{
+ if (istx == true) {
+ switch (desc_name) {
+ case HW_DESC_OWN:
+ SET_TX_DESC_OWN(pdesc, 1);
+ break;
+ case HW_DESC_TX_NEXTDESC_ADDR:
+ SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
+ break;
+ default:
+ RT_ASSERT(false, ("ERR txdesc :%d not process\n",
+ desc_name));
+ break;
+ }
+ } else {
+ switch (desc_name) {
+ case HW_DESC_RXOWN:
+ SET_RX_STATUS_DESC_OWN(pdesc, 1);
+ break;
+ case HW_DESC_RXBUFF_ADDR:
+ SET_RX_STATUS__DESC_BUFF_ADDR(pdesc, *(u32 *) val);
+ break;
+ case HW_DESC_RXPKT_LEN:
+ SET_RX_STATUS_DESC_PKT_LEN(pdesc, *(u32 *) val);
+ break;
+ case HW_DESC_RXERO:
+ SET_RX_STATUS_DESC_EOR(pdesc, 1);
+ break;
+ default:
+ RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
+ desc_name));
+ break;
+ }
+ }
+}
+
+u32 rtl92se_get_desc(u8 *p_desc, bool istx, u8 desc_name)
+{
+ u32 ret = 0;
+
+ if (istx == true) {
+ switch (desc_name) {
+ case HW_DESC_OWN:
+ ret = GET_TX_DESC_OWN(p_desc);
+ break;
+ case HW_DESC_TXBUFF_ADDR:
+ ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);
+ break;
+ default:
+ RT_ASSERT(false, ("ERR txdesc :%d not process\n",
+ desc_name));
+ break;
+ }
+ } else {
+ switch (desc_name) {
+ case HW_DESC_OWN:
+ ret = GET_RX_STATUS_DESC_OWN(p_desc);
+ break;
+ case HW_DESC_RXPKT_LEN:
+ ret = GET_RX_STATUS_DESC_PKT_LEN(p_desc);
+ break;
+ default:
+ RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
+ desc_name));
+ break;
+ }
+ }
+ return ret;
+}
+
+void rtl92se_tx_polling(struct ieee80211_hw *hw, unsigned int hw_queue)
+{
+ struct rtl_priv *rtlpriv = rtl_priv(hw);
+ rtl_write_word(rtlpriv, TP_POLL, BIT(0) << (hw_queue));
+}
+
Index: wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
===================================================================
--- /dev/null
+++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ * Copyright(c) 2009-2010 Realtek Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+ * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
+ * Hsinchu 300, Taiwan.
+ *
+ * Larry Finger <Larry.Finger@lwfinger.net>
+ *
+ *****************************************************************************/
+#ifndef __REALTEK_PCI92SE_TRX_H__
+#define __REALTEK_PCI92SE_TRX_H__
+
+void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
+ u8 *pdesc, struct ieee80211_tx_info *info, struct sk_buff* skb,
+ unsigned int qsel, struct rtl_tcb_desc *ptcb_desc);
+void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
+ bool b_firstseg, bool b_lastseg,
+ struct sk_buff *skb);
+bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
+ struct ieee80211_rx_status *rx_status, u8 *pdesc, struct sk_buff *skb);
+void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val);
+u32 rtl92se_get_desc(u8 *pdesc, bool istx, u8 desc_name);
+void rtl92se_tx_polling(struct ieee80211_hw *hw, unsigned int hw_queue);
+
+#endif
+
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig
2011-03-06 6:36 [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig Larry Finger
@ 2011-03-06 20:14 ` François Valenduc
2011-03-06 20:43 ` Larry Finger
0 siblings, 1 reply; 7+ messages in thread
From: François Valenduc @ 2011-03-06 20:14 UTC (permalink / raw)
To: Larry Finger; +Cc: public-linux-wireless-u79uwXL29TY76Z2rM5mHXA
Le 06/03/11 07:36, Larry Finger a écrit :
> From: Chaoming Li <chaoming_li-kXabqFNEczNtrwSWzY7KCg@public.gmane.org>
>
> Merge routines trx.c and trx.h for RTL8192SE.
>
> Signed-off-by: Chaoming_Li <chaoming_li-kXabqFNEczNtrwSWzY7KCg@public.gmane.org>
> Signed-off-by: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
> ---
>
> Index: wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
> ===================================================================
> --- /dev/null
> +++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
> @@ -0,0 +1,978 @@
> +/******************************************************************************
> + *
> + * Copyright(c) 2009-2010 Realtek Corporation.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License along with
> + * this program; if not, write to the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
> + *
> + * The full GNU General Public License is included in this distribution in the
> + * file called LICENSE.
> + *
> + * Contact Information:
> + * wlanfae <wlanfae-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org>
> + * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
> + * Hsinchu 300, Taiwan.
> + *
> + * Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
> + *
> + *****************************************************************************/
> +
> +#include "../wifi.h"
> +#include "../pci.h"
> +#include "../base.h"
> +#include "reg.h"
> +#include "def.h"
> +#include "phy.h"
> +#include "fw.h"
> +#include "trx.h"
> +#include "led.h"
> +
> +static u8 _rtl92se_map_hwqueue_to_fwqueue(__le16 fc, unsigned int skb_queue)
> +{
> + u8 qsel;
> +
> + if (unlikely(ieee80211_is_beacon(fc)))
> + return QSLT_BEACON;
> +
> + if (ieee80211_is_mgmt(fc))
> + return QSLT_MGNT;
> +
> + if (ieee80211_is_nullfunc(fc))
> + return QSLT_HIGH;
> +
> + switch (skb_queue) {
> + case VO_QUEUE:
> + qsel = QSLT_VO;
> + break;
> + case VI_QUEUE:
> + qsel = QSLT_VI;
> + break;
> + case BE_QUEUE:
> + qsel = QSLT_BE;
> + break;
> + case BK_QUEUE:
> + qsel = QSLT_BK;
> + break;
> + default:
> + qsel = QSLT_BE;
> + RT_ASSERT(false, ("BE queue, skb_queue:%d, set qsel = 0x%X\n",
> + skb_queue, QSLT_BE));
> + break;
> + }
> + return qsel;
> +}
> +
> +static int _rtl92se_rate_mapping(bool isht, u8 desc_rate, bool first_ampdu)
> +{
> + int rate_idx = 0;
> +
> + if (first_ampdu) {
> + if (false == isht) {
> + switch (desc_rate) {
> + case DESC92S_RATE1M:
> + rate_idx = 0;
> + break;
> + case DESC92S_RATE2M:
> + rate_idx = 1;
> + break;
> + case DESC92S_RATE5_5M:
> + rate_idx = 2;
> + break;
> + case DESC92S_RATE11M:
> + rate_idx = 3;
> + break;
> + case DESC92S_RATE6M:
> + rate_idx = 4;
> + break;
> + case DESC92S_RATE9M:
> + rate_idx = 5;
> + break;
> + case DESC92S_RATE12M:
> + rate_idx = 6;
> + break;
> + case DESC92S_RATE18M:
> + rate_idx = 7;
> + break;
> + case DESC92S_RATE24M:
> + rate_idx = 8;
> + break;
> + case DESC92S_RATE36M:
> + rate_idx = 9;
> + break;
> + case DESC92S_RATE48M:
> + rate_idx = 10;
> + break;
> + case DESC92S_RATE54M:
> + rate_idx = 11;
> + break;
> + default:
> + rate_idx = 0;
> + break;
> + }
> + } else {
> + rate_idx = 11;
> + }
> +
> + return rate_idx;
> + }
> +
> + switch (desc_rate) {
> + case DESC92S_RATE1M:
> + rate_idx = 0;
> + break;
> + case DESC92S_RATE2M:
> + rate_idx = 1;
> + break;
> + case DESC92S_RATE5_5M:
> + rate_idx = 2;
> + break;
> + case DESC92S_RATE11M:
> + rate_idx = 3;
> + break;
> + case DESC92S_RATE6M:
> + rate_idx = 4;
> + break;
> + case DESC92S_RATE9M:
> + rate_idx = 5;
> + break;
> + case DESC92S_RATE12M:
> + rate_idx = 6;
> + break;
> + case DESC92S_RATE18M:
> + rate_idx = 7;
> + break;
> + case DESC92S_RATE24M:
> + rate_idx = 8;
> + break;
> + case DESC92S_RATE36M:
> + rate_idx = 9;
> + break;
> + case DESC92S_RATE48M:
> + rate_idx = 10;
> + break;
> + case DESC92S_RATE54M:
> + rate_idx = 11;
> + break;
> + default:
> + rate_idx = 11;
> + break;
> + }
> + return rate_idx;
> +}
> +
> +static u8 _rtl92s_query_rxpwrpercentage(char antpower)
> +{
> + if ((antpower <= -100) || (antpower >= 20))
> + return 0;
> + else if (antpower >= 0)
> + return 100;
> + else
> + return 100 + antpower;
> +}
> +
> +static u8 _rtl92s_evm_db_to_percentage(char value)
> +{
> + char ret_val;
> + ret_val = value;
> +
> + if (ret_val >= 0)
> + ret_val = 0;
> +
> + if (ret_val <= -33)
> + ret_val = -33;
> +
> + ret_val = 0 - ret_val;
> + ret_val *= 3;
> +
> + if (ret_val == 99)
> + ret_val = 100;
> +
> + return ret_val;
> +}
> +
> +static long _rtl92se_translate_todbm(struct ieee80211_hw *hw,
> + u8 signal_strength_index)
> +{
> + long signal_power;
> +
> + signal_power = (long)((signal_strength_index + 1) >> 1);
> + signal_power -= 95;
> + return signal_power;
> +}
> +
> +static long _rtl92se_signal_scale_mapping(struct ieee80211_hw *hw,
> + long currsig)
> +{
> + long retsig = 0;
> +
> + /* Step 1. Scale mapping. */
> + if (currsig > 47)
> + retsig = 100;
> + else if (currsig > 14 && currsig <= 47)
> + retsig = 100 - ((47 - currsig) * 3) / 2;
> + else if (currsig > 2 && currsig <= 14)
> + retsig = 48 - ((14 - currsig) * 15) / 7;
> + else if (currsig >= 0)
> + retsig = currsig * 9 + 1;
> +
> + return retsig;
> +}
> +
> +
> +static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
> + struct rtl_stats *pstats, u8 *pdesc,
> + struct rx_fwinfo *p_drvinfo,
> + bool packet_match_bssid, bool packet_toself,
> + bool packet_beacon)
> +{
> + struct rtl_priv *rtlpriv = rtl_priv(hw);
> + struct phy_sts_cck_8192s_t *cck_buf;
> + s8 rx_pwr_all = 0, rx_pwr[4];
> + u8 rf_rx_num = 0, evm, pwdb_all;
> + u8 i, max_spatial_stream;
> + u32 rssi, total_rssi = 0;
> + bool in_powersavemode = false;
> + bool is_cck_rate;
> +
> + is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc);
> + pstats->packet_matchbssid = packet_match_bssid;
> + pstats->packet_toself = packet_toself;
> + pstats->is_cck = is_cck_rate;
> + pstats->packet_beacon = packet_beacon;
> + pstats->is_cck = is_cck_rate;
> + pstats->rx_mimo_signalquality[0] = -1;
> + pstats->rx_mimo_signalquality[1] = -1;
> +
> + if (is_cck_rate) {
> + u8 report, cck_highpwr;
> + cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
> +
> + if (!in_powersavemode)
> + cck_highpwr = (u8) rtl_get_bbreg(hw,
> + RFPGA0_XA_HSSIPARAMETER2,
> + 0x200);
> + else
> + cck_highpwr = false;
> +
> + if (!cck_highpwr) {
> + u8 cck_agc_rpt = cck_buf->cck_agc_rpt;
> + report = cck_buf->cck_agc_rpt & 0xc0;
> + report = report >> 6;
> + switch (report) {
> + case 0x3:
> + rx_pwr_all = -40 - (cck_agc_rpt & 0x3e);
> + break;
> + case 0x2:
> + rx_pwr_all = -20 - (cck_agc_rpt & 0x3e);
> + break;
> + case 0x1:
> + rx_pwr_all = -2 - (cck_agc_rpt & 0x3e);
> + break;
> + case 0x0:
> + rx_pwr_all = 14 - (cck_agc_rpt & 0x3e);
> + break;
> + }
> + } else {
> + u8 cck_agc_rpt = cck_buf->cck_agc_rpt;
> + report = p_drvinfo->cfosho[0] & 0x60;
> + report = report >> 5;
> + switch (report) {
> + case 0x3:
> + rx_pwr_all = -40 - ((cck_agc_rpt & 0x1f) << 1);
> + break;
> + case 0x2:
> + rx_pwr_all = -20 - ((cck_agc_rpt & 0x1f) << 1);
> + break;
> + case 0x1:
> + rx_pwr_all = -2 - ((cck_agc_rpt & 0x1f) << 1);
> + break;
> + case 0x0:
> + rx_pwr_all = 14 - ((cck_agc_rpt & 0x1f) << 1);
> + break;
> + }
> + }
> +
> + pwdb_all = _rtl92s_query_rxpwrpercentage(rx_pwr_all);
> +
> + /* CCK gain is smaller than OFDM/MCS gain, */
> + /* so we add gain diff by experiences, the val is 6 */
> + pwdb_all += 6;
> + if (pwdb_all > 100)
> + pwdb_all = 100;
> + /* modify the offset to make the same gain index with OFDM. */
> + if (pwdb_all > 34 && pwdb_all <= 42)
> + pwdb_all -= 2;
> + else if (pwdb_all > 26 && pwdb_all <= 34)
> + pwdb_all -= 6;
> + else if (pwdb_all > 14 && pwdb_all <= 26)
> + pwdb_all -= 8;
> + else if (pwdb_all > 4 && pwdb_all <= 14)
> + pwdb_all -= 4;
> +
> + pstats->rx_pwdb_all = pwdb_all;
> + pstats->recvsignalpower = rx_pwr_all;
> +
> + if (packet_match_bssid) {
> + u8 sq;
> + if (pstats->rx_pwdb_all > 40) {
> + sq = 100;
> + } else {
> + sq = cck_buf->sq_rpt;
> + if (sq > 64)
> + sq = 0;
> + else if (sq < 20)
> + sq = 100;
> + else
> + sq = ((64 - sq) * 100) / 44;
> + }
> +
> + pstats->signalquality = sq;
> + pstats->rx_mimo_signalquality[0] = sq;
> + pstats->rx_mimo_signalquality[1] = -1;
> + }
> + } else {
> + rtlpriv->dm.rfpath_rxenable[0] =
> + rtlpriv->dm.rfpath_rxenable[1] = true;
> + for (i = RF90_PATH_A; i < RF90_PATH_MAX; i++) {
> + if (rtlpriv->dm.rfpath_rxenable[i])
> + rf_rx_num++;
> +
> + rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2) -
> + 110;
> + rssi = _rtl92s_query_rxpwrpercentage(rx_pwr[i]);
> + total_rssi += rssi;
> + rtlpriv->stats.rx_snr_db[i] = (long)(p_drvinfo->rxsnr[i]
> + / 2);
> +
> + if (packet_match_bssid)
> + pstats->rx_mimo_signalstrength[i] = (u8) rssi;
> + }
> +
> + rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
> + pwdb_all = _rtl92s_query_rxpwrpercentage(rx_pwr_all);
> + pstats->rx_pwdb_all = pwdb_all;
> + pstats->rxpower = rx_pwr_all;
> + pstats->recvsignalpower = rx_pwr_all;
> +
> + if (GET_RX_STATUS_DESC_RX_HT(pdesc) &&
> + GET_RX_STATUS_DESC_RX_MCS(pdesc) >= DESC92S_RATEMCS8 &&
> + GET_RX_STATUS_DESC_RX_MCS(pdesc) <= DESC92S_RATEMCS15)
> + max_spatial_stream = 2;
> + else
> + max_spatial_stream = 1;
> +
> + for (i = 0; i < max_spatial_stream; i++) {
> + evm = _rtl92s_evm_db_to_percentage(p_drvinfo->rxevm[i]);
> +
> + if (packet_match_bssid) {
> + if (i == 0)
> + pstats->signalquality = (u8)(evm&0xff);
> + pstats->rx_mimo_signalquality[i] =
> + (u8)(evm & 0xff);
> + }
> + }
> + }
> +
> + if (is_cck_rate)
> + pstats->signalstrength = (u8)(_rtl92se_signal_scale_mapping(hw,
> + pwdb_all));
> + else if (rf_rx_num != 0)
> + pstats->signalstrength = (u8) (_rtl92se_signal_scale_mapping(hw,
> + total_rssi /= rf_rx_num));
> +}
> +
> +static void _rtl92se_process_ui_rssi(struct ieee80211_hw *hw,
> + struct rtl_stats *pstats)
> +{
> + struct rtl_priv *rtlpriv = rtl_priv(hw);
> + struct rtl_phy *rtlphy = &(rtlpriv->phy);
> + u8 rfpath;
> + u32 last_rssi, tmpval;
> +
> + if (pstats->packet_toself || pstats->packet_beacon) {
> + rtlpriv->stats.rssi_calculate_cnt++;
> +
> + if (rtlpriv->stats.ui_rssi.total_num++ >=
> + PHY_RSSI_SLID_WIN_MAX) {
> + rtlpriv->stats.ui_rssi.total_num =
> + PHY_RSSI_SLID_WIN_MAX;
> + last_rssi = rtlpriv->stats.ui_rssi.elements[
> + rtlpriv->stats.ui_rssi.index];
> + rtlpriv->stats.ui_rssi.total_val -= last_rssi;
> + }
> +
> + rtlpriv->stats.ui_rssi.total_val += pstats->signalstrength;
> + rtlpriv->stats.ui_rssi.elements[rtlpriv->stats.ui_rssi.index++]
> + = pstats->signalstrength;
> +
> + if (rtlpriv->stats.ui_rssi.index >= PHY_RSSI_SLID_WIN_MAX)
> + rtlpriv->stats.ui_rssi.index = 0;
> +
> + tmpval = rtlpriv->stats.ui_rssi.total_val /
> + rtlpriv->stats.ui_rssi.total_num;
> + rtlpriv->stats.signal_strength = _rtl92se_translate_todbm(hw,
> + (u8) tmpval);
> + pstats->rssi = rtlpriv->stats.signal_strength;
> + }
> +
> + if (!pstats->is_cck && pstats->packet_toself) {
> + for (rfpath = RF90_PATH_A; rfpath < rtlphy->num_total_rfpath;
> + rfpath++) {
> + if (rtlpriv->stats.rx_rssi_percentage[rfpath] == 0) {
> + rtlpriv->stats.rx_rssi_percentage[rfpath] =
> + pstats->rx_mimo_signalstrength[rfpath];
> +
> + }
> +
> + if (pstats->rx_mimo_signalstrength[rfpath] >
> + rtlpriv->stats.rx_rssi_percentage[rfpath]) {
> + rtlpriv->stats.rx_rssi_percentage[rfpath] =
> + ((rtlpriv->stats.rx_rssi_percentage[rfpath]
> + * (RX_SMOOTH_FACTOR - 1)) +
> + (pstats->rx_mimo_signalstrength[rfpath])) /
> + (RX_SMOOTH_FACTOR);
> +
> + rtlpriv->stats.rx_rssi_percentage[rfpath]++;
> + } else {
> + rtlpriv->stats.rx_rssi_percentage[rfpath] =
> + ((rtlpriv->stats.rx_rssi_percentage[rfpath]
> + * (RX_SMOOTH_FACTOR - 1)) +
> + (pstats->rx_mimo_signalstrength[rfpath])) /
> + (RX_SMOOTH_FACTOR);
> + }
> +
> + }
> + }
> +}
> +
> +static void _rtl92se_update_rxsignalstatistics(struct ieee80211_hw *hw,
> + struct rtl_stats *pstats)
> +{
> + struct rtl_priv *rtlpriv = rtl_priv(hw);
> + int weighting = 0;
> +
> + if (rtlpriv->stats.recv_signal_power == 0)
> + rtlpriv->stats.recv_signal_power = pstats->recvsignalpower;
> +
> + if (pstats->recvsignalpower > rtlpriv->stats.recv_signal_power)
> + weighting = 5;
> + else if (pstats->recvsignalpower < rtlpriv->stats.recv_signal_power)
> + weighting = -5;
> +
> + rtlpriv->stats.recv_signal_power = (rtlpriv->stats.recv_signal_power * 5
> + + pstats->recvsignalpower + weighting) / 6;
> +}
> +
> +static void _rtl92se_process_pwdb(struct ieee80211_hw *hw,
> + struct rtl_stats *pstats)
> +{
> + struct rtl_priv *rtlpriv = rtl_priv(hw);
> + struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
> + long undecorated_smoothed_pwdb = 0;
> +
> + if (mac->opmode == NL80211_IFTYPE_ADHOC) {
> + return;
> + } else {
> + undecorated_smoothed_pwdb =
> + rtlpriv->dm.undecorated_smoothed_pwdb;
> + }
> +
> + if (pstats->packet_toself || pstats->packet_beacon) {
> + if (undecorated_smoothed_pwdb < 0)
> + undecorated_smoothed_pwdb = pstats->rx_pwdb_all;
> +
> + if (pstats->rx_pwdb_all > (u32) undecorated_smoothed_pwdb) {
> + undecorated_smoothed_pwdb =
> + (((undecorated_smoothed_pwdb) * (RX_SMOOTH_FACTOR
> + - 1)) +
> + (pstats->rx_pwdb_all)) / (RX_SMOOTH_FACTOR);
> +
> + undecorated_smoothed_pwdb = undecorated_smoothed_pwdb
> + + 1;
> + } else {
> + undecorated_smoothed_pwdb =
> + (((undecorated_smoothed_pwdb) *
> + (RX_SMOOTH_FACTOR - 1)) + (pstats->rx_pwdb_all)) /
> + (RX_SMOOTH_FACTOR);
> + }
> +
> + rtlpriv->dm.undecorated_smoothed_pwdb =
> + undecorated_smoothed_pwdb;
> + _rtl92se_update_rxsignalstatistics(hw, pstats);
> + }
> +}
> +
> +static void _rtl92se_process_ui_link_quality(struct ieee80211_hw *hw,
> + struct rtl_stats *pstats)
> +{
> + struct rtl_priv *rtlpriv = rtl_priv(hw);
> + u32 last_evm = 0, n, tmpval;
> +
> + if (pstats->signalquality != 0) {
> + if (pstats->packet_toself || pstats->packet_beacon) {
> +
> + if (rtlpriv->stats.ui_link_quality.total_num++ >=
> + PHY_LINKQUALITY_SLID_WIN_MAX) {
> + rtlpriv->stats.ui_link_quality.total_num =
> + PHY_LINKQUALITY_SLID_WIN_MAX;
> + last_evm = rtlpriv->stats.ui_link_quality.
> + elements
> + [rtlpriv->stats.ui_link_quality.index];
> + rtlpriv->stats.ui_link_quality.total_val -=
> + last_evm;
> + }
> +
> + rtlpriv->stats.ui_link_quality.total_val +=
> + pstats->signalquality;
> + rtlpriv->stats.ui_link_quality.elements[
> + rtlpriv->stats.ui_link_quality.index++] =
> + pstats->signalquality;
> +
> + if (rtlpriv->stats.ui_link_quality.index >=
> + PHY_LINKQUALITY_SLID_WIN_MAX)
> + rtlpriv->stats.ui_link_quality.index = 0;
> +
> + tmpval = rtlpriv->stats.ui_link_quality.total_val /
> + rtlpriv->stats.ui_link_quality.total_num;
> + rtlpriv->stats.signal_quality = tmpval;
> +
> + rtlpriv->stats.last_sigstrength_inpercent = tmpval;
> +
> + for (n = 0; n < 2; n++) {
> + if (pstats->rx_mimo_signalquality[n] != -1) {
> + if (rtlpriv->stats.rx_evm_percentage[n]
> + == 0) {
> + rtlpriv->stats.rx_evm_percentage
> + [n] =
> + pstats->rx_mimo_signalquality
> + [n];
> + }
> +
> + rtlpriv->stats.rx_evm_percentage[n] =
> + ((rtlpriv->stats.rx_evm_percentage
> + [n] * (RX_SMOOTH_FACTOR - 1))
> + + (pstats->rx_mimo_signalquality
> + [n] * 1)) /
> + (RX_SMOOTH_FACTOR);
> + }
> + }
> + }
> + }
> +}
> +
> +static void _rtl92se_process_phyinfo(struct ieee80211_hw *hw,
> + u8 *buffer,
> + struct rtl_stats *pcurrent_stats)
> +{
> + if (!pcurrent_stats->packet_matchbssid &&
> + !pcurrent_stats->packet_beacon)
> + return;
> +
> + _rtl92se_process_ui_rssi(hw, pcurrent_stats);
> + _rtl92se_process_pwdb(hw, pcurrent_stats);
> + _rtl92se_process_ui_link_quality(hw, pcurrent_stats);
> +}
> +
> +static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
> + struct sk_buff *skb, struct rtl_stats *pstats,
> + u8 *pdesc, struct rx_fwinfo *p_drvinfo)
> +{
> + struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
> + struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
> +
> + struct ieee80211_hdr *hdr;
> + u8 *tmp_buf;
> + u8 *praddr;
> + u8 *psaddr;
> + __le16 fc;
> + u16 u_fc, type;
> + bool packet_matchbssid, packet_toself, packet_beacon;
> +
> + tmp_buf = skb->data + pstats->rx_drvinfo_size + pstats->rx_bufshift;
> + hdr = (struct ieee80211_hdr *)tmp_buf;
> + fc = hdr->frame_control;
> + u_fc = le16_to_cpu(fc);
> + type = WLAN_FC_GET_TYPE(fc);
> + praddr = hdr->addr1;
> + psaddr = hdr->addr2;
> +
> + packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) &&
> + (!compare_ether_addr(mac->bssid, (u_fc & IEEE80211_FCTL_TODS) ?
> + hdr->addr1 : (u_fc & IEEE80211_FCTL_FROMDS) ?
> + hdr->addr2 : hdr->addr3)) && (!pstats->hwerror) &&
> + (!pstats->crc) && (!pstats->icv));
> +
> + packet_toself = packet_matchbssid &&
> + (!compare_ether_addr(praddr, rtlefuse->dev_addr));
> +
> + if (ieee80211_is_beacon(fc))
> + packet_beacon = true;
> +
> + _rtl92se_query_rxphystatus(hw, pstats, pdesc, p_drvinfo,
> + packet_matchbssid, packet_toself, packet_beacon);
> + _rtl92se_process_phyinfo(hw, tmp_buf, pstats);
> +}
> +
> +bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
> + struct ieee80211_rx_status *rx_status, u8 *pdesc,
> + struct sk_buff *skb)
> +{
> + struct rx_fwinfo *p_drvinfo;
> + u32 phystatus = (u32)GET_RX_STATUS_DESC_PHY_STATUS(pdesc);
> +
> + stats->length = (u16)GET_RX_STATUS_DESC_PKT_LEN(pdesc);
> + stats->rx_drvinfo_size = (u8)GET_RX_STATUS_DESC_DRVINFO_SIZE(pdesc) * 8;
> + stats->rx_bufshift = (u8)(GET_RX_STATUS_DESC_SHIFT(pdesc) & 0x03);
> + stats->icv = (u16)GET_RX_STATUS_DESC_ICV(pdesc);
> + stats->crc = (u16)GET_RX_STATUS_DESC_CRC32(pdesc);
> + stats->hwerror = (u16)(stats->crc | stats->icv);
> + stats->decrypted = !GET_RX_STATUS_DESC_SWDEC(pdesc);
> +
> + stats->rate = (u8)GET_RX_STATUS_DESC_RX_MCS(pdesc);
> + stats->shortpreamble = (u16)GET_RX_STATUS_DESC_SPLCP(pdesc);
> + stats->isampdu = (bool)(GET_RX_STATUS_DESC_PAGGR(pdesc) == 1);
> + stats->timestamp_low = GET_RX_STATUS_DESC_TSFL(pdesc);
> + stats->rx_is40Mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc);
> +
> + if (stats->hwerror)
> + return false;
> +
> + rx_status->freq = hw->conf.channel->center_freq;
> + rx_status->band = hw->conf.channel->band;
> +
> + if (GET_RX_STATUS_DESC_CRC32(pdesc))
> + rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
> +
> + if (!GET_RX_STATUS_DESC_SWDEC(pdesc))
> + rx_status->flag |= RX_FLAG_DECRYPTED;
> +
> + if (GET_RX_STATUS_DESC_BW(pdesc))
> + rx_status->flag |= RX_FLAG_40MHZ;
> +
> + if (GET_RX_STATUS_DESC_RX_HT(pdesc))
> + rx_status->flag |= RX_FLAG_HT;
> +
> + rx_status->flag |= RX_FLAG_MACTIME_MPDU;
> +
> + if (stats->decrypted)
> + rx_status->flag |= RX_FLAG_DECRYPTED;
> +
> + rx_status->rate_idx = _rtl92se_rate_mapping((bool)
> + GET_RX_STATUS_DESC_RX_HT(pdesc),
> + (u8)GET_RX_STATUS_DESC_RX_MCS(pdesc),
> + (bool)GET_RX_STATUS_DESC_PAGGR(pdesc));
> +
> +
> + rx_status->mactime = GET_RX_STATUS_DESC_TSFL(pdesc);
> + if (phystatus == true) {
> + p_drvinfo = (struct rx_fwinfo *)(skb->data +
> + stats->rx_bufshift);
> + _rtl92se_translate_rx_signal_stuff(hw, skb, stats, pdesc,
> + p_drvinfo);
> + }
> +
> + rx_status->signal = stats->rssi + 10;
> +
> + return true;
> +}
> +
> +void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
> + struct ieee80211_hdr *hdr, u8 *pdesc_tx,
> + struct ieee80211_tx_info *info, struct sk_buff *skb,
> + unsigned int queue_index, struct rtl_tcb_desc *ptcb_desc)
> +{
> + struct rtl_priv *rtlpriv = rtl_priv(hw);
> + struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
> + struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
> + struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
> +
> + u8 *pdesc = (u8 *) pdesc_tx;
> + u8 *qc = ieee80211_get_qos_ctl(hdr);
> + u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
> + u16 seq_number;
> + __le16 fc = hdr->frame_control;
> + u8 ReservedMacID = 0;
> + u8 fw_qsel = _rtl92se_map_hwqueue_to_fwqueue(fc, queue_index);
> + bool firstseg = (!(hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG)));
> + bool lastseg = (!(hdr->frame_control &
> + cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)));
> + dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
> + PCI_DMA_TODEVICE);
> +
> + seq_number = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
> +
> + rtl_get_tcb_desc(hw, info, skb, ptcb_desc);
> +
> + CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE_RTL8192S);
> +
> + if (firstseg) {
> + if (rtlpriv->dm.useramask) {
> + /* set txdesc macId */
> + if (ptcb_desc->mac_id < 32) {
> + SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
> + ReservedMacID |= ptcb_desc->mac_id;
> + }
> + }
> + SET_TX_DESC_RSVD_MACID(pdesc, ReservedMacID);
> +
> + SET_TX_DESC_TXHT(pdesc, ((ptcb_desc->hw_rate >=
> + DESC92S_RATEMCS0) ? 1 : 0));
> +
> + if (rtlhal->version == VERSION_8192S_ACUT) {
> + if (ptcb_desc->hw_rate == DESC92S_RATE1M ||
> + ptcb_desc->hw_rate == DESC92S_RATE2M ||
> + ptcb_desc->hw_rate == DESC92S_RATE5_5M ||
> + ptcb_desc->hw_rate == DESC92S_RATE11M) {
> + ptcb_desc->hw_rate = DESC92S_RATE12M;
> + }
> + }
> +
> + SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
> +
> + if (ptcb_desc->use_shortgi || ptcb_desc->use_shortpreamble)
> + SET_TX_DESC_TX_SHORT(pdesc, 0);
> +
> + /* Aggregation related */
> + if (mac->tids[tid].agg.agg_state == RTL_AGG_ON &&
> + info->flags & IEEE80211_TX_CTL_AMPDU)
> + SET_TX_DESC_AGG_ENABLE(pdesc, 1);
> +
> + /* For AMPDU, we must insert SSN into TX_DESC */
> + SET_TX_DESC_SEQ(pdesc, seq_number);
> +
> + /* Protection mode related */
> + /* For 92S, if RTS/CTS are set, HW will execute RTS. */
> + /* We choose only one protection mode to execute */
> + SET_TX_DESC_RTS_ENABLE(pdesc, ((ptcb_desc->rts_enable &&
> + !ptcb_desc->cts_enable) ? 1 : 0));
> + SET_TX_DESC_CTS_ENABLE(pdesc, ((ptcb_desc->cts_enable) ?
> + 1 : 0));
> + SET_TX_DESC_RTS_STBC(pdesc, ((ptcb_desc->rts_stbc) ? 1 : 0));
> +
> + SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
> + SET_TX_DESC_RTS_BANDWIDTH(pdesc, 0);
> + SET_TX_DESC_RTS_SUB_CARRIER(pdesc, ptcb_desc->rts_sc);
> + SET_TX_DESC_RTS_SHORT(pdesc, ((ptcb_desc->rts_rate <=
> + DESC92S_RATE54M) ?
> + (ptcb_desc->rts_use_shortpreamble ?
> + 1 : 0)
> + : (ptcb_desc->rts_use_shortgi ? 1 : 0)));
> +
> +
> + /* Set Bandwidth and sub-channel settings. */
> + if (mac->bw_40) {
> + if (ptcb_desc->packet_bw) {
> + SET_TX_DESC_TX_BANDWIDTH(pdesc, 1);
> + /* use duplicated mode */
> + SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
> + } else {
> + SET_TX_DESC_TX_BANDWIDTH(pdesc, 0);
> + SET_TX_DESC_TX_SUB_CARRIER(pdesc,
> + mac->cur_40_prime_sc);
> + }
> + } else {
> + SET_TX_DESC_TX_BANDWIDTH(pdesc, 0);
> + SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
> + }
> +
> + /* 3 Fill necessary field in First Descriptor */
> + /*DWORD 0*/
> + SET_TX_DESC_LINIP(pdesc, 0);
> + SET_TX_DESC_OFFSET(pdesc, 32);
> + SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb->len);
> +
> + /*DWORD 1*/
> + SET_TX_DESC_RA_BRSR_ID(pdesc, ptcb_desc->ratr_index);
> +
> + /* Fill security related */
> + if (info->control.hw_key) {
> + struct ieee80211_key_conf *keyconf =
> + info->control.hw_key;
> +
> + switch (keyconf->cipher) {
> + case WLAN_CIPHER_SUITE_WEP40:
> + case WLAN_CIPHER_SUITE_WEP104:
> + SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
> + break;
> + case WLAN_CIPHER_SUITE_TKIP:
> + SET_TX_DESC_SEC_TYPE(pdesc, 0x2);
> + break;
> + case WLAN_CIPHER_SUITE_CCMP:
> + SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
> + break;
> + default:
> + SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
> + break;
> +
> + }
> + }
> +
> + /* Set Packet ID */
> + SET_TX_DESC_PACKET_ID(pdesc, 0);
> +
> + /* We will assign magement queue to BK. */
> + SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
> +
> + /* Alwasy enable all rate fallback range */
> + SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
> +
> + /* Fix: I don't kown why hw use 6.5M to tx when set it */
> + SET_TX_DESC_USER_RATE(pdesc,
> + ptcb_desc->use_driver_rate ? 1 : 0);
> +
> + /* Set NON_QOS bit. */
> + if (!ieee80211_is_data_qos(fc))
> + SET_TX_DESC_NON_QOS(pdesc, 1);
> +
> + }
> +
> + /* Fill fields that are required to be initialized
> + * in all of the descriptors */
> + /*DWORD 0 */
> + SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
> + SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
> +
> + /* DWORD 7 */
> + SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) skb->len);
> +
> + /* DOWRD 8 */
> + SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
> +
> + RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
> +}
> +
> +void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
> + bool firstseg, bool lastseg, struct sk_buff *skb)
> +{
> + struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
> + struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
> + struct rtl_tcb_desc *tcb_desc = (struct rtl_tcb_desc *)(skb->cb);
> +
> + dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len,
> + PCI_DMA_TODEVICE);
> +
> + /* Clear all status */
> + CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_CMDDESC_SIZE_RTL8192S);
> +
> + /* This bit indicate this packet is used for FW download. */
> + if (tcb_desc->cmd_or_init == DESC_PACKET_TYPE_INIT) {
> + /* For firmware downlaod we only need to set LINIP */
> + SET_TX_DESC_LINIP(pdesc, tcb_desc->last_inipkt);
> +
> + /* 92SE must set as 1 for firmware download HW DMA error */
> + SET_TX_DESC_FIRST_SEG(pdesc, 1);
> + SET_TX_DESC_LAST_SEG(pdesc, 1);
> +
> + /* 92SE need not to set TX packet size when firmware download */
> + SET_TX_DESC_PKT_SIZE(pdesc, (u16)(skb->len));
> + SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
> + SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
> +
> + SET_TX_DESC_OWN(pdesc, 1);
> + } else { /* H2C Command Desc format (Host TXCMD) */
> + /* 92SE must set as 1 for firmware download HW DMA error */
> + SET_TX_DESC_FIRST_SEG(pdesc, 1);
> + SET_TX_DESC_LAST_SEG(pdesc, 1);
> +
> + SET_TX_DESC_OFFSET(pdesc, 0x20);
> +
> + /* Buffer size + command header */
> + SET_TX_DESC_PKT_SIZE(pdesc, (u16)(skb->len));
> + /* Fixed queue of H2C command */
> + SET_TX_DESC_QUEUE_SEL(pdesc, 0x13);
> +
> + SET_BITS_TO_LE_4BYTE(skb->data, 24, 7, rtlhal->h2c_txcmd_seq);
> +
> + SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)(skb->len));
> + SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
> + SET_TX_DESC_OWN(pdesc, 1);
> + }
> +}
> +
> +void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
> +{
> + if (istx == true) {
> + switch (desc_name) {
> + case HW_DESC_OWN:
> + SET_TX_DESC_OWN(pdesc, 1);
> + break;
> + case HW_DESC_TX_NEXTDESC_ADDR:
> + SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
> + break;
> + default:
> + RT_ASSERT(false, ("ERR txdesc :%d not process\n",
> + desc_name));
> + break;
> + }
> + } else {
> + switch (desc_name) {
> + case HW_DESC_RXOWN:
> + SET_RX_STATUS_DESC_OWN(pdesc, 1);
> + break;
> + case HW_DESC_RXBUFF_ADDR:
> + SET_RX_STATUS__DESC_BUFF_ADDR(pdesc, *(u32 *) val);
> + break;
> + case HW_DESC_RXPKT_LEN:
> + SET_RX_STATUS_DESC_PKT_LEN(pdesc, *(u32 *) val);
> + break;
> + case HW_DESC_RXERO:
> + SET_RX_STATUS_DESC_EOR(pdesc, 1);
> + break;
> + default:
> + RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
> + desc_name));
> + break;
> + }
> + }
> +}
> +
> +u32 rtl92se_get_desc(u8 *p_desc, bool istx, u8 desc_name)
> +{
> + u32 ret = 0;
> +
> + if (istx == true) {
> + switch (desc_name) {
> + case HW_DESC_OWN:
> + ret = GET_TX_DESC_OWN(p_desc);
> + break;
> + case HW_DESC_TXBUFF_ADDR:
> + ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);
> + break;
> + default:
> + RT_ASSERT(false, ("ERR txdesc :%d not process\n",
> + desc_name));
> + break;
> + }
> + } else {
> + switch (desc_name) {
> + case HW_DESC_OWN:
> + ret = GET_RX_STATUS_DESC_OWN(p_desc);
> + break;
> + case HW_DESC_RXPKT_LEN:
> + ret = GET_RX_STATUS_DESC_PKT_LEN(p_desc);
> + break;
> + default:
> + RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
> + desc_name));
> + break;
> + }
> + }
> + return ret;
> +}
> +
> +void rtl92se_tx_polling(struct ieee80211_hw *hw, unsigned int hw_queue)
> +{
> + struct rtl_priv *rtlpriv = rtl_priv(hw);
> + rtl_write_word(rtlpriv, TP_POLL, BIT(0) << (hw_queue));
> +}
> +
> Index: wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
> ===================================================================
> --- /dev/null
> +++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
> @@ -0,0 +1,45 @@
> +/******************************************************************************
> + *
> + * Copyright(c) 2009-2010 Realtek Corporation.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License along with
> + * this program; if not, write to the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
> + *
> + * The full GNU General Public License is included in this distribution in the
> + * file called LICENSE.
> + *
> + * Contact Information:
> + * wlanfae <wlanfae-Rasf1IRRPZFBDgjK7y7TUQ@public.gmane.org>
> + * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
> + * Hsinchu 300, Taiwan.
> + *
> + * Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
> + *
> + *****************************************************************************/
> +#ifndef __REALTEK_PCI92SE_TRX_H__
> +#define __REALTEK_PCI92SE_TRX_H__
> +
> +void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
> + u8 *pdesc, struct ieee80211_tx_info *info, struct sk_buff* skb,
> + unsigned int qsel, struct rtl_tcb_desc *ptcb_desc);
> +void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
> + bool b_firstseg, bool b_lastseg,
> + struct sk_buff *skb);
> +bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
> + struct ieee80211_rx_status *rx_status, u8 *pdesc, struct sk_buff *skb);
> +void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val);
> +u32 rtl92se_get_desc(u8 *pdesc, bool istx, u8 desc_name);
> +void rtl92se_tx_polling(struct ieee80211_hw *hw, unsigned int hw_queue);
> +
> +#endif
> +
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Hello,
It seems this patch is the same as the previous one (Merge routines
trx.c and trx.h for RTL8192SE). It doesn't add a Makefile and doesn't
contain KConfig entries.
François Valenduc
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig
2011-03-06 20:14 ` François Valenduc
@ 2011-03-06 20:43 ` Larry Finger
2011-03-06 20:56 ` François Valenduc
0 siblings, 1 reply; 7+ messages in thread
From: Larry Finger @ 2011-03-06 20:43 UTC (permalink / raw)
To: François Valenduc
Cc: Larry Finger, public-linux-wireless-u79uwXL29TY76Z2rM5mHXA
On 03/06/2011 02:14 PM, François Valenduc wrote:
>>
> Hello,
>
> It seems this patch is the same as the previous one (Merge routines
> trx.c and trx.h for RTL8192SE). It doesn't add a Makefile and doesn't
> contain KConfig entries.
>
> François Valenduc
Yes, I messed up my sending script. The correct patch now submitted.
Larry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig
2011-03-06 20:43 ` Larry Finger
@ 2011-03-06 20:56 ` François Valenduc
2011-03-06 21:30 ` Larry Finger
2011-03-07 2:35 ` Larry Finger
0 siblings, 2 replies; 7+ messages in thread
From: François Valenduc @ 2011-03-06 20:56 UTC (permalink / raw)
To: Larry Finger; +Cc: linux-wireless
Le 06/03/11 21:43, Larry Finger a écrit :
> On 03/06/2011 02:14 PM, François Valenduc wrote:
>>>
>> Hello,
>>
>> It seems this patch is the same as the previous one (Merge routines
>> trx.c and trx.h for RTL8192SE). It doesn't add a Makefile and doesn't
>> contain KConfig entries.
>>
>> François Valenduc
>
> Yes, I messed up my sending script. The correct patch now submitted.
>
> Larry
>
Sorry to annoy you again but either I am doing something wrong or this
new patch doesn't apply on top of the 10 first patches. There seems to
be problems in fuse.c, pci.c and core.c (all in
drivers/net/wireless/rtlwifi).
François
François
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig
2011-03-06 20:56 ` François Valenduc
@ 2011-03-06 21:30 ` Larry Finger
2011-03-07 2:35 ` Larry Finger
1 sibling, 0 replies; 7+ messages in thread
From: Larry Finger @ 2011-03-06 21:30 UTC (permalink / raw)
To: François Valenduc; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 912 bytes --]
On 03/06/2011 02:56 PM, François Valenduc wrote:
> Le 06/03/11 21:43, Larry Finger a écrit :
>> On 03/06/2011 02:14 PM, François Valenduc wrote:
>>>>
>>> Hello,
>>>
>>> It seems this patch is the same as the previous one (Merge routines
>>> trx.c and trx.h for RTL8192SE). It doesn't add a Makefile and doesn't
>>> contain KConfig entries.
>>>
>>> François Valenduc
>>
>> Yes, I messed up my sending script. The correct patch now submitted.
>>
>> Larry
>>
> Sorry to annoy you again but either I am doing something wrong or this
> new patch doesn't apply on top of the 10 first patches. There seems to
> be problems in fuse.c, pci.c and core.c (all in
> drivers/net/wireless/rtlwifi).
>
Are you using wireless-testing as your starting point? If so, you may need these
two patches applied before any of the 11. The usb_config one was already
submitted. The cleanup one needs to be part of the sequence.
Larry
[-- Attachment #2: rtlwifi_usb_config --]
[-- Type: text/plain, Size: 2096 bytes --]
Subject:
[PATCH] rtlwifi: usb parts should depend on CONFIG_USB
From:
"John W. Linville" <linville@tuxdriver.com>
Date:
Mon, 28 Feb 2011 14:48:20 -0500
To:
linux-wireless@vger.kernel.org
CC:
Geert Uytterhoeven <geert@linux-m68k.org>, Larry Finger <Larry.Finger@lwfinger.net>, George <george0505@realtek.com>, linux-next@vger.kernel.org, "John W. Linville" <linville@tuxdriver.com>
ERROR: "usb_unanchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_control_msg" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_submit_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_get_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_kill_anchored_urbs" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_put_dev" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_free_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_anchor_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
make[2]: *** [__modpost] Error 1
make[1]: *** [modules] Error 2
make: *** [sub-make] Error 2
The USB-part of rtlwifi should depend on CONFIG_USB.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/rtlwifi/Makefile | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Index: wireless-testing/drivers/net/wireless/rtlwifi/Makefile
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/Makefile
+++ wireless-testing/drivers/net/wireless/rtlwifi/Makefile
@@ -7,15 +7,18 @@ rtlwifi-objs := \
efuse.o \
ps.o \
rc.o \
- regd.o \
- usb.o
+ regd.o
rtl8192c_common-objs += \
-ifeq ($(CONFIG_PCI),y)
+ifneq ($(CONFIG_PCI),)
rtlwifi-objs += pci.o
endif
+ifneq ($(CONFIG_USB),)
+rtlwifi-objs += usb.o
+endif
+
obj-$(CONFIG_RTL8192C_COMMON) += rtl8192c/
obj-$(CONFIG_RTL8192CE) += rtl8192ce/
obj-$(CONFIG_RTL8192CU) += rtl8192cu/
[-- Attachment #3: rtlwifi_cleanup_unused_vars --]
[-- Type: text/plain, Size: 21607 bytes --]
Index: wireless-testing/drivers/net/wireless/rtlwifi/base.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/base.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/base.c
@@ -440,7 +440,7 @@ static void _rtl_txrate_selectmode(struc
}
if (rtlpriv->dm.useramask) {
- /* TODO we will differentiate adhoc and station futrue */
+ /* TODO adhoc and station handled differently in the future */
tcb_desc->mac_id = 0;
if ((mac->mode == WIRELESS_MODE_N_24G) ||
@@ -638,7 +638,7 @@ u8 rtl_is_special_data(struct ieee80211_
const struct iphdr *ip;
if (!ieee80211_is_data(fc))
- goto end;
+ return false;
if (ieee80211_is_nullfunc(fc))
return true;
@@ -694,7 +694,6 @@ u8 rtl_is_special_data(struct ieee80211_
return true;
}
-end:
return false;
}
Index: wireless-testing/drivers/net/wireless/rtlwifi/core.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/core.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/core.c
@@ -35,7 +35,7 @@
/*mutex for start & stop is must here. */
static int rtl_op_start(struct ieee80211_hw *hw)
{
- int err = 0;
+ int err;
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -45,10 +45,8 @@ static int rtl_op_start(struct ieee80211
return 0;
mutex_lock(&rtlpriv->locks.conf_mutex);
err = rtlpriv->intf_ops->adapter_start(hw);
- if (err)
- goto out;
- rtl_watch_dog_timer_callback((unsigned long)hw);
-out:
+ if (!err)
+ rtl_watch_dog_timer_callback((unsigned long)hw);
mutex_unlock(&rtlpriv->locks.conf_mutex);
return err;
}
Index: wireless-testing/drivers/net/wireless/rtlwifi/efuse.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/efuse.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/efuse.c
@@ -338,11 +338,11 @@ bool efuse_shadow_update_chk(struct ieee
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
u8 section_idx, i, Base;
u16 words_need = 0, hdr_num = 0, totalbytes, efuse_used;
- bool bwordchanged, bresult = true;
+ bool wordchanged, result = true;
for (section_idx = 0; section_idx < 16; section_idx++) {
Base = section_idx * 8;
- bwordchanged = false;
+ wordchanged = false;
for (i = 0; i < 8; i = i + 2) {
if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i] !=
@@ -351,11 +351,11 @@ bool efuse_shadow_update_chk(struct ieee
rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i +
1])) {
words_need++;
- bwordchanged = true;
+ wordchanged = true;
}
}
- if (bwordchanged == true)
+ if (wordchanged == true)
hdr_num++;
}
@@ -364,14 +364,14 @@ bool efuse_shadow_update_chk(struct ieee
if ((totalbytes + efuse_used) >=
(EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))
- bresult = false;
+ result = false;
RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
("efuse_shadow_update_chk(): totalbytes(%#x), "
"hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",
totalbytes, hdr_num, words_need, efuse_used));
- return bresult;
+ return result;
}
void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,
@@ -394,7 +394,7 @@ void efuse_shadow_write(struct ieee80211
else if (type == 2)
efuse_shadow_write_2byte(hw, offset, (u16) value);
else if (type == 4)
- efuse_shadow_write_4byte(hw, offset, (u32) value);
+ efuse_shadow_write_4byte(hw, offset, value);
}
@@ -573,7 +573,7 @@ static int efuse_one_byte_read(struct ie
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
u8 tmpidx = 0;
- int bresult;
+ int result;
rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_CTRL] + 1,
(u8) (addr & 0xff));
@@ -593,19 +593,18 @@ static int efuse_one_byte_read(struct ie
if (tmpidx < 100) {
*data = rtl_read_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_CTRL]);
- bresult = true;
+ result = true;
} else {
*data = 0xff;
- bresult = false;
+ result = false;
}
- return bresult;
+ return result;
}
static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
u8 tmpidx = 0;
- bool bresult;
RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
("Addr = %x Data=%x\n", addr, data));
@@ -627,11 +626,9 @@ static int efuse_one_byte_write(struct i
}
if (tmpidx < 100)
- bresult = true;
- else
- bresult = false;
+ return true;
- return bresult;
+ return false;
}
static void efuse_read_all_map(struct ieee80211_hw *hw, u8 * efuse)
@@ -682,11 +679,10 @@ static int efuse_pg_packet_read(struct i
{
u8 readstate = PG_STATE_HEADER;
- bool bcontinual = true;
+ bool continual = true;
u8 efuse_data, word_cnts = 0;
u16 efuse_addr = 0;
- u8 hworden;
u8 tmpdata[8];
if (data == NULL)
@@ -697,7 +693,7 @@ static int efuse_pg_packet_read(struct i
memset((void *)data, PGPKT_DATA_SIZE * sizeof(u8), 0xff);
memset((void *)tmpdata, PGPKT_DATA_SIZE * sizeof(u8), 0xff);
- while (bcontinual && (efuse_addr < EFUSE_MAX_SIZE)) {
+ while (continual && (efuse_addr < EFUSE_MAX_SIZE)) {
if (readstate & PG_STATE_HEADER) {
if (efuse_one_byte_read(hw, efuse_addr, &efuse_data)
&& (efuse_data != 0xFF))
@@ -706,9 +702,9 @@ static int efuse_pg_packet_read(struct i
offset, tmpdata,
&readstate);
else
- bcontinual = false;
+ continual = false;
} else if (readstate & PG_STATE_DATA) {
- efuse_word_enable_data_read(hworden, tmpdata, data);
+ efuse_word_enable_data_read(0, tmpdata, data);
efuse_addr = efuse_addr + (word_cnts * 2) + 1;
readstate = PG_STATE_HEADER;
}
@@ -726,13 +722,13 @@ static int efuse_pg_packet_read(struct i
}
static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
- u8 efuse_data, u8 offset, int *bcontinual,
+ u8 efuse_data, u8 offset, int *continual,
u8 *write_state, struct pgpkt_struct *target_pkt,
- int *repeat_times, int *bresult, u8 word_en)
+ int *repeat_times, int *result, u8 word_en)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct pgpkt_struct tmp_pkt;
- int bdataempty = true;
+ bool dataempty = true;
u8 originaldata[8 * sizeof(u8)];
u8 badworden = 0x0F;
u8 match_word_en, tmp_word_en;
@@ -752,10 +748,10 @@ static void efuse_write_data_case1(struc
u16 address = *efuse_addr + 1 + tmpindex;
if (efuse_one_byte_read(hw, address,
&efuse_data) && (efuse_data != 0xFF))
- bdataempty = false;
+ dataempty = false;
}
- if (bdataempty == false) {
+ if (dataempty == false) {
*efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1;
*write_state = PG_STATE_HEADER;
} else {
@@ -812,12 +808,12 @@ static void efuse_write_data_case1(struc
target_pkt->offset = offset;
target_pkt->word_en = tmp_word_en;
} else
- *bcontinual = false;
+ *continual = false;
*write_state = PG_STATE_HEADER;
*repeat_times += 1;
if (*repeat_times > EFUSE_REPEAT_THRESHOLD_) {
- *bcontinual = false;
- *bresult = false;
+ *continual = false;
+ *result = false;
}
} else {
*efuse_addr += (2 * tmp_word_cnts) + 1;
@@ -831,9 +827,9 @@ static void efuse_write_data_case1(struc
}
static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
- int *bcontinual, u8 *write_state,
+ int *continual, u8 *write_state,
struct pgpkt_struct target_pkt,
- int *repeat_times, int *bresult)
+ int *repeat_times, int *result)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct pgpkt_struct tmp_pkt;
@@ -853,8 +849,8 @@ static void efuse_write_data_case2(struc
*write_state = PG_STATE_HEADER;
*repeat_times += 1;
if (*repeat_times > EFUSE_REPEAT_THRESHOLD_) {
- *bcontinual = false;
- *bresult = false;
+ *continual = false;
+ *result = false;
}
} else {
tmp_pkt.offset = (tmp_header >> 4) & 0x0F;
@@ -885,8 +881,8 @@ static void efuse_write_data_case2(struc
*write_state = PG_STATE_HEADER;
*repeat_times += 1;
if (*repeat_times > EFUSE_REPEAT_THRESHOLD_) {
- *bcontinual = false;
- *bresult = false;
+ *continual = false;
+ *result = false;
}
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
@@ -900,7 +896,7 @@ static int efuse_pg_packet_write(struct
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct pgpkt_struct target_pkt;
u8 write_state = PG_STATE_HEADER;
- int bcontinual = true, bdataempty = true, bresult = true;
+ int continual = true, dataempty = true, result = true;
u16 efuse_addr = 0;
u8 efuse_data;
u8 target_word_cnts = 0;
@@ -924,11 +920,11 @@ static int efuse_pg_packet_write(struct
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, ("efuse Power ON\n"));
- while (bcontinual && (efuse_addr <
+ while (continual && (efuse_addr <
(EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) {
if (write_state == PG_STATE_HEADER) {
- bdataempty = true;
+ dataempty = true;
badworden = 0x0F;
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse PG_STATE_HEADER\n"));
@@ -937,32 +933,30 @@ static int efuse_pg_packet_write(struct
(efuse_data != 0xFF))
efuse_write_data_case1(hw, &efuse_addr,
efuse_data, offset,
- &bcontinual,
+ &continual,
&write_state, &target_pkt,
- &repeat_times, &bresult,
+ &repeat_times, &result,
word_en);
else
efuse_write_data_case2(hw, &efuse_addr,
- &bcontinual,
+ &continual,
&write_state,
target_pkt,
&repeat_times,
- &bresult);
+ &result);
} else if (write_state == PG_STATE_DATA) {
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse PG_STATE_DATA\n"));
- badworden = 0x0f;
badworden =
efuse_word_enable_data_write(hw, efuse_addr + 1,
target_pkt.word_en,
target_pkt.data);
if ((badworden & 0x0F) == 0x0F) {
- bcontinual = false;
+ continual = false;
} else {
- efuse_addr =
- efuse_addr + (2 * target_word_cnts) + 1;
+ efuse_addr += (2 * target_word_cnts) + 1;
target_pkt.offset = offset;
target_pkt.word_en = badworden;
@@ -972,8 +966,8 @@ static int efuse_pg_packet_write(struct
write_state = PG_STATE_HEADER;
repeat_times++;
if (repeat_times > EFUSE_REPEAT_THRESHOLD_) {
- bcontinual = false;
- bresult = false;
+ continual = false;
+ result = false;
}
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse PG_STATE_HEADER-3\n"));
@@ -1073,13 +1067,13 @@ static u8 efuse_word_enable_data_write(s
return badworden;
}
-static void efuse_power_switch(struct ieee80211_hw *hw, u8 bwrite, u8 pwrstate)
+static void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
u8 tempval;
u16 tmpV16;
- if (pwrstate == true) {
+ if (pwrstate) {
tmpV16 = rtl_read_word(rtlpriv,
rtlpriv->cfg->maps[SYS_ISO_CTRL]);
if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {
@@ -1107,8 +1101,8 @@ static void efuse_power_switch(struct ie
}
}
- if (pwrstate == true) {
- if (bwrite == true) {
+ if (pwrstate) {
+ if (write) {
tempval = rtl_read_byte(rtlpriv,
rtlpriv->cfg->maps[EFUSE_TEST] +
3);
@@ -1120,7 +1114,7 @@ static void efuse_power_switch(struct ie
}
} else {
- if (bwrite == true) {
+ if (write) {
tempval = rtl_read_byte(rtlpriv,
rtlpriv->cfg->maps[EFUSE_TEST] +
3);
@@ -1135,12 +1129,12 @@ static void efuse_power_switch(struct ie
static u16 efuse_get_current_size(struct ieee80211_hw *hw)
{
- int bcontinual = true;
+ int continual = true;
u16 efuse_addr = 0;
u8 hoffset, hworden;
u8 efuse_data, word_cnts;
- while (bcontinual && efuse_one_byte_read(hw, efuse_addr, &efuse_data)
+ while (continual && efuse_one_byte_read(hw, efuse_addr, &efuse_data)
&& (efuse_addr < EFUSE_MAX_SIZE)) {
if (efuse_data != 0xFF) {
hoffset = (efuse_data >> 4) & 0x0F;
@@ -1148,7 +1142,7 @@ static u16 efuse_get_current_size(struct
word_cnts = efuse_calculate_word_cnts(hworden);
efuse_addr = efuse_addr + (word_cnts * 2) + 1;
} else {
- bcontinual = false;
+ continual = false;
}
}
Index: wireless-testing/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -171,7 +171,6 @@ static void _rtl92c_write_fw(struct ieee
static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
- int err = -EIO;
u32 counter = 0;
u32 value32;
@@ -184,7 +183,7 @@ static int _rtl92c_fw_free_to_go(struct
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
("chksum report faill ! REG_MCUFWDL:0x%08x .\n",
value32));
- goto exit;
+ return -EIO;
}
RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
@@ -204,8 +203,7 @@ static int _rtl92c_fw_free_to_go(struct
("Polling FW ready success!!"
" REG_MCUFWDL:0x%08x .\n",
value32));
- err = 0;
- goto exit;
+ return 0;
}
mdelay(FW_8192C_POLLING_DELAY);
@@ -214,9 +212,7 @@ static int _rtl92c_fw_free_to_go(struct
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
("Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", value32));
-
-exit:
- return err;
+ return -EIO;
}
int rtl92c_download_fw(struct ieee80211_hw *hw)
@@ -226,16 +222,14 @@ int rtl92c_download_fw(struct ieee80211_
struct rtl92c_firmware_header *pfwheader;
u8 *pfwdata;
u32 fwsize;
- int err;
enum version_8192c version = rtlhal->version;
const struct firmware *firmware;
- printk(KERN_INFO "rtl8192cu: Loading firmware file %s\n",
+ printk(KERN_INFO "rtl8192c: Loading firmware file %s\n",
rtlpriv->cfg->fw_name);
- err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
- rtlpriv->io.dev);
- if (err) {
- printk(KERN_ERR "rtl8192cu: Firmware loading failed\n");
+ if (request_firmware(&firmware, rtlpriv->cfg->fw_name,
+ rtlpriv->io.dev)) {
+ printk(KERN_ERR "rtl8192c: Firmware loading failed\n");
return 1;
}
@@ -267,8 +261,7 @@ int rtl92c_download_fw(struct ieee80211_
_rtl92c_write_fw(hw, version, pfwdata, fwsize);
_rtl92c_enable_fw_download(hw, false);
- err = _rtl92c_fw_free_to_go(hw);
- if (err) {
+ if (_rtl92c_fw_free_to_go(hw)) {
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
("Firmware is not ready to run!\n"));
} else {
@@ -303,7 +296,6 @@ static void _rtl92c_fill_h2c_command(str
u16 box_reg, box_extreg;
u8 u1b_tmp;
bool isfw_read = false;
- u8 buf_index;
bool bwrite_sucess = false;
u8 wait_h2c_limmit = 100;
u8 wait_writeh2c_limmit = 100;
@@ -414,7 +406,7 @@ static void _rtl92c_fill_h2c_command(str
case 1:
boxcontent[0] &= ~(BIT(7));
memcpy((u8 *) (boxcontent) + 1,
- p_cmdbuffer + buf_index, 1);
+ p_cmdbuffer, 1);
for (idx = 0; idx < 4; idx++) {
rtl_write_byte(rtlpriv, box_reg + idx,
@@ -424,7 +416,7 @@ static void _rtl92c_fill_h2c_command(str
case 2:
boxcontent[0] &= ~(BIT(7));
memcpy((u8 *) (boxcontent) + 1,
- p_cmdbuffer + buf_index, 2);
+ p_cmdbuffer, 2);
for (idx = 0; idx < 4; idx++) {
rtl_write_byte(rtlpriv, box_reg + idx,
@@ -434,7 +426,7 @@ static void _rtl92c_fill_h2c_command(str
case 3:
boxcontent[0] &= ~(BIT(7));
memcpy((u8 *) (boxcontent) + 1,
- p_cmdbuffer + buf_index, 3);
+ p_cmdbuffer, 3);
for (idx = 0; idx < 4; idx++) {
rtl_write_byte(rtlpriv, box_reg + idx,
@@ -444,9 +436,9 @@ static void _rtl92c_fill_h2c_command(str
case 4:
boxcontent[0] |= (BIT(7));
memcpy((u8 *) (boxextcontent),
- p_cmdbuffer + buf_index, 2);
+ p_cmdbuffer, 2);
memcpy((u8 *) (boxcontent) + 1,
- p_cmdbuffer + buf_index + 2, 2);
+ p_cmdbuffer + 2, 2);
for (idx = 0; idx < 2; idx++) {
rtl_write_byte(rtlpriv, box_extreg + idx,
@@ -461,9 +453,9 @@ static void _rtl92c_fill_h2c_command(str
case 5:
boxcontent[0] |= (BIT(7));
memcpy((u8 *) (boxextcontent),
- p_cmdbuffer + buf_index, 2);
+ p_cmdbuffer, 2);
memcpy((u8 *) (boxcontent) + 1,
- p_cmdbuffer + buf_index + 2, 3);
+ p_cmdbuffer + 2, 3);
for (idx = 0; idx < 2; idx++) {
rtl_write_byte(rtlpriv, box_extreg + idx,
Index: wireless-testing/drivers/net/wireless/rtlwifi/pci.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/pci.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/pci.c
@@ -113,32 +113,19 @@ static void _rtl_pci_update_default_sett
/*Set HW definition to determine if it supports ASPM. */
switch (rtlpci->const_support_pciaspm) {
- case 0:{
- /*Not support ASPM. */
- bool support_aspm = false;
- ppsc->support_aspm = support_aspm;
- break;
- }
- case 1:{
- /*Support ASPM. */
- bool support_aspm = true;
- bool support_backdoor = true;
- ppsc->support_aspm = support_aspm;
-
- /*if(priv->oem_id == RT_CID_TOSHIBA &&
- !priv->ndis_adapter.amd_l1_patch)
- support_backdoor = false; */
-
- ppsc->support_backdoor = support_backdoor;
-
- break;
- }
+ case 0:
+ /*Not support ASPM. */
+ ppsc->support_aspm = false;
+ break;
+ case 1:
+ /*Support ASPM. */
+ ppsc->support_aspm = true;
+ ppsc->support_backdoor = true;
+ break;
case 2:
/*ASPM value set by chipset. */
- if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL) {
- bool support_aspm = true;
- ppsc->support_aspm = support_aspm;
- }
+ if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL)
+ ppsc->support_aspm = true;
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -152,13 +139,11 @@ static bool _rtl_pci_platform_switch_dev
u8 value)
{
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
- bool bresult = false;
value |= 0x40;
-
pci_write_config_byte(rtlpci->pdev, 0x80, value);
- return bresult;
+ return false;
}
/*When we set 0x01 to enable clk request. Set 0x0 to disable clk req.*/
@@ -166,14 +151,11 @@ static bool _rtl_pci_switch_clk_req(stru
{
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
u8 buffer;
- bool bresult = false;
buffer = value;
-
pci_write_config_byte(rtlpci->pdev, 0x81, value);
- bresult = true;
- return bresult;
+ return true;
}
/*Disable RTL8192SE ASPM & Disable Pci Bridge ASPM*/
@@ -191,6 +173,7 @@ static void rtl_pci_disable_aspm(struct
u16 pcibridge_linkctrlreg = pcipriv->ndis_adapter.
pcibridge_linkctrlreg;
u16 aspmlevel = 0;
+ u8 tmp_u1b = 0;
if (pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) {
RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
@@ -204,11 +187,8 @@ static void rtl_pci_disable_aspm(struct
_rtl_pci_switch_clk_req(hw, 0x0);
}
- if (1) {
- /*for promising device will in L0 state after an I/O. */
- u8 tmp_u1b;
- pci_read_config_byte(rtlpci->pdev, 0x80, &tmp_u1b);
- }
+ /*for promising device will in L0 state after an I/O. */
+ pci_read_config_byte(rtlpci->pdev, 0x80, &tmp_u1b);
/*Set corresponding value. */
aspmlevel |= BIT(0) | BIT(1);
@@ -224,7 +204,6 @@ static void rtl_pci_disable_aspm(struct
rtl_pci_raw_write_port_uchar(PCI_CONF_DATA, pcibridge_linkctrlreg);
udelay(50);
-
}
/*
Index: wireless-testing/drivers/net/wireless/rtlwifi/pci.h
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/pci.h
+++ wireless-testing/drivers/net/wireless/rtlwifi/pci.h
@@ -192,8 +192,8 @@ struct rtl_pci {
u8 const_devicepci_aspm_setting;
/*If it supports ASPM, Offset[560h] = 0x40,
otherwise Offset[560h] = 0x00. */
- bool b_support_aspm;
- bool b_support_backdoor;
+ bool support_aspm;
+ bool support_backdoor;
/*QOS & EDCA */
enum acm_method acm_method;
Index: wireless-testing/drivers/net/wireless/rtlwifi/ps.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/ps.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/ps.c
@@ -63,7 +63,6 @@ EXPORT_SYMBOL(rtl_ps_enable_nic);
bool rtl_ps_disable_nic(struct ieee80211_hw *hw)
{
- bool status = true;
struct rtl_priv *rtlpriv = rtl_priv(hw);
/*<1> Stop all timer */
@@ -75,7 +74,7 @@ bool rtl_ps_disable_nic(struct ieee80211
/*<3> Disable Adapter */
rtlpriv->cfg->ops->hw_disable(hw);
- return status;
+ return true;
}
EXPORT_SYMBOL(rtl_ps_disable_nic);
Index: wireless-testing/drivers/net/wireless/rtlwifi/wifi.h
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/wifi.h
+++ wireless-testing/drivers/net/wireless/rtlwifi/wifi.h
@@ -765,7 +765,7 @@ struct rtl_rfkill {
#define IQK_MATRIX_REG_NUM 8
#define IQK_MATRIX_SETTINGS_NUM (1 + 24 + 21)
struct iqk_matrix_regs {
- bool b_iqk_done;
+ bool iqk_done;
long value[1][IQK_MATRIX_REG_NUM];
};
@@ -1620,19 +1620,19 @@ struct bt_coexist_info {
u32 bt_edca_ul;
u32 bt_edca_dl;
- bool b_init_set;
- bool b_bt_busy_traffic;
- bool b_bt_traffic_mode_set;
- bool b_bt_non_traffic_mode_set;
+ bool init_set;
+ bool bt_busy_traffic;
+ bool bt_traffic_mode_set;
+ bool bt_non_traffic_mode_set;
- bool b_fw_coexist_all_off;
- bool b_sw_coexist_all_off;
+ bool fw_coexist_all_off;
+ bool sw_coexist_all_off;
u32 current_state;
u32 previous_state;
u8 bt_pre_rssi_state;
- u8 b_reg_bt_iso;
- u8 b_reg_bt_sco;
+ u8 reg_bt_iso;
+ u8 reg_bt_sco;
};
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig
2011-03-06 20:56 ` François Valenduc
2011-03-06 21:30 ` Larry Finger
@ 2011-03-07 2:35 ` Larry Finger
2011-03-07 18:18 ` François Valenduc
1 sibling, 1 reply; 7+ messages in thread
From: Larry Finger @ 2011-03-07 2:35 UTC (permalink / raw)
To: François Valenduc; +Cc: linux-wireless
On 03/06/2011 02:56 PM, François Valenduc wrote:
> Sorry to annoy you again but either I am doing something wrong or this
> new patch doesn't apply on top of the 10 first patches. There seems to
> be problems in fuse.c, pci.c and core.c (all in
> drivers/net/wireless/rtlwifi).
Did the driver build for you after those other two patches were added?
What are the PCI IDs for your device? I have 3 of them, and one does not yet
work - a problem that I'm now chasing.
Larry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig
2011-03-07 2:35 ` Larry Finger
@ 2011-03-07 18:18 ` François Valenduc
0 siblings, 0 replies; 7+ messages in thread
From: François Valenduc @ 2011-03-07 18:18 UTC (permalink / raw)
To: Larry Finger; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 6048 bytes --]
Le 07/03/11 03:35, Larry Finger a écrit :
> On 03/06/2011 02:56 PM, François Valenduc wrote:
>
>> Sorry to annoy you again but either I am doing something wrong or this
>> new patch doesn't apply on top of the 10 first patches. There seems to
>> be problems in fuse.c, pci.c and core.c (all in
>> drivers/net/wireless/rtlwifi).
>
> Did the driver build for you after those other two patches were added?
>
> What are the PCI IDs for your device? I have 3 of them, and one does
> not yet work - a problem that I'm now chasing.
>
> Larry
>
I didn't manage to build the driver yet. I still get rejects when I
apply the last patch (see attached file). So, I get the following
compile error:
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:33:17: erreur: def.h : Aucun
fichier ou dossier de ce type
In file included from drivers/net/wireless/rtlwifi/rtl8192se/dm.c:34:
drivers/net/wireless/rtlwifi/rtl8192se/phy.h:95: attention : ‘enum
fwcmd_iotype’ declared inside parameter list
drivers/net/wireless/rtlwifi/rtl8192se/phy.h:95: attention : visible
uniquement depuis cette définition ou déclaration, ce qui n'est
probablement pas ce que vous désirez
drivers/net/wireless/rtlwifi/rtl8192se/dm.c: In function
‘_rtl92s_dm_txpowertracking_callback_thermalmeter’:
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:179: erreur:
‘FW_CMD_TXPWR_TRACK_THERMAL’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:179: erreur: (Each
undeclared identifier is reported only once
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:179: erreur: for each
function it appears in.)
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:179: erreur: le type du
paramètre formel 2 est incomplet
drivers/net/wireless/rtlwifi/rtl8192se/dm.c: In function
‘_rtl92s_dm_refresh_rateadaptive_mask’:
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:233: erreur:
‘FW_CMD_CTRL_DM_BY_DRIVER’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:233: erreur: le type du
paramètre formel 2 est incomplet
drivers/net/wireless/rtlwifi/rtl8192se/dm.c: In function
‘_rtl92s_dm_initial_gain_sta_beforeconnect’:
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:487: erreur:
‘FW_CMD_DIG_ENABLE’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:487: erreur: le type du
paramètre formel 2 est incomplet
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:503: erreur:
‘FW_CMD_DIG_DISABLE’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:503: erreur: le type du
paramètre formel 2 est incomplet
drivers/net/wireless/rtlwifi/rtl8192se/dm.c: In function
‘_rtl92s_dm_ctrl_initgain_bytwoport’:
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:539: erreur:
‘FW_CMD_DIG_MODE_SS’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/dm.c:539: erreur: le type du
paramètre formel 2 est incomplet
make[5]: *** [drivers/net/wireless/rtlwifi/rtl8192se/dm.o] Erreur 1
make[5]: *** Attente des tâches non terminées....
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:38:17: erreur: def.h : Aucun
fichier ou dossier de ce type
In file included from drivers/net/wireless/rtlwifi/rtl8192se/hw.c:39:
drivers/net/wireless/rtlwifi/rtl8192se/phy.h:95: attention : ‘enum
fwcmd_iotype’ declared inside parameter list
drivers/net/wireless/rtlwifi/rtl8192se/phy.h:95: attention : visible
uniquement depuis cette définition ou déclaration, ce qui n'est
probablement pas ce que vous désirez
drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function
‘_rtl92se_macconfig_before_fwdownload’:
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:715: erreur: ‘RX_MPDU_QUEUE’
undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:715: erreur: (Each
undeclared identifier is reported only once
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:715: erreur: for each
function it appears in.)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:716: erreur: ‘RX_CMD_QUEUE’
undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function ‘rtl92se_hw_init’:
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:1007: erreur:
‘RF_OP_BY_SW_3WIRE’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:1069: erreur:
‘FW_CMD_RA_INIT’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:1069: erreur: le type du
paramètre formel 2 est incomplet
drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function
‘_rtl8192se_get_IC_Inferiority’:
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:1630: erreur:
‘IC_INFERIORITY_A’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:1638: erreur:
‘IC_INFERIORITY_B’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function
‘rtl92se_update_hal_rate_table’:
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:2088: erreur:
‘FW_CMD_RA_REFRESH_N’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:2088: erreur: le type du
paramètre formel 2 est incomplet
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:2090: erreur:
‘FW_CMD_RA_REFRESH_BG’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/rtl8192se/hw.c:2090: erreur: le type du
paramètre formel 2 est incomplet
make[5]: *** [drivers/net/wireless/rtlwifi/rtl8192se/hw.o] Erreur 1
It seems there is a missing header file (def.h). Finally, the output of
lspci -v is the following:
06:00.0 Network controller: Realtek Semiconductor Co., Ltd. RTL8191SEvB
Wireless LAN Controller (rev 10)
Subsystem: Realtek Semiconductor Co., Ltd. Device 8184
Flags: bus master, fast devsel, latency 0, IRQ 17
I/O ports at 2000 [size=256]
Memory at d1500000 (32-bit, non-prefetchable) [size=16K]
Capabilities: [40] Power Management version 3
Capabilities: [50] MSI: Enable- Count=1/1 Maskable- 64bit+
Capabilities: [70] Express Legacy Endpoint, MSI 00
Capabilities: [100] Advanced Error Reporting
Capabilities: [140] Virtual Channel <?>
Capabilities: [160] Device Serial Number 88-55-22-fe-ff-4c-e0-00
Kernel driver in use: rtl819xSE
Kernel modules: r8192se_pci
[-- Attachment #2: pci.c.rej --]
[-- Type: text/plain, Size: 1455 bytes --]
***************
*** 1454,1467 ****
struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
struct pci_dev *bridge_pdev = pdev->bus->self;
- u16 venderid;
- u16 deviceid;
u16 irqline;
u8 tmp;
- venderid = pdev->vendor;
- deviceid = pdev->device;
- pci_read_config_word(pdev, 0x3C, &irqline);
if (deviceid == RTL_PCI_8192_DID ||
deviceid == RTL_PCI_0044_DID ||
--- 1625,1637 ----
struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
struct pci_dev *bridge_pdev = pdev->bus->self;
+ u16 venderid = pdev->vendor;
+ u16 deviceid = pdev->device;
+ u8 revisionid = pdev->revision;
u16 irqline;
u8 tmp;
+ pci_read_config_word(pdev, PCI_INTERRUPT_LINE, &irqline);
if (deviceid == RTL_PCI_8192_DID ||
deviceid == RTL_PCI_0044_DID ||
***************
*** 1471,1477 ****
deviceid == RTL_PCI_8173_DID ||
deviceid == RTL_PCI_8172_DID ||
deviceid == RTL_PCI_8171_DID) {
- switch (pdev->revision) {
case RTL_PCI_REVISION_ID_8192PCIE:
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
("8192 PCI-E is found - "
--- 1641,1647 ----
deviceid == RTL_PCI_8173_DID ||
deviceid == RTL_PCI_8172_DID ||
deviceid == RTL_PCI_8171_DID) {
+ switch (revisionid) {
case RTL_PCI_REVISION_ID_8192PCIE:
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
("8192 PCI-E is found - "
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-03-07 18:18 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-06 6:36 [RFC/RFT 11/11] rtlwifi: rtl8192se: Modify rtlwifi routines to handle rtl8192se and add Makefile and Kconfig Larry Finger
2011-03-06 20:14 ` François Valenduc
2011-03-06 20:43 ` Larry Finger
2011-03-06 20:56 ` François Valenduc
2011-03-06 21:30 ` Larry Finger
2011-03-07 2:35 ` Larry Finger
2011-03-07 18:18 ` François Valenduc
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).