Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <0ce62044-b6a1-ca14-899d-47f7aa807df9@gmail.com>
Date:   Fri, 16 Jun 2023 14:10:36 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.2
Subject: Re: [PATCH 1/6] wifi: rtw88: use struct instead of macros to set TX
 desc
To:     Ping-Ke Shih <pkshih@realtek.com>, tony0620emma@gmail.com,
        kvalo@kernel.org
Cc:     phhuang@realtek.com, linux-wireless@vger.kernel.org
References: <20230616034431.17403-1-pkshih@realtek.com>
 <20230616034431.17403-2-pkshih@realtek.com>
Content-Language: en-US
From:   Bitterblue Smith <rtl8821cerfe2@gmail.com>
In-Reply-To: <20230616034431.17403-2-pkshih@realtek.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 16/06/2023 06:44, Ping-Ke Shih wrote:
> From: Po-Hao Huang <phhuang@realtek.com>
> 
> Remove macros that set TX descriptors. Use struct and
> le32_encode_bits() with mask definitions.
> 
> Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> ---
>  drivers/net/wireless/realtek/rtw88/rtw8723d.c |   5 +-
>  drivers/net/wireless/realtek/rtw88/tx.c       |  79 +++++++-----
>  drivers/net/wireless/realtek/rtw88/tx.h       | 121 +++++++-----------
>  drivers/net/wireless/realtek/rtw88/usb.c      |  12 +-
>  4 files changed, 104 insertions(+), 113 deletions(-)
> 

[...]

> diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
> index 976eafa739a2d..dbfd5576cc120 100644
> --- a/drivers/net/wireless/realtek/rtw88/usb.c
> +++ b/drivers/net/wireless/realtek/rtw88/usb.c
> @@ -24,11 +24,12 @@ struct rtw_usb_txcb {
>  static void rtw_usb_fill_tx_checksum(struct rtw_usb *rtwusb,
>  				     struct sk_buff *skb, int agg_num)
>  {
> +	struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)skb->data;
>  	struct rtw_dev *rtwdev = rtwusb->rtwdev;
>  	struct rtw_tx_pkt_info pkt_info;
>  
> -	SET_TX_DESC_DMA_TXAGG_NUM(skb->data, agg_num);
> -	pkt_info.pkt_offset = GET_TX_DESC_PKT_OFFSET(skb->data);
> +	le32_replace_bits(tx_desc->w7, agg_num, RTW_TX_DESC_W7_TXDESC_CHECKSUM);

This looks like the wrong mask. Should it be RTW_TX_DESC_W7_DMA_TXAGG_NUM ?

> +	pkt_info.pkt_offset = le32_get_bits(tx_desc->w1, RTW_TX_DESC_W1_PKT_OFFSET);
>  	rtw_tx_fill_txdesc_checksum(rtwdev, &pkt_info, skb->data);
>  }
>