Return-path: Received: from sabertooth02.qualcomm.com ([65.197.215.38]:48627 "EHLO sabertooth02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751231AbaJUIaO (ORCPT ); Tue, 21 Oct 2014 04:30:14 -0400 From: Kalle Valo To: Michal Kazior CC: "ath10k@lists.infradead.org" , linux-wireless Subject: Re: [PATCH v2 3/3] ath10k: speed up hw recovery References: <1413807758-30249-1-git-send-email-michal.kazior@tieto.com> <1413807758-30249-4-git-send-email-michal.kazior@tieto.com> <87lho9ygy1.fsf@kamboji.qca.qualcomm.com> Date: Tue, 21 Oct 2014 11:29:54 +0300 In-Reply-To: (Michal Kazior's message of "Tue, 21 Oct 2014 10:23:31 +0200") Message-ID: <87h9yxyge5.fsf@kamboji.qca.qualcomm.com> (sfid-20141021_103020_936336_360529E0) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-wireless-owner@vger.kernel.org List-ID: Michal Kazior writes: > On 21 October 2014 10:17, Kalle Valo wrote: >> Michal Kazior writes: >> >>> In some cases hw recovery was taking an absurdly >>> long time due to ath10k waiting for things that >>> would never really complete. >>> >>> Instead of waiting for inevitable timeouts poke >>> all completions and wakequeues and check if it's >>> still worth waiting. >>> >>> Reading/writing ar->state requires conf_mutex. >>> Since waiters might be holding it introduce a new >>> flag CRASH_FLUSH so it's possible to tell waiters >>> to abort whatever they were waiting for. >>> >>> Signed-off-by: Michal Kazior >> >> While applying to ath-next-test there was a conflict in core.h. Please >> check my resolution: >> >> https://github.com/kvalo/ath/commit/6cccda0185c7df96f439dc3f87961e81843de3ee > > I think it was `enum ath10k_cal_mode {` vs `enum ath10k_scan_state {` > because my patch was based without your cal patches. Yeah, that was the reason as I applied the cal file patches just an hour ago. With the amount of patches going to ath10k these conflicts are "business as usual", we just need to be careful with resolutions. As long as everyone use ath.git master branch as the baseline everything should go pretty smoothly, most of the time :) -- Kalle Valo