update_kernel_afdo: Freeze arm/5.15 on 114
BUG=b:277922889
TEST=./update_kernel_afdo --noupload canary
Change-Id: I4f8f562603116e7b2d3f299e3a82e49468551347
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/4450607
Tested-by: Denis Nikitin <denik@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Denis Nikitin <denik@chromium.org>
diff --git a/afdo_tools/update_kernel_afdo b/afdo_tools/update_kernel_afdo
index 5695e1a..2e8e07f 100755
--- a/afdo_tools/update_kernel_afdo
+++ b/afdo_tools/update_kernel_afdo
@@ -52,12 +52,14 @@
# The second scenario is when we want to disable kernel AFDO (when all devices
# move to kernelnext and there are no new profiles from the field). In this
# case we disable AFDO in main but still keep it live in beta and stable.
-declare -A SKIPPED_KVERS_IN_BRANCHES
-# In SKIPPED_KVERS_IN_BRANCHES
+declare -A SKIPPED_ARCHKVERS_IN_BRANCHES
+# In SKIPPED_ARCHKVERS_IN_BRANCHES
# - key is a branch number string;
-# - value is the list of kernels separated by space.
-# Example: SKIPPED_KVERS_IN_BRANCHES["105"]="4.4 4.14"
+# - value is the list of arch/kver separated by space.
+# Example: SKIPPED_ARCHKVERS_IN_BRANCHES["105"]="amd/4.4 arm/5.15"
# -------------------
+# Kernel tracing was disabled on arm in 114, b/275560674.
+SKIPPED_ARCHKVERS_IN_BRANCHES["114"]="arm/5.15"
script_dir=$(dirname "$0")
tc_utils_dir="${script_dir}/.."
@@ -218,15 +220,16 @@
do
# Skip kernels disabled in this branch.
skipped=false
- for skipped_branch in "${!SKIPPED_KVERS_IN_BRANCHES[@]}"
+ for skipped_branch in "${!SKIPPED_ARCHKVERS_IN_BRANCHES[@]}"
do
if [[ ${curr_branch_number} == "${skipped_branch}" ]]
then
- # Current branch is in the keys of SKIPPED_KVERS_IN_BRANCHES.
- # Now lets check if $kver is in the list.
- for skipped_kver in ${SKIPPED_KVERS_IN_BRANCHES[${skipped_branch}]}
+ # Current branch is in the keys of SKIPPED_ARCHKVERS_IN_BRANCHES.
+ # Now lets check if $arch/$kver is in the list.
+ for skipped_archkver in \
+ ${SKIPPED_ARCHKVERS_IN_BRANCHES[${skipped_branch}]}
do
- if [[ ${kver} == "${skipped_kver}" ]]
+ if [[ "${arch}/${kver}" == "${skipped_archkver}" ]]
then
skipped=true
break
@@ -236,7 +239,7 @@
done
if ${skipped}
then
- echo "${kver} is skipped in branch ${curr_branch_number}. Skip it."
+ echo "${arch}/${kver} is skipped in branch ${curr_branch_number}."
continue
fi
# Sort the gs output by timestamp, default ordering is by name. So
