Merge "UPSTREAM: ath10k: wmi: remove redundant integer fc" (4b6420eb) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+67 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA9887_HW_1_0_VERSION,
		@@ -97,6 +101,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA6174_HW_2_1_VERSION,
		@@ -119,6 +127,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA6174_HW_2_1_VERSION,
		@@ -141,6 +153,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA6174_HW_3_0_VERSION,
		@@ -163,6 +179,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA6174_HW_3_2_VERSION,
		@@ -188,6 +208,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA99X0_HW_2_0_DEV_VERSION,
		@@ -216,6 +240,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 4,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 11,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA9984_HW_1_0_DEV_VERSION,
		@@ -249,6 +277,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		*/
		.vht160_mcs_rx_highest = 1560,
		.vht160_mcs_tx_highest = 1560,
		.n_cipher_suites = 11,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA9888_HW_2_0_DEV_VERSION,
		@@ -281,6 +313,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		*/
		.vht160_mcs_rx_highest = 780,
		.vht160_mcs_tx_highest = 780,
		.n_cipher_suites = 11,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA9377_HW_1_0_DEV_VERSION,
		@@ -303,6 +339,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA9377_HW_1_1_DEV_VERSION,
		@@ -327,6 +367,10 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 0,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 8,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = QCA4019_HW_1_0_DEV_VERSION,
		@@ -356,6 +400,28 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
		.spectral_bin_discard = 4,
		.vht160_mcs_rx_highest = 0,
		.vht160_mcs_tx_highest = 0,
		.n_cipher_suites = 11,
		.num_peers = TARGET_TLV_NUM_PEERS,
		.ast_skid_limit = 0x10,
		.num_wds_entries = 0x20,
		},
		{
		.id = WCN3990_HW_1_0_DEV_VERSION,
		.dev_id = 0,
		.name = "wcn3990 hw1.0",
		.continuous_frag_desc = true,
		.tx_chain_mask = 0x7,
		.rx_chain_mask = 0x7,
		.max_spatial_stream = 4,
		.fw = {
		.dir = WCN3990_HW_1_0_FW_DIR,
		},
		.sw_decrypt_mcast_mgmt = true,
		.hw_ops = &wcn3990_ops,
		.decap_align_bytes = 1,
		.num_peers = TARGET_HL_10_TLV_NUM_PEERS,
		.ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT,
		.num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES,
		},
		};

		@@ -378,6 +444,7 @@ static const char *const ath10k_core_fw_feature_str[] = {
		[ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR] = "skip-null-func-war",
		[ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST] = "allows-mesh-bcast",
		[ATH10K_FW_FEATURE_NO_PS] = "no-ps",
		[ATH10K_FW_FEATURE_MGMT_TX_BY_REF] = "mgmt-tx-by-reference",
		};

		static unsigned int ath10k_core_get_fw_feature_str(char *buf,

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -613,6 +613,9 @@ enum ath10k_fw_features {
		/* Firmware does not support power save in station mode. */
		ATH10K_FW_FEATURE_NO_PS = 17,

		/* Firmware allows management tx by reference instead of by value. */
		ATH10K_FW_FEATURE_MGMT_TX_BY_REF = 18,

		/* keep last */
		ATH10K_FW_FEATURE_COUNT,
		};

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -926,3 +926,5 @@ const struct ath10k_hw_ops qca6174_ops = {
		.set_coverage_class = ath10k_hw_qca988x_set_coverage_class,
		.enable_pll_clk = ath10k_hw_qca6174_enable_pll_clock,
		};

		const struct ath10k_hw_ops wcn3990_ops = {};

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,10 @@ enum qca9377_chip_id_rev {
		#define QCA4019_HW_1_0_BOARD_DATA_FILE "board.bin"
		#define QCA4019_HW_1_0_PATCH_LOAD_ADDR 0x1234

		/* WCN3990 1.0 definitions */
		#define WCN3990_HW_1_0_DEV_VERSION ATH10K_HW_WCN3990
		#define WCN3990_HW_1_0_FW_DIR ATH10K_FW_DIR "/WCN3990/hw3.0"

		#define ATH10K_FW_FILE_BASE "firmware"
		#define ATH10K_FW_API_MAX 6
		#define ATH10K_FW_API_MIN 2
		@@ -550,6 +554,13 @@ struct ath10k_hw_params {
		*/
		int vht160_mcs_rx_highest;
		int vht160_mcs_tx_highest;

		/* Number of ciphers supported (i.e First N) in cipher_suites array */
		int n_cipher_suites;

		u32 num_peers;
		u32 ast_skid_limit;
		u32 num_wds_entries;
		};

		struct htt_rx_desc;
		@@ -564,6 +575,7 @@ struct ath10k_hw_ops {
		extern const struct ath10k_hw_ops qca988x_ops;
		extern const struct ath10k_hw_ops qca99x0_ops;
		extern const struct ath10k_hw_ops qca6174_ops;
		extern const struct ath10k_hw_ops wcn3990_ops;

		extern const struct ath10k_hw_clk_params qca6174_clk[];

		@@ -660,6 +672,11 @@ ath10k_rx_desc_get_l3_pad_bytes(struct ath10k_hw_params *hw,
		#define TARGET_TLV_NUM_MSDU_DESC (1024 + 32)
		#define TARGET_TLV_NUM_WOW_PATTERNS 22

		/* Target specific defines for WMI-HL-1.0 firmware */
		#define TARGET_HL_10_TLV_NUM_PEERS 14
		#define TARGET_HL_10_TLV_AST_SKID_LIMIT 6
		#define TARGET_HL_10_TLV_NUM_WDS_ENTRIES 2

		/* Diagnostic Window */
		#define CE_DIAG_PIPE 7

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

+41 −2

Original line number	Diff line number	Diff line
		@@ -242,6 +242,16 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
		case WLAN_CIPHER_SUITE_WEP104:
		arg.key_cipher = WMI_CIPHER_WEP;
		break;
		case WLAN_CIPHER_SUITE_CCMP_256:
		arg.key_cipher = WMI_CIPHER_AES_CCM;
		break;
		case WLAN_CIPHER_SUITE_GCMP:
		case WLAN_CIPHER_SUITE_GCMP_256:
		arg.key_cipher = WMI_CIPHER_AES_GCM;
		break;
		case WLAN_CIPHER_SUITE_BIP_GMAC_128:
		case WLAN_CIPHER_SUITE_BIP_GMAC_256:
		case WLAN_CIPHER_SUITE_BIP_CMAC_256:
		case WLAN_CIPHER_SUITE_AES_CMAC:
		WARN_ON(1);
		return -EINVAL;
		@@ -5737,7 +5747,10 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
		u32 flags2;

		/* this one needs to be done in software */
		if (key->cipher == WLAN_CIPHER_SUITE_AES_CMAC)
		if (key->cipher == WLAN_CIPHER_SUITE_AES_CMAC \|\|
		key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 \|\|
		key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256 \|\|
		key->cipher == WLAN_CIPHER_SUITE_BIP_CMAC_256)
		return 1;

		if (arvif->nohwcrypt)
		@@ -8159,7 +8172,22 @@ int ath10k_mac_register(struct ath10k *ar)
		WLAN_CIPHER_SUITE_WEP104,
		WLAN_CIPHER_SUITE_TKIP,
		WLAN_CIPHER_SUITE_CCMP,

		/* Do not add hardware supported ciphers before this line.
		* Allow software encryption for all chips. Don't forget to
		* update n_cipher_suites below.
		*/
		WLAN_CIPHER_SUITE_AES_CMAC,
		WLAN_CIPHER_SUITE_BIP_CMAC_256,
		WLAN_CIPHER_SUITE_BIP_GMAC_128,
		WLAN_CIPHER_SUITE_BIP_GMAC_256,

		/* Only QCA99x0 and QCA4019 varients support GCMP-128, GCMP-256
		* and CCMP-256 in hardware.
		*/
		WLAN_CIPHER_SUITE_GCMP,
		WLAN_CIPHER_SUITE_GCMP_256,
		WLAN_CIPHER_SUITE_CCMP_256,
		};
		struct ieee80211_supported_band *band;
		void *channels;
		@@ -8394,7 +8422,18 @@ int ath10k_mac_register(struct ath10k *ar)
		}

		ar->hw->wiphy->cipher_suites = cipher_suites;
		ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);

		/* QCA988x and QCA6174 family chips do not support CCMP-256, GCMP-128
		* and GCMP-256 ciphers in hardware. Fetch number of ciphers supported
		* from chip specific hw_param table.
		*/
		if (!ar->hw_params.n_cipher_suites \|\|
		ar->hw_params.n_cipher_suites > ARRAY_SIZE(cipher_suites)) {
		ath10k_err(ar, "invalid hw_params.n_cipher_suites %d\n",
		ar->hw_params.n_cipher_suites);
		ar->hw_params.n_cipher_suites = 8;
		}
		ar->hw->wiphy->n_cipher_suites = ar->hw_params.n_cipher_suites;

		wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);