Commit 5fff4c14 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-2021-04-13' of... 

Merge tag 'wireless-drivers-next-2021-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.13

First set of patches for v5.13. I have been offline for a couple of
and I have a smaller pull request this time. The next one will be
bigger. Nothing really special standing out.

ath11k

* add initial support for QCN9074, but not enabled yet due to firmware problems

* enable radar detection for 160MHz secondary segment

* handle beacon misses in station mode

rtw88

* 8822c: support firmware crash dump

mt7601u

* enable TDLS support
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8ef7adc6 fa9f5d0e

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

+20 −9
Original line number Diff line number Diff line
@@ -1759,17 +1759,11 @@ static int ath10k_snoc_probe(struct platform_device *pdev) 
	return ret;

}



static int ath10k_snoc_remove(struct platform_device *pdev)

static int ath10k_snoc_free_resources(struct ath10k *ar)

{

	struct ath10k *ar = platform_get_drvdata(pdev);

	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);



	ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc remove\n");



	reinit_completion(&ar->driver_recovery);



	if (test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags))

		wait_for_completion_timeout(&ar->driver_recovery, 3 * HZ);

	ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc free resources\n");



	set_bit(ATH10K_SNOC_FLAG_UNREGISTERING, &ar_snoc->flags);
@@ -1783,12 +1777,29 @@ static int ath10k_snoc_remove(struct platform_device *pdev) 
	return 0;

}



static int ath10k_snoc_remove(struct platform_device *pdev)

{

	struct ath10k *ar = platform_get_drvdata(pdev);

	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);



	ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc remove\n");



	reinit_completion(&ar->driver_recovery);



	if (test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags))

		wait_for_completion_timeout(&ar->driver_recovery, 3 * HZ);



	ath10k_snoc_free_resources(ar);



	return 0;

}



static void ath10k_snoc_shutdown(struct platform_device *pdev)

{

	struct ath10k *ar = platform_get_drvdata(pdev);



	ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc shutdown\n");

	ath10k_snoc_remove(pdev);

	ath10k_snoc_free_resources(ar);

}



static struct platform_driver ath10k_snoc_driver = {

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

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab) 
	cfg->tgt_ce = ab->hw_params.target_ce_config;

	cfg->svc_to_ce_map_len = ab->hw_params.svc_to_ce_map_len;

	cfg->svc_to_ce_map = ab->hw_params.svc_to_ce_map;

	ab->qmi.service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074;

	ab->qmi.service_ins_id = ab->hw_params.qmi_service_ins_id;

}



static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab)

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

+56 −2
Original line number Diff line number Diff line
@@ -187,6 +187,59 @@ const struct ce_attr ath11k_host_ce_config_qca6390[] = { 


};



const struct ce_attr ath11k_host_ce_config_qcn9074[] = {

	/* CE0: host->target HTC control and raw streams */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 16,

		.src_sz_max = 2048,

		.dest_nentries = 0,

	},



	/* CE1: target->host HTT + HTC control */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 0,

		.src_sz_max = 2048,

		.dest_nentries = 512,

		.recv_cb = ath11k_htc_rx_completion_handler,

	},



	/* CE2: target->host WMI */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 0,

		.src_sz_max = 2048,

		.dest_nentries = 32,

		.recv_cb = ath11k_htc_rx_completion_handler,

	},



	/* CE3: host->target WMI (mac0) */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 32,

		.src_sz_max = 2048,

		.dest_nentries = 0,

	},



	/* CE4: host->target HTT */

	{

		.flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,

		.src_nentries = 2048,

		.src_sz_max = 256,

		.dest_nentries = 0,

	},



	/* CE5: target->host pktlog */

	{

		.flags = CE_ATTR_FLAGS,

		.src_nentries = 0,

		.src_sz_max = 2048,

		.dest_nentries = 512,

		.recv_cb = ath11k_dp_htt_htc_t2h_msg_handler,

	},

};



static bool ath11k_ce_need_shadow_fix(int ce_id)

