Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp383622pxb; Tue, 2 Feb 2021 07:34:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJxe3ITIyjOJ1mD8E7hr/6sAZ5hYZX/xMFUaKhS7vDju4+SPH44MppBDKc4LZmWKWX7kmHDb X-Received: by 2002:a17:906:f0d0:: with SMTP id dk16mr7447254ejb.533.1612280096204; Tue, 02 Feb 2021 07:34:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612280096; cv=none; d=google.com; s=arc-20160816; b=PeaxFg3Mcs6O89kLmNMRkprSXo3B2eM1WetQP029C0e4hJs5kCTFb+G6MCp7R8J+Ez xf2WuJATaPCg3TGjJOy292Ht/Odyod2W4dOLcZJ7gKs9e8SgAcOYFsezbIbkPr9a+pk2 aoSIhGeG/Fa/I6qtBy/T5xfPmsSmboNaM0d0bPyS43mP2mN5P7L802LviPAwRlIvzqID d0huBhjdD2JuaIysGATZ1ozMHUfxbjQeCdAiyqMU3hqyrnc+19Rw0IA7iGjKMeLs8fxY UrxMXcXWScGj8+TQVFWBHsSWNyLNmbtFMDhlMokEKSWhbdP9HehanT61g6MhHKFrp5Qr mVZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h9/Ky/xULV66FRk6JQATInh1gxKFDQ9EiQWVzzRZQhU=; b=SobcydkqB89xAc8QSOkojDNOC9efNxVqTdqzb59+dB0DrVDjaWPugbk3v91v9UViFo Tlx1cFHPxP2NHgwGEFvlge/bfghuGcv3/W+MXHUiuX9BhIlDnJwyCLAAnUZsH4GFD8g7 cr1oaq4W/AiFPcxXRc/YRzEwaMSSkkVd3QAjAb1OPzo8W3RTHHgiSPRTKhZUR1FrrNkk PjXXIWWlYnhZqvoda0SDUmykItASuRtm/ON3PPRgNa3FMVOhFJcP1ES1gtGH2qAcngQC mAb0DVxkbXHvPgbvTGtzYpkIWk0bVF/wvU/96XchbVugZuPnPVetjqbNaduFI4lZbOWF WhIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QucPTij6; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c16si5433566ejm.289.2021.02.02.07.34.31; Tue, 02 Feb 2021 07:34:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QucPTij6; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235516AbhBBPal (ORCPT + 99 others); Tue, 2 Feb 2021 10:30:41 -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: linux-wireless@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