From patchwork Tue Mar 18 08:50:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roopni Devanathan X-Patchwork-Id: 14020599 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0DA61F91FE for ; Tue, 18 Mar 2025 08:50:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742287836; cv=none; b=Vc5NM27TCxDoP/XfNGZk6re8lTnZEO9Ui3/DWf47qLEnHn/8tFcpL1kXPrqrcyO2jTL33igXvd+FoGRppiPMlPbBJoaE5SqsuqWlVPBC+bId9qKIeuc8POka7G9u4MNlNKA+1Mp1UkSn58F8PeWGIsF/FMvy6m73VTTZx/2gf7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742287836; c=relaxed/simple; bh=Fn6kC/VbYiwAoEPE1Ak5tgKpIbKRrzdAh8sGWnBlztM=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=e0/ILnWswurmKqLnDqG0fsffMFe8Qnp10SYLayBDHWUnQfZGmXylEkiXah7LS9LiA/adxkqNKnHLyo5WP+ERQhTxvP1S15ATiYa8fcCc7uusyp6rhI42o4286Gfed94iQvZxLdhhhaTXkhOBo95faf5UqrRpbCqi7SCzXuJcDi0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=H0MmYJgR; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="H0MmYJgR" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52I2O7O6002749; Tue, 18 Mar 2025 08:50:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=ncnVs9DZPlq24ZLj54j/UK /7WG4D0U/GaRrVXHzJTjs=; b=H0MmYJgRdRLIQ6CrrjquwkTa6BNW6NXZIU4AYI tDH5L7Y4pMqm6rlNC+DECUVUzWvTXNlM8FoAjLqx07/3YSN4jMxIz3caEJbL7a1i pWknxkPogTQK3Xh1P4jBClQI8lGYs3i4ymabw7UqsJClOfKfMOkTavgvW0JUzoWd OJwgRNEFIj3pRUFIPGhx2FaEkAoQw4gblR2jOXB85qHIpiKSnqI1louzu5iuqk/p Ib5rhUILyYMdRnx2EJxQnUozCEvjSSDe99Kse8ySYyvxpTPG8FDqzPmLXHQFkKpk DuVakKy6SvaNWGxiAAbhPgox7svz2sG6j6gbVG9VKfuSsybQ== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45f010gwgd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Mar 2025 08:50:30 +0000 (GMT) Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 52I8oUkY014315 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Mar 2025 08:50:30 GMT Received: from hu-rdevanat-blr.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 18 Mar 2025 01:50:28 -0700 From: Roopni Devanathan To: CC: , Pradeep Kumar Chitrapu , Roopni Devanathan Subject: [PATCH ath-next] wifi: ath12k: Fix incorrect rates sent to firmware Date: Tue, 18 Mar 2025 14:20:13 +0530 Message-ID: <20250318085013.1296262-1-quic_rdevanat@quicinc.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: u4etpdmlqYYk1RqfO0MNu0fYdfhWOOEi X-Proofpoint-GUID: u4etpdmlqYYk1RqfO0MNu0fYdfhWOOEi X-Authority-Analysis: v=2.4 cv=G50cE8k5 c=1 sm=1 tr=0 ts=67d933d6 cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=Vs1iUdzkB0EA:10 a=COk6AnOGAAAA:8 a=z6_oMQ1SobYYos8x1-0A:9 a=v6Fpk0e4ntcIGe5OSANj:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-18_04,2025-03-17_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 lowpriorityscore=0 mlxlogscore=999 phishscore=0 adultscore=0 impostorscore=0 spamscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2503180063 From: Pradeep Kumar Chitrapu Before firmware assert, if there is a station interface in the device which is not associated with an AP, the basic rates are set to zero. Following this, during firmware recovery, when basic rates are zero, ath12k driver is sending invalid rate codes, which are negative values, to firmware. This results in firmware assert. Fix this by checking if rate codes are valid, before sending them to the firmware. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Signed-off-by: Pradeep Kumar Chitrapu Signed-off-by: Roopni Devanathan --- drivers/net/wireless/ath/ath12k/mac.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) base-commit: b6f473c96421b8b451a8df8ccb620bcd71d4b3f4 diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index 9fda97667d4e..3b6ee1e65f1b 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -3450,7 +3450,9 @@ static void ath12k_recalculate_mgmt_rate(struct ath12k *ar, } sband = hw->wiphy->bands[def->chan->band]; - basic_rate_idx = ffs(bss_conf->basic_rates) - 1; + basic_rate_idx = ffs(bss_conf->basic_rates); + if (basic_rate_idx) + basic_rate_idx -= 1; bitrate = sband->bitrates[basic_rate_idx].bitrate; hw_rate_code = ath12k_mac_get_rate_hw_value(bitrate); @@ -3983,10 +3985,13 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar, band = def.chan->band; mcast_rate = info->mcast_rate[band]; - if (mcast_rate > 0) + if (mcast_rate > 0) { rateidx = mcast_rate - 1; - else - rateidx = ffs(info->basic_rates) - 1; + } else { + rateidx = ffs(info->basic_rates); + if (rateidx) + rateidx -= 1; + } if (ar->pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP) rateidx += ATH12K_MAC_FIRST_OFDM_RATE_IDX;