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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 6F82DC433E6 for ; Tue, 2 Feb 2021 15:31:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 460F164F5E for ; Tue, 2 Feb 2021 15:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235577AbhBBPav (ORCPT ); Tue, 2 Feb 2021 10:30:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:40674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235102AbhBBPQA (ORCPT ); Tue, 2 Feb 2021 10:16:00 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4DF6E64FA5; Tue, 2 Feb 2021 15:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278464; bh=jCyPvmj/VHxcGkWl8CNXFkUNCSiy3nQSDgNHVBoMCJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QucPTij6qAvhGME13Cs54Vq0SSNzR/ZGNPH6g04rRH/lJiQO2jchcY/feJTzlydbK 5VPTEgQ3UhZYe05jh4C9Ndvr+Ifha/x4Ra/AN1JlzlhkvOQne2ZRZ0e8UxYbi3zzLL MbGof8xSHHQukay2hd0hf7oVPX1eW1S0tUw3qAdYw52bW7FJo2LN4ri0i35elK5SjM YEZRL/ybTIZrB6mZqESy4JyQ2r2YHeQnE3eVs4L1sI0sHStJaWmhqxT7AceQq4bcMQ 3hkI4qdMudECZgdYX6KTnblRUSR1VgW0agsZTJCrq7QIjv3zzHdvlOksdS1NiHUsmB gFDhKGFeAmpoQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Luca Coelho , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 2/6] iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time() Date: Tue, 2 Feb 2021 10:07:36 -0500 Message-Id: <20210202150740.1864854-2-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150740.1864854-1-sashal@kernel.org> References: <20210202150740.1864854-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Johannes Berg [ Upstream commit 5c56d862c749669d45c256f581eac4244be00d4d ] We need to take the mutex to call iwl_mvm_get_sync_time(), do it. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/iwlwifi.20210115130252.4bb5ccf881a6.I62973cbb081e80aa5b0447a5c3b9c3251a65cf6b@changeid Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c index f4d75ffe3d8a8..7f01fb91ea668 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c @@ -518,7 +518,10 @@ static ssize_t iwl_dbgfs_os_device_timediff_read(struct file *file, const size_t bufsz = sizeof(buf); int pos = 0; + mutex_lock(&mvm->mutex); iwl_mvm_get_sync_time(mvm, &curr_gp2, &curr_os); + mutex_unlock(&mvm->mutex); + do_div(curr_os, NSEC_PER_USEC); diff = curr_os - curr_gp2; pos += scnprintf(buf + pos, bufsz - pos, "diff=%lld\n", diff); -- 2.27.0