Commit 5b365af4 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v5.10. Major changes:

wcn36xx

* add support wcn3680 Wi-Fi 5 devices

ath11k

* spectral scan support for ipq6018
parents 225060c4 6a950755

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

+13 −5
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ static int ath10k_core_check_smbios(struct ath10k *ar) 
	return 0;

}



static int ath10k_core_check_dt(struct ath10k *ar)

int ath10k_core_check_dt(struct ath10k *ar)

{

	struct device_node *node;

	const char *variant = NULL;
@@ -1043,6 +1043,7 @@ static int ath10k_core_check_dt(struct ath10k *ar) 


	return 0;

}

EXPORT_SYMBOL(ath10k_core_check_dt);



static int ath10k_download_fw(struct ath10k *ar)

{
@@ -1437,6 +1438,13 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name, 
	}



	if (ar->id.qmi_ids_valid) {

		if (with_variant && ar->id.bdf_ext[0] != '\0')

			scnprintf(name, name_len,

				  "bus=%s,qmi-board-id=%x,qmi-chip-id=%x%s",

				  ath10k_bus_str(ar->hif.bus),

				  ar->id.qmi_board_id, ar->id.qmi_chip_id,

				  variant);

		else

			scnprintf(name, name_len,

				  "bus=%s,qmi-board-id=%x",

				  ath10k_bus_str(ar->hif.bus),

drivers/net/wireless/ath/ath10k/core.h

+2 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ struct ath10k { 
		bool bmi_ids_valid;

		bool qmi_ids_valid;

		u32 qmi_board_id;

		u32 qmi_chip_id;

		u8 bmi_board_id;

		u8 bmi_eboard_id;

		u8 bmi_chip_id;
@@ -1315,6 +1316,7 @@ int ath10k_core_register(struct ath10k *ar, 
			 const struct ath10k_bus_params *bus_params);

void ath10k_core_unregister(struct ath10k *ar);

int ath10k_core_fetch_board_file(struct ath10k *ar, int bd_ie_type);

int ath10k_core_check_dt(struct ath10k *ar);

void ath10k_core_free_board_files(struct ath10k *ar);



#endif /* _CORE_H_ */

drivers/net/wireless/ath/ath10k/qmi.c

+8 −0
Original line number Diff line number Diff line
@@ -576,6 +576,8 @@ static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi) 
	if (resp->chip_info_valid) {

		qmi->chip_info.chip_id = resp->chip_info.chip_id;

		qmi->chip_info.chip_family = resp->chip_info.chip_family;

	} else {

		qmi->chip_info.chip_id = 0xFF;

	}



	if (resp->board_info_valid)
@@ -817,12 +819,18 @@ static void ath10k_qmi_event_server_arrive(struct ath10k_qmi *qmi) 
static int ath10k_qmi_fetch_board_file(struct ath10k_qmi *qmi)

{

	struct ath10k *ar = qmi->ar;

	int ret;



	ar->hif.bus = ATH10K_BUS_SNOC;

	ar->id.qmi_ids_valid = true;

	ar->id.qmi_board_id = qmi->board_info.board_id;

	ar->id.qmi_chip_id = qmi->chip_info.chip_id;

	ar->hw_params.fw.dir = WCN3990_HW_1_0_FW_DIR;



	ret = ath10k_core_check_dt(ar);

	if (ret)

		ath10k_dbg(ar, ATH10K_DBG_QMI, "DT bdf variant name not set.\n");



	return ath10k_core_fetch_board_file(qmi->ar, ATH10K_BD_IE_BOARD);

}

drivers/net/wireless/ath/ath11k/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ath11k-y += core.o \ 
	    dbring.o \

	    hw.o



ath11k-$(CONFIG_ATH11K_DEBUGFS) += debug_htt_stats.o debugfs_sta.o

ath11k-$(CONFIG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o

ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o

ath11k-$(CONFIG_ATH11K_TRACING) += trace.o

ath11k-$(CONFIG_THERMAL) += thermal.o

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

+43 −6
Original line number Diff line number Diff line
@@ -323,9 +323,10 @@ static void ath11k_ahb_stop(struct ath11k_base *ab) 


static int ath11k_ahb_power_up(struct ath11k_base *ab)

{

	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);

	int ret;



	ret = rproc_boot(ab->tgt_rproc);

	ret = rproc_boot(ab_ahb->tgt_rproc);

	if (ret)

		ath11k_err(ab, "failed to boot the remote processor Q6\n");
@@ -334,7 +335,9 @@ static int ath11k_ahb_power_up(struct ath11k_base *ab) 


static void ath11k_ahb_power_down(struct ath11k_base *ab)

{

	rproc_shutdown(ab->tgt_rproc);

	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);



	rproc_shutdown(ab_ahb->tgt_rproc);

}



static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab)
@@ -600,6 +603,28 @@ static const struct ath11k_hif_ops ath11k_ahb_hif_ops = { 
	.power_up = ath11k_ahb_power_up,

};



static int ath11k_core_get_rproc(struct ath11k_base *ab)

{

	struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab);

	struct device *dev = ab->dev;

	struct rproc *prproc;

	phandle rproc_phandle;



	if (of_property_read_u32(dev->of_node, "qcom,rproc", &rproc_phandle)) {

		ath11k_err(ab, "failed to get q6_rproc handle\n");

		return -ENOENT;

	}



	prproc = rproc_get_by_phandle(rproc_phandle);

	if (!prproc) {

		ath11k_err(ab, "failed to get rproc\n");

		return -EINVAL;

	}

	ab_ahb->tgt_rproc = prproc;



	return 0;

}



static int ath11k_ahb_probe(struct platform_device *pdev)

{

	struct ath11k_base *ab;
@@ -626,7 +651,9 @@ static int ath11k_ahb_probe(struct platform_device *pdev) 
		return ret;

	}



	ab = ath11k_core_alloc(&pdev->dev, 0, ATH11K_BUS_AHB, &ath11k_ahb_bus_params);

	ab = ath11k_core_alloc(&pdev->dev, sizeof(struct ath11k_ahb),

			       ATH11K_BUS_AHB,

			       &ath11k_ahb_bus_params);

	if (!ab) {

		dev_err(&pdev->dev, "failed to allocate ath11k base\n");

		return -ENOMEM;
@@ -655,6 +682,12 @@ static int ath11k_ahb_probe(struct platform_device *pdev) 


	ath11k_ahb_init_qmi_ce_config(ab);



	ret = ath11k_core_get_rproc(ab);

	if (ret) {

		ath11k_err(ab, "failed to get rproc: %d\n", ret);

		goto err_ce_free;

	}



	ret = ath11k_core_init(ab);

	if (ret) {

		ath11k_err(ab, "failed to init core: %d\n", ret);
@@ -685,12 +718,16 @@ static int ath11k_ahb_probe(struct platform_device *pdev) 
static int ath11k_ahb_remove(struct platform_device *pdev)

{

	struct ath11k_base *ab = platform_get_drvdata(pdev);

	unsigned long left;



	reinit_completion(&ab->driver_recovery);



	if (test_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags))

		wait_for_completion_timeout(&ab->driver_recovery,

	if (test_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags)) {

		left = wait_for_completion_timeout(&ab->driver_recovery,

						   ATH11K_AHB_RECOVERY_TIMEOUT);

		if (!left)

			ath11k_warn(ab, "failed to receive recovery response completion\n");

	}



	set_bit(ATH11K_FLAG_UNREGISTERING, &ab->dev_flags);

	cancel_work_sync(&ab->restart_work);