[PATCH V2 11/16] i3c: mipi-i3c-hci: Factor out reset-and-restore helper

Adrian Hunter
2026-04-21T17:55:10Z

Factor the reset-and-restore sequence out of i3c_hci_rpm_resume() into
a separate helper.

This allows the same logic to be reused for recovery paths in subsequent
changes without duplicating suspend/resume handling.

No functional change.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---

Changes in V2:

Drop redundant i3c_hci_sync_irq_inactive(hci)
from i3c_hci_reset_and_restore() because it is called by
hci->io->suspend() anyway

drivers/i3c/master/mipi-i3c-hci/core.c | 19 +++++++++++++++++--
drivers/i3c/master/mipi-i3c-hci/hci.h | 2 ++
2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/i3c/master/mipi-i3c-hci/core.c b/drivers/i3c/master/mipi-i3c-hci/core.c
index 8274c84b16be..12a0122fb709 100644
--- a/drivers/i3c/master/mipi-i3c-hci/core.c
+++ b/drivers/i3c/master/mipi-i3c-hci/core.c
@@ -798,9 +798,8 @@ int i3c_hci_rpm_suspend(struct device *dev)
}
EXPORT_SYMBOL_GPL(i3c_hci_rpm_suspend);

-int i3c_hci_rpm_resume(struct device *dev)
+static int i3c_hci_do_reset_and_restore(struct i3c_hci *hci)
{
- struct i3c_hci *hci = dev_get_drvdata(dev);
int ret;

ret = i3c_hci_reset_and_init(hci);
@@ -821,6 +820,22 @@ int i3c_hci_rpm_resume(struct device *dev)

return 0;
}
+
+int i3c_hci_reset_and_restore(struct i3c_hci *hci)
+{
+ i3c_hci_bus_disable(hci);
+
+ hci->io->suspend(hci);
+
+ return i3c_hci_do_reset_and_restore(hci);
+}
+
+int i3c_hci_rpm_resume(struct device *dev)
+{
+ struct i3c_hci *hci = dev_get_drvdata(dev);
+
+ return i3c_hci_do_reset_and_restore(hci);
+}
EXPORT_SYMBOL_GPL(i3c_hci_rpm_resume);

static int i3c_hci_runtime_suspend(struct device *dev)
diff --git a/drivers/i3c/master/mipi-i3c-hci/hci.h b/drivers/i3c/master/mipi-i3c-hci/hci.h
index 97c31a315a6e..a3151c26827e 100644
--- a/drivers/i3c/master/mipi-i3c-hci/hci.h
+++ b/drivers/i3c/master/mipi-i3c-hci/hci.h
@@ -175,4 +175,6 @@ int i3c_hci_process_xfer(struct i3c_hci *hci, struct hci_xfer *xfer, int n);
int i3c_hci_rpm_suspend(struct device *dev);
int i3c_hci_rpm_resume(struct device *dev);

+int i3c_hci_reset_and_restore(struct i3c_hci *hci);
+
#endif