Revert "wlan: reduce TX SMSM notification"
This reverts commit 426c3ea4b1b2aaa2e6b3ceb5fc71e11dac1de1dd.
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index cfd6750..07bc403 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -2901,16 +2901,14 @@
#else
wpt_iterator iterator;
#endif /* FEATURE_R33D */
- wpt_uint32 isEmpty = 0;
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
"%s Enter", __func__);
- tempDxeCtrlBlk->smsmToggled = eWLAN_PAL_FALSE;
- if((0 == tempDxeCtrlBlk->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI].numRsvdDesc) &&
- (0 == tempDxeCtrlBlk->dxeChannel[WDTS_CHANNEL_TX_HIGH_PRI].numRsvdDesc))
+ if(WLANDXE_POWER_STATE_BMPS == tempDxeCtrlBlk->hostPowerState)
{
- isEmpty = 1;
+ tempDxeCtrlBlk->rivaPowerState = WLANDXE_RIVA_POWER_STATE_BMPS_UNKNOWN;
+ dxeNotifySmsm(eWLAN_PAL_FALSE, eWLAN_PAL_TRUE);
}
channelEntry->numFragmentCurrentChain = 0;
@@ -3053,16 +3051,10 @@
{
/* Update channel head as next avaliable linked slot */
channelEntry->headCtrlBlk = currentCtrlBlk;
- if(isEmpty)
- {
- tempDxeCtrlBlk->ringNotEmpty = eWLAN_PAL_TRUE;
- HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW,
- "SMSM_ret LO=%d HI=%d",
- tempDxeCtrlBlk->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI].numRsvdDesc,
- tempDxeCtrlBlk->dxeChannel[WDTS_CHANNEL_TX_HIGH_PRI].numRsvdDesc );
- dxeNotifySmsm(eWLAN_PAL_TRUE, eWLAN_PAL_FALSE);
- tempDxeCtrlBlk->smsmToggled = eWLAN_PAL_TRUE;
- }
+ tempDxeCtrlBlk->ringNotEmpty = eWLAN_PAL_TRUE;
+ HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_LOW, "SMSM_ret LO=%d HI=%d", tempDxeCtrlBlk->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI].numRsvdDesc,
+ tempDxeCtrlBlk->dxeChannel[WDTS_CHANNEL_TX_HIGH_PRI].numRsvdDesc );
+ dxeNotifySmsm(eWLAN_PAL_TRUE, eWLAN_PAL_FALSE);
return status;
}
@@ -3742,18 +3734,6 @@
dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_HIGH_PRI].numRsvdDesc,
channelType[dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI].channelType],
dxeCtxt->dxeChannel[WDTS_CHANNEL_TX_LOW_PRI].numRsvdDesc);
-
- if((WLANDXE_POWER_STATE_FULL != dxeCtxt->hostPowerState) &&
- (eWLAN_PAL_FALSE == tempDxeCtrlBlk->smsmToggled))
- {
- /* After TX Comp processing, still remaining frame on the DXE TX ring
- * And when push frame, RING was not empty marked
- * Then when push frame, no SMSM toggle happen
- * To avoid permanent TX stall, SMSM toggle is needed at here
- * With this toggle, host should gaurantee SMSM state should be changed */
- dxeNotifySmsm(eWLAN_PAL_FALSE, eWLAN_PAL_TRUE);
- dxeNotifySmsm(eWLAN_PAL_TRUE, eWLAN_PAL_FALSE);
- }
}
/*Kicking the DXE after the TX Complete interrupt was enabled - to avoid
@@ -4206,7 +4186,6 @@
tempDxeCtrlBlk->rxIntDisabledByIMPS = eWLAN_PAL_FALSE;
tempDxeCtrlBlk->txIntDisabledByIMPS = eWLAN_PAL_FALSE;
tempDxeCtrlBlk->driverReloadInProcessing = eWLAN_PAL_FALSE;
- tempDxeCtrlBlk->smsmToggled = eWLAN_PAL_FALSE;
/* Initialize SMSM state
* Init State is
diff --git a/CORE/DXE/src/wlan_qct_dxe_i.h b/CORE/DXE/src/wlan_qct_dxe_i.h
index 34d342e..77d3987 100644
--- a/CORE/DXE/src/wlan_qct_dxe_i.h
+++ b/CORE/DXE/src/wlan_qct_dxe_i.h
@@ -1,4 +1,3 @@
-/**=========================================================================
/*
* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*
@@ -40,7 +39,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-
#ifndef WLAN_QCT_DXE_I_H
#define WLAN_QCT_DXE_I_H
@@ -51,9 +49,9 @@
@brief
This file contains the external API exposed by the wlan data transfer abstraction layer module.
- Copyright (c) 2011 Qualcomm Technologies, Inc.
+ Copyright (c) 2011 QUALCOMM Incorporated.
All Rights Reserved.
- Qualcomm Technologies Confidential and Proprietary
+ Qualcomm Confidential and Proprietary
========================================================================*/
/*===========================================================================
@@ -644,7 +642,6 @@
wpt_packet *freeRXPacket;
wpt_boolean rxPalPacketUnavailable;
wpt_boolean driverReloadInProcessing;
- wpt_boolean smsmToggled;
} WLANDXE_CtrlBlkType;
/*==========================================================================