Bug fixes and improvements for MHI power operations
Subsystems (2)
v4 cover Bug fixes and improvements for MHI power operations
Bug fixes and improvements for MHI powerup and shutdown handling. Firmware load function names are updated to accurately reflect their purpose. Closed certain design gaps where the host (MHI bus) would allow clients to operate after a power down or error detection.
Move to an error state sooner based on different scenarios.
These patches were tested on arm64 and X86_64 architectures.
v4:
-Fixed up bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability patch by removing check for EE as well since a previous guard to check if MHI pm_state allows event ring access is already present. Event ring access should not be allowed at the time and hence the check is safe to remove.
v3:
-Fixed bus: mhi: core: Remove MHI event ring IRQ handlers when powering down -Mistakenly placed the free_irq() calls in mhi_pm_sys_error_transition() -Moved it to mhi_pm_disable_transition()
v2:
-Addressed patches based on review comments and made improvements -Added bus: mhi: core: Check for IRQ availability during registration -Dropped bus: mhi: core: Use the IRQF_ONESHOT flag for the BHI interrupt line -Split bus: mhi: core: Move to an error state on any firmware load failure -Modified the following patches:
-bus: mhi: core: Disable IRQs when powering down
-bus: mhi: core: Improve shutdown handling after link down detection -bus: mhi: core: Mark device inactive soon after host issues a shutdown -bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability -Addressed the above as follow-up patches with improvements:
-bus: mhi: core: Prevent sending multiple RDDM entry callbacks -bus: mhi: core: Separate system error and power down handling -bus: mhi: core: Remove MHI event ring IRQ handlers when powering down
Bhaumik Bhatt (12):
bus: mhi: core: Use appropriate names for firmware load functions
bus: mhi: core: Move to using high priority workqueue
bus: mhi: core: Skip device wake in error or shutdown states
bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability
bus: mhi: core: Prevent sending multiple RDDM entry callbacks
bus: mhi: core: Move to an error state on any firmware load failure
bus: mhi: core: Use appropriate label in firmware load handler API
bus: mhi: core: Move to an error state on mission mode failure
bus: mhi: core: Check for IRQ availability during registration
bus: mhi: core: Separate system error and power down handling
bus: mhi: core: Mark and maintain device states early on after power
down
bus: mhi: core: Remove MHI event ring IRQ handlers when powering down
drivers/bus/mhi/core/boot.c | 60 ++++++----- drivers/bus/mhi/core/init.c | 11 ++- drivers/bus/mhi/core/main.c | 9 +- drivers/bus/mhi/core/pm.c | 236 ++++++++++++++++++++++++++++++++------------ include/linux/mhi.h | 2 + 5 files changed, 222 insertions(+), 96 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 1/12 bus: mhi: core: Use appropriate names for firmware load functions
mhi_fw_load_sbl() function is currently used to transfer SBL or EDL images over BHI (Boot Host Interface). Same goes with mhi_fw_load_amss() which uses BHIe. However, the contents of these functions do not indicate support for a specific set of images. Since these can be used for any image download over BHI or BHIe, rename them based on the protocol used.
--- drivers/bus/mhi/core/boot.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/bus/mhi/core/boot.c +10 -9
@@ -176,7 +176,7 @@ int mhi_download_rddm_image(struct mhi_controller *mhi_cntrl, bool in_panic) }EXPORT_SYMBOL_GPL (mhi_download_rddm_image); -static int mhi_fw_load_amss (struct mhi_controller *mhi_cntrl, +static int mhi_fw_load_bhie (struct mhi_controller *mhi_cntrl,const struct mhi_buf *mhi_buf) {void __iomem *base = mhi_cntrl->bhie;
@@ -192,7 +192,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl, } sequence_id =MHI_RANDOM_U32_NONZERO (BHIE_TXVECSTATUS_SEQNUM_BMSK ); -dev_dbg (dev,"Starting AMSS download via BHIe. Sequence ID:%u\n" , +dev_dbg (dev,"Starting image download via BHIe. Sequence ID: %u\n" , sequence_id);mhi_write_reg (mhi_cntrl, base,BHIE_TXVECADDR_HIGH_OFFS ,upper_32_bits (mhi_buf->dma_addr));
@@ -223,7 +223,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,return (!ret) ? -ETIMEDOUT :0 ; } -static int mhi_fw_load_sbl (struct mhi_controller *mhi_cntrl, +static int mhi_fw_load_bhi (struct mhi_controller *mhi_cntrl,dma_addr_t dma_addr,size_t size) {
@@ -250,7 +250,7 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl, } session_id =MHI_RANDOM_U32_NONZERO (BHI_TXDB_SEQNUM_BMSK ); -dev_dbg (dev,"Starting SBL download via BHI. Session ID:%u\n" , +dev_dbg (dev,"Starting image download via BHI. Session ID: %u\n" , session_id);mhi_write_reg (mhi_cntrl, base,BHI_STATUS ,0 ); mhi_write_reg(mhi_cntrl, base, BHI_IMGADDR_HIGH,
@@ -449,9 +449,9 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)return ; } -/* Download SBL image */ +/* Download image using BHI */ memcpy (buf, firmware->data, size); - ret =mhi_fw_load_sbl (mhi_cntrl, dma_addr, size); + ret =mhi_fw_load_bhi (mhi_cntrl, dma_addr, size);mhi_free_coherent (mhi_cntrl, size, buf, dma_addr);if (!mhi_cntrl->fbc_download || ret || mhi_cntrl->ee ==MHI_EE_EDL )
@@ -459,7 +459,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)/* Error or in EDL mode, we're done */ if (ret) { -dev_err (dev,"MHI did not load SBL, ret:%d\n" , ret); +dev_err (dev,"MHI did not load image over BHI, ret: %d\n" , ret);return ; }
@@ -509,11 +509,12 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)/* Start full firmware image download */ image_info = mhi_cntrl->fbc_image; - ret =mhi_fw_load_amss (mhi_cntrl, + ret =mhi_fw_load_bhie (mhi_cntrl,/* Vector table is the last entry */ &image_info->mhi_buf[image_info->entries -1 ]);if (ret) -dev_err (dev,"MHI did not load AMSS, ret:%d\n" , ret); +dev_err (dev,"MHI did not load image over BHIe, ret: %d\n" , + ret);release_firmware (firmware);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 3/12 bus: mhi: core: Skip device wake in error or shutdown states
In reply to Bhaumik BhattMHI client drivers can request a device wake even if the device may be in an error state or undergoing a shutdown. To prevent unnecessary device wake processing, check for the device state and bail out early so that the clients are made aware of the device state sooner.
--- drivers/bus/mhi/core/pm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/bus/mhi/core/pm.c +4 -0
@@ -827,6 +827,10 @@ int __mhi_device_get_sync(struct mhi_controller *mhi_cntrl)/* Wake up the device */ read_lock_bh (&mhi_cntrl->pm_lock); +if (MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state)) { +read_unlock_bh (&mhi_cntrl->pm_lock); +return -EIO ; + } mhi_cntrl->wake_get (mhi_cntrl, true);if (MHI_PM_IN_SUSPEND_STATE (mhi_cntrl->pm_state))mhi_trigger_resume (mhi_cntrl);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 6/12 bus: mhi: core: Move to an error state on any firmware load failure
In reply to Bhaumik BhattMove MHI to a firmware download error state for a failure to find the firmware files or to load SBL or EBL image using BHI/BHIe. This helps detect an error state sooner and shortens the wait for a synchronous power up timeout.
--- drivers/bus/mhi/core/boot.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-)
drivers/bus/mhi/core/boot.c +20 -15
@@ -428,13 +428,13 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) !mhi_cntrl->seg_len))) {dev_err (dev,"No firmware image defined or !sbl_size || !seg_len\n" ); -return ; + goto error_fw_load; } ret =request_firmware (&firmware, fw_name, dev);if (ret) {dev_err (dev,"Error loading firmware: %d\n" , ret); -return ; + goto error_fw_load; } size = (mhi_cntrl->fbc_download) ? mhi_cntrl->sbl_size : firmware->size;
@@ -446,7 +446,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) buf =mhi_alloc_coherent (mhi_cntrl, size, &dma_addr,GFP_KERNEL );if (!buf) {release_firmware (firmware); -return ; + goto error_fw_load; }/* Download image using BHI */
@@ -454,17 +454,17 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) ret =mhi_fw_load_bhi (mhi_cntrl, dma_addr, size);mhi_free_coherent (mhi_cntrl, size, buf, dma_addr); -if (!mhi_cntrl->fbc_download || ret || mhi_cntrl->ee ==MHI_EE_EDL ) -release_firmware (firmware); -/* Error or in EDL mode, we're done */ if (ret) {dev_err (dev,"MHI did not load image over BHI, ret: %d\n" , ret); -return ; +release_firmware (firmware); + goto error_fw_load; } -if (mhi_cntrl->ee ==MHI_EE_EDL ) +if (mhi_cntrl->ee ==MHI_EE_EDL ) { +release_firmware (firmware);return ; + }write_lock_irq (&mhi_cntrl->pm_lock); mhi_cntrl->dev_state =MHI_STATE_RESET ;
@@ -477,13 +477,17 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)if (mhi_cntrl->fbc_download) { ret =mhi_alloc_bhie_table (mhi_cntrl, &mhi_cntrl->fbc_image, firmware->size); -if (ret) - goto error_alloc_fw_table; +if (ret) { +release_firmware (firmware); + goto error_fw_load; + }/* Load the firmware into BHIE vec table */ mhi_firmware_copy (mhi_cntrl, firmware, mhi_cntrl->fbc_image); } +release_firmware (firmware); + fw_load_ee_pthru:/* Transitioning into MHI RESET->READY state */ ret =mhi_ready_state_transition (mhi_cntrl);
@@ -512,11 +516,11 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) ret =mhi_fw_load_bhie (mhi_cntrl,/* Vector table is the last entry */ &image_info->mhi_buf[image_info->entries -1 ]); -if (ret) +if (ret) {dev_err (dev,"MHI did not load image over BHIe, ret: %d\n" , ret); - -release_firmware (firmware); + goto error_fw_load; + }return ;
@@ -524,6 +528,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)mhi_free_bhie_table (mhi_cntrl, mhi_cntrl->fbc_image); mhi_cntrl->fbc_image =NULL ; -error_alloc_fw_table: -release_firmware (firmware); +error_fw_load: + mhi_cntrl->pm_state =MHI_PM_FW_DL_ERR ; +wake_up_all (&mhi_cntrl->state_event); }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 7/12 bus: mhi: core: Use appropriate label in firmware load handler API
In reply to Bhaumik BhattCorrect the "error_read" label to say "error_ready_state" as that is the appropriate usage of the label.
--- drivers/bus/mhi/core/boot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bus/mhi/core/boot.c +3 -3
@@ -497,7 +497,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)if (ret) {dev_err (dev,"MHI did not enter READY state\n" ); - goto error_read; + goto error_ready_state; }/* Wait for the SBL event */
@@ -508,7 +508,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)if (!ret ||MHI_PM_IN_ERROR_STATE (mhi_cntrl->pm_state)) {dev_err (dev,"MHI did not enter SBL\n" ); - goto error_read; + goto error_ready_state; }/* Start full firmware image download */
@@ -524,7 +524,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)return ; -error_read: +error_ready_state:mhi_free_bhie_table (mhi_cntrl, mhi_cntrl->fbc_image); mhi_cntrl->fbc_image =NULL ;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 12/12 bus: mhi: core: Remove MHI event ring IRQ handlers when powering down
In reply to Bhaumik BhattWhile powering down, the device may or may not acknowledge an MHI RESET issued by host for a graceful shutdown scenario and end up sending an incoming data packet after tasklets have been killed. If a rogue device sends this interrupt for a data transfer event ring update, it can result in a tasklet getting scheduled while a clean up is ongoing or has completed and cause access to freed memory leading to a NULL pointer exception. Remove the interrupt handlers for MHI event rings early on to avoid this scenario.
--- drivers/bus/mhi/core/pm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bus/mhi/core/pm.c +2 -1
@@ -494,6 +494,7 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl)for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, mhi_event++) {if (mhi_event->offload_ev)continue ; +free_irq (mhi_cntrl->irq[mhi_event->irq], mhi_event);tasklet_kill (&mhi_event->task); }
@@ -1164,7 +1165,7 @@ void mhi_power_down(struct mhi_controller *mhi_cntrl, bool graceful)/* Wait for shutdown to complete */ flush_work (&mhi_cntrl->st_worker); -mhi_deinit_free_irq (mhi_cntrl); +free_irq (mhi_cntrl->irq[0 ], mhi_cntrl);if (!mhi_cntrl->pre_init) {/* Free all allocated resources */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 9/12 bus: mhi: core: Check for IRQ availability during registration
In reply to Bhaumik BhattCurrent design allows a controller to register with MHI successfully without the need to have any IRQs available for use. If no IRQs are available, power up requests to MHI can fail after a successful registration with MHI. Improve the design by checking for the number of IRQs available sooner within the mhi_regsiter_controller() API as it is required to be specified by the controller.
--- drivers/bus/mhi/core/init.c | 2 +- drivers/bus/mhi/core/pm.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/bus/mhi/core/init.c +1 -1
@@ -858,7 +858,7 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put || !mhi_cntrl->status_cb || !mhi_cntrl->read_reg || - !mhi_cntrl->write_reg) + !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs)return -EINVAL ; ret =parse_config (mhi_cntrl, config);
drivers/bus/mhi/core/pm.c +0 -3
@@ -926,9 +926,6 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl)dev_info (dev,"Requested to power ON\n" ); -if (mhi_cntrl->nr_irqs <1 ) -return -EINVAL ; -/* Supply default wake routines if not provided by controller driver */ if (!mhi_cntrl->wake_get || !mhi_cntrl->wake_put || !mhi_cntrl->wake_toggle) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 5/12 bus: mhi: core: Prevent sending multiple RDDM entry callbacks
In reply to Bhaumik BhattIf an mhi_power_down() is initiated after the device has entered RDDM and a status callback was provided for it, it is possible that another BHI interrupt fires while waiting for the MHI RESET to be cleared. If that happens, MHI host would have moved a "disabled" execution environment and the check to allow sending an RDDM status callback will pass when it is should not. Add a check to see if MHI is in an active state before proceeding.
--- drivers/bus/mhi/core/main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/bus/mhi/core/main.c +4 -0
@@ -401,6 +401,10 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv)/* If device supports RDDM don't bother processing SYS error */ if (mhi_cntrl->rddm_image) { +/* host may be performing a device power down already */ +if (!mhi_is_active (mhi_cntrl)) + goto exit_intvec; +if (mhi_cntrl->ee ==MHI_EE_RDDM && mhi_cntrl->ee != ee) { mhi_cntrl->status_cb (mhi_cntrl,MHI_CB_EE_RDDM );wake_up_all (&mhi_cntrl->state_event);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 11/12 bus: mhi: core: Mark and maintain device states early on after power down
In reply to Bhaumik Bhattmhi_power_down() does not ensure that the PM state is moved to an inaccessible state soon enough as the system can encounter scheduling delays till mhi_pm_disable_transition() gets called. Additionally, if an MHI controller decides that the device is now inaccessible and issues a power down, the register inaccessible state is not maintained by moving from MHI_PM_LD_ERR_FATAL_DETECT to MHI_PM_SHUTDOWN_PROCESS. This can result in bus errors if a client driver attempted to read registers when powering down. Close these gaps and avoid any race conditions to prevent such activity.
--- drivers/bus/mhi/core/pm.c | 77 ++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 44 deletions(-)
drivers/bus/mhi/core/pm.c +33 -44
@@ -37,9 +37,10 @@* M0 -> FW_DL_ERR * M0 -> M3_ENTER -> M3 -> M3_EXIT --> M0 * L1: SYS_ERR_DETECT -> SYS_ERR_PROCESS --> POR -* L2: SHUTDOWN_PROCESS -> DISABLE +* L2: SHUTDOWN_PROCESS -> LD_ERR_FATAL_DETECT +* SHUTDOWN_PROCESS -> DISABLE * L3: LD_ERR_FATAL_DETECT <--> LD_ERR_FATAL_DETECT -* LD_ERR_FATAL_DETECT -> SHUTDOWN_PROCESS +* LD_ERR_FATAL_DETECT -> DISABLE */ static struct mhi_pm_transitions const dev_state_transitions[] = {/* L0 States */
@@ -72,7 +73,7 @@ static struct mhi_pm_transitions const dev_state_transitions[] = { {MHI_PM_M3 ,MHI_PM_M3_EXIT |MHI_PM_SYS_ERR_DETECT | -MHI_PM_SHUTDOWN_PROCESS |MHI_PM_LD_ERR_FATAL_DETECT +MHI_PM_LD_ERR_FATAL_DETECT }, { MHI_PM_M3_EXIT,
@@ -103,7 +104,7 @@ static struct mhi_pm_transitions const dev_state_transitions[] = {/* L3 States */ {MHI_PM_LD_ERR_FATAL_DETECT , -MHI_PM_LD_ERR_FATAL_DETECT |MHI_PM_SHUTDOWN_PROCESS +MHI_PM_LD_ERR_FATAL_DETECT |MHI_PM_DISABLE }, };
@@ -445,10 +446,9 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl) }/* Handle shutdown transitions */ -static void mhi_pm_disable_transition (struct mhi_controller *mhi_cntrl, -enum mhi_pm_state transition_state) +static void mhi_pm_disable_transition (struct mhi_controller *mhi_cntrl) { -enum mhi_pm_state cur_state, prev_state; +enum mhi_pm_state cur_state;struct mhi_event *mhi_event;struct mhi_cmd_ctxt *cmd_ctxt;struct mhi_cmd *mhi_cmd;
@@ -456,33 +456,13 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl,struct device *dev = &mhi_cntrl->mhi_dev->dev;int ret, i; -dev_dbg (dev,"Transitioning from PM state: %s to: %s\n" , -to_mhi_pm_state_str (mhi_cntrl->pm_state), -to_mhi_pm_state_str (transition_state)); +dev_dbg (dev,"Processing disable transition with PM state: %s\n" , +to_mhi_pm_state_str (mhi_cntrl->pm_state));mutex_lock (&mhi_cntrl->pm_mutex); -write_lock_irq (&mhi_cntrl->pm_lock); - prev_state = mhi_cntrl->pm_state; - cur_state =mhi_tryset_pm_state (mhi_cntrl, transition_state); -if (cur_state == transition_state) { - mhi_cntrl->ee =MHI_EE_DISABLE_TRANSITION ; - mhi_cntrl->dev_state =MHI_STATE_RESET ; - } -write_unlock_irq (&mhi_cntrl->pm_lock); - -/* Wake up threads waiting for state transition */ -wake_up_all (&mhi_cntrl->state_event); - -if (cur_state != transition_state) { -dev_err (dev,"Failed to transition to state: %s from: %s\n" , -to_mhi_pm_state_str (transition_state), -to_mhi_pm_state_str (cur_state)); -mutex_unlock (&mhi_cntrl->pm_mutex); -return ; - }/* Trigger MHI RESET so that the device will not access host memory */ -if (MHI_REG_ACCESS_VALID (prev_state)) { +if (!MHI_PM_IN_FATAL_STATE (mhi_cntrl->pm_state)) {u32 in_reset =-1 ;unsigned long timeout =msecs_to_jiffies (mhi_cntrl->timeout_ms);
@@ -785,8 +765,7 @@ void mhi_pm_st_worker(struct work_struct *work)mhi_pm_sys_error_transition (mhi_cntrl);break ;case DEV_ST_TRANSITION_DISABLE : -mhi_pm_disable_transition - (mhi_cntrl,MHI_PM_SHUTDOWN_PROCESS ); +mhi_pm_disable_transition (mhi_cntrl);break ;default :break ;
@@ -1153,23 +1132,33 @@ EXPORT_SYMBOL_GPL(mhi_async_power_up);void mhi_power_down (struct mhi_controller *mhi_cntrl,bool graceful) { -enum mhi_pm_state cur_state; +enum mhi_pm_state cur_state, transition_state;struct device *dev = &mhi_cntrl->mhi_dev->dev;/* If it's not a graceful shutdown, force MHI to linkdown state */ -if (!graceful) { -mutex_lock (&mhi_cntrl->pm_mutex); -write_lock_irq (&mhi_cntrl->pm_lock); - cur_state =mhi_tryset_pm_state (mhi_cntrl, -MHI_PM_LD_ERR_FATAL_DETECT ); -write_unlock_irq (&mhi_cntrl->pm_lock); -mutex_unlock (&mhi_cntrl->pm_mutex); -if (cur_state !=MHI_PM_LD_ERR_FATAL_DETECT ) -dev_dbg (dev,"Failed to move to state: %s from: %s\n" , -to_mhi_pm_state_str (MHI_PM_LD_ERR_FATAL_DETECT ), -to_mhi_pm_state_str (mhi_cntrl->pm_state)); + transition_state = (graceful) ?MHI_PM_SHUTDOWN_PROCESS : +MHI_PM_LD_ERR_FATAL_DETECT ; + +mutex_lock (&mhi_cntrl->pm_mutex); +write_lock_irq (&mhi_cntrl->pm_lock); + cur_state =mhi_tryset_pm_state (mhi_cntrl, transition_state); +if (cur_state != transition_state) { +dev_err (dev,"Failed to move to state: %s from: %s\n" , +to_mhi_pm_state_str (transition_state), +to_mhi_pm_state_str (mhi_cntrl->pm_state)); +/* Force link down or error fatal detected state */ + mhi_cntrl->pm_state =MHI_PM_LD_ERR_FATAL_DETECT ; } +/* mark device inactive to avoid any further host processing */ + mhi_cntrl->ee =MHI_EE_DISABLE_TRANSITION ; + mhi_cntrl->dev_state =MHI_STATE_RESET ; + +wake_up_all (&mhi_cntrl->state_event); + +write_unlock_irq (&mhi_cntrl->pm_lock); +mutex_unlock (&mhi_cntrl->pm_mutex); +mhi_queue_state_transition (mhi_cntrl,DEV_ST_TRANSITION_DISABLE );/* Wait for shutdown to complete */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 4/12 bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability
In reply to Bhaumik BhattIn some cases, the entry of device to RDDM execution environment can occur after a significant amount of time has elapsed and a SYS_ERROR state change event has already arrived. This can result in scenarios where MHI controller and client drivers are unaware of the error state of the device. Remove the check for rddm_image when processing the SYS_ERROR state change as it is present in mhi_pm_sys_err_handler() already and prevent further activity until the expected RDDM execution environment change occurs or the controller driver decides further action.
--- drivers/bus/mhi/core/main.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/bus/mhi/core/main.c +0 -5
@@ -737,11 +737,6 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, {enum mhi_pm_state new_state; -/* skip SYS_ERROR handling if RDDM supported */ -if (mhi_cntrl->ee ==MHI_EE_RDDM || - mhi_cntrl->rddm_image) -break ; -dev_dbg (dev,"System error detected\n" );write_lock_irq (&mhi_cntrl->pm_lock); new_state = mhi_tryset_pm_state(mhi_cntrl,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 10/12 bus: mhi: core: Separate system error and power down handling
In reply to Bhaumik BhattCurrently, there exist a set of if...else statements in the mhi_pm_disable_transition() function which make handling system error and disable transitions differently complex. To make that cleaner and facilitate differences in behavior, separate these two transitions for MHI host.
--- drivers/bus/mhi/core/pm.c | 159 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 137 insertions(+), 22 deletions(-)
drivers/bus/mhi/core/pm.c +137 -22
@@ -444,7 +444,7 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl)return ret; } -/* Handle SYS_ERR and Shutdown transitions */ +/* Handle shutdown transitions */ static void mhi_pm_disable_transition (struct mhi_controller *mhi_cntrl,enum mhi_pm_state transition_state) {
@@ -460,10 +460,6 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl,to_mhi_pm_state_str (mhi_cntrl->pm_state), to_mhi_pm_state_str(transition_state)); -/* We must notify MHI control driver so it can clean up first */ -if (transition_state ==MHI_PM_SYS_ERR_PROCESS ) - mhi_cntrl->status_cb (mhi_cntrl,MHI_CB_SYS_ERROR ); -mutex_lock (&mhi_cntrl->pm_mutex);write_lock_irq (&mhi_cntrl->pm_lock); prev_state = mhi_cntrl->pm_state;
@@ -502,11 +498,8 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl, MHICTRL_RESET_SHIFT, &in_reset) || !in_reset, timeout); -if ((!ret || in_reset) && cur_state ==MHI_PM_SYS_ERR_PROCESS ) { +if (!ret || in_reset)dev_err (dev,"Device failed to exit MHI Reset state\n" ); -mutex_unlock (&mhi_cntrl->pm_mutex); -return ; - }/* * Device will clear BHI_INTVEC as a part of RESET processing,
@@ -566,19 +559,142 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl, er_ctxt->wp = er_ctxt->rbase; } -if (cur_state ==MHI_PM_SYS_ERR_PROCESS ) { -mhi_ready_state_transition (mhi_cntrl); - }else { -/* Move to disable state */ -write_lock_irq (&mhi_cntrl->pm_lock); - cur_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_DISABLE ); -write_unlock_irq (&mhi_cntrl->pm_lock); -if (unlikely (cur_state !=MHI_PM_DISABLE )) -dev_err (dev,"Error moving from PM state: %s to: %s\n" , -to_mhi_pm_state_str (cur_state), -to_mhi_pm_state_str (MHI_PM_DISABLE )); +/* Move to disable state */ +write_lock_irq (&mhi_cntrl->pm_lock); + cur_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_DISABLE ); +write_unlock_irq (&mhi_cntrl->pm_lock); +if (unlikely (cur_state !=MHI_PM_DISABLE )) +dev_err (dev,"Error moving from PM state: %s to: %s\n" , +to_mhi_pm_state_str (cur_state), +to_mhi_pm_state_str (MHI_PM_DISABLE )); + +dev_dbg (dev,"Exiting 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)); + +mutex_unlock (&mhi_cntrl->pm_mutex); +} + +/* Handle system error transitions */ +static void mhi_pm_sys_error_transition (struct mhi_controller *mhi_cntrl) +{ +enum mhi_pm_state cur_state, prev_state; +struct mhi_event *mhi_event; +struct mhi_cmd_ctxt *cmd_ctxt; +struct mhi_cmd *mhi_cmd; +struct mhi_event_ctxt *er_ctxt; +struct device *dev = &mhi_cntrl->mhi_dev->dev; +int ret, i; + +dev_dbg (dev,"Transitioning from PM state: %s to: %s\n" , +to_mhi_pm_state_str (mhi_cntrl->pm_state), +to_mhi_pm_state_str (MHI_PM_SYS_ERR_PROCESS )); + +/* We must notify MHI control driver so it can clean up first */ + mhi_cntrl->status_cb (mhi_cntrl,MHI_CB_SYS_ERROR ); + +mutex_lock (&mhi_cntrl->pm_mutex); +write_lock_irq (&mhi_cntrl->pm_lock); + prev_state = mhi_cntrl->pm_state; + cur_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_SYS_ERR_PROCESS ); +write_unlock_irq (&mhi_cntrl->pm_lock); + +if (cur_state !=MHI_PM_SYS_ERR_PROCESS ) { +dev_err (dev,"Failed to transition from PM state: %s to: %s\n" , +to_mhi_pm_state_str (cur_state), +to_mhi_pm_state_str (MHI_PM_SYS_ERR_PROCESS )); + goto exit_sys_error_transition; + } + + mhi_cntrl->ee =MHI_EE_DISABLE_TRANSITION ; + mhi_cntrl->dev_state =MHI_STATE_RESET ; + +/* Wake up threads waiting for state transition */ +wake_up_all (&mhi_cntrl->state_event); + +/* Trigger MHI RESET so that the device will not access host memory */ +if (MHI_REG_ACCESS_VALID (prev_state)) { +u32 in_reset =-1 ; +unsigned long timeout =msecs_to_jiffies (mhi_cntrl->timeout_ms); + +dev_dbg (dev,"Triggering MHI Reset in device\n" ); +mhi_set_mhi_state (mhi_cntrl,MHI_STATE_RESET ); + +/* Wait for the reset bit to be cleared by the device */ + ret =wait_event_timeout (mhi_cntrl->state_event, +mhi_read_reg_field (mhi_cntrl, + mhi_cntrl->regs, +MHICTRL , +MHICTRL_RESET_MASK , +MHICTRL_RESET_SHIFT , + &in_reset) || + !in_reset, timeout); +if (!ret || in_reset) { +dev_err (dev,"Device failed to exit MHI Reset state\n" ); + goto exit_sys_error_transition; + } + +/* +* Device will clear BHI_INTVEC as a part of RESET processing, +* hence re-program it +*/ +mhi_write_reg (mhi_cntrl, mhi_cntrl->bhi,BHI_INTVEC ,0 ); + } + +dev_dbg (dev, +"Waiting for all pending event ring processing to complete\n" ); + mhi_event = mhi_cntrl->mhi_event; +for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, mhi_event++) { +if (mhi_event->offload_ev) +continue ; +tasklet_kill (&mhi_event->task); } +/* Release lock and wait for all pending threads to complete */ +mutex_unlock (&mhi_cntrl->pm_mutex); +dev_dbg (dev,"Waiting for all pending threads to complete\n" ); +wake_up_all (&mhi_cntrl->state_event); + +dev_dbg (dev,"Reset all active channels and remove MHI devices\n" ); +device_for_each_child (mhi_cntrl->cntrl_dev,NULL , mhi_destroy_device); + +mutex_lock (&mhi_cntrl->pm_mutex); + +WARN_ON (atomic_read (&mhi_cntrl->dev_wake)); +WARN_ON (atomic_read (&mhi_cntrl->pending_pkts)); + +/* Reset the ev rings and cmd rings */ +dev_dbg (dev,"Resetting EV CTXT and CMD CTXT\n" ); + mhi_cmd = mhi_cntrl->mhi_cmd; + cmd_ctxt = mhi_cntrl->mhi_ctxt->cmd_ctxt; +for (i =0 ; i <NR_OF_CMD_RINGS ; i++, mhi_cmd++, cmd_ctxt++) { +struct mhi_ring *ring = &mhi_cmd->ring; + + ring->rp = ring->base; + ring->wp = ring->base; + cmd_ctxt->rp = cmd_ctxt->rbase; + cmd_ctxt->wp = cmd_ctxt->rbase; + } + + mhi_event = mhi_cntrl->mhi_event; + er_ctxt = mhi_cntrl->mhi_ctxt->er_ctxt; +for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, er_ctxt++, + mhi_event++) { +struct mhi_ring *ring = &mhi_event->ring; + +/* Skip offload events */ +if (mhi_event->offload_ev) +continue ; + + ring->rp = ring->base; + ring->wp = ring->base; + er_ctxt->rp = er_ctxt->rbase; + er_ctxt->wp = er_ctxt->rbase; + } + +mhi_ready_state_transition (mhi_cntrl); + +exit_sys_error_transition:dev_dbg (dev,"Exiting 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));
@@ -666,8 +782,7 @@ void mhi_pm_st_worker(struct work_struct *work)mhi_ready_state_transition (mhi_cntrl);break ;case DEV_ST_TRANSITION_SYS_ERR : -mhi_pm_disable_transition - (mhi_cntrl,MHI_PM_SYS_ERR_PROCESS ); +mhi_pm_sys_error_transition (mhi_cntrl);break ;case DEV_ST_TRANSITION_DISABLE : mhi_pm_disable_transition
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 8/12 bus: mhi: core: Move to an error state on mission mode failure
In reply to Bhaumik BhattIf the host receives a mission mode event and by the time it can get to processing it, the register accesses fail implying a connectivity error, MHI should move to an error state. This helps avoid longer wait times from a synchronous power up perspective and accurately reflects the MHI execution environment and power management states.
--- drivers/bus/mhi/core/pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/bus/mhi/core/pm.c +6 -2
@@ -383,10 +383,14 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl)write_lock_irq (&mhi_cntrl->pm_lock);if (MHI_REG_ACCESS_VALID (mhi_cntrl->pm_state)) mhi_cntrl->ee =mhi_get_exec_env (mhi_cntrl); -write_unlock_irq (&mhi_cntrl->pm_lock); -if (!MHI_IN_MISSION_MODE (mhi_cntrl->ee)) +if (!MHI_IN_MISSION_MODE (mhi_cntrl->ee)) { + mhi_cntrl->pm_state =MHI_PM_LD_ERR_FATAL_DETECT ; +write_unlock_irq (&mhi_cntrl->pm_lock); +wake_up_all (&mhi_cntrl->state_event);return -EIO ; + } +write_unlock_irq (&mhi_cntrl->pm_lock);wake_up_all (&mhi_cntrl->state_event);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 2/12 bus: mhi: core: Move to using high priority workqueue
In reply to Bhaumik BhattMHI work is currently scheduled on the global/system workqueue and can encounter delays on a stressed system. To avoid those unforeseen delays which can hamper bootup or shutdown times, use a dedicated high priority workqueue instead of the global/system workqueue.
--- drivers/bus/mhi/core/init.c | 9 +++++++++ drivers/bus/mhi/core/pm.c | 2 +- include/linux/mhi.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-)
drivers/bus/mhi/core/init.c +9 -0
@@ -880,6 +880,13 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,INIT_WORK (&mhi_cntrl->st_worker, mhi_pm_st_worker);init_waitqueue_head (&mhi_cntrl->state_event); + mhi_cntrl->hiprio_wq =alloc_ordered_workqueue + ("mhi_hiprio_wq" ,WQ_MEM_RECLAIM |WQ_HIGHPRI ); +if (!mhi_cntrl->hiprio_wq) { +dev_err (mhi_cntrl->cntrl_dev,"Failed to allocate workqueue\n" ); + goto error_alloc_cmd; + } + mhi_cmd = mhi_cntrl->mhi_cmd;for (i =0 ; i <NR_OF_CMD_RINGS ; i++, mhi_cmd++)spin_lock_init (&mhi_cmd->lock);
@@ -969,6 +976,7 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl, error_alloc_cmd:vfree (mhi_cntrl->mhi_chan);kfree (mhi_cntrl->mhi_event); +destroy_workqueue (mhi_cntrl->hiprio_wq);return ret; }
@@ -982,6 +990,7 @@ void mhi_unregister_controller(struct mhi_controller *mhi_cntrl)mhi_destroy_debugfs (mhi_cntrl); +destroy_workqueue (mhi_cntrl->hiprio_wq);kfree (mhi_cntrl->mhi_cmd);kfree (mhi_cntrl->mhi_event);
drivers/bus/mhi/core/pm.c +1 -1
@@ -597,7 +597,7 @@ int mhi_queue_state_transition(struct mhi_controller *mhi_cntrl,list_add_tail (&item->node, &mhi_cntrl->transition_list);spin_unlock_irqrestore (&mhi_cntrl->transition_lock, flags); -schedule_work (&mhi_cntrl->st_worker); +queue_work (mhi_cntrl->hiprio_wq, &mhi_cntrl->st_worker);return 0 ; }
include/linux/mhi.h +2 -0
@@ -337,6 +337,7 @@ struct mhi_controller_config {* @wlock: Lock for protecting device wakeup * @mhi_link_info: Device bandwidth info * @st_worker: State transition worker +* @hiprio_wq: High priority workqueue for MHI work such as state transitions * @state_event: State change event * @status_cb: CB function to notify power states of the device (required) * @wake_get: CB function to assert device wake (optional)
@@ -419,6 +420,7 @@ struct mhi_controller {spinlock_t wlock;struct mhi_link_info mhi_link_info;struct work_struct st_worker; +struct workqueue_struct *hiprio_wq;wait_queue_head_t state_event; void (*status_cb)(struct mhi_controller *mhi_cntrl,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v4 04/12] bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability
In reply to Bhaumik BhattQuoted 11 lines · Bhaumik Bhatt
In some cases, the entry of device to RDDM execution environment can occur after a significant amount of time has elapsed and a
SYS_ERRORstate change event has already arrived. This can result in scenarios where MHI controller and client drivers are unaware of the error state of the device. Remove the check forrddm_imagewhen processing theSYS_ERRORstate change as it is present inmhi_pm_sys_err_handler()already and prevent further activity until the expected RDDM execution environment change occurs or the controller driver decides further action.Signed-off-by Bhaumik Bhatt <[email protected]>
Thanks,
Mani
Quoted 24 lines
--- drivers/bus/mhi/core/main.c | 5 ----- 1 file changed, 5 deletions(-)drivers/bus/mhi/core/main.c +0
-5@@ -737,11 +737,6 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, {enum mhi_pm_state new_state; -/* skip SYS_ERROR handling if RDDM supported */ -if (mhi_cntrl->ee ==MHI_EE_RDDM || - mhi_cntrl->rddm_image) -break ; -dev_dbg (dev,"System error detected\n" );write_lock_irq (&mhi_cntrl->pm_lock); new_state = mhi_tryset_pm_state(mhi_cntrl,Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v4 10/12] bus: mhi: core: Separate system error and power down handling
In reply to Bhaumik BhattQuoted 7 lines · Bhaumik Bhatt
Currently, there exist a set of if...else statements in the
mhi_pm_disable_transition()function which make handling system error and disable transitions differently complex. To make that cleaner and facilitate differences in behavior, separate these two transitions for MHI host.Signed-off-by Bhaumik Bhatt <[email protected]>
Thanks,
Mani
Quoted 209 lines
--- drivers/bus/mhi/core/pm.c | 159 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 137 insertions(+), 22 deletions(-)drivers/bus/mhi/core/pm.c +137
-22@@ -444,7 +444,7 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl)return ret; } -/* Handle SYS_ERR and Shutdown transitions */ +/* Handle shutdown transitions */ static void mhi_pm_disable_transition (struct mhi_controller *mhi_cntrl,enum mhi_pm_state transition_state) {@@ -460,10 +460,6 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl,to_mhi_pm_state_str (mhi_cntrl->pm_state), to_mhi_pm_state_str(transition_state)); -/* We must notify MHI control driver so it can clean up first */ -if (transition_state ==MHI_PM_SYS_ERR_PROCESS ) - mhi_cntrl->status_cb (mhi_cntrl,MHI_CB_SYS_ERROR ); -mutex_lock (&mhi_cntrl->pm_mutex);write_lock_irq (&mhi_cntrl->pm_lock); prev_state = mhi_cntrl->pm_state;@@ -502,11 +498,8 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl, MHICTRL_RESET_SHIFT, &in_reset) || !in_reset, timeout); -if ((!ret || in_reset) && cur_state ==MHI_PM_SYS_ERR_PROCESS ) { +if (!ret || in_reset)dev_err (dev,"Device failed to exit MHI Reset state\n" ); -mutex_unlock (&mhi_cntrl->pm_mutex); -return ; - }/* * Device will clear BHI_INTVEC as a part of RESET processing, @@ -566,19 +559,142 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl, er_ctxt->wp = er_ctxt->rbase; } -if (cur_state ==MHI_PM_SYS_ERR_PROCESS ) { -mhi_ready_state_transition (mhi_cntrl); - }else { -/* Move to disable state */ -write_lock_irq (&mhi_cntrl->pm_lock); - cur_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_DISABLE ); -write_unlock_irq (&mhi_cntrl->pm_lock); -if (unlikely (cur_state !=MHI_PM_DISABLE )) -dev_err (dev,"Error moving from PM state: %s to: %s\n" , -to_mhi_pm_state_str (cur_state), -to_mhi_pm_state_str (MHI_PM_DISABLE )); +/* Move to disable state */ +write_lock_irq (&mhi_cntrl->pm_lock); + cur_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_DISABLE ); +write_unlock_irq (&mhi_cntrl->pm_lock); +if (unlikely (cur_state !=MHI_PM_DISABLE )) +dev_err (dev,"Error moving from PM state: %s to: %s\n" , +to_mhi_pm_state_str (cur_state), +to_mhi_pm_state_str (MHI_PM_DISABLE )); + +dev_dbg (dev,"Exiting 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)); + +mutex_unlock (&mhi_cntrl->pm_mutex); +} + +/* Handle system error transitions */ +static void mhi_pm_sys_error_transition (struct mhi_controller *mhi_cntrl) +{ +enum mhi_pm_state cur_state, prev_state; +struct mhi_event *mhi_event; +struct mhi_cmd_ctxt *cmd_ctxt; +struct mhi_cmd *mhi_cmd; +struct mhi_event_ctxt *er_ctxt; +struct device *dev = &mhi_cntrl->mhi_dev->dev; +int ret, i; + +dev_dbg (dev,"Transitioning from PM state: %s to: %s\n" , +to_mhi_pm_state_str (mhi_cntrl->pm_state), +to_mhi_pm_state_str (MHI_PM_SYS_ERR_PROCESS )); + +/* We must notify MHI control driver so it can clean up first */ + mhi_cntrl->status_cb (mhi_cntrl,MHI_CB_SYS_ERROR ); + +mutex_lock (&mhi_cntrl->pm_mutex); +write_lock_irq (&mhi_cntrl->pm_lock); + prev_state = mhi_cntrl->pm_state; + cur_state =mhi_tryset_pm_state (mhi_cntrl,MHI_PM_SYS_ERR_PROCESS ); +write_unlock_irq (&mhi_cntrl->pm_lock); + +if (cur_state !=MHI_PM_SYS_ERR_PROCESS ) { +dev_err (dev,"Failed to transition from PM state: %s to: %s\n" , +to_mhi_pm_state_str (cur_state), +to_mhi_pm_state_str (MHI_PM_SYS_ERR_PROCESS )); + goto exit_sys_error_transition; + } + + mhi_cntrl->ee =MHI_EE_DISABLE_TRANSITION ; + mhi_cntrl->dev_state =MHI_STATE_RESET ; + +/* Wake up threads waiting for state transition */ +wake_up_all (&mhi_cntrl->state_event); + +/* Trigger MHI RESET so that the device will not access host memory */ +if (MHI_REG_ACCESS_VALID (prev_state)) { +u32 in_reset =-1 ; +unsigned long timeout =msecs_to_jiffies (mhi_cntrl->timeout_ms); + +dev_dbg (dev,"Triggering MHI Reset in device\n" ); +mhi_set_mhi_state (mhi_cntrl,MHI_STATE_RESET ); + +/* Wait for the reset bit to be cleared by the device */ + ret =wait_event_timeout (mhi_cntrl->state_event, +mhi_read_reg_field (mhi_cntrl, + mhi_cntrl->regs, +MHICTRL , +MHICTRL_RESET_MASK , +MHICTRL_RESET_SHIFT , + &in_reset) || + !in_reset, timeout); +if (!ret || in_reset) { +dev_err (dev,"Device failed to exit MHI Reset state\n" ); + goto exit_sys_error_transition; + } + +/* +* Device will clear BHI_INTVEC as a part of RESET processing, +* hence re-program it +*/ +mhi_write_reg (mhi_cntrl, mhi_cntrl->bhi,BHI_INTVEC ,0 ); + } + +dev_dbg (dev, +"Waiting for all pending event ring processing to complete\n" ); + mhi_event = mhi_cntrl->mhi_event; +for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, mhi_event++) { +if (mhi_event->offload_ev) +continue ; +tasklet_kill (&mhi_event->task); } +/* Release lock and wait for all pending threads to complete */ +mutex_unlock (&mhi_cntrl->pm_mutex); +dev_dbg (dev,"Waiting for all pending threads to complete\n" ); +wake_up_all (&mhi_cntrl->state_event); + +dev_dbg (dev,"Reset all active channels and remove MHI devices\n" ); +device_for_each_child (mhi_cntrl->cntrl_dev,NULL , mhi_destroy_device); + +mutex_lock (&mhi_cntrl->pm_mutex); + +WARN_ON (atomic_read (&mhi_cntrl->dev_wake)); +WARN_ON (atomic_read (&mhi_cntrl->pending_pkts)); + +/* Reset the ev rings and cmd rings */ +dev_dbg (dev,"Resetting EV CTXT and CMD CTXT\n" ); + mhi_cmd = mhi_cntrl->mhi_cmd; + cmd_ctxt = mhi_cntrl->mhi_ctxt->cmd_ctxt; +for (i =0 ; i <NR_OF_CMD_RINGS ; i++, mhi_cmd++, cmd_ctxt++) { +struct mhi_ring *ring = &mhi_cmd->ring; + + ring->rp = ring->base; + ring->wp = ring->base; + cmd_ctxt->rp = cmd_ctxt->rbase; + cmd_ctxt->wp = cmd_ctxt->rbase; + } + + mhi_event = mhi_cntrl->mhi_event; + er_ctxt = mhi_cntrl->mhi_ctxt->er_ctxt; +for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, er_ctxt++, + mhi_event++) { +struct mhi_ring *ring = &mhi_event->ring; + +/* Skip offload events */ +if (mhi_event->offload_ev) +continue ; + + ring->rp = ring->base; + ring->wp = ring->base; + er_ctxt->rp = er_ctxt->rbase; + er_ctxt->wp = er_ctxt->rbase; + } + +mhi_ready_state_transition (mhi_cntrl); + +exit_sys_error_transition:dev_dbg (dev,"Exiting 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));@@ -666,8 +782,7 @@ void mhi_pm_st_worker(struct work_struct *work)mhi_ready_state_transition (mhi_cntrl);break ;case DEV_ST_TRANSITION_SYS_ERR : -mhi_pm_disable_transition - (mhi_cntrl,MHI_PM_SYS_ERR_PROCESS ); +mhi_pm_sys_error_transition (mhi_cntrl);break ;case DEV_ST_TRANSITION_DISABLE : mhi_pm_disable_transitionSignature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 34 lines · Bhaumik Bhatt
Bug fixes and improvements for MHI powerup and shutdown handling. Firmware load function names are updated to accurately reflect their purpose. Closed certain design gaps where the host (MHI bus) would allow clients to operate after a power down or error detection.
Move to an error state sooner based on different scenarios.These patches were tested on arm64 and
X86_64architectures.v4:
-Fixed up bus: mhi: core: Move toSYS_ERRORregardless of RDDM capability patch by removing check for EE as well since a previous guard to check if MHIpm_stateallows event ring access is already present. Event ring access should not be allowed at the time and hence the check is safe to remove.v3:
(quoted diff) +0
-3-Fixed bus: mhi: core: Remove MHI event ring IRQ handlers when powering down -Mistakenly placed the free_irq() calls in mhi_pm_sys_error_transition() -Moved it to mhi_pm_disable_transition()v2:
(quoted diff) +0
-13-Addressed patches based on review comments and made improvements -Added bus: mhi: core: Check for IRQ availability during registration -Dropped bus: mhi: core: Use the IRQF_ONESHOT flag for the BHI interrupt line -Split bus: mhi: core: Move to an error state on any firmware load failure -Modified the following patches: -bus: mhi: core: Disable IRQs when powering down -bus: mhi: core: Improve shutdown handling after link down detection -bus: mhi: core: Mark device inactive soon after host issues a shutdown -bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability -Addressed the above as follow-up patches with improvements: -bus: mhi: core: Prevent sending multiple RDDM entry callbacks -bus: mhi: core: Separate system error and power down handling -bus: mhi: core: Remove MHI event ring IRQ handlers when powering down
Quoted 14 lines
Bhaumik Bhatt (12):
bus: mhi: core: Use appropriate names for firmware load functions
bus: mhi: core: Move to using high priority workqueue
bus: mhi: core: Skip device wake in error or shutdown states
bus: mhi: core: Move toSYS_ERRORregardless of RDDM capability
bus: mhi: core: Prevent sending multiple RDDM entry callbacks
bus: mhi: core: Move to an error state on any firmware load failure
bus: mhi: core: Use appropriate label in firmware load handler API
bus: mhi: core: Move to an error state on mission mode failure
bus: mhi: core: Check for IRQ availability during registration
bus: mhi: core: Separate system error and power down handling
bus: mhi: core: Mark and maintain device states early on after power
down
bus: mhi: core: Remove MHI event ring IRQ handlers when powering down
Series applied to mhi-next!
Thanks,
Mani
Quoted 12 lines
drivers/bus/mhi/core/boot.c | 60 ++++++----- drivers/bus/mhi/core/init.c | 11 ++- drivers/bus/mhi/core/main.c | 9 +- drivers/bus/mhi/core/pm.c | 236 ++++++++++++++++++++++++++++++++------------ include/linux/mhi.h | 2 + 5 files changed, 222 insertions(+), 96 deletions(-)Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
This series was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
Quoted 9 lines · On Mon, 9 Nov 2020 12:47:19 -0800 you wrote:
Bug fixes and improvements for MHI powerup and shutdown handling. Firmware load function names are updated to accurately reflect their purpose. Closed certain design gaps where the host (MHI bus) would allow clients to operate after a power down or error detection.
Move to an error state sooner based on different scenarios.These patches were tested on arm64 and
X86_64architectures.[...]
Here is the summary with links:
- [v4,01/12] bus: mhi: core: Use appropriate names for firmware load functions
https://git.kernel.org/qcom/c/1b55c16a5e47 - [v4,02/12] bus: mhi: core: Move to using high priority workqueue https://git.kernel.org/qcom/c/8f7039787687 - [v4,03/12] bus: mhi: core: Skip device wake in error or shutdown states https://git.kernel.org/qcom/c/8e0559921f9a - [v4,04/12] bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability https://git.kernel.org/qcom/c/3fb81a4d5f2f - [v4,05/12] bus: mhi: core: Prevent sending multiple RDDM entry callbacks https://git.kernel.org/qcom/c/0c76b3fa580d - [v4,06/12] bus: mhi: core: Move to an error state on any firmware load failure https://git.kernel.org/qcom/c/12e050c77be0 - [v4,07/12] bus: mhi: core: Use appropriate label in firmware load handler API https://git.kernel.org/qcom/c/faa257075bcc - [v4,08/12] bus: mhi: core: Move to an error state on mission mode failure https://git.kernel.org/qcom/c/dc53d862eab8 - [v4,09/12] bus: mhi: core: Check for IRQ availability during registration https://git.kernel.org/qcom/c/40c3127187cb - [v4,10/12] bus: mhi: core: Separate system error and power down handling https://git.kernel.org/qcom/c/556bbb442bbb - [v4,11/12] bus: mhi: core: Mark and maintain device states early on after power down https://git.kernel.org/qcom/c/a03c7a86e127 - [v4,12/12] bus: mhi: core: Remove MHI event ring IRQ handlers when powering down https://git.kernel.org/qcom/c/6cc1716102b5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html