Skip to content

Comments

Orin rework#1201

Merged
brianmcgillion merged 1 commit intotiiuae:mainfrom
emrahbillur:orin-rework
May 21, 2025
Merged

Orin rework#1201
brianmcgillion merged 1 commit intotiiuae:mainfrom
emrahbillur:orin-rework

Conversation

@emrahbillur
Copy link
Contributor

@emrahbillur emrahbillur commented May 15, 2025

Description of Changes

Seperate hardware definitions of agx, agx64, and nx are defined. These definitions are merged with common hardware definitions and completed to a full nvidia configuration (with configuration imported from profiles/oırin.nix) in orin-configuration-builder.nix. Similar target generation method used as in laptop definitions.

Type of Change

  • New Feature
  • Bug Fix
  • Improvement / Refactor

Related Issues / Tickets

Testing issues of (#1152) caused this rework

Checklist

  • Clear summary in PR description
  • Detailed and meaningful commit message(s)
  • Commits are logically organized and squashed if appropriate
  • Contribution guidelines followed
  • Ghaf documentation updated with the commit - https://tiiuae.github.io/ghaf/
  • Author has run make-checks and it passes
  • All automatic GitHub Action checks pass - see actions
  • Author has added reviewers and removed PR draft status

Testing Instructions

Applicable Targets

  • Orin AGX aarch64
  • Orin NX aarch64
  • Lenovo X1 x86_64
  • Dell Latitude x86_64

Installation Method

  • Requires full re-installation
  • Can be updated with nixos-rebuild ... switch
  • Other:

Test Steps To Verify:

Just allow tests through the regular CICD chain. The whole target structure is same from outside. Just there is a need to test if it works the same as the previous target definitions.

@emrahbillur emrahbillur marked this pull request as draft May 15, 2025 10:57
@brianmcgillion
Copy link
Collaborator

can you remove the configurable network settings patch? make this cleaner and easier to review. the other patch will come on top of this when it is merged

@brianmcgillion
Copy link
Collaborator

really great start on this cleanup. will make the maintenance and configuration much easier going forward.

@emrahbillur emrahbillur requested a review from juliuskoskela May 20, 2025 10:34
@milva-unikie
Copy link

Tested on Orin-NX (native & cross-compiled)

Issues:

  • Two tools that we use for test-automation are not available: xtest and pkcs11-tool-optee. Both return a command not found error.

Working:

  • Boots to desktop.
  • All apps open.
  • Other than the two things mentioned above, test-automation passes.

@milva-unikie milva-unikie added bug on Orin NX Cross Issues found on NVIDIA Jetson NX Orin cross-compiled while checking this PR bug on Orin NX Issues found on NVIDIA Jetson NX Orin while checking this PR Needs Testing CI Team to pre-verify labels May 20, 2025
initial rework NVIDIA targets
Formatting
Re-base and fixes
Logo location fix
NVIDIA docker and podman rename, debug profile fixes
Profile enable
Separate target definitions
Optee import relocated
netvm configuration to hardware definitions
Profile rework
jetpack module readded

Signed-off-by: Emrah Billur <emrah.billur@unikie.com>

Optee fix

Signed-off-by: Emrah Billur <emrah.billur@unikie.com>

fmt

Signed-off-by: Emrah Billur <emrah.billur@unikie.com>
@emrahbillur
Copy link
Contributor Author

Tested on Orin-NX (native & cross-compiled)
Issues:
* Two tools that we use for test-automation are not available: xtest and pkcs11-tool-optee. Both return a command not found error.

Working:
* Boots to desktop.
* All apps open.
* Other than the two things mentioned above, test-automation passes.

The previous configuration had 2 optee configuration files. One for defining the option and settings and the second file for defining usage of optee through ghaf. During rework second files import is missing. Added now.

Ready for retest.

@leivos-unikie
Copy link
Contributor

Tested on Orin-NX (native & cross-compiled)
Issues:

  • Two tools that we use for test-automation are not available: xtest and pkcs11-tool-optee. Both return a command not found error.
    Working:
  • Boots to desktop.
  • All apps open.
  • Other than the two things mentioned above, test-automation passes.

The previous configuration had 2 optee configuration files. One for defining the option and settings and the second file for defining usage of optee through ghaf. During rework second files import is missing. Added now.

Ready for retest.

xtest and pkcs11-tool-optee are working now. Checked on Orin AGX.

@leivos-unikie
Copy link
Contributor

Automated tests passed with Orin AGX (native) image except nvpmodel check test:

https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com/job/tests/job/x-ghaf-hw-test/1454/artifact/Robot-Framework/test-suites/orin-agxANDnvpmodel/log.html#s1-s1-s1-t1

NVPM WARN: power mode is not set!
Unexpected power mode detected:
Expected: 3

It has passed in mainline.

@leivos-unikie leivos-unikie added the bug on Orin AGX Issues found on NVIDIA Jetson AGX Orin while checking this PR label May 20, 2025
@emrahbillur
Copy link
Contributor Author

emrahbillur commented May 20, 2025

Automated tests passed with Orin AGX (native) image except nvpmodel check test:
https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com/job/tests/job/x-ghaf-hw-test/1454/artifact/Robot-Framework/test-suites/orin-agxANDnvpmodel/log.html#s1-s1-s1-t1
NVPM WARN: power mode is not set! Unexpected power mode detected: Expected: 3
It has passed in mainline.

Strange issue as in nix repl I'm observing

{
"/nix/store/3rw6a3a7iqdzmbwzadifqbnhlwda9ypv-nvidia-l4t-nvpmodel-36.4.3-20250107174145/etc/
nvpmodel/nvpmodel_p3701_0000.conf";
  enable = true;
  profileNumber = 3;
}

I'll manually check it on system.
I now tested on AGX platform (with a version before optee bug fix) and

[0;ghaf@ghaf-host: ~ghaf@ghaf-host:~]$ nvpmodel -q
NV Power Mode: MODE_50W
3

everything seems OK.
I'll reflash with the latest version to ensure if the bug exists there.

@leivos-unikie
Copy link
Contributor

Automated tests passed with Orin AGX (native) image except nvpmodel check test:
https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com/job/tests/job/x-ghaf-hw-test/1454/artifact/Robot-Framework/test-suites/orin-agxANDnvpmodel/log.html#s1-s1-s1-t1
NVPM WARN: power mode is not set! Unexpected power mode detected: Expected: 3
It has passed in mainline.

Strange issue as in nix repl I'm observing

{
"/nix/store/3rw6a3a7iqdzmbwzadifqbnhlwda9ypv-nvidia-l4t-nvpmodel-36.4.3-20250107174145/etc/
nvpmodel/nvpmodel_p3701_0000.conf";
  enable = true;
  profileNumber = 3;
}

I'll manually check it on system.

I'll try also manually

@emrahbillur
Copy link
Contributor Author

Automated tests passed with Orin AGX (native) image except nvpmodel check test:
https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com/job/tests/job/x-ghaf-hw-test/1454/artifact/Robot-Framework/test-suites/orin-agxANDnvpmodel/log.html#s1-s1-s1-t1
NVPM WARN: power mode is not set! Unexpected power mode detected: Expected: 3
It has passed in mainline.

Strange issue as in nix repl I'm observing

{
"/nix/store/3rw6a3a7iqdzmbwzadifqbnhlwda9ypv-nvidia-l4t-nvpmodel-36.4.3-20250107174145/etc/
nvpmodel/nvpmodel_p3701_0000.conf";
  enable = true;
  profileNumber = 3;
}

I'll manually check it on system.

I'll try also manually

With the latest fixes it also works with nvpmodel -q

[0;ghaf@ghaf-host: ~ghaf@ghaf-host:~]$ nvpmodel -q
NV Power Mode: MODE_50W
3

[0;ghaf@ghaf-host: ~ghaf@ghaf-host:~]$ 

@emrahbillur
Copy link
Contributor Author

The test platform is AGX 32 GB.

@milva-unikie
Copy link

Tested on Orin-NX (native & cross-compiled)
Issues:

  • Two tools that we use for test-automation are not available: xtest and pkcs11-tool-optee. Both return a command not found error.
    Working:
  • Boots to desktop.
  • All apps open.
  • Other than the two things mentioned above, test-automation passes.

The previous configuration had 2 optee configuration files. One for defining the option and settings and the second file for defining usage of optee through ghaf. During rework second files import is missing. Added now.

Ready for retest.

As Samuli already confirmed, the tools are now available. NX looks good to me.

@milva-unikie milva-unikie added Tested on Orin NX This PR has been tested on NVIDIA Jetson NX Orin Tested on Orin NX Cross This PR has been tested on NVIDIA Jetson NX Orin cross-compiled and removed bug on Orin NX Cross Issues found on NVIDIA Jetson NX Orin cross-compiled while checking this PR bug on Orin NX Issues found on NVIDIA Jetson NX Orin while checking this PR labels May 21, 2025
@leivos-unikie
Copy link
Contributor

leivos-unikie commented May 21, 2025

Automated tests passed with Orin AGX (native) image except nvpmodel check test:
https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com/job/tests/job/x-ghaf-hw-test/1454/artifact/Robot-Framework/test-suites/orin-agxANDnvpmodel/log.html#s1-s1-s1-t1
NVPM WARN: power mode is not set! Unexpected power mode detected: Expected: 3
It has passed in mainline.

Strange issue as in nix repl I'm observing

{
"/nix/store/3rw6a3a7iqdzmbwzadifqbnhlwda9ypv-nvidia-l4t-nvpmodel-36.4.3-20250107174145/etc/
nvpmodel/nvpmodel_p3701_0000.conf";
  enable = true;
  profileNumber = 3;
}

I'll manually check it on system.

I'll try also manually

With the latest fixes it also works with nvpmodel -q

[0;ghaf@ghaf-host: ~ghaf@ghaf-host:~]$ nvpmodel -q
NV Power Mode: MODE_50W
3

[0;ghaf@ghaf-host: ~ghaf@ghaf-host:~]$ 

Yes, it works. I was not able to reproduce that issue with nvpmodel -q manually. Tried with flash-script and also by booting native image from USB.

@leivos-unikie leivos-unikie added Tested on Orin AGX Cross This PR has been tested on NVIDIA Jetson AGX Orin cross-compiled Tested on Orin AGX This PR has been tested on NVIDIA Jetson AGX Orin and removed bug on Orin AGX Issues found on NVIDIA Jetson AGX Orin while checking this PR Needs Testing CI Team to pre-verify labels May 21, 2025
@brianmcgillion brianmcgillion merged commit b43e992 into tiiuae:main May 21, 2025
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Tested on Orin AGX Cross This PR has been tested on NVIDIA Jetson AGX Orin cross-compiled Tested on Orin AGX This PR has been tested on NVIDIA Jetson AGX Orin Tested on Orin NX Cross This PR has been tested on NVIDIA Jetson NX Orin cross-compiled Tested on Orin NX This PR has been tested on NVIDIA Jetson NX Orin

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants