Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor the laptop out #678

Merged
merged 11 commits into from
Jul 1, 2024
Merged

Refactor the laptop out #678

merged 11 commits into from
Jul 1, 2024

Conversation

brianmcgillion
Copy link
Collaborator

@brianmcgillion brianmcgillion commented Jun 28, 2024 •
edited
Loading

Refactor the x1 target to extract out the common functionality for laptops and hardware definitions.

define a series of profiles to better define the use cases for each x86 target
prepare to be able to support further HW

Description of changes

Checklist for things done

  • Summary of the proposed changes in the PR description
  • More detailed description in the commit message(s)
  • Commits are squashed into relevant entities - avoid a lot of minimal dev time commits in the PR
  • Contribution guidelines followed
  • Ghaf documentation updated with the commit - https://tiiuae.github.io/ghaf/
  • PR linked to architecture documentation and requirement(s) (ticket id)
  • Test procedure described (or includes tests). Select one or more:
    • Tested on Lenovo X1 x86_64
    • Tested on Jetson Orin NX or AGX aarch64
    • Tested on Polarfire riscv64
  • Author has run nix flake check --accept-flake-config and it passes
  • All automatic Github Action checks pass - see actions
  • Author has added reviewers and removed PR draft status

Testing

Needs the usual round of tests on the Lenovo X1 target.
no new functionality jsut refactoring effort

@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 28, 2024 09:46 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion requested a review from mbssrc June 28, 2024 09:46
@brianmcgillion brianmcgillion marked this pull request as draft June 28, 2024 09:47
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 28, 2024 16:24 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 29, 2024 05:33 — with GitHub Actions Inactive
@brianmcgillion
Refactor the laptop out
0942ae0 
RFC commit to split laptop definition from 'secure laptop' reference

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion
Rename the basic disko config
bac4572 
The basic disko config is not hw specific so it can be renamed to
reflect that it is only a very generic partitioning.

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion
Move microvm input to ghaf.microvm module
9149202 
Contain the inputs within the module that is exporting it.

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion
Create an MVP user trial profile
810693b 
Define a profile for the MVP user trial which enables the apps and
services that will be supported in that configuration

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 29, 2024 06:25 — with GitHub Actions Inactive
@brianmcgillion
Make the laptop config generic
69c7ae6 
Pass the required modules down from the target system to the laptop configuration

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 29, 2024 07:13 — with GitHub Actions Inactive
@brianmcgillion
Use a generic laptop hardware module
2e327bf 
Use a generic HW module and pass in the specific hw configuration
depending on the actual laptop that is in use

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 29, 2024 08:00 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 29, 2024 08:14 — with GitHub Actions Inactive
@brianmcgillion
Fix statix warnings
c9e1729 
Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow June 29, 2024 08:20 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion marked this pull request as ready for review June 29, 2024 08:31
@brianmcgillion
Refine the laptop configuration
7eb03a1 
Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow July 1, 2024 08:05 — with GitHub Actions Inactive
@brianmcgillion
Rename x1 directory to the more generic laptop
911cfba 
This will allow to define multiple use cases in this directory and to
also support different hardware for the existing usecases.

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow July 1, 2024 08:10 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion added the Needs Testing CI Team to pre-verify label Jul 1, 2024
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow July 1, 2024 08:38 — with GitHub Actions Inactive
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow July 1, 2024 08:43 — with GitHub Actions Inactive
humaidq-tii
humaidq-tii requested changes Jul 1, 2024
View reviewed changes
modules/hardware/laptop.nix Show resolved Hide resolved
targets/laptop/laptop-configuration-builder.nix Outdated Show resolved Hide resolved
@brianmcgillion
Move laptop configuration to own file
188b886 
This is preliminary as to whether it lives in the library or as a
function *maybe* in the profile but not as a module.

Signed-off-by: Brian McGillion <[email protected]>
@brianmcgillion brianmcgillion temporarily deployed to internal-build-workflow July 1, 2024 11:02 — with GitHub Actions Inactive
barnabakos
barnabakos approved these changes Jul 1, 2024
View reviewed changes
Copy link
Collaborator

@barnabakos barnabakos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

11 commits up to: 188b886
PR is on top of latest tip of Ghaf main: a7167f4

platform: Lenovo X1 Carbon

  • ci-test-automation suite: ok
  • starting apps: ok
  • ad-hoc tesing: no new findings

@barnabakos barnabakos added Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon and removed Needs Testing CI Team to pre-verify labels Jul 1, 2024
@brianmcgillion brianmcgillion merged commit 4f2291c into tiiuae:main Jul 1, 2024
14 checks passed
@brianmcgillion brianmcgillion deleted the refactor-laptop branch July 1, 2024 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@humaidq-tii humaidq-tii humaidq-tii requested changes

@barnabakos barnabakos barnabakos approved these changes

@mbssrc mbssrc mbssrc approved these changes

Assignees
No one assigned
Labels
Tested on Lenovo X1 Carbon This PR has been tested on Lenovo X1 Carbon
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@brianmcgillion @humaidq-tii @mbssrc @barnabakos