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

Commit ee49a8ea authored by Yue Ma's avatar Yue Ma
Browse files

cnss2: Use shadow register version 2 structures for QCA6290 



Fill version 2 shadow registers and pass them to firmware through QMI
for QCA6290 chipset.

Change-Id: I3fc709bfbde231a9410b6a4ce23624dfb0795a7f
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent f28d87fb

drivers/net/wireless/cnss2/main.c

+9 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -367,15 +367,16 @@ int cnss_wlan_enable(struct device *dev, 
		req.svc_cfg[i].pipe_num = config->ce_svc_cfg[i].pipe_num;

	}



	req.shadow_reg_valid = 1;

	if (config->num_shadow_reg_cfg >

	    QMI_WLFW_MAX_NUM_SHADOW_REG_V01)

		req.shadow_reg_len = QMI_WLFW_MAX_NUM_SHADOW_REG_V01;

	req.shadow_reg_v2_valid = 1;

	if (config->num_shadow_reg_v2_cfg >

	    QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01)

		req.shadow_reg_v2_len = QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01;

	else

		req.shadow_reg_len = config->num_shadow_reg_cfg;

		req.shadow_reg_v2_len = config->num_shadow_reg_v2_cfg;



	memcpy(req.shadow_reg, config->shadow_reg_cfg,

	       sizeof(struct wlfw_shadow_reg_cfg_s_v01) * req.shadow_reg_len);

	memcpy(req.shadow_reg_v2, config->shadow_reg_v2_cfg,

	       sizeof(struct wlfw_shadow_reg_v2_cfg_s_v01)

	       * req.shadow_reg_v2_len);



	ret = cnss_wlfw_wlan_cfg_send_sync(plat_priv, &req);

	if (ret)

include/net/cnss2.h

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -101,6 +101,10 @@ struct cnss_shadow_reg_cfg { 
	u16 reg_offset;

};



struct cnss_shadow_reg_v2_cfg {

	u32 addr;

};



struct cnss_wlan_enable_cfg {

	u32 num_ce_tgt_cfg;

	struct cnss_ce_tgt_pipe_cfg *ce_tgt_cfg;
@@ -108,6 +112,8 @@ struct cnss_wlan_enable_cfg { 
	struct cnss_ce_svc_pipe_cfg *ce_svc_cfg;

	u32 num_shadow_reg_cfg;

	struct cnss_shadow_reg_cfg *shadow_reg_cfg;

	u32 num_shadow_reg_v2_cfg;

	struct cnss_shadow_reg_v2_cfg *shadow_reg_v2_cfg;

};



enum cnss_driver_mode {