Commit 14c914fc authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-2020-10-02' of... 

Merge tag 'wireless-drivers-next-2020-10-02' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

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

Third set of patches for v5.10. Lots of iwlwifi patches this time, but
also few patches ath11k and of course smaller changes to other
drivers.

Major changes:

rtw88

* properly recover from firmware crashes on 8822c

* dump firmware crash log

iwlwifi

* protected Target Wake Time (TWT) implementation

* support disabling 5.8GHz channels via ACPI

* support VHT extended NSS capability

* enable Target Wake Time (TWT) by default

ath11k

* improvements to QCA6390 PCI support to make it more usable
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0c2a01dc 70442ee6

drivers/bcma/driver_pci_host.c

+2 −2
Original line number Diff line number Diff line
@@ -419,12 +419,12 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) 
	pc_host->pci_ops.read = bcma_core_pci_hostmode_read_config;

	pc_host->pci_ops.write = bcma_core_pci_hostmode_write_config;



	pc_host->mem_resource.name = "BCMA PCIcore external memory",

	pc_host->mem_resource.name = "BCMA PCIcore external memory";

	pc_host->mem_resource.start = BCMA_SOC_PCI_DMA;

	pc_host->mem_resource.end = BCMA_SOC_PCI_DMA + BCMA_SOC_PCI_DMA_SZ - 1;

	pc_host->mem_resource.flags = IORESOURCE_MEM | IORESOURCE_PCI_FIXED;



	pc_host->io_resource.name = "BCMA PCIcore external I/O",

	pc_host->io_resource.name = "BCMA PCIcore external I/O";

	pc_host->io_resource.start = 0x100;

	pc_host->io_resource.end = 0x7FF;

	pc_host->io_resource.flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED;

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

+80 −0
Original line number Diff line number Diff line
@@ -187,6 +187,26 @@ const struct ce_attr ath11k_host_ce_config_qca6390[] = { 


};



static bool ath11k_ce_need_shadow_fix(int ce_id)

{

	/* only ce4 needs shadow workaroud*/

	if (ce_id == 4)

		return true;

	return false;

}



static void ath11k_ce_stop_shadow_timers(struct ath11k_base *ab)

{

	int i;



	if (!ab->hw_params.supports_shadow_regs)

		return;



	for (i = 0; i < ab->hw_params.ce_count; i++)

		if (ath11k_ce_need_shadow_fix(i))

			ath11k_dp_shadow_stop_timer(ab, &ab->ce.hp_timer[i]);

}



static int ath11k_ce_rx_buf_enqueue_pipe(struct ath11k_ce_pipe *pipe,

					 struct sk_buff *skb, dma_addr_t paddr)

{
@@ -505,6 +525,12 @@ static int ath11k_ce_init_ring(struct ath11k_base *ab, 


	ce_ring->hal_ring_id = ret;



	if (ab->hw_params.supports_shadow_regs &&

	    ath11k_ce_need_shadow_fix(ce_id))

		ath11k_dp_shadow_init_timer(ab, &ab->ce.hp_timer[ce_id],

					    ATH11K_SHADOW_CTRL_TIMER_INTERVAL,

					    ce_ring->hal_ring_id);



	return 0;

}
@@ -677,6 +703,9 @@ int ath11k_ce_send(struct ath11k_base *ab, struct sk_buff *skb, u8 pipe_id, 


	ath11k_hal_srng_access_end(ab, srng);



	if (ath11k_ce_need_shadow_fix(pipe_id))

		ath11k_dp_shadow_start_timer(ab, srng, &ab->ce.hp_timer[pipe_id]);



	spin_unlock_bh(&srng->lock);



	spin_unlock_bh(&ab->ce.ce_lock);
@@ -713,11 +742,56 @@ static void ath11k_ce_rx_pipe_cleanup(struct ath11k_ce_pipe *pipe) 
	}

}



static void ath11k_ce_shadow_config(struct ath11k_base *ab)

{

	int i;



	for (i = 0; i < ab->hw_params.ce_count; i++) {

		if (ab->hw_params.host_ce_config[i].src_nentries)

			ath11k_hal_srng_update_shadow_config(ab,

							     HAL_CE_SRC, i);



		if (ab->hw_params.host_ce_config[i].dest_nentries) {

			ath11k_hal_srng_update_shadow_config(ab,

							     HAL_CE_DST, i);



			ath11k_hal_srng_update_shadow_config(ab,

							     HAL_CE_DST_STATUS, i);

		}

	}

}



void ath11k_ce_get_shadow_config(struct ath11k_base *ab,

				 u32 **shadow_cfg, u32 *shadow_cfg_len)

