diff --git a/IR/Yocto/build-scripts/get_source.sh b/IR/Yocto/build-scripts/get_source.sh index cda916a0..3a09f0b3 100755 --- 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 index cc78950d..30b6d1b5 100644 --- 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 index a9954147..2208a778 100644 --- 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)}" \ No newline at end of file +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 index d64c42c8..0221b51b 100644 --- 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" \ No newline at end of file +PACKAGECONFIG[dt] = ",,, bash" diff --git a/common/config/grub-buildroot.cfg b/common/config/grub-buildroot.cfg index c3b109a0..d29f5315 100644 --- 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 -} \ No newline at end of file +} diff --git a/common/patches/0001-disable-default-psci-checker-run.patch b/common/patches/0001-disable-default-psci-checker-run.patch deleted file mode 100644 index b93638d4..00000000 --- a/common/patches/0001-disable-default-psci-checker-run.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4c52e8d9d98adc88edfc382196b247820c387175 Mon Sep 17 00:00:00 2001 -From: gurrev01 -Date: Mon, 18 Dec 2023 19:53:31 +0530 -Subject: [PATCH] enable psci checker - -Signed-off-by: gurrev01 ---- - drivers/firmware/psci/psci_checker.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c -index 116eb465c..0a80e8205 100644 ---- a/drivers/firmware/psci/psci_checker.c -+++ b/drivers/firmware/psci/psci_checker.c -@@ -24,6 +24,7 @@ - #include - - #include -+#include - - #define NUM_SUSPEND_CYCLE (10) - -@@ -438,6 +439,15 @@ static int suspend_tests(void) - static int __init psci_checker(void) - { - int ret; -+ char *cmdline = boot_command_line; // Get kernel command line -+ -+ // Check if "psci_checker" parameter is present in the kernel command line -+ if (strstr(cmdline, "psci_checker")) { -+ pr_info("PSCI checker enabled based on the kernel command line.\n"); -+ } else { -+ pr_info("PSCI checker is disabled.\n"); -+ return 0; -+ } - - /* - * Since we're in an initcall, we assume that all the CPUs that all --- -2.25.1 - diff --git a/common/scripts/build-linux.sh b/common/scripts/build-linux.sh index cabd9ba8..745fe31d 100755 --- 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