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

Commit 0f641f04 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 294d2fb4 on remote branch 

Change-Id: Iea61b66a09fd8ddc1346a0a42f96c7f9d1435a0d
parents 6d175aec 294d2fb4

cfg/src/cfg.c

+6 −5
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ cfg_mac_item_handler(struct cfg_value_store *store, 
		return;



	cfg_err("%s=%s - Invalid format (status %d); Using default "

		QDF_MAC_ADDR_STR, meta->name, str_value, status,

		QDF_MAC_ADDR_ARRAY(store_value->bytes));

		QDF_MAC_ADDR_FMT, meta->name, str_value, status,

		QDF_MAC_ADDR_REF(store_value->bytes));

}



static __attribute__((unused)) void
@@ -539,7 +539,8 @@ cfg_store_print(struct wlan_objmgr_psoc *psoc) 


#undef __CFG_INI_MAC

#define __CFG_INI_MAC(id, mtype, ctype, name, desc, def...) \

	cfg_nofl_debug("%s %pM", name, (&store->values.id##_internal)->bytes);

	cfg_nofl_debug("%s "QDF_MAC_ADDR_FMT, name, \

	QDF_MAC_ADDR_REF((&store->values.id##_internal)->bytes));



#undef __CFG_INI_IPV4

#define __CFG_INI_IPV4(id, mtype, ctype, name, desc, def...) \
@@ -591,8 +592,8 @@ cfg_ini_config_print(struct wlan_objmgr_psoc *psoc, uint8_t *buf, 
#undef __CFG_INI_MAC

#define __CFG_INI_MAC(id, mtype, ctype, name, desc, def...) \

	do { \

		len = qdf_scnprintf(buf, buflen, "%s %pM\n", name, \

				    (&store->values.id##_internal)->bytes); \

		len = qdf_scnprintf(buf, buflen, "%s "QDF_MAC_ADDR_FMT"\n", name, \

				    QDF_MAC_ADDR_REF((&store->values.id##_internal)->bytes)); \

		buf += len; \

		buflen -= len; \

	} while (0);

dp/inc/cdp_txrx_ops.h

+22 −4
Original line number Diff line number Diff line
@@ -1098,12 +1098,30 @@ struct ol_if_ops { 
	enum QDF_GLOBAL_MODE (*get_con_mode)(void);

#ifdef QCA_PEER_MULTIQ_SUPPORT

	int (*peer_ast_flowid_map)(struct cdp_ctrl_objmgr_psoc *ol_soc_handle,

			       uint16_t peer_id, uint8_t vdev_id, uint8_t *peer_mac_addr);

				   uint16_t peer_id, uint8_t vdev_id,

				   uint8_t *peer_mac_addr);

#endif

#ifdef DP_MEM_PRE_ALLOC

	void *(*dp_prealloc_get_consistent)(uint32_t *size,

					    void **base_vaddr_unaligned,

					    qdf_dma_addr_t *paddr_unaligned,

					    qdf_dma_addr_t *paddr_aligned,

					    uint32_t align,

					    uint32_t ring_type);

	void (*dp_prealloc_put_consistent)(qdf_size_t size,

					   void *vaddr_unligned,

					   qdf_dma_addr_t paddr);

	void (*dp_get_multi_pages)(uint32_t desc_type,

				   size_t element_size,

				   uint16_t element_num,

				   struct qdf_mem_multi_page_t *pages,

				   bool cacheable);

	void (*dp_put_multi_pages)(uint32_t desc_type,

				   struct qdf_mem_multi_page_t *pages);

#endif

	/* TODO: Add any other control path calls required to OL_IF/WMA layer */



};





#ifdef DP_PEER_EXTENDED_API

/**

 * struct cdp_misc_ops - mcl ops not classified

dp/wifi3.0/dp_htt.c

+12 −6
Original line number Diff line number Diff line
@@ -1986,7 +1986,13 @@ void htt_t2h_stats_handler(void *context) 
	uint8_t done;

	uint32_t rem_stats;



	if (!soc || !qdf_atomic_read(&soc->cmn_init_done)) {

	if (!soc) {

		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,

			  "soc is NULL");

		return;

	}



	if (!qdf_atomic_read(&soc->cmn_init_done)) {

		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,

			  "soc: 0x%pK, init_done: %d", soc,

			  qdf_atomic_read(&soc->cmn_init_done));
@@ -3966,14 +3972,14 @@ static void dp_htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) 
			htc_pm_runtime_put(soc->htc_soc);

			soc->tgt_ver.major = HTT_VER_CONF_MAJOR_GET(*msg_word);

			soc->tgt_ver.minor = HTT_VER_CONF_MINOR_GET(*msg_word);

			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,

			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,

				"target uses HTT version %d.%d; host uses %d.%d",

				soc->tgt_ver.major, soc->tgt_ver.minor,

				HTT_CURRENT_VERSION_MAJOR,

				HTT_CURRENT_VERSION_MINOR);

			if (soc->tgt_ver.major != HTT_CURRENT_VERSION_MAJOR) {

				QDF_TRACE(QDF_MODULE_ID_TXRX,

					QDF_TRACE_LEVEL_ERROR,

					QDF_TRACE_LEVEL_WARN,

					"*** Incompatible host/target HTT versions!");

			}

			/* abort if the target is incompatible with the host */
@@ -3981,7 +3987,7 @@ static void dp_htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) 
				HTT_CURRENT_VERSION_MAJOR);

			if (soc->tgt_ver.minor != HTT_CURRENT_VERSION_MINOR) {

				QDF_TRACE(QDF_MODULE_ID_TXRX,

					QDF_TRACE_LEVEL_WARN,

					QDF_TRACE_LEVEL_INFO_LOW,

					"*** Warning: host/target HTT versions"

					" are different, though compatible!");

			}

dp/wifi3.0/dp_internal.h

+50 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include "dp_types.h"



#define RX_BUFFER_SIZE_PKTLOG_LITE 1024

/* Alignment for consistent memory for DP rings*/

#define DP_RING_BASE_ALIGN 8





#define DP_RSSI_INVAL 0x80
@@ -1613,6 +1615,11 @@ static inline QDF_STATUS dp_h2t_cfg_stats_msg_send(struct dp_pdev *pdev, 
	return 0;

}



static inline void

dp_pkt_log_init(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, void *scn)

{

}



static inline void

dp_hif_update_pipe_callback(struct dp_soc *dp_soc, void *cb_context,

			    QDF_STATUS (*callback)(void *, qdf_nbuf_t, uint8_t),
@@ -2101,4 +2108,47 @@ void dp_set_max_page_size(struct qdf_mem_multi_page_t *pages, 
}

#endif /* MAX_ALLOC_PAGE_SIZE */



#ifdef DP_MEM_PRE_ALLOC

void dp_desc_multi_pages_mem_alloc(struct dp_soc *soc,

				   enum dp_desc_type desc_type,

				   struct qdf_mem_multi_page_t *pages,

				   size_t element_size,

				   uint16_t element_num,

				   qdf_dma_context_t memctxt,

				   bool cacheable);



void dp_desc_multi_pages_mem_free(struct dp_soc *soc,

				  enum dp_desc_type desc_type,

				  struct qdf_mem_multi_page_t *pages,

				  qdf_dma_context_t memctxt,

				  bool cacheable);



#else

static inline

void dp_desc_multi_pages_mem_alloc(struct dp_soc *soc,

				   enum dp_desc_type desc_type,

				   struct qdf_mem_multi_page_t *pages,

				   size_t element_size,

				   uint16_t element_num,

				   qdf_dma_context_t memctxt,

				   bool cacheable)

{

	qdf_mem_multi_pages_alloc(soc->osdev, pages, element_size,

				  element_num, memctxt, cacheable);

}



static inline

void dp_desc_multi_pages_mem_free(struct dp_soc *soc,

				  enum dp_desc_type desc_type,

				  struct qdf_mem_multi_page_t *pages,

				  qdf_dma_context_t memctxt,

				  bool cacheable)

{

	qdf_mem_multi_pages_free(soc->osdev, pages,

				 memctxt, cacheable);

}



#endif





#endif /* #ifndef _DP_INTERNAL_H_ */

dp/wifi3.0/dp_ipa.c

+4 −3
Original line number Diff line number Diff line
@@ -1258,7 +1258,8 @@ QDF_STATUS dp_ipa_setup_iface(char *ifname, uint8_t *mac_addr, 
	struct dp_ipa_uc_tx_hdr uc_tx_hdr_v6;

	int ret = -EINVAL;



	dp_debug("Add Partial hdr: %s, %pM", ifname, mac_addr);

	dp_debug("Add Partial hdr: %s, "QDF_MAC_ADDR_FMT, ifname,

		 QDF_MAC_ADDR_REF(mac_addr));

	qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t));

	qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr);
@@ -1513,8 +1514,8 @@ QDF_STATUS dp_ipa_setup_iface(char *ifname, uint8_t *mac_addr, 
	int ret = -EINVAL;



	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,

		  "%s: Add Partial hdr: %s, %pM",

		  __func__, ifname, mac_addr);

		  "%s: Add Partial hdr: %s, "QDF_MAC_ADDR_FMT,

		  __func__, ifname, QDF_MAC_ADDR_REF(mac_addr));



	qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t));

	qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr);