From: Greg Kroah-Hartman Date: Sun, 11 Aug 2024 15:46:10 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.105~114 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a5171c7af252db1f8dc0a8d06a763f822821b62;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: bus-mhi-host-pci_generic-add-support-for-telit-fe990-modem.patch revert-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-bpffs.patch --- diff --git a/queue-6.1/bus-mhi-host-pci_generic-add-support-for-telit-fe990-modem.patch b/queue-6.1/bus-mhi-host-pci_generic-add-support-for-telit-fe990-modem.patch new file mode 100644 index 00000000000..c0833f0acf6 --- /dev/null +++ b/queue-6.1/bus-mhi-host-pci_generic-add-support-for-telit-fe990-modem.patch @@ -0,0 +1,38 @@ +From 0724869ede9c169429bb622e2d28f97995a95656 Mon Sep 17 00:00:00 2001 +From: Daniele Palmas +Date: Fri, 4 Aug 2023 11:40:39 +0200 +Subject: bus: mhi: host: pci_generic: add support for Telit FE990 modem + +From: Daniele Palmas + +commit 0724869ede9c169429bb622e2d28f97995a95656 upstream. + +Add support for Telit FE990 that has the same configuration as FN990: + +$ lspci -vv +04:00.0 Unassigned class [ff00]: Qualcomm Device 0308 + Subsystem: Device 1c5d:2015 + +Signed-off-by: Daniele Palmas +Reviewed-by: Manivannan Sadhasivam +Link: https://lore.kernel.org/r/20230804094039.365102-1-dnlplm@gmail.com +[mani: minor update to commit subject and adjusted comment] +Signed-off-by: Manivannan Sadhasivam +Cc: Fabio Porcedda +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bus/mhi/host/pci_generic.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/bus/mhi/host/pci_generic.c ++++ b/drivers/bus/mhi/host/pci_generic.c +@@ -553,6 +553,9 @@ static const struct pci_device_id mhi_pc + /* Telit FN990 */ + { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0308, 0x1c5d, 0x2010), + .driver_data = (kernel_ulong_t) &mhi_telit_fn990_info }, ++ /* Telit FE990 */ ++ { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0308, 0x1c5d, 0x2015), ++ .driver_data = (kernel_ulong_t) &mhi_telit_fn990_info }, + { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308), + .driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info }, + { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */ diff --git a/queue-6.1/revert-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-bpffs.patch b/queue-6.1/revert-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-bpffs.patch new file mode 100644 index 00000000000..e0a3007c46d --- /dev/null +++ b/queue-6.1/revert-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-bpffs.patch @@ -0,0 +1,36 @@ +From e3a983f4e008a444ca4886f09fdba80dfd374433 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Sun, 11 Aug 2024 17:43:22 +0200 +Subject: Revert "bpftool: Mount bpffs when pinmaps path not under the bpffs" + +From: Greg Kroah-Hartman + +This reverts commit 65dd9cbafec2f6f7908cebcab0386f750fc352af which is +commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b upstream. + +It breaks the build, so should be dropped. + +Reported-by: Salvatore Bonaccorso +Link: https://lore.kernel.org/r/ZrSe8gZ_GyFv1knq@eldamar.lan +Cc: Tao Chen +Cc: Daniel Borkmann +Cc: Quentin Monnet +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/bpf/bpftool/prog.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/tools/bpf/bpftool/prog.c ++++ b/tools/bpf/bpftool/prog.c +@@ -1707,10 +1707,6 @@ static int load_with_options(int argc, c + } + + if (pinmaps) { +- err = create_and_mount_bpffs_dir(pinmaps); +- if (err) +- goto err_unpin; +- + err = bpf_object__pin_maps(obj, pinmaps); + if (err) { + p_err("failed to pin all maps"); diff --git a/queue-6.1/series b/queue-6.1/series index d6fe1fb1e26..da54b5dd0f8 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -49,3 +49,5 @@ ext4-fix-uninitialized-variable-in-ext4_inlinedir_to.patch jbd2-avoid-memleak-in-jbd2_journal_write_metadata_bu.patch s390-sclp-prevent-release-of-buffer-in-i-o.patch sunrpc-fix-a-race-to-wake-a-sync-task.patch +bus-mhi-host-pci_generic-add-support-for-telit-fe990-modem.patch +revert-bpftool-mount-bpffs-when-pinmaps-path-not-under-the-bpffs.patch