Received-SPF: pass (google.com: domain of linux-wireless+bounces-6678-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <67e46592-c521-411c-b23c-4fb2da30e3f5@gmail.com>
Date: Mon, 22 Apr 2024 20:13:49 +0300
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v6 6/6] wifi: rtlwifi: Adjust rtl8192d-common for USB
To: Ping-Ke Shih <pkshih@realtek.com>,
 "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
 Stefan Lippers-Hollmann <s.l-h@gmx.de>,
 Christian Hewitt <chewitt@libreelec.tv>
References: <9d54a192-d389-4a56-9286-2e7721cbbc27@gmail.com>
 <45848eb2-9c52-4aac-b7b0-b584955e41d7@gmail.com>
 <f080fd27b21147869e8b923891d5dcff@realtek.com>
Content-Language: en-US
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
In-Reply-To: <f080fd27b21147869e8b923891d5dcff@realtek.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 22/04/2024 06:39, Ping-Ke Shih wrote:
> Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote:
>> A few of the shared functions need small changes for the USB driver:
>>  - firmware loading
>>  - efuse reading
>>  - rate mask updating
>>  - rf register reading
>>  - initial gain for scanning
>>
>> Also, add a few macros to wifi.h and initialise rtlhal.interfaceindex
>> for USB devices.
>>
>> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
> 
> [...]
> 
>> @@ -965,12 +983,20 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
>>                 break;
>>         }
>>
>> -       value[0] = (ratr_bitmap & 0x0fffffff) | (ratr_index << 28);
>> -       value[1] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
>> +       le32p_replace_bits(&rate_mask.rate_mask_and_raid, ratr_bitmap, RATE_MASK_MASK);
>> +       le32p_replace_bits(&rate_mask.rate_mask_and_raid, ratr_index, RAID_MASK);
>> +       u8p_replace_bits(&rate_mask.macid_and_short_gi, macid, MACID_MASK);
>> +       u8p_replace_bits(&rate_mask.macid_and_short_gi, shortgi, SHORT_GI_MASK);
>> +       u8p_replace_bits(&rate_mask.macid_and_short_gi, 1, BIT(7));
>> +
>>         rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG,
>> -               "ratr_bitmap :%x value0:%x value1:%x\n",
>> -               ratr_bitmap, value[0], value[1]);
>> -       rtl92d_fill_h2c_cmd(hw, H2C_RA_MASK, 5, (u8 *)value);
>> +               "Rate_index:%x, ratr_val:%x, %5phC\n",
>> +               ratr_index, ratr_bitmap, &rate_mask);
>> +       memcpy(rtlpriv->rate_mask, &rate_mask, sizeof(rtlpriv->rate_mask));
>> +       /* rtl92d_fill_h2c_cmd() does USB I/O and will result in a
>> +        * "scheduled while atomic" if called directly
>> +        */
>> +       schedule_work(&rtlpriv->works.fill_h2c_cmd);
> 
> This function will be used by both PCI and USB, right? But, 
> only USB initialize/cancel rtlpriv->works.fill_h2c_cmd. 
> 

You're right, I didn't notice that. I will fix it the easy way:
call rtl92d_fill_h2c_cmd() for PCI and schedule_work() for USB.