Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 484d466e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: notify error to critical clients upon RDDM entry"

parents c59330e7 e144bb3e

drivers/bus/mhi/core/mhi_init.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static const char * const mhi_pm_state_str[] = { 
	[MHI_PM_BIT_M3] = "M3",

	[MHI_PM_BIT_M3_EXIT] = "M3->M0",

	[MHI_PM_BIT_FW_DL_ERR] = "FW DL Error",

	[MHI_PM_BIT_DEVICE_ERR_DETECT] = "Device Error Detect",

	[MHI_PM_BIT_SYS_ERR_DETECT] = "SYS_ERR Detect",

	[MHI_PM_BIT_SYS_ERR_PROCESS] = "SYS_ERR Process",

	[MHI_PM_BIT_SHUTDOWN_PROCESS] = "SHUTDOWN Process",

drivers/bus/mhi/core/mhi_internal.h

+6 −2
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ enum { 
	MHI_PM_BIT_M3,

	MHI_PM_BIT_M3_EXIT,

	MHI_PM_BIT_FW_DL_ERR,

	MHI_PM_BIT_DEVICE_ERR_DETECT,

	MHI_PM_BIT_SYS_ERR_DETECT,

	MHI_PM_BIT_SYS_ERR_PROCESS,

	MHI_PM_BIT_SHUTDOWN_PROCESS,
@@ -474,6 +475,8 @@ enum MHI_PM_STATE { 
	MHI_PM_M3_EXIT = BIT(MHI_PM_BIT_M3_EXIT),

	/* firmware download failure state */

	MHI_PM_FW_DL_ERR = BIT(MHI_PM_BIT_FW_DL_ERR),

	/* error or shutdown detected or processing state */

	MHI_PM_DEVICE_ERR_DETECT = BIT(MHI_PM_BIT_DEVICE_ERR_DETECT),

	MHI_PM_SYS_ERR_DETECT = BIT(MHI_PM_BIT_SYS_ERR_DETECT),

	MHI_PM_SYS_ERR_PROCESS = BIT(MHI_PM_BIT_SYS_ERR_PROCESS),

	MHI_PM_SHUTDOWN_PROCESS = BIT(MHI_PM_BIT_SHUTDOWN_PROCESS),
@@ -484,8 +487,9 @@ enum MHI_PM_STATE { 


#define MHI_REG_ACCESS_VALID(pm_state) ((pm_state & (MHI_PM_POR | MHI_PM_M0 | \

		MHI_PM_M2 | MHI_PM_M3_ENTER | MHI_PM_M3_EXIT | \

		MHI_PM_SYS_ERR_DETECT | MHI_PM_SYS_ERR_PROCESS | \

		MHI_PM_SHUTDOWN_PROCESS | MHI_PM_FW_DL_ERR)))

		MHI_PM_DEVICE_ERR_DETECT | MHI_PM_SYS_ERR_DETECT | \

		MHI_PM_SYS_ERR_PROCESS | MHI_PM_SHUTDOWN_PROCESS | \

		MHI_PM_FW_DL_ERR)))

#define MHI_PM_IN_ERROR_STATE(pm_state) (pm_state >= MHI_PM_FW_DL_ERR)

#define MHI_PM_IN_FATAL_STATE(pm_state) (pm_state >= MHI_PM_LD_ERR_FATAL_DETECT)

#define MHI_DB_ACCESS_VALID(mhi_cntrl) (mhi_cntrl->pm_state & \

drivers/bus/mhi/core/mhi_main.c

+3 −0
Original line number Diff line number Diff line
@@ -1588,6 +1588,9 @@ irqreturn_t mhi_intvec_threaded_handlr(int irq_number, void *dev) 
			mhi_cntrl->status_cb(mhi_cntrl, mhi_cntrl->priv_data,

					     MHI_CB_EE_RDDM);

			wake_up_all(&mhi_cntrl->state_event);



			/* notify critical clients with early notifications */

			mhi_control_error(mhi_cntrl);

		}

		goto exit_intvec;

	}

drivers/bus/mhi/core/mhi_pm.c

+37 −22
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
 *     M0 <--> M0

 *     M0 -> FW_DL_ERR

 *     M0 -> M3_ENTER -> M3 -> M3_EXIT --> M0

 * L1: SYS_ERR_DETECT -> SYS_ERR_PROCESS --> POR

 * L1: DEVICE_ERR_DETECT -> SYS_ERR_DETECT

 *     SYS_ERR_DETECT -> SYS_ERR_PROCESS --> POR

 * L2: SHUTDOWN_PROCESS -> LD_ERR_FATAL_DETECT

 *     SHUTDOWN_PROCESS -> DISABLE

 * L3: LD_ERR_FATAL_DETECT <--> LD_ERR_FATAL_DETECT
