Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp366888pxb; Tue, 2 Feb 2021 07:14:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqn9i67Puho0+ztGHDsHyAa5uMB1KZu801A/Bkai0XGXePRDx8n6OaQkxswY1Wiz9y6/u+ X-Received: by 2002:a17:906:9249:: with SMTP id c9mr10363578ejx.416.1612278853908; Tue, 02 Feb 2021 07:14:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612278853; cv=none; d=google.com; s=arc-20160816; b=W1bDA8Tips9UKyFkOSSy/jvdEDrpgK+e5FoWdjm4LUnQX+ry8JgC7dVrPREWp0bnS1 1irHScwqy+Ee6R1NNRw2yBq58snuYMDtnSkVNgCAHuhsTPpTHgQ1+Vnc08MkJolMqZNR 0AeWo7mneIfuzdmj35tcRqiFcJGvOU2ucffMZAg5IibLfYCCNTOw4TvulkmapFivfDSK L7lTr8d34slJMJT6fYiV+6UakCbu6anN0JdWR2nN3bPHlP1v+9V+dQfQ6XB/h38n7eOP gYY3ZIk8i+oOgJlWMN+sbKnQMtYSZbAPZKy12lIjwEs6GC4M53G9jLb0VXcTOfAqc9gi q3Sg== 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=qyA1s9seoC+yqR+le15kNt0kKA4YwClR2jcj8ieCGqk=; b=YAovYb+opC3/FbTW/kqfsIi9lJcWLP6SDlTi4X/ewyZ21vLs/5rHRMa9ka1oF2utw5 gk/9AWmRmevMeBq0OMBdquJphT9+IiFu/XkLF5+ny/54sqYfUTimIs/Tr0exROZMemTM QLV3tlBgISpFe7spgW8X9Rf8/Qg5OI1bL65f/TsohtHhC0teLSWVQgYtlYxyKZ0zZwyN d+s00hVbEKhQfixawmsidXem8t/ZJ9TkUDyuKC1YF1X/iGqz2XrjL5j5X9mkOyETRcMb 3hj6h7Ze6LdzjA2ZsLK607hx3Qv6Oa0yDy3jgLDZYUuZTMBZePWnogfyDxJp0JhqFrnr npMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=h30fAHzL; 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 p6si13063507edm.151.2021.02.02.07.13.45; Tue, 02 Feb 2021 07:14:13 -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=h30fAHzL; 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 S235194AbhBBPL6 (ORCPT + 99 others); Tue, 2 Feb 2021 10:11:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:38280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235155AbhBBPJp (ORCPT ); Tue, 2 Feb 2021 10:09:45 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id F3E9164F69; Tue, 2 Feb 2021 15:06:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278394; bh=X8nsuQJTgoe6gbLnW8ip3eaIYtCcVSr3zvpNLTjzxfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h30fAHzLVsk28nvBlpxb3pJIjSLSKn7dDDQalWfmISCvRN9uDCfd7z8npP4jX9pW+ O3lSe+mAi++Y5wRWdiB1Te5F6hcuOkwerEk41ou5PkbKPbsJE6AEoRlAxosKAp+gHy iT5ztZAlAp0oS9qx21MY4a+NOm7+OPvlPU9U9eI6qkeieNVOQXaE2kMaWgy4XbiZIf b6Y+vvTeg3c16cFuX+TgN4gxPJHf3Ywa/Uoj7Hr26xUALphgXf0NmjiqCr7NYHI7iT 7xWFlg1oUneliwLFaSHgDfpcgBXA3M/3frFnomU5Lq2Mlm+4CHqiTazSYQKtj0PzcU JfSYAOYQL2G1g== 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 5.10 14/25] iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time() Date: Tue, 2 Feb 2021 10:06:04 -0500 Message-Id: <20210202150615.1864175-14-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150615.1864175-1-sashal@kernel.org> References: <20210202150615.1864175-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 f043eefabb4ec..7b1d2dac6ceb8 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c @@ -514,7 +514,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