scripts: Adapt where to get init function pointer in check_init scripts

As the pointer has been removed from struct init_entry, it should be
looked up in the pointed object instead, as it has been done already
for device objects.

Signed-off-by: Tomasz Bursztyka <[email protected]>

Author: tbursztyka

scripts/build/check_init_priorities.py

@@ -51,6 +51,8 @@
 
 # The offset of the init pointer in "struct device", in number of pointers.
 DEVICE_INIT_OFFSET = 5
+# The offset of the init pointer in "struct service", in number of pointers.
+SERVICE_INIT_OFFSET = 0
 
 class Priority:
     """Parses and holds a device initialization priority.
@@ -207,20 +209,23 @@ def _process_initlevels(self):
                     raise ValueError(f"no symbol at addr {addr:08x}")
                 obj, size, shidx = self._objects[addr]
 
-                arg0_name = self._object_name(self._initlevel_pointer(addr, 0, shidx))
-                arg1_name = self._object_name(self._initlevel_pointer(addr, 1, shidx))
+                obj_name = self._object_name(self._initlevel_pointer(addr, 0, shidx))
+                if obj_name != "unknown":
+                    obj_addr = self._object_addr[obj_name]
+                    _, _, shidx = self._objects[obj_addr]
 
-                ordinal = self._device_ord_from_name(arg1_name)
-                if ordinal:
-                    dev_addr = self._object_addr[arg1_name]
-                    _, _, shidx = self._objects[dev_addr]
-                    arg0_name = self._object_name(self._initlevel_pointer(
-                        dev_addr, DEVICE_INIT_OFFSET, shidx))
+                    ordinal = self._device_ord_from_name(obj_name)
+                    if ordinal:
+                        init_fn_name = self._object_name(self._initlevel_pointer(
+                            obj_addr, DEVICE_INIT_OFFSET, shidx))
 
-                    prio = Priority(level, priority)
-                    self.devices[ordinal] = (prio, arg0_name)
+                        prio = Priority(level, priority)
+                        self.devices[ordinal] = (prio, init_fn_name)
+                    else:
+                        init_fn_name = self._object_name(self._initlevel_pointer(
+                            obj_addr, SERVICE_INIT_OFFSET, shidx))
 
-                self.initlevels[level].append(f"{obj}: {arg0_name}({arg1_name})")
+                        self.initlevels[level].append(f"{obj}: {init_fn_name}({obj_name})")
 
                 addr += size
                 priority += 1

scripts/build/check_init_priorities_test.py

@@ -209,24 +209,29 @@ def test_process_initlevels(self, mock_zilinit, mock_ip, mock_on):
                 0x00: ("a", 4, 0),
                 0x04: ("b", 4, 0),
                 0x08: ("c", 4, 0),
+                0x0a: ("d", 4, 0),
                 }
         obj._object_addr = {
                 "__device_dts_ord_11": 0x00,
                 "__device_dts_ord_22": 0x04,
+                "__service_foo" : 0x0a,
                 }
 
         mock_ip.side_effect = lambda *args: args
 
         def mock_obj_name(*args):
-            if args[0] == (0, 5, 0):
-                return "i0"
-            elif args[0] == (0, 1, 0):
+            if args[0] == (0, 0, 0):
                 return "__device_dts_ord_11"
+            elif args[0] == (4, 0, 0):
+                return "__device_dts_ord_22"
+            elif args[0] == (8, 0, 0):
+                return "__service_foo"
+            elif args[0] == (10, 0, 0):
+                return "foo_init_fn"
+            elif args[0] == (0, 5, 0):
+                return "i0"
             elif args[0] == (4, 5, 0):
                 return "i1"
-            elif args[0] == (4, 1, 0):
-                return "__device_dts_ord_22"
-            return f"name_{args[0][0]}_{args[0][1]}"
         mock_on.side_effect = mock_obj_name
 
         obj._process_initlevels()
@@ -235,7 +240,7 @@ def mock_obj_name(*args):
             "EARLY": [],
             "PRE_KERNEL_1": [],
             "PRE_KERNEL_2": ["a: i0(__device_dts_ord_11)", "b: i1(__device_dts_ord_22)"],
-            "POST_KERNEL": ["c: name_8_0(name_8_1)"],
+            "POST_KERNEL": ["c: foo_init_fn(__service_foo)"],
             "APPLICATION": [],
             "SMP": [],
             })