mac80211: ath11k: Support reading board_id from devicetree and

filesystem

Author: hzyitc

package/kernel/mac80211/patches/ath11k/211-ath11k-Support-reading-board_id-from-devicetree.patch

@@ -0,0 +1,35 @@
+From 65e53c8d35592e719b20dd81dfcb3537f0cb67b2 Mon Sep 17 00:00:00 2001
+From: hzy <hzyitc@outlook.com>
+Date: Sat, 7 Oct 2023 22:19:31 +0800
+Subject: [PATCH 1/2] ath11k: Support reading board_id from devicetree
+
+---
+ drivers/net/wireless/ath/ath11k/qmi.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
+index 194ae302..e4a28359 100644
+--- a/drivers/net/wireless/ath/ath11k/qmi.c
++++ b/drivers/net/wireless/ath/ath11k/qmi.c
+@@ -2217,6 +2217,7 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
+ 	struct qmi_txn txn;
+ 	int ret = 0;
+ 	int r;
++	u32 board_id;
+ 	char *fw_build_id;
+ 	int fw_build_id_mask_len;
+ 
+@@ -2259,7 +2260,9 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
+ 		ab->qmi.target.chip_family = resp.chip_info.chip_family;
+ 	}
+ 
+-	if (resp.board_info_valid)
++	if (!of_property_read_u32(ab->dev->of_node, "qcom,board_id", &board_id) && board_id != 0xFF)
++		ab->qmi.target.board_id = board_id;
++	else if (resp.board_info_valid)
+ 		ab->qmi.target.board_id = resp.board_info.board_id;
+ 	else
+ 		ab->qmi.target.board_id = 0xFF;
+-- 
+2.40.1
+

package/kernel/mac80211/patches/ath11k/212-ath11k-Support-reading-board_id-from-filesystem.patch

@@ -0,0 +1,58 @@
+From 50bdef1cc677f55240d1fb781a8ee81c15d9375b Mon Sep 17 00:00:00 2001
+From: hzy <hzyitc@outlook.com>
+Date: Sat, 7 Oct 2023 22:22:05 +0800
+Subject: [PATCH 2/2] ath11k: Support reading board_id from filesystem
+
+---
+ drivers/net/wireless/ath/ath11k/qmi.c | 28 ++++++++++++++++++++++++++-
+ 1 file changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
+index e4a28359..d50b6300 100644
+--- a/drivers/net/wireless/ath/ath11k/qmi.c
++++ b/drivers/net/wireless/ath/ath11k/qmi.c
+@@ -2210,6 +2210,30 @@ out:
+ 	return ret;
+ }
+ 
++static int ath11k_qmi_fetch_board_id_from_fs(struct ath11k_base *ab, u32 *board_id)
++{
++	const struct firmware *fw;
++	char buf[64];
++	int len;
++	int ret;
++
++	snprintf(buf, sizeof(buf), "board_id-%s-%s",
++		 ath11k_bus_str(ab->hif.bus), dev_name(ab->dev));
++
++	fw = ath11k_core_firmware_request(ab, buf);
++	if(IS_ERR(fw))
++		return PTR_ERR(fw);
++
++	len = min(fw->size, sizeof(buf) - 1);
++	memcpy(buf, fw->data, len);
++	buf[len] = 0;
++
++	ret = kstrtouint(buf, 0, board_id);
++
++	release_firmware(fw);
++	return ret;
++}
++
+ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
+ {
+ 	struct qmi_wlanfw_cap_req_msg_v01 req;
+@@ -2260,7 +2284,9 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
+ 		ab->qmi.target.chip_family = resp.chip_info.chip_family;
+ 	}
+ 
+-	if (!of_property_read_u32(ab->dev->of_node, "qcom,board_id", &board_id) && board_id != 0xFF)
++	if (!ath11k_qmi_fetch_board_id_from_fs(ab, &board_id) && board_id != 0xFF)
++		ab->qmi.target.board_id = board_id;
++	else if (!of_property_read_u32(ab->dev->of_node, "qcom,board_id", &board_id) && board_id != 0xFF)
+ 		ab->qmi.target.board_id = board_id;
+ 	else if (resp.board_info_valid)
+ 		ab->qmi.target.board_id = resp.board_info.board_id;
+-- 
+2.40.1
+