| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374 |
- From 036862011a5d13e8c54d9d0f9fe838fea986df89 Mon Sep 17 00:00:00 2001
- From: Henry Chen <[email protected]>
- Date: Mon, 4 Jan 2016 20:02:52 +0800
- Subject: [PATCH 27/90] soc: mediatek: PMIC wrap: Clear the vldclr if state
- machine stay on FSM_VLDCLR state.
- Sometimes PMIC is too busy to send data in time to cause pmic wrap timeout,
- because pmic wrap is waiting for FSM_VLDCLR after finishing WACS2_CMD. It
- just return error when issue happened, so the state machine will stay on
- FSM_VLDCLR state when data send back later by PMIC and timeout again in next
- time because pmic wrap waiting for FSM_IDLE state at the beginning of the
- read/write function.
- Clear the vldclr when timeout if state machine stay on FSM_VLDCLR.
- Signed-off-by: Henry Chen <[email protected]>
- Tested-by: Ricky Liang <[email protected]>
- Signed-off-by: Matthias Brugger <[email protected]>
- ---
- drivers/soc/mediatek/mtk-pmic-wrap.c | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
- diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
- index 105597a..696071b 100644
- --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
- +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
- @@ -412,6 +412,20 @@ static bool pwrap_is_fsm_vldclr(struct pmic_wrapper *wrp)
- return PWRAP_GET_WACS_FSM(val) == PWRAP_WACS_FSM_WFVLDCLR;
- }
-
- +/*
- + * Timeout issue sometimes caused by the last read command
- + * failed because pmic wrap could not got the FSM_VLDCLR
- + * in time after finishing WACS2_CMD. It made state machine
- + * still on FSM_VLDCLR and timeout next time.
- + * Check the status of FSM and clear the vldclr to recovery the
- + * error.
- + */
- +static inline void pwrap_leave_fsm_vldclr(struct pmic_wrapper *wrp)
- +{
- + if (pwrap_is_fsm_vldclr(wrp))
- + pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR);
- +}
- +
- static bool pwrap_is_sync_idle(struct pmic_wrapper *wrp)
- {
- return pwrap_readl(wrp, PWRAP_WACS2_RDATA) & PWRAP_STATE_SYNC_IDLE0;
- @@ -445,8 +459,10 @@ static int pwrap_write(struct pmic_wrapper *wrp, u32 adr, u32 wdata)
- int ret;
-
- ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
- - if (ret)
- + if (ret) {
- + pwrap_leave_fsm_vldclr(wrp);
- return ret;
- + }
-
- pwrap_writel(wrp, (1 << 31) | ((adr >> 1) << 16) | wdata,
- PWRAP_WACS2_CMD);
- @@ -459,8 +475,10 @@ static int pwrap_read(struct pmic_wrapper *wrp, u32 adr, u32 *rdata)
- int ret;
-
- ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle);
- - if (ret)
- + if (ret) {
- + pwrap_leave_fsm_vldclr(wrp);
- return ret;
- + }
-
- pwrap_writel(wrp, (adr >> 1) << 16, PWRAP_WACS2_CMD);
-
- --
- 1.7.10.4
|
