linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>,
	Luca Coelho <luciano.coelho@intel.com>,
	Kalle Valo <kvalo@codeaurora.org>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.14 06/57] iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time()
Date: Mon, 22 Feb 2021 13:35:32 +0100	[thread overview]
Message-ID: <20210222121027.679332534@linuxfoundation.org> (raw)
In-Reply-To: <20210222121027.174911182@linuxfoundation.org>

From: Johannes Berg <johannes.berg@intel.com>

[ Upstream commit 5c56d862c749669d45c256f581eac4244be00d4d ]

We need to take the mutex to call iwl_mvm_get_sync_time(), do it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20210115130252.4bb5ccf881a6.I62973cbb081e80aa5b0447a5c3b9c3251a65cf6b@changeid
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 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




  parent reply	other threads:[~2021-02-22 13:14 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-22 12:35 [PATCH 4.14 00/57] 4.14.222-rc1 review Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 01/57] fgraph: Initialize tracing_graph_pause at task creation Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 02/57] remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 03/57] remoteproc: qcom_q6v5_mss: Validate MBA " Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 04/57] af_key: relax availability checks for skb size calculation Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 05/57] pNFS/NFSv4: Try to return invalid layout in pnfs_layout_process() Greg Kroah-Hartman
2021-02-22 12:35 ` Greg Kroah-Hartman [this message]
2021-02-22 12:35 ` [PATCH 4.14 07/57] iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 08/57] iwlwifi: mvm: guard against device removal in reprobe Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 09/57] SUNRPC: Move simple_get_bytes and simple_get_netobj into private header Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 10/57] SUNRPC: Handle 0 length opaque XDR object data properly Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 11/57] lib/string: Add strscpy_pad() function Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 12/57] include/trace/events/writeback.h: fix -Wstringop-truncation warnings Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 13/57] memcg: fix a crash in wb_workfn when a device disappears Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 14/57] squashfs: add more sanity checks in id lookup Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 15/57] squashfs: add more sanity checks in inode lookup Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 16/57] squashfs: add more sanity checks in xattr id lookup Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 17/57] tracing: Do not count ftrace events in top level enable output Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 18/57] tracing: Check length before giving out the filter buffer Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 19/57] arm/xen: Dont probe xenbus as part of an early initcall Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 20/57] MIPS: BMIPS: Fix section mismatch warning Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 21/57] arm64: dts: rockchip: Fix PCIe DT properties on rk3399 Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 22/57] platform/x86: hp-wmi: Disable tablet-mode reporting by default Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 23/57] ovl: perform vfs_getxattr() with mounter creds Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 24/57] cap: fix conversions on getxattr Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 25/57] ovl: skip getxattr of security labels Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 26/57] ARM: dts: lpc32xx: Revert set default clock rate of HCLK PLL Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 27/57] ARM: ensure the signal page contains defined contents Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 28/57] memblock: do not start bottom-up allocations with kernel_end Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 29/57] bpf: Check for integer overflow when using roundup_pow_of_two() Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 30/57] netfilter: xt_recent: Fix attempt to update deleted entry Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 31/57] xen/netback: avoid race in xenvif_rx_ring_slots_available() Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 32/57] netfilter: conntrack: skip identical origin tuple in same zone only Greg Kroah-Hartman
2021-02-22 12:35 ` [PATCH 4.14 33/57] usb: dwc3: ulpi: fix checkpatch warning Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 34/57] usb: dwc3: ulpi: Replace CPU-based busyloop with Protocol-based one Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 35/57] net/vmw_vsock: improve locking in vsock_connect_timeout() Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 36/57] net: watchdog: hold device global xmit lock during tx disable Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 37/57] vsock/virtio: update credit only if socket is not closed Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 38/57] vsock: fix locking in vsock_shutdown() Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 39/57] i2c: stm32f7: fix configuration of the digital filter Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 40/57] h8300: fix PREEMPTION build, TI_PRE_COUNT undefined Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 41/57] x86/build: Disable CET instrumentation in the kernel for 32-bit too Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 42/57] trace: Use -mcount-record for dynamic ftrace Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 43/57] tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 44/57] tracing: Avoid calling cc-option -mrecord-mcount for every Makefile Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 45/57] Xen/x86: dont bail early from clear_foreign_p2m_mapping() Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 46/57] Xen/x86: also check kernel mapping in set_foreign_p2m_mapping() Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 47/57] Xen/gntdev: correct dev_bus_addr handling in gntdev_map_grant_pages() Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 48/57] Xen/gntdev: correct error checking " Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 49/57] xen/arm: dont ignore return errors from set_phys_to_machine Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 50/57] xen-blkback: dont "handle" error by BUG() Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 51/57] xen-netback: " Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 52/57] xen-scsiback: " Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 53/57] xen-blkback: fix error handling in xen_blkbk_map() Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 54/57] scsi: qla2xxx: Fix crash during driver load on big endian machines Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 55/57] USB: Gadget Ethernet: Re-enable Jumbo frames Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 56/57] usb: gadget: u_ether: Fix MTU size mismatch with RX packet size Greg Kroah-Hartman
2021-02-22 12:36 ` [PATCH 4.14 57/57] kvm: check tlbs_dirty directly Greg Kroah-Hartman
2021-02-22 21:27 ` [PATCH 4.14 00/57] 4.14.222-rc1 review Guenter Roeck
2021-02-23 11:53 ` Naresh Kamboju

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210222121027.679332534@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=johannes.berg@intel.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luciano.coelho@intel.com \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).