Merge tag 'for-linville-20140717' of git://github.com/kvalo/ath (5235cd21) · Commits · e / devices / android_kernel_xiaomi_markw

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -603,16 +603,19 @@ static int ath10k_ce_completed_send_next_nolock(struct ath10k_ce_pipe *ce_state,
		if (ret)
		return ret;

		src_ring->hw_index =
		ath10k_ce_src_ring_read_index_get(ar, ctrl_addr);
		src_ring->hw_index &= nentries_mask;
		read_index = ath10k_ce_src_ring_read_index_get(ar, ctrl_addr);
		if (read_index == 0xffffffff)
		return -ENODEV;

		read_index &= nentries_mask;
		src_ring->hw_index = read_index;

		ath10k_pci_sleep(ar);
		}

		read_index = src_ring->hw_index;

		if ((read_index == sw_index) \|\| (read_index == 0xffffffff))
		if (read_index == sw_index)
		return -EIO;

		sbase = src_ring->shadow_base;

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -802,7 +802,7 @@ int ath10k_core_start(struct ath10k *ar)

		INIT_LIST_HEAD(&ar->arvifs);

		if (!test_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags))
		if (!test_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags)) {
		ath10k_info("%s (0x%08x, 0x%08x) fw %s api %d htt %d.%d\n",
		ar->hw_params.name,
		ar->target_version,
		@@ -811,6 +811,12 @@ int ath10k_core_start(struct ath10k *ar)
		ar->fw_api,
		ar->htt.target_version_major,
		ar->htt.target_version_minor);
		ath10k_info("debug %d debugfs %d tracing %d dfs %d\n",
		config_enabled(CONFIG_ATH10K_DEBUG),
		config_enabled(CONFIG_ATH10K_DEBUGFS),
		config_enabled(CONFIG_ATH10K_TRACING),
		config_enabled(CONFIG_ATH10K_DFS_CERTIFIED));
		}

		__set_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags);

		@@ -988,7 +994,9 @@ err_unregister_mac:
		err_release_fw:
		ath10k_core_free_firmware_files(ar);
		err:
		device_release_driver(ar->dev);
		/* TODO: It's probably a good idea to release device from the driver
		* but calling device_release_driver() here will cause a deadlock.
		*/
		return;
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -290,6 +290,9 @@ struct ath10k_debug {
		struct ath_dfs_pool_stats dfs_pool_stats;

		u32 fw_dbglog_mask;

		u8 htt_max_amsdu;
		u8 htt_max_ampdu;
		};

		enum ath10k_state {

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

+73 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,72 @@ static const struct file_operations fops_htt_stats_mask = {
		.llseek = default_llseek,
		};

		static ssize_t ath10k_read_htt_max_amsdu_ampdu(struct file *file,
		char __user *user_buf,
		size_t count, loff_t *ppos)
		{
		struct ath10k *ar = file->private_data;
		char buf[64];
		u8 amsdu = 3, ampdu = 64;
		unsigned int len;

		mutex_lock(&ar->conf_mutex);

		if (ar->debug.htt_max_amsdu)
		amsdu = ar->debug.htt_max_amsdu;

		if (ar->debug.htt_max_ampdu)
		ampdu = ar->debug.htt_max_ampdu;

		mutex_unlock(&ar->conf_mutex);

		len = scnprintf(buf, sizeof(buf), "%u %u\n", amsdu, ampdu);

		return simple_read_from_buffer(user_buf, count, ppos, buf, len);
		}

		static ssize_t ath10k_write_htt_max_amsdu_ampdu(struct file *file,
		const char __user *user_buf,
		size_t count, loff_t *ppos)
		{
		struct ath10k *ar = file->private_data;
		int res;
		char buf[64];
		unsigned int amsdu, ampdu;

		simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);

		/* make sure that buf is null terminated */
		buf[sizeof(buf) - 1] = 0;

		res = sscanf(buf, "%u %u", &amsdu, &ampdu);

		if (res != 2)
		return -EINVAL;

		mutex_lock(&ar->conf_mutex);

		res = ath10k_htt_h2t_aggr_cfg_msg(&ar->htt, ampdu, amsdu);
		if (res)
		goto out;

		res = count;
		ar->debug.htt_max_amsdu = amsdu;
		ar->debug.htt_max_ampdu = ampdu;

		out:
		mutex_unlock(&ar->conf_mutex);
		return res;
		}

		static const struct file_operations fops_htt_max_amsdu_ampdu = {
		.read = ath10k_read_htt_max_amsdu_ampdu,
		.write = ath10k_write_htt_max_amsdu_ampdu,
		.open = simple_open,
		.owner = THIS_MODULE,
		.llseek = default_llseek,
		};

		static ssize_t ath10k_read_fw_dbglog(struct file *file,
		char __user *user_buf,
		size_t count, loff_t *ppos)
		@@ -757,6 +823,9 @@ void ath10k_debug_stop(struct ath10k *ar)
		* warning from del_timer(). */
		if (ar->debug.htt_stats_mask != 0)
		cancel_delayed_work(&ar->debug.htt_stats_dwork);

		ar->debug.htt_max_amsdu = 0;
		ar->debug.htt_max_ampdu = 0;
		}

		static ssize_t ath10k_write_simulate_radar(struct file *file,
		@@ -867,6 +936,10 @@ int ath10k_debug_create(struct ath10k *ar)
		debugfs_create_file("htt_stats_mask", S_IRUSR, ar->debug.debugfs_phy,
		ar, &fops_htt_stats_mask);

		debugfs_create_file("htt_max_amsdu_ampdu", S_IRUSR \| S_IWUSR,
		ar->debug.debugfs_phy, ar,
		&fops_htt_max_amsdu_ampdu);

		debugfs_create_file("fw_dbglog", S_IRUSR, ar->debug.debugfs_phy,
		ar, &fops_fw_dbglog);

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

+5 −8

Original line number	Diff line number	Diff line
		@@ -240,16 +240,10 @@ struct htt_oob_sync_req {
		__le16 rsvd0;
		} __packed;

		#define HTT_AGGR_CONF_MAX_NUM_AMSDU_SUBFRAMES_MASK 0x1F
		#define HTT_AGGR_CONF_MAX_NUM_AMSDU_SUBFRAMES_LSB 0

		struct htt_aggr_conf {
		u8 max_num_ampdu_subframes;
		union {
		/* dont use bitfields; undefined behaviour */
		u8 flags; /* see %HTT_AGGR_CONF_MAX_NUM_AMSDU_SUBFRAMES_ */
		u8 max_num_amsdu_subframes:5;
		} __packed;
		/* amsdu_subframes is limited by 0x1F mask */
		u8 max_num_amsdu_subframes;
		} __packed;

		#define HTT_MGMT_FRM_HDR_DOWNLOAD_LEN 32
		@@ -1343,6 +1337,9 @@ void ath10k_htt_t2h_msg_handler(struct ath10k ar, struct sk_buff skb);
		int ath10k_htt_h2t_ver_req_msg(struct ath10k_htt *htt);
		int ath10k_htt_h2t_stats_req(struct ath10k_htt *htt, u8 mask, u64 cookie);
		int ath10k_htt_send_rx_ring_cfg_ll(struct ath10k_htt *htt);
		int ath10k_htt_h2t_aggr_cfg_msg(struct ath10k_htt *htt,
		u8 max_subfrms_ampdu,
		u8 max_subfrms_amsdu);

		void __ath10k_htt_tx_dec_pending(struct ath10k_htt *htt);
		int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt);