Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E7AAC46465 for ; Tue, 6 Nov 2018 12:38:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 344E120862 for ; Tue, 6 Nov 2018 12:38:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="mEaXJ8Ie"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="HUwW3tej" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 344E120862 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387994AbeKFWDZ (ORCPT ); Tue, 6 Nov 2018 17:03:25 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:35486 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387968AbeKFWDZ (ORCPT ); Tue, 6 Nov 2018 17:03:25 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 083F360600; Tue, 6 Nov 2018 12:38:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541507903; bh=Pns5uoV6LiXAHIDjANXSMdLFpt2QQeCphE9BwjLMKBQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=mEaXJ8IecJeojdn8KWzkjH25V8ulERZbD7IdGkwtJZBGZphAR2EN/ph8DXTi1/2gZ /xN20ZSzo8bjdlS8tI8YFkgAU7hej0f9muOKpaAm3xyOz5dPNjpf780Z/NGxmZTACY ZokR6HMmSpPsrzhrR9nQ5Y6Y450Fqlo/NXPPIuNw= Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 5926A60247; Tue, 6 Nov 2018 12:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1541507902; bh=Pns5uoV6LiXAHIDjANXSMdLFpt2QQeCphE9BwjLMKBQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=HUwW3tejuneM7/B3GVLPlpJ6Ymrua29ji2++w7jFni/arZvFWqyvqEHALEUjFo0Ns 4V2gxBZtG5bmlPgvZd6iWQ4MZKRdUbaJDYlENutc9H47G/Ue3a/b/EjmKVRE/28rEt QOnWQD5U+H7VRPLSXpSoh7NizwlVkXQnZb+5XrQM= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 06 Nov 2018 14:38:22 +0200 From: merez@codeaurora.org To: Kalle Valo Cc: Ahmad Masri , linux-wireless@vger.kernel.org, wil6210@qti.qualcomm.com, linux-wireless-owner@vger.kernel.org Subject: Re: [PATCH 07/16] wil6210: refactor disconnect flow In-Reply-To: <874lcue6ft.fsf@codeaurora.org> References: <1540975944-30576-1-git-send-email-merez@codeaurora.org> <1540975944-30576-8-git-send-email-merez@codeaurora.org> <871s7ybir0.fsf@purkki.adurom.net> <6852209b6e110737dc189ec89a49078f@codeaurora.org> <874lcue6ft.fsf@codeaurora.org> Message-ID: <98ff59749bbf386ba92faec2203ac3e9@codeaurora.org> X-Sender: merez@codeaurora.org User-Agent: Roundcube Webmail/1.2.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 2018-11-06 14:28, Kalle Valo wrote: > merez@codeaurora.org writes: > >> On 2018-11-06 12:30, Kalle Valo wrote: >>> Maya Erez writes: >>> >>>> From: Ahmad Masri >>>> >>>> Separate sending command to the fw from the event handling function >>>> to >>>> simplify the disconnect flow and track the from_event flag >>>> correctly. >>>> >>>> Signed-off-by: Ahmad Masri >>>> Signed-off-by: Maya Erez >>> >>> [...] >>> >>>> +static int wil_disconnect_cid(struct wil6210_vif *vif, int cid, >>>> + u16 reason_code) >>>> +__acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock) >>>> +{ >>>> + struct wil6210_priv *wil = vif_to_wil(vif); >>>> + struct wireless_dev *wdev = vif_to_wdev(vif); >>>> + struct wil_sta_info *sta = &wil->sta[cid]; >>>> + bool del_sta = false; >>>> + >>>> + might_sleep(); >>>> + wil_dbg_misc(wil, "disconnect_cid: CID %d, MID %d, status %d\n", >>>> + cid, sta->mid, sta->status); >>>> + >>>> + if (sta->status == wil_sta_unused) >>>> + return 0; >>>> + >>>> + if (vif->mid != sta->mid) { >>>> + wil_err(wil, "STA MID mismatch with VIF MID(%d)\n", vif->mid); >>>> + return -EINVAL; >>>> + } >>>> + >>>> + /* inform lower layers */ >>>> + if (wdev->iftype == NL80211_IFTYPE_AP && disable_ap_sme) >>>> + del_sta = true; >>>> + >>>> + /* disconnect by sending command disconnect/del_sta and wait >>>> + * synchronously for WMI_DISCONNECT_EVENTID event. >>>> + */ >>>> + return wmi_disconnect_sta(vif, sta->addr, reason_code, del_sta); >>>> +} >>> >>> I don't get use of __acquires() and __releases() in this function. I >>> see >>> similar pattern already in wil6210 but care to explain why this is >>> needed? I don't see the function even accessing tid_rx_lock so I'm >>> very >>> confused. >> >> I assume it is a copy / paste leftover that we missed in the code >> review. We will remove it. > > Actually I already removed the annotations from the pending branch and > no need to resend, it's faster that way. Please double check if you > can, > unfortunately I cannot provide a direct link cgit doesn't show the new > commit yet. In such a case you can go ahead and apply the patches without "wil6210: ignore HALP ICR if already handled". I'll upstream its fixed version in the next set of wil6210 patches. -- Maya Erez Qualcomm Israel, Inc. on behalf of Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project