Enable psci checker by default, and skip based on initcall_blacklist (#…

…219) * Enable psci checker by default, and skip based on initcall_blacklist * Update linux-yocto_6.4.bb * Update linux-yocto_6.6.bb --------- Co-authored-by: cherat01 <[email protected]>
ARM-software · Nov 17, 2024 · 678a96e · 678a96e
1 parent 4ce089b
commit 678a96e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 50 deletions.
diff --git a/IR/Yocto/build-scripts/get_source.sh b/IR/Yocto/build-scripts/get_source.sh
@@ -133,7 +133,6 @@ copy_recipes()
     popd
     # copy any patches to linux src files directory
     cp $COMMON_DIR_PATH/patches/tpm-tis-spi-Add-hardware-wait-polling.patch $TOP_DIR/meta-woden/recipes-kernel/linux/files
-    cp $COMMON_DIR_PATH/patches/0001-disable-default-psci-checker-run.patch $TOP_DIR/meta-woden/recipes-kernel/linux/files
     cp $COMMON_DIR_PATH/patches/0007-fwts-last-attempt-status.patch $TOP_DIR/meta-woden/recipes-acs/fwts/files
     cp $COMMON_DIR_PATH/patches/0008-acpi-iort-memory-access-flag-update.patch $TOP_DIR/meta-woden/recipes-acs/fwts/files
 }

diff --git a/IR/Yocto/meta-woden/recipes-images/images/woden-image.bb b/IR/Yocto/meta-woden/recipes-images/images/woden-image.bb
@@ -113,7 +113,7 @@ do_dir_deploy() {
     then
         echo "grub entry for Linux Boot for Security Interface Extension already present"
     else
-        awk '/menuentry '\''Linux Boot'\''/, /ext4/' grub.cfg | sed 's/Linux Boot/Linux Boot for Security Interface Extension (optional)/' | sed 's/ext4/ext4 secureboot/' >> grub.cfg
+        awk '/menuentry '\''Linux Boot'\''/, /ext4/' grub.cfg | sed 's/Linux Boot/Linux Boot for Security Interface Extension (optional)/' | sed 's/ext4/ext4 secureboot initcall_blacklist=psci_checker/' >> grub.cfg
         echo "}" >> grub.cfg
     fi
 

diff --git a/IR/Yocto/meta-woden/recipes-kernel/linux/linux-yocto_6.4.bb b/IR/Yocto/meta-woden/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            https://gitlab.arm.com/linux-arm/linux-acs/-/raw/master/kernel/src/0001-BSA-ACS-Linux-6.4.patch;patch=1;md5sum=7a4ce9635bc4af637c0463d8fdd038c0 \
            file://0002-Fix-for-CompuLab-IOT-GATE-iMX8-boot-issue.patch;patch=1 \
            file://tpm-tis-spi-Add-hardware-wait-polling.patch;patch=1 \
-           file://0001-disable-default-psci-checker-run.patch;patch=1 \
 "
 FILESEXTRAPATHS:prepend := "${TOPDIR}/../meta-arm/meta-arm/recipes-kernel/linux/files:"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
@@ -41,4 +40,4 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
 KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
-KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/IR/Yocto/meta-woden/recipes-kernel/linux/linux-yocto_6.6.bb b/IR/Yocto/meta-woden/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -40,7 +40,6 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            https://gitlab.arm.com/linux-arm/linux-acs/-/raw/master/kernel/src/0001-BSA-ACS-Linux-6.6.patch;patch=1;md5sum=89b6c420ece275846f79c8b6f6f9cb09 \
            file://0001-KSelfTest.patch;patch=1 \
            file://0001-dt-extract-compatibles.patch;patch=1 \
-           file://0001-disable-default-psci-checker-run.patch;patch=1 \
 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
@@ -72,4 +71,4 @@ KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.scc"
 INSANE_SKIP:kernel-vmlinux:qemuppc64 = "textrel"
 
 #added extra
-PACKAGECONFIG[dt] = ",,, bash"
+PACKAGECONFIG[dt] = ",,, bash"
diff --git a/common/config/grub-buildroot.cfg b/common/config/grub-buildroot.cfg
@@ -17,10 +17,10 @@ menuentry 'SCT for Security Interface Extension (optional)' {
     chainloader /EFI/BOOT/Shell.efi -nostartup sie_startup.nsh
 }
 menuentry 'Linux Boot for Security Interface Extension (optional)' {
-    linux /Image rootwait verbose debug console=tty0 console=ttyS0  console=ttyAMA0 secureboot
+    linux /Image rootwait verbose debug initcall_blacklist=psci_checker console=tty0 console=ttyS0  console=ttyAMA0 secureboot
     initrd /ramdisk-buildroot.img
 }
 menuentry 'Linux Boot with SetVirtualAddressMap enabled' {
-    linux /Image rootwait verbose debug crashkernel=256M acsforcevamap console=tty0 console=ttyS0  console=ttyAMA0
+    linux /Image rootwait verbose debug initcall_blacklist=psci_checker crashkernel=256M acsforcevamap console=tty0 console=ttyS0  console=ttyAMA0
     initrd /ramdisk-buildroot.img
-}
+}
diff --git a/common/patches/0001-disable-default-psci-checker-run.patch b/common/patches/0001-disable-default-psci-checker-run.patch
diff --git a/common/scripts/build-linux.sh b/common/scripts/build-linux.sh
@@ -84,6 +84,7 @@ do_build ()
     sed -i 's/# CONFIG_TCG_FTPM_TEE is not set/CONFIG_TCG_FTPM_TEE=y/g' $LINUX_OUT_DIR/.config
     sed -i 's/# CONFIG_TEE is not set/CONFIG_TEE=y/g' $LINUX_OUT_DIR/.config
     sed -i 's/# CONFIG_OPTEE is not set/CONFIG_OPTEE=y/g' $LINUX_OUT_DIR/.config
+    sed -i 's/# CONFIG_ARM_PSCI_CHECKER is not set/CONFIG_ARM_PSCI_CHECKER=y/g' $LINUX_OUT_DIR/.config
     #Configurations to enable rshim support in ES/SR ACS images
     echo "CONFIG_MLXBF_TMFIFO=y" >> $LINUX_OUT_DIR/.config
     #Configurations to increase serial ports