All of lore.kernel.org
 help / color / mirror / Atom feed
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
Date: Mon, 21 Mar 2022 13:13:14 +0200	[thread overview]
Message-ID: <87v8w7mud1.fsf@kernel.org> (raw)
In-Reply-To: <20220319023543.14288-1-quic_wgong@quicinc.com> (Wen Gong's message of "Fri, 18 Mar 2022 22:35:40 -0400")

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

-- 
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

WARNING: multiple messages have this Message-ID (diff)
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
Date: Mon, 21 Mar 2022 13:13:14 +0200	[thread overview]
Message-ID: <87v8w7mud1.fsf@kernel.org> (raw)
In-Reply-To: <20220319023543.14288-1-quic_wgong@quicinc.com> (Wen Gong's message of "Fri, 18 Mar 2022 22:35:40 -0400")

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

  parent reply	other threads:[~2022-03-21 11:13 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-19  2:35 [PATCH 0/3] ath11k: add support muti-type regdb data for WCN6855 Wen Gong
2022-03-19  2:35 ` Wen Gong
2022-03-19  2:35 ` [PATCH 1/3] ath11k: remove unused ATH11K_BD_IE_BOARD_EXT Wen Gong
2022-03-19  2:35   ` Wen Gong
2022-03-23  8:55   ` Kalle Valo
2022-03-23  8:55     ` Kalle Valo
2022-03-19  2:35 ` [PATCH 2/3] ath11k: disable regdb support for QCA6390 Wen Gong
2022-03-19  2:35   ` Wen Gong
2022-03-19  2:35 ` [PATCH 3/3] ath11k: add support to search regdb data in board-2.bin for WCN6855 Wen Gong
2022-03-19  2:35   ` Wen Gong
2022-03-30  8:05   ` Kalle Valo
2022-03-30  8:05     ` Kalle Valo
2022-03-21 11:13 ` Kalle Valo [this message]
2022-03-21 11:13   ` [PATCH 0/3] ath11k: add support muti-type regdb data " Kalle Valo

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=87v8w7mud1.fsf@kernel.org \
    --to=kvalo@kernel.org \
    --cc=ath11k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=quic_wgong@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.