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

[NOT FOR MERGE] Intel txt aem 2.06 rebased #20

Closed
wants to merge 31 commits into from
Closed

[NOT FOR MERGE] Intel txt aem 2.06 rebased #20

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0e20cf1
i386/msr: Merge rdmsr.h and wrmsr.h into msr.h
Dec 17, 2019
69d6d82
i386/msr: Rename grub_msr_read() and grub_msr_write()
Dec 17, 2019
e349ad1
i386/msr: Extract and improve MSR support detection code
Apr 25, 2020
68e3344
i386/memory: Rename PAGE_SHIFT to GRUB_PAGE_SHIFT
Nov 20, 2019
89a387c
i386/memory: Rename PAGE_SIZE to GRUB_PAGE_SIZE and make it global
Nov 20, 2019
a65ac35
i386/memory: Define GRUB_PAGE_MASK constant and GRUB_PAGE_{UP,DOWN} m…
krystian-hebel Jan 22, 2024
19c1993
mmap: Add grub_mmap_get_lowest() and grub_mmap_get_highest()
May 4, 2020
4213c39
i386/tpm: Rename tpm module to tpm_verifier
Apr 22, 2020
137e1c0
i386/tpm: Add TPM TIS and CRB driver
May 4, 2020
7d89e5d
i386/slaunch: Add basic platform support for secure launch
rossphilipson Aug 7, 2019
1ec91a6
i386/txt: Initial commit of the Secure Launch Resource Table (SLRT)
rossphilipson Jan 9, 2023
d8a9355
i386/txt: Add Intel TXT definitions header file
rossphilipson Aug 7, 2019
9736d05
i386/txt: Add Intel TXT core implementation
rossphilipson Aug 7, 2019
f00c4fc
i386/txt: Add Intel TXT ACM module support
rossphilipson Aug 7, 2019
fdf9662
i386/txt: Add Intel TXT verification routines
rossphilipson Aug 7, 2019
b1adb3a
i386/txt: Initialize TPM 1.2 event log in TXT heap
miczyg1 Aug 31, 2022
e2fcca0
i386/txt: switch to using Secure Launch Resource Table interface
rossphilipson Jan 13, 2023
1ee2f71
i386/slaunch: Add secure launch framework and commands
rossphilipson Aug 7, 2019
e360ef6
multiboot: make GRUB_MULTIBOOT(make_mbi) return MBI's size
SergiiDmytruk Nov 22, 2023
594fe47
multiboot2: Implement TXT slaunch support
miczyg1 Sep 1, 2022
c6bd2ee
Add GitHub actions for building QubesOS packages
SergiiDmytruk Jul 29, 2023
60d94af
.github/workflows/build.yml: run when a tag is pushed
SergiiDmytruk Oct 4, 2023
8be0756
.github/workflows/build.yml: drop pull_request_target
SergiiDmytruk Oct 4, 2023
a485120
.github/workflows/build.yml: bump base-commit
krystian-hebel Apr 26, 2024
61e3170
i386/skinit: Add AMD SKINIT implementation
krystian-hebel Nov 10, 2020
c9a17ff
i386/slaunch: Add support for AMD SKINIT
krystian-hebel Nov 10, 2020
8dc7c67
multiboot2: support AMD SKINIT
krystian-hebel Dec 30, 2020
b1083c1
i386/slaunch: improve error recovery of "slaunch_module" command
SergiiDmytruk Feb 20, 2024
99b6c86
i386/txt: do not update MLE header
SergiiDmytruk Feb 28, 2024
f6dfae5
i386/skinit: don't allocate TPM event log low
SergiiDmytruk Mar 30, 2024
85ccfdc
grub-core/loader/multiboot_elfxx.c: Fix calculating MLE size
miczyg1 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions grub-core/loader/i386/skinit.c
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

This could be squashed into i386/skinit: Add AMD SKINIT implementation.

Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ grub_skinit_boot_prepare (struct grub_relocator *rel,
if (slb == NULL)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "SLB module is missing");

err = grub_relocator_alloc_chunk_align (rel, &ch, 0x1000000,
0xffffffff - GRUB_SLAUNCH_TPM_EVT_LOG_SIZE,
GRUB_SLAUNCH_TPM_EVT_LOG_SIZE, GRUB_PAGE_SIZE,
GRUB_RELOCATOR_PREFERENCE_NONE, 1);
err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0x1000000,
UP_TO_TOP32(GRUB_SLAUNCH_TPM_EVT_LOG_SIZE),
GRUB_SLAUNCH_TPM_EVT_LOG_SIZE, GRUB_PAGE_SIZE,
GRUB_RELOCATOR_PREFERENCE_HIGH, 1);

if (err != GRUB_ERR_NONE)
return grub_error (err, "cannot alloc memory for TPM event log");
Expand Down
Loading