Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a63b04e 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 4.15. Major changes:

ath10k

* add support for CCMP-256, GCMP and GCMP-256 ciphers on hardware
  there it's supported (QCA99x0 and QCA4019)
parents 1d1aa8f1 0a590a38

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

+13 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 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,

	},

	{

		.id = QCA9887_HW_1_0_VERSION,
@@ -97,6 +98,7 @@ 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,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -119,6 +121,7 @@ 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,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -141,6 +144,7 @@ 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,

	},

	{

		.id = QCA6174_HW_3_0_VERSION,
@@ -163,6 +167,7 @@ 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,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -188,6 +193,7 @@ 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,

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -216,6 +222,7 @@ 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,

	},

	{

		.id = QCA9984_HW_1_0_DEV_VERSION,
@@ -249,6 +256,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		 */

		.vht160_mcs_rx_highest = 1560,

		.vht160_mcs_tx_highest = 1560,

		.n_cipher_suites = 11,

	},

	{

		.id = QCA9888_HW_2_0_DEV_VERSION,
@@ -281,6 +289,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		 */

		.vht160_mcs_rx_highest = 780,

		.vht160_mcs_tx_highest = 780,

		.n_cipher_suites = 11,

	},

	{

		.id = QCA9377_HW_1_0_DEV_VERSION,
@@ -303,6 +312,7 @@ 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,

	},

	{

		.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -327,6 +337,7 @@ 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,

	},

	{

		.id = QCA4019_HW_1_0_DEV_VERSION,
@@ -356,6 +367,7 @@ 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,

	},

};
@@ -377,6 +389,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_BTCOEX_PARAM] = "btcoex-param",

	[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",

};



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
@@ -612,6 +612,9 @@ enum ath10k_fw_features { 
	 */

	ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST = 16,



	/* Firmware does not support power save in station mode. */

	ATH10K_FW_FEATURE_NO_PS = 17,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};

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

+9 −4
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_dst_ring = { 
	.wm_high	= &wcn3990_dst_wm_high,

};



struct ath10k_hw_ce_regs wcn3990_ce_regs = {

const struct ath10k_hw_ce_regs wcn3990_ce_regs = {

	.sr_base_addr		= 0x00000000,

	.sr_size_addr		= 0x00000008,

	.dr_base_addr		= 0x0000000c,
@@ -457,7 +457,7 @@ static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = { 
	.wm_high	= &qcax_dst_wm_high,

};



struct ath10k_hw_ce_regs qcax_ce_regs = {

const struct ath10k_hw_ce_regs qcax_ce_regs = {

	.sr_base_addr		= 0x00000000,

	.sr_size_addr		= 0x00000004,

	.dr_base_addr		= 0x00000008,
@@ -604,8 +604,13 @@ static void ath10k_hw_qca988x_set_coverage_class(struct ath10k *ar, 


	/* Only modify registers if the core is started. */

	if ((ar->state != ATH10K_STATE_ON) &&

	    (ar->state != ATH10K_STATE_RESTARTED))

	    (ar->state != ATH10K_STATE_RESTARTED)) {

		spin_lock_bh(&ar->data_lock);

		/* Store config value for when radio boots up */

		ar->fw_coverage.coverage_class = value;

		spin_unlock_bh(&ar->data_lock);

		goto unlock;

	}



	/* Retrieve the current values of the two registers that need to be

	 * adjusted.
@@ -637,7 +642,7 @@ static void ath10k_hw_qca988x_set_coverage_class(struct ath10k *ar, 
		ar->fw_coverage.reg_ack_cts_timeout_orig = timeout_reg;

	ar->fw_coverage.reg_phyclk = phyclk_reg;



	/* Calculat new value based on the (original) firmware calculation. */

	/* Calculate new value based on the (original) firmware calculation. */

	slottime_reg = ar->fw_coverage.reg_slottime_orig;

	timeout_reg = ar->fw_coverage.reg_ack_cts_timeout_orig;

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

+5 −2
Original line number Diff line number Diff line
@@ -369,8 +369,8 @@ extern const struct ath10k_hw_values qca99x0_values; 
extern const struct ath10k_hw_values qca9888_values;

extern const struct ath10k_hw_values qca4019_values;

extern const struct ath10k_hw_values wcn3990_values;

extern struct ath10k_hw_ce_regs wcn3990_ce_regs;

extern struct ath10k_hw_ce_regs qcax_ce_regs;

extern const struct ath10k_hw_ce_regs wcn3990_ce_regs;

extern const struct ath10k_hw_ce_regs qcax_ce_regs;



void ath10k_hw_fill_survey_time(struct ath10k *ar, struct survey_info *survey,

				u32 cc, u32 rcc, u32 cc_prev, u32 rcc_prev);
@@ -550,6 +550,9 @@ 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;

};



struct htt_rx_desc;

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

+48 −4
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;
@@ -5723,7 +5733,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)
@@ -8074,7 +8087,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;
@@ -8146,8 +8174,13 @@ int ath10k_mac_register(struct ath10k *ar) 
			BIT(NL80211_IFTYPE_P2P_GO);



	ieee80211_hw_set(ar->hw, SIGNAL_DBM);



	if (!test_bit(ATH10K_FW_FEATURE_NO_PS,

		      ar->running_fw->fw_file.fw_features)) {

		ieee80211_hw_set(ar->hw, SUPPORTS_PS);

		ieee80211_hw_set(ar->hw, SUPPORTS_DYNAMIC_PS);

	}



	ieee80211_hw_set(ar->hw, MFP_CAPABLE);

	ieee80211_hw_set(ar->hw, REPORTS_TX_ACK_STATUS);

	ieee80211_hw_set(ar->hw, HAS_RATE_CONTROL);
@@ -8313,7 +8346,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);