Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1284981 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-12-07 04:20 +0100 |
| Last post | 2015-12-07 19:00 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-07 04:20 +0100
Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Kalle Valo <kvalo@codeaurora.org> - 2015-12-07 16:10 +0100
Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Kalle Valo <kvalo@qca.qualcomm.com> - 2015-12-07 19:00 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-12-07 04:20 +0100 |
| Subject | linux-next: manual merge of the wireless-drivers-next tree with Linus' tree |
| Message-ID | <qCUvf-7qj-7@gated-at.bofh.it> |
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)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Kalle Valo <kvalo@codeaurora.org> |
|---|---|
| Date | 2015-12-07 16:10 +0100 |
| Subject | Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree |
| Message-ID | <qD5Ap-6co-81@gated-at.bofh.it> |
| In reply to | #1284981 |
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 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).
Thanks, the fix looks good to me.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Kalle Valo <kvalo@qca.qualcomm.com> |
|---|---|
| Date | 2015-12-07 19:00 +0100 |
| Subject | Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree |
| Message-ID | <qD8eS-7I5-5@gated-at.bofh.it> |
| In reply to | #1285541 |
Kalle Valo <kvalo@codeaurora.org> writes:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> 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).
>
> Thanks, the fix looks good to me.
BTW, this conflict should be fixed once Dave merges my
wireless-drivers-next pull request.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web