* [PATCH V3 1/3] i3c: master: Add i3c_master_do_daa_ext() for post-hibernation address recovery
2026-01-20 18:37 [PATCH V3 0/3] i3c: mipi-i3c-hci-pci: Add System Suspend support Adrian Hunter
@ 2026-01-20 18:37 ` Adrian Hunter
2026-01-20 20:28 ` Frank Li
2026-01-20 18:37 ` [PATCH V3 2/3] i3c: mipi-i3c-hci: Add optional System Suspend support Adrian Hunter
2026-01-20 18:37 ` [PATCH V3 3/3] i3c: mipi-i3c-hci-pci: Add " Adrian Hunter
2 siblings, 1 reply; 5+ messages in thread
From: Adrian Hunter @ 2026-01-20 18:37 UTC (permalink / raw)
To: alexandre.belloni; +Cc: Frank.Li, Wolfram Sang, david.nystrom, linux-i3c
After system hibernation, I3C Dynamic Addresses may be reassigned at boot
and no longer match the values recorded before suspend. Introduce
i3c_master_do_daa_ext() to handle this situation.
The restore procedure is straightforward: issue a Reset Dynamic Address
Assignment (RSTDAA), then run the standard DAA sequence. The existing DAA
logic already supports detecting and updating devices whose dynamic
addresses differ from previously known values.
Refactor the DAA path by introducing a shared helper used by both the
normal i3c_master_do_daa() path and the new extended restore function,
and correct the kernel-doc in the process.
Export i3c_master_do_daa_ext() so that master drivers can invoke it from
their PM restore callbacks.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
Changes in V3:
Rename 'restore' parameter to 'rstdaa'
Changes in V2:
Helper function is now called i3c_master_do_daa_ext() and takes
'restore' as an argument.
Fix new helper function so that RSTDAA is conditional on the
'restore' parameter.
Subject and commit message amended accordingly.
drivers/i3c/master.c | 49 +++++++++++++++++++++++++++++---------
include/linux/i3c/master.h | 1 +
2 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 594d61edcef4..49fb6e30a68e 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -1735,22 +1735,24 @@ i3c_master_register_new_i3c_devs(struct i3c_master_controller *master)
}
/**
- * i3c_master_do_daa() - do a DAA (Dynamic Address Assignment)
- * @master: master doing the DAA
+ * i3c_master_do_daa_ext() - Dynamic Address Assignment (extended version)
+ * @master: controller
+ * @rstdaa: whether to first perform Reset of Dynamic Addresses (RSTDAA)
*
- * This function is instantiating an I3C device object and adding it to the
- * I3C device list. All device information are automatically retrieved using
- * standard CCC commands.
- *
- * The I3C device object is returned in case the master wants to attach
- * private data to it using i3c_dev_set_master_data().
+ * Perform Dynamic Address Assignment with optional support for System
+ * Hibernation (@rstdaa is true).
*
- * This function must be called with the bus lock held in write mode.
+ * After System Hibernation, Dynamic Addresses can have been reassigned at boot
+ * time to different values. A simple strategy is followed to handle that.
+ * Perform a Reset of Dynamic Addresses (RSTDAA) followed by the normal DAA
+ * procedure which has provision for reassigning addresses that differ from the
+ * previously recorded addresses.
*
* Return: a 0 in case of success, an negative error code otherwise.
*/
-int i3c_master_do_daa(struct i3c_master_controller *master)
+int i3c_master_do_daa_ext(struct i3c_master_controller *master, bool rstdaa)
{
+ int rstret = 0;
int ret;
ret = i3c_master_rpm_get(master);
@@ -1758,7 +1760,15 @@ int i3c_master_do_daa(struct i3c_master_controller *master)
return ret;
i3c_bus_maintenance_lock(&master->bus);
+
+ if (rstdaa) {
+ rstret = i3c_master_rstdaa_locked(master, I3C_BROADCAST_ADDR);
+ if (rstret == I3C_ERROR_M2)
+ rstret = 0;
+ }
+
ret = master->ops->do_daa(master);
+
i3c_bus_maintenance_unlock(&master->bus);
if (ret)
@@ -1769,7 +1779,24 @@ int i3c_master_do_daa(struct i3c_master_controller *master)
i3c_bus_normaluse_unlock(&master->bus);
out:
i3c_master_rpm_put(master);
- return ret;
+
+ return rstret ?: ret;
+}
+EXPORT_SYMBOL_GPL(i3c_master_do_daa_ext);
+
+/**
+ * i3c_master_do_daa() - do a DAA (Dynamic Address Assignment)
+ * @master: master doing the DAA
+ *
+ * This function instantiates I3C device objects and adds them to the
+ * I3C device list. All device information is automatically retrieved using
+ * standard CCC commands.
+ *
+ * Return: a 0 in case of success, an negative error code otherwise.
+ */
+int i3c_master_do_daa(struct i3c_master_controller *master)
+{
+ return i3c_master_do_daa_ext(master, false);
}
EXPORT_SYMBOL_GPL(i3c_master_do_daa);
diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h
index c1ec597f655c..af2bb48363ba 100644
--- a/include/linux/i3c/master.h
+++ b/include/linux/i3c/master.h
@@ -598,6 +598,7 @@ int i3c_master_get_free_addr(struct i3c_master_controller *master,
int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
u8 addr);
int i3c_master_do_daa(struct i3c_master_controller *master);
+int i3c_master_do_daa_ext(struct i3c_master_controller *master, bool rstdaa);
struct i3c_dma *i3c_master_dma_map_single(struct device *dev, void *ptr,
size_t len, bool force_bounce,
enum dma_data_direction dir);
--
2.51.0
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH V3 1/3] i3c: master: Add i3c_master_do_daa_ext() for post-hibernation address recovery
2026-01-20 18:37 ` [PATCH V3 1/3] i3c: master: Add i3c_master_do_daa_ext() for post-hibernation address recovery Adrian Hunter
@ 2026-01-20 20:28 ` Frank Li
0 siblings, 0 replies; 5+ messages in thread
From: Frank Li @ 2026-01-20 20:28 UTC (permalink / raw)
To: Adrian Hunter; +Cc: alexandre.belloni, Wolfram Sang, david.nystrom, linux-i3c
On Tue, Jan 20, 2026 at 08:37:33PM +0200, Adrian Hunter wrote:
> After system hibernation, I3C Dynamic Addresses may be reassigned at boot
> and no longer match the values recorded before suspend. Introduce
> i3c_master_do_daa_ext() to handle this situation.
>
> The restore procedure is straightforward: issue a Reset Dynamic Address
> Assignment (RSTDAA), then run the standard DAA sequence. The existing DAA
> logic already supports detecting and updating devices whose dynamic
> addresses differ from previously known values.
>
> Refactor the DAA path by introducing a shared helper used by both the
> normal i3c_master_do_daa() path and the new extended restore function,
> and correct the kernel-doc in the process.
>
> Export i3c_master_do_daa_ext() so that master drivers can invoke it from
> their PM restore callbacks.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
Reviewed-by: Frank Li <Frank.Li@nxp.com>
>
>
> Changes in V3:
>
> Rename 'restore' parameter to 'rstdaa'
>
> Changes in V2:
> Helper function is now called i3c_master_do_daa_ext() and takes
> 'restore' as an argument.
> Fix new helper function so that RSTDAA is conditional on the
> 'restore' parameter.
> Subject and commit message amended accordingly.
>
>
> drivers/i3c/master.c | 49 +++++++++++++++++++++++++++++---------
> include/linux/i3c/master.h | 1 +
> 2 files changed, 39 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
> index 594d61edcef4..49fb6e30a68e 100644
> --- a/drivers/i3c/master.c
> +++ b/drivers/i3c/master.c
> @@ -1735,22 +1735,24 @@ i3c_master_register_new_i3c_devs(struct i3c_master_controller *master)
> }
>
> /**
> - * i3c_master_do_daa() - do a DAA (Dynamic Address Assignment)
> - * @master: master doing the DAA
> + * i3c_master_do_daa_ext() - Dynamic Address Assignment (extended version)
> + * @master: controller
> + * @rstdaa: whether to first perform Reset of Dynamic Addresses (RSTDAA)
> *
> - * This function is instantiating an I3C device object and adding it to the
> - * I3C device list. All device information are automatically retrieved using
> - * standard CCC commands.
> - *
> - * The I3C device object is returned in case the master wants to attach
> - * private data to it using i3c_dev_set_master_data().
> + * Perform Dynamic Address Assignment with optional support for System
> + * Hibernation (@rstdaa is true).
> *
> - * This function must be called with the bus lock held in write mode.
> + * After System Hibernation, Dynamic Addresses can have been reassigned at boot
> + * time to different values. A simple strategy is followed to handle that.
> + * Perform a Reset of Dynamic Addresses (RSTDAA) followed by the normal DAA
> + * procedure which has provision for reassigning addresses that differ from the
> + * previously recorded addresses.
> *
> * Return: a 0 in case of success, an negative error code otherwise.
> */
> -int i3c_master_do_daa(struct i3c_master_controller *master)
> +int i3c_master_do_daa_ext(struct i3c_master_controller *master, bool rstdaa)
> {
> + int rstret = 0;
> int ret;
>
> ret = i3c_master_rpm_get(master);
> @@ -1758,7 +1760,15 @@ int i3c_master_do_daa(struct i3c_master_controller *master)
> return ret;
>
> i3c_bus_maintenance_lock(&master->bus);
> +
> + if (rstdaa) {
> + rstret = i3c_master_rstdaa_locked(master, I3C_BROADCAST_ADDR);
> + if (rstret == I3C_ERROR_M2)
> + rstret = 0;
> + }
> +
> ret = master->ops->do_daa(master);
> +
> i3c_bus_maintenance_unlock(&master->bus);
>
> if (ret)
> @@ -1769,7 +1779,24 @@ int i3c_master_do_daa(struct i3c_master_controller *master)
> i3c_bus_normaluse_unlock(&master->bus);
> out:
> i3c_master_rpm_put(master);
> - return ret;
> +
> + return rstret ?: ret;
> +}
> +EXPORT_SYMBOL_GPL(i3c_master_do_daa_ext);
> +
> +/**
> + * i3c_master_do_daa() - do a DAA (Dynamic Address Assignment)
> + * @master: master doing the DAA
> + *
> + * This function instantiates I3C device objects and adds them to the
> + * I3C device list. All device information is automatically retrieved using
> + * standard CCC commands.
> + *
> + * Return: a 0 in case of success, an negative error code otherwise.
> + */
> +int i3c_master_do_daa(struct i3c_master_controller *master)
> +{
> + return i3c_master_do_daa_ext(master, false);
> }
> EXPORT_SYMBOL_GPL(i3c_master_do_daa);
>
> diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h
> index c1ec597f655c..af2bb48363ba 100644
> --- a/include/linux/i3c/master.h
> +++ b/include/linux/i3c/master.h
> @@ -598,6 +598,7 @@ int i3c_master_get_free_addr(struct i3c_master_controller *master,
> int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
> u8 addr);
> int i3c_master_do_daa(struct i3c_master_controller *master);
> +int i3c_master_do_daa_ext(struct i3c_master_controller *master, bool rstdaa);
> struct i3c_dma *i3c_master_dma_map_single(struct device *dev, void *ptr,
> size_t len, bool force_bounce,
> enum dma_data_direction dir);
> --
> 2.51.0
>
>
> --
> linux-i3c mailing list
> linux-i3c@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-i3c
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V3 2/3] i3c: mipi-i3c-hci: Add optional System Suspend support
2026-01-20 18:37 [PATCH V3 0/3] i3c: mipi-i3c-hci-pci: Add System Suspend support Adrian Hunter
2026-01-20 18:37 ` [PATCH V3 1/3] i3c: master: Add i3c_master_do_daa_ext() for post-hibernation address recovery Adrian Hunter
@ 2026-01-20 18:37 ` Adrian Hunter
2026-01-20 18:37 ` [PATCH V3 3/3] i3c: mipi-i3c-hci-pci: Add " Adrian Hunter
2 siblings, 0 replies; 5+ messages in thread
From: Adrian Hunter @ 2026-01-20 18:37 UTC (permalink / raw)
To: alexandre.belloni; +Cc: Frank.Li, Wolfram Sang, david.nystrom, linux-i3c
Add system suspend callbacks. Implement them by forcing runtime PM.
Consequently bail out if Runtime PM is not allowed.
On resume from System Suspend (suspend to RAM), rerun Dynamic Address
Assignment to restore addresses for devices that may have lost power.
On resume from System Hibernation (suspend to disk), use the new
i3c_master_do_daa_ext() helper with 'rstdaa' set to true, which
additionally handles the case where devices are assigned different dynamic
addresses after a hibernation boot.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
---
Changes in V3:
Rename 'restore' parameter to 'rstdaa'
Add Frank's Rev'd-by
Changes in V2:
Helper function is now called i3c_master_do_daa_ext() and takes
'restore' as an argument
drivers/i3c/master/mipi-i3c-hci/core.c | 49 ++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/drivers/i3c/master/mipi-i3c-hci/core.c b/drivers/i3c/master/mipi-i3c-hci/core.c
index 02c5a133e329..e925584113d1 100644
--- a/drivers/i3c/master/mipi-i3c-hci/core.c
+++ b/drivers/i3c/master/mipi-i3c-hci/core.c
@@ -769,6 +769,49 @@ static int i3c_hci_runtime_resume(struct device *dev)
return 0;
}
+static int i3c_hci_suspend(struct device *dev)
+{
+ struct i3c_hci *hci = dev_get_drvdata(dev);
+
+ if (!(hci->quirks & HCI_QUIRK_RPM_ALLOWED))
+ return 0;
+
+ return pm_runtime_force_suspend(dev);
+}
+
+static int i3c_hci_resume_common(struct device *dev, bool rstdaa)
+{
+ struct i3c_hci *hci = dev_get_drvdata(dev);
+ int ret;
+
+ if (!(hci->quirks & HCI_QUIRK_RPM_ALLOWED))
+ return 0;
+
+ ret = pm_runtime_force_resume(dev);
+ if (ret)
+ return ret;
+
+ ret = i3c_master_do_daa_ext(&hci->master, rstdaa);
+ if (ret)
+ dev_err(dev, "Dynamic Address Assignment failed on resume, error %d\n", ret);
+
+ /*
+ * I3C devices may have retained their dynamic address anyway. Do not
+ * fail the resume because of DAA error.
+ */
+ return 0;
+}
+
+static int i3c_hci_resume(struct device *dev)
+{
+ return i3c_hci_resume_common(dev, false);
+}
+
+static int i3c_hci_restore(struct device *dev)
+{
+ return i3c_hci_resume_common(dev, true);
+}
+
#define DEFAULT_AUTOSUSPEND_DELAY_MS 1000
static void i3c_hci_rpm_enable(struct device *dev)
@@ -945,6 +988,12 @@ static const struct platform_device_id i3c_hci_driver_ids[] = {
MODULE_DEVICE_TABLE(platform, i3c_hci_driver_ids);
static const struct dev_pm_ops i3c_hci_pm_ops = {
+ .suspend = pm_sleep_ptr(i3c_hci_suspend),
+ .resume = pm_sleep_ptr(i3c_hci_resume),
+ .freeze = pm_sleep_ptr(i3c_hci_suspend),
+ .thaw = pm_sleep_ptr(i3c_hci_resume),
+ .poweroff = pm_sleep_ptr(i3c_hci_suspend),
+ .restore = pm_sleep_ptr(i3c_hci_restore),
RUNTIME_PM_OPS(i3c_hci_runtime_suspend, i3c_hci_runtime_resume, NULL)
};
--
2.51.0
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH V3 3/3] i3c: mipi-i3c-hci-pci: Add System Suspend support
2026-01-20 18:37 [PATCH V3 0/3] i3c: mipi-i3c-hci-pci: Add System Suspend support Adrian Hunter
2026-01-20 18:37 ` [PATCH V3 1/3] i3c: master: Add i3c_master_do_daa_ext() for post-hibernation address recovery Adrian Hunter
2026-01-20 18:37 ` [PATCH V3 2/3] i3c: mipi-i3c-hci: Add optional System Suspend support Adrian Hunter
@ 2026-01-20 18:37 ` Adrian Hunter
2 siblings, 0 replies; 5+ messages in thread
From: Adrian Hunter @ 2026-01-20 18:37 UTC (permalink / raw)
To: alexandre.belloni; +Cc: Frank.Li, Wolfram Sang, david.nystrom, linux-i3c
Assign the driver PM operations pointer, which is necessary for the PCI
subsystem to put the device into a low power state. Refer to
pci_pm_suspend_noirq() which bails out if the pointer is NULL, before
it has the opportunity to call pci_prepare_to_sleep().
No other actions are necessary as the mipi-i3c-hci driver takes care of
controller state.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
---
Changes in V3:
Add Frank's Rev'd-by
Changes in V2:
None
drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c b/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c
index 1b38771667e5..0f05a15c14c7 100644
--- a/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c
+++ b/drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c
@@ -320,6 +320,10 @@ static void mipi_i3c_hci_pci_remove(struct pci_dev *pci)
mfd_remove_devices(&pci->dev);
}
+/* PM ops must exist for PCI to put a device to a low power state */
+static const struct dev_pm_ops mipi_i3c_hci_pci_pm_ops = {
+};
+
static const struct pci_device_id mipi_i3c_hci_pci_devices[] = {
/* Wildcat Lake-U */
{ PCI_VDEVICE(INTEL, 0x4d7c), (kernel_ulong_t)&intel_mi_1_info},
@@ -342,6 +346,9 @@ static struct pci_driver mipi_i3c_hci_pci_driver = {
.id_table = mipi_i3c_hci_pci_devices,
.probe = mipi_i3c_hci_pci_probe,
.remove = mipi_i3c_hci_pci_remove,
+ .driver = {
+ .pm = pm_ptr(&mipi_i3c_hci_pci_pm_ops)
+ },
};
module_pci_driver(mipi_i3c_hci_pci_driver);
--
2.51.0
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply related [flat|nested] 5+ messages in thread