Commit c4ae8b9d authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: pass the clock type to iwl_mvm_get_sync_time() 



Allow the caller to pass the clock type to iwl_mvm_get_sync_time() so
callers with different needs can decide whether to use boottime or
realtime.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210612142637.093f6660e69b.Ifd2328ac2130269f729c9c1bceec44ba01d79e88@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 7119f02b

drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2012-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -460,7 +460,7 @@ static ssize_t iwl_dbgfs_os_device_timediff_read(struct file *file, 
	int pos = 0;



	mutex_lock(&mvm->mutex);

	iwl_mvm_get_sync_time(mvm, &curr_gp2, &curr_os);

	iwl_mvm_get_sync_time(mvm, CLOCK_BOOTTIME, &curr_gp2, &curr_os, NULL);

	mutex_unlock(&mvm->mutex);



	do_div(curr_os, NSEC_PER_USEC);

drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

+3 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2020 Intel Corporation

 * Copyright (C) 2018-2021 Intel Corporation

 */

#include <linux/etherdevice.h>

#include <linux/math64.h>
@@ -879,7 +879,8 @@ static u64 iwl_mvm_ftm_get_host_time(struct iwl_mvm *mvm, __le32 fw_gp2_ts) 
	u32 curr_gp2, diff;

	u64 now_from_boot_ns;



	iwl_mvm_get_sync_time(mvm, &curr_gp2, &now_from_boot_ns);

	iwl_mvm_get_sync_time(mvm, CLOCK_BOOTTIME, &curr_gp2,

			      &now_from_boot_ns, NULL);



	if (curr_gp2 >= gp2_ts)

		diff = curr_gp2 - gp2_ts;

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/thermal.h>

#endif



#include <linux/ktime.h>



#include "iwl-op-mode.h"

#include "iwl-trans.h"

#include "fw/notif-wait.h"
@@ -1450,7 +1452,8 @@ u8 iwl_mvm_mac80211_ac_to_ucode_ac(enum ieee80211_ac_numbers ac); 
void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm);

u8 first_antenna(u8 mask);

u8 iwl_mvm_next_antenna(struct iwl_mvm *mvm, u8 valid, u8 last_idx);

void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime);

void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, int clock_type, u32 *gp2,

			   u64 *boottime, ktime_t *realtime);

u32 iwl_mvm_get_systime(struct iwl_mvm *mvm);



/* Tx / Host Commands */

drivers/net/wireless/intel/iwlwifi/mvm/utils.c

+8 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2012-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2013-2014 Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 */
@@ -1398,7 +1398,8 @@ u32 iwl_mvm_get_systime(struct iwl_mvm *mvm) 
	return iwl_read_prph(mvm->trans, reg_addr);

}



void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime)

void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, int clock_type,

			   u32 *gp2, u64 *boottime, ktime_t *realtime)

{

	bool ps_disabled;
@@ -1412,7 +1413,11 @@ void iwl_mvm_get_sync_time(struct iwl_mvm *mvm, u32 *gp2, u64 *boottime) 
	}



	*gp2 = iwl_mvm_get_systime(mvm);



	if (clock_type == CLOCK_BOOTTIME && boottime)

		*boottime = ktime_get_boottime_ns();

	else if (clock_type == CLOCK_REALTIME && realtime)

		*realtime = ktime_get_real();



	if (!ps_disabled) {

		mvm->ps_disabled = ps_disabled;