Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56ef9357 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Make time sync period configurable"

parents 98ebb0bd 8ee8175d

drivers/net/wireless/cnss2/debug.c

+5 −0
Original line number Diff line number Diff line
@@ -555,6 +555,8 @@ static ssize_t cnss_control_params_debug_write(struct file *fp, 
		plat_priv->ctrl_params.qmi_timeout = val;

	else if (strcmp(cmd, "bdf_type") == 0)

		plat_priv->ctrl_params.bdf_type = val;

	else if (strcmp(cmd, "time_sync_period") == 0)

		plat_priv->ctrl_params.time_sync_period = val;

	else

		return -EINVAL;
@@ -625,12 +627,15 @@ static int cnss_control_params_debug_show(struct seq_file *s, void *data) 
	seq_puts(s, "mhi_timeout: Timeout for MHI operation in milliseconds\n");

	seq_puts(s, "qmi_timeout: Timeout for QMI message in milliseconds\n");

	seq_puts(s, "bdf_type: Type of board data file to be downloaded\n");

	seq_puts(s, "time_sync_period: Time period to do time sync with device in milliseconds\n");



	seq_puts(s, "\nCurrent value:\n");

	cnss_show_quirks_state(s, cnss_priv);

	seq_printf(s, "mhi_timeout: %u\n", cnss_priv->ctrl_params.mhi_timeout);

	seq_printf(s, "qmi_timeout: %u\n", cnss_priv->ctrl_params.qmi_timeout);

	seq_printf(s, "bdf_type: %u\n", cnss_priv->ctrl_params.bdf_type);

	seq_printf(s, "time_sync_period: %u\n",

		   cnss_priv->ctrl_params.time_sync_period);



	return 0;

}

drivers/net/wireless/cnss2/main.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#endif

#define CNSS_QMI_TIMEOUT_DEFAULT	10000

#define CNSS_BDF_TYPE_DEFAULT		CNSS_BDF_ELF

#define CNSS_TIME_SYNC_PERIOD_DEFAULT	900000



static struct cnss_plat_data *plat_env;
@@ -1904,6 +1905,7 @@ static void cnss_init_control_params(struct cnss_plat_data *plat_priv) 
	plat_priv->ctrl_params.mhi_timeout = CNSS_MHI_TIMEOUT_DEFAULT;

	plat_priv->ctrl_params.qmi_timeout = CNSS_QMI_TIMEOUT_DEFAULT;

	plat_priv->ctrl_params.bdf_type = CNSS_BDF_TYPE_DEFAULT;

	plat_priv->ctrl_params.time_sync_period = CNSS_TIME_SYNC_PERIOD_DEFAULT;

}



static const struct platform_device_id cnss_platform_id_table[] = {

drivers/net/wireless/cnss2/main.h

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ struct cnss_control_params { 
	unsigned int mhi_timeout;

	unsigned int qmi_timeout;

	unsigned int bdf_type;

	unsigned int time_sync_period;

};



struct cnss_cpr_info {

drivers/net/wireless/cnss2/pci.c

+5 −3
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ 
#define EMULATION_HW			0

#endif



#define TIME_SYNC_PERIOD_JF		msecs_to_jiffies(900000)



static DEFINE_SPINLOCK(pci_link_down_lock);

static DEFINE_SPINLOCK(pci_reg_window_lock);
@@ -891,6 +889,9 @@ static void cnss_pci_time_sync_work_hdlr(struct work_struct *work) 
{

	struct cnss_pci_data *pci_priv =

		container_of(work, struct cnss_pci_data, time_sync_work.work);

	struct cnss_plat_data *plat_priv = pci_priv->plat_priv;

	unsigned int time_sync_period_ms =

		plat_priv->ctrl_params.time_sync_period;



	if (cnss_pci_is_device_down(&pci_priv->pci_dev->dev))

		return;
@@ -899,7 +900,8 @@ static void cnss_pci_time_sync_work_hdlr(struct work_struct *work) 
		return;



	cnss_pci_update_timestamp(pci_priv);

	schedule_delayed_work(&pci_priv->time_sync_work, TIME_SYNC_PERIOD_JF);

	schedule_delayed_work(&pci_priv->time_sync_work,

			      msecs_to_jiffies(time_sync_period_ms));



	cnss_pci_pm_runtime_mark_last_busy(pci_priv);

	cnss_pci_pm_runtime_put_autosuspend(pci_priv);