qcacmn: construct shadow v2 config

In this change, hif requests hal construct the shadow register
configuration for all the necessary datapath rings.  Then hif
requests hal append the configuration for the srng rings used
by the host copy engine module.  When constructing the shadow
register configuration, the hal makes note to use the shadow
register addresses instead of the actual addresses.

Change-Id: Ide8f523dece0d1dc6eb05f4c86739ece7909c25a
CRs-Fixed: 1113131

hal/wifi3.0/hal_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -129,6 +129,39 @@ struct hal_srng_params {
 	uint8_t ring_id;
 };
 
+/* hal_construct_shadow_config() - initialize the shadow registers for dp rings
+ * @hal_soc: hal handle
+ *
+ * Return: QDF_STATUS_OK on success
+ */
+extern QDF_STATUS hal_construct_shadow_config(void *hal_soc);
+
+/* hal_set_one_shadow_config() - add a config for the specified ring
+ * @hal_soc: hal handle
+ * @ring_type: ring type
+ * @ring_num: ring num
+ *
+ * The ring type and ring num uniquely specify the ring.  After this call,
+ * the hp/tp will be added as the next entry int the shadow register
+ * configuration table.  The hal code will use the shadow register address
+ * in place of the hp/tp address.
+ *
+ * This function is exposed, so that the CE module can skip configuring shadow
+ * registers for unused ring and rings assigned to the firmware.
+ *
+ * Return: QDF_STATUS_OK on success
+ */
+extern QDF_STATUS hal_set_one_shadow_config(void *hal_soc, int ring_type,
+					    int ring_num);
+/**
+ * hal_get_shadow_config() - retrieve the config table
+ * @hal_soc: hal handle
+ * @shadow_config: will point to the table after
+ * @num_shadow_registers_configured: will contain the number of valid entries
+ */
+extern void hal_get_shadow_config(void *hal_soc,
+				  struct pld_shadow_reg_v2_cfg **shadow_config,
+				  int *num_shadow_registers_configured);
 /**
  * hal_srng_setup - Initalize HW SRNG ring.
  *

hal/wifi3.0/hal_internal.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -60,6 +60,7 @@
 #include "rx_attention.h"
 #include "tx_msdu_extension.h"
 #include "wcss_version.h"
+#include "pld_common.h"
 
 /* TBD: This should be movded to shared HW header file */
 enum hal_srng_ring_id {
@@ -278,6 +279,10 @@ struct hal_hw_srng_config {
 	enum hal_srng_dir ring_dir;
 };
 
+/* calculate the register address offset from bar0 of shadow register x */
+#define SHADOW_REGISTER(x) (0x00003024 + (4*x))
+#define MAX_SHADOW_REGISTERS 36
+
 /**
  * HAL context to be used to access SRNG APIs (currently used by data path
  * and transport (CE) modules)
@@ -308,6 +313,10 @@ struct hal_soc {
 	/* REO blocking resource index */
 	uint8_t reo_res_bitmap;
 	uint8_t index;
+
+	/* shadow register configuration */
+	struct pld_shadow_reg_v2_cfg shadow_config[MAX_SHADOW_REGISTERS];
+	int num_shadow_registers_configured;
 };
 
 /* TODO: Check if the following can be provided directly by HW headers */

hal/wifi3.0/hal_srng.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -27,6 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "pld_common.h"
 #include "hal_api.h"
 #include "wcss_version.h"
 
@@ -166,7 +167,6 @@
  * and hence need to be attached with hal_soc based on HW type
  */
 #define HAL_SRNG_CONFIG(_hal_soc, _ring_type) (&hw_srng_table[_ring_type])
