[WCNCR00158507] misc: Add RF setting control
[Description]
Add RF settings GET commands
Solution:
Provide PoP, PD, ED, RFGain get commands,
these commands need corresponding firmware(CL69201).
Test:
WiFi scan/connection OK, no error (return 0) if using old firmware.
Change-Id: I1b88130380fdadd036298243fece2fd59f26252a
CR-Id: WCNCR00158507
Feature: misc
Signed-off-by: ZD Hu <zd.hu@mediatek.com>
(cherry picked from commit 3d959f5576b29bc924905dee35bb73c823c30717)
diff --git a/os/linux/gl_wext_priv.c b/os/linux/gl_wext_priv.c
index f8d294c..0f38c75 100644
--- a/os/linux/gl_wext_priv.c
+++ b/os/linux/gl_wext_priv.c
@@ -2362,9 +2362,22 @@
#define CMD_BA_SIZE_CONFIG "BA_SIZE_CONFIG"
#define CMD_TRAFFIC_REPORT "TRAFFIC_REPORT"
#define CMD_SET_POP "SET_POP"
+#define CMD_GET_POP "GET_POP"
#define CMD_SET_ED "SET_ED"
+#define CMD_GET_ED "GET_ED"
#define CMD_SET_PD "SET_PD"
+#define CMD_GET_PD "GET_PD"
#define CMD_SET_MAX_RFGAIN "SET_MAX_RFGAIN"
+#define CMD_GET_MAX_RFGAIN "GET_MAX_RFGAIN"
+
+enum {
+ CMD_ADVCTL_NOISE_ID = 1,
+ CMD_ADVCTL_POP_ID,
+ CMD_ADVCTL_ED_ID,
+ CMD_ADVCTL_PD_ID,
+ CMD_ADVCTL_MAX_RFGAIN_ID,
+ CMD_ADVCTL_MAX
+};
#endif
static UINT_8 g_ucMiracastMode = MIRACAST_MODE_OFF;
@@ -8923,7 +8936,7 @@
INT_32 i4Argc = 0;
PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
INT_32 u4Ret = 0;
- UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + 1;
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + CMD_ADVCTL_NOISE_ID;
UINT_32 u4Sel = 0;
PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
@@ -8970,7 +8983,7 @@
INT_32 i4BytesWritten = 0;
INT_32 i4Argc = 0;
PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
- UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_GET_ID + 1;
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_GET_ID + CMD_ADVCTL_NOISE_ID;
UINT_32 u4Offset = 0;
PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
INT_16 u2Wf0AvgPwr, u2Wf1AvgPwr;
@@ -9422,7 +9435,7 @@
INT_32 i4Argc = 0;
PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
INT_32 u4Ret = 0;
- UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + 2;
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + CMD_ADVCTL_POP_ID;
UINT_32 u4Sel = 0, u4CckTh = 0, u4OfdmTh = 0;
PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
@@ -9468,6 +9481,54 @@
}
+static int priv_driver_get_pop(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
+{
+ P_GLUE_INFO_T prGlueInfo = NULL;
+ WLAN_STATUS rStatus = WLAN_STATUS_SUCCESS;
+ UINT_32 u4BufLen = 0;
+ INT_32 i4BytesWritten = 0;
+ INT_32 i4Argc = 0;
+ PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_GET_ID + CMD_ADVCTL_POP_ID;
+ UINT_32 u4Offset = 0;
+ PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
+ UINT_32 u4CckTh = 0, u4OfdmTh = 0;
+
+ ASSERT(prNetDev);
+
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ ASSERT(prNetDev);
+ if (GLUE_CHK_PR2(prNetDev, pcCommand) == FALSE)
+ return -1;
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ DBGLOG(REQ, LOUD, "command is %s\n", pcCommand);
+ wlanCfgParseArgument(pcCommand, &i4Argc, apcArgv);
+
+ rSwCtrlInfo.u4Data = 0;
+ rSwCtrlInfo.u4Id = u4Id;
+
+ rStatus = kalIoctl(prGlueInfo,
+ wlanoidQuerySwCtrlRead,
+ &rSwCtrlInfo, sizeof(rSwCtrlInfo), TRUE, TRUE, TRUE, &u4BufLen);
+
+ DBGLOG(REQ, LOUD, "rStatus %u\n", rStatus);
+ if (rStatus != WLAN_STATUS_SUCCESS)
+ return -1;
+
+ u4CckTh = rSwCtrlInfo.u4Data & 0xFF;
+ u4OfdmTh = (rSwCtrlInfo.u4Data >> 8) & 0xFF;
+
+ u4Offset += snprintf(pcCommand + u4Offset, i4TotalLen - u4Offset,
+ "PoP: CckTh:%ddB OfdmTh:%ddB\n", u4CckTh, u4OfdmTh);
+
+ i4BytesWritten = (INT_32)u4Offset;
+
+ return i4BytesWritten;
+
+}
+
static int priv_driver_set_ed(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
{
P_GLUE_INFO_T prGlueInfo = NULL;
@@ -9477,7 +9538,7 @@
INT_32 i4Argc = 0;
PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
INT_32 u4Ret = 0, u4EdVal = 0;
- UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + 3;
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + CMD_ADVCTL_ED_ID;
UINT_32 u4Sel = 0;
PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
@@ -9521,6 +9582,53 @@
}
+static int priv_driver_get_ed(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
+{
+ P_GLUE_INFO_T prGlueInfo = NULL;
+ WLAN_STATUS rStatus = WLAN_STATUS_SUCCESS;
+ UINT_32 u4BufLen = 0;
+ INT_32 i4BytesWritten = 0;
+ INT_32 i4Argc = 0;
+ PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_GET_ID + CMD_ADVCTL_ED_ID;
+ UINT_32 u4Offset = 0;
+ PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
+ INT_8 u4EdVal = 0;
+
+ ASSERT(prNetDev);
+
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ ASSERT(prNetDev);
+ if (GLUE_CHK_PR2(prNetDev, pcCommand) == FALSE)
+ return -1;
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ DBGLOG(REQ, LOUD, "command is %s\n", pcCommand);
+ wlanCfgParseArgument(pcCommand, &i4Argc, apcArgv);
+
+ rSwCtrlInfo.u4Data = 0;
+ rSwCtrlInfo.u4Id = u4Id;
+
+ rStatus = kalIoctl(prGlueInfo,
+ wlanoidQuerySwCtrlRead,
+ &rSwCtrlInfo, sizeof(rSwCtrlInfo), TRUE, TRUE, TRUE, &u4BufLen);
+
+ DBGLOG(REQ, LOUD, "rStatus %u\n", rStatus);
+ if (rStatus != WLAN_STATUS_SUCCESS)
+ return -1;
+
+ u4EdVal = rSwCtrlInfo.u4Data & 0xFF;
+
+ u4Offset += snprintf(pcCommand + u4Offset, i4TotalLen - u4Offset,
+ "ED: %ddB\n", u4EdVal);
+
+ i4BytesWritten = (INT_32)u4Offset;
+
+ return i4BytesWritten;
+
+}
+
static int priv_driver_set_pd(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
{
P_GLUE_INFO_T prGlueInfo = NULL;
@@ -9530,7 +9638,7 @@
INT_32 i4Argc = 0;
PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
INT_32 u4Ret = 0;
- UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + 4;
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + CMD_ADVCTL_PD_ID;
UINT_32 u4Sel = 0;
INT_32 u4CckTh = 0, u4OfdmTh = 0;
PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
@@ -9584,6 +9692,54 @@
return i4BytesWritten;
}
+static int priv_driver_get_pd(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
+{
+ P_GLUE_INFO_T prGlueInfo = NULL;
+ WLAN_STATUS rStatus = WLAN_STATUS_SUCCESS;
+ UINT_32 u4BufLen = 0;
+ INT_32 i4BytesWritten = 0;
+ INT_32 i4Argc = 0;
+ PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_GET_ID + CMD_ADVCTL_PD_ID;
+ UINT_32 u4Offset = 0;
+ PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
+ INT_8 u4CckTh = 0, u4OfdmTh = 0;
+
+ ASSERT(prNetDev);
+
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ ASSERT(prNetDev);
+ if (GLUE_CHK_PR2(prNetDev, pcCommand) == FALSE)
+ return -1;
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ DBGLOG(REQ, LOUD, "command is %s\n", pcCommand);
+ wlanCfgParseArgument(pcCommand, &i4Argc, apcArgv);
+
+ rSwCtrlInfo.u4Data = 0;
+ rSwCtrlInfo.u4Id = u4Id;
+
+ rStatus = kalIoctl(prGlueInfo,
+ wlanoidQuerySwCtrlRead,
+ &rSwCtrlInfo, sizeof(rSwCtrlInfo), TRUE, TRUE, TRUE, &u4BufLen);
+
+ DBGLOG(REQ, LOUD, "rStatus %u\n", rStatus);
+ if (rStatus != WLAN_STATUS_SUCCESS)
+ return -1;
+
+ u4CckTh = rSwCtrlInfo.u4Data & 0xFF;
+ u4OfdmTh = (rSwCtrlInfo.u4Data >> 8) & 0xFF;
+
+ u4Offset += snprintf(pcCommand + u4Offset, i4TotalLen - u4Offset,
+ "PD: CckTh:%ddB OfdmTh:%ddB\n", u4CckTh, u4OfdmTh);
+
+ i4BytesWritten = (INT_32)u4Offset;
+
+ return i4BytesWritten;
+
+}
+
static int priv_driver_set_maxrfgain(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
{
P_GLUE_INFO_T prGlueInfo = NULL;
@@ -9593,7 +9749,7 @@
INT_32 i4Argc = 0;
PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
INT_32 u4Ret = 0;
- UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + 5;
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_SET_ID + CMD_ADVCTL_MAX_RFGAIN_ID;
UINT_32 u4Sel = 0;
INT_32 u4Wf0Gain = 0, u4Wf1Gain = 0;
PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
@@ -9647,6 +9803,53 @@
return i4BytesWritten;
}
+static int priv_driver_get_maxrfgain(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
+{
+ P_GLUE_INFO_T prGlueInfo = NULL;
+ WLAN_STATUS rStatus = WLAN_STATUS_SUCCESS;
+ UINT_32 u4BufLen = 0;
+ INT_32 i4BytesWritten = 0;
+ INT_32 i4Argc = 0;
+ PCHAR apcArgv[WLAN_CFG_ARGV_MAX] = { 0 };
+ UINT_32 u4Id = CMD_SW_DBGCTL_ADVCTL_GET_ID + CMD_ADVCTL_MAX_RFGAIN_ID;
+ UINT_32 u4Offset = 0;
+ PARAM_CUSTOM_SW_CTRL_STRUCT_T rSwCtrlInfo;
+ UINT_8 u4Wf0Gain = 0, u4Wf1Gain = 0;
+
+ ASSERT(prNetDev);
+
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ ASSERT(prNetDev);
+ if (GLUE_CHK_PR2(prNetDev, pcCommand) == FALSE)
+ return -1;
+ prGlueInfo = *((P_GLUE_INFO_T *) netdev_priv(prNetDev));
+
+ DBGLOG(REQ, LOUD, "command is %s\n", pcCommand);
+ wlanCfgParseArgument(pcCommand, &i4Argc, apcArgv);
+
+ rSwCtrlInfo.u4Data = 0;
+ rSwCtrlInfo.u4Id = u4Id;
+
+ rStatus = kalIoctl(prGlueInfo,
+ wlanoidQuerySwCtrlRead,
+ &rSwCtrlInfo, sizeof(rSwCtrlInfo), TRUE, TRUE, TRUE, &u4BufLen);
+
+ DBGLOG(REQ, LOUD, "rStatus %u\n", rStatus);
+ if (rStatus != WLAN_STATUS_SUCCESS)
+ return -1;
+
+ u4Wf0Gain = rSwCtrlInfo.u4Data & 0xFF;
+ u4Wf1Gain = (rSwCtrlInfo.u4Data >> 8) & 0xFF;
+
+ u4Offset += snprintf(pcCommand + u4Offset, i4TotalLen - u4Offset,
+ "Max RFGain: WF0:%ddB WF1:%ddB\n", u4Wf0Gain, u4Wf1Gain);
+
+ i4BytesWritten = (INT_32)u4Offset;
+
+ return i4BytesWritten;
+
+}
#endif
static int priv_driver_set_csi(IN struct net_device *prNetDev, IN char *pcCommand, IN int i4TotalLen)
@@ -10094,12 +10297,20 @@
i4BytesWritten = priv_driver_get_traffic_report(prNetDev, pcCommand, i4TotalLen);
else if (strnicmp(pcCommand, CMD_SET_POP, strlen(CMD_SET_POP)) == 0)
i4BytesWritten = priv_driver_set_pop(prNetDev, pcCommand, i4TotalLen);
+ else if (strnicmp(pcCommand, CMD_GET_POP, strlen(CMD_GET_POP)) == 0)
+ i4BytesWritten = priv_driver_get_pop(prNetDev, pcCommand, i4TotalLen);
else if (strnicmp(pcCommand, CMD_SET_ED, strlen(CMD_SET_ED)) == 0)
i4BytesWritten = priv_driver_set_ed(prNetDev, pcCommand, i4TotalLen);
+ else if (strnicmp(pcCommand, CMD_GET_ED, strlen(CMD_GET_ED)) == 0)
+ i4BytesWritten = priv_driver_get_ed(prNetDev, pcCommand, i4TotalLen);
else if (strnicmp(pcCommand, CMD_SET_PD, strlen(CMD_SET_PD)) == 0)
i4BytesWritten = priv_driver_set_pd(prNetDev, pcCommand, i4TotalLen);
+ else if (strnicmp(pcCommand, CMD_GET_PD, strlen(CMD_GET_PD)) == 0)
+ i4BytesWritten = priv_driver_get_pd(prNetDev, pcCommand, i4TotalLen);
else if (strnicmp(pcCommand, CMD_SET_MAX_RFGAIN, strlen(CMD_SET_MAX_RFGAIN)) == 0)
i4BytesWritten = priv_driver_set_maxrfgain(prNetDev, pcCommand, i4TotalLen);
+ else if (strnicmp(pcCommand, CMD_GET_MAX_RFGAIN, strlen(CMD_GET_MAX_RFGAIN)) == 0)
+ i4BytesWritten = priv_driver_get_maxrfgain(prNetDev, pcCommand, i4TotalLen);
#endif
else
i4CmdFound = 0;
