staging: r8188eu: remove HW_VAR_SET_OPMODE from SetHwReg8188EU()

Remove the HW_VAR_SET_OPMODE case from SetHwReg8188EU() and move the
functions that are called by that case to rtw_mlme_ext.c. This is part
of the ongoing effort to get rid of SetHwReg8188EU().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220715062908.8547-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 771910763fecb386b9d7a67b37b2c74b719e5662..0edcf84db16dff34be0bc2197b936e58fd67d7b6 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -5674,6 +5674,107 @@ void clear_beacon_valid_bit(struct adapter *adapter)
        rtw_write8(adapter, REG_TDECTRL + 2, reg | BIT(0));
 }
 
+void rtw_resume_tx_beacon(struct adapter *adapt)
+{
+       struct hal_data_8188e *haldata = &adapt->haldata;
+
+       /*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
+       /*  which should be read from register to a global variable. */
+
+       rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) | BIT(6));
+       haldata->RegFwHwTxQCtrl |= BIT(6);
+       rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0xff);
+       haldata->RegReg542 |= BIT(0);
+       rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542);
+}
+
+void rtw_stop_tx_beacon(struct adapter *adapt)
+{
+       struct hal_data_8188e *haldata = &adapt->haldata;
+
+       /*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
+       /*  which should be read from register to a global variable. */
+
+       rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) & (~BIT(6)));
+       haldata->RegFwHwTxQCtrl &= (~BIT(6));
+       rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0x64);
+       haldata->RegReg542 &= ~(BIT(0));
+       rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542);
+
+        /* todo: CheckFwRsvdPageContent(Adapter);  2010.06.23. Added by tynli. */
+}
+
+static void rtw_set_opmode(struct adapter *adapter, u8 mode)
+{
+       u8 val8;
+       int res;
+
+       /*  disable Port0 TSF update */
+       res = rtw_read8(adapter, REG_BCN_CTRL, &val8);
+       if (res)
+               return;
+
+       rtw_write8(adapter, REG_BCN_CTRL, val8 | BIT(4));
+
+       /*  set net_type */
+       res = rtw_read8(adapter, MSR, &val8);
+       if (res)
+               return;
+
+       val8 &= 0x0c;
+       val8 |= mode;
+       rtw_write8(adapter, MSR, val8);
+
+       if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) {
+               rtw_stop_tx_beacon(adapter);
+
+               rtw_write8(adapter, REG_BCN_CTRL, 0x19);/* disable atim wnd */
+       } else if (mode == _HW_STATE_ADHOC_) {
+               rtw_resume_tx_beacon(adapter);
+               rtw_write8(adapter, REG_BCN_CTRL, 0x1a);
+       } else if (mode == _HW_STATE_AP_) {
+               rtw_resume_tx_beacon(adapter);
+
+               rtw_write8(adapter, REG_BCN_CTRL, 0x12);
+
+               /* Set RCR */
+               rtw_write32(adapter, REG_RCR, 0x7000208e);/* CBSSID_DATA must set to 0,reject ICV_ERR packet */
+               /* enable to rx data frame */
+               rtw_write16(adapter, REG_RXFLTMAP2, 0xFFFF);
+               /* enable to rx ps-poll */
+               rtw_write16(adapter, REG_RXFLTMAP1, 0x0400);
+
+               /* Beacon Control related register for first time */
+               rtw_write8(adapter, REG_BCNDMATIM, 0x02); /*  2ms */
+
+               rtw_write8(adapter, REG_ATIMWND, 0x0a); /*  10ms */
+               rtw_write16(adapter, REG_BCNTCFG, 0x00);
+               rtw_write16(adapter, REG_TBTT_PROHIBIT, 0xff04);
+               rtw_write16(adapter, REG_TSFTR_SYN_OFFSET, 0x7fff);/*  +32767 (~32ms) */
+
+               /* reset TSF */
+               rtw_write8(adapter, REG_DUAL_TSF_RST, BIT(0));
+
+               /* BIT(3) - If set 0, hw will clr bcnq when tx becon ok/fail or port 0 */
+               res = rtw_read8(adapter, REG_MBID_NUM, &val8);
+               if (res)
+                       return;
+
+               rtw_write8(adapter, REG_MBID_NUM, val8 | BIT(3) | BIT(4));
+
+               /* enable BCN0 Function for if1 */
+               /* don't enable update TSF0 for if1 (due to TSF update when beacon/probe rsp are received) */
+               rtw_write8(adapter, REG_BCN_CTRL, (DIS_TSF_UDT0_NORMAL_CHIP | EN_BCN_FUNCTION | BIT(1)));
+
+               /* dis BCN1 ATIM  WND if if2 is station */
+               res = rtw_read8(adapter, REG_BCN_CTRL_1, &val8);
+               if (res)
+                       return;
+
+               rtw_write8(adapter, REG_BCN_CTRL_1, val8 | BIT(0));
+       }
+}
+
 /****************************************************************************
 
 Following are some utitity fuctions for WiFi MLME
@@ -7142,7 +7243,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)
                type = _HW_STATE_NOLINK_;
        }
 
-       SetHwReg8188EU(padapter, HW_VAR_SET_OPMODE, (u8 *)(&type));
+       rtw_set_opmode(padapter, type);
 
        return H2C_SUCCESS;
 }

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 421fe7c40390f9fb2329220945f1c6b8c5540a73..b8fd73ac8f7c20b1c983e5584262fc44482d6f39 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -963,117 +963,12 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
        kfree(efuse_buf);
 }
 
-static void ResumeTxBeacon(struct adapter *adapt)
-{
-       struct hal_data_8188e *haldata = &adapt->haldata;
-
-       /*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
-       /*  which should be read from register to a global variable. */
-
-       rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) | BIT(6));
-       haldata->RegFwHwTxQCtrl |= BIT(6);
-       rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0xff);
-       haldata->RegReg542 |= BIT(0);
-       rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542);
-}
-
-static void StopTxBeacon(struct adapter *adapt)
-{
-       struct hal_data_8188e *haldata = &adapt->haldata;
-
-       /*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
-       /*  which should be read from register to a global variable. */
-
-       rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl) & (~BIT(6)));
-       haldata->RegFwHwTxQCtrl &= (~BIT(6));
-       rtw_write8(adapt, REG_TBTT_PROHIBIT + 1, 0x64);
-       haldata->RegReg542 &= ~(BIT(0));
-       rtw_write8(adapt, REG_TBTT_PROHIBIT + 2, haldata->RegReg542);
-
-        /* todo: CheckFwRsvdPageContent(Adapter);  2010.06.23. Added by tynli. */
-}
-
-static void hw_var_set_opmode(struct adapter *Adapter, u8 *val)
-{
-       u8 val8;
-       u8 mode = *((u8 *)val);
-       int res;
-
-       /*  disable Port0 TSF update */
-       res = rtw_read8(Adapter, REG_BCN_CTRL, &val8);
-       if (res)
-               return;
-
-       rtw_write8(Adapter, REG_BCN_CTRL, val8 | BIT(4));
-
-       /*  set net_type */
-       res = rtw_read8(Adapter, MSR, &val8);
-       if (res)
-               return;
-
-       val8 &= 0x0c;
-       val8 |= mode;
-       rtw_write8(Adapter, MSR, val8);
-
-       if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) {
-               StopTxBeacon(Adapter);
-
-               rtw_write8(Adapter, REG_BCN_CTRL, 0x19);/* disable atim wnd */
-       } else if (mode == _HW_STATE_ADHOC_) {
-               ResumeTxBeacon(Adapter);
-               rtw_write8(Adapter, REG_BCN_CTRL, 0x1a);
-       } else if (mode == _HW_STATE_AP_) {
-               ResumeTxBeacon(Adapter);
-
-               rtw_write8(Adapter, REG_BCN_CTRL, 0x12);
-
-               /* Set RCR */
-               rtw_write32(Adapter, REG_RCR, 0x7000208e);/* CBSSID_DATA must set to 0,reject ICV_ERR packet */
-               /* enable to rx data frame */
-               rtw_write16(Adapter, REG_RXFLTMAP2, 0xFFFF);
-               /* enable to rx ps-poll */
-               rtw_write16(Adapter, REG_RXFLTMAP1, 0x0400);
-
-               /* Beacon Control related register for first time */
-               rtw_write8(Adapter, REG_BCNDMATIM, 0x02); /*  2ms */
-
-               rtw_write8(Adapter, REG_ATIMWND, 0x0a); /*  10ms */
-               rtw_write16(Adapter, REG_BCNTCFG, 0x00);
-               rtw_write16(Adapter, REG_TBTT_PROHIBIT, 0xff04);
-               rtw_write16(Adapter, REG_TSFTR_SYN_OFFSET, 0x7fff);/*  +32767 (~32ms) */
-
-               /* reset TSF */
-               rtw_write8(Adapter, REG_DUAL_TSF_RST, BIT(0));
-
-               /* BIT(3) - If set 0, hw will clr bcnq when tx becon ok/fail or port 0 */
-               res = rtw_read8(Adapter, REG_MBID_NUM, &val8);
-               if (res)
-                       return;
-
-               rtw_write8(Adapter, REG_MBID_NUM, val8 | BIT(3) | BIT(4));
-
-               /* enable BCN0 Function for if1 */
-               /* don't enable update TSF0 for if1 (due to TSF update when beacon/probe rsp are received) */
-               rtw_write8(Adapter, REG_BCN_CTRL, (DIS_TSF_UDT0_NORMAL_CHIP | EN_BCN_FUNCTION | BIT(1)));
-
-               /* dis BCN1 ATIM  WND if if2 is station */
-               res = rtw_read8(Adapter, REG_BCN_CTRL_1, &val8);
-               if (res)
-                       return;
-
-               rtw_write8(Adapter, REG_BCN_CTRL_1, val8 | BIT(0));
-       }
-}
-
 void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
 {
        u8 reg;
        int res;
 
        switch (variable) {
-       case HW_VAR_SET_OPMODE:
-               hw_var_set_opmode(Adapter, val);
-               break;
        case HW_VAR_CORRECT_TSF:
                {
                        u64     tsf;
@@ -1084,7 +979,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                                                          pmlmeinfo->bcn_interval * 1024) - 1024; /* us */
 
                        if (((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE))
-                               StopTxBeacon(Adapter);
+                               rtw_stop_tx_beacon(Adapter);
 
                        /* disable related TSF function */
                        res = rtw_read8(Adapter, REG_BCN_CTRL, &reg);
@@ -1104,7 +999,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        rtw_write8(Adapter, REG_BCN_CTRL, reg | BIT(3));
 
                        if (((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE))
-                               ResumeTxBeacon(Adapter);
+                               rtw_resume_tx_beacon(Adapter);
                }
                break;
        default:
@@ -1221,7 +1116,7 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)
 
        _BeaconFunctionEnable(adapt, true, true);
 
-       ResumeTxBeacon(adapt);
+       rtw_resume_tx_beacon(adapt);
 
        res = rtw_read8(adapt, bcn_ctrl_reg, &reg);
        if (res)

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 819d0dc6e6dcc13c17118acbf0660ac931edfe34..e1dfd621a5cbe5cda3d91e0f7490b4eab784ca01 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -9,7 +9,6 @@
 #include "Hal8188EPhyCfg.h"
 
 enum hw_variables {
-       HW_VAR_SET_OPMODE,
        HW_VAR_CORRECT_TSF,
 };
 

diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index c630700ea65722709ec06fbfa64bbea7299b6416..28416d1bd15c994815cb364e3cb4597d3be61312 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -532,6 +532,8 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr);
 unsigned int send_beacon(struct adapter *padapter);
 bool get_beacon_valid_bit(struct adapter *adapter);
 void clear_beacon_valid_bit(struct adapter *adapter);
+void rtw_resume_tx_beacon(struct adapter *adapt);
+void rtw_stop_tx_beacon(struct adapter *adapt);
 
 void start_clnt_assoc(struct adapter *padapter);
 void start_clnt_auth(struct adapter *padapter);