dm: event: add EVT_DM_POST_INIT_R event type

This patch introduces EVT_DM_POST_INIT_R event type for handling hooks
after relocation.

Fixes: 55171aedda88 ("dm: Emit the arch_cpu_init_dm() even only before relocation")
Suggested-by: Simon Glass <[email protected]>
Cc: Bin Meng <[email protected]>
Signed-off-by: Chanho Park <[email protected]>
Tested-by: Milan P. Stanić <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Tested-by: Roland Ruckerbauer <[email protected]>
Tested-by: Roland Ruckerbauer <[email protected]>
Fixed missing event name in event.c:
Signed-off-by: Simon Glass <[email protected]>

diff --git a/common/event.c b/common/event.c
index 3224e2812224da85b0b61c0f3d758e4427bfe577..6653300e6cf48db043f41064c71bc6539cd5cec9 100644 (file)
--- a/common/event.c
+++ b/common/event.c
@@ -28,6 +28,7 @@ const char *const type_name[] = {
 
        /* Events related to driver model */
        "dm_post_init_f",
+       "dm_post_init_r",
        "dm_pre_probe",
        "dm_post_probe",
        "dm_pre_remove",

diff --git a/drivers/core/root.c b/drivers/core/root.c
index 6775fb0b65755e6df564c63797442591fdfb860b..79d871ab291aece7dcbf234bfa8ab194d4e0dcf3 100644 (file)
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -436,8 +436,10 @@ int dm_init_and_scan(bool pre_reloc_only)
                        return ret;
                }
        }
-       if (CONFIG_IS_ENABLED(DM_EVENT) && !(gd->flags & GD_FLG_RELOC)) {
-               ret = event_notify_null(EVT_DM_POST_INIT_F);
+       if (CONFIG_IS_ENABLED(DM_EVENT)) {
+               ret = event_notify_null(gd->flags & GD_FLG_RELOC ?
+                                       EVT_DM_POST_INIT_R :
+                                       EVT_DM_POST_INIT_F);
                if (ret)
                        return log_msg_ret("ev", ret);
        }

diff --git a/include/event.h b/include/event.h
index daf44bf8a83b2ec2edcee981c23bed16df78df5d..bb38ba98e73bb685561ec79d1f60126f6b387916 100644 (file)
--- a/include/event.h
+++ b/include/event.h
@@ -24,6 +24,7 @@ enum event_t {
 
        /* Events related to driver model */
        EVT_DM_POST_INIT_F,
+       EVT_DM_POST_INIT_R,
        EVT_DM_PRE_PROBE,
        EVT_DM_POST_PROBE,
        EVT_DM_PRE_REMOVE,