Received-SPF: pass (google.com: domain of linux-wireless+bounces-4677-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <20d3457d-2d06-4088-81bd-893bf2712092@quicinc.com>
Date: Wed, 13 Mar 2024 19:59:25 +0530
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v4 03/12] wifi: ath12k: modify ath12k mac start/stop ops
 for single wiphy
Content-Language: en-US
To: Jeff Johnson <quic_jjohnson@quicinc.com>, <ath12k@lists.infradead.org>
CC: <linux-wireless@vger.kernel.org>, Sriram R <quic_srirrama@quicinc.com>
References: <20240312135557.1778379-1-quic_ramess@quicinc.com>
 <20240312135557.1778379-4-quic_ramess@quicinc.com>
 <c0756266-1f45-4b31-83e8-a8b8c31fafc6@quicinc.com>
From: Rameshkumar Sundaram <quic_ramess@quicinc.com>
In-Reply-To: <c0756266-1f45-4b31-83e8-a8b8c31fafc6@quicinc.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit


On 3/13/2024 3:43 AM, Jeff Johnson wrote:
> On 3/12/2024 6:55 AM, Rameshkumar Sundaram wrote:
>> From: Sriram R <quic_srirrama@quicinc.com>
>>
>> When mac80211 does drv start/stop, apply the state change
>> for all the radios within the wiphy in ath12k.
>>
>> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
>> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
>>
>> Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
>> Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com>
>> ---
>>   drivers/net/wireless/ath/ath12k/mac.c | 43 +++++++++++++++++++--------
>>   1 file changed, 31 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
>> index 0f33f5615170..4afaba3ba934 100644
>> --- a/drivers/net/wireless/ath/ath12k/mac.c
>> +++ b/drivers/net/wireless/ath/ath12k/mac.c
>> @@ -243,6 +243,7 @@ static const u32 ath12k_smps_map[] = {
>>   
>>   static int ath12k_start_vdev_delay(struct ath12k *ar,
>>   				   struct ath12k_vif *arvif);
>> +static void ath12k_mac_stop(struct ath12k *ar);
>>   
>>   static const char *ath12k_mac_phymode_str(enum wmi_phy_mode mode)
>>   {
>> @@ -5472,23 +5473,39 @@ static int ath12k_mac_start(struct ath12k *ar)
>>   	return ret;
>>   }
>>   
>> +static void ath12k_drain_tx(struct ath12k_hw *ah)
>> +{
>> +	struct ath12k *ar;
>> +	int i;
>> +
>> +	for_each_ar(i, ah, ar)
>> +		ath12k_mac_drain_tx(ar);
>> +}
>> +
>>   static int ath12k_mac_op_start(struct ieee80211_hw *hw)
>>   {
>>   	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);
>> -	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);
>> -	struct ath12k_base *ab = ar->ab;
>> -	int ret;
>> +	struct ath12k *ar;
>> +	int ret, i;
>>   
>> -	ath12k_mac_drain_tx(ar);
>> +	ath12k_drain_tx(ah);
>>   
>> -	ret = ath12k_mac_start(ar);
>> -	if (ret) {
>> -		ath12k_err(ab, "fail to start mac operations in pdev idx %d ret %d\n",
>> -			   ar->pdev_idx, ret);
>> -		return ret;
>> +	for_each_ar(i, ah, ar) {
>> +		ret = ath12k_mac_start(ar);
>> +		if (ret) {
>> +			ath12k_err(ar->ab, "fail to start mac operations in pdev idx %d ret %d\n",
>> +				   ar->pdev_idx, ret);
>> +			goto fail_start;
>> +		}
>>   	}
>>   
>>   	return 0;
>> +fail_start:
>> +	for (; i > 0; i--) {
> 
> should this be >= 0? otherwise you never stop radio 0
Ah! yes, will fix it in next version
> also note that this has a dependency upon how the macro is implemented since
> that determines when i is incremented.
Yeah, we'll fall to fail_start only if we had to break prematurely (i.e. 
before i could reach ah->num_radios).
> 
>> +		ar = ath12k_ah_to_ar(ah, i);
>> +		ath12k_mac_stop(ar);
>> +	}
>> +	return ret;
>>   }
>>   
>>   int ath12k_mac_rfkill_config(struct ath12k *ar)
>> @@ -5584,11 +5601,13 @@ static void ath12k_mac_stop(struct ath12k *ar)
>>   static void ath12k_mac_op_stop(struct ieee80211_hw *hw)
>>   {
>>   	struct ath12k_hw *ah = ath12k_hw_to_ah(hw);
>> -	struct ath12k *ar = ath12k_ah_to_ar(ah, 0);
>> +	struct ath12k *ar;
>> +	int i;
>>   
>> -	ath12k_mac_drain_tx(ar);
>> +	ath12k_drain_tx(ah);
>>   
>> -	ath12k_mac_stop(ar);
>> +	for_each_ar(i, ah, ar)
>> +		ath12k_mac_stop(ar);
>>   }
>>   
>>   static u8
>