Commit 43ed15e1 authored by Carl Huang's avatar Carl Huang Committed by Kalle Valo
Browse files

ath11k: put hw to DBS using WMI_PDEV_SET_HW_MODE_CMDID 



It's recommended to use wmi command WMI_PDEV_SET_HW_MODE_CMDID to put hardware
to dbs mode instead of wmi_init command. This fixes a few strange stability
issues.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by: default avatarCarl Huang <cjhuang@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1607609124-17250-3-git-send-email-kvalo@codeaurora.org
parent fc46e1b2

drivers/net/wireless/ath/ath11k/core.c

+9 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_ipq8074,

		.svc_to_ce_map_len = 21,

		.single_pdev_only = false,

		.needs_band_to_mac = true,

		.rxdma1_enable = true,

		.num_rxmda_per_pdev = 1,

		.rx_mac_buf_ring = false,
@@ -89,7 +88,6 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_ipq6018,

		.svc_to_ce_map_len = 19,

		.single_pdev_only = false,

		.needs_band_to_mac = true,

		.rxdma1_enable = true,

		.num_rxmda_per_pdev = 1,

		.rx_mac_buf_ring = false,
@@ -127,7 +125,6 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390,

		.svc_to_ce_map_len = 14,

		.single_pdev_only = true,

		.needs_band_to_mac = false,

		.rxdma1_enable = false,

		.num_rxmda_per_pdev = 2,

		.rx_mac_buf_ring = true,
@@ -646,6 +643,15 @@ static int ath11k_core_start(struct ath11k_base *ab, 
		goto err_reo_cleanup;

	}



	/* put hardware to DBS mode */

	if (ab->hw_params.single_pdev_only) {

		ret = ath11k_wmi_set_hw_mode(ab, WMI_HOST_HW_MODE_DBS);

		if (ret) {

			ath11k_err(ab, "failed to send dbs mode: %d\n", ret);

			goto err_hif_stop;

		}

	}



	ret = ath11k_dp_tx_htt_h2t_ver_req_msg(ab);

	if (ret) {

		ath11k_err(ab, "failed to send htt version request message: %d\n",

drivers/net/wireless/ath/ath11k/hw.h

+0 −6
Original line number Diff line number Diff line
@@ -143,12 +143,6 @@ struct ath11k_hw_params { 


	bool single_pdev_only;



	/* For example on QCA6390 struct

	 * wmi_init_cmd_param::band_to_mac_config needs to be false as the

	 * firmware creates the mapping.

	 */

	bool needs_band_to_mac;



	bool rxdma1_enable;

	int num_rxmda_per_pdev;

	bool rx_mac_buf_ring;

drivers/net/wireless/ath/ath11k/wmi.c

+34 −4
Original line number Diff line number Diff line
@@ -3479,6 +3479,35 @@ int ath11k_wmi_wait_for_unified_ready(struct ath11k_base *ab) 
	return 0;

}



int ath11k_wmi_set_hw_mode(struct ath11k_base *ab,

			   enum wmi_host_hw_mode_config_type mode)

{

	struct wmi_pdev_set_hw_mode_cmd_param *cmd;

	struct sk_buff *skb;

	struct ath11k_wmi_base *wmi_ab = &ab->wmi_ab;

	int len;

	int ret;



	len = sizeof(*cmd);



	skb = ath11k_wmi_alloc_skb(wmi_ab, len);

	cmd = (struct wmi_pdev_set_hw_mode_cmd_param *)skb->data;



	cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SET_HW_MODE_CMD) |

			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);



	cmd->pdev_id = WMI_PDEV_ID_SOC;

	cmd->hw_mode_index = mode;



	ret = ath11k_wmi_cmd_send(&wmi_ab->wmi[0], skb, WMI_PDEV_SET_HW_MODE_CMDID);

	if (ret) {

		ath11k_warn(ab, "failed to send WMI_PDEV_SET_HW_MODE_CMDID\n");

		dev_kfree_skb(skb);

	}



	return ret;

}



int ath11k_wmi_cmd_init(struct ath11k_base *ab)

{

	struct ath11k_wmi_base *wmi_sc = &ab->wmi_ab;
@@ -3497,10 +3526,11 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab) 
	init_param.hw_mode_id = wmi_sc->preferred_hw_mode;

	init_param.mem_chunks = wmi_sc->mem_chunks;



	if (ab->hw_params.needs_band_to_mac) {

	if (ab->hw_params.single_pdev_only)

		init_param.hw_mode_id = WMI_HOST_HW_MODE_MAX;



	init_param.num_band_to_mac = ab->num_radios;

	ath11k_fill_band_to_mac_param(ab, init_param.band_to_mac);

	}



	return ath11k_init_cmd_send(&wmi_sc->wmi[0], &init_param);

}

drivers/net/wireless/ath/ath11k/wmi.h

+3 −0
Original line number Diff line number Diff line
@@ -5171,4 +5171,7 @@ int ath11k_wmi_fils_discovery(struct ath11k *ar, u32 vdev_id, u32 interval, 
			      bool unsol_bcast_probe_resp_enabled);

int ath11k_wmi_probe_resp_tmpl(struct ath11k *ar, u32 vdev_id,

			       struct sk_buff *tmpl);

int ath11k_wmi_set_hw_mode(struct ath11k_base *ab,

			   enum wmi_host_hw_mode_config_type mode);



#endif