{

	/* only ce4 needs shadow workaroud*/
@@ -455,7 +508,7 @@ static void ath11k_ce_srng_msi_ring_params_setup(struct ath11k_base *ab, u32 ce_ 
						 struct hal_srng_params *ring_params)

{

	u32 msi_data_start;

	u32 msi_data_count;

	u32 msi_data_count, msi_data_idx;

	u32 msi_irq_start;

	u32 addr_lo;

	u32 addr_hi;
@@ -469,10 +522,11 @@ static void ath11k_ce_srng_msi_ring_params_setup(struct ath11k_base *ab, u32 ce_ 
		return;



	ath11k_get_msi_address(ab, &addr_lo, &addr_hi);

	ath11k_get_ce_msi_idx(ab, ce_id, &msi_data_idx);



	ring_params->msi_addr = addr_lo;

	ring_params->msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) << 32);

	ring_params->msi_data = (ce_id % msi_data_count) + msi_data_start;

	ring_params->msi_data = (msi_data_idx % msi_data_count) + msi_data_start;

	ring_params->flags |= HAL_SRNG_FLAGS_MSI_INTR;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct ath11k_ce { 


extern const struct ce_attr ath11k_host_ce_config_ipq8074[];

extern const struct ce_attr ath11k_host_ce_config_qca6390[];

extern const struct ce_attr ath11k_host_ce_config_qcn9074[];



void ath11k_ce_cleanup_pipes(struct ath11k_base *ab);

void ath11k_ce_rx_replenish_retry(struct timer_list *t);

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

+44 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_ipq8074,

		.internal_sleep_clock = false,

		.regs = &ipq8074_regs,

		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074,

		.host_ce_config = ath11k_host_ce_config_ipq8074,

		.ce_count = 12,

		.target_ce_config = ath11k_target_ce_config_wlan_ipq8074,
@@ -68,6 +69,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.idle_ps = false,

		.cold_boot_calib = true,

		.supports_suspend = false,

		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

	},

	{

		.hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -83,6 +85,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_ipq8074,

		.internal_sleep_clock = false,

		.regs = &ipq8074_regs,

		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074,

		.host_ce_config = ath11k_host_ce_config_ipq8074,

		.ce_count = 12,

		.target_ce_config = ath11k_target_ce_config_wlan_ipq8074,
@@ -106,6 +109,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.idle_ps = false,

		.cold_boot_calib = true,

		.supports_suspend = false,

		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

	},

	{

		.name = "qca6390 hw2.0",
@@ -121,6 +125,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.ring_mask = &ath11k_hw_ring_mask_qca6390,

		.internal_sleep_clock = true,

		.regs = &qca6390_regs,

		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390,

		.host_ce_config = ath11k_host_ce_config_qca6390,

		.ce_count = 9,

		.target_ce_config = ath11k_target_ce_config_wlan_qca6390,
@@ -143,6 +148,44 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.idle_ps = true,

		.cold_boot_calib = false,

		.supports_suspend = true,

		.hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074),

	},

	{

		.name = "qcn9074 hw1.0",

		.hw_rev = ATH11K_HW_QCN9074_HW10,

		.fw = {

			.dir = "QCN9074/hw1.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

		},

		.max_radios = 1,

		.single_pdev_only = false,

		.qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9074,

		.hw_ops = &qcn9074_ops,

		.ring_mask = &ath11k_hw_ring_mask_qcn9074,

		.internal_sleep_clock = false,

		.regs = &qcn9074_regs,

		.host_ce_config = ath11k_host_ce_config_qcn9074,

		.ce_count = 6,

		.target_ce_config = ath11k_target_ce_config_wlan_qcn9074,

		.target_ce_count = 9,

		.svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qcn9074,

		.svc_to_ce_map_len = 18,

		.rxdma1_enable = true,

		.num_rxmda_per_pdev = 1,

		.rx_mac_buf_ring = false,

		.vdev_start_delay = false,

		.htt_peer_map_v2 = true,

		.tcl_0_only = false,

		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP) |

					BIT(NL80211_IFTYPE_MESH_POINT),

		.supports_monitor = true,

		.supports_shadow_regs = false,

		.idle_ps = false,

		.cold_boot_calib = false,

		.supports_suspend = false,

		.hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074),

	},

};
@@ -974,7 +1017,7 @@ static int ath11k_init_hw_params(struct ath11k_base *ab) 


	ab->hw_params = *hw_params;



	ath11k_dbg(ab, ATH11K_DBG_BOOT, "Hardware name %s\n", ab->hw_params.name);

	ath11k_info(ab, "%s\n", ab->hw_params.name);



	return 0;

}