From nobody Fri Jun 19 16:52:54 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 AA7D1C433EF for ; Thu, 31 Mar 2022 13:05:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236621AbiCaNHc (ORCPT ); Thu, 31 Mar 2022 09:07:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236567AbiCaNHV (ORCPT ); Thu, 31 Mar 2022 09:07:21 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C73BC49252 for ; Thu, 31 Mar 2022 06:05:33 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id bi12so48055947ejb.3 for ; Thu, 31 Mar 2022 06:05:33 -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=wLM8ocKt6f0arebieMXLbfikbZM3siH2fLv2W59ipRg=; b=GPYA80S5QnuytLdzBu2lKmTT4pttp+NDMO26zncwgWjfyTTSEE0CmyiOb3xx6xTzGJ 4c6Vhz9iYrJgMYSxW6ZxJxyPo7KS+MoV+BD6TvGVU9GU0rWrhlfCR5ac1eupmJAaoPn+ b9rWtDUypN8Kv5YWWYUm/hfBLHK4z1wt3lh+SgHiXyBUleZSm280/QZ+DrQG9VSROu9o +F+w+oAwV/DlmjW5if8ZPXJYQAoSqy97PgdjH/TAlqTAie5pJsK+c7Giqm5eWrAOPozZ LMNCeWCu0isId2APvA/BnHca1f7ZtqVtTZDNWv/ZK2Dfnkk4+8eLuxR1j2XghtXQ8IhO FgQQ== 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=wLM8ocKt6f0arebieMXLbfikbZM3siH2fLv2W59ipRg=; b=caP04sE7kK2dckZEXlMbsIj3cweZr485ct7xWsnIjhTwPqZjg5MkxT/PT3SflpcpSL tIKeVa3jTBsNELFmc0+YEoEkfA5km1CD28C4PIHXIEGIVZ1eSA55LuX3+M/DCMQVDtyF 77XfhcS9xdaBd4hlKZAmtBaLY/ET0H3r4n9pijUY/n0V1snjwmN7wcTYxQU5TFqaq9ai A7gDolWCEyqpNhOWcom4B+NzF1kAbkV8pL1GJQIk7BMLjOTABqcjmrbhbvq5yb1WXO6m zJv+4nAu1HOuOXqN34zaFpUXjdia+X9FHDYqVPqUG+Ijha3Z2+Dxzvwgh+AmobVxB0Pu Gx0g== X-Gm-Message-State: AOAM530/WOgLATLzvZAr6PDCnWg2oj0IDwDPWTt/ESdeJIlLWC9DZ0gG MrYxZxUTFLfPePurtQIeGKE= X-Google-Smtp-Source: ABdhPJySxYC9VY6GU3cnheaUqRUTgTRtIMdM3cjme2J0sjJokpLC7EyjcXJpEn5RcJALk3PCjETRFA== X-Received: by 2002:a17:906:1645:b0:6ce:de9:6eb1 with SMTP id n5-20020a170906164500b006ce0de96eb1mr4972136ejd.616.1648731929952; Thu, 31 Mar 2022 06:05:29 -0700 (PDT) Received: from localhost.localdomain ([95.90.187.85]) by smtp.gmail.com with ESMTPSA id kw3-20020a170907770300b006d2a835ac33sm9333358ejc.197.2022.03.31.06.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 06:05:29 -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 1/5] staging: r8188eu: rename clear_bacon_valid_bit() Date: Thu, 31 Mar 2022 15:05:18 +0200 Message-Id: <20220331130522.6648-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331130522.6648-1-straube.linux@gmail.com> References: <20220331130522.6648-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 clear_bacon_valid_bit(). Actually it should be clear_beacon_valid_bit(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 4 ++-- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 643f9f8a7a3d..15a91c5fc852 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5761,7 +5761,7 @@ unsigned int send_beacon(struct adapter *padapter) =20 u32 start =3D jiffies; =20 - clear_bacon_valid_bit(padapter); + clear_beacon_valid_bit(padapter); =20 do { issue_beacon(padapter, 100); @@ -5784,7 +5784,7 @@ unsigned int send_beacon(struct adapter *padapter) } } =20 -void clear_bacon_valid_bit(struct adapter *adapter) +void clear_beacon_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)); diff --git a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c b/drivers/staging/r= 8188eu/hal/rtl8188e_cmd.c index a7337954891a..2e252562e48c 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_cmd.c @@ -557,7 +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_bacon_valid_bit(adapt); + clear_beacon_valid_bit(adapt); DLBcnCount =3D 0; poll =3D 0; do { @@ -596,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) - clear_bacon_valid_bit(adapt); + clear_beacon_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/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 66f7361e7a19..a00da19c4b88 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -538,7 +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); +void clear_beacon_valid_bit(struct adapter *adapter); =20 void start_clnt_assoc(struct adapter *padapter); void start_clnt_auth(struct adapter *padapter); --=20 2.35.1 From nobody Fri Jun 19 16:52:54 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 9E781C433F5 for ; Thu, 31 Mar 2022 13:05:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236601AbiCaNHX (ORCPT ); Thu, 31 Mar 2022 09:07:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236573AbiCaNHT (ORCPT ); Thu, 31 Mar 2022 09:07:19 -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 BA66049916 for ; Thu, 31 Mar 2022 06:05:32 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id g20so28085486edw.6 for ; Thu, 31 Mar 2022 06:05:32 -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=Vhzg+EFSHTIr1gVDui1/FuKQCOLjPrm8bCZUxNvvDXU=; b=V12rv/gD9izH5kJjX4/6cUNAYZK5mCknm7kdkqtNI5auSjebI1oFnHvaPqKB87D5Ua eWcpwaWUlyMEL0qc0skuBP93r1L/dhi1ewpgYVxqQD79Rax9sWcSmPz1eXHPEorGnN3y YC1rWn8L6rDurf5KymFbuu6JLBRu0/MKx1X3oUUHhYvMBksunmwVdHpiuUSgY9m2icbb qbFjJLvo/dO6lDU1aXzRifD7oBUO7kIV7sUFRn7p95WWJeostmmztpY7AJ7HMI5MCvc8 N6fRmhPQNNLjkLbrdJM1ma1Dhh44teNIPaKS91y/WXUX7YnImFHg/TZ10P7S6Puzs74h KDtQ== 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=Vhzg+EFSHTIr1gVDui1/FuKQCOLjPrm8bCZUxNvvDXU=; b=Fw0256ogTsQhVD69yruMLzhFDLAC/HS0s+aXTeZW/eSeUCvV/sjiCo+ocP68OxJHP4 UvfaC+x8XZUEtUZS4Sz4flKKAPREGECZqdr2JOqfSAhCCJQNuvU6uvChmC/0X/Vocirq PhBL2mD//5FkZXbtCCnibcjkCoX59SxNG+EqPL/hoBdpjMtusEvGZIAjfGsjXk6Ck/h3 h9TV6tqbBes3byxNpRsz0cCU2h0Gq8G+8+85et+6zPiOg/dgdgc95XggbiImEXVDzBHf Z9K44IqNt/6X7IdvutLPyIsKBg8WlordWsKxZjC8Z0hU2p2xi0kKrpDoLBN/zqpR5Ffr gAPw== X-Gm-Message-State: AOAM533T2670uqjIUYa9rC4476cNqv+wi67HkT4AlK7MEv1RLVtbGEq2 2q94Z1hhxivnHk4tAP/jdaI= X-Google-Smtp-Source: ABdhPJxI+/ZNJNapuNc5I5I5OMz/nuAIDlweF9ZbVqo17g9YvwLlrKiTx6+7HAh+k+R2m81ecmrPWw== X-Received: by 2002:aa7:cc82:0:b0:410:d2b0:1a07 with SMTP id p2-20020aa7cc82000000b00410d2b01a07mr16432053edt.359.1648731930883; Thu, 31 Mar 2022 06:05:30 -0700 (PDT) Received: from localhost.localdomain ([95.90.187.85]) by smtp.gmail.com with ESMTPSA id kw3-20020a170907770300b006d2a835ac33sm9333358ejc.197.2022.03.31.06.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 06:05:30 -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 2/5] staging: r8188eu: remove HW_VAR_BCN_VALID from GetHwReg8188EU() Date: Thu, 31 Mar 2022 15:05:19 +0200 Message-Id: <20220331130522.6648-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331130522.6648-1-straube.linux@gmail.com> References: <20220331130522.6648-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 from GetHwReg8188EU() just calls rtw_read8(). Remove HW_VAR_BCN_VALID from GetHwReg8188EU() and call rtw_read8() 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 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 10 ++++++++-- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 4 ---- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 15a91c5fc852..3032a7e7977b 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5755,7 +5755,7 @@ unsigned int send_delba(struct adapter *padapter, u8 = initiator, u8 *addr) =20 unsigned int send_beacon(struct adapter *padapter) { - u8 bxmitok =3D false; + bool bxmitok =3D false; int issue =3D 0; int poll =3D 0; =20 @@ -5768,7 +5768,7 @@ unsigned int send_beacon(struct adapter *padapter) issue++; do { yield(); - GetHwReg8188EU(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok)); + bxmitok =3D get_beacon_valid_bit(padapter); poll++; } while ((poll % 10) !=3D 0 && !bxmitok && !padapter->bSurpriseRemoved &= & !padapter->bDriverStopped); } while (!bxmitok && issue < 100 && !padapter->bSurpriseRemoved && !padap= ter->bDriverStopped); @@ -5784,6 +5784,12 @@ unsigned int send_beacon(struct adapter *padapter) } } =20 +bool get_beacon_valid_bit(struct adapter *adapter) +{ + /* BIT(16) of REG_TDECTRL =3D BIT(0) of REG_TDECTRL+2 */ + return BIT(0) & rtw_read8(adapter, REG_TDECTRL + 2); +} + void clear_beacon_valid_bit(struct adapter *adapter) { /* BIT(16) of REG_TDECTRL =3D BIT(0) of REG_TDECTRL+2, write 1 to clear, = Clear by sw */ diff --git a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c b/drivers/staging/r= 8188eu/hal/rtl8188e_cmd.c index 2e252562e48c..45b788212628 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_cmd.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_cmd.c @@ -568,7 +568,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *a= dapt, u8 mstatus) yield(); /* mdelay(10); */ /* check rsvd page download OK. */ - GetHwReg8188EU(adapt, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid)); + bcn_valid =3D get_beacon_valid_bit(adapt); poll++; } while (!bcn_valid && (poll % 10) !=3D 0 && !adapt->bSurpriseRemoved &= & !adapt->bDriverStopped); } while (!bcn_valid && DLBcnCount <=3D 100 && !adapt->bSurpriseRemoved &= & !adapt->bDriverStopped); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 8cb1163ced5d..8c4bc78681e1 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1289,10 +1289,6 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) struct odm_dm_struct *podmpriv =3D &haldata->odmpriv; =20 switch (variable) { - case HW_VAR_BCN_VALID: - /* BCN_VALID, BIT(16) of REG_TDECTRL =3D BIT(0) of REG_TDECTRL+2 */ - val[0] =3D (BIT(0) & rtw_read8(Adapter, REG_TDECTRL + 2)) ? true : false; - break; case HW_VAR_DM_FLAG: val[0] =3D podmpriv->SupportAbility; break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 1e2177b8e11c..065fc7bd78d5 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_JOIN, HW_VAR_SLOT_TIME, HW_VAR_ACK_PREAMBLE, - HW_VAR_BCN_VALID, HW_VAR_DM_FLAG, HW_VAR_DM_FUNC_OP, HW_VAR_DM_FUNC_RESET, diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index a00da19c4b88..0875472dbb72 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); +bool get_beacon_valid_bit(struct adapter *adapter); void clear_beacon_valid_bit(struct adapter *adapter); =20 void start_clnt_assoc(struct adapter *padapter); --=20 2.35.1 From nobody Fri Jun 19 16:52:54 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 B4131C433F5 for ; Thu, 31 Mar 2022 13:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236612AbiCaNH0 (ORCPT ); Thu, 31 Mar 2022 09:07:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236575AbiCaNHV (ORCPT ); Thu, 31 Mar 2022 09:07:21 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 510DD49926 for ; Thu, 31 Mar 2022 06:05:33 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id b15so28115081edn.4 for ; Thu, 31 Mar 2022 06:05:33 -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=UE4Nx0CiTaCczhJ2vYi5Ie0116akL9a7MnthzOVYiR8=; b=OlrEIJa52NH8jCOlaQ3+hYcIEuyuwp6tVMbKB787dxYsbdcsPPQC63OIJ7VXhU8w1/ 6csxZjXYaHkH4zNGIrJKU7PTMU++UO96s5nYGHyCkDelF5NUR3WiN9dFlaN151HUeC7b o4QS/zJIo2eht4oEw7/9hP7g/t56wamG5LNWNTQRL/DKY1l/Vn4CZz9hgaJdykwiDX0C dNrfSccT8zp1WbZwYOX/ZVQ37qSCeIquilyrpyW0n5t3wfoiNpLcsN/eBhZkz1hyFm3W hKKY5iCsb3YK++J57+r8agGJTN2uxJC5zAa1widOmsXzpt2Zg57D6pycVBbVgVa+KtYU 4C/w== 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=UE4Nx0CiTaCczhJ2vYi5Ie0116akL9a7MnthzOVYiR8=; b=NmmzJ7+KKz9MsdIqYbKP1XSd7rIVS4IBCuOg2u2swagSEMrY97QbLw1iykKPrxk2gk 9jCeFxwaiR4PLdh2ZB2Qtii49edyw7XSjV4hFi79zsZVdbjKr8/xHpl+wgAbo6ZI2+T5 MlTakGDlmXEGImWF7b+I8pY9DXybi4gV0DdZmGSaJ1kakYFRrXM7bLxRll6Izctt3PJz ULtSnSxPq5jJ8z5ssI2gB7B5qlF0lmk/j8uhHaVYJJ71/yaxDlDIaVR6e0Q576YEkhbG r5USO5y9LUMvDWBPHg2fIr2ck6BAA3oIuU6QBWZhzvZqBLDqryctcRW4ETPzcWzplOoi fb5w== X-Gm-Message-State: AOAM530Gt8aunhGxHOq3TwpPikWBlQghJFYUDfbpgB0xRcM6Fz+Q9Enx OemygI+VOVAnaBsswUXp+Z0= X-Google-Smtp-Source: ABdhPJxuP9Apo1VHcnc/4RfNtkPAHelI4026bKbbWIjW9YKgNTAt9ARLJUajmJmP5l37C4vHBGYO6Q== X-Received: by 2002:a05:6402:51d2:b0:419:7d2e:9d0 with SMTP id r18-20020a05640251d200b004197d2e09d0mr16378621edd.82.1648731931763; Thu, 31 Mar 2022 06:05:31 -0700 (PDT) Received: from localhost.localdomain ([95.90.187.85]) by smtp.gmail.com with ESMTPSA id kw3-20020a170907770300b006d2a835ac33sm9333358ejc.197.2022.03.31.06.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 06:05:31 -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 3/5] staging: r8188eu: remove HW_VAR_CHK_HI_QUEUE_EMPTY from GetHwReg8188EU() Date: Thu, 31 Mar 2022 15:05:20 +0200 Message-Id: <20220331130522.6648-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331130522.6648-1-straube.linux@gmail.com> References: <20220331130522.6648-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_CHK_HI_QUEUE_EMPTY from GetHwReg8188EU() just calls rtw_read32(). Remove HW_VAR_CHK_HI_QUEUE_EMPTY from GetHwReg8188EU() and call rtw_read32() 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 --- drivers/staging/r8188eu/core/rtw_cmd.c | 14 +++++++------- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 859ec8d8ad9e..496fb67f2253 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -1199,6 +1199,11 @@ u8 rtw_ps_cmd(struct adapter *padapter) return res; } =20 +static bool rtw_is_hi_queue_empty(struct adapter *adapter) +{ + return (rtw_read32(adapter, REG_HGQ_INFORMATION) & 0x0000ff00) =3D=3D 0; +} + static void rtw_chk_hi_queue_hdl(struct adapter *padapter) { int cnt =3D 0; @@ -1210,12 +1215,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *pad= apter) return; =20 if (psta_bmc->sleepq_len =3D=3D 0) { - u8 val =3D 0; - - /* while ((rtw_read32(padapter, 0x414)&0x00ffff00)!=3D 0) */ - /* while ((rtw_read32(padapter, 0x414)&0x0000ff00)!=3D 0) */ - - GetHwReg8188EU(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val); + bool val =3D rtw_is_hi_queue_empty(padapter); =20 while (!val) { msleep(100); @@ -1225,7 +1225,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *pada= pter) if (cnt > 10) break; =20 - GetHwReg8188EU(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val); + val =3D rtw_is_hi_queue_empty(padapter); } =20 if (cnt <=3D 10) { diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 8c4bc78681e1..611785caa17f 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1310,9 +1310,6 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 varia= ble, u8 *val) } } break; - case HW_VAR_CHK_HI_QUEUE_EMPTY: - *val =3D ((rtw_read32(Adapter, REG_HGQ_INFORMATION) & 0x0000ff00) =3D=3D= 0) ? true : false; - break; default: break; } diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 065fc7bd78d5..f0a6d697e68b 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_FIFO_CLEARN_UP, HW_VAR_RPT_TIMER_SETTING, HW_VAR_H2C_MEDIA_STATUS_RPT, - HW_VAR_CHK_HI_QUEUE_EMPTY, }; =20 enum hal_def_variable { --=20 2.35.1 From nobody Fri Jun 19 16:52:54 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 864B5C433F5 for ; Thu, 31 Mar 2022 13:05:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236626AbiCaNHg (ORCPT ); Thu, 31 Mar 2022 09:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236576AbiCaNHV (ORCPT ); Thu, 31 Mar 2022 09:07:21 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3B5049FAF for ; Thu, 31 Mar 2022 06:05:33 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id b24so28072625edu.10 for ; Thu, 31 Mar 2022 06:05:33 -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=2Ctmuw6ZzQ/vE6l7pPQ1kZ77ejeBWjd65IhnZItF+7o=; b=PA9hp7AaOABt/iP+ZiFzFNht0r9TpK6+AtLyRBKegBFMk8C5TTBclQn/3LdhL06PYG vCXEC3ofAdzCzLcx3hkigp/Ez/+ECsVNcAidWqy4ylzm1/IsErOdS0ehjNX4VQCwNWOm Y3rzVugkTNFL7AcqMfXWysAlobQP8jaFe1u1XcqwoILhX/XOMfNyxW3269VcNK6sQbH7 5SmqSKrL2hfV8nfOABpzrYgtGWIvmPxsRJ8Re7G8lyhKhhMNytkwb8nAARvaS180+8XK 7ZMx+/DyaMLeLSXovfAkrykFPZDw0nTf5HP6IIR4zyrvW998SXgJGwbUuvrcY8iGxu7s UH+w== 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=2Ctmuw6ZzQ/vE6l7pPQ1kZ77ejeBWjd65IhnZItF+7o=; b=bGitDZfYVxB/myC8fd1PppxXp3nlkYH6h08OVJAG0xlNrNJEQcW9fYJsFGj4Tttpkm pbHAfR0xHTDtcfVfYJyLiXYAphYaBP/vxmxrIivzoKXIxAHZrIU5jIe9jK4FZdT5/J77 BbLJOGLYlIN4/Eq3Il0K3tgls21rNvuwf53NPGY0MODjiuGKz6YLPDo/H2otiPrg25Et oRY9oXjhuK732hBKJwzKAQ8BWRkwxtvIWONzMf0g/+QlOh92HDh5gZfP3NzTcoWf52W3 F5Tcz9/ASjnBPlUpDUQDkDarSgAzuwVyUBJA6b5erfoYkOlY46VYsnRmTKSlP73vRxnu pNVA== X-Gm-Message-State: AOAM532pnzOzeJmztUMZYHgE6VuD564ryL7CKE3pEql3Vt3AoEV35uls 2su07xZnQDWpb00I2Hr8v+E= X-Google-Smtp-Source: ABdhPJw1Tgl4jd12QxFtucjF6mXHRFgjMS1MSm3qywNuDoODZr9ywM5BeRbkZWKKjLLztmCcMrcaFg== X-Received: by 2002:a05:6402:2681:b0:419:4564:1bd4 with SMTP id w1-20020a056402268100b0041945641bd4mr16634407edd.358.1648731932488; Thu, 31 Mar 2022 06:05:32 -0700 (PDT) Received: from localhost.localdomain ([95.90.187.85]) by smtp.gmail.com with ESMTPSA id kw3-20020a170907770300b006d2a835ac33sm9333358ejc.197.2022.03.31.06.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 06:05:32 -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 4/5] staging: r8188eu: remove HW_VAR_FWLPS_RF_ON from GetHwReg8188EU() Date: Thu, 31 Mar 2022 15:05:21 +0200 Message-Id: <20220331130522.6648-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331130522.6648-1-straube.linux@gmail.com> References: <20220331130522.6648-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" Move the functionality of the HW_VAR_FWLPS_RF_ON case in GetHwReg8188EU() to a static function in rtw_pwrctrl.c and remove the HW_VAR_FWLPS_RF_ON case from GetHwReg8188EU(). This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 19 ++++++++++++++++--- drivers/staging/r8188eu/hal/usb_halinit.c | 18 ------------------ drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r= 8188eu/core/rtw_pwrctrl.c index 7beabf82eb92..0141de7ab08c 100644 --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c @@ -217,6 +217,21 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_m= ode, u8 smart_ps, u8 bcn_a =20 } =20 +static bool lps_rf_on(struct adapter *adapter) +{ + /* When we halt NIC, we should check if FW LPS is leave. */ + if (adapter->pwrctrlpriv.rf_pwrstate =3D=3D rf_off) { + /* If it is in HW/SW Radio OFF or IPS state, we do not check Fw LPS Lea= ve, */ + /* because Fw is unload. */ + return true; + } + + if (rtw_read32(adapter, REG_RCR) & 0x00070000) + return false; + + return true; +} + /* * Return: * 0: Leave OK @@ -226,13 +241,11 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_= mode, u8 smart_ps, u8 bcn_a s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) { u32 start_time; - u8 bAwake =3D false; s32 err =3D 0; =20 start_time =3D jiffies; while (1) { - GetHwReg8188EU(padapter, HW_VAR_FWLPS_RF_ON, &bAwake); - if (bAwake) + if (lps_rf_on(padapter)) break; =20 if (padapter->bSurpriseRemoved) { diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 611785caa17f..37c56690b13a 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1292,24 +1292,6 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) case HW_VAR_DM_FLAG: val[0] =3D podmpriv->SupportAbility; break; - case HW_VAR_FWLPS_RF_ON: - { - /* When we halt NIC, we should check if FW LPS is leave. */ - if (Adapter->pwrctrlpriv.rf_pwrstate =3D=3D rf_off) { - /* If it is in HW/SW Radio OFF or IPS state, we do not check Fw LPS L= eave, */ - /* because Fw is unload. */ - val[0] =3D true; - } else { - u32 valRCR; - valRCR =3D rtw_read32(Adapter, REG_RCR); - valRCR &=3D 0x00070000; - if (valRCR) - val[0] =3D false; - else - val[0] =3D true; - } - } - break; default: break; } diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index f0a6d697e68b..0033a0aca27b 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -26,7 +26,6 @@ enum hw_variables { HW_VAR_AMPDU_FACTOR, HW_VAR_H2C_FW_PWRMODE, HW_VAR_H2C_FW_JOINBSSRPT, - HW_VAR_FWLPS_RF_ON, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, HW_VAR_INITIAL_GAIN, HW_VAR_ANTENNA_DIVERSITY_SELECT, --=20 2.35.1 From nobody Fri Jun 19 16:52:54 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 98C2FC433F5 for ; Thu, 31 Mar 2022 13:05:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236630AbiCaNHl (ORCPT ); Thu, 31 Mar 2022 09:07:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236590AbiCaNHW (ORCPT ); Thu, 31 Mar 2022 09:07:22 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D126C4A3D4 for ; Thu, 31 Mar 2022 06:05:34 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id c62so28091924edf.5 for ; Thu, 31 Mar 2022 06:05:34 -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=hDkMgRtARbafWLIsbRUHsKRuUskVl4hLD8Sy8XkZqqQ=; b=RuBqpGSqjVaNIFU0quQSMU7nMkXosvjERI4FrDrlsgaGgLhK7/ARVZFry+fAVp5s6S hq5MsxLjysLVqULWFzG5uFc3dGwdt+l1F5cuib5Evgsp+n3/C4j7gkf0qGTpyC8D7Ee7 rT9VRxPfPa4O47VYd+paKpeo/6OXAbd61PMNSi6vaC2rz7HE07gY6WpDne/AxvKJV0ro 1b90+Dgxu3gkPnGQktk/lmBWr4rzxXrSgZSB+MZ53RFqWUttx+vUbLVYQOOH0ct32Z/D p/dzmDFriyTZoPxKpfxOlAmxNzcpjIBb/mBnfMt1u5jUQFok19miYGi+yzl2x2tSR08M 2G4g== 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=hDkMgRtARbafWLIsbRUHsKRuUskVl4hLD8Sy8XkZqqQ=; b=pt801eXOFLfEsD9fuEKEqn+/jZGq7NCtOtHzV82LYW56H6UdRBcPSE3h9YWYxLHRNB aVa5nhsd0/gSrVx5qYD89ZebBbMZaQDUNfn0D2xEAismXAPEwYt0PZyThNQsubjgxFEz IYcYMf/R+j5fJOYdKEf8aEaXqvz17nOCdqvD9NNPpEH/5O7aQbW8G0YiPNk2IottxL36 xDRv07SjY6Yd+VslCy2ZHS7GGFNwvdHH4Rq7fOolrGdmhmI0FNgKW019vcFGbJJQk1i/ iWMEOJKgWpBqTPE/XEZdP0iu5+2zQvTKWinVP+2pN1kO1K/AhJ5GyDeRyjSU+dWiikol g1XA== X-Gm-Message-State: AOAM530samq2DF57+kk7P0/0UA53iDcWejXtVpJx0T2V8I+ga0RbiypC 42olJNVAkSjYcZKPUILWEw0= X-Google-Smtp-Source: ABdhPJzlp512fZ6CXDDdg1NM8qbyrCqIy1+fO2jPvqpDCyPTWMsKe07QK7eYVqWYDPJO22cPiDbllA== X-Received: by 2002:a05:6402:4248:b0:419:4583:eaa2 with SMTP id g8-20020a056402424800b004194583eaa2mr16571892edb.376.1648731933208; Thu, 31 Mar 2022 06:05:33 -0700 (PDT) Received: from localhost.localdomain ([95.90.187.85]) by smtp.gmail.com with ESMTPSA id kw3-20020a170907770300b006d2a835ac33sm9333358ejc.197.2022.03.31.06.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 06:05:32 -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 5/5] staging: r8188eu: remove GetHwReg8188EU() Date: Thu, 31 Mar 2022 15:05:22 +0200 Message-Id: <20220331130522.6648-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331130522.6648-1-straube.linux@gmail.com> References: <20220331130522.6648-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 only call to GetHwReg8188EU() that is left over from previous cleanups sets a variable that is immediately overwritten. This call is useless and we can finally remove the GetHwReg8188EU() function. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_halinit.c | 15 --------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 +--- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 37c56690b13a..6b4b0b0c4f53 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1283,21 +1283,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) =20 } =20 -void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) -{ - struct hal_data_8188e *haldata =3D &Adapter->haldata; - struct odm_dm_struct *podmpriv =3D &haldata->odmpriv; - - switch (variable) { - case HW_VAR_DM_FLAG: - val[0] =3D podmpriv->SupportAbility; - break; - default: - break; - } - -} - /* Query setting of specified variable. */ void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable e= Variable, void *pValue) { diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 0033a0aca27b..9b465001975c 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -66,7 +66,6 @@ void GetHalDefVar8188EUsb(struct adapter *Adapter, enum h= al_def_variable eVariab unsigned int rtl8188eu_inirp_init(struct adapter *Adapter); =20 void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val); -void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val); =20 uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter); diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index 7df213856d66..6383b399ae40 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -3620,9 +3620,7 @@ static int rtw_dbg_port(struct net_device *dev, break; case 0x06: { - u32 ODMFlag; - GetHwReg8188EU(padapter, HW_VAR_DM_FLAG, (u8 *)(&ODMFlag)); - ODMFlag =3D (u32)(0x0f & arg); + u32 ODMFlag =3D (u32)(0x0f & arg); SetHwReg8188EU(padapter, HW_VAR_DM_FLAG, (u8 *)(&ODMFlag)); } break; --=20 2.35.1