{

	if (!ab->hw_params.supports_shadow_regs)

		return;



	ath11k_hal_srng_get_shadow_config(ab, shadow_cfg, shadow_cfg_len);



	/* shadow is already configured */

	if (*shadow_cfg_len)

		return;



	/* shadow isn't configured yet, configure now.

	 * non-CE srngs are configured firstly, then

	 * all CE srngs.

	 */

	ath11k_hal_srng_shadow_config(ab);

	ath11k_ce_shadow_config(ab);



	/* get the shadow configuration */

	ath11k_hal_srng_get_shadow_config(ab, shadow_cfg, shadow_cfg_len);

}

EXPORT_SYMBOL(ath11k_ce_get_shadow_config);



void ath11k_ce_cleanup_pipes(struct ath11k_base *ab)

{

	struct ath11k_ce_pipe *pipe;

	int pipe_num;



	ath11k_ce_stop_shadow_timers(ab);



	for (pipe_num = 0; pipe_num < ab->hw_params.ce_count; pipe_num++) {

		pipe = &ab->ce.ce_pipe[pipe_num];

		ath11k_ce_rx_pipe_cleanup(pipe);
@@ -767,6 +841,9 @@ int ath11k_ce_init_pipes(struct ath11k_base *ab) 
	int i;

	int ret;



	ath11k_ce_get_shadow_config(ab, &ab->qmi.ce_cfg.shadow_reg_v2,

				    &ab->qmi.ce_cfg.shadow_reg_v2_len);



	for (i = 0; i < ab->hw_params.ce_count; i++) {

		pipe = &ab->ce.ce_pipe[i];
@@ -828,6 +905,9 @@ void ath11k_ce_free_pipes(struct ath11k_base *ab) 
	for (i = 0; i < ab->hw_params.ce_count; i++) {

		pipe = &ab->ce.ce_pipe[i];



		if (ath11k_ce_need_shadow_fix(i))

			ath11k_dp_shadow_stop_timer(ab, &ab->ce.hp_timer[i]);



		if (pipe->src_ring) {

			desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_SRC);

			dma_free_coherent(ab->dev,

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

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ struct ath11k_ce { 
	struct ath11k_ce_pipe ce_pipe[CE_COUNT_MAX];

	/* Protects rings of all ce pipes */

	spinlock_t ce_lock;

	struct ath11k_hp_update_timer hp_timer[CE_COUNT_MAX];

};



extern const struct ce_attr ath11k_host_ce_config_ipq8074[];
@@ -187,4 +188,6 @@ void ath11k_ce_poll_send_completed(struct ath11k_base *ab, u8 pipe_id); 
int ath11k_ce_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,

				  u8 *ul_pipe, u8 *dl_pipe);

int ath11k_ce_attr_attach(struct ath11k_base *ab);

void ath11k_ce_get_shadow_config(struct ath11k_base *ab,

				 u32 **shadow_cfg, u32 *shadow_cfg_len);

#endif

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

+21 −0
Original line number Diff line number Diff line
@@ -58,6 +58,13 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.htt_peer_map_v2 = true,

		.tcl_0_only = false,

		.spectral_fft_sz = 2,



		.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,

	},

	{

		.hw_rev = ATH11K_HW_IPQ6018_HW10,
@@ -88,6 +95,13 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.htt_peer_map_v2 = true,

		.tcl_0_only = false,

		.spectral_fft_sz = 4,



		.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,

	},

	{

		.name = "qca6390 hw2.0",
@@ -118,6 +132,12 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.htt_peer_map_v2 = false,

		.tcl_0_only = true,

		.spectral_fft_sz = 0,



		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP),

		.supports_monitor = false,

		.supports_shadow_regs = true,

		.idle_ps = true,

	},

};
@@ -398,6 +418,7 @@ static void ath11k_core_stop(struct ath11k_base *ab) 
{

	if (!test_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags))

		ath11k_qmi_firmware_stop(ab);



	ath11k_hif_stop(ab);

	ath11k_wmi_detach(ab);

	ath11k_dp_pdev_reo_cleanup(ab);

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

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 


extern unsigned int ath11k_frame_mode;



#define ATH11K_MON_TIMER_INTERVAL  10



enum ath11k_supported_bw {

	ATH11K_BW_20	= 0,

	ATH11K_BW_40	= 1,
@@ -727,6 +729,7 @@ struct ath11k_base { 
	struct ath11k_dbring_cap *db_caps;

	u32 num_db_cap;



	struct timer_list mon_reap_timer;

	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE