From 8d88ee46516a5fbb596178289469047166723b56 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 7 Jul 2020 16:11:47 +0200 Subject: [PATCH] 4.14-stable patches added patches: dm-zoned-assign-max_io_len-correctly.patch efi-make-it-possible-to-disable-efivar_ssdt-entirely.patch --- ...dm-zoned-assign-max_io_len-correctly.patch | 35 +++++++++++ ...ible-to-disable-efivar_ssdt-entirely.patch | 61 +++++++++++++++++++ queue-4.14/series | 2 + 3 files changed, 98 insertions(+) create mode 100644 queue-4.14/dm-zoned-assign-max_io_len-correctly.patch create mode 100644 queue-4.14/efi-make-it-possible-to-disable-efivar_ssdt-entirely.patch diff --git a/queue-4.14/dm-zoned-assign-max_io_len-correctly.patch b/queue-4.14/dm-zoned-assign-max_io_len-correctly.patch new file mode 100644 index 00000000000..82372150cb5 --- /dev/null +++ b/queue-4.14/dm-zoned-assign-max_io_len-correctly.patch @@ -0,0 +1,35 @@ +From 7b2377486767503d47265e4d487a63c651f6b55d Mon Sep 17 00:00:00 2001 +From: Hou Tao +Date: Mon, 15 Jun 2020 11:33:23 +0800 +Subject: dm zoned: assign max_io_len correctly + +From: Hou Tao + +commit 7b2377486767503d47265e4d487a63c651f6b55d upstream. + +The unit of max_io_len is sector instead of byte (spotted through +code review), so fix it. + +Fixes: 3b1a94c88b79 ("dm zoned: drive-managed zoned block device target") +Cc: stable@vger.kernel.org +Signed-off-by: Hou Tao +Reviewed-by: Damien Le Moal +Signed-off-by: Mike Snitzer +Signed-off-by: Greg Kroah-Hartman + + +--- + drivers/md/dm-zoned-target.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/md/dm-zoned-target.c ++++ b/drivers/md/dm-zoned-target.c +@@ -789,7 +789,7 @@ static int dmz_ctr(struct dm_target *ti, + } + + /* Set target (no write same support) */ +- ti->max_io_len = dev->zone_nr_sectors << 9; ++ ti->max_io_len = dev->zone_nr_sectors; + ti->num_flush_bios = 1; + ti->num_discard_bios = 1; + ti->num_write_zeroes_bios = 1; diff --git a/queue-4.14/efi-make-it-possible-to-disable-efivar_ssdt-entirely.patch b/queue-4.14/efi-make-it-possible-to-disable-efivar_ssdt-entirely.patch new file mode 100644 index 00000000000..717ab454ffb --- /dev/null +++ b/queue-4.14/efi-make-it-possible-to-disable-efivar_ssdt-entirely.patch @@ -0,0 +1,61 @@ +From 435d1a471598752446a72ad1201b3c980526d869 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 15 Jun 2020 16:24:08 -0400 +Subject: efi: Make it possible to disable efivar_ssdt entirely + +From: Peter Jones + +commit 435d1a471598752446a72ad1201b3c980526d869 upstream. + +In most cases, such as CONFIG_ACPI_CUSTOM_DSDT and +CONFIG_ACPI_TABLE_UPGRADE, boot-time modifications to firmware tables +are tied to specific Kconfig options. Currently this is not the case +for modifying the ACPI SSDT via the efivar_ssdt kernel command line +option and associated EFI variable. + +This patch adds CONFIG_EFI_CUSTOM_SSDT_OVERLAYS, which defaults +disabled, in order to allow enabling or disabling that feature during +the build. + +Cc: +Signed-off-by: Peter Jones +Link: https://lore.kernel.org/r/20200615202408.2242614-1-pjones@redhat.com +Signed-off-by: Ard Biesheuvel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firmware/efi/Kconfig | 11 +++++++++++ + drivers/firmware/efi/efi.c | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/firmware/efi/Kconfig ++++ b/drivers/firmware/efi/Kconfig +@@ -164,6 +164,17 @@ config RESET_ATTACK_MITIGATION + have been evicted, since otherwise it will trigger even on clean + reboots. + ++config EFI_CUSTOM_SSDT_OVERLAYS ++ bool "Load custom ACPI SSDT overlay from an EFI variable" ++ depends on EFI_VARS && ACPI ++ default ACPI_TABLE_UPGRADE ++ help ++ Allow loading of an ACPI SSDT overlay from an EFI variable specified ++ by a kernel command line option. ++ ++ See Documentation/admin-guide/acpi/ssdt-overlays.rst for more ++ information.endmenu ++ + endmenu + + config UEFI_CPER +--- a/drivers/firmware/efi/efi.c ++++ b/drivers/firmware/efi/efi.c +@@ -221,7 +221,7 @@ static void generic_ops_unregister(void) + efivars_unregister(&generic_efivars); + } + +-#if IS_ENABLED(CONFIG_ACPI) ++#ifdef CONFIG_EFI_CUSTOM_SSDT_OVERLAYS + #define EFIVAR_SSDT_NAME_MAX 16 + static char efivar_ssdt[EFIVAR_SSDT_NAME_MAX] __initdata; + static int __init efivar_ssdt_setup(char *str) diff --git a/queue-4.14/series b/queue-4.14/series index bb3d6c811a3..98ba66aa8f2 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -23,3 +23,5 @@ smb3-honor-persistent-resilient-handle-flags-for-multiuser-mounts.patch cifs-fix-the-target-file-was-deleted-when-rename-failed.patch mips-add-missing-ehb-in-mtc0-mfc0-sequence-for-dspen.patch irqchip-gic-atomically-update-affinity.patch +dm-zoned-assign-max_io_len-correctly.patch +efi-make-it-possible-to-disable-efivar_ssdt-entirely.patch -- 2.47.3