qualcomm factory build doesn't boot when using rb3gen2-core CDT

[mwasilew]

When using rb3gen2-core CDT on rb3gen2 without camera (core kit) the build from foundries factory (qualcomm factory, main branch) doesn't boot. The boot log below:

UEFI Start     [ 1566]
 - 0x09FC01000 [ 1569] Sec.efi
ASLR        : ON
DEP         : ON (RTB)
Timer Delta : +2 mS
RAM Entry 0 : Base 0x0080000000  Size 0x0039700000
RAM Entry 1 : Base 0x00C0000000  Size 0x0001800000
RAM Entry 2 : Base 0x00C3400000  Size 0x00BCC00000
RAM Entry 3 : Base 0x0180000000  Size 0x0100000000
Total Available RAM : 8059 MB (0x01F7B00000)
Total Installed RAM : 8192 MB (0x0200000000)
Init CPU core 1
  > Scheduler up on Core 1
UEFI Ver    : 6.0.240923.BOOT.MXF.1.0.c1-00193.1-KODIAKLA-1
Build Info  : 64b Sep 23 2024 18:19:42
Boot Device : UFS
PROD Mode   : TRUE
Retail      : TRUE
After Create Event Status (0x0)
PM0: 47, PM1: 63, PM2: 49, PM8: 46, 
Module cannot re-initialize DAL module environment
UFS INQUIRY ID: SAMSUNG KM8V9001JM-B813 0100
UFS Boot LUN: 1
tz_armv8_smc_call failed, TzStatus = 0xFFFFFFFF,  SmcId = 0x32000105  
Status = 0x3
APP_REGION_NOTIFICATION_CMD: Syscall Not Supported, status 3
HW Wdog Setting from PCD : Disabled
QseeResponse->result = 0xE
Status = 0x7
QseeResponse->result = 0xE
Status = 0x7
QseeResponse->result = 0xE
Status = 0x7
QseeResponse->result = 0xE
Status = 0x7
LoadImageFromPartitionUsingGuid Failed: 14
Failed to start featenabler_a TA, status = 14
DisplayDxe: Resolution 1920x1080 (1 intf)
smem_alloc_ex: SMEM alloc_ex failed with err=-3! smem_type=478, remote=3, size=32, flags=0x40000000.smem_alloc_ex: SMEM alloc_ex failed with err=-3! smem_type=478, remote=12, size=32, flags=0x40000000.smem_alloc_ex: SMEM alloc_ex failed with err=-3! smem_type=478, remote=17, size=32, flags=0x40000000.smem_alloc_ex: SMEM alloc_ex failed with err=-3! smem_type=478, remote=18, size=32, flags=0x40000000.fast_core_num val: 0
UsbConfigLibOpenProtocols: PMI version (0x0)
UsbConfigLibOpenProtocols: gPmicNpaClientHS2 cannot be created
UsbConfigInit: after setting role
UsbConfigInit: UsbConfigInit, not start on port: 0, mode 0
UsbConfigInit: after setting role
UsbConfigInit: UsbConfigInit, not start on port: 1, mode 0
UsbConfigPortsQueryConnectionChange: usbport->connectstate: ATT
ButtonsDxeTest: Keypress SDAM data payload 0 
HypDtFixupEntryPoint : Reading of OsConfigTableSelection failed,checking DT setting 
SoftSKUDxeInitialize: SoftSKU not supported for this chip
MinidumpTADxe: Minidump TA loading not enabled.
Disp init wait [ 1948] 
-----------------------------
Platform Init  [ 2010] BDS
UEFI Ver   : 6.0.240923.BOOT.MXF.1.0.c1-00193.1-KODIAKLA-1
Platform           : IOT
Subtype            : 5
Boot Device        : UFS
Chip Name          : QCS6490
Chip Ver           : 1.0
Chip Serial Number : 0x7D0E76C
-----------------------------
FatDiskIo: error Invalid Parameter
FatDiskIo: error Invalid Parameter
FatDiskIo: error Invalid Parameter
FatDiskIo: error Invalid Parameter
Locate pMorPpiProtocol failed 0xE 00000010
Platform Init End : 2142
-----------------------------
FatDiskIo: error Invalid Parameter
FatDiskIo: error Invalid Parameter
FatDiskIo: error Invalid Parameter
FatDiskIo: error Invalid Parameter
Required Params for Compatible DTB:
PlatformId = 0x1F2 
 Platform = 0x20 
 ChipVersion = 0x10000
ChipVersion = 0x5 
 Subtype = 0x0 
 SoftSkuId = 0x0 
DDR = 0x8362A678 
 LoadDtbOnReadyToBoot DTB Matching failed with Status = E
Reading of OsConfigTableSelection failed,checking DT settings
 UEFI Total : 707 ms
POST Time      [ 2273] OS Loader
FatDiskIo: error Invalid Parameter
Start EBS        [ 2527] 
BDS: LogFs sync skipped, Unsupported
App Log Flush : 0 ms
 RemoteObj_invoke  count 1 
 RemoteObj_invoke  count 1 
ScmArmV8ExitBootServicesHandler, Status = 0x0. 
Gunyah based bootup
Exit EBS        [ 2561] UEFI End

Same factory build boots OK when using rb3gen2-vision-kit CDT.

Links to CDT:

• core: https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS6490/cdt/rb3gen2-core-kit.zip
• vision kit: https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS6490/cdt/rb3gen2-vision-kit.zip

[ricardosalveti]

Wasn't able to validate it yet, but my assumption is because of the default set of device tree files available based on the machine configuration.

Since CDT for core will look for the core-based dtbs, it might not work correctly with the vision kit CDT. Can you try building for 'qcs6490-rb3gen2-core-kit' instead?

[mwasilew]

OK, let me try to use a different machine.

[mwasilew]

I tested all 4 combinations. The outcome is simple - CDT has to match the MACHINE. core-kit CDT works with core-kit OE build. vision-kit CDT works with vision-kit OE build. Here are the test jobs:

• core-kit CDT + core-kit build: https://lava.infra.foundries.io/scheduler/job/60116#L1103
• vision-kit CDT + core-kit build: https://lava.infra.foundries.io/scheduler/job/60117#L1111
• vision-kit CDT + vision-kit build: https://lava.infra.foundries.io/scheduler/job/60119#L1103
• core-kit CDT + vision-kid build: https://lava.infra.foundries.io/scheduler/job/60120#L1111

So IMHO the only way forward is to include CDT in the factory build.

[ricardosalveti]

Yeah, comparing with plain 1.3:

B -    491385 - CDT Version:3,Platform ID:32,Major ID:1,Minor ID:0,Subtype:2
#Compatible OS DTB found. Model = Qualcomm Technologies, Inc. Robotics RB3gen2 addons vision mezz platform
B -    427061 - CDT Version:3,Platform ID:32,Major ID:1,Minor ID:0,Subtype:5
#Compatible OS DTB found. Model = Qualcomm Technologies, Inc. Robotics RB3gen2 addons ptz mezz platform

Only works there because the vision kit build has both dtbs in it.

I think we should do as you suggested and just make sure we are including CDT by default.