From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
To: gregkh@linuxfoundation.org
Cc: hemantk@codeaurora.org, bbhatt@codeaurora.org,
linux-arm-msm@vger.kernel.org, jhugo@codeaurora.org,
linux-kernel@vger.kernel.org, loic.poulain@linaro.org,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Subject: [PATCH 23/29] bus: mhi: core: Mark and maintain device states early on after power down
Date: Wed, 2 Dec 2020 15:11:53 +0530 [thread overview]
Message-ID: <20201202094159.107075-24-manivannan.sadhasivam@linaro.org> (raw)
In-Reply-To: <20201202094159.107075-1-manivannan.sadhasivam@linaro.org>
From: Bhaumik Bhatt <bbhatt@codeaurora.org>
mhi_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.
Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
drivers/bus/mhi/core/pm.c | 77 +++++++++++++++++----------------------
1 file changed, 33 insertions(+), 44 deletions(-)
diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c
index 347ae7dd6cf8..ffbf6f539510 100644
--- a/drivers/bus/mhi/core/pm.c
+++ b/drivers/bus/mhi/core/pm.c
@@ -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 */
--
2.25.1
next prev parent reply other threads:[~2020-12-02 9:44 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 9:41 [PATCH 00/29] MHI changes for v5.11 Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 01/29] bus: mhi: Remove auto-start option Manivannan Sadhasivam
2020-12-02 16:00 ` Kalle Valo
2020-12-02 16:27 ` Manivannan Sadhasivam
2020-12-02 16:57 ` Kalle Valo
2020-12-02 17:48 ` Greg KH
2020-12-02 9:41 ` [PATCH 02/29] net: qrtr: Start MHI channels during init Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 03/29] bus: mhi: core: fix potential operator-precedence with BHI macros Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 04/29] bus: mhi: Add MHI PCI support for WWAN modems Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 05/29] bus: mhi: core: Fix null pointer access when parsing MHI configuration Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 06/29] bus: mhi: Fix channel close issue on driver remove Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 07/29] bus: mhi: core: Remove unnecessary counter from mhi_firmware_copy() Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 08/29] bus: mhi: core: Add missing EXPORT_SYMBOL for mhi_get_mhi_state() Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 09/29] bus: mhi: core: Expose mhi_get_exec_env() API for controllers Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 10/29] bus: mhi: core: Remove unused mhi_fw_load_worker() declaration Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 11/29] bus: mhi: core: Rename RDDM download function to use proper words Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 12/29] bus: mhi: core: Skip RDDM download for unknown execution environment Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 13/29] bus: mhi: core: Use appropriate names for firmware load functions Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 14/29] bus: mhi: core: Move to using high priority workqueue Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 15/29] bus: mhi: core: Skip device wake in error or shutdown states Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 16/29] bus: mhi: core: Move to SYS_ERROR regardless of RDDM capability Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 17/29] bus: mhi: core: Prevent sending multiple RDDM entry callbacks Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 18/29] bus: mhi: core: Move to an error state on any firmware load failure Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 19/29] bus: mhi: core: Use appropriate label in firmware load handler API Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 20/29] bus: mhi: core: Move to an error state on mission mode failure Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 21/29] bus: mhi: core: Check for IRQ availability during registration Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 22/29] bus: mhi: core: Separate system error and power down handling Manivannan Sadhasivam
2020-12-02 9:41 ` Manivannan Sadhasivam [this message]
2020-12-02 9:41 ` [PATCH 24/29] bus: mhi: core: Remove MHI event ring IRQ handlers when powering down Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 25/29] net: qrtr: Unprepare MHI channels during remove Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 26/29] bus: mhi: core: Indexed MHI controller name Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 27/29] bus: mhi: core: Fix device hierarchy Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 28/29] bus: mhi: core: Fix error handling in mhi_register_controller() Manivannan Sadhasivam
2020-12-02 9:41 ` [PATCH 29/29] mhi: pci_generic: Fix implicit conversion warning Manivannan Sadhasivam
2020-12-02 16:29 ` [PATCH 00/29] MHI changes for v5.11 Manivannan Sadhasivam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201202094159.107075-24-manivannan.sadhasivam@linaro.org \
--to=manivannan.sadhasivam@linaro.org \
--cc=bbhatt@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=hemantk@codeaurora.org \
--cc=jhugo@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).