-
 static struct hal_hw_srng_config hw_srng_table[] = {
 	/* TODO: max_rings can populated by querying HW capabilities */
 	{ /* REO_DST */
@@ -485,6 +485,146 @@ static struct hal_hw_srng_config hw_srng_table[] = {
 	},
 };
 
+/**
+ * hal_get_srng_ring_id() - get the ring id of a descriped ring
+ * @hal: hal_soc data structure
+ * @ring_type: type enum describing the ring
+ * @ring_num: which ring of the ring type
+ * @mac_id: which mac does the ring belong to (or 0 for non-lmac rings)
+ *
+ * Return: the ring id or -EINVAL if the ring does not exist.
+ */
+static int hal_get_srng_ring_id(struct hal_soc *hal, int ring_type,
+				int ring_num, int mac_id)
+{
+	struct hal_hw_srng_config *ring_config =
+		HAL_SRNG_CONFIG(hal, ring_type);
+	int ring_id;
+
+	if (ring_num >= ring_config->max_rings) {
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
+			"%s: ring_num exceeded maximum no. of supported rings\n",
+			__func__);
+		return -EINVAL;
+	}
+
+	if (ring_config->lmac_ring) {
+		ring_id = ring_config->start_ring_id + ring_num +
+			(mac_id * HAL_MAX_RINGS_PER_LMAC);
+	} else {
+		ring_id = ring_config->start_ring_id + ring_num;
+	}
+
+	return ring_id;
+}
+
+static struct hal_srng *hal_get_srng(struct hal_soc *hal, int ring_id)
+{
+	/* TODO: Should we allocate srng structures dynamically? */
+	return &(hal->srng_list[ring_id]);
+}
+
+#define HP_OFFSET_IN_REG_START 1
+#define OFFSET_FROM_HP_TO_TP 4
+static void hal_update_srng_hp_tp_address(void *hal_soc,
+					  int shadow_config_index,
+					  int ring_type,
+					  int ring_num)
+{
+	struct hal_srng *srng;
+	struct hal_soc *hal = (struct hal_soc *)hal_soc;
+	int ring_id;
+
+	ring_id = hal_get_srng_ring_id(hal_soc, ring_type, ring_num, 0);
+	if (ring_id < 0)
+		return;
+
+	srng = hal_get_srng(hal_soc, ring_id);
+
+	if (srng->ring_dir == HAL_SRNG_DST_RING)
+		srng->u.dst_ring.tp_addr = SHADOW_REGISTER(shadow_config_index)
+			+ hal->dev_base_addr;
+	else
+		srng->u.src_ring.hp_addr = SHADOW_REGISTER(shadow_config_index)
+			+ hal->dev_base_addr;
+}
+
+QDF_STATUS hal_set_one_shadow_config(void *hal_soc,
+				      int ring_type,
+				      int ring_num)
+{
+	uint32_t target_register;
+	struct hal_soc *hal = (struct hal_soc *)hal_soc;
+	struct hal_hw_srng_config *srng_config = &hw_srng_table[ring_type];
+	int shadow_config_index = hal->num_shadow_registers_configured;
+
+	if (shadow_config_index >= MAX_SHADOW_REGISTERS) {
+		QDF_ASSERT(0);
+		return QDF_STATUS_E_RESOURCES;
+	}
+
+	hal->num_shadow_registers_configured++;
+
+	target_register = srng_config->reg_start[HP_OFFSET_IN_REG_START];
+	target_register += (srng_config->reg_size[HP_OFFSET_IN_REG_START]
+			    *ring_num);
+
+	/* if the ring is a dst ring, we need to shadow the tail pointer */
+	if (srng_config->ring_dir == HAL_SRNG_DST_RING)
+		target_register += OFFSET_FROM_HP_TO_TP;
+
+	hal->shadow_config[shadow_config_index].addr = target_register;
+
+	/* update hp/tp addr in the hal_soc structure*/
+	hal_update_srng_hp_tp_address(hal_soc, shadow_config_index, ring_type,
+				      ring_num);
+
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
+			"%s: target_reg %x, shadow_index %x, ring_type %d, ring num %d\n",
+		       __func__, target_register, shadow_config_index,
+		       ring_type, ring_num);
+
+	return QDF_STATUS_SUCCESS;
+}
+
+QDF_STATUS hal_construct_shadow_config(void *hal_soc)
+{
+	int ring_type, ring_num;
+
+	for (ring_type = 0; ring_type < MAX_RING_TYPES; ring_type++) {
+		struct hal_hw_srng_config *srng_config =
+			&hw_srng_table[ring_type];
+
+		if (ring_type == CE_SRC ||
+		    ring_type == CE_DST ||
+		    ring_type == CE_DST_STATUS)
+			continue;
+
+		if (srng_config->lmac_ring)
+			continue;
+
+		for (ring_num = 0; ring_num < srng_config->max_rings;
+		     ring_num++)
+			hal_set_one_shadow_config(hal_soc, ring_type, ring_num);
+	}
+
+	return QDF_STATUS_SUCCESS;
+}
+
+void hal_get_shadow_config(void *hal_soc,
+	struct pld_shadow_reg_v2_cfg **shadow_config,
+	int *num_shadow_registers_configured)
+{
+	struct hal_soc *hal = (struct hal_soc *)hal_soc;
+
+	*shadow_config = hal->shadow_config;
+	*num_shadow_registers_configured =
+		hal->num_shadow_registers_configured;
+
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
+			"%s\n", __func__);
+}
+
 /**
  * hal_attach - Initalize HAL layer
  * @hif_handle: Opaque HIF handle
@@ -792,6 +932,7 @@ static inline void hal_srng_hw_init(struct hal_soc *hal,
 		hal_srng_dst_hw_init(hal, srng);
 }
 
+#define CHECK_SHADOW_REGISTERS true
 /**
  * hal_srng_setup - Initalize HW SRNG ring.
  * @hal_soc: Opaque HAL SOC handle
@@ -822,22 +963,11 @@ void *hal_srng_setup(void *hal_soc, int ring_type, int ring_num,
 	void *dev_base_addr;
 	int i;
 
-	if (ring_num >= ring_config->max_rings) {
-		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
-			"%s: ring_num exceeded maximum no. of supported rings\n",
-			__func__);
+	ring_id = hal_get_srng_ring_id(hal_soc, ring_type, ring_num, 0);
+	if (ring_id < 0)
 		return NULL;
-	}
 
-	if (ring_config->lmac_ring) {
-		ring_id = ring_config->start_ring_id + ring_num +
-			(mac_id * HAL_MAX_RINGS_PER_LMAC);
-	} else {
-		ring_id = ring_config->start_ring_id + ring_num;
-	}
-
-	/* TODO: Should we allocate srng structures dynamically? */
-	srng = &(hal->srng_list[ring_id]);
+	srng = hal_get_srng(hal_soc, ring_id);
 
 	if (srng->initialized) {
 		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
@@ -877,6 +1007,8 @@ void *hal_srng_setup(void *hal_soc, int ring_type, int ring_num,
 	srng->flags |= HAL_SRNG_MSI_SWAP;
 	srng->flags |= HAL_SRNG_RING_PTR_SWAP;
 #endif
+
+#define ignore_shadow false
 	if (srng->ring_dir == HAL_SRNG_SRC_RING) {
 		srng->u.src_ring.hp = 0;
 		srng->u.src_ring.reap_hp = srng->ring_size -
@@ -892,8 +1024,18 @@ void *hal_srng_setup(void *hal_soc, int ring_type, int ring_num,
 				&(hal->shadow_wrptr_mem_vaddr[ring_id -
 					HAL_SRNG_LMAC1_ID_START]);
 			srng->flags |= HAL_SRNG_LMAC_RING;
-		} else {
+		} else if (ignore_shadow || (srng->u.src_ring.hp_addr == 0)) {
 			srng->u.src_ring.hp_addr = SRNG_SRC_ADDR(srng, HP);
+
+			if (CHECK_SHADOW_REGISTERS) {
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_ERROR,
+					  "%s: Ring (%d, %d) missing shadow config\n",
+					  __func__, ring_type, ring_num);
+			}
+		} else {
+			/* todo validate that the shadow register is pointing to
+			 * the correct address */
 		}
 	} else {
 		/* During initialization loop count in all the descriptors
@@ -916,12 +1058,21 @@ void *hal_srng_setup(void *hal_soc, int ring_type, int ring_num,
 				&(hal->shadow_wrptr_mem_vaddr[ring_id -
 				HAL_SRNG_LMAC1_ID_START]);
 			srng->flags |= HAL_SRNG_LMAC_RING;
-		} else {
+		} else if (ignore_shadow || srng->u.dst_ring.tp_addr == 0) {
 			srng->u.dst_ring.tp_addr = SRNG_DST_ADDR(srng, TP);
+
+			if (CHECK_SHADOW_REGISTERS) {
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_ERROR,
+					  "%s: Ring (%d, %d) missing shadow config\n",
+					  __func__, ring_type, ring_num);
+			}
+		} else {
+			/* todo validate that the shadow register is pointing to
+			 * the correct address */
 		}
 	}
 
