Skip to contentSkip to conversation

FAILED: patch "[PATCH] bus: mhi: Fix pm_state conversion to string" failed to apply to 5.15-stable tree

PATCH [email protected] 1 participant 1 message Mar 31, 2022

Subsystems (2)
Stable branch MHI bus
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 64f93a9a27c1970fa8ee5ffc5a6ae2bda477ec5b Mon Sep 17 00:00:00 2001
From: Paul Davey <[email protected]>
Date: Tue, 1 Mar 2022 21:33:00 +0530
Subject: [PATCH] bus: mhi: Fix pm_state conversion to string

On big endian architectures the mhi debugfs files which report pm state give "Invalid State" for all states. This is caused by using find_last_bit which takes an unsigned long* while the state is passed in as an enum mhi_pm_state which will be of int size.

Fix by using __fls to pass the value of state instead of find_last_bit.

Also the current API expects "mhi_pm_state" enumerator as the function argument but the function only works with bitmasks. So as Alex suggested, let's change the argument to u32 to avoid confusion.

Fixes a6e2e3522f29 ("bus: mhi: core: Add support for PM state transitions")
Cc [email protected]
[mani: changed the function argument to u32]
Reviewed-by Manivannan Sadhasivam <[email protected]>
Reviewed-by Hemant Kumar <[email protected]>
Reviewed-by Alex Elder <[email protected]>
Signed-off-by Paul Davey <[email protected]>
Signed-off-by Manivannan Sadhasivam <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/bus/mhi/core/init.c +6 -4
index 046f407dc5d6..09394a1c29ec 100644
@@ -77,12 +77,14 @@ static const char * const mhi_pm_state_str[] = {
 	[MHI_PM_STATE_LD_ERR_FATAL_DETECT] = "Linkdown or Error Fatal Detect",
 };
 
-const char *to_mhi_pm_state_str(enum mhi_pm_state state)
+const char *to_mhi_pm_state_str(u32 state)
 {
-	unsigned long pm_state = state;
-	int index = find_last_bit(&pm_state, 32);
+	int index;
 
-	if (index >= ARRAY_SIZE(mhi_pm_state_str))
+	if (state)
+		index = __fls(state);
+
+	if (!state || index >= ARRAY_SIZE(mhi_pm_state_str))
 		return "Invalid State";
 
 	return mhi_pm_state_str[index];
drivers/bus/mhi/core/internal.h +1 -1
index e2e10474a9d9..3508cbbf555d 100644
@@ -622,7 +622,7 @@ void mhi_free_bhie_table(struct mhi_controller *mhi_cntrl,
 enum mhi_pm_state __must_check mhi_tryset_pm_state(
 					struct mhi_controller *mhi_cntrl,
 					enum mhi_pm_state state);
-const char *to_mhi_pm_state_str(enum mhi_pm_state state);
+const char *to_mhi_pm_state_str(u32 state);
 int mhi_queue_state_transition(struct mhi_controller *mhi_cntrl,
 			       enum dev_st_transition state);
 void mhi_pm_st_worker(struct work_struct *work);