From patchwork Wed Aug 14 09:43:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raj Kumar Bhagat X-Patchwork-Id: 13763199 X-Patchwork-Delegate: kvalo@adurom.com Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 61C6116A37C for ; Wed, 14 Aug 2024 09:44:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723628698; cv=none; b=CWp8C8KBK0MmVvm1vZ37P2cDJxwLFDcpYQDZko3erl6xCfu0uAoGSIj1hfBbkmtnBqS+biDSeihSiwtzYU2tVAgzKT/bpcGelwrt3I9z2ewEwokvnPhGpvGQy36VDpZ6umD+P5EOnGbNnrVbzgsiv9OgneZn1np/B6uQzLfURrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723628698; c=relaxed/simple; bh=YkAqdUCD2iCO/iXwkTuo8AprAlT6Vxm3+//sCSk5Hhc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=puixLBWTEizTsAV6tgGLazu+telSlboLLU3tgOABQjtd0v5OIYCAv2XchuIM6StKyWFfSAZ0ofALLfyZVRknZ2VvsA1RKLLGSETrXLx7zmE7OD89IchtT/rLdhXaAMR1Utoa3Z3txKr0jWG3l/iW+/DXWci5t6yZLjSV8MpDyRA= 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=oWudwYOC; arc=none smtp.client-ip=205.220.180.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="oWudwYOC" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47DNFd8w021210; Wed, 14 Aug 2024 09:44:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XsQmLkCCJ7EGh1Yc1vgDhvoJKL1nGzJzdm896rIsz1s=; b=oWudwYOCfrbB5sVq 85Yg7oH9XlXTkDONpfhxe3hAP8p0y3C1L5bvcba8XkVnHIRy6FPuy6FLsWNmWz37 CNp+kjyBaV2PLcUdm5R54vvGKQ1B3ZIeZNvF0azsPVQnTb6CwNZ0xTVCEyHzz1Jg +SIt95F4XJyKz23PoF3UdvMfkDCJE4o6fM/3JFpaUXYZs2EN5WzXI8WjkjPyrnCy rT9h+916ORPi843pO29j20uJJgSaeXGsAhcgHi3tdY4RwhW1JEuDTIcB+Faf+wiM ITlaUOZLSImX/NmSfAqrtkuwG1AP53FVO6heE011wskK6yPMoAzZBkIm1vKVkl1m rnMGHA== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 40x1d4jpk0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Aug 2024 09:44:53 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 47E9iq7Z017494 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Aug 2024 09:44:52 GMT Received: from hu-rajkbhag-blr.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 14 Aug 2024 02:44:50 -0700 From: Raj Kumar Bhagat To: CC: , Raj Kumar Bhagat Subject: [RFC PATCH 15/18] wifi: ath12k: add support to read board_id from device-tree Date: Wed, 14 Aug 2024 15:13:20 +0530 Message-ID: <20240814094323.3927603-16-quic_rajkbhag@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240814094323.3927603-1-quic_rajkbhag@quicinc.com> References: <20240814094323.3927603-1-quic_rajkbhag@quicinc.com> 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 nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: SAsRXV78RIfxn9y2nu01ClWwHTtLG_30 X-Proofpoint-GUID: SAsRXV78RIfxn9y2nu01ClWwHTtLG_30 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-08-14_07,2024-08-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 impostorscore=0 adultscore=0 phishscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2407110000 definitions=main-2408140067 Currently, QMI target board_id is read from firmware during QMI target capability request. If the board_id is not fused in WiFi device, firmware responds with the default board id (0xFF). Due to this, "board-2.bin" board data download fails if "board-2.bin" does not have board data for the default board id (0xFF). Hence, add support to read board_id from device-tree. If the board_id is not fused in WiFi device, use device-tree to read board_id. Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1 Signed-off-by: Raj Kumar Bhagat --- drivers/net/wireless/ath/ath12k/qmi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c index 7a039659dbec..428d081f722f 100644 --- a/drivers/net/wireless/ath/ath12k/qmi.c +++ b/drivers/net/wireless/ath/ath12k/qmi.c @@ -2566,7 +2566,8 @@ static int ath12k_qmi_request_target_cap(struct ath12k_base *ab) struct qmi_wlanfw_cap_req_msg_v01 req = {}; struct qmi_wlanfw_cap_resp_msg_v01 resp = {}; struct qmi_txn txn; - unsigned int board_id = ATH12K_BOARD_ID_DEFAULT; + struct device *dev = ab->dev; + u32 board_id = ATH12K_BOARD_ID_DEFAULT; int ret = 0; int r; int i; @@ -2606,9 +2607,13 @@ static int ath12k_qmi_request_target_cap(struct ath12k_base *ab) } if (resp.board_info_valid) - ab->qmi.target.board_id = resp.board_info.board_id; - else - ab->qmi.target.board_id = board_id; + board_id = resp.board_info.board_id; + if (board_id == ATH12K_BOARD_ID_DEFAULT || ~board_id == 0) + of_property_read_u32(dev->of_node, "qcom,board_id", &board_id); + if (board_id == ATH12K_BOARD_ID_DEFAULT || ~board_id == 0) + ath12k_warn(ab, "unable to read board_id, using default board_id: 0x%x\n", + board_id); + ab->qmi.target.board_id = board_id; if (resp.soc_info_valid) ab->qmi.target.soc_id = resp.soc_info.soc_id;