From: Rameshkumar Sundaram <quic_ramess@quicinc.com>
To: Jeff Johnson <quic_jjohnson@quicinc.com>, <ath12k@lists.infradead.org>
Cc: <linux-wireless@vger.kernel.org>, Sriram R <quic_srirrama@quicinc.com>
Subject: Re: [PATCH v4 12/12] wifi: ath12k: support get_survey mac op for single wiphy
Date: Tue, 19 Mar 2024 21:52:55 +0530 [thread overview]
Message-ID: <6989461b-295e-4886-9d39-64f15cc01074@quicinc.com> (raw)
In-Reply-To: <036abbcc-eb90-48db-a82e-5565bcc336ef@quicinc.com>
On 3/13/2024 4:55 AM, Jeff Johnson wrote:
> On 3/12/2024 6:55 AM, Rameshkumar Sundaram wrote:
>> From: Sriram R <quic_srirrama@quicinc.com>
>>
>> The radio for which the survey info needs to be collected
>> depends on the channel idx which could be based on the band.
>> Use the idx to identify the appropriate sband since multiple
>> bands could be combined for single wiphy case.
>>
>> Also use the channel idx and sband to identify the corresponding
>> radio on which the survey results needs to be populated.
>>
>> 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 | 25 ++++++++++++++++---------
>> 1 file changed, 16 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
>> index 6123d7db2edc..a31003f8325d 100644
>> --- a/drivers/net/wireless/ath/ath12k/mac.c
>> +++ b/drivers/net/wireless/ath/ath12k/mac.c
>> @@ -7821,7 +7821,6 @@ ath12k_mac_update_bss_chan_survey(struct ath12k *ar,
>> static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
>> struct survey_info *survey)
>> {
>> - struct ath12k_hw *ah = ath12k_hw_to_ah(hw);
>> struct ath12k *ar;
>> struct ieee80211_supported_band *sband;
>> struct survey_info *ar_survey;
>> @@ -7830,12 +7829,6 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
>> if (idx >= ATH12K_NUM_CHANS)
>> return -ENOENT;
>>
>> - ar = ath12k_ah_to_ar(ah, 0);
>> -
>> - ar_survey = &ar->survey[idx];
>> -
>> - mutex_lock(&ar->conf_mutex);
>> -
>> sband = hw->wiphy->bands[NL80211_BAND_2GHZ];
>> if (sband && idx >= sband->n_channels) {
>> idx -= sband->n_channels;
>> @@ -7850,6 +7843,21 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
>> goto exit;
>> }
>>
>> + ar = ath12k_mac_get_ar_by_chan(hw, &sband->channels[idx]);
>> + if (!ar) {
>> + if (sband->channels[idx].flags & IEEE80211_CHAN_DISABLED) {
>> + ret = 0;
>> + memset(survey, 0, sizeof(*survey));
>> + goto exit;
>> + }
>> + ret = -ENOENT;
>> + goto exit;
>> + }
>> +
>> + ar_survey = &ar->survey[idx];
>> +
>> + mutex_lock(&ar->conf_mutex);
>> +
>> ath12k_mac_update_bss_chan_survey(ar, &sband->channels[idx]);
>>
>> spin_lock_bh(&ar->data_lock);
>> @@ -7861,9 +7869,8 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx,
>> if (ar->rx_channel == survey->channel)
>> survey->filled |= SURVEY_INFO_IN_USE;
>>
>> -exit:
>> mutex_unlock(&ar->conf_mutex);
>> -
>> +exit:
>
> goto should normally only be used when there is centralized cleanup.
> since now there is no cleanup required, all of the goto exit calls should just
> directly return the appropriate error
>
Sure, this sneaked through while rebasing, thanks for pointing out. Will
fix it in next version.
>> return ret;
>> }
>>
>
next prev parent reply other threads:[~2024-03-19 16:23 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 13:55 [PATCH v4 00/12] wifi: ath12k: Add single wiphy support Rameshkumar Sundaram
2024-03-12 13:55 ` [PATCH v4 01/12] wifi: ath12k: add multiple radio support in a single MAC HW un/register Rameshkumar Sundaram
2024-03-12 21:53 ` Jeff Johnson
2024-03-13 12:57 ` Rameshkumar Sundaram
2024-03-13 15:06 ` Jeff Johnson
2024-03-13 16:48 ` Kalle Valo
2024-03-13 16:58 ` Kalle Valo
2024-03-13 18:04 ` Jeff Johnson
2024-03-13 19:56 ` Jonas Gorski
2024-03-14 19:38 ` Rameshkumar Sundaram
2024-03-18 18:36 ` Kalle Valo
2024-03-19 15:51 ` Rameshkumar Sundaram
2024-03-12 13:55 ` [PATCH v4 02/12] wifi: ath12k: Modify add and remove chanctx ops for single wiphy support Rameshkumar Sundaram
2024-03-12 21:58 ` Jeff Johnson
2024-03-12 13:55 ` [PATCH v4 03/12] wifi: ath12k: modify ath12k mac start/stop ops for single wiphy Rameshkumar Sundaram
2024-03-12 22:13 ` Jeff Johnson
2024-03-13 14:29 ` Rameshkumar Sundaram
2024-03-12 13:55 ` [PATCH v4 04/12] wifi: ath12k: vdev statemachine changes " Rameshkumar Sundaram
2024-03-12 22:25 ` Jeff Johnson
2024-03-13 14:36 ` Rameshkumar Sundaram
2024-03-14 10:17 ` kernel test robot
2024-03-12 13:55 ` [PATCH v4 05/12] wifi: ath12k: scan " Rameshkumar Sundaram
2024-03-12 22:35 ` Jeff Johnson
2024-03-19 15:58 ` Rameshkumar Sundaram
2024-03-12 13:55 ` [PATCH v4 06/12] wifi: ath12k: fetch correct radio based on vdev status Rameshkumar Sundaram
2024-03-12 22:48 ` Jeff Johnson
2024-03-12 13:55 ` [PATCH v4 07/12] wifi: ath12k: Cache vdev configs before vdev create Rameshkumar Sundaram
2024-03-12 23:01 ` Jeff Johnson
2024-03-19 16:12 ` Rameshkumar Sundaram
2024-03-12 13:55 ` [PATCH v4 08/12] wifi: ath12k: Add additional checks for vif and sta iterators Rameshkumar Sundaram
2024-03-12 23:06 ` Jeff Johnson
2024-03-12 13:55 ` [PATCH v4 09/12] wifi: ath12k: modify regulatory support for single wiphy architecture Rameshkumar Sundaram
2024-03-12 23:13 ` Jeff Johnson
2024-03-12 13:55 ` [PATCH v4 10/12] wifi: ath12k: Modify set and get antenna mac ops for single wiphy Rameshkumar Sundaram
2024-03-12 23:18 ` Jeff Johnson
2024-03-12 13:55 ` [PATCH v4 11/12] wifi: ath12k: Modify rts threshold mac op " Rameshkumar Sundaram
2024-03-12 23:21 ` Jeff Johnson
2024-03-12 13:55 ` [PATCH v4 12/12] wifi: ath12k: support get_survey " Rameshkumar Sundaram
2024-03-12 23:25 ` Jeff Johnson
2024-03-19 16:22 ` Rameshkumar Sundaram [this message]
2024-03-12 20:59 ` [PATCH v4 00/12] wifi: ath12k: Add single wiphy support Jeff Johnson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6989461b-295e-4886-9d39-64f15cc01074@quicinc.com \
--to=quic_ramess@quicinc.com \
--cc=ath12k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=quic_jjohnson@quicinc.com \
--cc=quic_srirrama@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).