From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B01EFC433F5 for ; Mon, 25 Apr 2022 23:13:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237425AbiDYXQ1 (ORCPT ); Mon, 25 Apr 2022 19:16:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237350AbiDYXQS (ORCPT ); Mon, 25 Apr 2022 19:16:18 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08EAF46668 for ; Mon, 25 Apr 2022 16:13:12 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id u5so3873817pjr.5 for ; Mon, 25 Apr 2022 16:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=2DJhIYTqXYplW9lP9uJQwqXKSCnTlNmW0Zo9c3Kv29k=; b=epgKtVTNynOyu/7OZFsmHnChXekgv57ciJlvl0aIbH/M+t0fuW4gnBFAv2SPOU/7oI lOwY1o5RP7sRPX4OvCPP47Jw2e6kzACR8pgMEW7Ia8M6D+UwuFy1P4WGdE9aXyy69FpB l5hLGufQ0xogXf1k0QakrqnU+LccdI2/aOYQ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2DJhIYTqXYplW9lP9uJQwqXKSCnTlNmW0Zo9c3Kv29k=; b=NjCnugL9iBp7/XQpB3ZX3qjrkK4QAjEdIZ5vXvZnElZN010w+VLvuIocajOhaxe/jt 4ujjG0OMP7nwbjiPhKlBmFIFl18bLHACGf6F5jVy/4tVpEQb2a4gpXgiftvHYU3gT/R4 sdJDuCg+Oh6yTV6QXCAJKBuUNsu8qAisaZCoYQFdFxgNOrR9XR82ivHC1kToPU5WpKAr 5JOPO4ZgPp9WaOx7+w0otUZB1d4DktQRWlmOCCGu2o0BrdJJj0cd97xb4WgLlII6FX4Z S3gXX3+8qWK0UYyuRf4yckyvz0DZkuTKe+l21bO27Dy2h4/pOmrIcfGQFPdfYibCPMPo e/qg== X-Gm-Message-State: AOAM532UxBN9YzueZfCkrkVDiy9M9UiLd8qGJKzQ9LxpAlN0QoZvorHw TJ6Yh7ajJMxw63aFTVq7uiRi7g== X-Google-Smtp-Source: ABdhPJx1ULMWttNhMQ0Qvlkb27kuiPfgh7vujfY1m6axCjNVRaz5FzsGwvA+45wmAAUpUKZG8wN4Dw== X-Received: by 2002:a17:902:b906:b0:14f:76a0:ad48 with SMTP id bf6-20020a170902b90600b0014f76a0ad48mr20675811plb.79.1650928391477; Mon, 25 Apr 2022 16:13:11 -0700 (PDT) Received: from google.com ([2620:15c:202:201:84c6:2d6d:c16:1a1b]) by smtp.gmail.com with ESMTPSA id z16-20020a17090abd9000b001d2edf4b513sm347375pjr.56.2022.04.25.16.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 16:13:10 -0700 (PDT) Date: Mon, 25 Apr 2022 16:13:08 -0700 From: Brian Norris To: Abhishek Kumar Cc: kvalo@kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, netdev@vger.kernel.org, Wen Gong , "David S. Miller" , Jakub Kicinski , Paolo Abeni Subject: Re: [PATCH] ath10k: skip ath10k_halt during suspend for driver state RESTARTING Message-ID: References: <20220425021442.1.I650b809482e1af8d0156ed88b5dc2677a0711d46@changeid> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Apr 25, 2022 at 04:11:44PM -0700, Brian Norris wrote: > On Mon, Apr 25, 2022 at 02:15:20AM +0000, Abhishek Kumar wrote: > > --- a/drivers/net/wireless/ath/ath10k/mac.c > > +++ b/drivers/net/wireless/ath/ath10k/mac.c > > @@ -5345,8 +5345,22 @@ static void ath10k_stop(struct ieee80211_hw *hw) ... > > + /* If the current driver state is RESTARTING but not yet > > + * fully RESTARTED because of incoming suspend event, > > + * then ath11k_halt is already called via > > s/ath11k/ath10k/ > > I know ath11k is the hot new thing, but this is ath10k ;) > > > + * ath10k_core_restart and should not be called here. > > s/ath10k/ath11k/ Oh boy, I got *that* backwards! Should be this, obviously: s/ath11k/ath10k/ > > + */ > > + if (ar->state != ATH10K_STATE_RESTARTING) > > + ath10k_halt(ar); > > + else > > + /* Suspending here, because when in RESTARTING > > + * state, ath11k_core_stop skips > > s/ath10k/ath11k/ Same. Brian