From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 342051B983E; Mon, 4 Nov 2024 10:53:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730717621; cv=none; b=CMhLG9M8GBg7A/glnzD9pwjvNcWgHsObw46n/nOCDE4JPoiKP7GrOKe7NN2Eqz9l2DB+OjiTEpqDACKt4EEnjaL1MXIMIvJCypgE4+Xb+jxBY84Q1Gi5phJ3fZIaK65mbFvra8p2MOuNPWIpMW/qyY0xKmbuaqiMV3FJ9TXhTO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730717621; c=relaxed/simple; bh=Ji6YRB8mZXjuoVDnGxKqDW13n3rl62If0n1jNeCQMis=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AKEUOszHROH7M53pQ/N7jLFlL5Cuq7/CQiPD4USDRgigTy1gifGq+ctoHE+n0SSvUopYBohtBOwMJL2ExKSrXmZTgxIIVNjK1YCH/vCsJ7jcb+492lVDwu6UBp0j0CUYNzy7VbHNEW4aQPL29zf04SLZwRO8PLv1JhVSg0XFTHI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k3df7ZlF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k3df7ZlF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 087F1C4CECE; Mon, 4 Nov 2024 10:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730717620; bh=Ji6YRB8mZXjuoVDnGxKqDW13n3rl62If0n1jNeCQMis=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k3df7ZlFw8BpEkYhJlZlm/5ZxE/sOnH3zpqc10gomhecbInDK/pw2cIU4yg8UygCp B6JdPrD5dd9x7erhmwKFHQlvrokRpd7pE4n/pUkjuYeBPe5n6Tg+3E0MvVPXe9w8Qw 4QnCA2a9ZCZUW6v+yKLA30n3KQND7DoJXbtN4pwmeef8x0tNsjLNDzLqpyIHrofUsM J3/3oG8e+rIJG3K0EokqC8s71IrFN4xnAZyWwknEtTjkgYqEcukI5SeRc/DR7KHG7z Cs7bBYJ2ml4zxKQRvOyJ74UZ30ANXqi9YvJLXxgfmH+L02IyrotVzxFMH+0f/Y3eWC OhjetOLLzGVew== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Gabay , Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, shaul.triebitz@intel.com, gregory.greenman@intel.com, yedidya.ben.shimol@intel.com, emmanuel.grumbach@intel.com, benjamin.berg@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 04/11] wifi: iwlwifi: mvm: Use the sync timepoint API in suspend Date: Mon, 4 Nov 2024 05:53:02 -0500 Message-ID: <20241104105324.97393-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241104105324.97393-1-sashal@kernel.org> References: <20241104105324.97393-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.115 Content-Transfer-Encoding: 8bit From: Daniel Gabay [ Upstream commit 9715246ca0bfc9feaec1b4ff5b3d38de65a7025d ] When starting the suspend flow, HOST_D3_START triggers an _async_ firmware dump collection for debugging purposes. The async worker may race with suspend flow and fail to get NIC access, resulting in the following warning: "Timeout waiting for hardware access (CSR_GP_CNTRL 0xffffffff)" Fix this by switching to the sync version to ensure the dump completes before proceeding with the suspend flow, avoiding potential race issues. Signed-off-by: Daniel Gabay Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20241010140328.9aae318cd593.I4b322009f39489c0b1d8893495c887870f73ed9c@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/init.c | 4 +++- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/init.c b/drivers/net/wireless/intel/iwlwifi/fw/init.c index 135bd48bfe9fa..cf02a2afbee56 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/init.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/init.c @@ -39,10 +39,12 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans, } IWL_EXPORT_SYMBOL(iwl_fw_runtime_init); +/* Assumes the appropriate lock is held by the caller */ void iwl_fw_runtime_suspend(struct iwl_fw_runtime *fwrt) { iwl_fw_suspend_timestamp(fwrt); - iwl_dbg_tlv_time_point(fwrt, IWL_FW_INI_TIME_POINT_HOST_D3_START, NULL); + iwl_dbg_tlv_time_point_sync(fwrt, IWL_FW_INI_TIME_POINT_HOST_D3_START, + NULL); } IWL_EXPORT_SYMBOL(iwl_fw_runtime_suspend); diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c index 425588605a262..53302c29c2291 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c @@ -1375,7 +1375,9 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) iwl_mvm_pause_tcm(mvm, true); + mutex_lock(&mvm->mutex); iwl_fw_runtime_suspend(&mvm->fwrt); + mutex_unlock(&mvm->mutex); return __iwl_mvm_suspend(hw, wowlan, false); } -- 2.43.0