Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Kalle Valo <kvalo@kernel.org>
To:     Wen Gong <quic_wgong@quicinc.com>
Cc:     <ath11k@lists.infradead.org>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH 0/3] ath11k: add support muti-type regdb data for WCN6855
References: <20220319023543.14288-1-quic_wgong@quicinc.com>
Date:   Mon, 21 Mar 2022 13:13:14 +0200
In-Reply-To: <20220319023543.14288-1-quic_wgong@quicinc.com> (Wen Gong's
        message of "Fri, 18 Mar 2022 22:35:40 -0400")
Message-ID: <87v8w7mud1.fsf@kernel.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Wen Gong <quic_wgong@quicinc.com> writes:

> Add enum value ATH11K_BD_IE_REGDB and enum type ath11k_bd_ie_regdb_type
> for regdb data, the board-2.bin will include both board data and regdb
> files.

In the pending branch this conflicted with your varian changes:

<<<<<<< current
		ath11k_dbg(ab, ATH11K_DBG_BOOT,
			   "failed to fetch board data for %s from %s\n",
=======
		ath11k_err(ab,
			   "failed to fetch %s for %s from %s\n",
			   ath11k_bd_ie_type_str(ie_id_match),
>>>>>>> patched

I used ath11k_err() for now, but I suspect I need to change it to
ath11k_dbg(). Will no better after some testing and review.

--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -954,7 +954,10 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd)
                return ret;
        }
 
-       ret = ath11k_core_fetch_board_data_api_n(ab, bd, fallback_boardname);
+       ret = ath11k_core_fetch_board_data_api_n(ab, bd, fallback_boardname,
+                                                ATH11K_BD_IE_BOARD,
+                                                ATH11K_BD_IE_BOARD_NAME,
+                                                ATH11K_BD_IE_BOARD_DATA);
        if (!ret)
                goto success;

This was an easy compilation fix.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches