From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vivek Natarajan <nataraja@qti.qualcomm.com>,
Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Subject: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Date: Mon, 7 Dec 2015 14:13:25 +1100 [thread overview]
Message-ID: <20151207141325.1609aec1@canb.auug.org.au> (raw)
Hi Kalle,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/ath/ath10k/pci.c
between commit:
6419fdbb6f90 ("ath10k: poll HTT send completion when CE 5 is unused")
from Linus' tree and commit:
afb0bf7f530b ("ath10k: add support for pktlog in QCA99X0")
from the wireless-drivers-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/ath/ath10k/pci.c
index 930785a724e1,5c91a673cf80..000000000000
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@@ -107,9 -111,9 +107,10 @@@ static void ath10k_pci_htc_tx_cb(struc
static void ath10k_pci_htc_rx_cb(struct ath10k_ce_pipe *ce_state);
static void ath10k_pci_htt_tx_cb(struct ath10k_ce_pipe *ce_state);
static void ath10k_pci_htt_rx_cb(struct ath10k_ce_pipe *ce_state);
+static void ath10k_pci_htt_htc_rx_cb(struct ath10k_ce_pipe *ce_state);
+ static void ath10k_pci_pktlog_rx_cb(struct ath10k_ce_pipe *ce_state);
-static const struct ce_attr host_ce_config_wlan[] = {
+static struct ce_attr host_ce_config_wlan[] = {
/* CE0: host->target HTC control and raw streams */
{
.flags = CE_ATTR_FLAGS,
@@@ -1205,16 -1210,15 +1207,25 @@@ static void ath10k_pci_htc_rx_cb(struc
ath10k_pci_process_rx_cb(ce_state, ath10k_htc_rx_completion_handler);
}
+static void ath10k_pci_htt_htc_rx_cb(struct ath10k_ce_pipe *ce_state)
+{
+ /* CE4 polling needs to be done whenever CE pipe which transports
+ * HTT Rx (target->host) is processed.
+ */
+ ath10k_ce_per_engine_service(ce_state->ar, 4);
+
+ ath10k_pci_process_rx_cb(ce_state, ath10k_htc_rx_completion_handler);
+}
+
+ /* Called by lower (CE) layer when data is received from the Target.
+ * Only 10.4 firmware uses separate CE to transfer pktlog data.
+ */
+ static void ath10k_pci_pktlog_rx_cb(struct ath10k_ce_pipe *ce_state)
+ {
+ ath10k_pci_process_rx_cb(ce_state,
+ ath10k_htt_rx_pktlog_completion_handler);
+ }
+
/* Called by lower (CE) layer when a send to HTT Target completes. */
static void ath10k_pci_htt_tx_cb(struct ath10k_ce_pipe *ce_state)
{
next reply other threads:[~2015-12-07 3:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 3:13 Stephen Rothwell [this message]
2015-12-07 14:59 ` linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Kalle Valo
2015-12-07 17:51 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2017-08-24 1:28 Stephen Rothwell
2017-08-24 1:24 Stephen Rothwell
2017-08-24 1:17 Stephen Rothwell
2017-08-24 1:32 ` Stephen Rothwell
2017-08-24 7:44 ` Kalle Valo
2017-08-04 2:04 Stephen Rothwell
2017-08-04 6:36 ` Kalle Valo
2015-02-09 3:14 Stephen Rothwell
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=20151207141325.1609aec1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nataraja@qti.qualcomm.com \
--cc=rmanohar@qti.qualcomm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).