Sfoglia il codice sorgente

Revert "qcacmn: Reduce WMI max message size on low mem profile"

This reverts commit Change-Id: Icb25be0f4ce60112ef6293f39f9dcc57ebc0288c.

CE2 pipe source ring size is configured as 1700 bytes in LM build where
2048 bytes in regular build. WMI msg size is always hard coded in FW to
2048 bytes in both build. WMI/QMI Pipe configuration is not matching.

Revert CE2 pipe configuration to 2k in the LM build temporarily till FW
updates wmi msg size based ring size configuration.

Change-Id: I2b66097ff9aa23c49fa77fa78b865828f244d108
CRs-Fixed: 2457381
Shashikala Prabhu 5 anni fa
parent
commit
f7b7f5e929
1 ha cambiato i file con 10 aggiunte e 16 eliminazioni
  1. 10 16
      hif/src/ce/ce_assignment.h

+ 10 - 16
hif/src/ce/ce_assignment.h

@@ -663,21 +663,15 @@ static struct CE_pipe_config target_ce_config_wlan_ar900b[] = {
 #endif
 #endif
 };
 };
 
 
-#ifdef QCA_LOWMEM_CONFIG
-#define WMI_MAX_BUF_SIZE 1700
-#else
-#define WMI_MAX_BUF_SIZE 2048
-#endif
-
 static struct CE_attr host_ce_config_wlan_qca8074[] = {
 static struct CE_attr host_ce_config_wlan_qca8074[] = {
 	/* host->target HTC control and raw streams */
 	/* host->target HTC control and raw streams */
 	{ /* CE0 */ CE_ATTR_FLAGS, 0, 16, 2048, 0, NULL,},
 	{ /* CE0 */ CE_ATTR_FLAGS, 0, 16, 2048, 0, NULL,},
 	/* target->host HTT + HTC control */
 	/* target->host HTT + HTC control */
 	{ /* CE1 */ CE_ATTR_FLAGS, 0, 0,  2048, 512, NULL,},
 	{ /* CE1 */ CE_ATTR_FLAGS, 0, 0,  2048, 512, NULL,},
 	/* target->host WMI */
 	/* target->host WMI */
-	{ /* CE2 */ CE_ATTR_FLAGS, 0, 0,  WMI_MAX_BUF_SIZE, 512, NULL,},
+	{ /* CE2 */ CE_ATTR_FLAGS, 0, 0,  2048, 512, NULL,},
 	/* host->target WMI (mac0) */
 	/* host->target WMI (mac0) */
-	{ /* CE3 */ CE_ATTR_FLAGS, 0, 32, WMI_MAX_BUF_SIZE, 0, NULL,},
+	{ /* CE3 */ CE_ATTR_FLAGS, 0, 32, 2048, 0, NULL,},
 	/* host->target HTT */
 	/* host->target HTT */
 	{ /* CE4 */ (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,
 	{ /* CE4 */ (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,
 		CE_HTT_H2T_MSG_SRC_NENTRIES, 256, 0, NULL,},
 		CE_HTT_H2T_MSG_SRC_NENTRIES, 256, 0, NULL,},
@@ -687,11 +681,11 @@ static struct CE_attr host_ce_config_wlan_qca8074[] = {
 	{ /* CE6 */ CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR, 0, 0,
 	{ /* CE6 */ CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR, 0, 0,
 		0, 0, NULL,},
 		0, 0, NULL,},
 	/* host->target WMI (mac1) */
 	/* host->target WMI (mac1) */
-	{ /* CE7 */ CE_ATTR_FLAGS, 0, 32, WMI_MAX_BUF_SIZE, 0, NULL,},
+	{ /* CE7 */ CE_ATTR_FLAGS, 0, 32, 2048, 0, NULL,},
 	/* Target to uMC */
 	/* Target to uMC */
 	{ /* CE8 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 	{ /* CE8 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 	/* host->target WMI (mac2) */
 	/* host->target WMI (mac2) */
-	{ /* CE9 */ CE_ATTR_FLAGS, 0, 32,  WMI_MAX_BUF_SIZE, 0, NULL,},
+	{ /* CE9 */ CE_ATTR_FLAGS, 0, 32,  2048, 0, NULL,},
 	/* target->host HTT */
 	/* target->host HTT */
 	{ /* CE10 unused */ 0, 0, 0, 0, 0, NULL,},
 	{ /* CE10 unused */ 0, 0, 0, 0, 0, NULL,},
 	{ /* CE11 unused */ 0, 0, 0, 0, 0, NULL,},
 	{ /* CE11 unused */ 0, 0, 0, 0, 0, NULL,},
@@ -703,9 +697,9 @@ static struct CE_pipe_config target_ce_config_wlan_qca8074[] = {
 	/* target->host HTT */
 	/* target->host HTT */
 	{ /* CE1 */ 1, PIPEDIR_IN,  32, 2048, CE_ATTR_FLAGS, 0,},
 	{ /* CE1 */ 1, PIPEDIR_IN,  32, 2048, CE_ATTR_FLAGS, 0,},
 	/* target->host WMI  + HTC control */
 	/* target->host WMI  + HTC control */
-	{ /* CE2 */ 2, PIPEDIR_IN,  32, WMI_MAX_BUF_SIZE, CE_ATTR_FLAGS, 0,},
+	{ /* CE2 */ 2, PIPEDIR_IN,  32, 2048, CE_ATTR_FLAGS, 0,},
 	/* host->target WMI */
 	/* host->target WMI */
-	{ /* CE3 */ 3, PIPEDIR_OUT, 32, WMI_MAX_BUF_SIZE, CE_ATTR_FLAGS, 0,},
+	{ /* CE3 */ 3, PIPEDIR_OUT, 32, 2048, CE_ATTR_FLAGS, 0,},
 	/* host->target HTT */
 	/* host->target HTT */
 	{ /* CE4 */ 4, PIPEDIR_OUT, 256, 256,
 	{ /* CE4 */ 4, PIPEDIR_OUT, 256, 256,
 		(CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,},
 		(CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,},
@@ -714,13 +708,13 @@ static struct CE_pipe_config target_ce_config_wlan_qca8074[] = {
 	{ /* CE5 */ 5, PIPEDIR_IN,  32, 2048, 0, 0,},
 	{ /* CE5 */ 5, PIPEDIR_IN,  32, 2048, 0, 0,},
 	/* Reserved for target autonomous HIF_memcpy */
 	/* Reserved for target autonomous HIF_memcpy */
 	{ /* CE6 */ 6, PIPEDIR_INOUT, 32, 65535, 64, 0,},
 	{ /* CE6 */ 6, PIPEDIR_INOUT, 32, 65535, 64, 0,},
-	/* CE7 host->target WMI (mac1) */
-	{ /* CE7 */ 7, PIPEDIR_OUT, 32, WMI_MAX_BUF_SIZE,
+	/* CE7 used only by Host */
+	{ /* CE7 */ 7, PIPEDIR_OUT, 32, 2048,
 		8192, 0,},
 		8192, 0,},
 	/* CE8 used only by IPA */
 	/* CE8 used only by IPA */
 	{ /* CE8 */ 8, PIPEDIR_INOUT, 32, 65535, 112, 0,},
 	{ /* CE8 */ 8, PIPEDIR_INOUT, 32, 65535, 112, 0,},
-	/* CE9 host->target WMI (mac2) */
-	{ /* CE9 */ 9, PIPEDIR_OUT,  32, WMI_MAX_BUF_SIZE, 8192, 0,},
+	/* CE9 target->host HTT */
+	{ /* CE9 */ 9, PIPEDIR_OUT,  32, 2048, 8192, 0,},
 	/* CE10 target->host HTT */
 	/* CE10 target->host HTT */
 	{/* CE10 unused */10, PIPEDIR_NONE, 0, 0, 0, 0,},
 	{/* CE10 unused */10, PIPEDIR_NONE, 0, 0, 0, 0,},
 	{/* CE11 unused */11, PIPEDIR_NONE, 0, 0, 0, 0,},
 	{/* CE11 unused */11, PIPEDIR_NONE, 0, 0, 0, 0,},