ATH10K Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Valo, Kalle" <kvalo@qca.qualcomm.com>
To: "michal.kazior@tieto.com" <michal.kazior@tieto.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
	"ath10k@lists.infradead.org" <ath10k@lists.infradead.org>
Subject: Re: [PATCH 10/13] ath10k: implement flushing of pending frames in txqs
Date: Fri, 4 Mar 2016 15:37:28 +0000	[thread overview]
Message-ID: <87twkmw8y5.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <CA+BoTQmgMBfz+Dkf-+0gDHvnhk5OA4_ZGZgwYDKXG5yP-xMRYw@mail.gmail.com>	(Michal Kazior's message of "Fri, 4 Mar 2016 10:52:04 +0100")

Michal Kazior <michal.kazior@tieto.com> writes:

> On 4 March 2016 at 10:17, Valo, Kalle <kvalo@qca.qualcomm.com> wrote:
>> Michal Kazior <michal.kazior@tieto.com> writes:
>>
>>> Firmware supporting pull-push tx model may request
>>> a switch between modes. When switching from
>>> pull-push to push-only it will be necessary to
>>> flush all pending frames. The code will do that
>>> once other bits that actually trigger it are added.
>>>
>>> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
>>
>> This fails to apply:
>>
>> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/htt_rx.c).
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0010 ath10k: implement flushing of pending frames in txqs
>>
>>> @@ -2370,6 +2371,8 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr)
>>>               dev_kfree_skb_any(skb);
>>>       }
>>>
>>> +     ath10k_mac_tx_push_pending(ar);
>>> +
>>>       spin_lock_bh(&htt->rx_ring.lock);
>>>       while ((skb = __skb_dequeue(&htt->rx_compl_q))) {
>>>               resp = (struct htt_resp *)skb->data;
>>
>> This hunk seems to be the problem. I could try to fix it myself but the
>> function has changed so I would prefer that you respin.
>
> This patch is in v1. It's base included some extra patches that
> weren't in ath.git at the time.
>
> The v2 patchset has this patch squashed into wake_tx_queue patch and
> the entire v2 patchset is based solely on ath.git without any extra
> patches in between. Did patchwork confuse these patchsets?

No, it was me who got confused :) I was accidentally applying v1 instead
of v2.

But v2 also has conflicts with ath-next. I need to first update my trees
to get latest cfg80211/mac80211 and then I'll try again.

-- 
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

  reply	other threads:[~2016-03-04 15:37 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-21 13:46 [PATCH 00/13] ath10k: implement push-pull tx model Michal Kazior
2016-01-21 13:46 ` [PATCH 01/13] ath10k: refactor tx code Michal Kazior
2016-01-21 13:46 ` [PATCH 02/13] ath10k: unify txpath decision Michal Kazior
2016-01-21 13:46 ` [PATCH 03/13] ath10k: refactor tx pending management Michal Kazior
2016-01-21 13:46 ` [PATCH 04/13] ath10k: maintain peer_id for each sta and vif Michal Kazior
2016-01-21 13:46 ` [PATCH 05/13] ath10k: add fast peer_map lookup Michal Kazior
2016-01-21 13:46 ` [PATCH 06/13] ath10k: add new htt message generation/parsing logic Michal Kazior
2016-01-21 13:46 ` [PATCH 07/13] ath10k: implement wake_tx_queue Michal Kazior
2016-01-21 13:46 ` [PATCH 08/13] ath10k: implement updating shared htt txq state Michal Kazior
2016-01-21 13:46 ` [PATCH 09/13] ath10k: add txq placeholder Michal Kazior
2016-01-21 13:46 ` [PATCH 10/13] ath10k: implement flushing of pending frames in txqs Michal Kazior
2016-03-04  9:17   ` Valo, Kalle
2016-03-04  9:52     ` Michal Kazior
2016-03-04 15:37       ` Valo, Kalle [this message]
2016-01-21 13:46 ` [PATCH 11/13] ath10k: store txq in skb_cb Michal Kazior
2016-01-21 13:46 ` [PATCH 12/13] ath10k: keep track of queue depth per txq Michal Kazior
2016-01-21 13:46 ` [PATCH 13/13] ath10k: implement push-pull tx Michal Kazior
2016-01-21 17:40   ` Peter Oh
2016-01-22  7:47     ` Michal Kazior
2016-01-26 10:28       ` Michal Kazior
2016-01-26 19:03         ` Peter Oh
2016-01-28  8:36     ` Kalle Valo
2016-01-22  0:43 ` [PATCH 00/13] ath10k: implement push-pull tx model Ben Greear
2016-03-01 10:32 ` [PATCH v2 00/11] " Michal Kazior
2016-03-01 10:32   ` [PATCH v2 01/11] ath10k: refactor tx code Michal Kazior
2016-03-01 10:32   ` [PATCH v2 02/11] ath10k: unify txpath decision Michal Kazior
2016-03-01 10:32   ` [PATCH v2 03/11] ath10k: refactor tx pending management Michal Kazior
2016-03-01 10:32   ` [PATCH v2 04/11] ath10k: maintain peer_id for each sta and vif Michal Kazior
2016-03-01 10:32   ` [PATCH v2 05/11] ath10k: add fast peer_map lookup Michal Kazior
2016-03-01 10:32   ` [PATCH v2 06/11] ath10k: add new htt message generation/parsing logic Michal Kazior
2016-03-01 10:32   ` [PATCH v2 07/11] ath10k: implement wake_tx_queue Michal Kazior
2016-03-06 14:27     ` Valo, Kalle
2016-03-07  6:04       ` Michal Kazior
2016-03-07  9:36         ` Valo, Kalle
2016-03-01 10:32   ` [PATCH v2 08/11] ath10k: implement updating shared htt txq state Michal Kazior
2016-03-01 10:32   ` [PATCH v2 09/11] ath10k: store txq in skb_cb Michal Kazior
2016-03-01 10:32   ` [PATCH v2 10/11] ath10k: keep track of queue depth per txq Michal Kazior
2016-03-01 10:32   ` [PATCH v2 11/11] ath10k: implement push-pull tx Michal Kazior
2016-03-06 14:18   ` [PATCH v2 00/11] ath10k: implement push-pull tx model Valo, Kalle
2016-03-07  6:13     ` Michal Kazior
2016-03-07  9:48   ` Valo, Kalle

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=87twkmw8y5.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo@qca.qualcomm.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=michal.kazior@tieto.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