* linux-next: manual merge of the efi tree with the tip tree
@ 2023-06-07 2:08 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2023-06-07 2:08 UTC (permalink / raw)
To: Ard Biesheuvel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: Borislav Petkov (AMD), Ilias Apalodimas, Kirill A. Shutemov,
Linux Kernel Mailing List, Linux Next Mailing List,
Masahisa Kojima
[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]
Hi all,
Today's linux-next merge of the efi tree got a conflict in:
drivers/firmware/efi/Makefile
between commit:
2053bc57f367 ("efi: Add unaccepted memory support")
from the tip tree and commit:
39c90699b330 ("efi: Add tee-based EFI variable driver")
from the efi tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/firmware/efi/Makefile
index e489fefd23da,2ca8ee6ab490..000000000000
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@@ -41,4 -41,4 +41,5 @@@ obj-$(CONFIG_EFI_CAPSULE_LOADER) += cap
obj-$(CONFIG_EFI_EARLYCON) += earlycon.o
obj-$(CONFIG_UEFI_CPER_ARM) += cper-arm.o
obj-$(CONFIG_UEFI_CPER_X86) += cper-x86.o
+obj-$(CONFIG_UNACCEPTED_MEMORY) += unaccepted_memory.o
+ obj-$(CONFIG_TEE_STMM_EFI) += stmm/tee_stmm_efi.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the efi tree with the tip tree
@ 2022-11-25 1:22 Stephen Rothwell
2022-11-25 10:29 ` Borislav Petkov
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2022-11-25 1:22 UTC (permalink / raw)
To: Ard Biesheuvel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: Borislav Petkov, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]
Hi all,
Today's linux-next merge of the efi tree got a conflict in:
arch/x86/boot/compressed/efi_thunk_64.S
between commit:
cb8bda8ad443 ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S")
from the tip tree and commit:
a61962d8e7d3 ("efi: libstub: Permit mixed mode return types other than efi_status_t")
from the efi tree.
I fixed it up (I remofved the file and applied the following patch) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 25 Nov 2022 12:15:58 +1100
Subject: [PATCH] fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/x86/boot/compressed/efi_mixed.S | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/x86/boot/compressed/efi_mixed.S b/arch/x86/boot/compressed/efi_mixed.S
index 8b02e507d3bb..4ca70bf93dc0 100644
--- a/arch/x86/boot/compressed/efi_mixed.S
+++ b/arch/x86/boot/compressed/efi_mixed.S
@@ -132,12 +132,6 @@ SYM_FUNC_START(__efi64_thunk)
movl %ebx, %fs
movl %ebx, %gs
- /*
- * Convert 32-bit status code into 64-bit.
- */
- roll $1, %eax
- rorq $1, %rax
-
pop %rbx
pop %rbp
RET
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the efi tree with the tip tree
2022-11-25 1:22 Stephen Rothwell
@ 2022-11-25 10:29 ` Borislav Petkov
0 siblings, 0 replies; 5+ messages in thread
From: Borislav Petkov @ 2022-11-25 10:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ard Biesheuvel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Linux Kernel Mailing List,
Linux Next Mailing List
On Fri, Nov 25, 2022 at 12:22:16PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the efi tree got a conflict in:
>
> arch/x86/boot/compressed/efi_thunk_64.S
>
> between commit:
>
> cb8bda8ad443 ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S")
>
> from the tip tree and commit:
>
> a61962d8e7d3 ("efi: libstub: Permit mixed mode return types other than efi_status_t")
>
> from the efi tree.
>
> I fixed it up (I remofved the file and applied the following patch) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Fri, 25 Nov 2022 12:15:58 +1100
> Subject: [PATCH] fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> arch/x86/boot/compressed/efi_mixed.S | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/efi_mixed.S b/arch/x86/boot/compressed/efi_mixed.S
> index 8b02e507d3bb..4ca70bf93dc0 100644
> --- a/arch/x86/boot/compressed/efi_mixed.S
> +++ b/arch/x86/boot/compressed/efi_mixed.S
> @@ -132,12 +132,6 @@ SYM_FUNC_START(__efi64_thunk)
> movl %ebx, %fs
> movl %ebx, %gs
>
> - /*
> - * Convert 32-bit status code into 64-bit.
> - */
> - roll $1, %eax
> - rorq $1, %rax
> -
> pop %rbx
> pop %rbp
> RET
> --
LGTM, thanks Stephen.
We'll keep that in mind when sending the pull requests later.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the efi tree with the tip tree
@ 2022-04-26 6:16 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2022-04-26 6:16 UTC (permalink / raw)
To: Ard Biesheuvel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: Borislav Petkov, Brijesh Singh, Dov Murik,
Linux Kernel Mailing List, Linux Next Mailing List, Tom Lendacky
[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]
Hi all,
Today's linux-next merge of the efi tree got conflicts in:
drivers/virt/Kconfig
drivers/virt/Makefile
between commits:
fce96cf04430 ("virt: Add SEV-SNP guest driver")
9617f2f48310 ("virt: sevguest: Rename the sevguest dir and files to sev-guest")
from the tip tree and commit:
cbabf03c3ef3 ("virt: Add efi_secret module to expose confidential computing secrets")
from the efi tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/virt/Kconfig
index 0c1bba7c5c66,c877da072d4d..000000000000
--- a/drivers/virt/Kconfig
+++ b/drivers/virt/Kconfig
@@@ -48,6 -48,6 +48,8 @@@ source "drivers/virt/nitro_enclaves/Kco
source "drivers/virt/acrn/Kconfig"
+source "drivers/virt/coco/sev-guest/Kconfig"
+
+ source "drivers/virt/coco/efi_secret/Kconfig"
+
endif
diff --cc drivers/virt/Makefile
index b2e6e864ebbe,067b5427f40f..000000000000
--- a/drivers/virt/Makefile
+++ b/drivers/virt/Makefile
@@@ -9,4 -9,4 +9,5 @@@ obj-y += vboxguest
obj-$(CONFIG_NITRO_ENCLAVES) += nitro_enclaves/
obj-$(CONFIG_ACRN_HSM) += acrn/
+obj-$(CONFIG_SEV_GUEST) += coco/sev-guest/
+ obj-$(CONFIG_EFI_SECRET) += coco/efi_secret/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* linux-next: manual merge of the efi tree with the tip tree
@ 2022-04-14 2:54 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2022-04-14 2:54 UTC (permalink / raw)
To: Ard Biesheuvel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: Borislav Petkov, Brijesh Singh, Dov Murik,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
Hi all,
Today's linux-next merge of the efi tree got conflicts in:
drivers/virt/Kconfig
drivers/virt/Makefile
between commit:
fce96cf04430 ("virt: Add SEV-SNP guest driver")
from the tip tree and commit:
cbabf03c3ef3 ("virt: Add efi_secret module to expose confidential computing secrets")
from the efi tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/virt/Kconfig
index 7d3273cfab27,c877da072d4d..000000000000
--- a/drivers/virt/Kconfig
+++ b/drivers/virt/Kconfig
@@@ -48,6 -48,6 +48,8 @@@ source "drivers/virt/nitro_enclaves/Kco
source "drivers/virt/acrn/Kconfig"
+source "drivers/virt/coco/sevguest/Kconfig"
+
+ source "drivers/virt/coco/efi_secret/Kconfig"
+
endif
diff --cc drivers/virt/Makefile
index 7b87a7ba1972,067b5427f40f..000000000000
--- a/drivers/virt/Makefile
+++ b/drivers/virt/Makefile
@@@ -9,4 -9,4 +9,5 @@@ obj-y += vboxguest
obj-$(CONFIG_NITRO_ENCLAVES) += nitro_enclaves/
obj-$(CONFIG_ACRN_HSM) += acrn/
+obj-$(CONFIG_SEV_GUEST) += coco/sevguest/
+ obj-$(CONFIG_EFI_SECRET) += coco/efi_secret/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-07 2:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-07 2:08 linux-next: manual merge of the efi tree with the tip tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-11-25 1:22 Stephen Rothwell
2022-11-25 10:29 ` Borislav Petkov
2022-04-26 6:16 Stephen Rothwell
2022-04-14 2:54 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox