Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp404649pxb; Tue, 2 Feb 2021 08:04:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmGl3jALA4Wx695wCdquEUVdahmJ3iV3izhqVLPSuET5EM+qM79YwPr3ZEr622UNKiIVXx X-Received: by 2002:aa7:cd8c:: with SMTP id x12mr16319322edv.355.1612281867009; Tue, 02 Feb 2021 08:04:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612281867; cv=none; d=google.com; s=arc-20160816; b=kkxkvbKFu0mewlIwKeqibkNNGFUmdaxg7B8WmyTz34rQ2UkvPcshcr11NhuAQJDVEn gDZYytAGa0DeIjsDThDpSqVHzrGU4CBC48qbHKQtjUDZW8ZZs9agSCdijNgMn5UvEw4X sQ/kVJee8QoNOPPUKFzeOrITOFyhKe3NZzBGlSSs0dVQWjuP6HrTBlLiRYf6R7nJ0h+7 EdxH4jLHy0u/rs2fCHhBBuoegNcd871aST19i3QsCGkm+/HuBPUPi0XLIDZew/TKARcl GgFBL/RjEJzqL681CYTDKS1CFoNoKr2sckAIwbtAZZ80gHZa/ILtzeNp4NzHOUmWlNvp RI0Q== 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=CO1JvBFfNXaIqCJ1egoRr4omGt3AEl7W6Ye8eDaBa81lPM1d0vUn2qhjRG7FN8v6CD 2vmqu50iSMK2j2tftNUlPuVdopgywmAFY7aPXzvdmEasCkxknAZ9Zxq2ZihKhHMYjp8L Oxi7CRN0FyN1LpXFMgluSnLQa0pjIqhlSmd5v1mZ48ovde64s9W0N2NGPuFuAYiBchN0 PiQRm7SOqApgMGYW8l8iblLU88jHLTbD2Yexiuojv+UjSVf+8SCwJQRprIBeivU1LsJ1 cQykWfKQT/g2RT6HVcKdrOEMOeiwHRW/CGCU0zL7p4lEWtDx1Xx+Xd1YHhDRx+d37eJD wdiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=X9pVZBb+; 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 bu13si11783469ejb.588.2021.02.02.08.04.00; Tue, 02 Feb 2021 08:04:26 -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=X9pVZBb+; 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 S235910AbhBBQAe (ORCPT + 99 others); Tue, 2 Feb 2021 11:00:34 -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 S235212AbhBBPMC (ORCPT ); Tue, 2 Feb 2021 10:12:02 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0C07364F80; Tue, 2 Feb 2021 15:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278422; bh=X8nsuQJTgoe6gbLnW8ip3eaIYtCcVSr3zvpNLTjzxfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X9pVZBb+2T/kqWxEySQHswXOCAnkSJL5nrFpdfHY2rcYjpAMATfvePshP6ZjCh9bB yJPUNRgYqOjad9io8QptcTFaU9DzjxR6z8rzE8h/CTUuRQ6CGN/nqz3UHhFv5rheuw 3Cgzdrw7zehf43UE5FG2hOz04oU+E1OqTlQ9e//nDoM+4FwF/db32ACFaXSiDjnzOg SSKTDnAb8iea5MFVsLftShrs5iQLkSQTaHFXYsvDatXN5Zrl5P+IWPDvw6kWmrsSA+ Bt2ngw6a66osBcCNI/S25brfgi0fGSReeEhKI7zZ2yOWFtuvRzB816Wb+u+fk41BgI ucmoSeuNGJUBg== 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.4 09/17] iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time() Date: Tue, 2 Feb 2021 10:06:43 -0500 Message-Id: <20210202150651.1864426-9-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150651.1864426-1-sashal@kernel.org> References: <20210202150651.1864426-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