Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp370853pxb; Tue, 2 Feb 2021 07:18:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDymLbDV6VwsDg7TKQ075TRrLAZkto7Ee6T4LLV4HB3oLBF1aCb5uI/uUAYgU8qazStujL X-Received: by 2002:a17:907:1050:: with SMTP id oy16mr10818872ejb.424.1612279121366; Tue, 02 Feb 2021 07:18:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612279121; cv=none; d=google.com; s=arc-20160816; b=v2MWp2JoXoOgst8yvLZue3iI7+d1QXnV7eGkCtHiia5Y5J9EHQ+jdwA7h9dwDqpG68 EjG5ZbuGFk2cePgt7QpSGRg+/3y4Jc6bseAp11L6zBirYd68kBzrueHtCwW033JB1Yyy F6Wn3gW+GzLtrxqZcnT9F9UrRUJSympj45pWAEpqjvFpXpigp6ahgGvmG5tQIwdjZ1kJ Wzb+DA5IAARkdfxSEd40kqShsXkTWW0CPmeEQqJ3b5QtSgSJoGCg1vET4c+sNYEDPhdt gbyXn8fCQ49GezD7cnuT56gMOnerPBwuuTw/6BZrbQEETJnmhe0kVgX7lJx89aOM7Zs3 UFWw== 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=AEyR7MRkjbw2+47MruLjzvETJycv3lBXBKi3b4iDv+k=; b=AT2Kc9iIuqeyG3/MqfaV/hyFChp+Xie/+tDHdQxtIUohhh6DsbtqfhBAZE6dwL9qbY 5IjWJBz59qsby61Hr/AP8KuI3qKtk28x7sV4FJZdS+V+MHbcMvV2bGkUGYtvJPe1HzO3 Ods1YP+rx15rckyCM7tRZZRQH3Rf85/naEivFE2rGjoij0r64coLXFsheGqVXV573jJ9 Ozr2gMMwAp0T8h95geVkNFbLbxZ7s5yBVTA1impopO+PFRUSskaz39lT4lavtyToLw+a SBdtXNwtw/n6ttbGkhtD1uASZM7HtuYjCIm/5jvDSTsKgT6Vd6IWHJVj6jABmmyhSqNZ Dhwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=opbKsybC; 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.18.15; Tue, 02 Feb 2021 07:18:41 -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=opbKsybC; 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 S235145AbhBBPQ0 (ORCPT + 99 others); Tue, 2 Feb 2021 10:16:26 -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 S235223AbhBBPNl (ORCPT ); Tue, 2 Feb 2021 10:13:41 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 046F664F98; Tue, 2 Feb 2021 15:07:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278441; bh=8zbBwMMZ2sjCt9t0409HVX+AKEniPr73bu/McM7taqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=opbKsybCZJn2pgz+8hMvQRiE25OA90nokSrsMYVocldc0BiGyG6ZObQNurado6ABp hHk/+RjnQj86npjfaHxrJMQpBZVukC/9ScGbF8TgOMPjBuBTJ2o2IVlT9MGW8lTMie 0k55ghaMxKtSBpauyuRiqXof0ojZkw659wN2DXjgzT847YzoTJLOSH6dZzmkVwaKmT 2JjXnHOpTkWctA3fsGNoR/gcCWoYzfSvnOClFdnDFmjRaPm2MIdbSzHFvMiRBiqO3H jMH8KoMh4WulvO7T22Zszipd0sR0+y0WjLqYayyrK8prcX2AZ6Hq3eD2x/IyFbiniX Aldd17vp6LgAw== 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.19 05/10] iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time() Date: Tue, 2 Feb 2021 10:07:09 -0500 Message-Id: <20210202150715.1864614-5-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150715.1864614-1-sashal@kernel.org> References: <20210202150715.1864614-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 798605c4f1227..5287f21d7ba63 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c @@ -520,7 +520,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