Skip to content

scripts: build: Fix check_init_priorities.py for ARCMWDT compatibility #62120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+11 −1
Closed

scripts: build: Fix check_init_priorities.py for ARCMWDT compatibility #62120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion scripts/build/check_init_priorities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import pathlib
import pickle
import sys
import re

from elftools.elf.elffile import ELFFile
from elftools.elf.relocation import RelocationSection
Expand Down Expand Up @@ -75,9 +76,18 @@ class Priority:
"""
def __init__(self, name):
for idx, level in enumerate(_DEVICE_INIT_LEVELS):
expr = re.compile(rf".*{level}(\d+)_(\d+).*")
if level in name:
_, priority_str = name.strip("_").split(level)
priority, sub_priority = priority_str.split("_")

# ARCMWDT linker generates extended section names
# (ex.: .rela.z_init_POST_KERNEL40_0_.__init_k_sys_work_q_init).
# limitation is required for reading only 2 parameters from
# priority string.
Comment on lines +83 to +86
Copy link
Member

@gmarull gmarull Sep 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment is now redundant, also please check @fabiobaltieri PR, because these changes may not be needed at all

Copy link
Author

@kokas-a kokas-a Sep 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fabiobaltieri, @gmarull , Suggested changes #62459 works fine for WMDT compiler. So if pointed PR is applied in nearest future there is no need in this one (#62459).

Copy link
Member

@fabiobaltieri fabiobaltieri Sep 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's merged, hopefully we should be good to go

Sorry about the breakage again, thanks for you patience.

m = expr.match(name)
if not m:
continue
priority, sub_priority = m.groups()
self._level = idx
self._priority = int(priority)
self._sub_priority = int(sub_priority)
Expand Down