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

Changes/fixes on top of v11 AMD patches for non-PSP case #26

Draft
wants to merge 26 commits into
base: grub-sl-2.12-v11-amd
Choose a base branch
from
Draft

Changes/fixes on top of v11 AMD patches for non-PSP case #26

wants to merge 26 commits into from

Conversation

SergiiDmytruk
Copy link
Member

Significant number commits are meant to be squashed into other commits on the base branch later on.

@SergiiDmytruk
loader/slaunch/psp.c: don't cause use of __udivmoddi4()
6c173bd 
Just use grub_divmod64() explicitly like all other code does.

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
grub-core: fix non-EFI build
c9ffe3f 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
krystian-hebel
krystian-hebel requested changes Nov 28, 2024
View reviewed changes
grub-core/loader/multiboot_elfxx.c Outdated Show resolved Hide resolved
grub-core/loader/multiboot_mbi2.c Outdated Show resolved Hide resolved
grub-core/loader/multiboot_mbi2.c Outdated Show resolved Hide resolved
grub-core/loader/slaunch/psp.c Outdated Show resolved Hide resolved
grub-core/loader/slaunch/skl.c Outdated Show resolved Hide resolved
grub-core/loader/slaunch/txt.c Outdated Show resolved Hide resolved
include/grub/slaunch.h Outdated Show resolved Hide resolved
SergiiDmytruk and others added 24 commits November 29, 2024 19:48
@SergiiDmytruk
grub-core/loader/slaunch/psp.c: fix rounding up after division
682497d 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader: fix pointer <-> integer conversions
8147876 
The behaviour is implementation specific and in case of GCC 32-bit
pointers are **sign-extended** on conversions to a larger integer type,
thus producing invalid values.

The opposite isn't dangerous, but still generates compiler warnings.

Go through `grub_addr_t` in both cases.

https://gcc.gnu.org/onlinedocs/gcc/Arrays-and-pointers-implementation.html

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch: fix invalid format specifiers
025f421 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/txt.c: FIXME cleanup
8b80806 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@miczyg1 @SergiiDmytruk
i386/txt: Initialize TPM 1.2 event log in TXT heap
e69ea65 
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch: make SKINIT work on AMD without PSP
0231aa9 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch: {SKL,SLB}_MIN_A{,L}IGNMENT
561f864 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/skl.c: fix allocating SKL and placing SLRT
3fbbb79 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch: fix reading mle_header
81876ee 
Only the case of legacy boot has slparams->mle_start and
slparams->mle_mem different.  Other places are updated for consistency.

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch: allow multiple "slaunch_module" commands
b883adc 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/skl.c: improve grub_skl_set_module() checks
8a69289 
Make them more comprehensive and remove the `skl_size <
(8*GRUB_PAGE_SIZE)` one which doesn't make much sense.

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/dlstub.c: better checks/errors
4d853d2 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/dlstub.c: start with zeroed relocator state
d4b61e3 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/skl.c: better errors and checks
b64de8b 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
include/grub/i386/txt.h: add missing #include
5fc2a42 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/slrt.c: add NULL checks
54100f5 
Not all boot methods are Linux EFI boot methods.

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
include/grub/slaunch.h: add missing forward declaration
d92ba09 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
loader/slaunch/skl.c: fix a comment typo
6e77edd 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
slaunch: introduce a hook for filling SLRT policy
8c705ef 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
multiboot: Make GRUB_MULTIBOOT(make_mbi) return MBI's size
d00a1a6 
GRUB_MULTIBOOT(get_mbi_size) returns an upper bound on MBI's size
instead of the actual size.  It could also be used for measurements
after zeroing unused parts of the buffer, but using an actual size seems
like a better option as the same MBI will always have the same hash
regardless of the amount of extra memory that follows it.

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@miczyg1 @SergiiDmytruk
multiboot2: Support TXT and SKINIT slaunch
e383612 
The code makes sure that MBI entry goes first in DRTM, so the payload
can measure it first on launch.  Then goes SLRT and other typical
entries, while MB2 modules are added at the end.

Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Signed-off-by: Tomasz Żyjewski <tomasz.zyjewski@3mdeb.com>
Signed-off-by: Krystian Hebel <krystian.hebel@3mdeb.com>
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
grub-core/loader/slaunch/psp.c: simplify is_drtm_device()
a655a9e 
Just return bool.

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
grub-core/loader/slaunch/psp.c: fix comment capitalization
8b35409 
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
@SergiiDmytruk
grub-core/loader/slaunch/psp.c: drop extra assignments from init_drtm…
805d4f3 
…_device()

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
SergiiDmytruk
SergiiDmytruk commented Nov 29, 2024
View reviewed changes
Copy link
Member Author

@SergiiDmytruk SergiiDmytruk left a comment •
edited
Loading

Choose a reason for hiding this comment

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

GitHub: You need to leave a comment indicating the requested changes.
Me: Shut up and post my replies to outdated conversations.

P.S. Private browsing suggests that it did post them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krystian-hebel krystian-hebel krystian-hebel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SergiiDmytruk @krystian-hebel @miczyg1