From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CB6CC433FE for ; Tue, 29 Mar 2022 20:22:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbiC2UXr (ORCPT ); Tue, 29 Mar 2022 16:23:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231187AbiC2UXf (ORCPT ); Tue, 29 Mar 2022 16:23:35 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1300023B3DC for ; Tue, 29 Mar 2022 13:21:51 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a8so37281915ejc.8 for ; Tue, 29 Mar 2022 13:21:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iwoHH2DorQoLHJxUTXcAs6n0sWifllvRMo0K56xrEzw=; b=mQ3AbiTBM6wCrigpmTiVd/Ll38qQH+4MXqq5afjCa0AcRph490/4HL4l5dH1Okt71G sElXl2tczJw/DGceqv/ckeN8TgyJO/uEvK6CqqnptIbjq8RedVVwga8UOl9nF7bvi8ZZ wcitcXQmn/SUHqyKN0yAJ8nM4D+59JSn9YHVYnSrDQIpvALUAQsj6KVr/i+W93gkEH3J oM5ttIUgNbhMQB14TTV9qjyCYxJMEqUeVOK4XJ5KEsBDOSUbpJaX+9TNH7VqhU/Wh+Ov gCkNfrgRRyvAgQmwXr7HVGNqi2K622a7T6EZnOJ3gWh671JUX70ZK0tUvuXNkrSf/jCn 5MRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iwoHH2DorQoLHJxUTXcAs6n0sWifllvRMo0K56xrEzw=; b=ZMiNKNMquFAMkPtUQjheLiskjK5Saq0rryAOOPPmJKs/N3cFTagpYsiX4ABizGa25e 9erdFqmS7Yu3swWovcdedPFBtZ4vQwuweLAGxcNEVSsf7NYG7mLAeU1BX/L79kHonWIo uzVnimS5B7wM7UyZ0PNixcQsgvCMw889h3t/JoRWJ3CVy76LprXLkxvMT2vMkGxjFpBO or/w19wJDrSVRMKXuTacULxBK8+b8oGjKLkuERFA2SfGjpCJ+KDJNvyjUP3d3fuUyv+z 5JDZd0r5m9UiFtl8PAh6DmXkvBOq2LoJo4WUFIh9gNk/hf9i0bV+kwnj8gWJOu+nZyMA ZquA== X-Gm-Message-State: AOAM530JmVV1f3kmH5EokZ232zZKhJymT/jNXBlXT3WmNm4byyLxVZbf oIyT+uAlSSmEwJFYc+Gy9fo= X-Google-Smtp-Source: ABdhPJw4oLdWWjJKgol/2/7lcJdEbAX5CWE5R7NVZULtHjCju1DvV5+XbQ2GXKKxTYyK+y8GhNAe4w== X-Received: by 2002:a17:907:b590:b0:6cf:48a4:9a4c with SMTP id qx16-20020a170907b59000b006cf48a49a4cmr35635934ejc.6.1648585309697; Tue, 29 Mar 2022 13:21:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:49 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 1/8] staging: r8188eu: remove HW_VAR_RESP_SIFS from SetHwReg8188EU() Date: Tue, 29 Mar 2022 22:21:34 +0200 Message-Id: <20220329202141.7028-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" SetHwReg8188EU() is called with HW_VAR_RESP_SIFS only in one place. Remove the HW_VAR_RESP_SIFS case from SetHwReg8188EU() and call rtw_write8() directly instead. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/core/rtw_wlan_util.c | 11 ++++++----- drivers/staging/r8188eu/hal/usb_halinit.c | 8 -------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 5a1eede57458..e44f4752f222 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1326,7 +1326,6 @@ void update_capinfo(struct adapter *Adapter, u16 upda= teCap) void update_wireless_mode(struct adapter *padapter) { int ratelen, network_type =3D 0; - u32 SIFS_Timer; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; struct wlan_bssid_ex *cur_network =3D &pmlmeinfo->network; @@ -1353,10 +1352,12 @@ void update_wireless_mode(struct adapter *padapter) =20 pmlmeext->cur_wireless_mode =3D network_type & padapter->registrypriv.wir= eless_mode; =20 - SIFS_Timer =3D 0x0a0a0808;/* 0x0808 -> for CCK, 0x0a0a -> for OFDM */ - /* change this value if having IOT issues. */ - - SetHwReg8188EU(padapter, HW_VAR_RESP_SIFS, (u8 *)&SIFS_Timer); + /* RESP_SIFS for CCK */ + rtw_write8(padapter, REG_R2T_SIFS, 0x08); + rtw_write8(padapter, REG_R2T_SIFS + 1, 0x08); + /* RESP_SIFS for OFDM */ + rtw_write8(padapter, REG_T2T_SIFS, 0x0a); + rtw_write8(padapter, REG_T2T_SIFS + 1, 0x0a); =20 if (pmlmeext->cur_wireless_mode & WIRELESS_11B) update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 789ad11170b2..0186f8bf73c7 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1119,14 +1119,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } } break; - case HW_VAR_RESP_SIFS: - /* RESP_SIFS for CCK */ - rtw_write8(Adapter, REG_R2T_SIFS, val[0]); /* SIFS_T2T_CCK (0x08) */ - rtw_write8(Adapter, REG_R2T_SIFS + 1, val[1]); /* SIFS_R2T_CCK(0x08) */ - /* RESP_SIFS for OFDM */ - rtw_write8(Adapter, REG_T2T_SIFS, val[2]); /* SIFS_T2T_OFDM (0x0a) */ - rtw_write8(Adapter, REG_T2T_SIFS + 1, val[3]); /* SIFS_R2T_OFDM(0x0a) */ - break; case HW_VAR_ACK_PREAMBLE: { u8 regTmp; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 6f661c4af358..77069cbc1e07 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -17,7 +17,6 @@ enum hw_variables { HW_VAR_MLME_SITESURVEY, HW_VAR_MLME_JOIN, HW_VAR_SLOT_TIME, - HW_VAR_RESP_SIFS, HW_VAR_ACK_PREAMBLE, HW_VAR_BCN_VALID, HW_VAR_DM_FLAG, --=20 2.35.1 From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06F65C433F5 for ; Tue, 29 Mar 2022 20:22:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231645AbiC2UXv (ORCPT ); Tue, 29 Mar 2022 16:23:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231272AbiC2UXf (ORCPT ); Tue, 29 Mar 2022 16:23:35 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA81023B3DF for ; Tue, 29 Mar 2022 13:21:51 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id pv16so37466649ejb.0 for ; Tue, 29 Mar 2022 13:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3IFwCjklhdRZF/g42Am6ngyzxVzMgTYWvicG6NBlRjM=; b=G1iMqA5VrU8bfNiRqfkjPG99D1FghY/aI+iNYv291Gxlg440Cq8gTnfKzjelxam0wL tGDRpmqIKmY7K26DQiGGl8m9Yu1RA8uXgLLBBGbwZssgCXtRlavVLAwIhsevmQZlU2A4 QAbZWLsxkAvNXPOJHp75CKhv/nJZ85mDxxbDxfqPqqP+owbqfrlU8EB1ZLkOXG45jJ/5 lvnCR7E3S1ngFJP1rRfIMP9ARiXcA/CsSQZ+XsJIuLkBzxhlGbwgrkhDWPoNZbxFOZ1p uVrCaZiVhXaiZ+1vGPfowv0crlrwdSHzmdtSGpO6fwxJzXVeF/HI1kzYOucGaEhbaoNx JHYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3IFwCjklhdRZF/g42Am6ngyzxVzMgTYWvicG6NBlRjM=; b=bRfuiO7Q8TautE68NJ44Bpri6Uv25aBSLx6J0w1aPCzkNkPgkvARo+VDvk57RP2iLS I6T8FOD/KaldPgKCT9uEDtmTWNGqhUFUAc+ou9hmpvAYe8IP3Ml6me+LwMZ60yTP1Z3+ Vkr5BxMyvv6EyetutgGpmxChEo2O6NBWUNvJvP6Wt8Anf7zdbxT754s7CAeKtwpYTVQy RKZRYHTUuXDq5hRNjTeD3XuNJVbRvs2VKXkGlYaUw9/sBveG+6WGLyZwZxEtCc+Sx2BD kPZKnBPFURvoaV2OIVoRQFTmamzbeJoEw3ar6p7ctd5e3ElWuot2JXrXZseqHlqHn4Gi wwlw== X-Gm-Message-State: AOAM533a5zV4a3U4DHBlCPsAegJjh+37Jiq30N10LJnzN8tQ/YjRYBQ8 5jweJnolB7ks3g641ygM2Lw= X-Google-Smtp-Source: ABdhPJwrIj+5MAnCgW7GIyGwt8R/AGvQIxzLAUowU6Dz+8h8/P33LuxJRRVek/UUeeFM5V+OKNM61Q== X-Received: by 2002:a17:906:3283:b0:6ce:78f9:fafd with SMTP id 3-20020a170906328300b006ce78f9fafdmr37454449ejw.534.1648585310502; Tue, 29 Mar 2022 13:21:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:50 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 2/8] staging: r8188eu: remove HW_VAR_MLME_DISCONNECT from SetHwReg8188EU() Date: Tue, 29 Mar 2022 22:21:35 +0200 Message-Id: <20220329202141.7028-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" SetHwReg8188EU() is called with HW_VAR_MLME_DISCONNECT only from functions in rtw_mlme_ext.c. Move the functionality into a static function in rtw_mlme_ext.c and remove the HW_VAR_MLME_DISCONNECT case from SetHwReg8188EU(). This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/core/rtw_mlme_ext.c | 19 ++++++++++++++++--- drivers/staging/r8188eu/hal/usb_halinit.c | 11 ----------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index c0a1efcd8b28..4a9321e6e327 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6799,13 +6799,26 @@ void mlmeext_sta_add_event_callback(struct adapter = *padapter, struct sta_info *p update_sta_info(padapter, psta); } =20 +static void mlme_disconnect(struct adapter *adapter) +{ + /* Set RCR to not to receive data frame when NO LINK state */ + /* reject all data frames */ + rtw_write16(adapter, REG_RXFLTMAP2, 0x00); + + /* reset TSF */ + rtw_write8(adapter, REG_DUAL_TSF_RST, (BIT(0) | BIT(1))); + + /* disable update TSF */ + rtw_write8(adapter, REG_BCN_CTRL, rtw_read8(adapter, REG_BCN_CTRL) | BIT(= 4)); +} + void mlmeext_sta_del_event_callback(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 if (is_client_associated_to_ap(padapter) || is_IBSS_empty(padapter)) { - SetHwReg8188EU(padapter, HW_VAR_MLME_DISCONNECT, NULL); + mlme_disconnect(padapter); SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr); =20 /* restore to initial setting. */ @@ -7169,7 +7182,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) /* set MSR to nolink -> infra. mode */ Set_MSR(padapter, _HW_STATE_STATION_); =20 - SetHwReg8188EU(padapter, HW_VAR_MLME_DISCONNECT, NULL); + mlme_disconnect(padapter); } =20 rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, = false); @@ -7265,7 +7278,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned = char *pbuf) if (is_client_associated_to_ap(padapter)) issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVI= NG, param->deauth_timeout_ms / 100, 100); =20 - SetHwReg8188EU(padapter, HW_VAR_MLME_DISCONNECT, NULL); + mlme_disconnect(padapter); SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr); =20 /* restore to initial setting. */ diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 0186f8bf73c7..8e4b84f51a3c 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1024,17 +1024,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) ResumeTxBeacon(Adapter); } break; - case HW_VAR_MLME_DISCONNECT: - /* Set RCR to not to receive data frame when NO LINK state */ - /* reject all data frames */ - rtw_write16(Adapter, REG_RXFLTMAP2, 0x00); - - /* reset TSF */ - rtw_write8(Adapter, REG_DUAL_TSF_RST, (BIT(0) | BIT(1))); - - /* disable update TSF */ - rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL) | BIT= (4)); - break; case HW_VAR_MLME_SITESURVEY: if (*((u8 *)val)) { /* under sitesurvey */ /* config RCR to receive different BSSID & not to receive data frame */ diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 77069cbc1e07..d481cc759e27 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -13,7 +13,6 @@ enum hw_variables { HW_VAR_BSSID, HW_VAR_BASIC_RATE, HW_VAR_CORRECT_TSF, - HW_VAR_MLME_DISCONNECT, HW_VAR_MLME_SITESURVEY, HW_VAR_MLME_JOIN, HW_VAR_SLOT_TIME, --=20 2.35.1 From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54B57C433EF for ; Tue, 29 Mar 2022 20:22:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231752AbiC2UXy (ORCPT ); Tue, 29 Mar 2022 16:23:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231363AbiC2UXg (ORCPT ); Tue, 29 Mar 2022 16:23:36 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6A6012221F for ; Tue, 29 Mar 2022 13:21:52 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id c62so22005691edf.5 for ; Tue, 29 Mar 2022 13:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pXzC7B+G1Vq7z1Rm7bBrok4K1ZSPCYyPSAJ9Zp074Sw=; b=q3vf2bCmZ1ZNNDsHVj7VTUOZLT75ckZ+jzRTjxI79ZK+r+8N7HyjTOv8g1xVew7qrp yv3aQOyyx4HhhSbJsA4UnbTAVgeeQxw8zQMKDSy3h4ZNu2XJhoPnpfuh/fbxd43IUFGT Y/3Rbf6KrXPtt18ROsuEXWlwIqbeiQWg8hxICPLyKUS0Cfk5YC8Y8rWk52nTgOqnw5HR smIsJNAVpgssK5M1Q0nQeM9U/f5+ZoiQBSesQW767NVM11xiMbxKv5s7KBG2WzQvZKb3 tJGl2/f7dI/hLUEgK4mnvAdwJkUk089iZpPFeskba3V0FxPDNxOhSOOZoW1Qe8kF5NSL DswQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pXzC7B+G1Vq7z1Rm7bBrok4K1ZSPCYyPSAJ9Zp074Sw=; b=IHbOPfc6wB1kU1xypiQEvtKTgWuG2+rV5PU9yt0KV/cn+pHOmiPzAthJxkeON4HAdt HIGm3H8kpmIyzAJkMKoFZLVcnEortL3m7zJF89U0AvomLtlqEk+wpLGqN9+VqlDtUR2t rkFYgA4JYuBzwTpYUNn6fI4kYy9j705ClqcMgIN0oO95r0ZsmZ5dIf2X/wsRfaOD4i0G 08w8+aXqvXRkrSQNdSQ5a93TmFJPmdWMd/YMl4Xb0hYp689hn8Gx78x4QSXC1nRD8OR9 9PZcEJUA4kuRL4l/M4lovlzdzvXlH9PAYz9Jy6trmDs3bjpymMi3Q1pmVsGCzmOt1XMC kk5A== X-Gm-Message-State: AOAM532eGMMBaFEBLoHHMTATbaEpX445QVLryIGgsplrztzI+niR+NKr ZXj6w6E1/PI+lxK7ktt01jk= X-Google-Smtp-Source: ABdhPJwjjdL5AxQOccoKR3owW99Y8879dAR8FYcnUW7XGN1zAHBGFL2zRoplCkFqRzGWCsFRR+nvxw== X-Received: by 2002:a05:6402:3689:b0:419:d380:ddbc with SMTP id ej9-20020a056402368900b00419d380ddbcmr6819875edb.230.1648585311330; Tue, 29 Mar 2022 13:21:51 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:50 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 3/8] staging: r8188eu: rename some macros to upper case Date: Tue, 29 Mar 2022 22:21:36 +0200 Message-Id: <20220329202141.7028-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename some macros to upper case to avoid camel case and improve readability. While at it, remove some unused macros. Signed-off-by: Michael Straube --- v2: no changes drivers/staging/r8188eu/hal/usb_halinit.c | 12 ++++++------ drivers/staging/r8188eu/include/rtl8188e_spec.h | 10 +++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 8e4b84f51a3c..8dc90f9636b5 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1148,19 +1148,19 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 var= iable, u8 *val) AcmCtrl =3D AcmCtrl | 0x1; =20 if (acm_ctrl & BIT(3)) - AcmCtrl |=3D AcmHw_VoqEn; + AcmCtrl |=3D ACMHW_VOQEN; else - AcmCtrl &=3D (~AcmHw_VoqEn); + AcmCtrl &=3D (~ACMHW_VOQEN); =20 if (acm_ctrl & BIT(2)) - AcmCtrl |=3D AcmHw_ViqEn; + AcmCtrl |=3D ACMHW_VIQEN; else - AcmCtrl &=3D (~AcmHw_ViqEn); + AcmCtrl &=3D (~ACMHW_VIQEN); =20 if (acm_ctrl & BIT(1)) - AcmCtrl |=3D AcmHw_BeqEn; + AcmCtrl |=3D ACMHW_BEQEN; else - AcmCtrl &=3D (~AcmHw_BeqEn); + AcmCtrl &=3D (~ACMHW_BEQEN); =20 rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl); } diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/stag= ing/r8188eu/include/rtl8188e_spec.h index edae053e350e..ef42c4b2f20c 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_spec.h +++ b/drivers/staging/r8188eu/include/rtl8188e_spec.h @@ -998,13 +998,9 @@ Current IOREG MAP #define STOP_BCNQ BIT(6) =20 /* 2 ACMHWCTRL */ -#define AcmHw_HwEn BIT(0) -#define AcmHw_BeqEn BIT(1) -#define AcmHw_ViqEn BIT(2) -#define AcmHw_VoqEn BIT(3) -#define AcmHw_BeqStatus BIT(4) -#define AcmHw_ViqStatus BIT(5) -#define AcmHw_VoqStatus BIT(6) +#define ACMHW_BEQEN BIT(1) +#define ACMHW_VIQEN BIT(2) +#define ACMHW_VOQEN BIT(3) =20 /* 0x0600h ~ 0x07FFh WMAC Configuration */ /* 2APSD_CTRL */ --=20 2.35.1 From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99550C433F5 for ; Tue, 29 Mar 2022 20:22:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231582AbiC2UX7 (ORCPT ); Tue, 29 Mar 2022 16:23:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231389AbiC2UXh (ORCPT ); Tue, 29 Mar 2022 16:23:37 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89C4623B3FD for ; Tue, 29 Mar 2022 13:21:53 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id pv16so37466768ejb.0 for ; Tue, 29 Mar 2022 13:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tFUJkKDNSDlaGRatgnjRTwnUsmUOuBgdOwxC6d/heDg=; b=ILwQiPuexznMlZzfZ499KkWWp3FTCt9En4hJq0G3JPeDcSovZzeVa6o+fkNo+6f6eZ rV5Kgk0uzq9H3a73qfvSqXAnlsaIrJOOxunyhgNqePq+uAXu2tdVqhw5WsB3fdrlGzSL 6x6ISn0SUSjLio6JxqKCJqaie+dLsFgZ82vh+3AhpVJAdItkvtxjNcyBeOdhottgAJ6j 2h50T+3vFPu1eIpMf4qLsqvq9KNgkSdtrxGpt00xjBjq7s0hdYaNGpVAVO7jxswUIZqg JAR9CTlO8XNn8cKXXW+4Epsly+Z26Y7+lwqLwoJJIMUsG1ITV6pSrtjvZyuoEi2cMbwX 0/jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tFUJkKDNSDlaGRatgnjRTwnUsmUOuBgdOwxC6d/heDg=; b=s4rHvar9PsgoWaxNG3aNw8r37fsqyhhGfGU+lO4PnT3tcWkW2clF5McU9CK5T/ETl2 s0NCJlKakzKyk+bdR8UijD23y3fiSzkH5Cvz6V1p2i6sC0awcq0DYN1jdVCOGLdMd99g OypOP3n36ogBRFzOwJMKT3fHO9MKNsXgQAQ6qYcnWB8EBUfKP1nvSFf0FQiQ9BLpy2Cu ZR6DZJWRl308hph5kl1M/RekvIu0mFnkK2DDmZEwfQBpIX3zNq7W12UZYVOUD1K3uYk4 zmtPTYzkBbcaZL0Ct5VF/oM0w2x2BR+zXjuvEtvNar94gpy5B9to8tICuklXHIql80MV 0XQA== X-Gm-Message-State: AOAM5326S6pZPL7EflvenY/Dvwn8yy0UQ9r/prcv9VwmkVKHYVCr+GJy itUVfb/7AfhxdVaApFL0Hpw8RUIId0o= X-Google-Smtp-Source: ABdhPJyoyU0t0fHUeTsbyn9P2w0/m69f5NzLf++en/S7/O08ht/Bf0ZI72Hz+EUn+qNGq1qQqicIQw== X-Received: by 2002:a17:907:9801:b0:6db:ab31:96f4 with SMTP id ji1-20020a170907980100b006dbab3196f4mr36730399ejc.571.1648585312165; Tue, 29 Mar 2022 13:21:52 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:51 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 4/8] staging: r8188eu: remove HW_VAR_ACM_CTRL from SetHwReg8188EU() Date: Tue, 29 Mar 2022 22:21:37 +0200 Message-Id: <20220329202141.7028-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" SetHwReg8188EU() is called with HW_VAR_ACM_CTRL only from a function in rtw_wlan_util.c. Move the functionality into a static function in rtw_wlan_util.c and remove the HW_VAR_ACM_CTRL case from SetHwReg8188EU(). This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: Moved the code into a function. drivers/staging/r8188eu/core/rtw_wlan_util.c | 27 +++++++++++++++++++- drivers/staging/r8188eu/hal/usb_halinit.c | 26 ------------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index e44f4752f222..f005bd3c9ff2 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -503,6 +503,31 @@ int WMM_param_handler(struct adapter *padapter, struct= ndis_802_11_var_ie *pIE) return true; } =20 +static void set_acm_ctrl(struct adapter *adapter, u8 acm_mask) +{ + u8 acmctrl =3D rtw_read8(adapter, REG_ACMHWCTRL); + + if (acm_mask > 1) + acmctrl =3D acmctrl | 0x1; + + if (acm_mask & BIT(3)) + acmctrl |=3D ACMHW_VOQEN; + else + acmctrl &=3D (~ACMHW_VOQEN); + + if (acm_mask & BIT(2)) + acmctrl |=3D ACMHW_VIQEN; + else + acmctrl &=3D (~ACMHW_VIQEN); + + if (acm_mask & BIT(1)) + acmctrl |=3D ACMHW_BEQEN; + else + acmctrl &=3D (~ACMHW_BEQEN); + + rtw_write8(adapter, REG_ACMHWCTRL, acmctrl); +} + void WMMOnAssocRsp(struct adapter *padapter) { u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; @@ -564,7 +589,7 @@ void WMMOnAssocRsp(struct adapter *padapter) } =20 if (padapter->registrypriv.acm_method =3D=3D 1) - SetHwReg8188EU(padapter, HW_VAR_ACM_CTRL, (u8 *)(&acm_mask)); + set_acm_ctrl(padapter, acm_mask); else padapter->mlmepriv.acm_mask =3D acm_mask; =20 diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 8dc90f9636b5..1bf867123c48 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1139,32 +1139,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) haldata->AcParam_BE =3D ((u32 *)(val))[0]; rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); break; - case HW_VAR_ACM_CTRL: - { - u8 acm_ctrl =3D *((u8 *)val); - u8 AcmCtrl =3D rtw_read8(Adapter, REG_ACMHWCTRL); - - if (acm_ctrl > 1) - AcmCtrl =3D AcmCtrl | 0x1; - - if (acm_ctrl & BIT(3)) - AcmCtrl |=3D ACMHW_VOQEN; - else - AcmCtrl &=3D (~ACMHW_VOQEN); - - if (acm_ctrl & BIT(2)) - AcmCtrl |=3D ACMHW_VIQEN; - else - AcmCtrl &=3D (~ACMHW_VIQEN); - - if (acm_ctrl & BIT(1)) - AcmCtrl |=3D ACMHW_BEQEN; - else - AcmCtrl &=3D (~ACMHW_BEQEN); - - rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl); - } - break; case HW_VAR_AMPDU_MIN_SPACE: { u8 MinSpacingToSet; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index d481cc759e27..5b4de29a2e10 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -23,7 +23,6 @@ enum hw_variables { HW_VAR_DM_FUNC_RESET, HW_VAR_DM_FUNC_CLR, HW_VAR_AC_PARAM_BE, - HW_VAR_ACM_CTRL, HW_VAR_AMPDU_MIN_SPACE, HW_VAR_AMPDU_FACTOR, HW_VAR_RXDMA_AGG_PG_TH, --=20 2.35.1 From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B569C433F5 for ; Tue, 29 Mar 2022 20:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231530AbiC2UYE (ORCPT ); Tue, 29 Mar 2022 16:24:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231405AbiC2UXi (ORCPT ); Tue, 29 Mar 2022 16:23:38 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82CEF12221F for ; Tue, 29 Mar 2022 13:21:54 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id qa43so37387800ejc.12 for ; Tue, 29 Mar 2022 13:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rm745D6xhclneBAjGr3VVkPQWEDVAMfJN6aO5oy/Yx4=; b=XWrTwpWwc6tx4JOrixKR++eET5FoOLIPUNU98mZounH+JyVXW/JA2DxPuCWY6QAjIy FoR1QyN8RiiMyWOvyAcD3ZI42e0tBW7EMVaOucIYOWPIotA4X6+pprt0WifmXxSmME4n O+XD2urLrbzI6/dzLc2oJ0zz4rgY4dLMPY45iE5BI2mPQVSt3C87UU8/wP0xDdSRWr/J 9q/pHuhooyy63dz6MK9TvR5tdoZ/zICKUyhTIGAhIhFRLEl8Fog95CXJfmcZnE51vYoX QMnClf0/rGMyq+D3OeAHBC0KBUixpeH4XsxlHL4X+P4JjoG9Bj0QH4Clecfy43PpKTMW jLXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rm745D6xhclneBAjGr3VVkPQWEDVAMfJN6aO5oy/Yx4=; b=jn7AxeV5H2DUfuIIK4vRHZgatse4d6TzWsLGckNF0D/CuEKPfgnh7YycGBlTohBVts lSetZcQefdno/W/xeqxbPoHTWrPVwdY03NJeb5xaPREwh1Xtkzah9AQi0D0DqywR4Cza BlJoDkyrO7ZzWGbU4/a7S1faSXgweC3xjXiqkxSoX+nX8X6ghKa8Jx8NQeD+gurZH1ZR Q7tT7WAkqh015U/ET4tvtNICkBQGGUy3EAyfs8nARFBhyAEmdC8Ob2zFg3D6xlG87a5G ToswklY0dnA1DUyMWJ7oRPkGZhwb5LCULo6MWEh2RFp+TVhws2KXblO5hVX1HVALA3d+ 4Rmw== X-Gm-Message-State: AOAM531NlQRIVmv35CwuP7Hae+mU7omAbypQEp8oqaQ7zmZl1EEQWhSx k5mhh7vH6KVw0NKqZcLjj/8Ny5ebnYM= X-Google-Smtp-Source: ABdhPJxSWEuMjJjWnQiMZVz+zwSjoXL8OwJOedad+fGqqzzmL0mySxT/9s/fOSJUHghYbZv0iDlabg== X-Received: by 2002:a17:906:3adb:b0:6b7:876c:d11b with SMTP id z27-20020a1709063adb00b006b7876cd11bmr36234623ejd.250.1648585312922; Tue, 29 Mar 2022 13:21:52 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:52 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 5/8] staging: r8188eu: remove HW_VAR_RXDMA_AGG_PG_TH from SetHwReg8188EU() Date: Tue, 29 Mar 2022 22:21:38 +0200 Message-Id: <20220329202141.7028-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The HW_VAR_RXDMA_AGG_PG_TH case in SetHwReg8188EU() just sets a variable conditionally and then calls rtw_write8(). Set the variable in the caller and call rtw_write8() directly. Move the functionality into a new static function to make the code cleaner. Remove the HW_VAR_RXDMA_AGG_PG_TH case from SetHwReg8188EU(). This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: Moved the code into a function and included patch 6/9 of v1. drivers/staging/r8188eu/core/rtw_mlme.c | 34 +++++++++++++--------- drivers/staging/r8188eu/hal/usb_halinit.c | 8 ----- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index f1e1627641cb..086d64542082 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1787,10 +1787,29 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) =20 } =20 +static void rtw_set_threshold(struct adapter *adapter) +{ + u8 threshold; + struct mlme_priv *mlmepriv =3D &adapter->mlmepriv; + struct ht_priv *htpriv =3D &mlmepriv->htpriv; + + /* TH =3D 1 =3D> means that invalidate usb rx aggregation */ + /* TH =3D 0 =3D> means that validate usb rx aggregation, use init value.= */ + if (htpriv->ht_option) { + if (adapter->registrypriv.wifi_spec =3D=3D 1) + threshold =3D 1; + else + threshold =3D USB_RXAGG_PAGE_COUNT; + + rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, threshold); + } else { + rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, 1); + } +} + /* the function is at passive_level */ void rtw_joinbss_reset(struct adapter *padapter) { - u8 threshold; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; struct ht_priv *phtpriv =3D &pmlmepriv->htpriv; =20 @@ -1801,18 +1820,7 @@ void rtw_joinbss_reset(struct adapter *padapter) =20 phtpriv->ampdu_enable =3D false;/* reset to disabled */ =20 - /* TH =3D 1 =3D> means that invalidate usb rx aggregation */ - /* TH =3D 0 =3D> means that validate usb rx aggregation, use init value.= */ - if (phtpriv->ht_option) { - if (padapter->registrypriv.wifi_spec =3D=3D 1) - threshold =3D 1; - else - threshold =3D 0; - SetHwReg8188EU(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); - } else { - threshold =3D 1; - SetHwReg8188EU(padapter, HW_VAR_RXDMA_AGG_PG_TH, (u8 *)(&threshold)); - } + rtw_set_threshold(padapter); } =20 /* the function is >=3D passive_level */ diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 1bf867123c48..1b08346f2afd 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1193,14 +1193,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } } break; - case HW_VAR_RXDMA_AGG_PG_TH: - { - u8 threshold =3D *((u8 *)val); - if (threshold =3D=3D 0) - threshold =3D USB_RXAGG_PAGE_COUNT; - rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, threshold); - } - break; case HW_VAR_H2C_FW_PWRMODE: { u8 psmode =3D (*(u8 *)val); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 5b4de29a2e10..8708675c3478 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -25,7 +25,6 @@ enum hw_variables { HW_VAR_AC_PARAM_BE, HW_VAR_AMPDU_MIN_SPACE, HW_VAR_AMPDU_FACTOR, - HW_VAR_RXDMA_AGG_PG_TH, HW_VAR_H2C_FW_PWRMODE, HW_VAR_H2C_FW_JOINBSSRPT, HW_VAR_FWLPS_RF_ON, --=20 2.35.1 From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17BB6C433F5 for ; Tue, 29 Mar 2022 20:22:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231915AbiC2UYJ (ORCPT ); Tue, 29 Mar 2022 16:24:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231425AbiC2UXi (ORCPT ); Tue, 29 Mar 2022 16:23:38 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20D0123B3DB for ; Tue, 29 Mar 2022 13:21:55 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id h4so14234660edr.3 for ; Tue, 29 Mar 2022 13:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fIs5jI9omv80B5uNj3oOSCaJBQX+29ujQ7UOt2Cbf58=; b=Jf9Ra5iHS5hioNaVO9GhdL/uG/444ph1zmk8dUfMXgNVj83UXcBTgmZOtWGdvqUIbx 3u9vsnL3GcceGLKWE7h9bbTV9SWJESQPgF4kcb8psti+o0GS/btGAzv1tqbHwY+oQjOt JkBqL9Hyqppb0cEwNz7H17AyztFK0zcX3LBQftBbsEycfOFdliWjQhQOd0411Fqy2FSm myQNedrtJ0r0q0xxD530yD5pjCG7DqM42vYJm0N3Y+MxcaAQEBu51uM8pvhtob2JqivO 8jocciF7IEnWwzhxFLNhtJsyCrlK4zXiC+A1eT4AwfPgA5PvOhWPPtSve0+pCI8gCZuD iq4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fIs5jI9omv80B5uNj3oOSCaJBQX+29ujQ7UOt2Cbf58=; b=IIyjmuqVeZYyX5hgfE6fbttL0w3XwcaN0bkTHKO44zAdOfWDxGvrLl6AoqYt0bI8Zj 23rxBlh68sYJw1frzN6gOhOsPvtMphteqq6SuqvhG8NqqbpVZGjrWOvGr/SIo3iEQEdW 2B1B5BT9djx2zJQlGHnmMOfrI7pIi/QVz+mvahb6tdYsX+kF7yun8PFbKjUyr5DLHga1 xRRFP4vDF40p7d8TX/jVzNd3r2WB38rRg0GWSsnaNeIEEGHI+QoDOM10omeMwnY4yYwU p8Ql5A5kMltnWVtJaN/X3VRa/KU66h424GoiFQfNOKCCGXJwleyEDe8Lp85Nd00Slogw /Byw== X-Gm-Message-State: AOAM531L/Y4yV3lX7jCI4Rijmg1OvhGETP0NopbKRRPWm4Cdcfj23T2e +nvd6lG2MyIZc2qFkRMMkVE= X-Google-Smtp-Source: ABdhPJyJa+lNo2HUwnOhZSfYZOfzn0GkZx6F2p+5jGP+ETbLaJm7lunbaJHlO7RRzTMHAtEHDXhtlQ== X-Received: by 2002:aa7:c056:0:b0:418:e8d7:52a3 with SMTP id k22-20020aa7c056000000b00418e8d752a3mr6703601edo.301.1648585313737; Tue, 29 Mar 2022 13:21:53 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:53 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 6/8] staging: r8188eu: simplify if-else statement Date: Tue, 29 Mar 2022 22:21:39 +0200 Message-Id: <20220329202141.7028-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Simplify a nested if-else statement to a single if-else statement in rtw_set_threshold(). This improves readability and allows us to remove the local variable threshold. Signed-off-by: Michael Straube --- v2: Better readable simplification. drivers/staging/r8188eu/core/rtw_mlme.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 086d64542082..1d52cfac1999 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1789,20 +1789,14 @@ void rtw_update_registrypriv_dev_network(struct ada= pter *adapter) =20 static void rtw_set_threshold(struct adapter *adapter) { - u8 threshold; struct mlme_priv *mlmepriv =3D &adapter->mlmepriv; struct ht_priv *htpriv =3D &mlmepriv->htpriv; =20 - /* TH =3D 1 =3D> means that invalidate usb rx aggregation */ - /* TH =3D 0 =3D> means that validate usb rx aggregation, use init value.= */ - if (htpriv->ht_option) { - if (adapter->registrypriv.wifi_spec =3D=3D 1) - threshold =3D 1; - else - threshold =3D USB_RXAGG_PAGE_COUNT; - - rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, threshold); + if (htpriv->ht_option && adapter->registrypriv.wifi_spec !=3D 1) { + /* validate usb rx aggregation, use init value. */ + rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, USB_RXAGG_PAGE_COUNT); } else { + /* invalidate usb rx aggregation */ rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, 1); } } --=20 2.35.1 From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A92DC433EF for ; Tue, 29 Mar 2022 20:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230022AbiC2UYN (ORCPT ); Tue, 29 Mar 2022 16:24:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230232AbiC2UXj (ORCPT ); Tue, 29 Mar 2022 16:23:39 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DFD023C0F7 for ; Tue, 29 Mar 2022 13:21:55 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id bi12so37484673ejb.3 for ; Tue, 29 Mar 2022 13:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d7XcUVJ/bFv2YOKU/4L/gZCPvA4Jcc/g7XOEqyRUVvA=; b=L+2MCEYTGsuGik3/UJSVfjjPoKdqGfa1XwEGM3LMdjhhCKJWIEWhOInYt8iBXgkMs9 BYm0LWR+8mXcck5me0zURYESi/Qdfj7dTOhX5BL9npgCih6y3sRVOI3pI186rvp4+49S yN63ngAtKE35JdXxx8okz+6c2qV2DAfD5e5sWaTxT1/fY+vmjaz/I2Y0HkAoxKXPX+5j JJxeeEsx5zoUtuaZN0lyCAXl5rTlWLEBltWYjMWsnD1DC4Hi5N2XdmVV8zc0l9NIDNv6 ruVYd5/e8Y/mZznDaq64hhr3zXqONYfQkuEzj9dHHg6D9NotLqs8ERz8cB7hl9UHqQDK X8Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d7XcUVJ/bFv2YOKU/4L/gZCPvA4Jcc/g7XOEqyRUVvA=; b=gVI6XIQqkV3IURafwItQxD3zew9hpfiv4YdnIhVIuAWyf9cIVo8ZASPUIwhHJLMaBt fO6OYcLk7KJY9TsVuZfnkLTUYfT+CmAfEPV90Q4pEKuHyXuZfho3uXK/v1X9WrHsRGvL ZXeTuL2fpIh7yCnm5brlVvUji2BmHSEDaYFspDD8SBUKp5DBsTZvUK6d2onJmIdZGhck 7iRbRVYcf4RsLDHuLQmHMkRga5D9PyAsDokMDMFOOdGEhWbW+13iiTHMgBqqxLAOdUHB b7lO/+3RvRIWiiFQ5yp7v2qfHtidJkqM6FpPmXA7dxuBsiycwblh63Lf5HxoRA+YHK9b Td6w== X-Gm-Message-State: AOAM533/qKNTQ2ipaSWaqC+6WhWlO8Cdl9GdbPSCf92E70jN9hDezu5B rMtys+fs+/X+xWewuZB4xlU= X-Google-Smtp-Source: ABdhPJwKrsTrjZ5SGRWAIzq4kAwHHpxrsbpyCj8qpAo+CW6Dg3SiBQ4zU/5ywq2OfBGG+bZnlsAZaA== X-Received: by 2002:a17:907:6297:b0:6da:6388:dc58 with SMTP id nd23-20020a170907629700b006da6388dc58mr37854195ejc.472.1648585314580; Tue, 29 Mar 2022 13:21:54 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:54 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 7/8] staging: r8188eu: remove HW_VAR_TX_RPT_MAX_MACID from SetHwReg8188EU() Date: Tue, 29 Mar 2022 22:21:40 +0200 Message-Id: <20220329202141.7028-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The HW_VAR_TX_RPT_MAX_MACID case in SetHwReg8188EU() just calls rtw_write8(). Remove HW_VAR_TX_RPT_MAX_MACID from SetHwReg8188EU() and call rtw_write8() directly. Move the call to a new function to indicate what it actually does. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: Moved the code into a function. drivers/staging/r8188eu/core/rtw_mlme.c | 8 +++++++- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 ++- drivers/staging/r8188eu/hal/usb_halinit.c | 6 ------ drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/rtw_mlme.h | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 1d52cfac1999..ee48dfd09fb3 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1096,6 +1096,11 @@ void rtw_joinbss_event_callback(struct adapter *adap= ter, u8 *pbuf) =20 } =20 +void rtw_set_max_rpt_macid(struct adapter *adapter, u8 macid) +{ + rtw_write8(adapter, REG_TX_RPT_CTRL + 1, macid + 1); +} + static u8 search_max_mac_id(struct adapter *padapter) { u8 mac_id; @@ -1132,7 +1137,8 @@ void rtw_sta_media_status_rpt(struct adapter *adapter= , struct sta_info *psta, return; =20 macid =3D search_max_mac_id(adapter); - SetHwReg8188EU(adapter, HW_VAR_TX_RPT_MAX_MACID, (u8 *)&macid); + rtw_set_max_rpt_macid(adapter, macid); + /* MACID|OPMODE:1 connect */ media_status_rpt =3D (u16)((psta->mac_id << 8) | mstatus); SetHwReg8188EU(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status_= rpt); diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 4a9321e6e327..9df87a878121 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6749,7 +6749,8 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) =20 /* set per sta rate after updating HT cap. */ set_sta_rate(padapter, psta); - SetHwReg8188EU(padapter, HW_VAR_TX_RPT_MAX_MACID, (u8 *)&psta->mac_id); + rtw_set_max_rpt_macid(padapter, psta->mac_id); + media_status =3D (psta->mac_id << 8) | 1; /* MACID|OPMODE: 1 means con= nect */ SetHwReg8188EU(padapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_statu= s); } diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 1b08346f2afd..a3c955e54321 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1274,12 +1274,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } } break; - case HW_VAR_TX_RPT_MAX_MACID: - { - u8 maxMacid =3D *val; - rtw_write8(Adapter, REG_TX_RPT_CTRL + 1, maxMacid + 1); - } - break; case HW_VAR_H2C_MEDIA_STATUS_RPT: rtl8188e_set_FwMediaStatus_cmd(Adapter, (*(__le16 *)val)); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 8708675c3478..a997bbbae69f 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -33,7 +33,6 @@ enum hw_variables { HW_VAR_ANTENNA_DIVERSITY_SELECT, HW_VAR_FIFO_CLEARN_UP, HW_VAR_RPT_TIMER_SETTING, - HW_VAR_TX_RPT_MAX_MACID, HW_VAR_H2C_MEDIA_STATUS_RPT, HW_VAR_CHK_HI_QUEUE_EMPTY, }; diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 01de253c0376..37d217aaf524 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -594,6 +594,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan= _network *tgt_network); void rtw_set_roaming(struct adapter *adapter, u8 to_roaming); u8 rtw_to_roaming(struct adapter *adapter); =20 +void rtw_set_max_rpt_macid(struct adapter *adapter, u8 macid); void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *ps= ta, u32 mstatus); =20 --=20 2.35.1 From nobody Mon May 11 09:09:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA3B3C433EF for ; Tue, 29 Mar 2022 20:22:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231889AbiC2UYS (ORCPT ); Tue, 29 Mar 2022 16:24:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231440AbiC2UXk (ORCPT ); Tue, 29 Mar 2022 16:23:40 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBCEF23C0FF for ; Tue, 29 Mar 2022 13:21:56 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id c10so19012196ejs.13 for ; Tue, 29 Mar 2022 13:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vc+8XpUtyVNiqLLtoPnfC057JfZKwxN2NzxO5NmDbTM=; b=J8KvhlYAxm+Jnh6RGzMUCOrR7LASjHDjKLf5jrdb7ibPS1BGAOderi0ICuiQLOoWyM O64NUJJ4vQsUb3dhKCJmgbTPbtzGWo/hteuB/MPqXsZak+nvNHyoaVJ5btw1AAG0jiun Hmuod6ahu8v1xcFS1CnWVL/k7aP4sXme7RHzBSSRzNeSD0HG5P/F5Umq3x+kkN8gjjnB sg16FIP0gKIezve0rP45KcMue2wfubsDIQQm5bqQpPJg4ZcewjJnLZVVIC2KTGMXSCTI KDuRbsGbxAvg3IDqHj9rs5gse7S/pfXRFWRKKFYBJjKW7FfL5Hx7s8v7+8+JgvuSsejk drzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vc+8XpUtyVNiqLLtoPnfC057JfZKwxN2NzxO5NmDbTM=; b=MgiijQx8KmRjvty3YFru24S1R6Gt+O40HoD1CpYnxyH3P4YmIfgYy96MAT3YNj6P4F T6kRQkCNSzdSg0yaEtXL4MbqxwStOFCCHEZbzbKi1Kg125soc+LGSr9Xp6zkfwiEBnIY 6GdMyxZkk76LkAl5hPA/+WwSckF3iruSWVp0+ANoHNPk2eoX3BWloOXagdDgboGcHi9K kiW7OkRThh+M5kIhdb5ex93Wz/ckrDJXuNwJiL96d+39B+p6VXn0oRQ+FW4ukbyRN+Lp p5wDwD+3KwIyPdHPzRJH9wBRH2mmeqVHzvIFoYZ1Mx3DR3yktI+Em0BlLUlnLJxdfy3i av/A== X-Gm-Message-State: AOAM5321WPZqD8lWvTNPGhu0pDh14lD/dktexMb+7iH5YKzJ3ecfy+mp CCgW5DvJ2Aib/KK6FHQY334= X-Google-Smtp-Source: ABdhPJyPSqTxbQ86DNXVq4dHPCjZDaRIOKjLwbjGpyYpgcIHWvJQhPQXPaahdJCFxV1EyoV45FqJBQ== X-Received: by 2002:a17:907:6d96:b0:6df:f199:6a7c with SMTP id sb22-20020a1709076d9600b006dff1996a7cmr37449982ejc.137.1648585315340; Tue, 29 Mar 2022 13:21:55 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id ss12-20020a170907038c00b006e0ec9e806dsm3938111ejb.136.2022.03.29.13.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 13:21:54 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 8/8] staging: r8188eu: remove HW_VAR_BCN_VALID from SetHwReg8188EU() Date: Tue, 29 Mar 2022 22:21:41 +0200 Message-Id: <20220329202141.7028-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220329202141.7028-1-straube.linux@gmail.com> References: <20220329202141.7028-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The HW_VAR_BCN_VALID case in SetHwReg8188EU() just calls rtw_write8(). Remove HW_VAR_BCN_VALID from SetHwReg8188EU() and call rtw_write8() directly. Move the call to a new function to indicate what it actually does. This is part of the ongoing effort to getrid of the unwanted hal layer. Signed-off-by: Michael Straube --- v2: Moved the code into a function. drivers/staging/r8188eu/core/rtw_mlme_ext.c | 9 ++++++++- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 5 ++--- drivers/staging/r8188eu/hal/usb_halinit.c | 4 ---- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 9df87a878121..ef14a960c861 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5764,7 +5764,8 @@ unsigned int send_beacon(struct adapter *padapter) =20 u32 start =3D jiffies; =20 - SetHwReg8188EU(padapter, HW_VAR_BCN_VALID, NULL); + clear_bacon_valid_bit(padapter); + do { issue_beacon(padapter, 100); issue++; @@ -5786,6 +5787,12 @@ unsigned int send_beacon(struct adapter *padapter) } } =20 +void clear_bacon_valid_bit(struct adapter *adapter) +{ + /* BIT(16) of REG_TDECTRL =3D BIT(0) of REG_TDECTRL+2, write 1 to clear, = Clear by sw */ + rtw_write8(adapter, REG_TDECTRL + 2, rtw_read8(adapter, REG_TDECTRL + 2) = | BIT(0)); +} + /*************************************************************************= *** =20 Following are some utitity fuctions for WiFi MLME diff --git a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c b/drivers/staging/r= 8188eu/hal/rtl8188e_cmd.c index f1464e4ba429..a7337954891a 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_cmd.c @@ -557,8 +557,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *a= dapt, u8 mstatus) rtw_write8(adapt, REG_FWHW_TXQ_CTRL + 2, (haldata->RegFwHwTxQCtrl & (~BI= T(6)))); haldata->RegFwHwTxQCtrl &=3D (~BIT(6)); =20 - /* Clear beacon valid check bit. */ - SetHwReg8188EU(adapt, HW_VAR_BCN_VALID, NULL); + clear_bacon_valid_bit(adapt); DLBcnCount =3D 0; poll =3D 0; do { @@ -597,7 +596,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *a= dapt, u8 mstatus) =20 /* Update RSVD page location H2C to Fw. */ if (bcn_valid) - SetHwReg8188EU(adapt, HW_VAR_BCN_VALID, NULL); + clear_bacon_valid_bit(adapt); =20 /* Do not enable HW DMA BCN or it will cause Pcie interface hang by tim= ing issue. 2011.11.24. by tynli. */ /* Clear CR[8] or beacon packet will not be send to TxBuf anymore. */ diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index a3c955e54321..0330947e0106 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1277,10 +1277,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) case HW_VAR_H2C_MEDIA_STATUS_RPT: rtl8188e_set_FwMediaStatus_cmd(Adapter, (*(__le16 *)val)); break; - case HW_VAR_BCN_VALID: - /* BCN_VALID, BIT(16) of REG_TDECTRL =3D BIT(0) of REG_TDECTRL+2, write = 1 to clear, Clear by sw */ - rtw_write8(Adapter, REG_TDECTRL + 2, rtw_read8(Adapter, REG_TDECTRL + 2)= | BIT(0)); - break; default: break; } diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index bab6eeae6fc9..6974c7ffafde 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -538,6 +538,7 @@ void issue_action_BA(struct adapter *padapter, unsigned= char *raddr, unsigned char action, unsigned short status); unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr); unsigned int send_beacon(struct adapter *padapter); +void clear_bacon_valid_bit(struct adapter *adapter); =20 void start_clnt_assoc(struct adapter *padapter); void start_clnt_auth(struct adapter *padapter); --=20 2.35.1