Update to 4.19.3

This commit is contained in:
Ben Hutchings 2018-11-22 00:15:29 +00:00
parent d16d94111b
commit 397f2ab6e1
2 changed files with 9 additions and 8 deletions

3
debian/changelog vendored
View File

@ -1,9 +1,10 @@
linux (4.19.2-1~exp1) UNRELEASED; urgency=medium linux (4.19.3-1~exp1) UNRELEASED; urgency=medium
* New upstream release: https://kernelnewbies.org/Linux_4.19 * New upstream release: https://kernelnewbies.org/Linux_4.19
* New upstream stable update: * New upstream stable update:
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.1 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.1
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.2 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.2
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.3
[ Ben Hutchings ] [ Ben Hutchings ]
* linux-perf: Enable verbose output for build-time feature detection * linux-perf: Enable verbose output for build-time feature detection

View File

@ -18,6 +18,7 @@ Signed-off-by: Linn Crosetto <linn@hpe.com>
- Pass result of efi_get_secureboot() in stub through to - Pass result of efi_get_secureboot() in stub through to
efi_set_secure_boot() in main kernel efi_set_secure_boot() in main kernel
- Use lockdown API and naming] - Use lockdown API and naming]
[bwh: Forward-ported to 4.19.3: adjust context in update_fdt()]
--- ---
arch/arm64/Kconfig | 13 +++++++++++++ arch/arm64/Kconfig | 13 +++++++++++++
drivers/firmware/efi/arm-init.c | 7 +++++++ drivers/firmware/efi/arm-init.c | 7 +++++++
@ -50,7 +51,7 @@ Signed-off-by: Linn Crosetto <linn@hpe.com>
return; return;
--- a/drivers/firmware/efi/efi.c --- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c
@@ -635,7 +635,8 @@ static __initdata struct params fdt_para @@ -657,7 +657,8 @@ static __initdata struct params fdt_para
UEFI_PARAM("MemMap Address", "linux,uefi-mmap-start", mmap), UEFI_PARAM("MemMap Address", "linux,uefi-mmap-start", mmap),
UEFI_PARAM("MemMap Size", "linux,uefi-mmap-size", mmap_size), UEFI_PARAM("MemMap Size", "linux,uefi-mmap-size", mmap_size),
UEFI_PARAM("MemMap Desc. Size", "linux,uefi-mmap-desc-size", desc_size), UEFI_PARAM("MemMap Desc. Size", "linux,uefi-mmap-desc-size", desc_size),
@ -62,23 +63,22 @@ Signed-off-by: Linn Crosetto <linn@hpe.com>
static __initdata struct params xen_fdt_params[] = { static __initdata struct params xen_fdt_params[] = {
--- a/drivers/firmware/efi/libstub/fdt.c --- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c
@@ -158,6 +158,13 @@ static efi_status_t update_fdt(efi_syste @@ -159,6 +159,12 @@ static efi_status_t update_fdt(efi_syste
return efi_status;
} }
} }
+
+ fdt_val32 = cpu_to_fdt32(efi_get_secureboot(sys_table)); + fdt_val32 = cpu_to_fdt32(efi_get_secureboot(sys_table));
+ status = fdt_setprop(fdt, node, "linux,uefi-secure-boot", + status = fdt_setprop(fdt, node, "linux,uefi-secure-boot",
+ &fdt_val32, sizeof(fdt_val32)); + &fdt_val32, sizeof(fdt_val32));
+ if (status) + if (status)
+ goto fdt_set_fail; + goto fdt_set_fail;
+ +
return EFI_SUCCESS; /* shrink the FDT back to its minimum size */
fdt_pack(fdt);
fdt_set_fail:
--- a/include/linux/efi.h --- a/include/linux/efi.h
+++ b/include/linux/efi.h +++ b/include/linux/efi.h
@@ -749,6 +749,7 @@ struct efi_fdt_params { @@ -786,6 +786,7 @@ struct efi_fdt_params {
u32 mmap_size; u32 mmap_size;
u32 desc_size; u32 desc_size;
u32 desc_ver; u32 desc_ver;