Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp389652pxb; Tue, 2 Feb 2021 07:43:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJz971/wYzeub+DeSH0fk6tTTDul3Oip+ZIGZJi6V/E2nf+2uqXfK9Oh9ulHGGExUn506eBW X-Received: by 2002:a50:e3c4:: with SMTP id c4mr24088089edm.77.1612280581078; Tue, 02 Feb 2021 07:43:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612280581; cv=none; d=google.com; s=arc-20160816; b=qDgMMRluZOFpNyLfcEUHDSs21mrRUAzZPqmAfVVyaO6I0LN7g4DBkXKQHZEgR52SSS N3NecVrinIJXHgpOGVi5LcwJVI/Yy5Am8yUCJu+E2uOh+V5Z976p6fD6qR8HawirEGU5 VG/crefPYhD5wp8nc/V+weod9HrC6f34gGmLqi3j+zkudjFYIa9tTnuqQ/sQaGPLOjt7 Bg5LNL1OdVcT/MnlwNJez8MiRoSvz/KSCQh/93TN32fDlk4i1kxX1EiAShyH/q7PSPqH LbhmbemJPssJi5QCbSw3LWzYgzBEDHIy9IO72YzKKpAj66ahRTzIsk+OYCvTqmGR6YTD Tj4g== 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=9tbrFMWg6Xe/UEp+99cm3EBxggRa0VYQGb1KHXzQVIA=; b=DNNcCeI69HqlewiLuuxuHML+NUZiXF2Xl+GIN/IibzlMF1uHL6uhWKiFmrgg3YK0ji KLlHwai1mI04u6bkwf/6/DpEfdFt3jOh4Y/f5T9jooTTwMhKOYL3jexZGXijba+Mjiz6 gLH+N1+rL/O6J1jpG/CwkSaWzkxL9Eqha+5IPtnoPCKteS34xfXjutdCWid/MM/4cyzr BdFEih0XrKH3AYOJvv6kVD6E9BDGMibMtJN45R4chsVpIkfwUbKBfYHrrZ8bLAyAfclS BmAw6Fm7Wljt15Sm13tPlAuxIA4MeN2CaEjvmKmI/Xr7Dqvh1igYwXiiWDhwmPGAJ7kX Xv5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Wry5aANP; 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 hr20si13021937ejc.23.2021.02.02.07.42.36; Tue, 02 Feb 2021 07:43:01 -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=Wry5aANP; 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 S235543AbhBBPkZ (ORCPT + 99 others); Tue, 2 Feb 2021 10:40:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:39462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235269AbhBBPOv (ORCPT ); Tue, 2 Feb 2021 10:14:51 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A397364FA2; Tue, 2 Feb 2021 15:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278454; bh=joKYNFrfxTJaTY/td3Bgwgy7/4s/D9KzIQu/cAYX05w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wry5aANPidZILEhKoxb2BIurX7TtgC+mXKW0UBJEuTXcX2Zx2AqEhM9+GsN64mxbt oll8KCqE/aRc/j7QPpzreOJThoLjntpeepHDplBUTnObzBQ55RzVpszFfAh3xTYY4S 2TxVlR9hFG5dKL7Vp91cKD1EypE7oEPckbFs2EEBhqTe0PkKfdO4ssWLiB2yzpG2x8 GAusHBc52E8qFHVmgigVkExB5UG4wHHpXeiAbRFKqDN8rdTp5HdfvbbAwfv4PtUQI3 t5F8CJiWe3kQDiZ12WIU/g0beY4egL0zu8zEHCpjJG1eh7I6EtEdfN2iDG8kH1u51s DsxxhvCYxz/fg== 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.14 3/7] iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time() Date: Tue, 2 Feb 2021 10:07:25 -0500 Message-Id: <20210202150730.1864745-3-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150730.1864745-1-sashal@kernel.org> References: <20210202150730.1864745-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 71a01df96f8b0..6db51abb8f4a3 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