Commit c5a3f56f authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'ath-next-20231215' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath 

ath.git patches for v6.8.

We have new features only for ath12k but lots of small cleanup for
ath10k, ath11k and ath12k. And of course smaller fixes to several
drivers.

Major changes:

ath12k

* support one MSI vector

* WCN7850: support AP mode
parents 40d51f70 fd6ed177

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2014,2016-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include "bmi.h"

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

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include "hif.h"

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

+17 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -100,6 +101,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA988X_HW_2_0_VERSION,
@@ -140,6 +142,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA9887_HW_1_0_VERSION,
@@ -181,6 +184,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -217,6 +221,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -257,6 +262,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -297,6 +303,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA6174_HW_3_0_VERSION,
@@ -337,6 +344,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -381,6 +389,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = true,

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -427,6 +436,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA9984_HW_1_0_DEV_VERSION,
@@ -480,6 +490,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA9888_HW_2_0_DEV_VERSION,
@@ -530,6 +541,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA9377_HW_1_0_DEV_VERSION,
@@ -570,6 +582,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -612,6 +625,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -645,6 +659,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = QCA4019_HW_1_0_DEV_VERSION,
@@ -692,6 +707,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = false,

		.use_fw_tx_credits = true,

		.delay_unmap_buffer = false,

		.mcast_frame_registration = false,

	},

	{

		.id = WCN3990_HW_1_0_DEV_VERSION,
@@ -725,6 +741,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_restart_disconnect = true,

		.use_fw_tx_credits = false,

		.delay_unmap_buffer = true,

		.mcast_frame_registration = false,

	},

};

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

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#ifndef _CORE_H_
@@ -607,7 +608,7 @@ struct ath10k_vif { 
			u8 tim_bitmap[64];

			u8 tim_len;

			u32 ssid_len;

			u8 ssid[IEEE80211_MAX_SSID_LEN];

			u8 ssid[IEEE80211_MAX_SSID_LEN] __nonstring;

			bool hidden_ssid;

			/* P2P_IE with NoA attribute for P2P_GO case */

			u32 noa_len;

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include "coredump.h"