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

Commit 8aaa878d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from ath.git 

Major changes:

ath10k:

* add QCA9377 support
* fw_stats support for 10.4 firmware

ath6kl:

* report antenna configuration to user space
* implement ethtool stats
parents 845da6e5 13eff531

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

+8 −49
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ int ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, 
{

	struct ath10k *ar = ce_state->ar;

	struct ath10k_ce_ring *src_ring = ce_state->src_ring;

	struct ce_desc *desc, *sdesc;

	struct ce_desc *desc, sdesc;

	unsigned int nentries_mask = src_ring->nentries_mask;

	unsigned int sw_index = src_ring->sw_index;

	unsigned int write_index = src_ring->write_index;
@@ -294,7 +294,6 @@ int ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, 


	desc = CE_SRC_RING_TO_DESC(src_ring->base_addr_owner_space,

				   write_index);

	sdesc = CE_SRC_RING_TO_DESC(src_ring->shadow_base, write_index);



	desc_flags |= SM(transfer_id, CE_DESC_FLAGS_META_DATA);
@@ -303,11 +302,11 @@ int ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, 
	if (flags & CE_SEND_FLAG_BYTE_SWAP)

		desc_flags |= CE_DESC_FLAGS_BYTE_SWAP;



	sdesc->addr   = __cpu_to_le32(buffer);

	sdesc->nbytes = __cpu_to_le16(nbytes);

	sdesc->flags  = __cpu_to_le16(desc_flags);

	sdesc.addr   = __cpu_to_le32(buffer);

	sdesc.nbytes = __cpu_to_le16(nbytes);

	sdesc.flags  = __cpu_to_le16(desc_flags);



	*desc = *sdesc;

	*desc = sdesc;



	src_ring->per_transfer_context[write_index] = per_transfer_context;
@@ -579,17 +578,13 @@ int ath10k_ce_revoke_recv_next(struct ath10k_ce_pipe *ce_state, 
 * The caller takes responsibility for any necessary locking.

 */

int ath10k_ce_completed_send_next_nolock(struct ath10k_ce_pipe *ce_state,

					 void **per_transfer_contextp,

					 u32 *bufferp,

					 unsigned int *nbytesp,

					 unsigned int *transfer_idp)

					 void **per_transfer_contextp)

{

	struct ath10k_ce_ring *src_ring = ce_state->src_ring;

	u32 ctrl_addr = ce_state->ctrl_addr;

	struct ath10k *ar = ce_state->ar;

	unsigned int nentries_mask = src_ring->nentries_mask;

	unsigned int sw_index = src_ring->sw_index;

	struct ce_desc *sdesc, *sbase;

	unsigned int read_index;



	if (src_ring->hw_index == sw_index) {
@@ -614,15 +609,6 @@ int ath10k_ce_completed_send_next_nolock(struct ath10k_ce_pipe *ce_state, 
	if (read_index == sw_index)

		return -EIO;



	sbase = src_ring->shadow_base;

	sdesc = CE_SRC_RING_TO_DESC(sbase, sw_index);



	/* Return data from completed source descriptor */

	*bufferp = __le32_to_cpu(sdesc->addr);

	*nbytesp = __le16_to_cpu(sdesc->nbytes);

	*transfer_idp = MS(__le16_to_cpu(sdesc->flags),

			   CE_DESC_FLAGS_META_DATA);



	if (per_transfer_contextp)

		*per_transfer_contextp =

			src_ring->per_transfer_context[sw_index];
@@ -697,10 +683,7 @@ int ath10k_ce_cancel_send_next(struct ath10k_ce_pipe *ce_state, 
}



int ath10k_ce_completed_send_next(struct ath10k_ce_pipe *ce_state,

				  void **per_transfer_contextp,

				  u32 *bufferp,

				  unsigned int *nbytesp,

				  unsigned int *transfer_idp)

				  void **per_transfer_contextp)

{

	struct ath10k *ar = ce_state->ar;

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
@@ -708,9 +691,7 @@ int ath10k_ce_completed_send_next(struct ath10k_ce_pipe *ce_state, 


	spin_lock_bh(&ar_pci->ce_lock);

	ret = ath10k_ce_completed_send_next_nolock(ce_state,

						   per_transfer_contextp,

						   bufferp, nbytesp,

						   transfer_idp);

						   per_transfer_contextp);

	spin_unlock_bh(&ar_pci->ce_lock);



	return ret;
@@ -940,27 +921,6 @@ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id, 
			src_ring->base_addr_ce_space_unaligned,

			CE_DESC_RING_ALIGN);



	/*

	 * Also allocate a shadow src ring in regular

	 * mem to use for faster access.

	 */

	src_ring->shadow_base_unaligned =

		kmalloc((nentries * sizeof(struct ce_desc) +

			 CE_DESC_RING_ALIGN), GFP_KERNEL);

	if (!src_ring->shadow_base_unaligned) {

		dma_free_coherent(ar->dev,

				  (nentries * sizeof(struct ce_desc) +

				   CE_DESC_RING_ALIGN),

				  src_ring->base_addr_owner_space,

				  src_ring->base_addr_ce_space);

		kfree(src_ring);

		return ERR_PTR(-ENOMEM);

	}



	src_ring->shadow_base = PTR_ALIGN(

			src_ring->shadow_base_unaligned,

			CE_DESC_RING_ALIGN);



	return src_ring;

}
@@ -1139,7 +1099,6 @@ void ath10k_ce_free_pipe(struct ath10k *ar, int ce_id) 
	struct ath10k_ce_pipe *ce_state = &ar_pci->ce_states[ce_id];



	if (ce_state->src_ring) {

		kfree(ce_state->src_ring->shadow_base_unaligned);

		dma_free_coherent(ar->dev,

				  (ce_state->src_ring->nentries *

				   sizeof(struct ce_desc) +

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

+2 −14
Original line number Diff line number Diff line
@@ -100,12 +100,6 @@ struct ath10k_ce_ring { 


	/* CE address space */

	u32 base_addr_ce_space;

	/*

	 * Start of shadow copy of descriptors, within regular memory.

	 * Aligned to descriptor-size boundary.

	 */

	void *shadow_base_unaligned;

	struct ce_desc *shadow_base;



	/* keep last */

	void *per_transfer_context[0];
@@ -192,16 +186,10 @@ int ath10k_ce_completed_recv_next(struct ath10k_ce_pipe *ce_state, 
 * Pops 1 completed send buffer from Source ring.

 */

int ath10k_ce_completed_send_next(struct ath10k_ce_pipe *ce_state,

				  void **per_transfer_contextp,

				  u32 *bufferp,

				  unsigned int *nbytesp,

				  unsigned int *transfer_idp);

				  void **per_transfer_contextp);



int ath10k_ce_completed_send_next_nolock(struct ath10k_ce_pipe *ce_state,

					 void **per_transfer_contextp,

					 u32 *bufferp,

					 unsigned int *nbytesp,

					 unsigned int *transfer_idp);

					 void **per_transfer_contextp);



/*==================CE Engine Initialization=======================*/

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

+19 −2
Original line number Diff line number Diff line
@@ -137,6 +137,21 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

		},

	},

	{

		.id = QCA9377_HW_1_0_DEV_VERSION,

		.name = "qca9377 hw1.0",

		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.otp_exe_param = 0,

		.fw = {

			.dir = QCA9377_HW_1_0_FW_DIR,

			.fw = QCA9377_HW_1_0_FW_FILE,

			.otp = QCA9377_HW_1_0_OTP_FILE,

			.board = QCA9377_HW_1_0_BOARD_DATA_FILE,

			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},

	},

};



static const char *const ath10k_core_fw_feature_str[] = {
@@ -151,6 +166,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING] = "no-4addr-pad",

	[ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT] = "skip-clock-init",

	[ATH10K_FW_FEATURE_RAW_MODE_SUPPORT] = "raw-mode",

	[ATH10K_FW_FEATURE_SUPPORTS_ADAPTIVE_CCA] = "adaptive-cca",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,
@@ -568,8 +584,8 @@ static int ath10k_download_fw(struct ath10k *ar, enum ath10k_firmware_mode mode) 
		}

		break;

	case ATH10K_FIRMWARE_MODE_UTF:

		data = ar->testmode.utf->data;

		data_len = ar->testmode.utf->size;

		data = ar->testmode.utf_firmware_data;

		data_len = ar->testmode.utf_firmware_len;

		mode_name = "utf";

		break;

	default:
@@ -1900,6 +1916,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 
		ar->hw_values = &qca988x_values;

		break;

	case ATH10K_HW_QCA6174:

	case ATH10K_HW_QCA9377:

		ar->regs = &qca6174_regs;

		ar->hw_values = &qca6174_values;

		break;

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

+19 −3
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ struct ath10k_fw_stats_pdev { 
	s32 hw_queued;

	s32 hw_reaped;

	s32 underrun;

	u32 hw_paused;

	s32 tx_abort;

	s32 mpdus_requed;

	u32 tx_ko;
@@ -226,6 +227,16 @@ struct ath10k_fw_stats_pdev { 
	u32 pdev_resets;

	u32 phy_underrun;

	u32 txop_ovf;

	u32 seq_posted;

	u32 seq_failed_queueing;

	u32 seq_completed;

	u32 seq_restarted;

	u32 mu_seq_posted;

	u32 mpdus_sw_flush;

	u32 mpdus_hw_filter;

	u32 mpdus_truncated;

	u32 mpdus_ack_failed;

	u32 mpdus_expired;



	/* PDEV RX stats */

	s32 mid_ppdu_route_change;
@@ -242,6 +253,7 @@ struct ath10k_fw_stats_pdev { 
	s32 phy_errs;

	s32 phy_err_drop;

	s32 mpdu_errs;

	s32 rx_ovfl_errs;

};



struct ath10k_fw_stats {
@@ -497,6 +509,9 @@ enum ath10k_fw_features { 
	 */

	ATH10K_FW_FEATURE_RAW_MODE_SUPPORT = 10,



	/* Firmware Supports Adaptive CCA*/

	ATH10K_FW_FEATURE_SUPPORTS_ADAPTIVE_CCA = 11,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};
@@ -730,8 +745,6 @@ struct ath10k { 
	int num_started_vdevs;



	/* Protected by conf-mutex */

	u8 supp_tx_chainmask;

	u8 supp_rx_chainmask;

	u8 cfg_tx_chainmask;

	u8 cfg_rx_chainmask;
@@ -814,9 +827,12 @@ struct ath10k { 
	struct {

		/* protected by conf_mutex */

		const struct firmware *utf;

		char utf_version[32];

		const void *utf_firmware_data;

		size_t utf_firmware_len;

		DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT);

		enum ath10k_fw_wmi_op_version orig_wmi_op_version;



		enum ath10k_fw_wmi_op_version op_version;

		/* protected by data_lock */

		bool utf_monitor;

	} testmode;

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

+12 −0
Original line number Diff line number Diff line
@@ -84,6 +84,15 @@ enum qca6174_chip_id_rev { 
#define QCA99X0_HW_2_0_BOARD_DATA_FILE "board.bin"

#define QCA99X0_HW_2_0_PATCH_LOAD_ADDR	0x1234



/* QCA9377 1.0 definitions */

#define QCA9377_HW_1_0_DEV_VERSION     0x05020001

#define QCA9377_HW_1_0_CHIP_ID_REV     0x1

#define QCA9377_HW_1_0_FW_DIR          ATH10K_FW_DIR "/QCA9377/hw1.0"

#define QCA9377_HW_1_0_FW_FILE         "firmware.bin"

#define QCA9377_HW_1_0_OTP_FILE        "otp.bin"

#define QCA9377_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA9377_HW_1_0_PATCH_LOAD_ADDR	0x1234



#define ATH10K_FW_API2_FILE		"firmware-2.bin"

#define ATH10K_FW_API3_FILE		"firmware-3.bin"
@@ -94,6 +103,7 @@ enum qca6174_chip_id_rev { 
#define ATH10K_FW_API5_FILE		"firmware-5.bin"



#define ATH10K_FW_UTF_FILE		"utf.bin"

#define ATH10K_FW_UTF_API2_FILE		"utf-2.bin"



/* includes also the null byte */

#define ATH10K_FIRMWARE_MAGIC               "QCA-ATH10K"
@@ -176,6 +186,7 @@ enum ath10k_hw_rev { 
	ATH10K_HW_QCA988X,

	ATH10K_HW_QCA6174,

	ATH10K_HW_QCA99X0,

	ATH10K_HW_QCA9377,

};



struct ath10k_hw_regs {
@@ -228,6 +239,7 @@ void ath10k_hw_fill_survey_time(struct ath10k *ar, struct survey_info *survey, 
#define QCA_REV_988X(ar) ((ar)->hw_rev == ATH10K_HW_QCA988X)

#define QCA_REV_6174(ar) ((ar)->hw_rev == ATH10K_HW_QCA6174)

#define QCA_REV_99X0(ar) ((ar)->hw_rev == ATH10K_HW_QCA99X0)

#define QCA_REV_9377(ar) ((ar)->hw_rev == ATH10K_HW_QCA9377)



/* Known pecularities:

 *  - raw appears in nwifi decap, raw and nwifi appear in ethernet decap