@@ -49,44 +50,53 @@ static struct mhi_pm_transitions const mhi_state_transitions[] = { 
	{

		MHI_PM_POR,

		MHI_PM_POR | MHI_PM_DISABLE | MHI_PM_M0 |

		MHI_PM_SYS_ERR_DETECT | MHI_PM_SHUTDOWN_PROCESS |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_FW_DL_ERR |

		MHI_PM_SHUTDOWN_NO_ACCESS

		MHI_PM_DEVICE_ERR_DETECT | MHI_PM_SYS_ERR_DETECT |

		MHI_PM_SHUTDOWN_PROCESS | MHI_PM_LD_ERR_FATAL_DETECT |

		MHI_PM_FW_DL_ERR | MHI_PM_SHUTDOWN_NO_ACCESS

	},

	{

		MHI_PM_M0,

		MHI_PM_M0 | MHI_PM_M2 | MHI_PM_M3_ENTER |

		MHI_PM_SYS_ERR_DETECT | MHI_PM_SHUTDOWN_PROCESS |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_FW_DL_ERR |

		MHI_PM_SHUTDOWN_NO_ACCESS

		MHI_PM_DEVICE_ERR_DETECT | MHI_PM_SYS_ERR_DETECT |

		MHI_PM_SHUTDOWN_PROCESS | MHI_PM_LD_ERR_FATAL_DETECT |

		MHI_PM_FW_DL_ERR | MHI_PM_SHUTDOWN_NO_ACCESS

	},

	{

		MHI_PM_M2,

		MHI_PM_M0 | MHI_PM_SYS_ERR_DETECT | MHI_PM_SHUTDOWN_PROCESS |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_SHUTDOWN_NO_ACCESS

		MHI_PM_M0 | MHI_PM_DEVICE_ERR_DETECT | MHI_PM_SYS_ERR_DETECT |

		MHI_PM_SHUTDOWN_PROCESS | MHI_PM_LD_ERR_FATAL_DETECT |

		MHI_PM_SHUTDOWN_NO_ACCESS

	},

	{

		MHI_PM_M3_ENTER,

		MHI_PM_M3 | MHI_PM_SYS_ERR_DETECT | MHI_PM_SHUTDOWN_PROCESS |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_SHUTDOWN_NO_ACCESS

		MHI_PM_M3 | MHI_PM_DEVICE_ERR_DETECT | MHI_PM_SYS_ERR_DETECT |

		MHI_PM_SHUTDOWN_PROCESS | MHI_PM_LD_ERR_FATAL_DETECT |

		MHI_PM_SHUTDOWN_NO_ACCESS

	},

	{

		MHI_PM_M3,

		MHI_PM_M3_EXIT | MHI_PM_SYS_ERR_DETECT |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_SHUTDOWN_NO_ACCESS

		MHI_PM_M3_EXIT | MHI_PM_DEVICE_ERR_DETECT |

		MHI_PM_SYS_ERR_DETECT | MHI_PM_LD_ERR_FATAL_DETECT |

		MHI_PM_SHUTDOWN_NO_ACCESS

	},

	{

		MHI_PM_M3_EXIT,

		MHI_PM_M0 | MHI_PM_SYS_ERR_DETECT | MHI_PM_SHUTDOWN_PROCESS |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_SHUTDOWN_NO_ACCESS

		MHI_PM_M0 | MHI_PM_DEVICE_ERR_DETECT | MHI_PM_SYS_ERR_DETECT |

		MHI_PM_SHUTDOWN_PROCESS | MHI_PM_LD_ERR_FATAL_DETECT |

		MHI_PM_SHUTDOWN_NO_ACCESS

	},

	{

		MHI_PM_FW_DL_ERR,

		MHI_PM_FW_DL_ERR | MHI_PM_SYS_ERR_DETECT |

		MHI_PM_SHUTDOWN_PROCESS | MHI_PM_LD_ERR_FATAL_DETECT |

		MHI_PM_SHUTDOWN_NO_ACCESS

		MHI_PM_FW_DL_ERR | MHI_PM_DEVICE_ERR_DETECT |

		MHI_PM_SYS_ERR_DETECT | MHI_PM_SHUTDOWN_PROCESS |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_SHUTDOWN_NO_ACCESS

	},

	/* L1 States */

	{

		MHI_PM_DEVICE_ERR_DETECT,

		MHI_PM_SYS_ERR_DETECT | MHI_PM_SHUTDOWN_PROCESS |

		MHI_PM_LD_ERR_FATAL_DETECT | MHI_PM_SHUTDOWN_NO_ACCESS

	},

	{

		MHI_PM_SYS_ERR_DETECT,

		MHI_PM_SYS_ERR_PROCESS | MHI_PM_SHUTDOWN_PROCESS |
@@ -935,19 +945,24 @@ EXPORT_SYMBOL(mhi_async_power_up); 
/* Transition MHI into error state and notify critical clients */

void mhi_control_error(struct mhi_controller *mhi_cntrl)

{

	enum MHI_PM_STATE cur_state;

	enum MHI_PM_STATE cur_state, transition_state;



	MHI_LOG("Enter with pm_state:%s MHI_STATE:%s\n",

		to_mhi_pm_state_str(mhi_cntrl->pm_state),

		TO_MHI_STATE_STR(mhi_cntrl->dev_state));



	/* link is not down if device is in RDDM */

	transition_state = (mhi_cntrl->ee == MHI_EE_RDDM) ?

		MHI_PM_DEVICE_ERR_DETECT : MHI_PM_LD_ERR_FATAL_DETECT;



	write_lock_irq(&mhi_cntrl->pm_lock);

	cur_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_LD_ERR_FATAL_DETECT);

	cur_state = mhi_tryset_pm_state(mhi_cntrl, transition_state);

	write_unlock_irq(&mhi_cntrl->pm_lock);



	if (cur_state != MHI_PM_LD_ERR_FATAL_DETECT) {

	/* proceed if we move to device error or are already in error state */

	if (!MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) {

		MHI_ERR("Failed to transition to state:%s from:%s\n",

			to_mhi_pm_state_str(MHI_PM_LD_ERR_FATAL_DETECT),

			to_mhi_pm_state_str(transition_state),

			to_mhi_pm_state_str(cur_state));

		goto exit_control_error;

	}