diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-08-17 09:42:06 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-08-17 09:42:06 -0500 |
commit | 19efe144db6a6699f2695f93de5da7357aa96374 (patch) | |
tree | 37f689ac73e5ac99a79035f8bda21f2c61b29a60 /patch-5.19-redhat.patch | |
parent | cf2a689a154b2ad4bafe8a36eeaf34887ac77d0f (diff) | |
download | kernel-19efe144db6a6699f2695f93de5da7357aa96374.tar.gz kernel-19efe144db6a6699f2695f93de5da7357aa96374.tar.xz kernel-19efe144db6a6699f2695f93de5da7357aa96374.zip |
kernel-5.19.2-300
* Wed Aug 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.2-0]
- v5.19.2 rebase
Resolves:
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.19-redhat.patch')
-rw-r--r-- | patch-5.19-redhat.patch | 79 |
1 files changed, 74 insertions, 5 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index c5eaaec65..01d7ac053 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -25,6 +25,7 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 ++- drivers/firmware/efi/secureboot.c | 38 + + drivers/firmware/sysfb.c | 18 +- drivers/gpu/drm/drm_ioctl.c | 8 +- drivers/gpu/drm/v3d/Kconfig | 5 +- drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +- @@ -51,12 +52,13 @@ include/linux/security.h | 5 + init/Kconfig | 2 +- kernel/module/signing.c | 9 +- + net/bluetooth/hci_event.c | 20 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 58 files changed, 1690 insertions(+), 312 deletions(-) + 60 files changed, 1727 insertions(+), 313 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..217c42874f41 100644 @@ -248,7 +250,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 3acb329035eb..90437fb215a4 100644 +index e2edc38ce52c..87712692db3c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -367,10 +369,10 @@ index ce9826bce29b..948d18e59cf5 100644 CONFIG_DRM_ETNAVIV=m CONFIG_DRM_MXSFB=m diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 1652a9800ebe..834d178f6c70 100644 +index a5d1b561ed53..cd93c9041679 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1128,7 +1128,7 @@ endchoice +@@ -1145,7 +1145,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -379,7 +381,7 @@ index 1652a9800ebe..834d178f6c70 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1367,6 +1367,7 @@ config XEN +@@ -1384,6 +1384,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -866,6 +868,42 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 1f276f108cc9..7039ad9bdf7f 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include <linux/screen_info.h> + #include <linux/sysfb.h> + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -83,7 +99,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 51fcf1298023..7f1097947731 100644 --- a/drivers/gpu/drm/drm_ioctl.c @@ -3023,6 +3061,37 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) +diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c +index 7cb956d3abb2..12df96177187 100644 +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -3997,6 +3997,26 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data, + break; + } + } ++ if (i == ARRAY_SIZE(hci_cc_table)) { ++ /* Unknown opcode, assume byte 0 contains the status, so ++ * that e.g. __hci_cmd_sync() properly returns errors ++ * for vendor specific commands send by HCI drivers. ++ * ++ * Note that the specification does not specify that ++ * byte 0 is the status: ++ * ++ * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E ++ * page 2189: ++ * ++ * Return_Parameters: ++ * Size: Depends on command ++ * ++ * For now using byte 0 seems to work fine, but in the future ++ * this may need to be updated so that drivers using vendor ++ * commands can specify their own completion handler. ++ */ ++ *status = skb->data[0]; ++ } + + handle_cmd_cnt_and_timer(hdev, ev->ncmd); + diff --git a/scripts/tags.sh b/scripts/tags.sh index 01fab3d4f90b..2ae5dfc904f9 100755 --- a/scripts/tags.sh |