-
 	if (!(ring_config->lmac_ring)) {
 		hal_srng_hw_init(hal, srng);
 

hif/src/ce/ce_main.c

@@ -58,6 +58,15 @@
 #endif
 #include "mp_dev.h"
 
+#if (defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6290)) && \
+	!defined(QCA_WIFI_SUPPORT_SRNG)
+#define QCA_WIFI_SUPPORT_SRNG
+#endif
+
+#ifdef QCA_WIFI_SUPPORT_SRNG
+#include "hal_api.h"
+#endif
+
 /* Forward references */
 static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info);
 
@@ -635,7 +644,7 @@ bool ce_srng_based(struct hif_softc *scn)
 	return false;
 }
 
-#if defined(QCA_WIFI_QCA8074) || defined(QCA_WIFI_QCA6290)
+#ifdef QCA_WIFI_SUPPORT_SRNG
 static struct ce_ops *ce_services_attach(struct hif_softc *scn)
 {
 	if (ce_srng_based(scn))
@@ -643,7 +652,67 @@ static struct ce_ops *ce_services_attach(struct hif_softc *scn)
 
 	return ce_services_legacy();
 }
+
+static void hif_hal_construct_ce_shadow_config(struct hif_softc *scn)
+{
+	struct HIF_CE_state *hif_state = HIF_GET_CE_STATE(scn);
+
+	for (ce_id = 0; ce_id < scn->ce_count; ce_id++) {
+		if (hif_state->host_ce_config[ce_id].src_nentries)
+			hal_set_one_shadow_config(scn->hal_soc,
+						  CE_SRC, ce_id);
+
+		if (hif_state->host_ce_config[ce_id].dest_nentries) {
+			hal_set_one_shadow_config(scn->hal_soc,
+						  CE_DST, ce_id);
+
+			hal_set_one_shadow_config(scn->hal_soc,
+						  CE_DST_STATUS, ce_id);
+		}
+	}
+}
+
+static void hif_prepare_hal_shadow_register_cfg(struct hif_softc *scn,
+		struct pld_shadow_reg_v2_cfg **shadow_config,
+		int *num_shadow_registers_configured)
+{
+	int ce_id;
+
+	if (!ce_srng_based(scn))
+		return;
+
+	if (scn->hal == NULL) {
+		HIF_ERROR("%s: hal not initialized: not initializing shadow config",
+			  __func__);
+		return;
+	}
+
+	hal_get_shadow_config(scn->hal_soc, shadow_config,
+			      num_shadow_registers_configured);
+
+	if (*num_shadow_registers_configured != 0) {
+		HIF_ERROR("%s: hal shadow register configuration allready constructed",
+			  __func__);
+
+		/* return with original configuration*/
+		return;
+	}
+
+	hal_construct_shadow_config(scn->hal_soc);
+	hif_hal_construct_ce_shadow_config(scn);
+
+	/* get updated configuration */
+	hal_get_shadow_config(scn->hal_soc, shadow_config,
+			      num_shadow_registers_configured);
+
+}
 #else	/* QCA_LITHIUM */
+void hif_prepare_hal_shadow_register_cfg(struct hif_softc *scn,
+		struct pld_shadow_reg_v2_cfg **shadow_config,
+		int *num_shadow_registers_configured) {
+
+}
+
 static struct ce_ops *ce_services_attach(struct hif_softc *scn)
 {
 	return ce_services_legacy();
@@ -1994,6 +2063,20 @@ void hif_get_target_ce_config(struct hif_softc *scn,
 		*shadow_cfg_sz_ret = shadow_cfg_sz;
 }
 
+
+void hif_print_hal_shadow_register_cfg(struct pld_wlan_enable_cfg *cfg)
+{
+	int i;
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
+		  "%s: num_config %d\n", __func__, cfg->num_shadow_reg_v2_cfg);
+
+	for (i = 0; i < cfg->num_shadow_reg_v2_cfg; i++) {
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
+		     "%s: i %d, val %x\n", __func__, i,
+		     cfg->shadow_reg_v2_cfg[i].addr);
+	}
+}
+
 /**
  * hif_wlan_enable(): call the platform driver to enable wlan
  * @scn: HIF Context
@@ -2022,6 +2105,11 @@ int hif_wlan_enable(struct hif_softc *scn)
 	cfg.num_ce_svc_pipe_cfg /= sizeof(struct service_to_pipe);
 	cfg.num_shadow_reg_cfg /= sizeof(struct shadow_reg_cfg);
 
+	hif_prepare_hal_shadow_register_cfg(scn, &cfg.shadow_reg_v2_cfg,
+			      &cfg.num_shadow_reg_v2_cfg);
+
+	hif_print_hal_shadow_register_cfg(&cfg);
+
 	if (QDF_GLOBAL_FTM_MODE == con_mode)
 		mode = PLD_FTM;
 	else if (QDF_IS_EPPING_ENABLED(con_mode))
@@ -2038,6 +2126,9 @@ int hif_wlan_enable(struct hif_softc *scn)
 
 #define CE_EPPING_USES_IRQ true
 
+
+
+
 /**
  * hif_ce_prepare_config() - load the correct static tables.
  * @scn: hif context

hif/src/ce/ce_main.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -185,6 +185,10 @@ struct shadow_reg_cfg {
 	uint16_t reg_offset;
 };
 
+struct shadow_reg_v2_cfg {
+	uint32_t reg_value;
+};
+
 void hif_ce_stop(struct hif_softc *scn);
 int hif_dump_ce_registers(struct hif_softc *scn);
 void
@@ -214,6 +218,7 @@ void hif_get_target_ce_config(struct hif_softc *scn,
 		int *target_ce_config_sz_ret,
 		struct service_to_pipe **target_service_to_ce_map_ret,
 		int *target_service_to_ce_map_sz_ret,
-		struct shadow_reg_cfg **target_shadow_reg_cfg_ret,
-		int *shadow_cfg_sz_ret);
+		struct shadow_reg_cfg **target_shadow_reg_cfg_v1_ret,
+		int *shadow_cfg_v1_sz_ret);
+
 #endif /* __CE_H__ */