From d62be6517c2a759b3aecb65310d0ab2cfd75c7b4 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 30 May 2024 14:48:13 -0400 Subject: [PATCH] Fixes for 5.15 Signed-off-by: Sasha Levin --- ...4x-cleanup-trcidr0-register-accesses.patch | 106 +++++ ...do-not-hardcode-iomem-access-for-reg.patch | 44 ++ ...do-not-save-restore-data-trace-contr.patch | 119 ++++++ ...fix-access-to-resource-selector-regi.patch | 51 +++ ...m4x-fix-unbalanced-pm_runtime_enable.patch | 66 +++ ...sight-etm4x-safe-access-for-trcqcltr.patch | 90 ++++ ...refactor-to-make-instp0-check-more-i.patch | 48 +++ ...4-add-check-for-dma_set_max_seg_size.patch | 40 ++ ...rcar-pci-host-add-missing-iommu-prop.patch | 47 +++ ...rcar-pci-host-add-optional-regulator.patch | 57 +++ ...trl-mediatek-mt7622-fix-array-proper.patch | 168 ++++++++ ...elect-irq_domain-instead-of-dependin.patch | 47 +++ ...n-t-allow-unaligned-truncation-on-re.patch | 65 +++ ...x-to-cover-reserve-release-_compress.patch | 75 ++++ ...x-to-relocate-check-condition-in-f2f.patch | 70 ++++ ...relocate-check-condition-in-f2f.patch-5887 | 70 ++++ .../f2fs-convert-to-use-sbi-directly.patch | 81 ++++ ..._copy_page-and-replace-with-memcpy_p.patch | 81 ++++ ...ow-partial-truncation-on-pinned-file.patch | 40 ++ ...k-pinfile-flag-in-f2fs_move_file_ran.patch | 37 ++ ...ase-node-block-count-in-error-path-o.patch | 44 ++ ...cate-check-condition-in-f2fs_falloca.patch | 62 +++ ...-on-page-writeback-in-__clone_blkadd.patch | 53 +++ queue-5.15/f2fs-fix-typos-in-comments.patch | 183 ++++++++ ...i-id-add-a-release-callback-function.patch | 50 +++ ...d-owner-module-and-take-its-refcount.patch | 210 ++++++++++ ...standard-dev_release-for-class-drive.patch | 394 ++++++++++++++++++ ...rl-move-device-table-to-its-right-lo.patch | 66 +++ ...heck-return-of-get_channel_from_mode.patch | 59 +++ ...310-support-negative-temperature-val.patch | 67 +++ ...subcmd-fix-parse-options-memory-leak.patch | 61 +++ ...e-early-printk-call-from-cpuinfo-sta.patch | 37 ++ ...e-gcc-flag-for-non-existing-early_pr.patch | 36 ++ ...-umask-handling-from-ovl_create_uppe.patch | 39 ++ ...r_port_dpc_enable_dsm-with-pci-firmw.patch | 71 ++++ ...r_port_locate_dsm-with-pci-firmware-.patch | 65 +++ ...194-fix-probe-path-for-endpoint-mode.patch | 47 +++ ...t-rid-of-duplicate-group-option-item.patch | 48 +++ ...nals-inject-build-id-fix-trap-divide.patch | 55 +++ ...file-leak-in-daemon_session__control.patch | 59 +++ ...erf-docs-document-bpf-event-modifier.patch | 48 +++ ...x-unassigned-instruction-op-discover.patch | 73 ++++ ...issing-libgen.h-header-needed-for-us.patch | 53 +++ ...te-session-after-stopping-sideband-t.patch | 83 ++++ ...id-segv-in-report__setup_sample_type.patch | 47 +++ ...display-metric-header-for-non-leader.patch | 90 ++++ ...i-exit-screen-refresh-race-condition.patch | 75 ++++ .../perf-ui-browser-avoid-segv-on-title.patch | 46 ++ ...r-don-t-save-pointer-to-stack-memory.patch | 143 +++++++ .../perf-ui-update-use-of-pthread-mutex.patch | 382 +++++++++++++++++ ...dd-an-error-check-in-register_device.patch | 72 ++++ ...ge-of-the-deprecated-ida_simple_xx-a.patch | 57 +++ ...-alt_stfle_fac_list-from-decompresso.patch | 49 +++ ...orrect-initialization-of-len-fields-.patch | 42 ++ ...orrect-initialization-of-nvme-dump-b.patch | 43 ++ ...-out-mno-pic-data-is-text-relative-c.patch | 58 +++ ...ate-unwind-information-for-c-modules.patch | 55 +++ ...vdso-use-standard-stack-frame-layout.patch | 56 +++ ...er-out-munaligned-symbols-flag-for-v.patch | 56 +++ .../serial-max3100-fix-bitwise-types.patch | 53 +++ ...ock-port-lock-when-calling-uart_hand.patch | 66 +++ ...pdate-uart_driver_registered-on-driv.patch | 73 ++++ ...-add-proper-sched.h-include-for-sche.patch | 44 ++ ...otect-invalidating-rxdma-on-shutdown.patch | 47 +++ queue-5.15/series | 69 +++ ...dwire-cadence-fix-invalid-pdi-offset.patch | 48 +++ ...a-double-free-in-stm_register_device.patch | 57 +++ ...u_audio-clear-uac-pointer-when-freed.patch | 40 ++ ...-bd9576-drop-always-running-property.patch | 84 ++++ ...wdt-switch-to-using-devm_fwnode_gpio.patch | 127 ++++++ 70 files changed, 5344 insertions(+) create mode 100644 queue-5.15/coresight-etm4x-cleanup-trcidr0-register-accesses.patch create mode 100644 queue-5.15/coresight-etm4x-do-not-hardcode-iomem-access-for-reg.patch create mode 100644 queue-5.15/coresight-etm4x-do-not-save-restore-data-trace-contr.patch create mode 100644 queue-5.15/coresight-etm4x-fix-access-to-resource-selector-regi.patch create mode 100644 queue-5.15/coresight-etm4x-fix-unbalanced-pm_runtime_enable.patch create mode 100644 queue-5.15/coresight-etm4x-safe-access-for-trcqcltr.patch create mode 100644 queue-5.15/coresight-no-op-refactor-to-make-instp0-check-more-i.patch create mode 100644 queue-5.15/dmaengine-idma64-add-check-for-dma_set_max_seg_size.patch create mode 100644 queue-5.15/dt-bindings-pci-rcar-pci-host-add-missing-iommu-prop.patch create mode 100644 queue-5.15/dt-bindings-pci-rcar-pci-host-add-optional-regulator.patch create mode 100644 queue-5.15/dt-bindings-pinctrl-mediatek-mt7622-fix-array-proper.patch create mode 100644 queue-5.15/extcon-max8997-select-irq_domain-instead-of-dependin.patch create mode 100644 queue-5.15/f2fs-compress-don-t-allow-unaligned-truncation-on-re.patch create mode 100644 queue-5.15/f2fs-compress-fix-to-cover-reserve-release-_compress.patch create mode 100644 queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch create mode 100644 queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch-5887 create mode 100644 queue-5.15/f2fs-convert-to-use-sbi-directly.patch create mode 100644 queue-5.15/f2fs-delete-f2fs_copy_page-and-replace-with-memcpy_p.patch create mode 100644 queue-5.15/f2fs-do-not-allow-partial-truncation-on-pinned-file.patch create mode 100644 queue-5.15/f2fs-fix-to-check-pinfile-flag-in-f2fs_move_file_ran.patch create mode 100644 queue-5.15/f2fs-fix-to-release-node-block-count-in-error-path-o.patch create mode 100644 queue-5.15/f2fs-fix-to-relocate-check-condition-in-f2fs_falloca.patch create mode 100644 queue-5.15/f2fs-fix-to-wait-on-page-writeback-in-__clone_blkadd.patch create mode 100644 queue-5.15/f2fs-fix-typos-in-comments.patch create mode 100644 queue-5.15/firmware-dmi-id-add-a-release-callback-function.patch create mode 100644 queue-5.15/fpga-region-add-owner-module-and-take-its-refcount.patch create mode 100644 queue-5.15/fpga-region-use-standard-dev_release-for-class-drive.patch create mode 100644 queue-5.15/greybus-arche-ctrl-move-device-table-to-its-right-lo.patch create mode 100644 queue-5.15/greybus-lights-check-return-of-get_channel_from_mode.patch create mode 100644 queue-5.15/iio-pressure-dps310-support-negative-temperature-val.patch create mode 100644 queue-5.15/libsubcmd-fix-parse-options-memory-leak.patch create mode 100644 queue-5.15/microblaze-remove-early-printk-call-from-cpuinfo-sta.patch create mode 100644 queue-5.15/microblaze-remove-gcc-flag-for-non-existing-early_pr.patch create mode 100644 queue-5.15/ovl-remove-upper-umask-handling-from-ovl_create_uppe.patch create mode 100644 queue-5.15/pci-edr-align-edr_port_dpc_enable_dsm-with-pci-firmw.patch create mode 100644 queue-5.15/pci-edr-align-edr_port_locate_dsm-with-pci-firmware-.patch create mode 100644 queue-5.15/pci-tegra194-fix-probe-path-for-endpoint-mode.patch create mode 100644 queue-5.15/perf-annotate-get-rid-of-duplicate-group-option-item.patch create mode 100644 queue-5.15/perf-bench-internals-inject-build-id-fix-trap-divide.patch create mode 100644 queue-5.15/perf-daemon-fix-file-leak-in-daemon_session__control.patch create mode 100644 queue-5.15/perf-docs-document-bpf-event-modifier.patch create mode 100644 queue-5.15/perf-intel-pt-fix-unassigned-instruction-op-discover.patch create mode 100644 queue-5.15/perf-probe-add-missing-libgen.h-header-needed-for-us.patch create mode 100644 queue-5.15/perf-record-delete-session-after-stopping-sideband-t.patch create mode 100644 queue-5.15/perf-report-avoid-segv-in-report__setup_sample_type.patch create mode 100644 queue-5.15/perf-stat-don-t-display-metric-header-for-non-leader.patch create mode 100644 queue-5.15/perf-top-fix-tui-exit-screen-refresh-race-condition.patch create mode 100644 queue-5.15/perf-ui-browser-avoid-segv-on-title.patch create mode 100644 queue-5.15/perf-ui-browser-don-t-save-pointer-to-stack-memory.patch create mode 100644 queue-5.15/perf-ui-update-use-of-pthread-mutex.patch create mode 100644 queue-5.15/ppdev-add-an-error-check-in-register_device.patch create mode 100644 queue-5.15/ppdev-remove-usage-of-the-deprecated-ida_simple_xx-a.patch create mode 100644 queue-5.15/s390-boot-remove-alt_stfle_fac_list-from-decompresso.patch create mode 100644 queue-5.15/s390-ipl-fix-incorrect-initialization-of-len-fields-.patch create mode 100644 queue-5.15/s390-ipl-fix-incorrect-initialization-of-nvme-dump-b.patch create mode 100644 queue-5.15/s390-vdso-filter-out-mno-pic-data-is-text-relative-c.patch create mode 100644 queue-5.15/s390-vdso-generate-unwind-information-for-c-modules.patch create mode 100644 queue-5.15/s390-vdso-use-standard-stack-frame-layout.patch create mode 100644 queue-5.15/s390-vdso64-filter-out-munaligned-symbols-flag-for-v.patch create mode 100644 queue-5.15/serial-max3100-fix-bitwise-types.patch create mode 100644 queue-5.15/serial-max3100-lock-port-lock-when-calling-uart_hand.patch create mode 100644 queue-5.15/serial-max3100-update-uart_driver_registered-on-driv.patch create mode 100644 queue-5.15/serial-sc16is7xx-add-proper-sched.h-include-for-sche.patch create mode 100644 queue-5.15/serial-sh-sci-protect-invalidating-rxdma-on-shutdown.patch create mode 100644 queue-5.15/soundwire-cadence-fix-invalid-pdi-offset.patch create mode 100644 queue-5.15/stm-class-fix-a-double-free-in-stm_register_device.patch create mode 100644 queue-5.15/usb-gadget-u_audio-clear-uac-pointer-when-freed.patch create mode 100644 queue-5.15/watchdog-bd9576-drop-always-running-property.patch create mode 100644 queue-5.15/watchdog-bd9576_wdt-switch-to-using-devm_fwnode_gpio.patch diff --git a/queue-5.15/coresight-etm4x-cleanup-trcidr0-register-accesses.patch b/queue-5.15/coresight-etm4x-cleanup-trcidr0-register-accesses.patch new file mode 100644 index 00000000000..d48285a85f1 --- /dev/null +++ b/queue-5.15/coresight-etm4x-cleanup-trcidr0-register-accesses.patch @@ -0,0 +1,106 @@ +From f77cc75c7787ff03148dd871db9517eb6bfe4cae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Mar 2022 17:18:58 +0000 +Subject: coresight: etm4x: Cleanup TRCIDR0 register accesses + +From: James Clark + +[ Upstream commit e601cc9a3a9b94b48de7f120b583d94c2d9fe3b5 ] + +This is a no-op change for style and consistency and has no effect on +the binary output by the compiler. In sysreg.h fields are defined as +the register name followed by the field name and then _MASK. This +allows for grepping for fields by name rather than using magic numbers. + +Signed-off-by: James Clark +Reviewed-by: Mike Leach +Link: https://lore.kernel.org/r/20220304171913.2292458-2-james.clark@arm.com +Signed-off-by: Mathieu Poirier +Stable-dep-of: 46bf8d7cd853 ("coresight: etm4x: Safe access for TRCQCLTR") +Signed-off-by: Sasha Levin +--- + .../coresight/coresight-etm4x-core.c | 36 +++++-------------- + drivers/hwtracing/coresight/coresight-etm4x.h | 13 +++++++ + 2 files changed, 21 insertions(+), 28 deletions(-) + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index fd753669b33eb..ed5b38013dc14 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -1048,41 +1048,21 @@ static void etm4_init_arch_data(void *info) + etmidr0 = etm4x_relaxed_read32(csa, TRCIDR0); + + /* INSTP0, bits[2:1] P0 tracing support field */ +- if (BMVAL(etmidr0, 1, 2) == 0b11) +- drvdata->instrp0 = true; +- else +- drvdata->instrp0 = false; +- ++ drvdata->instrp0 = !!(FIELD_GET(TRCIDR0_INSTP0_MASK, etmidr0) == 0b11); + /* TRCBB, bit[5] Branch broadcast tracing support bit */ +- if (BMVAL(etmidr0, 5, 5)) +- drvdata->trcbb = true; +- else +- drvdata->trcbb = false; +- ++ drvdata->trcbb = !!(etmidr0 & TRCIDR0_TRCBB); + /* TRCCOND, bit[6] Conditional instruction tracing support bit */ +- if (BMVAL(etmidr0, 6, 6)) +- drvdata->trccond = true; +- else +- drvdata->trccond = false; +- ++ drvdata->trccond = !!(etmidr0 & TRCIDR0_TRCCOND); + /* TRCCCI, bit[7] Cycle counting instruction bit */ +- if (BMVAL(etmidr0, 7, 7)) +- drvdata->trccci = true; +- else +- drvdata->trccci = false; +- ++ drvdata->trccci = !!(etmidr0 & TRCIDR0_TRCCCI); + /* RETSTACK, bit[9] Return stack bit */ +- if (BMVAL(etmidr0, 9, 9)) +- drvdata->retstack = true; +- else +- drvdata->retstack = false; +- ++ drvdata->retstack = !!(etmidr0 & TRCIDR0_RETSTACK); + /* NUMEVENT, bits[11:10] Number of events field */ +- drvdata->nr_event = BMVAL(etmidr0, 10, 11); ++ drvdata->nr_event = FIELD_GET(TRCIDR0_NUMEVENT_MASK, etmidr0); + /* QSUPP, bits[16:15] Q element support field */ +- drvdata->q_support = BMVAL(etmidr0, 15, 16); ++ drvdata->q_support = FIELD_GET(TRCIDR0_QSUPP_MASK, etmidr0); + /* TSSIZE, bits[28:24] Global timestamp size field */ +- drvdata->ts_size = BMVAL(etmidr0, 24, 28); ++ drvdata->ts_size = FIELD_GET(TRCIDR0_TSSIZE_MASK, etmidr0); + + /* maximum size of resources */ + etmidr2 = etm4x_relaxed_read32(csa, TRCIDR2); +diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h +index 348d440ccd060..c463dab350397 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x.h ++++ b/drivers/hwtracing/coresight/coresight-etm4x.h +@@ -125,6 +125,19 @@ + + #define TRCRSR_TA BIT(12) + ++/* ++ * Bit positions of registers that are defined above, in the sysreg.h style ++ * of _MASK for multi bit fields and BIT() for single bits. ++ */ ++#define TRCIDR0_INSTP0_MASK GENMASK(2, 1) ++#define TRCIDR0_TRCBB BIT(5) ++#define TRCIDR0_TRCCOND BIT(6) ++#define TRCIDR0_TRCCCI BIT(7) ++#define TRCIDR0_RETSTACK BIT(9) ++#define TRCIDR0_NUMEVENT_MASK GENMASK(11, 10) ++#define TRCIDR0_QSUPP_MASK GENMASK(16, 15) ++#define TRCIDR0_TSSIZE_MASK GENMASK(28, 24) ++ + /* + * System instructions to access ETM registers. + * See ETMv4.4 spec ARM IHI0064F section 4.3.6 System instructions +-- +2.43.0 + diff --git a/queue-5.15/coresight-etm4x-do-not-hardcode-iomem-access-for-reg.patch b/queue-5.15/coresight-etm4x-do-not-hardcode-iomem-access-for-reg.patch new file mode 100644 index 00000000000..84a96e025b5 --- /dev/null +++ b/queue-5.15/coresight-etm4x-do-not-hardcode-iomem-access-for-reg.patch @@ -0,0 +1,44 @@ +From 1e2cbc94db317fc762f44ca610ce9018fb7c5536 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Apr 2024 15:26:59 +0100 +Subject: coresight: etm4x: Do not hardcode IOMEM access for register restore + +From: Suzuki K Poulose + +[ Upstream commit 1e7ba33fa591de1cf60afffcabb45600b3607025 ] + +When we restore the register state for ETM4x, while coming back +from CPU idle, we hardcode IOMEM access. This is wrong and could +blow up for an ETM with system instructions access (and for ETE). + +Fixes: f5bd523690d2 ("coresight: etm4x: Convert all register accesses") +Reported-by: Yabin Cui +Reviewed-by: Mike Leach +Signed-off-by: Suzuki K Poulose +Tested-by: Yabin Cui +Link: https://lore.kernel.org/r/20240412142702.2882478-2-suzuki.poulose@arm.com +Signed-off-by: Sasha Levin +--- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index 3f5e9400222e7..07f1c0ff89961 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -1697,8 +1697,10 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata) + { + int i; + struct etmv4_save_state *state = drvdata->save_state; +- struct csdev_access tmp_csa = CSDEV_ACCESS_IOMEM(drvdata->base); +- struct csdev_access *csa = &tmp_csa; ++ struct csdev_access *csa = &drvdata->csdev->access; ++ ++ if (WARN_ON(!drvdata->csdev)) ++ return; + + etm4_cs_unlock(drvdata, csa); + etm4x_relaxed_write32(csa, state->trcclaimset, TRCCLAIMSET); +-- +2.43.0 + diff --git a/queue-5.15/coresight-etm4x-do-not-save-restore-data-trace-contr.patch b/queue-5.15/coresight-etm4x-do-not-save-restore-data-trace-contr.patch new file mode 100644 index 00000000000..15eef31f8d7 --- /dev/null +++ b/queue-5.15/coresight-etm4x-do-not-save-restore-data-trace-contr.patch @@ -0,0 +1,119 @@ +From c9f0082e5df3a5fa24593a7a59247e843fc2bc90 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Apr 2024 15:27:00 +0100 +Subject: coresight: etm4x: Do not save/restore Data trace control registers + +From: Suzuki K Poulose + +[ Upstream commit 5eb3a0c2c52368cb9902e9a6ea04888e093c487d ] + +ETM4x doesn't support Data trace on A class CPUs. As such do not access the +Data trace control registers during CPU idle. This could cause problems for +ETE. While at it, remove all references to the Data trace control registers. + +Fixes: f188b5e76aae ("coresight: etm4x: Save/restore state across CPU low power states") +Reported-by: Yabin Cui +Reviewed-by: Mike Leach +Signed-off-by: Suzuki K Poulose +Tested-by: Yabin Cui +Link: https://lore.kernel.org/r/20240412142702.2882478-3-suzuki.poulose@arm.com +Signed-off-by: Sasha Levin +--- + .../coresight/coresight-etm4x-core.c | 6 ---- + drivers/hwtracing/coresight/coresight-etm4x.h | 28 ------------------- + 2 files changed, 34 deletions(-) + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index 07f1c0ff89961..d3c11e305e5b9 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -1609,9 +1609,6 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) + state->trcvissctlr = etm4x_read32(csa, TRCVISSCTLR); + if (drvdata->nr_pe_cmp) + state->trcvipcssctlr = etm4x_read32(csa, TRCVIPCSSCTLR); +- state->trcvdctlr = etm4x_read32(csa, TRCVDCTLR); +- state->trcvdsacctlr = etm4x_read32(csa, TRCVDSACCTLR); +- state->trcvdarcctlr = etm4x_read32(csa, TRCVDARCCTLR); + + for (i = 0; i < drvdata->nrseqstate - 1; i++) + state->trcseqevr[i] = etm4x_read32(csa, TRCSEQEVRn(i)); +@@ -1726,9 +1723,6 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata) + etm4x_relaxed_write32(csa, state->trcvissctlr, TRCVISSCTLR); + if (drvdata->nr_pe_cmp) + etm4x_relaxed_write32(csa, state->trcvipcssctlr, TRCVIPCSSCTLR); +- etm4x_relaxed_write32(csa, state->trcvdctlr, TRCVDCTLR); +- etm4x_relaxed_write32(csa, state->trcvdsacctlr, TRCVDSACCTLR); +- etm4x_relaxed_write32(csa, state->trcvdarcctlr, TRCVDARCCTLR); + + for (i = 0; i < drvdata->nrseqstate - 1; i++) + etm4x_relaxed_write32(csa, state->trcseqevr[i], TRCSEQEVRn(i)); +diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h +index a0f3f0ba3380c..348d440ccd060 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x.h ++++ b/drivers/hwtracing/coresight/coresight-etm4x.h +@@ -43,9 +43,6 @@ + #define TRCVIIECTLR 0x084 + #define TRCVISSCTLR 0x088 + #define TRCVIPCSSCTLR 0x08C +-#define TRCVDCTLR 0x0A0 +-#define TRCVDSACCTLR 0x0A4 +-#define TRCVDARCCTLR 0x0A8 + /* Derived resources registers */ + #define TRCSEQEVRn(n) (0x100 + (n * 4)) /* n = 0-2 */ + #define TRCSEQRSTEVR 0x118 +@@ -90,9 +87,6 @@ + /* Address Comparator registers n = 0-15 */ + #define TRCACVRn(n) (0x400 + (n * 8)) + #define TRCACATRn(n) (0x480 + (n * 8)) +-/* Data Value Comparator Value registers, n = 0-7 */ +-#define TRCDVCVRn(n) (0x500 + (n * 16)) +-#define TRCDVCMRn(n) (0x580 + (n * 16)) + /* ContextID/Virtual ContextID comparators, n = 0-7 */ + #define TRCCIDCVRn(n) (0x600 + (n * 8)) + #define TRCVMIDCVRn(n) (0x640 + (n * 8)) +@@ -174,9 +168,6 @@ + /* List of registers accessible via System instructions */ + #define ETM4x_ONLY_SYSREG_LIST(op, val) \ + CASE_##op((val), TRCPROCSELR) \ +- CASE_##op((val), TRCVDCTLR) \ +- CASE_##op((val), TRCVDSACCTLR) \ +- CASE_##op((val), TRCVDARCCTLR) \ + CASE_##op((val), TRCOSLAR) + + #define ETM_COMMON_SYSREG_LIST(op, val) \ +@@ -324,22 +315,6 @@ + CASE_##op((val), TRCACATRn(13)) \ + CASE_##op((val), TRCACATRn(14)) \ + CASE_##op((val), TRCACATRn(15)) \ +- CASE_##op((val), TRCDVCVRn(0)) \ +- CASE_##op((val), TRCDVCVRn(1)) \ +- CASE_##op((val), TRCDVCVRn(2)) \ +- CASE_##op((val), TRCDVCVRn(3)) \ +- CASE_##op((val), TRCDVCVRn(4)) \ +- CASE_##op((val), TRCDVCVRn(5)) \ +- CASE_##op((val), TRCDVCVRn(6)) \ +- CASE_##op((val), TRCDVCVRn(7)) \ +- CASE_##op((val), TRCDVCMRn(0)) \ +- CASE_##op((val), TRCDVCMRn(1)) \ +- CASE_##op((val), TRCDVCMRn(2)) \ +- CASE_##op((val), TRCDVCMRn(3)) \ +- CASE_##op((val), TRCDVCMRn(4)) \ +- CASE_##op((val), TRCDVCMRn(5)) \ +- CASE_##op((val), TRCDVCMRn(6)) \ +- CASE_##op((val), TRCDVCMRn(7)) \ + CASE_##op((val), TRCCIDCVRn(0)) \ + CASE_##op((val), TRCCIDCVRn(1)) \ + CASE_##op((val), TRCCIDCVRn(2)) \ +@@ -821,9 +796,6 @@ struct etmv4_save_state { + u32 trcviiectlr; + u32 trcvissctlr; + u32 trcvipcssctlr; +- u32 trcvdctlr; +- u32 trcvdsacctlr; +- u32 trcvdarcctlr; + + u32 trcseqevr[ETM_MAX_SEQ_STATES]; + u32 trcseqrstevr; +-- +2.43.0 + diff --git a/queue-5.15/coresight-etm4x-fix-access-to-resource-selector-regi.patch b/queue-5.15/coresight-etm4x-fix-access-to-resource-selector-regi.patch new file mode 100644 index 00000000000..ecd8cb48c30 --- /dev/null +++ b/queue-5.15/coresight-etm4x-fix-access-to-resource-selector-regi.patch @@ -0,0 +1,51 @@ +From 403f4ff99775f1e5719c24ca76874a391fef8aa1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Apr 2024 15:27:02 +0100 +Subject: coresight: etm4x: Fix access to resource selector registers + +From: Suzuki K Poulose + +[ Upstream commit d6fc00d0f640d6010b51054aa8b0fd191177dbc9 ] + +Resource selector pair 0 is always implemented and reserved. We must not +touch it, even during save/restore for CPU Idle. Rest of the driver is +well behaved. Fix the offending ones. + +Reported-by: Yabin Cui +Fixes: f188b5e76aae ("coresight: etm4x: Save/restore state across CPU low power states") +Signed-off-by: Suzuki K Poulose +Tested-by: Yabin Cui +Reviewed-by: Mike Leach +Link: https://lore.kernel.org/r/20240412142702.2882478-5-suzuki.poulose@arm.com +Signed-off-by: Sasha Levin +--- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index 130e9030a8bef..84734c7c19158 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -1608,7 +1608,8 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) + state->trccntvr[i] = etm4x_read32(csa, TRCCNTVRn(i)); + } + +- for (i = 0; i < drvdata->nr_resource * 2; i++) ++ /* Resource selector pair 0 is reserved */ ++ for (i = 2; i < drvdata->nr_resource * 2; i++) + state->trcrsctlr[i] = etm4x_read32(csa, TRCRSCTLRn(i)); + + for (i = 0; i < drvdata->nr_ss_cmp; i++) { +@@ -1723,7 +1724,8 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata) + etm4x_relaxed_write32(csa, state->trccntvr[i], TRCCNTVRn(i)); + } + +- for (i = 0; i < drvdata->nr_resource * 2; i++) ++ /* Resource selector pair 0 is reserved */ ++ for (i = 2; i < drvdata->nr_resource * 2; i++) + etm4x_relaxed_write32(csa, state->trcrsctlr[i], TRCRSCTLRn(i)); + + for (i = 0; i < drvdata->nr_ss_cmp; i++) { +-- +2.43.0 + diff --git a/queue-5.15/coresight-etm4x-fix-unbalanced-pm_runtime_enable.patch b/queue-5.15/coresight-etm4x-fix-unbalanced-pm_runtime_enable.patch new file mode 100644 index 00000000000..26c2b977e0b --- /dev/null +++ b/queue-5.15/coresight-etm4x-fix-unbalanced-pm_runtime_enable.patch @@ -0,0 +1,66 @@ +From a71bd9ed6f4ccb3f1eb0b69ae6251909c79bd7dc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Mar 2024 11:28:33 +0530 +Subject: coresight: etm4x: Fix unbalanced pm_runtime_enable() + +From: Anshuman Khandual + +[ Upstream commit caa41c47dab7e1054f587e592ab21296e3a6781c ] + +There is an unbalanced pm_runtime_enable() in etm4_probe_platform_dev() +when etm4_probe() fails. This problem can be observed via the coresight +etm4 module's (load -> unload -> load) sequence when etm4_probe() fails +in etm4_probe_platform_dev(). + +[ 63.379943] coresight-etm4x 7040000.etm: Unbalanced pm_runtime_enable! +[ 63.393630] coresight-etm4x 7140000.etm: Unbalanced pm_runtime_enable! +[ 63.407455] coresight-etm4x 7240000.etm: Unbalanced pm_runtime_enable! +[ 63.420983] coresight-etm4x 7340000.etm: Unbalanced pm_runtime_enable! +[ 63.420999] coresight-etm4x 7440000.etm: Unbalanced pm_runtime_enable! +[ 63.441209] coresight-etm4x 7540000.etm: Unbalanced pm_runtime_enable! +[ 63.454689] coresight-etm4x 7640000.etm: Unbalanced pm_runtime_enable! +[ 63.474982] coresight-etm4x 7740000.etm: Unbalanced pm_runtime_enable! + +This fixes the above problem - with an explicit pm_runtime_disable() call +when etm4_probe() fails during etm4_probe_platform_dev(). + +Cc: Lorenzo Pieralisi +Cc: Hanjun Guo +Cc: Sudeep Holla +Cc: "Rafael J. Wysocki" +Cc: Len Brown +Cc: Suzuki K Poulose +Cc: Mike Leach +Cc: James Clark +Cc: Leo Yan +Cc: linux-acpi@vger.kernel.org +Cc: linux-arm-kernel@lists.infradead.org +Cc: linux-kernel@vger.kernel.org +Cc: coresight@lists.linaro.org +Fixes: 5214b563588e ("coresight: etm4x: Add support for sysreg only devices") +Reviewed-by: James Clark +Signed-off-by: Anshuman Khandual +Signed-off-by: Suzuki K Poulose +Link: https://lore.kernel.org/r/20240314055843.2625883-2-anshuman.khandual@arm.com +Signed-off-by: Sasha Levin +--- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index 26d0d4485ae99..3f5e9400222e7 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -2022,6 +2022,9 @@ static int etm4_probe_platform_dev(struct platform_device *pdev) + ret = etm4_probe(&pdev->dev, NULL, 0); + + pm_runtime_put(&pdev->dev); ++ if (ret) ++ pm_runtime_disable(&pdev->dev); ++ + return ret; + } + +-- +2.43.0 + diff --git a/queue-5.15/coresight-etm4x-safe-access-for-trcqcltr.patch b/queue-5.15/coresight-etm4x-safe-access-for-trcqcltr.patch new file mode 100644 index 00000000000..ab0f074500f --- /dev/null +++ b/queue-5.15/coresight-etm4x-safe-access-for-trcqcltr.patch @@ -0,0 +1,90 @@ +From 2ff4c10587a73ee2d58b6630170279fe50ae49db Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Apr 2024 15:27:01 +0100 +Subject: coresight: etm4x: Safe access for TRCQCLTR + +From: Suzuki K Poulose + +[ Upstream commit 46bf8d7cd8530eca607379033b9bc4ac5590a0cd ] + +ETM4x implements TRCQCLTR only when the Q elements are supported +and the Q element filtering is supported (TRCIDR0.QFILT). Access +to the register otherwise could be fatal. Fix this by tracking the +availability, like the others. + +Fixes: f188b5e76aae ("coresight: etm4x: Save/restore state across CPU low power states") +Reported-by: Yabin Cui +Reviewed-by: Mike Leach +Signed-off-by: Suzuki K Poulose +Tested-by: Yabin Cui +Link: https://lore.kernel.org/r/20240412142702.2882478-4-suzuki.poulose@arm.com +Signed-off-by: Sasha Levin +--- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 8 ++++++-- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 +++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index ed5b38013dc14..130e9030a8bef 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -1061,6 +1061,8 @@ static void etm4_init_arch_data(void *info) + drvdata->nr_event = FIELD_GET(TRCIDR0_NUMEVENT_MASK, etmidr0); + /* QSUPP, bits[16:15] Q element support field */ + drvdata->q_support = FIELD_GET(TRCIDR0_QSUPP_MASK, etmidr0); ++ if (drvdata->q_support) ++ drvdata->q_filt = !!(etmidr0 & TRCIDR0_QFILT); + /* TSSIZE, bits[28:24] Global timestamp size field */ + drvdata->ts_size = FIELD_GET(TRCIDR0_TSSIZE_MASK, etmidr0); + +@@ -1582,7 +1584,8 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) + state->trcccctlr = etm4x_read32(csa, TRCCCCTLR); + state->trcbbctlr = etm4x_read32(csa, TRCBBCTLR); + state->trctraceidr = etm4x_read32(csa, TRCTRACEIDR); +- state->trcqctlr = etm4x_read32(csa, TRCQCTLR); ++ if (drvdata->q_filt) ++ state->trcqctlr = etm4x_read32(csa, TRCQCTLR); + + state->trcvictlr = etm4x_read32(csa, TRCVICTLR); + state->trcviiectlr = etm4x_read32(csa, TRCVIIECTLR); +@@ -1696,7 +1699,8 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata) + etm4x_relaxed_write32(csa, state->trcccctlr, TRCCCCTLR); + etm4x_relaxed_write32(csa, state->trcbbctlr, TRCBBCTLR); + etm4x_relaxed_write32(csa, state->trctraceidr, TRCTRACEIDR); +- etm4x_relaxed_write32(csa, state->trcqctlr, TRCQCTLR); ++ if (drvdata->q_filt) ++ etm4x_relaxed_write32(csa, state->trcqctlr, TRCQCTLR); + + etm4x_relaxed_write32(csa, state->trcvictlr, TRCVICTLR); + etm4x_relaxed_write32(csa, state->trcviiectlr, TRCVIIECTLR); +diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h +index c463dab350397..3ab528c6b91f1 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x.h ++++ b/drivers/hwtracing/coresight/coresight-etm4x.h +@@ -135,6 +135,7 @@ + #define TRCIDR0_TRCCCI BIT(7) + #define TRCIDR0_RETSTACK BIT(9) + #define TRCIDR0_NUMEVENT_MASK GENMASK(11, 10) ++#define TRCIDR0_QFILT BIT(14) + #define TRCIDR0_QSUPP_MASK GENMASK(16, 15) + #define TRCIDR0_TSSIZE_MASK GENMASK(28, 24) + +@@ -880,6 +881,7 @@ struct etmv4_save_state { + * @os_unlock: True if access to management registers is allowed. + * @instrp0: Tracing of load and store instructions + * as P0 elements is supported. ++ * @q_filt: Q element filtering support, if Q elements are supported. + * @trcbb: Indicates if the trace unit supports branch broadcast tracing. + * @trccond: If the trace unit supports conditional + * instruction tracing. +@@ -938,6 +940,7 @@ struct etmv4_drvdata { + bool boot_enable; + bool os_unlock; + bool instrp0; ++ bool q_filt; + bool trcbb; + bool trccond; + bool retstack; +-- +2.43.0 + diff --git a/queue-5.15/coresight-no-op-refactor-to-make-instp0-check-more-i.patch b/queue-5.15/coresight-no-op-refactor-to-make-instp0-check-more-i.patch new file mode 100644 index 00000000000..90ced1a3882 --- /dev/null +++ b/queue-5.15/coresight-no-op-refactor-to-make-instp0-check-more-i.patch @@ -0,0 +1,48 @@ +From dd76dab03fe3098983f069913b9a148bb3f51ca6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Feb 2022 11:53:35 +0000 +Subject: coresight: no-op refactor to make INSTP0 check more idiomatic + +From: James Clark + +[ Upstream commit d05bbad0130ff86b802e5cd6acbb6cac23b841b8 ] + +The spec says this: + + P0 tracing support field. The permitted values are: + 0b00 Tracing of load and store instructions as P0 elements is not + supported. + 0b11 Tracing of load and store instructions as P0 elements is + supported, so TRCCONFIGR.INSTP0 is supported. + + All other values are reserved. + +The value we are looking for is 0b11 so simplify this. The double read +and && was a bit obfuscated. + +Suggested-by: Suzuki Poulose +Signed-off-by: James Clark +Link: https://lore.kernel.org/r/20220203115336.119735-2-james.clark@arm.com +Signed-off-by: Suzuki K Poulose +Stable-dep-of: 46bf8d7cd853 ("coresight: etm4x: Safe access for TRCQCLTR") +Signed-off-by: Sasha Levin +--- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c +index d3c11e305e5b9..fd753669b33eb 100644 +--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c ++++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +@@ -1048,7 +1048,7 @@ static void etm4_init_arch_data(void *info) + etmidr0 = etm4x_relaxed_read32(csa, TRCIDR0); + + /* INSTP0, bits[2:1] P0 tracing support field */ +- if (BMVAL(etmidr0, 1, 1) && BMVAL(etmidr0, 2, 2)) ++ if (BMVAL(etmidr0, 1, 2) == 0b11) + drvdata->instrp0 = true; + else + drvdata->instrp0 = false; +-- +2.43.0 + diff --git a/queue-5.15/dmaengine-idma64-add-check-for-dma_set_max_seg_size.patch b/queue-5.15/dmaengine-idma64-add-check-for-dma_set_max_seg_size.patch new file mode 100644 index 00000000000..d6db4f2df88 --- /dev/null +++ b/queue-5.15/dmaengine-idma64-add-check-for-dma_set_max_seg_size.patch @@ -0,0 +1,40 @@ +From 43f6e0e10bc9949e9a7f2ea955d69801e6222453 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Apr 2024 02:49:32 +0000 +Subject: dmaengine: idma64: Add check for dma_set_max_seg_size + +From: Chen Ni + +[ Upstream commit 2b1c1cf08a0addb6df42f16b37133dc7a351de29 ] + +As the possible failure of the dma_set_max_seg_size(), it should be +better to check the return value of the dma_set_max_seg_size(). + +Fixes: e3fdb1894cfa ("dmaengine: idma64: set maximum allowed segment size for DMA") +Signed-off-by: Chen Ni +Acked-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20240403024932.3342606-1-nichen@iscas.ac.cn +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/idma64.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c +index af8777a1ec2e3..89e4a3e1d5198 100644 +--- a/drivers/dma/idma64.c ++++ b/drivers/dma/idma64.c +@@ -594,7 +594,9 @@ static int idma64_probe(struct idma64_chip *chip) + + idma64->dma.dev = chip->sysdev; + +- dma_set_max_seg_size(idma64->dma.dev, IDMA64C_CTLH_BLOCK_TS_MASK); ++ ret = dma_set_max_seg_size(idma64->dma.dev, IDMA64C_CTLH_BLOCK_TS_MASK); ++ if (ret) ++ return ret; + + ret = dma_async_device_register(&idma64->dma); + if (ret) +-- +2.43.0 + diff --git a/queue-5.15/dt-bindings-pci-rcar-pci-host-add-missing-iommu-prop.patch b/queue-5.15/dt-bindings-pci-rcar-pci-host-add-missing-iommu-prop.patch new file mode 100644 index 00000000000..6128fe7461f --- /dev/null +++ b/queue-5.15/dt-bindings-pci-rcar-pci-host-add-missing-iommu-prop.patch @@ -0,0 +1,47 @@ +From 52d17fb4c59d12114f5438a86eb6cbe968f568c1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 1 Feb 2024 16:52:01 +0100 +Subject: dt-bindings: PCI: rcar-pci-host: Add missing IOMMU properties +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Geert Uytterhoeven + +[ Upstream commit 78d212851f0e56b7d7083c4d5014aa7fa8b77e20 ] + +make dtbs_check: + + arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dtb: pcie@fe000000: Unevaluated properties are not allowed ('iommu-map', 'iommu-map-mask' were unexpected) + from schema $id: http://devicetree.org/schemas/pci/rcar-pci-host.yaml# + +Fix this by adding the missing IOMMU-related properties. + +[kwilczynski: added missing Fixes: tag] +Fixes: 0d69ce3c2c63 ("dt-bindings: PCI: rcar-pci-host: Convert bindings to json-schema") +Link: https://lore.kernel.org/linux-pci/babc878a93cb6461a5d39331f8ecfa654dfda921.1706802597.git.geert+renesas@glider.be +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Krzysztof Wilczyński +Acked-by: Conor Dooley +Signed-off-by: Sasha Levin +--- + Documentation/devicetree/bindings/pci/rcar-pci-host.yaml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml +index b6a7cb32f61e5..835b6db00c279 100644 +--- a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml ++++ b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml +@@ -77,6 +77,9 @@ properties: + vpcie12v-supply: + description: The 12v regulator to use for PCIe. + ++ iommu-map: true ++ iommu-map-mask: true ++ + required: + - compatible + - reg +-- +2.43.0 + diff --git a/queue-5.15/dt-bindings-pci-rcar-pci-host-add-optional-regulator.patch b/queue-5.15/dt-bindings-pci-rcar-pci-host-add-optional-regulator.patch new file mode 100644 index 00000000000..061f518ef16 --- /dev/null +++ b/queue-5.15/dt-bindings-pci-rcar-pci-host-add-optional-regulator.patch @@ -0,0 +1,57 @@ +From d79db466a80233d9b394dd67cc3a0038fef1a3b0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 5 Nov 2023 10:29:07 +0100 +Subject: dt-bindings: PCI: rcar-pci-host: Add optional regulators +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Wolfram Sang + +[ Upstream commit b952f96a57e6fb4528c1d6be19e941c3322f9905 ] + +Support regulators found on the KingFisher board for miniPCIe (1.5 and +3.3v). For completeness, describe a 12v regulator while we are here. + +Link: https://lore.kernel.org/linux-pci/20231105092908.3792-2-wsa+renesas@sang-engineering.com +Signed-off-by: Wolfram Sang +Signed-off-by: Krzysztof Wilczyński +Reviewed-by: Geert Uytterhoeven +Acked-by: Krzysztof Kozlowski +Stable-dep-of: 78d212851f0e ("dt-bindings: PCI: rcar-pci-host: Add missing IOMMU properties") +Signed-off-by: Sasha Levin +--- + .../devicetree/bindings/pci/rcar-pci-host.yaml | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml +index 8fdfbc763d704..b6a7cb32f61e5 100644 +--- a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml ++++ b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml +@@ -68,6 +68,15 @@ properties: + phy-names: + const: pcie + ++ vpcie1v5-supply: ++ description: The 1.5v regulator to use for PCIe. ++ ++ vpcie3v3-supply: ++ description: The 3.3v regulator to use for PCIe. ++ ++ vpcie12v-supply: ++ description: The 12v regulator to use for PCIe. ++ + required: + - compatible + - reg +@@ -121,5 +130,7 @@ examples: + clock-names = "pcie", "pcie_bus"; + power-domains = <&sysc R8A7791_PD_ALWAYS_ON>; + resets = <&cpg 319>; ++ vpcie3v3-supply = <&pcie_3v3>; ++ vpcie12v-supply = <&pcie_12v>; + }; + }; +-- +2.43.0 + diff --git a/queue-5.15/dt-bindings-pinctrl-mediatek-mt7622-fix-array-proper.patch b/queue-5.15/dt-bindings-pinctrl-mediatek-mt7622-fix-array-proper.patch new file mode 100644 index 00000000000..29dca430ffd --- /dev/null +++ b/queue-5.15/dt-bindings-pinctrl-mediatek-mt7622-fix-array-proper.patch @@ -0,0 +1,168 @@ +From d65cc5b7391c8a7adb7f03b31fef960f0812bd29 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 23 Apr 2024 06:55:01 +0200 +Subject: dt-bindings: pinctrl: mediatek: mt7622: fix array properties +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +[ Upstream commit 61fcbbf3ca038c048c942ce31bb3d3c846c87581 ] + +Some properties (function groups & pins) are meant to be arrays and +should allow multiple entries out of enum sets. Use "items" for those. + +Mistake was noticed during validation of in-kernel DTS files. + +Fixes: b9ffc18c6388 ("dt-bindings: mediatek: convert pinctrl to yaml") +Signed-off-by: Rafał Miłecki +Acked-by: Rob Herring +Message-ID: <20240423045502.7778-1-zajec5@gmail.com> +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + .../pinctrl/mediatek,mt7622-pinctrl.yaml | 92 ++++++++++--------- + 1 file changed, 49 insertions(+), 43 deletions(-) + +diff --git a/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml +index 0feecd376c694..9aed3a58f39e4 100644 +--- a/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml ++++ b/Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml +@@ -94,7 +94,8 @@ patternProperties: + then: + properties: + groups: +- enum: [emmc, emmc_rst] ++ items: ++ enum: [emmc, emmc_rst] + - if: + properties: + function: +@@ -102,8 +103,9 @@ patternProperties: + then: + properties: + groups: +- enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw, +- rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio] ++ items: ++ enum: [esw, esw_p0_p1, esw_p2_p3_p4, rgmii_via_esw, ++ rgmii_via_gmac1, rgmii_via_gmac2, mdc_mdio] + - if: + properties: + function: +@@ -120,10 +122,11 @@ patternProperties: + then: + properties: + groups: +- enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data, +- i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws, +- i2s1_out_data, i2s2_out_data, i2s3_out_data, +- i2s4_out_data] ++ items: ++ enum: [i2s_in_mclk_bclk_ws, i2s1_in_data, i2s2_in_data, ++ i2s3_in_data, i2s4_in_data, i2s_out_mclk_bclk_ws, ++ i2s1_out_data, i2s2_out_data, i2s3_out_data, ++ i2s4_out_data] + - if: + properties: + function: +@@ -156,10 +159,11 @@ patternProperties: + then: + properties: + groups: +- enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken, +- pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq, +- pcie0_pad_perst, pcie1_pad_perst, pcie_pereset, +- pcie_wake, pcie_clkreq] ++ items: ++ enum: [pcie0_0_waken, pcie0_1_waken, pcie1_0_waken, ++ pcie0_0_clkreq, pcie0_1_clkreq, pcie1_0_clkreq, ++ pcie0_pad_perst, pcie1_pad_perst, pcie_pereset, ++ pcie_wake, pcie_clkreq] + - if: + properties: + function: +@@ -175,11 +179,12 @@ patternProperties: + then: + properties: + groups: +- enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1, +- pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0, +- pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1, +- pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3, +- pwm_ch7_0, pwm_0, pwm_1] ++ items: ++ enum: [pwm_ch1_0, pwm_ch1_1, pwm_ch1_2, pwm_ch2_0, pwm_ch2_1, ++ pwm_ch2_2, pwm_ch3_0, pwm_ch3_1, pwm_ch3_2, pwm_ch4_0, ++ pwm_ch4_1, pwm_ch4_2, pwm_ch4_3, pwm_ch5_0, pwm_ch5_1, ++ pwm_ch5_2, pwm_ch6_0, pwm_ch6_1, pwm_ch6_2, pwm_ch6_3, ++ pwm_ch7_0, pwm_0, pwm_1] + - if: + properties: + function: +@@ -257,33 +262,34 @@ patternProperties: + pins: + description: | + An array of strings. Each string contains the name of a pin. +- enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0, +- RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS, +- I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT, +- I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1, +- G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2, +- G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6, +- NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0, +- MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1, +- MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2, +- MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3, +- MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL, +- PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS, +- GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N, +- PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2, +- AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4, +- PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA, +- WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4, +- WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG, +- EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS, +- EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N, +- WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD, +- UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD, +- UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N, +- PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5, +- GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK, +- TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3, +- WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6] ++ items: ++ enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0, ++ RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS, ++ I2C_SDA, I2C_SCL, I2S2_IN, I2S3_IN, I2S4_IN, I2S2_OUT, ++ I2S3_OUT, I2S4_OUT, GPIO_B, MDC, MDIO, G2_TXD0, G2_TXD1, ++ G2_TXD2, G2_TXD3, G2_TXEN, G2_TXC, G2_RXD0, G2_RXD1, G2_RXD2, ++ G2_RXD3, G2_RXDV, G2_RXC, NCEB, NWEB, NREB, NDL4, NDL5, NDL6, ++ NDL7, NRB, NCLE, NALE, NDL0, NDL1, NDL2, NDL3, MDI_TP_P0, ++ MDI_TN_P0, MDI_RP_P0, MDI_RN_P0, MDI_TP_P1, MDI_TN_P1, ++ MDI_RP_P1, MDI_RN_P1, MDI_RP_P2, MDI_RN_P2, MDI_TP_P2, ++ MDI_TN_P2, MDI_TP_P3, MDI_TN_P3, MDI_RP_P3, MDI_RN_P3, ++ MDI_RP_P4, MDI_RN_P4, MDI_TP_P4, MDI_TN_P4, PMIC_SCL, ++ PMIC_SDA, SPIC1_CLK, SPIC1_MOSI, SPIC1_MISO, SPIC1_CS, ++ GPIO_D, WATCHDOG, RTS3_N, CTS3_N, TXD3, RXD3, PERST0_N, ++ PERST1_N, WLED_N, EPHY_LED0_N, AUXIN0, AUXIN1, AUXIN2, ++ AUXIN3, TXD4, RXD4, RTS4_N, CST4_N, PWM1, PWM2, PWM3, PWM4, ++ PWM5, PWM6, PWM7, GPIO_E, TOP_5G_CLK, TOP_5G_DATA, ++ WF0_5G_HB0, WF0_5G_HB1, WF0_5G_HB2, WF0_5G_HB3, WF0_5G_HB4, ++ WF0_5G_HB5, WF0_5G_HB6, XO_REQ, TOP_RST_N, SYS_WATCHDOG, ++ EPHY_LED0_N_JTDO, EPHY_LED1_N_JTDI, EPHY_LED2_N_JTMS, ++ EPHY_LED3_N_JTCLK, EPHY_LED4_N_JTRST_N, WF2G_LED_N, ++ WF5G_LED_N, GPIO_9, GPIO_10, GPIO_11, GPIO_12, UART1_TXD, ++ UART1_RXD, UART1_CTS, UART1_RTS, UART2_TXD, UART2_RXD, ++ UART2_CTS, UART2_RTS, SMI_MDC, SMI_MDIO, PCIE_PERESET_N, ++ PWM_0, GPIO_0, GPIO_1, GPIO_2, GPIO_3, GPIO_4, GPIO_5, ++ GPIO_6, GPIO_7, GPIO_8, UART0_TXD, UART0_RXD, TOP_2G_CLK, ++ TOP_2G_DATA, WF0_2G_HB0, WF0_2G_HB1, WF0_2G_HB2, WF0_2G_HB3, ++ WF0_2G_HB4, WF0_2G_HB5, WF0_2G_HB6] + + bias-disable: true + +-- +2.43.0 + diff --git a/queue-5.15/extcon-max8997-select-irq_domain-instead-of-dependin.patch b/queue-5.15/extcon-max8997-select-irq_domain-instead-of-dependin.patch new file mode 100644 index 00000000000..ea2af70e95d --- /dev/null +++ b/queue-5.15/extcon-max8997-select-irq_domain-instead-of-dependin.patch @@ -0,0 +1,47 @@ +From 3f9dfd3ef1aaa8b1cd6450a0e6175a9c057f2930 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 12 Feb 2024 22:00:28 -0800 +Subject: extcon: max8997: select IRQ_DOMAIN instead of depending on it + +From: Randy Dunlap + +[ Upstream commit b1781d0a1458070d40134e4f3412ec9d70099bec ] + +IRQ_DOMAIN is a hidden (not user visible) symbol. Users cannot set +it directly thru "make *config", so drivers should select it instead +of depending on it if they need it. +Relying on it being set for a dependency is risky. + +Consistently using "select" or "depends on" can also help reduce +Kconfig circular dependency issues. + +Therefore, change EXTCON_MAX8997's use of "depends on" for +IRQ_DOMAIN to "select". + +Link: https://lore.kernel.org/lkml/20240213060028.9744-1-rdunlap@infradead.org/ +Fixes: dca1a71e4108 ("extcon: Add support irq domain for MAX8997 muic") +Signed-off-by: Randy Dunlap +Acked-by: Arnd Bergmann +Signed-off-by: Chanwoo Choi +Signed-off-by: Sasha Levin +--- + drivers/extcon/Kconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig +index 7684b3afa6304..ba0542ef4d888 100644 +--- a/drivers/extcon/Kconfig ++++ b/drivers/extcon/Kconfig +@@ -113,7 +113,8 @@ config EXTCON_MAX77843 + + config EXTCON_MAX8997 + tristate "Maxim MAX8997 EXTCON Support" +- depends on MFD_MAX8997 && IRQ_DOMAIN ++ depends on MFD_MAX8997 ++ select IRQ_DOMAIN + help + If you say yes here you get support for the MUIC device of + Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory +-- +2.43.0 + diff --git a/queue-5.15/f2fs-compress-don-t-allow-unaligned-truncation-on-re.patch b/queue-5.15/f2fs-compress-don-t-allow-unaligned-truncation-on-re.patch new file mode 100644 index 00000000000..8fee57becb3 --- /dev/null +++ b/queue-5.15/f2fs-compress-don-t-allow-unaligned-truncation-on-re.patch @@ -0,0 +1,65 @@ +From a14ec86bafb6b575a22d6689495e98f07c55669c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 May 2024 11:33:39 +0800 +Subject: f2fs: compress: don't allow unaligned truncation on released compress + inode + +From: Chao Yu + +[ Upstream commit 29ed2b5dd521ce7c5d8466cd70bf0cc9d07afeee ] + +f2fs image may be corrupted after below testcase: +- mkfs.f2fs -O extra_attr,compression -f /dev/vdb +- mount /dev/vdb /mnt/f2fs +- touch /mnt/f2fs/file +- f2fs_io setflags compression /mnt/f2fs/file +- dd if=/dev/zero of=/mnt/f2fs/file bs=4k count=4 +- f2fs_io release_cblocks /mnt/f2fs/file +- truncate -s 8192 /mnt/f2fs/file +- umount /mnt/f2fs +- fsck.f2fs /dev/vdb + +[ASSERT] (fsck_chk_inode_blk:1256) --> ino: 0x5 has i_blocks: 0x00000002, but has 0x3 blocks +[FSCK] valid_block_count matching with CP [Fail] [0x4, 0x5] +[FSCK] other corrupted bugs [Fail] + +The reason is: partial truncation assume compressed inode has reserved +blocks, after partial truncation, valid block count may change w/o +.i_blocks and .total_valid_block_count update, result in corruption. + +This patch only allow cluster size aligned truncation on released +compress inode for fixing. + +Fixes: c61404153eb6 ("f2fs: introduce FI_COMPRESS_RELEASED instead of using IMMUTABLE bit") +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 30b015fbec6a5..be9536815e50d 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -899,9 +899,14 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, + ATTR_GID | ATTR_TIMES_SET)))) + return -EPERM; + +- if ((attr->ia_valid & ATTR_SIZE) && +- !f2fs_is_compress_backend_ready(inode)) +- return -EOPNOTSUPP; ++ if ((attr->ia_valid & ATTR_SIZE)) { ++ if (!f2fs_is_compress_backend_ready(inode)) ++ return -EOPNOTSUPP; ++ if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED) && ++ !IS_ALIGNED(attr->ia_size, ++ F2FS_BLK_TO_BYTES(F2FS_I(inode)->i_cluster_size))) ++ return -EINVAL; ++ } + + err = setattr_prepare(&init_user_ns, dentry, attr); + if (err) +-- +2.43.0 + diff --git a/queue-5.15/f2fs-compress-fix-to-cover-reserve-release-_compress.patch b/queue-5.15/f2fs-compress-fix-to-cover-reserve-release-_compress.patch new file mode 100644 index 00000000000..d4dc82c6171 --- /dev/null +++ b/queue-5.15/f2fs-compress-fix-to-cover-reserve-release-_compress.patch @@ -0,0 +1,75 @@ +From 1053ee345d2e0ab3e179b0aa00fe970ba565f511 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 May 2024 18:41:39 +0800 +Subject: f2fs: compress: fix to cover {reserve,release}_compress_blocks() w/ + cp_rwsem lock + +From: Chao Yu + +[ Upstream commit 0a4ed2d97cb6d044196cc3e726b6699222b41019 ] + +It needs to cover {reserve,release}_compress_blocks() w/ cp_rwsem lock +to avoid racing with checkpoint, otherwise, filesystem metadata including +blkaddr in dnode, inode fields and .total_valid_block_count may be +corrupted after SPO case. + +Fixes: ef8d563f184e ("f2fs: introduce F2FS_IOC_RELEASE_COMPRESS_BLOCKS") +Fixes: c75488fb4d82 ("f2fs: introduce F2FS_IOC_RESERVE_COMPRESS_BLOCKS") +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index f10156aecf425..30b015fbec6a5 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -3490,9 +3490,12 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) + struct dnode_of_data dn; + pgoff_t end_offset, count; + ++ f2fs_lock_op(sbi); ++ + set_new_dnode(&dn, inode, NULL, NULL, 0); + ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE); + if (ret) { ++ f2fs_unlock_op(sbi); + if (ret == -ENOENT) { + page_idx = f2fs_get_next_page_offset(&dn, + page_idx); +@@ -3510,6 +3513,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) + + f2fs_put_dnode(&dn); + ++ f2fs_unlock_op(sbi); ++ + if (ret < 0) + break; + +@@ -3652,9 +3657,12 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) + struct dnode_of_data dn; + pgoff_t end_offset, count; + ++ f2fs_lock_op(sbi); ++ + set_new_dnode(&dn, inode, NULL, NULL, 0); + ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE); + if (ret) { ++ f2fs_unlock_op(sbi); + if (ret == -ENOENT) { + page_idx = f2fs_get_next_page_offset(&dn, + page_idx); +@@ -3672,6 +3680,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) + + f2fs_put_dnode(&dn); + ++ f2fs_unlock_op(sbi); ++ + if (ret < 0) + break; + +-- +2.43.0 + diff --git a/queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch b/queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch new file mode 100644 index 00000000000..5b9c8335d0f --- /dev/null +++ b/queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch @@ -0,0 +1,70 @@ +From 6aad40155cff89106d60dad7b17de4fa884c1640 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Apr 2024 15:26:03 +0800 +Subject: f2fs: compress: fix to relocate check condition in + f2fs_{release,reserve}_compress_blocks() + +From: Chao Yu + +[ Upstream commit 7c5dffb3d90c5921b91981cc663e02757d90526e ] + +Compress flag should be checked after inode lock held to avoid +racing w/ f2fs_setflags_common(), fix it. + +Fixes: 4c8ff7095bef ("f2fs: support data compression") +Reported-by: Zhiguo Niu +Closes: https://lore.kernel.org/linux-f2fs-devel/CAHJ8P3LdZXLc2rqeYjvymgYHr2+YLuJ0sLG9DdsJZmwO7deuhw@mail.gmail.com +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 3d811594d0d5c..1a03d0f33549c 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -3439,9 +3439,6 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) + if (!f2fs_sb_has_compression(F2FS_I_SB(inode))) + return -EOPNOTSUPP; + +- if (!f2fs_compressed_file(inode)) +- return -EINVAL; +- + if (f2fs_readonly(sbi->sb)) + return -EROFS; + +@@ -3460,7 +3457,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) + goto out; + } + +- if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { ++ if (!f2fs_compressed_file(inode) || ++ is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { + ret = -EINVAL; + goto out; + } +@@ -3618,9 +3616,6 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) + if (!f2fs_sb_has_compression(F2FS_I_SB(inode))) + return -EOPNOTSUPP; + +- if (!f2fs_compressed_file(inode)) +- return -EINVAL; +- + if (f2fs_readonly(sbi->sb)) + return -EROFS; + +@@ -3635,7 +3630,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) + + inode_lock(inode); + +- if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { ++ if (!f2fs_compressed_file(inode) || ++ !is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { + ret = -EINVAL; + goto unlock_inode; + } +-- +2.43.0 + diff --git a/queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch-5887 b/queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch-5887 new file mode 100644 index 00000000000..fae95b45a2d --- /dev/null +++ b/queue-5.15/f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch-5887 @@ -0,0 +1,70 @@ +From 98cc2f64fe646c426cd51a446bde565b1bb204b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Apr 2024 15:26:04 +0800 +Subject: f2fs: compress: fix to relocate check condition in + f2fs_ioc_{,de}compress_file() + +From: Chao Yu + +[ Upstream commit bd9ae4ae9e585061acfd4a169f2321706f900246 ] + +Compress flag should be checked after inode lock held to avoid +racing w/ f2fs_setflags_common() , fix it. + +Fixes: 5fdb322ff2c2 ("f2fs: add F2FS_IOC_DECOMPRESS_FILE and F2FS_IOC_COMPRESS_FILE") +Reported-by: Zhiguo Niu +Closes: https://lore.kernel.org/linux-f2fs-devel/CAHJ8P3LdZXLc2rqeYjvymgYHr2+YLuJ0sLG9DdsJZmwO7deuhw@mail.gmail.com +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 5c0c7b95259f3..da071ed11a3f6 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -4016,9 +4016,6 @@ static int f2fs_ioc_decompress_file(struct file *filp, unsigned long arg) + if (!(filp->f_mode & FMODE_WRITE)) + return -EBADF; + +- if (!f2fs_compressed_file(inode)) +- return -EINVAL; +- + f2fs_balance_fs(sbi, true); + + file_start_write(filp); +@@ -4029,7 +4026,8 @@ static int f2fs_ioc_decompress_file(struct file *filp, unsigned long arg) + goto out; + } + +- if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { ++ if (!f2fs_compressed_file(inode) || ++ is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { + ret = -EINVAL; + goto out; + } +@@ -4088,9 +4086,6 @@ static int f2fs_ioc_compress_file(struct file *filp, unsigned long arg) + if (!(filp->f_mode & FMODE_WRITE)) + return -EBADF; + +- if (!f2fs_compressed_file(inode)) +- return -EINVAL; +- + f2fs_balance_fs(sbi, true); + + file_start_write(filp); +@@ -4101,7 +4096,8 @@ static int f2fs_ioc_compress_file(struct file *filp, unsigned long arg) + goto out; + } + +- if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { ++ if (!f2fs_compressed_file(inode) || ++ is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) { + ret = -EINVAL; + goto out; + } +-- +2.43.0 + diff --git a/queue-5.15/f2fs-convert-to-use-sbi-directly.patch b/queue-5.15/f2fs-convert-to-use-sbi-directly.patch new file mode 100644 index 00000000000..816a51ac923 --- /dev/null +++ b/queue-5.15/f2fs-convert-to-use-sbi-directly.patch @@ -0,0 +1,81 @@ +From 4572d58e3bfac6ffe6eecf78568cde589b45f3f4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 13 Jun 2023 15:51:57 +0800 +Subject: f2fs: convert to use sbi directly + +From: Yangtao Li + +[ Upstream commit c3355ea9d82fe6b1a4226c9a7d311f9c5715b456 ] + +F2FS_I_SB(inode) is redundant. + +Signed-off-by: Yangtao Li +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Stable-dep-of: bd9ae4ae9e58 ("f2fs: compress: fix to relocate check condition in f2fs_ioc_{,de}compress_file()") +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 1a03d0f33549c..5c0c7b95259f3 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -3436,7 +3436,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) + int ret; + int writecount; + +- if (!f2fs_sb_has_compression(F2FS_I_SB(inode))) ++ if (!f2fs_sb_has_compression(sbi)) + return -EOPNOTSUPP; + + if (f2fs_readonly(sbi->sb)) +@@ -3446,7 +3446,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) + if (ret) + return ret; + +- f2fs_balance_fs(F2FS_I_SB(inode), true); ++ f2fs_balance_fs(sbi, true); + + inode_lock(inode); + +@@ -3613,7 +3613,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) + unsigned int reserved_blocks = 0; + int ret; + +- if (!f2fs_sb_has_compression(F2FS_I_SB(inode))) ++ if (!f2fs_sb_has_compression(sbi)) + return -EOPNOTSUPP; + + if (f2fs_readonly(sbi->sb)) +@@ -3626,7 +3626,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) + if (atomic_read(&F2FS_I(inode)->i_compr_blocks)) + goto out; + +- f2fs_balance_fs(F2FS_I_SB(inode), true); ++ f2fs_balance_fs(sbi, true); + + inode_lock(inode); + +@@ -4019,7 +4019,7 @@ static int f2fs_ioc_decompress_file(struct file *filp, unsigned long arg) + if (!f2fs_compressed_file(inode)) + return -EINVAL; + +- f2fs_balance_fs(F2FS_I_SB(inode), true); ++ f2fs_balance_fs(sbi, true); + + file_start_write(filp); + inode_lock(inode); +@@ -4091,7 +4091,7 @@ static int f2fs_ioc_compress_file(struct file *filp, unsigned long arg) + if (!f2fs_compressed_file(inode)) + return -EINVAL; + +- f2fs_balance_fs(F2FS_I_SB(inode), true); ++ f2fs_balance_fs(sbi, true); + + file_start_write(filp); + inode_lock(inode); +-- +2.43.0 + diff --git a/queue-5.15/f2fs-delete-f2fs_copy_page-and-replace-with-memcpy_p.patch b/queue-5.15/f2fs-delete-f2fs_copy_page-and-replace-with-memcpy_p.patch new file mode 100644 index 00000000000..11107848b85 --- /dev/null +++ b/queue-5.15/f2fs-delete-f2fs_copy_page-and-replace-with-memcpy_p.patch @@ -0,0 +1,81 @@ +From a280edb46218203ecb78c978cf787551c2315b01 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 17 Jul 2022 10:36:13 +0200 +Subject: f2fs: Delete f2fs_copy_page() and replace with memcpy_page() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Fabio M. De Francesco + +[ Upstream commit 1dd55358efc4f74e49fa9e1e97a03804852a4c20 ] + +f2fs_copy_page() is a wrapper around two kmap() + one memcpy() from/to +the mapped pages. It unnecessarily duplicates a kernel API and it makes +use of kmap(), which is being deprecated in favor of kmap_local_page(). + +Two main problems with kmap(): (1) It comes with an overhead as mapping +space is restricted and protected by a global lock for synchronization and +(2) it also requires global TLB invalidation when the kmap’s pool wraps +and it might block when the mapping space is fully utilized until a slot +becomes available. + +With kmap_local_page() the mappings are per thread, CPU local, can take +page faults, and can be called from any context (including interrupts). +It is faster than kmap() in kernels with HIGHMEM enabled. Therefore, its +use in __clone_blkaddrs() is safe and should be preferred. + +Delete f2fs_copy_page() and use a plain memcpy_page() in the only one +site calling the removed function. memcpy_page() avoids open coding two +kmap_local_page() + one memcpy() between the two kernel virtual addresses. + +Suggested-by: Christoph Hellwig +Suggested-by: Ira Weiny +Signed-off-by: Fabio M. De Francesco +Reviewed-by: Christoph Hellwig +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Stable-dep-of: d3876e34e7e7 ("f2fs: fix to wait on page writeback in __clone_blkaddrs()") +Signed-off-by: Sasha Levin +--- + fs/f2fs/f2fs.h | 10 ---------- + fs/f2fs/file.c | 2 +- + 2 files changed, 1 insertion(+), 11 deletions(-) + +diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h +index 647d53df6a3de..e49fca9daf2d3 100644 +--- a/fs/f2fs/f2fs.h ++++ b/fs/f2fs/f2fs.h +@@ -2587,16 +2587,6 @@ static inline struct page *f2fs_pagecache_get_page( + return pagecache_get_page(mapping, index, fgp_flags, gfp_mask); + } + +-static inline void f2fs_copy_page(struct page *src, struct page *dst) +-{ +- char *src_kaddr = kmap(src); +- char *dst_kaddr = kmap(dst); +- +- memcpy(dst_kaddr, src_kaddr, PAGE_SIZE); +- kunmap(dst); +- kunmap(src); +-} +- + static inline void f2fs_put_page(struct page *page, int unlock) + { + if (!page) +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 378ab6bd1b8d8..9b7ecbb974258 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -1276,7 +1276,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, + f2fs_put_page(psrc, 1); + return PTR_ERR(pdst); + } +- f2fs_copy_page(psrc, pdst); ++ memcpy_page(pdst, 0, psrc, 0, PAGE_SIZE); + set_page_dirty(pdst); + set_page_private_gcing(pdst); + f2fs_put_page(pdst, 1); +-- +2.43.0 + diff --git a/queue-5.15/f2fs-do-not-allow-partial-truncation-on-pinned-file.patch b/queue-5.15/f2fs-do-not-allow-partial-truncation-on-pinned-file.patch new file mode 100644 index 00000000000..861f32dcbc1 --- /dev/null +++ b/queue-5.15/f2fs-do-not-allow-partial-truncation-on-pinned-file.patch @@ -0,0 +1,40 @@ +From 18a26298c65963c0d8254e98859bd19afe9cd8c6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 7 Jan 2022 20:08:45 -0800 +Subject: f2fs: do not allow partial truncation on pinned file + +From: Jaegeuk Kim + +[ Upstream commit 5fed0be8583f08c1548b4dcd9e5ee0d1133d0730 ] + +If the pinned file has a hole by partial truncation, application that has +the block map will be broken. + +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Stable-dep-of: 278a6253a673 ("f2fs: fix to relocate check condition in f2fs_fallocate()") +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index da071ed11a3f6..959e1458412df 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -1760,7 +1760,11 @@ static long f2fs_fallocate(struct file *file, int mode, + (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE))) + return -EOPNOTSUPP; + +- if (f2fs_compressed_file(inode) && ++ /* ++ * Pinned file should not support partial trucation since the block ++ * can be used by applications. ++ */ ++ if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) && + (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE | + FALLOC_FL_ZERO_RANGE | FALLOC_FL_INSERT_RANGE))) + return -EOPNOTSUPP; +-- +2.43.0 + diff --git a/queue-5.15/f2fs-fix-to-check-pinfile-flag-in-f2fs_move_file_ran.patch b/queue-5.15/f2fs-fix-to-check-pinfile-flag-in-f2fs_move_file_ran.patch new file mode 100644 index 00000000000..cf3ba3de4c2 --- /dev/null +++ b/queue-5.15/f2fs-fix-to-check-pinfile-flag-in-f2fs_move_file_ran.patch @@ -0,0 +1,37 @@ +From 505483ba700e0da79da838ba3af3328fdca320a1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Apr 2024 22:24:20 +0800 +Subject: f2fs: fix to check pinfile flag in f2fs_move_file_range() + +From: Chao Yu + +[ Upstream commit e07230da0500e0919a765037c5e81583b519be2c ] + +ioctl(F2FS_IOC_MOVE_RANGE) can truncate or punch hole on pinned file, +fix to disallow it. + +Fixes: 5fed0be8583f ("f2fs: do not allow partial truncation on pinned file") +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 39002f3c3f8a7..f10156aecf425 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -2790,7 +2790,8 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, + goto out; + } + +- if (f2fs_compressed_file(src) || f2fs_compressed_file(dst)) { ++ if (f2fs_compressed_file(src) || f2fs_compressed_file(dst) || ++ f2fs_is_pinned_file(src) || f2fs_is_pinned_file(dst)) { + ret = -EOPNOTSUPP; + goto out_unlock; + } +-- +2.43.0 + diff --git a/queue-5.15/f2fs-fix-to-release-node-block-count-in-error-path-o.patch b/queue-5.15/f2fs-fix-to-release-node-block-count-in-error-path-o.patch new file mode 100644 index 00000000000..981db025786 --- /dev/null +++ b/queue-5.15/f2fs-fix-to-release-node-block-count-in-error-path-o.patch @@ -0,0 +1,44 @@ +From 3af6a22fa314cbe06d45033eade2c012b509de17 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 11:31:00 +0800 +Subject: f2fs: fix to release node block count in error path of + f2fs_new_node_page() + +From: Chao Yu + +[ Upstream commit 0fa4e57c1db263effd72d2149d4e21da0055c316 ] + +It missed to call dec_valid_node_count() to release node block count +in error path, fix it. + +Fixes: 141170b759e0 ("f2fs: fix to avoid use f2fs_bug_on() in f2fs_new_node_page()") +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/node.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c +index dc85dd55314cc..b6758887540f2 100644 +--- a/fs/f2fs/node.c ++++ b/fs/f2fs/node.c +@@ -1300,6 +1300,7 @@ struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs) + } + if (unlikely(new_ni.blk_addr != NULL_ADDR)) { + err = -EFSCORRUPTED; ++ dec_valid_node_count(sbi, dn->inode, !ofs); + set_sbi_flag(sbi, SBI_NEED_FSCK); + goto fail; + } +@@ -1325,7 +1326,6 @@ struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs) + if (ofs == 0) + inc_valid_inode_count(sbi); + return page; +- + fail: + clear_node_page_dirty(page); + f2fs_put_page(page, 1); +-- +2.43.0 + diff --git a/queue-5.15/f2fs-fix-to-relocate-check-condition-in-f2fs_falloca.patch b/queue-5.15/f2fs-fix-to-relocate-check-condition-in-f2fs_falloca.patch new file mode 100644 index 00000000000..2347b7838ee --- /dev/null +++ b/queue-5.15/f2fs-fix-to-relocate-check-condition-in-f2fs_falloca.patch @@ -0,0 +1,62 @@ +From 79d28ce4e068800ed06a18f1e47eaf4d94d5cd95 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Apr 2024 22:24:19 +0800 +Subject: f2fs: fix to relocate check condition in f2fs_fallocate() + +From: Chao Yu + +[ Upstream commit 278a6253a673611dbc8ab72a3b34b151a8e75822 ] + +compress and pinfile flag should be checked after inode lock held to +avoid race condition, fix it. + +Fixes: 4c8ff7095bef ("f2fs: support data compression") +Fixes: 5fed0be8583f ("f2fs: do not allow partial truncation on pinned file") +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index ffec3c5374f89..39002f3c3f8a7 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -1760,15 +1760,6 @@ static long f2fs_fallocate(struct file *file, int mode, + (mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE))) + return -EOPNOTSUPP; + +- /* +- * Pinned file should not support partial truncation since the block +- * can be used by applications. +- */ +- if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) && +- (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE | +- FALLOC_FL_ZERO_RANGE | FALLOC_FL_INSERT_RANGE))) +- return -EOPNOTSUPP; +- + if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | + FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE | + FALLOC_FL_INSERT_RANGE)) +@@ -1776,6 +1767,17 @@ static long f2fs_fallocate(struct file *file, int mode, + + inode_lock(inode); + ++ /* ++ * Pinned file should not support partial truncation since the block ++ * can be used by applications. ++ */ ++ if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) && ++ (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE | ++ FALLOC_FL_ZERO_RANGE | FALLOC_FL_INSERT_RANGE))) { ++ ret = -EOPNOTSUPP; ++ goto out; ++ } ++ + ret = file_modified(file); + if (ret) + goto out; +-- +2.43.0 + diff --git a/queue-5.15/f2fs-fix-to-wait-on-page-writeback-in-__clone_blkadd.patch b/queue-5.15/f2fs-fix-to-wait-on-page-writeback-in-__clone_blkadd.patch new file mode 100644 index 00000000000..d112654ee1f --- /dev/null +++ b/queue-5.15/f2fs-fix-to-wait-on-page-writeback-in-__clone_blkadd.patch @@ -0,0 +1,53 @@ +From ae7b877ad279bfeb91534613042fdf7228d60e2e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Mar 2024 19:28:45 +0800 +Subject: f2fs: fix to wait on page writeback in __clone_blkaddrs() + +From: Chao Yu + +[ Upstream commit d3876e34e7e789e2cbdd782360fef2a777391082 ] + +In below race condition, dst page may become writeback status +in __clone_blkaddrs(), it needs to wait writeback before update, +fix it. + +Thread A GC Thread +- f2fs_move_file_range + - filemap_write_and_wait_range(dst) + - gc_data_segment + - f2fs_down_write(dst) + - move_data_page + - set_page_writeback(dst_page) + - f2fs_submit_page_write + - f2fs_up_write(dst) + - f2fs_down_write(dst) + - __exchange_data_block + - __clone_blkaddrs + - f2fs_get_new_data_page + - memcpy_page + +Fixes: 0a2aa8fbb969 ("f2fs: refactor __exchange_data_block for speed up") +Signed-off-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 9b7ecbb974258..3d811594d0d5c 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -1276,6 +1276,9 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, + f2fs_put_page(psrc, 1); + return PTR_ERR(pdst); + } ++ ++ f2fs_wait_on_page_writeback(pdst, DATA, true, true); ++ + memcpy_page(pdst, 0, psrc, 0, PAGE_SIZE); + set_page_dirty(pdst); + set_page_private_gcing(pdst); +-- +2.43.0 + diff --git a/queue-5.15/f2fs-fix-typos-in-comments.patch b/queue-5.15/f2fs-fix-typos-in-comments.patch new file mode 100644 index 00000000000..4db8095d0e5 --- /dev/null +++ b/queue-5.15/f2fs-fix-typos-in-comments.patch @@ -0,0 +1,183 @@ +From f135a3d0bebfe992d6d55c7883b907d9269dbfcd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Feb 2023 20:56:00 +0900 +Subject: f2fs: fix typos in comments + +From: Jinyoung CHOI + +[ Upstream commit 146949defda868378992171b9e42318b06fcd482 ] + +This patch is to fix typos in f2fs files. + +Signed-off-by: Jinyoung Choi +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Stable-dep-of: 278a6253a673 ("f2fs: fix to relocate check condition in f2fs_fallocate()") +Signed-off-by: Sasha Levin +--- + fs/f2fs/checkpoint.c | 4 ++-- + fs/f2fs/compress.c | 2 +- + fs/f2fs/data.c | 8 ++++---- + fs/f2fs/extent_cache.c | 4 ++-- + fs/f2fs/file.c | 6 +++--- + fs/f2fs/namei.c | 2 +- + fs/f2fs/segment.c | 2 +- + 7 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c +index 7d3e7418d8fd5..71a3714419f85 100644 +--- a/fs/f2fs/checkpoint.c ++++ b/fs/f2fs/checkpoint.c +@@ -792,7 +792,7 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) + */ + head = &im->ino_list; + +- /* loop for each orphan inode entry and write them in Jornal block */ ++ /* loop for each orphan inode entry and write them in journal block */ + list_for_each_entry(orphan, head, list) { + if (!page) { + page = f2fs_grab_meta_page(sbi, start_blk++); +@@ -1124,7 +1124,7 @@ int f2fs_sync_dirty_inodes(struct f2fs_sb_info *sbi, enum inode_type type, + } else { + /* + * We should submit bio, since it exists several +- * wribacking dentry pages in the freeing inode. ++ * writebacking dentry pages in the freeing inode. + */ + f2fs_submit_merged_write(sbi, DATA); + cond_resched(); +diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c +index 88799c6ebd7de..be46dc41523b4 100644 +--- a/fs/f2fs/compress.c ++++ b/fs/f2fs/compress.c +@@ -1247,7 +1247,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, + loff_t psize; + int i, err; + +- /* we should bypass data pages to proceed the kworkder jobs */ ++ /* we should bypass data pages to proceed the kworker jobs */ + if (unlikely(f2fs_cp_error(sbi))) { + mapping_set_error(cc->rpages[0]->mapping, -EIO); + goto out_free; +diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c +index a8e99da8edc1f..fa86eaf1d6393 100644 +--- a/fs/f2fs/data.c ++++ b/fs/f2fs/data.c +@@ -2412,7 +2412,7 @@ static int f2fs_mpage_readpages(struct inode *inode, + + #ifdef CONFIG_F2FS_FS_COMPRESSION + if (f2fs_compressed_file(inode)) { +- /* there are remained comressed pages, submit them */ ++ /* there are remained compressed pages, submit them */ + if (!f2fs_cluster_can_merge_page(&cc, page->index)) { + ret = f2fs_read_multi_pages(&cc, &bio, + max_nr_pages, +@@ -2811,7 +2811,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, + + trace_f2fs_writepage(page, DATA); + +- /* we should bypass data pages to proceed the kworkder jobs */ ++ /* we should bypass data pages to proceed the kworker jobs */ + if (unlikely(f2fs_cp_error(sbi))) { + mapping_set_error(page->mapping, -EIO); + /* +@@ -2938,7 +2938,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, + redirty_out: + redirty_page_for_writepage(wbc, page); + /* +- * pageout() in MM traslates EAGAIN, so calls handle_write_error() ++ * pageout() in MM translates EAGAIN, so calls handle_write_error() + * -> mapping_set_error() -> set_bit(AS_EIO, ...). + * file_write_and_wait_range() will see EIO error, which is critical + * to return value of fsync() followed by atomic_write failure to user. +@@ -2972,7 +2972,7 @@ static int f2fs_write_data_page(struct page *page, + } + + /* +- * This function was copied from write_cche_pages from mm/page-writeback.c. ++ * This function was copied from write_cache_pages from mm/page-writeback.c. + * The major change is making write step of cold data page separately from + * warm/hot data page. + */ +diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c +index 6a9ab5c11939f..30b8924d1493d 100644 +--- a/fs/f2fs/extent_cache.c ++++ b/fs/f2fs/extent_cache.c +@@ -112,7 +112,7 @@ struct rb_node **f2fs_lookup_rb_tree_for_insert(struct f2fs_sb_info *sbi, + * @prev_ex: extent before ofs + * @next_ex: extent after ofs + * @insert_p: insert point for new extent at ofs +- * in order to simpfy the insertion after. ++ * in order to simplify the insertion after. + * tree must stay unchanged between lookup and insertion. + */ + struct rb_entry *f2fs_lookup_rb_tree_ret(struct rb_root_cached *root, +@@ -573,7 +573,7 @@ static void f2fs_update_extent_tree_range(struct inode *inode, + if (!en) + en = next_en; + +- /* 2. invlidate all extent nodes in range [fofs, fofs + len - 1] */ ++ /* 2. invalidate all extent nodes in range [fofs, fofs + len - 1] */ + while (en && en->ei.fofs < end) { + unsigned int org_end; + int parts = 0; /* # of parts current extent split into */ +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 959e1458412df..ffec3c5374f89 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -304,7 +304,7 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, + * for OPU case, during fsync(), node can be persisted before + * data when lower device doesn't support write barrier, result + * in data corruption after SPO. +- * So for strict fsync mode, force to use atomic write sematics ++ * So for strict fsync mode, force to use atomic write semantics + * to keep write order in between data/node and last node to + * avoid potential data corruption. + */ +@@ -1761,7 +1761,7 @@ static long f2fs_fallocate(struct file *file, int mode, + return -EOPNOTSUPP; + + /* +- * Pinned file should not support partial trucation since the block ++ * Pinned file should not support partial truncation since the block + * can be used by applications. + */ + if ((f2fs_compressed_file(inode) || f2fs_is_pinned_file(inode)) && +@@ -1811,7 +1811,7 @@ static long f2fs_fallocate(struct file *file, int mode, + static int f2fs_release_file(struct inode *inode, struct file *filp) + { + /* +- * f2fs_relase_file is called at every close calls. So we should ++ * f2fs_release_file is called at every close calls. So we should + * not drop any inmemory pages by close called by other process. + */ + if (!(filp->f_mode & FMODE_WRITE) || +diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c +index 0d6906644feb7..80bc386ec6980 100644 +--- a/fs/f2fs/namei.c ++++ b/fs/f2fs/namei.c +@@ -959,7 +959,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, + + /* + * If new_inode is null, the below renaming flow will +- * add a link in old_dir which can conver inline_dir. ++ * add a link in old_dir which can convert inline_dir. + * After then, if we failed to get the entry due to other + * reasons like ENOMEM, we had to remove the new entry. + * Instead of adding such the error handling routine, let's +diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c +index b454496ca67a1..1c69dc91c3292 100644 +--- a/fs/f2fs/segment.c ++++ b/fs/f2fs/segment.c +@@ -3772,7 +3772,7 @@ void f2fs_wait_on_page_writeback(struct page *page, + + /* submit cached LFS IO */ + f2fs_submit_merged_write_cond(sbi, NULL, page, 0, type); +- /* sbumit cached IPU IO */ ++ /* submit cached IPU IO */ + f2fs_submit_merged_ipu_write(sbi, NULL, page); + if (ordered) { + wait_on_page_writeback(page); +-- +2.43.0 + diff --git a/queue-5.15/firmware-dmi-id-add-a-release-callback-function.patch b/queue-5.15/firmware-dmi-id-add-a-release-callback-function.patch new file mode 100644 index 00000000000..bc6042d913e --- /dev/null +++ b/queue-5.15/firmware-dmi-id-add-a-release-callback-function.patch @@ -0,0 +1,50 @@ +From be16d1b7e593a509b6913d1ed7a5948e72e4c480 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 09:34:24 +0200 +Subject: firmware: dmi-id: add a release callback function + +From: Arnd Bergmann + +[ Upstream commit cf770af5645a41a753c55a053fa1237105b0964a ] + +dmi_class uses kfree() as the .release function, but that now causes +a warning with clang-16 as it violates control flow integrity (KCFI) +rules: + +drivers/firmware/dmi-id.c:174:17: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict] + 174 | .dev_release = (void(*)(struct device *)) kfree, + +Add an explicit function to call kfree() instead. + +Fixes: 4f5c791a850e ("DMI-based module autoloading") +Link: https://lore.kernel.org/lkml/20240213100238.456912-1-arnd@kernel.org/ +Signed-off-by: Arnd Bergmann +Signed-off-by: Jean Delvare +Signed-off-by: Sasha Levin +--- + drivers/firmware/dmi-id.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c +index 940ddf916202a..77a8d43e65d3c 100644 +--- a/drivers/firmware/dmi-id.c ++++ b/drivers/firmware/dmi-id.c +@@ -169,9 +169,14 @@ static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env) + return 0; + } + ++static void dmi_dev_release(struct device *dev) ++{ ++ kfree(dev); ++} ++ + static struct class dmi_class = { + .name = "dmi", +- .dev_release = (void(*)(struct device *)) kfree, ++ .dev_release = dmi_dev_release, + .dev_uevent = dmi_dev_uevent, + }; + +-- +2.43.0 + diff --git a/queue-5.15/fpga-region-add-owner-module-and-take-its-refcount.patch b/queue-5.15/fpga-region-add-owner-module-and-take-its-refcount.patch new file mode 100644 index 00000000000..9656a04fbb4 --- /dev/null +++ b/queue-5.15/fpga-region-add-owner-module-and-take-its-refcount.patch @@ -0,0 +1,210 @@ +From e48775b83da1b529f7a042c07d1fad00715fa484 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Apr 2024 10:35:59 +0200 +Subject: fpga: region: add owner module and take its refcount + +From: Marco Pagani + +[ Upstream commit b7c0e1ecee403a43abc89eb3e75672b01ff2ece9 ] + +The current implementation of the fpga region assumes that the low-level +module registers a driver for the parent device and uses its owner pointer +to take the module's refcount. This approach is problematic since it can +lead to a null pointer dereference while attempting to get the region +during programming if the parent device does not have a driver. + +To address this problem, add a module owner pointer to the fpga_region +struct and use it to take the module's refcount. Modify the functions for +registering a region to take an additional owner module parameter and +rename them to avoid conflicts. Use the old function names for helper +macros that automatically set the module that registers the region as the +owner. This ensures compatibility with existing low-level control modules +and reduces the chances of registering a region without setting the owner. + +Also, update the documentation to keep it consistent with the new interface +for registering an fpga region. + +Fixes: 0fa20cdfcc1f ("fpga: fpga-region: device tree control for FPGA") +Suggested-by: Greg Kroah-Hartman +Suggested-by: Xu Yilun +Reviewed-by: Russ Weight +Signed-off-by: Marco Pagani +Acked-by: Xu Yilun +Link: https://lore.kernel.org/r/20240419083601.77403-1-marpagan@redhat.com +Signed-off-by: Xu Yilun +Signed-off-by: Sasha Levin +--- + Documentation/driver-api/fpga/fpga-region.rst | 13 ++++++---- + drivers/fpga/fpga-region.c | 24 +++++++++++-------- + include/linux/fpga/fpga-region.h | 13 +++++++--- + 3 files changed, 32 insertions(+), 18 deletions(-) + +diff --git a/Documentation/driver-api/fpga/fpga-region.rst b/Documentation/driver-api/fpga/fpga-region.rst +index dc55d60a0b4a5..2d03b5fb76575 100644 +--- a/Documentation/driver-api/fpga/fpga-region.rst ++++ b/Documentation/driver-api/fpga/fpga-region.rst +@@ -46,13 +46,16 @@ API to add a new FPGA region + ---------------------------- + + * struct fpga_region - The FPGA region struct +-* struct fpga_region_info - Parameter structure for fpga_region_register_full() +-* fpga_region_register_full() - Create and register an FPGA region using the ++* struct fpga_region_info - Parameter structure for __fpga_region_register_full() ++* __fpga_region_register_full() - Create and register an FPGA region using the + fpga_region_info structure to provide the full flexibility of options +-* fpga_region_register() - Create and register an FPGA region using standard ++* __fpga_region_register() - Create and register an FPGA region using standard + arguments + * fpga_region_unregister() - Unregister an FPGA region + ++Helper macros ``fpga_region_register()`` and ``fpga_region_register_full()`` ++automatically set the module that registers the FPGA region as the owner. ++ + The FPGA region's probe function will need to get a reference to the FPGA + Manager it will be using to do the programming. This usually would happen + during the region's probe function. +@@ -82,10 +85,10 @@ following APIs to handle building or tearing down that list. + :functions: fpga_region_info + + .. kernel-doc:: drivers/fpga/fpga-region.c +- :functions: fpga_region_register_full ++ :functions: __fpga_region_register_full + + .. kernel-doc:: drivers/fpga/fpga-region.c +- :functions: fpga_region_register ++ :functions: __fpga_region_register + + .. kernel-doc:: drivers/fpga/fpga-region.c + :functions: fpga_region_unregister +diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c +index b0ac18de4885d..d73daea579ac7 100644 +--- a/drivers/fpga/fpga-region.c ++++ b/drivers/fpga/fpga-region.c +@@ -52,7 +52,7 @@ static struct fpga_region *fpga_region_get(struct fpga_region *region) + } + + get_device(dev); +- if (!try_module_get(dev->parent->driver->owner)) { ++ if (!try_module_get(region->ops_owner)) { + put_device(dev); + mutex_unlock(®ion->mutex); + return ERR_PTR(-ENODEV); +@@ -74,7 +74,7 @@ static void fpga_region_put(struct fpga_region *region) + + dev_dbg(dev, "put\n"); + +- module_put(dev->parent->driver->owner); ++ module_put(region->ops_owner); + put_device(dev); + mutex_unlock(®ion->mutex); + } +@@ -180,14 +180,16 @@ static struct attribute *fpga_region_attrs[] = { + ATTRIBUTE_GROUPS(fpga_region); + + /** +- * fpga_region_register_full - create and register an FPGA Region device ++ * __fpga_region_register_full - create and register an FPGA Region device + * @parent: device parent + * @info: parameters for FPGA Region ++ * @owner: module containing the get_bridges function + * + * Return: struct fpga_region or ERR_PTR() + */ + struct fpga_region * +-fpga_region_register_full(struct device *parent, const struct fpga_region_info *info) ++__fpga_region_register_full(struct device *parent, const struct fpga_region_info *info, ++ struct module *owner) + { + struct fpga_region *region; + int id, ret = 0; +@@ -212,6 +214,7 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info * + region->compat_id = info->compat_id; + region->priv = info->priv; + region->get_bridges = info->get_bridges; ++ region->ops_owner = owner; + + mutex_init(®ion->mutex); + INIT_LIST_HEAD(®ion->bridge_list); +@@ -240,13 +243,14 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info * + + return ERR_PTR(ret); + } +-EXPORT_SYMBOL_GPL(fpga_region_register_full); ++EXPORT_SYMBOL_GPL(__fpga_region_register_full); + + /** +- * fpga_region_register - create and register an FPGA Region device ++ * __fpga_region_register - create and register an FPGA Region device + * @parent: device parent + * @mgr: manager that programs this region + * @get_bridges: optional function to get bridges to a list ++ * @owner: module containing the get_bridges function + * + * This simple version of the register function should be sufficient for most users. + * The fpga_region_register_full() function is available for users that need to +@@ -255,17 +259,17 @@ EXPORT_SYMBOL_GPL(fpga_region_register_full); + * Return: struct fpga_region or ERR_PTR() + */ + struct fpga_region * +-fpga_region_register(struct device *parent, struct fpga_manager *mgr, +- int (*get_bridges)(struct fpga_region *)) ++__fpga_region_register(struct device *parent, struct fpga_manager *mgr, ++ int (*get_bridges)(struct fpga_region *), struct module *owner) + { + struct fpga_region_info info = { 0 }; + + info.mgr = mgr; + info.get_bridges = get_bridges; + +- return fpga_region_register_full(parent, &info); ++ return __fpga_region_register_full(parent, &info, owner); + } +-EXPORT_SYMBOL_GPL(fpga_region_register); ++EXPORT_SYMBOL_GPL(__fpga_region_register); + + /** + * fpga_region_unregister - unregister an FPGA region +diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h +index 3b87f232425c9..1c446c2ce2f9c 100644 +--- a/include/linux/fpga/fpga-region.h ++++ b/include/linux/fpga/fpga-region.h +@@ -36,6 +36,7 @@ struct fpga_region_info { + * @mgr: FPGA manager + * @info: FPGA image info + * @compat_id: FPGA region id for compatibility check. ++ * @ops_owner: module containing the get_bridges function + * @priv: private data + * @get_bridges: optional function to get bridges to a list + */ +@@ -46,6 +47,7 @@ struct fpga_region { + struct fpga_manager *mgr; + struct fpga_image_info *info; + struct fpga_compat_id *compat_id; ++ struct module *ops_owner; + void *priv; + int (*get_bridges)(struct fpga_region *region); + }; +@@ -58,12 +60,17 @@ struct fpga_region *fpga_region_class_find( + + int fpga_region_program_fpga(struct fpga_region *region); + ++#define fpga_region_register_full(parent, info) \ ++ __fpga_region_register_full(parent, info, THIS_MODULE) + struct fpga_region * +-fpga_region_register_full(struct device *parent, const struct fpga_region_info *info); ++__fpga_region_register_full(struct device *parent, const struct fpga_region_info *info, ++ struct module *owner); + ++#define fpga_region_register(parent, mgr, get_bridges) \ ++ __fpga_region_register(parent, mgr, get_bridges, THIS_MODULE) + struct fpga_region * +-fpga_region_register(struct device *parent, struct fpga_manager *mgr, +- int (*get_bridges)(struct fpga_region *)); ++__fpga_region_register(struct device *parent, struct fpga_manager *mgr, ++ int (*get_bridges)(struct fpga_region *), struct module *owner); + void fpga_region_unregister(struct fpga_region *region); + + #endif /* _FPGA_REGION_H */ +-- +2.43.0 + diff --git a/queue-5.15/fpga-region-use-standard-dev_release-for-class-drive.patch b/queue-5.15/fpga-region-use-standard-dev_release-for-class-drive.patch new file mode 100644 index 00000000000..51f378fbf25 --- /dev/null +++ b/queue-5.15/fpga-region-use-standard-dev_release-for-class-drive.patch @@ -0,0 +1,394 @@ +From 2b8912a5f41bcb475df3ab70c8def29654398e6f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Nov 2021 17:55:53 -0800 +Subject: fpga: region: Use standard dev_release for class driver + +From: Russ Weight + +[ Upstream commit 8886a579744fbfa53e69aa453ed10ae3b1f9abac ] + +The FPGA region class driver data structure is being treated as a +managed resource instead of using the standard dev_release call-back +function to release the class data structure. This change removes the +managed resource code and combines the create() and register() +functions into a single register() or register_full() function. + +The register_full() function accepts an info data structure to provide +flexibility in passing optional parameters. The register() function +supports the current parameter list for users that don't require the +use of optional parameters. + +Signed-off-by: Russ Weight +Reviewed-by: Xu Yilun +Acked-by: Xu Yilun +Signed-off-by: Moritz Fischer +Stable-dep-of: b7c0e1ecee40 ("fpga: region: add owner module and take its refcount") +Signed-off-by: Sasha Levin +--- + Documentation/driver-api/fpga/fpga-region.rst | 12 +- + drivers/fpga/dfl-fme-region.c | 17 ++- + drivers/fpga/dfl.c | 12 +- + drivers/fpga/fpga-region.c | 119 +++++++----------- + drivers/fpga/of-fpga-region.c | 10 +- + include/linux/fpga/fpga-region.h | 36 ++++-- + 6 files changed, 95 insertions(+), 111 deletions(-) + +diff --git a/Documentation/driver-api/fpga/fpga-region.rst b/Documentation/driver-api/fpga/fpga-region.rst +index 2636a27c11b24..dc55d60a0b4a5 100644 +--- a/Documentation/driver-api/fpga/fpga-region.rst ++++ b/Documentation/driver-api/fpga/fpga-region.rst +@@ -46,8 +46,11 @@ API to add a new FPGA region + ---------------------------- + + * struct fpga_region - The FPGA region struct +-* devm_fpga_region_create() - Allocate and init a region struct +-* fpga_region_register() - Register an FPGA region ++* struct fpga_region_info - Parameter structure for fpga_region_register_full() ++* fpga_region_register_full() - Create and register an FPGA region using the ++ fpga_region_info structure to provide the full flexibility of options ++* fpga_region_register() - Create and register an FPGA region using standard ++ arguments + * fpga_region_unregister() - Unregister an FPGA region + + The FPGA region's probe function will need to get a reference to the FPGA +@@ -75,8 +78,11 @@ following APIs to handle building or tearing down that list. + .. kernel-doc:: include/linux/fpga/fpga-region.h + :functions: fpga_region + ++.. kernel-doc:: include/linux/fpga/fpga-region.h ++ :functions: fpga_region_info ++ + .. kernel-doc:: drivers/fpga/fpga-region.c +- :functions: devm_fpga_region_create ++ :functions: fpga_region_register_full + + .. kernel-doc:: drivers/fpga/fpga-region.c + :functions: fpga_region_register +diff --git a/drivers/fpga/dfl-fme-region.c b/drivers/fpga/dfl-fme-region.c +index 1eeb42af10122..4aebde0a7f1c3 100644 +--- a/drivers/fpga/dfl-fme-region.c ++++ b/drivers/fpga/dfl-fme-region.c +@@ -30,6 +30,7 @@ static int fme_region_get_bridges(struct fpga_region *region) + static int fme_region_probe(struct platform_device *pdev) + { + struct dfl_fme_region_pdata *pdata = dev_get_platdata(&pdev->dev); ++ struct fpga_region_info info = { 0 }; + struct device *dev = &pdev->dev; + struct fpga_region *region; + struct fpga_manager *mgr; +@@ -39,20 +40,18 @@ static int fme_region_probe(struct platform_device *pdev) + if (IS_ERR(mgr)) + return -EPROBE_DEFER; + +- region = devm_fpga_region_create(dev, mgr, fme_region_get_bridges); +- if (!region) { +- ret = -ENOMEM; ++ info.mgr = mgr; ++ info.compat_id = mgr->compat_id; ++ info.get_bridges = fme_region_get_bridges; ++ info.priv = pdata; ++ region = fpga_region_register_full(dev, &info); ++ if (IS_ERR(region)) { ++ ret = PTR_ERR(region); + goto eprobe_mgr_put; + } + +- region->priv = pdata; +- region->compat_id = mgr->compat_id; + platform_set_drvdata(pdev, region); + +- ret = fpga_region_register(region); +- if (ret) +- goto eprobe_mgr_put; +- + dev_dbg(dev, "DFL FME FPGA Region probed\n"); + + return 0; +diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c +index c38143ef23c64..071c25c164a82 100644 +--- a/drivers/fpga/dfl.c ++++ b/drivers/fpga/dfl.c +@@ -1407,19 +1407,15 @@ dfl_fpga_feature_devs_enumerate(struct dfl_fpga_enum_info *info) + if (!cdev) + return ERR_PTR(-ENOMEM); + +- cdev->region = devm_fpga_region_create(info->dev, NULL, NULL); +- if (!cdev->region) { +- ret = -ENOMEM; +- goto free_cdev_exit; +- } +- + cdev->parent = info->dev; + mutex_init(&cdev->lock); + INIT_LIST_HEAD(&cdev->port_dev_list); + +- ret = fpga_region_register(cdev->region); +- if (ret) ++ cdev->region = fpga_region_register(info->dev, NULL, NULL); ++ if (IS_ERR(cdev->region)) { ++ ret = PTR_ERR(cdev->region); + goto free_cdev_exit; ++ } + + /* create and init build info for enumeration */ + binfo = devm_kzalloc(info->dev, sizeof(*binfo), GFP_KERNEL); +diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c +index a4838715221ff..b0ac18de4885d 100644 +--- a/drivers/fpga/fpga-region.c ++++ b/drivers/fpga/fpga-region.c +@@ -180,39 +180,42 @@ static struct attribute *fpga_region_attrs[] = { + ATTRIBUTE_GROUPS(fpga_region); + + /** +- * fpga_region_create - alloc and init a struct fpga_region ++ * fpga_region_register_full - create and register an FPGA Region device + * @parent: device parent +- * @mgr: manager that programs this region +- * @get_bridges: optional function to get bridges to a list +- * +- * The caller of this function is responsible for freeing the resulting region +- * struct with fpga_region_free(). Using devm_fpga_region_create() instead is +- * recommended. ++ * @info: parameters for FPGA Region + * +- * Return: struct fpga_region or NULL ++ * Return: struct fpga_region or ERR_PTR() + */ +-struct fpga_region +-*fpga_region_create(struct device *parent, +- struct fpga_manager *mgr, +- int (*get_bridges)(struct fpga_region *)) ++struct fpga_region * ++fpga_region_register_full(struct device *parent, const struct fpga_region_info *info) + { + struct fpga_region *region; + int id, ret = 0; + ++ if (!info) { ++ dev_err(parent, ++ "Attempt to register without required info structure\n"); ++ return ERR_PTR(-EINVAL); ++ } ++ + region = kzalloc(sizeof(*region), GFP_KERNEL); + if (!region) +- return NULL; ++ return ERR_PTR(-ENOMEM); + + id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL); +- if (id < 0) ++ if (id < 0) { ++ ret = id; + goto err_free; ++ } ++ ++ region->mgr = info->mgr; ++ region->compat_id = info->compat_id; ++ region->priv = info->priv; ++ region->get_bridges = info->get_bridges; + +- region->mgr = mgr; +- region->get_bridges = get_bridges; + mutex_init(®ion->mutex); + INIT_LIST_HEAD(®ion->bridge_list); + +- device_initialize(®ion->dev); + region->dev.class = fpga_region_class; + region->dev.parent = parent; + region->dev.of_node = parent->of_node; +@@ -222,6 +225,12 @@ struct fpga_region + if (ret) + goto err_remove; + ++ ret = device_register(®ion->dev); ++ if (ret) { ++ put_device(®ion->dev); ++ return ERR_PTR(ret); ++ } ++ + return region; + + err_remove: +@@ -229,76 +238,32 @@ struct fpga_region + err_free: + kfree(region); + +- return NULL; +-} +-EXPORT_SYMBOL_GPL(fpga_region_create); +- +-/** +- * fpga_region_free - free an FPGA region created by fpga_region_create() +- * @region: FPGA region +- */ +-void fpga_region_free(struct fpga_region *region) +-{ +- ida_simple_remove(&fpga_region_ida, region->dev.id); +- kfree(region); +-} +-EXPORT_SYMBOL_GPL(fpga_region_free); +- +-static void devm_fpga_region_release(struct device *dev, void *res) +-{ +- struct fpga_region *region = *(struct fpga_region **)res; +- +- fpga_region_free(region); ++ return ERR_PTR(ret); + } ++EXPORT_SYMBOL_GPL(fpga_region_register_full); + + /** +- * devm_fpga_region_create - create and initialize a managed FPGA region struct ++ * fpga_region_register - create and register an FPGA Region device + * @parent: device parent + * @mgr: manager that programs this region + * @get_bridges: optional function to get bridges to a list + * +- * This function is intended for use in an FPGA region driver's probe function. +- * After the region driver creates the region struct with +- * devm_fpga_region_create(), it should register it with fpga_region_register(). +- * The region driver's remove function should call fpga_region_unregister(). +- * The region struct allocated with this function will be freed automatically on +- * driver detach. This includes the case of a probe function returning error +- * before calling fpga_region_register(), the struct will still get cleaned up. ++ * This simple version of the register function should be sufficient for most users. ++ * The fpga_region_register_full() function is available for users that need to ++ * pass additional, optional parameters. + * +- * Return: struct fpga_region or NULL ++ * Return: struct fpga_region or ERR_PTR() + */ +-struct fpga_region +-*devm_fpga_region_create(struct device *parent, +- struct fpga_manager *mgr, +- int (*get_bridges)(struct fpga_region *)) ++struct fpga_region * ++fpga_region_register(struct device *parent, struct fpga_manager *mgr, ++ int (*get_bridges)(struct fpga_region *)) + { +- struct fpga_region **ptr, *region; +- +- ptr = devres_alloc(devm_fpga_region_release, sizeof(*ptr), GFP_KERNEL); +- if (!ptr) +- return NULL; ++ struct fpga_region_info info = { 0 }; + +- region = fpga_region_create(parent, mgr, get_bridges); +- if (!region) { +- devres_free(ptr); +- } else { +- *ptr = region; +- devres_add(parent, ptr); +- } ++ info.mgr = mgr; ++ info.get_bridges = get_bridges; + +- return region; +-} +-EXPORT_SYMBOL_GPL(devm_fpga_region_create); +- +-/** +- * fpga_region_register - register an FPGA region +- * @region: FPGA region +- * +- * Return: 0 or -errno +- */ +-int fpga_region_register(struct fpga_region *region) +-{ +- return device_add(®ion->dev); ++ return fpga_region_register_full(parent, &info); + } + EXPORT_SYMBOL_GPL(fpga_region_register); + +@@ -316,6 +281,10 @@ EXPORT_SYMBOL_GPL(fpga_region_unregister); + + static void fpga_region_dev_release(struct device *dev) + { ++ struct fpga_region *region = to_fpga_region(dev); ++ ++ ida_simple_remove(&fpga_region_ida, region->dev.id); ++ kfree(region); + } + + /** +diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c +index e3c25576b6b9d..9c662db1c5088 100644 +--- a/drivers/fpga/of-fpga-region.c ++++ b/drivers/fpga/of-fpga-region.c +@@ -405,16 +405,12 @@ static int of_fpga_region_probe(struct platform_device *pdev) + if (IS_ERR(mgr)) + return -EPROBE_DEFER; + +- region = devm_fpga_region_create(dev, mgr, of_fpga_region_get_bridges); +- if (!region) { +- ret = -ENOMEM; ++ region = fpga_region_register(dev, mgr, of_fpga_region_get_bridges); ++ if (IS_ERR(region)) { ++ ret = PTR_ERR(region); + goto eprobe_mgr_put; + } + +- ret = fpga_region_register(region); +- if (ret) +- goto eprobe_mgr_put; +- + of_platform_populate(np, fpga_region_of_match, NULL, ®ion->dev); + platform_set_drvdata(pdev, region); + +diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h +index 27cb706275dba..3b87f232425c9 100644 +--- a/include/linux/fpga/fpga-region.h ++++ b/include/linux/fpga/fpga-region.h +@@ -7,6 +7,27 @@ + #include + #include + ++struct fpga_region; ++ ++/** ++ * struct fpga_region_info - collection of parameters an FPGA Region ++ * @mgr: fpga region manager ++ * @compat_id: FPGA region id for compatibility check. ++ * @priv: fpga region private data ++ * @get_bridges: optional function to get bridges to a list ++ * ++ * fpga_region_info contains parameters for the register_full function. ++ * These are separated into an info structure because they some are optional ++ * others could be added to in the future. The info structure facilitates ++ * maintaining a stable API. ++ */ ++struct fpga_region_info { ++ struct fpga_manager *mgr; ++ struct fpga_compat_id *compat_id; ++ void *priv; ++ int (*get_bridges)(struct fpga_region *region); ++}; ++ + /** + * struct fpga_region - FPGA Region structure + * @dev: FPGA Region device +@@ -37,15 +58,12 @@ struct fpga_region *fpga_region_class_find( + + int fpga_region_program_fpga(struct fpga_region *region); + +-struct fpga_region +-*fpga_region_create(struct device *dev, struct fpga_manager *mgr, +- int (*get_bridges)(struct fpga_region *)); +-void fpga_region_free(struct fpga_region *region); +-int fpga_region_register(struct fpga_region *region); +-void fpga_region_unregister(struct fpga_region *region); ++struct fpga_region * ++fpga_region_register_full(struct device *parent, const struct fpga_region_info *info); + +-struct fpga_region +-*devm_fpga_region_create(struct device *dev, struct fpga_manager *mgr, +- int (*get_bridges)(struct fpga_region *)); ++struct fpga_region * ++fpga_region_register(struct device *parent, struct fpga_manager *mgr, ++ int (*get_bridges)(struct fpga_region *)); ++void fpga_region_unregister(struct fpga_region *region); + + #endif /* _FPGA_REGION_H */ +-- +2.43.0 + diff --git a/queue-5.15/greybus-arche-ctrl-move-device-table-to-its-right-lo.patch b/queue-5.15/greybus-arche-ctrl-move-device-table-to-its-right-lo.patch new file mode 100644 index 00000000000..d658c83f162 --- /dev/null +++ b/queue-5.15/greybus-arche-ctrl-move-device-table-to-its-right-lo.patch @@ -0,0 +1,66 @@ +From a9cb96a52cb16f4e0fb5ef6952da0064a2a285f0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Apr 2024 10:06:35 +0200 +Subject: greybus: arche-ctrl: move device table to its right location + +From: Arnd Bergmann + +[ Upstream commit 6a0b8c0da8d8d418cde6894a104cf74e6098ddfa ] + +The arche-ctrl has two platform drivers and three of_device_id tables, +but one table is only used for the the module loader, while the other +two seem to be associated with their drivers. + +This leads to a W=1 warning when the driver is built-in: + +drivers/staging/greybus/arche-platform.c:623:34: error: 'arche_combined_id' defined but not used [-Werror=unused-const-variable=] + 623 | static const struct of_device_id arche_combined_id[] = { + +Drop the extra table and register both tables that are actually +used as the ones for the module loader instead. + +Fixes: 7b62b61c752a ("greybus: arche-ctrl: Don't expose driver internals to arche-platform driver") +Signed-off-by: Arnd Bergmann +Link: https://lore.kernel.org/r/20240403080702.3509288-18-arnd@kernel.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/greybus/arche-apb-ctrl.c | 1 + + drivers/staging/greybus/arche-platform.c | 9 +-------- + 2 files changed, 2 insertions(+), 8 deletions(-) + +diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c +index bbf3ba744fc44..c7383c6c6094d 100644 +--- a/drivers/staging/greybus/arche-apb-ctrl.c ++++ b/drivers/staging/greybus/arche-apb-ctrl.c +@@ -468,6 +468,7 @@ static const struct of_device_id arche_apb_ctrl_of_match[] = { + { .compatible = "usbffff,2", }, + { }, + }; ++MODULE_DEVICE_TABLE(of, arche_apb_ctrl_of_match); + + static struct platform_driver arche_apb_ctrl_device_driver = { + .probe = arche_apb_ctrl_probe, +diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c +index e374dfc0c92fd..00beb8bb1b331 100644 +--- a/drivers/staging/greybus/arche-platform.c ++++ b/drivers/staging/greybus/arche-platform.c +@@ -620,14 +620,7 @@ static const struct of_device_id arche_platform_of_match[] = { + { .compatible = "google,arche-platform", }, + { }, + }; +- +-static const struct of_device_id arche_combined_id[] = { +- /* Use PID/VID of SVC device */ +- { .compatible = "google,arche-platform", }, +- { .compatible = "usbffff,2", }, +- { }, +-}; +-MODULE_DEVICE_TABLE(of, arche_combined_id); ++MODULE_DEVICE_TABLE(of, arche_platform_of_match); + + static struct platform_driver arche_platform_device_driver = { + .probe = arche_platform_probe, +-- +2.43.0 + diff --git a/queue-5.15/greybus-lights-check-return-of-get_channel_from_mode.patch b/queue-5.15/greybus-lights-check-return-of-get_channel_from_mode.patch new file mode 100644 index 00000000000..29dfaa32b6c --- /dev/null +++ b/queue-5.15/greybus-lights-check-return-of-get_channel_from_mode.patch @@ -0,0 +1,59 @@ +From 393f129b63427556eeebc4db53127b3a304808c1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 25 Mar 2024 22:09:55 +0000 +Subject: greybus: lights: check return of get_channel_from_mode + +From: Rui Miguel Silva + +[ Upstream commit a1ba19a1ae7cd1e324685ded4ab563e78fe68648 ] + +If channel for the given node is not found we return null from +get_channel_from_mode. Make sure we validate the return pointer +before using it in two of the missing places. + +This was originally reported in [0]: +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +[0] https://lore.kernel.org/all/20240301190425.120605-1-m.lobanov@rosalinux.ru + +Fixes: 2870b52bae4c ("greybus: lights: add lights implementation") +Reported-by: Mikhail Lobanov +Suggested-by: Mikhail Lobanov +Suggested-by: Alex Elder +Signed-off-by: Rui Miguel Silva +Link: https://lore.kernel.org/r/20240325221549.2185265-1-rmfrfs@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/greybus/light.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c +index c6bd86a5335ab..9999f84016992 100644 +--- a/drivers/staging/greybus/light.c ++++ b/drivers/staging/greybus/light.c +@@ -147,6 +147,9 @@ static int __gb_lights_flash_brightness_set(struct gb_channel *channel) + channel = get_channel_from_mode(channel->light, + GB_CHANNEL_MODE_TORCH); + ++ if (!channel) ++ return -EINVAL; ++ + /* For not flash we need to convert brightness to intensity */ + intensity = channel->intensity_uA.min + + (channel->intensity_uA.step * channel->led->brightness); +@@ -549,7 +552,10 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) + } + + channel_flash = get_channel_from_mode(light, GB_CHANNEL_MODE_FLASH); +- WARN_ON(!channel_flash); ++ if (!channel_flash) { ++ dev_err(dev, "failed to get flash channel from mode\n"); ++ return -EINVAL; ++ } + + fled = &channel_flash->fled; + +-- +2.43.0 + diff --git a/queue-5.15/iio-pressure-dps310-support-negative-temperature-val.patch b/queue-5.15/iio-pressure-dps310-support-negative-temperature-val.patch new file mode 100644 index 00000000000..85d78bfe86b --- /dev/null +++ b/queue-5.15/iio-pressure-dps310-support-negative-temperature-val.patch @@ -0,0 +1,67 @@ +From 9cfc95ced7380f7ea47702dc1cff35e2e57a9d8d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Apr 2024 12:50:27 +0200 +Subject: iio: pressure: dps310: support negative temperature values + +From: Thomas Haemmerle + +[ Upstream commit 9dd6b32e76ff714308964cd9ec91466a343dcb8b ] + +The current implementation interprets negative values returned from +`dps310_calculate_temp` as error codes. +This has a side effect that when negative temperature values are +calculated, they are interpreted as error. + +Fix this by using the return value only for error handling and passing a +pointer for the value. + +Fixes: ba6ec48e76bc ("iio: Add driver for Infineon DPS310") +Signed-off-by: Thomas Haemmerle +Link: https://lore.kernel.org/r/20240415105030.1161770-2-thomas.haemmerle@leica-geosystems.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/pressure/dps310.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/iio/pressure/dps310.c b/drivers/iio/pressure/dps310.c +index 1b6b9530f1662..7fdc7a0147f0e 100644 +--- a/drivers/iio/pressure/dps310.c ++++ b/drivers/iio/pressure/dps310.c +@@ -730,7 +730,7 @@ static int dps310_read_pressure(struct dps310_data *data, int *val, int *val2, + } + } + +-static int dps310_calculate_temp(struct dps310_data *data) ++static int dps310_calculate_temp(struct dps310_data *data, int *val) + { + s64 c0; + s64 t; +@@ -746,7 +746,9 @@ static int dps310_calculate_temp(struct dps310_data *data) + t = c0 + ((s64)data->temp_raw * (s64)data->c1); + + /* Convert to milliCelsius and scale the temperature */ +- return (int)div_s64(t * 1000LL, kt); ++ *val = (int)div_s64(t * 1000LL, kt); ++ ++ return 0; + } + + static int dps310_read_temp(struct dps310_data *data, int *val, int *val2, +@@ -768,11 +770,10 @@ static int dps310_read_temp(struct dps310_data *data, int *val, int *val2, + if (rc) + return rc; + +- rc = dps310_calculate_temp(data); +- if (rc < 0) ++ rc = dps310_calculate_temp(data, val); ++ if (rc) + return rc; + +- *val = rc; + return IIO_VAL_INT; + + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: +-- +2.43.0 + diff --git a/queue-5.15/libsubcmd-fix-parse-options-memory-leak.patch b/queue-5.15/libsubcmd-fix-parse-options-memory-leak.patch new file mode 100644 index 00000000000..2b9cadc9915 --- /dev/null +++ b/queue-5.15/libsubcmd-fix-parse-options-memory-leak.patch @@ -0,0 +1,61 @@ +From 4d102dac890a48afb2d85b12116369103551e390 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 May 2024 22:20:15 -0700 +Subject: libsubcmd: Fix parse-options memory leak + +From: Ian Rogers + +[ Upstream commit 230a7a71f92212e723fa435d4ca5922de33ec88a ] + +If a usage string is built in parse_options_subcommand, also free it. + +Fixes: 901421a5bdf605d2 ("perf tools: Remove subcmd dependencies on strbuf") +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Josh Poimboeuf +Cc: Kan Liang +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: https://lore.kernel.org/r/20240509052015.1914670-1-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/lib/subcmd/parse-options.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c +index 39ebf6192016d..e799d35cba434 100644 +--- a/tools/lib/subcmd/parse-options.c ++++ b/tools/lib/subcmd/parse-options.c +@@ -633,11 +633,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o + const char *const subcommands[], const char *usagestr[], int flags) + { + struct parse_opt_ctx_t ctx; ++ char *buf = NULL; + + /* build usage string if it's not provided */ + if (subcommands && !usagestr[0]) { +- char *buf = NULL; +- + astrcatf(&buf, "%s %s [] {", subcmd_config.exec_name, argv[0]); + + for (int i = 0; subcommands[i]; i++) { +@@ -679,7 +678,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o + astrcatf(&error_buf, "unknown switch `%c'", *ctx.opt); + usage_with_options(usagestr, options); + } +- ++ if (buf) { ++ usagestr[0] = NULL; ++ free(buf); ++ } + return parse_options_end(&ctx); + } + +-- +2.43.0 + diff --git a/queue-5.15/microblaze-remove-early-printk-call-from-cpuinfo-sta.patch b/queue-5.15/microblaze-remove-early-printk-call-from-cpuinfo-sta.patch new file mode 100644 index 00000000000..039a6924429 --- /dev/null +++ b/queue-5.15/microblaze-remove-early-printk-call-from-cpuinfo-sta.patch @@ -0,0 +1,37 @@ +From 82907f960f5cd7e46d6df6fd7c3f1c13bba16d73 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Apr 2024 10:27:21 +0200 +Subject: microblaze: Remove early printk call from cpuinfo-static.c + +From: Michal Simek + +[ Upstream commit 58d647506c92ccd3cfa0c453c68ddd14f40bf06f ] + +Early printk has been removed already that's why also remove calling it. +Similar change has been done in cpuinfo-pvr-full.c by commit cfbd8d1979af +("microblaze: Remove early printk setup"). + +Fixes: 96f0e6fcc9ad ("microblaze: remove redundant early_printk support") +Signed-off-by: Michal Simek +Link: https://lore.kernel.org/r/2f10db506be8188fa07b6ec331caca01af1b10f8.1712824039.git.michal.simek@amd.com +Signed-off-by: Sasha Levin +--- + arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/microblaze/kernel/cpu/cpuinfo-static.c b/arch/microblaze/kernel/cpu/cpuinfo-static.c +index 85dbda4a08a81..03da36dc6d9c9 100644 +--- a/arch/microblaze/kernel/cpu/cpuinfo-static.c ++++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c +@@ -18,7 +18,7 @@ static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; + static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; + + #define err_printk(x) \ +- early_printk("ERROR: Microblaze " x "-different for kernel and DTS\n"); ++ pr_err("ERROR: Microblaze " x "-different for kernel and DTS\n"); + + void __init set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu) + { +-- +2.43.0 + diff --git a/queue-5.15/microblaze-remove-gcc-flag-for-non-existing-early_pr.patch b/queue-5.15/microblaze-remove-gcc-flag-for-non-existing-early_pr.patch new file mode 100644 index 00000000000..c41126b7039 --- /dev/null +++ b/queue-5.15/microblaze-remove-gcc-flag-for-non-existing-early_pr.patch @@ -0,0 +1,36 @@ +From 158a15596c6915340e3fc006e5c8ba6b1a76b2d2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Apr 2024 10:21:44 +0200 +Subject: microblaze: Remove gcc flag for non existing early_printk.c file + +From: Michal Simek + +[ Upstream commit edc66cf0c4164aa3daf6cc55e970bb94383a6a57 ] + +early_printk support for removed long time ago but compilation flag for +ftrace still points to already removed file that's why remove that line +too. + +Fixes: 96f0e6fcc9ad ("microblaze: remove redundant early_printk support") +Signed-off-by: Michal Simek +Link: https://lore.kernel.org/r/5493467419cd2510a32854e2807bcd263de981a0.1712823702.git.michal.simek@amd.com +Signed-off-by: Sasha Levin +--- + arch/microblaze/kernel/Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile +index 15a20eb814cef..46dcc3b6a00f7 100644 +--- a/arch/microblaze/kernel/Makefile ++++ b/arch/microblaze/kernel/Makefile +@@ -7,7 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER + # Do not trace early boot code and low level code + CFLAGS_REMOVE_timer.o = -pg + CFLAGS_REMOVE_intc.o = -pg +-CFLAGS_REMOVE_early_printk.o = -pg + CFLAGS_REMOVE_ftrace.o = -pg + CFLAGS_REMOVE_process.o = -pg + endif +-- +2.43.0 + diff --git a/queue-5.15/ovl-remove-upper-umask-handling-from-ovl_create_uppe.patch b/queue-5.15/ovl-remove-upper-umask-handling-from-ovl_create_uppe.patch new file mode 100644 index 00000000000..d6520e20e1a --- /dev/null +++ b/queue-5.15/ovl-remove-upper-umask-handling-from-ovl_create_uppe.patch @@ -0,0 +1,39 @@ +From 61427aca202280501145d2a2d619c6b8ae379284 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 May 2024 20:35:57 +0200 +Subject: ovl: remove upper umask handling from ovl_create_upper() + +From: Miklos Szeredi + +[ Upstream commit 096802748ea1dea8b476938e0a8dc16f4bd2f1ad ] + +This is already done by vfs_prepare_mode() when creating the upper object +by vfs_create(), vfs_mkdir() and vfs_mknod(). + +No regressions have been observed in xfstests run with posix acls turned +off for the upper filesystem. + +Fixes: 1639a49ccdce ("fs: move S_ISGID stripping into the vfs_*() helpers") +Signed-off-by: Miklos Szeredi +Signed-off-by: Sasha Levin +--- + fs/overlayfs/dir.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c +index 519193ce7d575..89fc23803dafc 100644 +--- a/fs/overlayfs/dir.c ++++ b/fs/overlayfs/dir.c +@@ -325,9 +325,6 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode, + struct dentry *newdentry; + int err; + +- if (!attr->hardlink && !IS_POSIXACL(udir)) +- attr->mode &= ~current_umask(); +- + inode_lock_nested(udir, I_MUTEX_PARENT); + newdentry = ovl_create_real(udir, + lookup_one_len(dentry->d_name.name, +-- +2.43.0 + diff --git a/queue-5.15/pci-edr-align-edr_port_dpc_enable_dsm-with-pci-firmw.patch b/queue-5.15/pci-edr-align-edr_port_dpc_enable_dsm-with-pci-firmw.patch new file mode 100644 index 00000000000..81e92576e61 --- /dev/null +++ b/queue-5.15/pci-edr-align-edr_port_dpc_enable_dsm-with-pci-firmw.patch @@ -0,0 +1,71 @@ +From 36115f1b7f2b0d9dcc6ed018753ed0a576752e86 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 May 2024 02:25:43 +0000 +Subject: PCI/EDR: Align EDR_PORT_DPC_ENABLE_DSM with PCI Firmware r3.3 + +From: Kuppuswamy Sathyanarayanan + +[ Upstream commit f24ba846133d0edec785ac6430d4daf6e9c93a09 ] + +The "Downstream Port Containment related Enhancements" ECN of Jan 28, 2019 +(document 12888 below), defined the EDR_PORT_DPC_ENABLE_DSM function with +Revision ID 5 with Arg3 being an integer. But when the ECN was integrated +into PCI Firmware r3.3, sec 4.6.12, it was defined as Revision ID 6 with +Arg3 being a package containing an integer. + +The implementation in acpi_enable_dpc() supplies a package as Arg3 (arg4 in +the code), but it previously specified Revision ID 5. Align this with PCI +Firmware r3.3 by using Revision ID 6. + +If firmware implemented per the ECN, its Revision 5 function would receive +a package as Arg3 when it expects an integer, so acpi_enable_dpc() would +likely fail. If such firmware exists and lacks a Revision 6 function that +expects a package, we may have to add support for Revision 5. + +Link: https://lore.kernel.org/r/20240501022543.1626025-1-sathyanarayanan.kuppuswamy@linux.intel.com +Link: https://members.pcisig.com/wg/PCI-SIG/document/12888 +Fixes: ac1c8e35a326 ("PCI/DPC: Add Error Disconnect Recover (EDR) support") +Signed-off-by: Kuppuswamy Sathyanarayanan +[bhelgaas: split into two patches, update commit log] +Signed-off-by: Bjorn Helgaas +Tested-by: Satish Thatchanamurthy # one platform +Signed-off-by: Sasha Levin +--- + drivers/pci/pcie/edr.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +diff --git a/drivers/pci/pcie/edr.c b/drivers/pci/pcie/edr.c +index 87734e4c3c204..5b5a502363c00 100644 +--- a/drivers/pci/pcie/edr.c ++++ b/drivers/pci/pcie/edr.c +@@ -32,10 +32,10 @@ static int acpi_enable_dpc(struct pci_dev *pdev) + int status = 0; + + /* +- * Behavior when calling unsupported _DSM functions is undefined, +- * so check whether EDR_PORT_DPC_ENABLE_DSM is supported. ++ * Per PCI Firmware r3.3, sec 4.6.12, EDR_PORT_DPC_ENABLE_DSM is ++ * optional. Return success if it's not implemented. + */ +- if (!acpi_check_dsm(adev->handle, &pci_acpi_dsm_guid, 5, ++ if (!acpi_check_dsm(adev->handle, &pci_acpi_dsm_guid, 6, + 1ULL << EDR_PORT_DPC_ENABLE_DSM)) + return 0; + +@@ -46,12 +46,7 @@ static int acpi_enable_dpc(struct pci_dev *pdev) + argv4.package.count = 1; + argv4.package.elements = &req; + +- /* +- * Per Downstream Port Containment Related Enhancements ECN to PCI +- * Firmware Specification r3.2, sec 4.6.12, EDR_PORT_DPC_ENABLE_DSM is +- * optional. Return success if it's not implemented. +- */ +- obj = acpi_evaluate_dsm(adev->handle, &pci_acpi_dsm_guid, 5, ++ obj = acpi_evaluate_dsm(adev->handle, &pci_acpi_dsm_guid, 6, + EDR_PORT_DPC_ENABLE_DSM, &argv4); + if (!obj) + return 0; +-- +2.43.0 + diff --git a/queue-5.15/pci-edr-align-edr_port_locate_dsm-with-pci-firmware-.patch b/queue-5.15/pci-edr-align-edr_port_locate_dsm-with-pci-firmware-.patch new file mode 100644 index 00000000000..f3ae0fa5f32 --- /dev/null +++ b/queue-5.15/pci-edr-align-edr_port_locate_dsm-with-pci-firmware-.patch @@ -0,0 +1,65 @@ +From 11defc99a36058dbeb361a65389002f52c1d6d57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 8 May 2024 14:31:38 -0500 +Subject: PCI/EDR: Align EDR_PORT_LOCATE_DSM with PCI Firmware r3.3 + +From: Kuppuswamy Sathyanarayanan + +[ Upstream commit e2e78a294a8a863898b781dbcf90e087eda3155d ] + +The "Downstream Port Containment related Enhancements" ECN of Jan 28, 2019 +(document 12888 below), defined the EDR_PORT_LOCATE_DSM function with +Revision ID 5 with a return value encoding (Bits 2:0 = Function, Bits 7:3 = +Device, Bits 15:8 = Bus). When the ECN was integrated into PCI Firmware +r3.3, sec 4.6.13, Bit 31 was added to indicate success or failure. + +Check Bit 31 for failure in acpi_dpc_port_get(). + +Link: https://lore.kernel.org/r/20240501022543.1626025-1-sathyanarayanan.kuppuswamy@linux.intel.com +Link: https://members.pcisig.com/wg/PCI-SIG/document/12888 +Fixes: ac1c8e35a326 ("PCI/DPC: Add Error Disconnect Recover (EDR) support") +Signed-off-by: Kuppuswamy Sathyanarayanan +[bhelgaas: split into two patches, update commit log] +Signed-off-by: Bjorn Helgaas +Tested-by: Satish Thatchanamurthy # one platform +Signed-off-by: Sasha Levin +--- + drivers/pci/pcie/edr.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/drivers/pci/pcie/edr.c b/drivers/pci/pcie/edr.c +index 5b5a502363c00..35210007602c5 100644 +--- a/drivers/pci/pcie/edr.c ++++ b/drivers/pci/pcie/edr.c +@@ -80,8 +80,9 @@ static struct pci_dev *acpi_dpc_port_get(struct pci_dev *pdev) + u16 port; + + /* +- * Behavior when calling unsupported _DSM functions is undefined, +- * so check whether EDR_PORT_DPC_ENABLE_DSM is supported. ++ * If EDR_PORT_LOCATE_DSM is not implemented under the target of ++ * EDR, the target is the port that experienced the containment ++ * event (PCI Firmware r3.3, sec 4.6.13). + */ + if (!acpi_check_dsm(adev->handle, &pci_acpi_dsm_guid, 5, + 1ULL << EDR_PORT_LOCATE_DSM)) +@@ -98,6 +99,16 @@ static struct pci_dev *acpi_dpc_port_get(struct pci_dev *pdev) + return NULL; + } + ++ /* ++ * Bit 31 represents the success/failure of the operation. If bit ++ * 31 is set, the operation failed. ++ */ ++ if (obj->integer.value & BIT(31)) { ++ ACPI_FREE(obj); ++ pci_err(pdev, "Locate Port _DSM failed\n"); ++ return NULL; ++ } ++ + /* + * Firmware returns DPC port BDF details in following format: + * 15:8 = bus +-- +2.43.0 + diff --git a/queue-5.15/pci-tegra194-fix-probe-path-for-endpoint-mode.patch b/queue-5.15/pci-tegra194-fix-probe-path-for-endpoint-mode.patch new file mode 100644 index 00000000000..80cf0d3a7cc --- /dev/null +++ b/queue-5.15/pci-tegra194-fix-probe-path-for-endpoint-mode.patch @@ -0,0 +1,47 @@ +From 1cedf6b4ce703bd36e3d8eb54bc3dc50606deca6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 15:00:53 +0530 +Subject: PCI: tegra194: Fix probe path for Endpoint mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Vidya Sagar + +[ Upstream commit 19326006a21da26532d982254677c892dae8f29b ] + +Tegra194 PCIe probe path is taking failure path in success case for +Endpoint mode. Return success from the switch case instead of going +into the failure path. + +Fixes: c57247f940e8 ("PCI: tegra: Add support for PCIe endpoint mode in Tegra194") +Link: https://lore.kernel.org/linux-pci/20240408093053.3948634-1-vidyas@nvidia.com +Signed-off-by: Vidya Sagar +Signed-off-by: Krzysztof Wilczyński +Reviewed-by: Jon Hunter +Signed-off-by: Sasha Levin +--- + drivers/pci/controller/dwc/pcie-tegra194.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c +index 2f82da76e3711..3703ea0d90c28 100644 +--- a/drivers/pci/controller/dwc/pcie-tegra194.c ++++ b/drivers/pci/controller/dwc/pcie-tegra194.c +@@ -2142,10 +2142,13 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev) + ret = tegra_pcie_config_ep(pcie, pdev); + if (ret < 0) + goto fail; ++ else ++ return 0; + break; + + default: + dev_err(dev, "Invalid PCIe device type %d\n", pcie->mode); ++ ret = -EINVAL; + } + + fail: +-- +2.43.0 + diff --git a/queue-5.15/perf-annotate-get-rid-of-duplicate-group-option-item.patch b/queue-5.15/perf-annotate-get-rid-of-duplicate-group-option-item.patch new file mode 100644 index 00000000000..ada14125569 --- /dev/null +++ b/queue-5.15/perf-annotate-get-rid-of-duplicate-group-option-item.patch @@ -0,0 +1,48 @@ +From 36146c4fe2ec67b97074a622589831af1a134c89 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 Mar 2024 15:43:12 -0700 +Subject: perf annotate: Get rid of duplicate --group option item + +From: Namhyung Kim + +[ Upstream commit 374af9f1f06b5e991c810d2e4983d6f58df32136 ] + +The options array in cmd_annotate() has duplicate --group options. It +only needs one and let's get rid of the other. + + $ perf annotate -h 2>&1 | grep group + --group Show event group information together + --group Show event group information together + +Fixes: 7ebaf4890f63eb90 ("perf annotate: Support '--group' option") +Reviewed-by: Kan Liang +Signed-off-by: Namhyung Kim +Cc: Adrian Hunter +Cc: Ian Rogers +Cc: Ingo Molnar +Cc: Jin Yao +Cc: Jiri Olsa +Cc: Peter Zijlstra +Link: https://lore.kernel.org/r/20240322224313.423181-1-namhyung@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/builtin-annotate.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c +index 05eb098cb0e3b..592d92092614e 100644 +--- a/tools/perf/builtin-annotate.c ++++ b/tools/perf/builtin-annotate.c +@@ -541,8 +541,6 @@ int cmd_annotate(int argc, const char **argv) + "Enable symbol demangling"), + OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel, + "Enable kernel symbol demangling"), +- OPT_BOOLEAN(0, "group", &symbol_conf.event_group, +- "Show event group information together"), + OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period, + "Show a column with the sum of periods"), + OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples, +-- +2.43.0 + diff --git a/queue-5.15/perf-bench-internals-inject-build-id-fix-trap-divide.patch b/queue-5.15/perf-bench-internals-inject-build-id-fix-trap-divide.patch new file mode 100644 index 00000000000..2fd1a224e99 --- /dev/null +++ b/queue-5.15/perf-bench-internals-inject-build-id-fix-trap-divide.patch @@ -0,0 +1,55 @@ +From f3871a32bc80a2c74afe7ccb3fecc92044a4084c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 14:50:26 +0800 +Subject: perf bench internals inject-build-id: Fix trap divide when collecting + just one DSO + +From: He Zhe + +[ Upstream commit d9180e23fbfa3875424d3a6b28b71b072862a52a ] + +'perf bench internals inject-build-id' suffers from the following error when +only one DSO is collected. + + # perf bench internals inject-build-id -v + Collected 1 DSOs + traps: internals-injec[2305] trap divide error + ip:557566ba6394 sp:7ffd4de97fe0 error:0 in perf[557566b2a000+23d000] + Build-id injection benchmark + Iteration #1 + Floating point exception + +This patch removes the unnecessary minus one from the divisor which also +corrects the randomization range. + +Signed-off-by: He Zhe +Fixes: 0bf02a0d80427f26 ("perf bench: Add build-id injection benchmark") +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Ian Rogers +Cc: Jiri Olsa +Cc: Mark Rutland +Cc: Namhyung Kim +Link: https://lore.kernel.org/r/20240507065026.2652929-1-zhe.he@windriver.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/bench/inject-buildid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/bench/inject-buildid.c b/tools/perf/bench/inject-buildid.c +index 17672790f1231..d1672be702f3b 100644 +--- a/tools/perf/bench/inject-buildid.c ++++ b/tools/perf/bench/inject-buildid.c +@@ -361,7 +361,7 @@ static int inject_build_id(struct bench_data *data, u64 *max_rss) + return -1; + + for (i = 0; i < nr_mmaps; i++) { +- int idx = rand() % (nr_dsos - 1); ++ int idx = rand() % nr_dsos; + struct bench_dso *dso = &dsos[idx]; + u64 timestamp = rand() % 1000000; + +-- +2.43.0 + diff --git a/queue-5.15/perf-daemon-fix-file-leak-in-daemon_session__control.patch b/queue-5.15/perf-daemon-fix-file-leak-in-daemon_session__control.patch new file mode 100644 index 00000000000..f7ebf5a53ce --- /dev/null +++ b/queue-5.15/perf-daemon-fix-file-leak-in-daemon_session__control.patch @@ -0,0 +1,59 @@ +From 23cefd83b8a300f6cb8c90caea091def73cde8e9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 May 2024 17:34:24 -0700 +Subject: perf daemon: Fix file leak in daemon_session__control + +From: Samasth Norway Ananda + +[ Upstream commit 09541603462c399c7408d50295db99b4b8042eaa ] + +The open() function returns -1 on error. + +The 'control' and 'ack' file descriptors are both initialized with +open() and further validated with 'if' statement. + +'if (!control)' would evaluate to 'true' if returned value on error were +'0' but it is actually '-1'. + +Fixes: edcaa47958c7438b ("perf daemon: Add 'ping' command") +Signed-off-by: Samasth Norway Ananda +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Ian Rogers +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: https://lore.kernel.org/r/20240510003424.2016914-1-samasth.norway.ananda@oracle.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/builtin-daemon.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c +index 61929f63a0474..361fbee36b35c 100644 +--- a/tools/perf/builtin-daemon.c ++++ b/tools/perf/builtin-daemon.c +@@ -523,7 +523,7 @@ static int daemon_session__control(struct daemon_session *session, + session->base, SESSION_CONTROL); + + control = open(control_path, O_WRONLY|O_NONBLOCK); +- if (!control) ++ if (control < 0) + return -1; + + if (do_ack) { +@@ -532,7 +532,7 @@ static int daemon_session__control(struct daemon_session *session, + session->base, SESSION_ACK); + + ack = open(ack_path, O_RDONLY, O_NONBLOCK); +- if (!ack) { ++ if (ack < 0) { + close(control); + return -1; + } +-- +2.43.0 + diff --git a/queue-5.15/perf-docs-document-bpf-event-modifier.patch b/queue-5.15/perf-docs-document-bpf-event-modifier.patch new file mode 100644 index 00000000000..d77e5ffe670 --- /dev/null +++ b/queue-5.15/perf-docs-document-bpf-event-modifier.patch @@ -0,0 +1,48 @@ +From 4f42f8715da7fc84dfd8a096258c13e15ce9f370 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Apr 2024 10:00:13 -0700 +Subject: perf docs: Document bpf event modifier + +From: Ian Rogers + +[ Upstream commit eb4d27cf9aef3e6c9bcaf8fa1a1cadc2433d847b ] + +Document that 'b' is used as a modifier to make an event use a BPF +counter. + +Fixes: 01bd8efcec444468 ("perf stat: Introduce ':b' modifier") +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Athira Rajeev +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Kan Liang +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: Ravi Bangoria +Cc: Song Liu +Cc: Thomas Richter +Link: https://lore.kernel.org/r/20240416170014.985191-1-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/Documentation/perf-list.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt +index 4c7db1da8fccc..a4881d32b318a 100644 +--- a/tools/perf/Documentation/perf-list.txt ++++ b/tools/perf/Documentation/perf-list.txt +@@ -59,6 +59,7 @@ counted. The following modifiers exist: + D - pin the event to the PMU + W - group is weak and will fallback to non-group if not schedulable, + e - group or event are exclusive and do not share the PMU ++ b - use BPF aggregration (see perf stat --bpf-counters) + + The 'p' modifier can be used for specifying how precise the instruction + address should be. The 'p' modifier can be specified multiple times: +-- +2.43.0 + diff --git a/queue-5.15/perf-intel-pt-fix-unassigned-instruction-op-discover.patch b/queue-5.15/perf-intel-pt-fix-unassigned-instruction-op-discover.patch new file mode 100644 index 00000000000..b7bbeba0496 --- /dev/null +++ b/queue-5.15/perf-intel-pt-fix-unassigned-instruction-op-discover.patch @@ -0,0 +1,73 @@ +From ecad851e518d9aa4eeb34a3f676c8d3f2123117d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Mar 2024 10:32:23 +0200 +Subject: perf intel-pt: Fix unassigned instruction op (discovered by + MemorySanitizer) + +From: Adrian Hunter + +[ Upstream commit e101a05f79fd4ee3e89d2f3fb716493c33a33708 ] + +MemorySanitizer discovered instances where the instruction op value was +not assigned.: + + WARNING: MemorySanitizer: use-of-uninitialized-value + #0 0x5581c00a76b3 in intel_pt_sample_flags tools/perf/util/intel-pt.c:1527:17 + Uninitialized value was stored to memory at + #0 0x5581c005ddf8 in intel_pt_walk_insn tools/perf/util/intel-pt-decoder/intel-pt-decoder.c:1256:25 + +The op value is used to set branch flags for branch instructions +encountered when walking the code, so fix by setting op to +INTEL_PT_OP_OTHER in other cases. + +Fixes: 4c761d805bb2d2ea ("perf intel-pt: Fix intel_pt_fup_event() assumptions about setting state type") +Reported-by: Ian Rogers +Signed-off-by: Adrian Hunter +Tested-by: Ian Rogers +Cc: Jiri Olsa +Cc: Namhyung Kim +Closes: https://lore.kernel.org/linux-perf-users/20240320162619.1272015-1-irogers@google.com/ +Link: https://lore.kernel.org/r/20240326083223.10883-1-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++ + tools/perf/util/intel-pt.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +index b9f94f198a3eb..3530551b82819 100644 +--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c ++++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +@@ -1215,6 +1215,8 @@ static bool intel_pt_fup_event(struct intel_pt_decoder *decoder) + bool ret = false; + + decoder->state.type &= ~INTEL_PT_BRANCH; ++ decoder->state.insn_op = INTEL_PT_OP_OTHER; ++ decoder->state.insn_len = 0; + + if (decoder->set_fup_tx_flags) { + decoder->set_fup_tx_flags = false; +diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c +index 805bad9364e94..b00776c65c186 100644 +--- a/tools/perf/util/intel-pt.c ++++ b/tools/perf/util/intel-pt.c +@@ -721,6 +721,7 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn, + bool nr; + + intel_pt_insn->length = 0; ++ intel_pt_insn->op = INTEL_PT_OP_OTHER; + + if (to_ip && *ip == to_ip) + goto out_no_cache; +@@ -816,6 +817,7 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn, + + if (to_ip && *ip == to_ip) { + intel_pt_insn->length = 0; ++ intel_pt_insn->op = INTEL_PT_OP_OTHER; + goto out_no_cache; + } + +-- +2.43.0 + diff --git a/queue-5.15/perf-probe-add-missing-libgen.h-header-needed-for-us.patch b/queue-5.15/perf-probe-add-missing-libgen.h-header-needed-for-us.patch new file mode 100644 index 00000000000..e98617bf537 --- /dev/null +++ b/queue-5.15/perf-probe-add-missing-libgen.h-header-needed-for-us.patch @@ -0,0 +1,53 @@ +From 0269c1e4bbe438579b7eb484f9d66187f902a5e3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Mar 2024 11:13:30 -0300 +Subject: perf probe: Add missing libgen.h header needed for using basename() + +From: Arnaldo Carvalho de Melo + +[ Upstream commit 581037151910126a7934e369e4b6ac70eda9a703 ] + +This prototype is obtained indirectly, by luck, from some other header +in probe-event.c in most systems, but recently exploded on alpine:edge: + + 8 13.39 alpine:edge : FAIL gcc version 13.2.1 20240309 (Alpine 13.2.1_git20240309) + util/probe-event.c: In function 'convert_exec_to_group': + util/probe-event.c:225:16: error: implicit declaration of function 'basename' [-Werror=implicit-function-declaration] + 225 | ptr1 = basename(exec_copy); + | ^~~~~~~~ + util/probe-event.c:225:14: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] + 225 | ptr1 = basename(exec_copy); + | ^ + cc1: all warnings being treated as errors + make[3]: *** [/git/perf-6.8.0/tools/build/Makefile.build:158: util] Error 2 + +Fix it by adding the libgen.h header where basename() is prototyped. + +Fixes: fb7345bbf7fad9bf ("perf probe: Support basic dwarf-based operations on uprobe events") +Cc: Masami Hiramatsu +Cc: Adrian Hunter +Cc: Ian Rogers +Cc: Jiri Olsa +Cc: Namhyung Kim +Link: https://lore.kernel.org/lkml/ +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/util/probe-event.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c +index 68844c48f688a..454a7e2325d87 100644 +--- a/tools/perf/util/probe-event.c ++++ b/tools/perf/util/probe-event.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.43.0 + diff --git a/queue-5.15/perf-record-delete-session-after-stopping-sideband-t.patch b/queue-5.15/perf-record-delete-session-after-stopping-sideband-t.patch new file mode 100644 index 00000000000..48f1cd28a4e --- /dev/null +++ b/queue-5.15/perf-record-delete-session-after-stopping-sideband-t.patch @@ -0,0 +1,83 @@ +From 15a3e7e34157f54d4266ae16435f000c33bb5a4d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 Feb 2024 23:46:36 -0800 +Subject: perf record: Delete session after stopping sideband thread + +From: Ian Rogers + +[ Upstream commit 88ce0106a1f603bf360cb397e8fe293f8298fabb ] + +The session has a header in it which contains a perf env with +bpf_progs. The bpf_progs are accessed by the sideband thread and so +the sideband thread must be stopped before the session is deleted, to +avoid a use after free. This error was detected by AddressSanitizer +in the following: + + ==2054673==ERROR: AddressSanitizer: heap-use-after-free on address 0x61d000161e00 at pc 0x55769289de54 bp 0x7f9df36d4ab0 sp 0x7f9df36d4aa8 + READ of size 8 at 0x61d000161e00 thread T1 + #0 0x55769289de53 in __perf_env__insert_bpf_prog_info util/env.c:42 + #1 0x55769289dbb1 in perf_env__insert_bpf_prog_info util/env.c:29 + #2 0x557692bbae29 in perf_env__add_bpf_info util/bpf-event.c:483 + #3 0x557692bbb01a in bpf_event__sb_cb util/bpf-event.c:512 + #4 0x5576928b75f4 in perf_evlist__poll_thread util/sideband_evlist.c:68 + #5 0x7f9df96a63eb in start_thread nptl/pthread_create.c:444 + #6 0x7f9df9726a4b in clone3 ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81 + + 0x61d000161e00 is located 384 bytes inside of 2136-byte region [0x61d000161c80,0x61d0001624d8) + freed by thread T0 here: + #0 0x7f9dfa6d7288 in __interceptor_free libsanitizer/asan/asan_malloc_linux.cpp:52 + #1 0x557692978d50 in perf_session__delete util/session.c:319 + #2 0x557692673959 in __cmd_record tools/perf/builtin-record.c:2884 + #3 0x55769267a9f0 in cmd_record tools/perf/builtin-record.c:4259 + #4 0x55769286710c in run_builtin tools/perf/perf.c:349 + #5 0x557692867678 in handle_internal_command tools/perf/perf.c:402 + #6 0x557692867a40 in run_argv tools/perf/perf.c:446 + #7 0x557692867fae in main tools/perf/perf.c:562 + #8 0x7f9df96456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 + +Fixes: 657ee5531903339b ("perf evlist: Introduce side band thread") +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Athira Rajeev +Cc: Christian Brauner +Cc: Disha Goel +Cc: Ingo Molnar +Cc: James Clark +Cc: Jiri Olsa +Cc: Kajol Jain +Cc: Kan Liang +Cc: K Prateek Nayak +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: Song Liu +Cc: Tim Chen +Cc: Yicong Yang +Link: https://lore.kernel.org/r/20240301074639.2260708-1-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/builtin-record.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c +index b92c26f6aa1d7..95ea3a9867c58 100644 +--- a/tools/perf/builtin-record.c ++++ b/tools/perf/builtin-record.c +@@ -2075,10 +2075,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) + close(done_fd); + #endif + zstd_fini(&session->zstd_data); +- perf_session__delete(session); +- + if (!opts->no_bpf_event) + evlist__stop_sb_thread(rec->sb_evlist); ++ ++ perf_session__delete(session); + return status; + } + +-- +2.43.0 + diff --git a/queue-5.15/perf-report-avoid-segv-in-report__setup_sample_type.patch b/queue-5.15/perf-report-avoid-segv-in-report__setup_sample_type.patch new file mode 100644 index 00000000000..7039796e6f2 --- /dev/null +++ b/queue-5.15/perf-report-avoid-segv-in-report__setup_sample_type.patch @@ -0,0 +1,47 @@ +From 15897057f237580ce882273caa03c498a22d1efe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 20:53:00 -0700 +Subject: perf report: Avoid SEGV in report__setup_sample_type() + +From: Ian Rogers + +[ Upstream commit 45b4f402a6b782352c4bafcff682bfb01da9ca05 ] + +In some cases evsel->name is lazily initialized in evsel__name(). If not +initialized passing NULL to strstr() leads to a SEGV. + +Fixes: ccb17caecfbd542f ("perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event") +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Ingo Molnar +Cc: James Clark +Cc: Jiri Olsa +Cc: Kan Liang +Cc: Leo Yan +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: https://lore.kernel.org/r/20240508035301.1554434-4-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/builtin-report.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c +index 6583ad9cc7deb..35bf3b01d9cc7 100644 +--- a/tools/perf/builtin-report.c ++++ b/tools/perf/builtin-report.c +@@ -410,7 +410,7 @@ static int report__setup_sample_type(struct report *rep) + * compatibility, set the bit if it's an old perf data file. + */ + evlist__for_each_entry(session->evlist, evsel) { +- if (strstr(evsel->name, "arm_spe") && ++ if (strstr(evsel__name(evsel), "arm_spe") && + !(sample_type & PERF_SAMPLE_DATA_SRC)) { + evsel->core.attr.sample_type |= PERF_SAMPLE_DATA_SRC; + sample_type |= PERF_SAMPLE_DATA_SRC; +-- +2.43.0 + diff --git a/queue-5.15/perf-stat-don-t-display-metric-header-for-non-leader.patch b/queue-5.15/perf-stat-don-t-display-metric-header-for-non-leader.patch new file mode 100644 index 00000000000..4b63896506f --- /dev/null +++ b/queue-5.15/perf-stat-don-t-display-metric-header-for-non-leader.patch @@ -0,0 +1,90 @@ +From ffe4bafb4030031521db5d98e0de427226d65800 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 May 2024 22:13:09 -0700 +Subject: perf stat: Don't display metric header for non-leader uncore events + +From: Ian Rogers + +[ Upstream commit 193a9e30207f54777ff42d0d8be8389edc522277 ] + +On an Intel tigerlake laptop a metric like: + + { + "BriefDescription": "Test", + "MetricExpr": "imc_free_running@data_read@ + imc_free_running@data_write@", + "MetricGroup": "Test", + "MetricName": "Test", + "ScaleUnit": "6.103515625e-5MiB" + }, + +Will have 4 events: + + uncore_imc_free_running_0/data_read/ + uncore_imc_free_running_0/data_write/ + uncore_imc_free_running_1/data_read/ + uncore_imc_free_running_1/data_write/ + +If aggregration is disabled with metric-only 2 column headers are +needed: + + $ perf stat -M test --metric-only -A -a sleep 1 + + Performance counter stats for 'system wide': + + MiB Test MiB Test + CPU0 1821.0 1820.5 + +But when not, the counts aggregated in the metric leader and only 1 +column should be shown: + + $ perf stat -M test --metric-only -a sleep 1 + Performance counter stats for 'system wide': + + MiB Test + 5909.4 + + 1.001258915 seconds time elapsed + +Achieve this by skipping events that aren't metric leaders when +printing column headers and aggregation isn't disabled. + +The bug is long standing, the fixes tag is set to a refactor as that +is as far back as is reasonable to backport. + +Fixes: 088519f318be3a41 ("perf stat: Move the display functions to stat-display.c") +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Ingo Molnar +Cc: Jiri Olsa +Cc: Kaige Ye +Cc: Kan Liang +Cc: K Prateek Nayak +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: Yicong Yang +Link: https://lore.kernel.org/r/20240510051309.2452468-1-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/util/stat-display.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c +index 5ed20e1e09aef..79384e8326c65 100644 +--- a/tools/perf/util/stat-display.c ++++ b/tools/perf/util/stat-display.c +@@ -1000,6 +1000,9 @@ static void print_metric_headers(struct perf_stat_config *config, + + /* Print metrics headers only */ + evlist__for_each_entry(evlist, counter) { ++ if (config->aggr_mode != AGGR_NONE && counter->metric_leader != counter) ++ continue; ++ + os.evsel = counter; + out.ctx = &os; + out.print_metric = print_metric_header; +-- +2.43.0 + diff --git a/queue-5.15/perf-top-fix-tui-exit-screen-refresh-race-condition.patch b/queue-5.15/perf-top-fix-tui-exit-screen-refresh-race-condition.patch new file mode 100644 index 00000000000..d8733f2d230 --- /dev/null +++ b/queue-5.15/perf-top-fix-tui-exit-screen-refresh-race-condition.patch @@ -0,0 +1,75 @@ +From a905d6053ba71300556fbc81850d9d50abbc0bea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Dec 2021 16:55:19 +0800 +Subject: perf top: Fix TUI exit screen refresh race condition + +From: yaowenbin + +[ Upstream commit 64f18d2d043015b3f835ce4c9f3beb97cfd19b6e ] + +When the following command is executed several times, a coredump file is +generated. + + $ timeout -k 9 5 perf top -e task-clock + ******* + ******* + ******* + 0.01% [kernel] [k] __do_softirq + 0.01% libpthread-2.28.so [.] __pthread_mutex_lock + 0.01% [kernel] [k] __ll_sc_atomic64_sub_return + double free or corruption (!prev) perf top --sort comm,dso + timeout: the monitored command dumped core + +When we terminate "perf top" using sending signal method, +SLsmg_reset_smg() called. SLsmg_reset_smg() resets the SLsmg screen +management routines by freeing all memory allocated while it was active. + +However SLsmg_reinit_smg() maybe be called by another thread. + +SLsmg_reinit_smg() will free the same memory accessed by +SLsmg_reset_smg(), thus it results in a double free. + +SLsmg_reinit_smg() is called already protected by ui__lock, so we fix +the problem by adding pthread_mutex_trylock of ui__lock when calling +SLsmg_reset_smg(). + +Signed-off-by: Wenyu Liu +Tested-by: Arnaldo Carvalho de Melo +Cc: Alexander Shishkin +Cc: Jiri Olsa +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: wuxu.wu@huawei.com +Link: http://lore.kernel.org/lkml/a91e3943-7ddc-f5c0-a7f5-360f073c20e6@huawei.com +Signed-off-by: Hewenliang +Signed-off-by: yaowenbin +Signed-off-by: Arnaldo Carvalho de Melo +Stable-dep-of: 769e6a1e15bd ("perf ui browser: Don't save pointer to stack memory") +Signed-off-by: Sasha Levin +--- + tools/perf/ui/tui/setup.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/tools/perf/ui/tui/setup.c b/tools/perf/ui/tui/setup.c +index e9bfe856a5dee..b1be59b4e2a4f 100644 +--- a/tools/perf/ui/tui/setup.c ++++ b/tools/perf/ui/tui/setup.c +@@ -170,9 +170,11 @@ void ui__exit(bool wait_for_ok) + "Press any key...", 0); + + SLtt_set_cursor_visibility(1); +- SLsmg_refresh(); +- SLsmg_reset_smg(); ++ if (!pthread_mutex_trylock(&ui__lock)) { ++ SLsmg_refresh(); ++ SLsmg_reset_smg(); ++ pthread_mutex_unlock(&ui__lock); ++ } + SLang_reset_tty(); +- + perf_error__unregister(&perf_tui_eops); + } +-- +2.43.0 + diff --git a/queue-5.15/perf-ui-browser-avoid-segv-on-title.patch b/queue-5.15/perf-ui-browser-avoid-segv-on-title.patch new file mode 100644 index 00000000000..9e725411c4f --- /dev/null +++ b/queue-5.15/perf-ui-browser-avoid-segv-on-title.patch @@ -0,0 +1,46 @@ +From c7b044007100f3cde867dc2ba44d46060431a69d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 20:52:58 -0700 +Subject: perf ui browser: Avoid SEGV on title + +From: Ian Rogers + +[ Upstream commit 90f01afb0dfafbc9b094bb61e61a4ac297d9d0d2 ] + +If the title is NULL then it can lead to a SEGV. + +Fixes: 769e6a1e15bdbbaf ("perf ui browser: Don't save pointer to stack memory") +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Ingo Molnar +Cc: James Clark +Cc: Jiri Olsa +Cc: Kan Liang +Cc: Leo Yan +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: https://lore.kernel.org/r/20240508035301.1554434-2-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/ui/browser.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c +index d09b4cbec6e06..5d6f4f25c33d0 100644 +--- a/tools/perf/ui/browser.c ++++ b/tools/perf/ui/browser.c +@@ -203,7 +203,7 @@ void ui_browser__refresh_dimensions(struct ui_browser *browser) + void ui_browser__handle_resize(struct ui_browser *browser) + { + ui__refresh_dimensions(false); +- ui_browser__show(browser, browser->title, ui_helpline__current); ++ ui_browser__show(browser, browser->title ?: "", ui_helpline__current); + ui_browser__refresh(browser); + } + +-- +2.43.0 + diff --git a/queue-5.15/perf-ui-browser-don-t-save-pointer-to-stack-memory.patch b/queue-5.15/perf-ui-browser-don-t-save-pointer-to-stack-memory.patch new file mode 100644 index 00000000000..2b8ed075e5f --- /dev/null +++ b/queue-5.15/perf-ui-browser-don-t-save-pointer-to-stack-memory.patch @@ -0,0 +1,143 @@ +From 3abee371def089c74b8b5c582dcdb541c8fcef3a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 May 2024 11:35:38 -0700 +Subject: perf ui browser: Don't save pointer to stack memory + +From: Ian Rogers + +[ Upstream commit 769e6a1e15bdbbaf2b0d2f37c24f2c53268bd21f ] + +ui_browser__show() is capturing the input title that is stack allocated +memory in hist_browser__run(). + +Avoid a use after return by strdup-ing the string. + +Committer notes: + +Further explanation from Ian Rogers: + +My command line using tui is: +$ sudo bash -c 'rm /tmp/asan.log*; export +ASAN_OPTIONS="log_path=/tmp/asan.log"; /tmp/perf/perf mem record -a +sleep 1; /tmp/perf/perf mem report' +I then go to the perf annotate view and quit. This triggers the asan +error (from the log file): +``` +==1254591==ERROR: AddressSanitizer: stack-use-after-return on address +0x7f2813331920 at pc 0x7f28180 +65991 bp 0x7fff0a21c750 sp 0x7fff0a21bf10 +READ of size 80 at 0x7f2813331920 thread T0 + #0 0x7f2818065990 in __interceptor_strlen +../../../../src/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:461 + #1 0x7f2817698251 in SLsmg_write_wrapped_string +(/lib/x86_64-linux-gnu/libslang.so.2+0x98251) + #2 0x7f28176984b9 in SLsmg_write_nstring +(/lib/x86_64-linux-gnu/libslang.so.2+0x984b9) + #3 0x55c94045b365 in ui_browser__write_nstring ui/browser.c:60 + #4 0x55c94045c558 in __ui_browser__show_title ui/browser.c:266 + #5 0x55c94045c776 in ui_browser__show ui/browser.c:288 + #6 0x55c94045c06d in ui_browser__handle_resize ui/browser.c:206 + #7 0x55c94047979b in do_annotate ui/browsers/hists.c:2458 + #8 0x55c94047fb17 in evsel__hists_browse ui/browsers/hists.c:3412 + #9 0x55c940480a0c in perf_evsel_menu__run ui/browsers/hists.c:3527 + #10 0x55c940481108 in __evlist__tui_browse_hists ui/browsers/hists.c:3613 + #11 0x55c9404813f7 in evlist__tui_browse_hists ui/browsers/hists.c:3661 + #12 0x55c93ffa253f in report__browse_hists tools/perf/builtin-report.c:671 + #13 0x55c93ffa58ca in __cmd_report tools/perf/builtin-report.c:1141 + #14 0x55c93ffaf159 in cmd_report tools/perf/builtin-report.c:1805 + #15 0x55c94000c05c in report_events tools/perf/builtin-mem.c:374 + #16 0x55c94000d96d in cmd_mem tools/perf/builtin-mem.c:516 + #17 0x55c9400e44ee in run_builtin tools/perf/perf.c:350 + #18 0x55c9400e4a5a in handle_internal_command tools/perf/perf.c:403 + #19 0x55c9400e4e22 in run_argv tools/perf/perf.c:447 + #20 0x55c9400e53ad in main tools/perf/perf.c:561 + #21 0x7f28170456c9 in __libc_start_call_main +../sysdeps/nptl/libc_start_call_main.h:58 + #22 0x7f2817045784 in __libc_start_main_impl ../csu/libc-start.c:360 + #23 0x55c93ff544c0 in _start (/tmp/perf/perf+0x19a4c0) (BuildId: +84899b0e8c7d3a3eaa67b2eb35e3d8b2f8cd4c93) + +Address 0x7f2813331920 is located in stack of thread T0 at offset 32 in frame + #0 0x55c94046e85e in hist_browser__run ui/browsers/hists.c:746 + + This frame has 1 object(s): + [32, 192) 'title' (line 747) <== Memory access at offset 32 is +inside this variable +HINT: this may be a false positive if your program uses some custom +stack unwind mechanism, swapcontext or vfork +``` +hist_browser__run isn't on the stack so the asan error looks legit. +There's no clean init/exit on struct ui_browser so I may be trading a +use-after-return for a memory leak, but that seems look a good trade +anyway. + +Fixes: 05e8b0804ec4 ("perf ui browser: Stop using 'self'") +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Andi Kleen +Cc: Athira Rajeev +Cc: Ben Gainey +Cc: Ingo Molnar +Cc: James Clark +Cc: Jiri Olsa +Cc: Kajol Jain +Cc: Kan Liang +Cc: K Prateek Nayak +Cc: Li Dong +Cc: Mark Rutland +Cc: Namhyung Kim +Cc: Oliver Upton +Cc: Paran Lee +Cc: Peter Zijlstra +Cc: Ravi Bangoria +Cc: Sun Haiyong +Cc: Tim Chen +Cc: Yanteng Si +Cc: Yicong Yang +Link: https://lore.kernel.org/r/20240507183545.1236093-2-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/ui/browser.c | 4 +++- + tools/perf/ui/browser.h | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c +index 78fb01d6ad63f..d09b4cbec6e06 100644 +--- a/tools/perf/ui/browser.c ++++ b/tools/perf/ui/browser.c +@@ -287,7 +287,8 @@ int ui_browser__show(struct ui_browser *browser, const char *title, + mutex_lock(&ui__lock); + __ui_browser__show_title(browser, title); + +- browser->title = title; ++ free(browser->title); ++ browser->title = strdup(title); + zfree(&browser->helpline); + + va_start(ap, helpline); +@@ -304,6 +305,7 @@ void ui_browser__hide(struct ui_browser *browser) + mutex_lock(&ui__lock); + ui_helpline__pop(); + zfree(&browser->helpline); ++ zfree(&browser->title); + mutex_unlock(&ui__lock); + } + +diff --git a/tools/perf/ui/browser.h b/tools/perf/ui/browser.h +index 510ce45540501..6e98d5f8f71cc 100644 +--- a/tools/perf/ui/browser.h ++++ b/tools/perf/ui/browser.h +@@ -21,7 +21,7 @@ struct ui_browser { + u8 extra_title_lines; + int current_color; + void *priv; +- const char *title; ++ char *title; + char *helpline; + const char *no_samples_msg; + void (*refresh_dimensions)(struct ui_browser *browser); +-- +2.43.0 + diff --git a/queue-5.15/perf-ui-update-use-of-pthread-mutex.patch b/queue-5.15/perf-ui-update-use-of-pthread-mutex.patch new file mode 100644 index 00000000000..7983acfc335 --- /dev/null +++ b/queue-5.15/perf-ui-update-use-of-pthread-mutex.patch @@ -0,0 +1,382 @@ +From 27af52a19803b179766447e4b79fe4e8b9f89091 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Aug 2022 09:42:33 -0700 +Subject: perf ui: Update use of pthread mutex +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ian Rogers + +[ Upstream commit 82aff6cc070417f26f9b02b26e63c17ff43b4044 ] + +Switch to the use of mutex wrappers that provide better error checking. + +Signed-off-by: Ian Rogers +Cc: Adrian Hunter +Cc: Alexander Shishkin +Cc: Alexandre Truong +Cc: Alexey Bayduraev +Cc: Andi Kleen +Cc: Andres Freund +Cc: Andrii Nakryiko +Cc: André Almeida +Cc: Athira Jajeev +Cc: Christophe JAILLET +Cc: Colin Ian King +Cc: Dario Petrillo +Cc: Darren Hart +Cc: Dave Marchevsky +Cc: Davidlohr Bueso +Cc: Fangrui Song +Cc: Hewenliang +Cc: Ingo Molnar +Cc: James Clark +Cc: Jason Wang +Cc: Jiri Olsa +Cc: Kajol Jain +Cc: Kim Phillips +Cc: Leo Yan +Cc: Mark Rutland +Cc: Martin LiÅ¡ka +Cc: Masami Hiramatsu +Cc: Nathan Chancellor +Cc: Nick Desaulniers +Cc: Pavithra Gurushankar +Cc: Peter Zijlstra +Cc: Quentin Monnet +Cc: Ravi Bangoria +Cc: Remi Bernon +Cc: Riccardo Mancini +Cc: Song Liu +Cc: Stephane Eranian +Cc: Thomas Gleixner +Cc: Thomas Richter +Cc: Tom Rix +Cc: Weiguo Li +Cc: Wenyu Liu +Cc: William Cohen +Cc: Zechuan Chen +Cc: bpf@vger.kernel.org +Cc: llvm@lists.linux.dev +Cc: yaowenbin +Link: https://lore.kernel.org/r/20220826164242.43412-10-irogers@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Stable-dep-of: 769e6a1e15bd ("perf ui browser: Don't save pointer to stack memory") +Signed-off-by: Sasha Levin +--- + tools/perf/ui/browser.c | 20 ++++++++++---------- + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/ui/setup.c | 5 +++-- + tools/perf/ui/tui/helpline.c | 5 ++--- + tools/perf/ui/tui/progress.c | 8 ++++---- + tools/perf/ui/tui/setup.c | 8 ++++---- + tools/perf/ui/tui/util.c | 18 +++++++++--------- + tools/perf/ui/ui.h | 4 ++-- + 8 files changed, 35 insertions(+), 35 deletions(-) + +diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c +index fa5bd5c20e96b..78fb01d6ad63f 100644 +--- a/tools/perf/ui/browser.c ++++ b/tools/perf/ui/browser.c +@@ -268,9 +268,9 @@ void __ui_browser__show_title(struct ui_browser *browser, const char *title) + + void ui_browser__show_title(struct ui_browser *browser, const char *title) + { +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + __ui_browser__show_title(browser, title); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + } + + int ui_browser__show(struct ui_browser *browser, const char *title, +@@ -284,7 +284,7 @@ int ui_browser__show(struct ui_browser *browser, const char *title, + + browser->refresh_dimensions(browser); + +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + __ui_browser__show_title(browser, title); + + browser->title = title; +@@ -295,16 +295,16 @@ int ui_browser__show(struct ui_browser *browser, const char *title, + va_end(ap); + if (err > 0) + ui_helpline__push(browser->helpline); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + return err ? 0 : -1; + } + + void ui_browser__hide(struct ui_browser *browser) + { +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + ui_helpline__pop(); + zfree(&browser->helpline); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + } + + static void ui_browser__scrollbar_set(struct ui_browser *browser) +@@ -352,9 +352,9 @@ static int __ui_browser__refresh(struct ui_browser *browser) + + int ui_browser__refresh(struct ui_browser *browser) + { +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + __ui_browser__refresh(browser); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + + return 0; + } +@@ -390,10 +390,10 @@ int ui_browser__run(struct ui_browser *browser, int delay_secs) + while (1) { + off_t offset; + +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + err = __ui_browser__refresh(browser); + SLsmg_refresh(); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + if (err < 0) + break; + +diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c +index 44ba900828f6c..b8747e8dd9ea4 100644 +--- a/tools/perf/ui/browsers/annotate.c ++++ b/tools/perf/ui/browsers/annotate.c +@@ -8,11 +8,11 @@ + #include "../../util/hist.h" + #include "../../util/sort.h" + #include "../../util/map.h" ++#include "../../util/mutex.h" + #include "../../util/symbol.h" + #include "../../util/evsel.h" + #include "../../util/evlist.h" + #include +-#include + #include + #include + #include +diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c +index 700335cde6180..25ded88801a3d 100644 +--- a/tools/perf/ui/setup.c ++++ b/tools/perf/ui/setup.c +@@ -1,5 +1,4 @@ + // SPDX-License-Identifier: GPL-2.0 +-#include + #include + #include + +@@ -8,7 +7,7 @@ + #include "../util/hist.h" + #include "ui.h" + +-pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER; ++struct mutex ui__lock; + void *perf_gtk_handle; + int use_browser = -1; + +@@ -76,6 +75,7 @@ int stdio__config_color(const struct option *opt __maybe_unused, + + void setup_browser(bool fallback_to_pager) + { ++ mutex_init(&ui__lock); + if (use_browser < 2 && (!isatty(1) || dump_trace)) + use_browser = 0; + +@@ -118,4 +118,5 @@ void exit_browser(bool wait_for_ok) + default: + break; + } ++ mutex_destroy(&ui__lock); + } +diff --git a/tools/perf/ui/tui/helpline.c b/tools/perf/ui/tui/helpline.c +index 298d6af82fddd..db4952f5990bd 100644 +--- a/tools/perf/ui/tui/helpline.c ++++ b/tools/perf/ui/tui/helpline.c +@@ -2,7 +2,6 @@ + #include + #include + #include +-#include + #include + #include + +@@ -33,7 +32,7 @@ static int tui_helpline__show(const char *format, va_list ap) + int ret; + static int backlog; + +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + ret = vscnprintf(ui_helpline__last_msg + backlog, + sizeof(ui_helpline__last_msg) - backlog, format, ap); + backlog += ret; +@@ -45,7 +44,7 @@ static int tui_helpline__show(const char *format, va_list ap) + SLsmg_refresh(); + backlog = 0; + } +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + + return ret; + } +diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c +index 3d74af5a7ece6..71b6c8d9474fb 100644 +--- a/tools/perf/ui/tui/progress.c ++++ b/tools/perf/ui/tui/progress.c +@@ -45,7 +45,7 @@ static void tui_progress__update(struct ui_progress *p) + } + + ui__refresh_dimensions(false); +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + y = SLtt_Screen_Rows / 2 - 2; + SLsmg_set_color(0); + SLsmg_draw_box(y, 0, 3, SLtt_Screen_Cols); +@@ -56,7 +56,7 @@ static void tui_progress__update(struct ui_progress *p) + bar = ((SLtt_Screen_Cols - 2) * p->curr) / p->total; + SLsmg_fill_region(y, 1, 1, bar, ' '); + SLsmg_refresh(); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + } + + static void tui_progress__finish(void) +@@ -67,12 +67,12 @@ static void tui_progress__finish(void) + return; + + ui__refresh_dimensions(false); +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + y = SLtt_Screen_Rows / 2 - 2; + SLsmg_set_color(0); + SLsmg_fill_region(y, 0, 3, SLtt_Screen_Cols, ' '); + SLsmg_refresh(); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + } + + static struct ui_progress_ops tui_progress__ops = { +diff --git a/tools/perf/ui/tui/setup.c b/tools/perf/ui/tui/setup.c +index b1be59b4e2a4f..a3b8c397c24d5 100644 +--- a/tools/perf/ui/tui/setup.c ++++ b/tools/perf/ui/tui/setup.c +@@ -29,10 +29,10 @@ void ui__refresh_dimensions(bool force) + { + if (force || ui__need_resize) { + ui__need_resize = 0; +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + SLtt_get_screen_size(); + SLsmg_reinit_smg(); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + } + } + +@@ -170,10 +170,10 @@ void ui__exit(bool wait_for_ok) + "Press any key...", 0); + + SLtt_set_cursor_visibility(1); +- if (!pthread_mutex_trylock(&ui__lock)) { ++ if (mutex_trylock(&ui__lock)) { + SLsmg_refresh(); + SLsmg_reset_smg(); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + } + SLang_reset_tty(); + perf_error__unregister(&perf_tui_eops); +diff --git a/tools/perf/ui/tui/util.c b/tools/perf/ui/tui/util.c +index 0f562e2cb1e88..3c5174854ac8b 100644 +--- a/tools/perf/ui/tui/util.c ++++ b/tools/perf/ui/tui/util.c +@@ -95,7 +95,7 @@ int ui_browser__input_window(const char *title, const char *text, char *input, + t = sep + 1; + } + +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + + max_len += 2; + nr_lines += 8; +@@ -125,17 +125,17 @@ int ui_browser__input_window(const char *title, const char *text, char *input, + SLsmg_write_nstring((char *)exit_msg, max_len); + SLsmg_refresh(); + +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + + x += 2; + len = 0; + key = ui__getch(delay_secs); + while (key != K_TIMER && key != K_ENTER && key != K_ESC) { +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + + if (key == K_BKSPC) { + if (len == 0) { +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + goto next_key; + } + SLsmg_gotorc(y, x + --len); +@@ -147,7 +147,7 @@ int ui_browser__input_window(const char *title, const char *text, char *input, + } + SLsmg_refresh(); + +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + + /* XXX more graceful overflow handling needed */ + if (len == sizeof(buf) - 1) { +@@ -215,19 +215,19 @@ void __ui__info_window(const char *title, const char *text, const char *exit_msg + + void ui__info_window(const char *title, const char *text) + { +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + __ui__info_window(title, text, NULL); + SLsmg_refresh(); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + } + + int ui__question_window(const char *title, const char *text, + const char *exit_msg, int delay_secs) + { +- pthread_mutex_lock(&ui__lock); ++ mutex_lock(&ui__lock); + __ui__info_window(title, text, exit_msg); + SLsmg_refresh(); +- pthread_mutex_unlock(&ui__lock); ++ mutex_unlock(&ui__lock); + return ui__getch(delay_secs); + } + +diff --git a/tools/perf/ui/ui.h b/tools/perf/ui/ui.h +index 9b6fdf06e1d2f..99f8d2fe9bc55 100644 +--- a/tools/perf/ui/ui.h ++++ b/tools/perf/ui/ui.h +@@ -2,11 +2,11 @@ + #ifndef _PERF_UI_H_ + #define _PERF_UI_H_ 1 + +-#include ++#include "../util/mutex.h" + #include + #include + +-extern pthread_mutex_t ui__lock; ++extern struct mutex ui__lock; + extern void *perf_gtk_handle; + + extern int use_browser; +-- +2.43.0 + diff --git a/queue-5.15/ppdev-add-an-error-check-in-register_device.patch b/queue-5.15/ppdev-add-an-error-check-in-register_device.patch new file mode 100644 index 00000000000..8fdcc80402c --- /dev/null +++ b/queue-5.15/ppdev-add-an-error-check-in-register_device.patch @@ -0,0 +1,72 @@ +From e7cca825343d6384c585f47ff7f155dec01eecde Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Apr 2024 16:38:40 +0800 +Subject: ppdev: Add an error check in register_device + +From: Huai-Yuan Liu + +[ Upstream commit fbf740aeb86a4fe82ad158d26d711f2f3be79b3e ] + +In register_device, the return value of ida_simple_get is unchecked, +in witch ida_simple_get will use an invalid index value. + +To address this issue, index should be checked after ida_simple_get. When +the index value is abnormal, a warning message should be printed, the port +should be dropped, and the value should be recorded. + +Fixes: 9a69645dde11 ("ppdev: fix registering same device name") +Signed-off-by: Huai-Yuan Liu +Link: https://lore.kernel.org/r/20240412083840.234085-1-qq810974084@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/char/ppdev.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c +index f6024d97fe70b..a97edbf7455a6 100644 +--- a/drivers/char/ppdev.c ++++ b/drivers/char/ppdev.c +@@ -296,28 +296,35 @@ static int register_device(int minor, struct pp_struct *pp) + if (!port) { + pr_warn("%s: no associated port!\n", name); + rc = -ENXIO; +- goto err; ++ goto err_free_name; + } + + index = ida_alloc(&ida_index, GFP_KERNEL); ++ if (index < 0) { ++ pr_warn("%s: failed to get index!\n", name); ++ rc = index; ++ goto err_put_port; ++ } ++ + memset(&ppdev_cb, 0, sizeof(ppdev_cb)); + ppdev_cb.irq_func = pp_irq; + ppdev_cb.flags = (pp->flags & PP_EXCL) ? PARPORT_FLAG_EXCL : 0; + ppdev_cb.private = pp; + pdev = parport_register_dev_model(port, name, &ppdev_cb, index); +- parport_put_port(port); + + if (!pdev) { + pr_warn("%s: failed to register device!\n", name); + rc = -ENXIO; + ida_free(&ida_index, index); +- goto err; ++ goto err_put_port; + } + + pp->pdev = pdev; + pp->index = index; + dev_dbg(&pdev->dev, "registered pardevice\n"); +-err: ++err_put_port: ++ parport_put_port(port); ++err_free_name: + kfree(name); + return rc; + } +-- +2.43.0 + diff --git a/queue-5.15/ppdev-remove-usage-of-the-deprecated-ida_simple_xx-a.patch b/queue-5.15/ppdev-remove-usage-of-the-deprecated-ida_simple_xx-a.patch new file mode 100644 index 00000000000..c640957c0a2 --- /dev/null +++ b/queue-5.15/ppdev-remove-usage-of-the-deprecated-ida_simple_xx-a.patch @@ -0,0 +1,57 @@ +From 7cfff325f788e06540be16c8c7fd376baef6b4b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Dec 2023 06:01:47 +0100 +Subject: ppdev: Remove usage of the deprecated ida_simple_xx() API + +From: Christophe JAILLET + +[ Upstream commit d8407f71ebeaeb6f50bd89791837873e44609708 ] + +ida_alloc() and ida_free() should be preferred to the deprecated +ida_simple_get() and ida_simple_remove(). + +This is less verbose. + +Signed-off-by: Christophe JAILLET +Link: https://lore.kernel.org/r/ba9da12fdd5cdb2c28180b7160af5042447d803f.1702962092.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: fbf740aeb86a ("ppdev: Add an error check in register_device") +Signed-off-by: Sasha Levin +--- + drivers/char/ppdev.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c +index 38b46c7d17371..f6024d97fe70b 100644 +--- a/drivers/char/ppdev.c ++++ b/drivers/char/ppdev.c +@@ -299,7 +299,7 @@ static int register_device(int minor, struct pp_struct *pp) + goto err; + } + +- index = ida_simple_get(&ida_index, 0, 0, GFP_KERNEL); ++ index = ida_alloc(&ida_index, GFP_KERNEL); + memset(&ppdev_cb, 0, sizeof(ppdev_cb)); + ppdev_cb.irq_func = pp_irq; + ppdev_cb.flags = (pp->flags & PP_EXCL) ? PARPORT_FLAG_EXCL : 0; +@@ -310,7 +310,7 @@ static int register_device(int minor, struct pp_struct *pp) + if (!pdev) { + pr_warn("%s: failed to register device!\n", name); + rc = -ENXIO; +- ida_simple_remove(&ida_index, index); ++ ida_free(&ida_index, index); + goto err; + } + +@@ -750,7 +750,7 @@ static int pp_release(struct inode *inode, struct file *file) + + if (pp->pdev) { + parport_unregister_device(pp->pdev); +- ida_simple_remove(&ida_index, pp->index); ++ ida_free(&ida_index, pp->index); + pp->pdev = NULL; + pr_debug(CHRDEV "%x: unregistered pardevice\n", minor); + } +-- +2.43.0 + diff --git a/queue-5.15/s390-boot-remove-alt_stfle_fac_list-from-decompresso.patch b/queue-5.15/s390-boot-remove-alt_stfle_fac_list-from-decompresso.patch new file mode 100644 index 00000000000..ba2fbd7cf55 --- /dev/null +++ b/queue-5.15/s390-boot-remove-alt_stfle_fac_list-from-decompresso.patch @@ -0,0 +1,49 @@ +From 0c85bbf9919f68bc5e004d878f0c312caf7a2c85 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 May 2024 09:20:27 +0200 +Subject: s390/boot: Remove alt_stfle_fac_list from decompressor + +From: Sven Schnelle + +[ Upstream commit e7dec0b7926f3cd493c697c4c389df77e8e8a34c ] + +It is nowhere used in the decompressor, therefore remove it. + +Fixes: 17e89e1340a3 ("s390/facilities: move stfl information from lowcore to global data") +Reviewed-by: Heiko Carstens +Signed-off-by: Sven Schnelle +Signed-off-by: Heiko Carstens +Signed-off-by: Sasha Levin +--- + arch/s390/boot/startup.c | 1 - + arch/s390/kernel/setup.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c +index 1aa11a8f57dd8..05fed61c5e3b7 100644 +--- a/arch/s390/boot/startup.c ++++ b/arch/s390/boot/startup.c +@@ -27,7 +27,6 @@ int __bootdata(is_full_image) = 1; + struct initrd_data __bootdata(initrd_data); + + u64 __bootdata_preserved(stfle_fac_list[16]); +-u64 __bootdata_preserved(alt_stfle_fac_list[16]); + struct oldmem_data __bootdata_preserved(oldmem_data); + + void error(char *x) +diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c +index b7ce6c7c84c6f..50cb4c3d3682a 100644 +--- a/arch/s390/kernel/setup.c ++++ b/arch/s390/kernel/setup.c +@@ -154,7 +154,7 @@ unsigned int __bootdata_preserved(zlib_dfltcc_support); + EXPORT_SYMBOL(zlib_dfltcc_support); + u64 __bootdata_preserved(stfle_fac_list[16]); + EXPORT_SYMBOL(stfle_fac_list); +-u64 __bootdata_preserved(alt_stfle_fac_list[16]); ++u64 alt_stfle_fac_list[16]; + struct oldmem_data __bootdata_preserved(oldmem_data); + + unsigned long VMALLOC_START; +-- +2.43.0 + diff --git a/queue-5.15/s390-ipl-fix-incorrect-initialization-of-len-fields-.patch b/queue-5.15/s390-ipl-fix-incorrect-initialization-of-len-fields-.patch new file mode 100644 index 00000000000..7bda5b7f2b5 --- /dev/null +++ b/queue-5.15/s390-ipl-fix-incorrect-initialization-of-len-fields-.patch @@ -0,0 +1,42 @@ +From fba9687ff411b8ef567137d39bf368c6ee671816 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 May 2024 12:41:25 +0200 +Subject: s390/ipl: Fix incorrect initialization of len fields in nvme reipl + block + +From: Alexander Egorenkov + +[ Upstream commit 9c922b73acaf39f867668d9cbe5dc69c23511f84 ] + +Use correct symbolic constants IPL_BP_NVME_LEN and IPL_BP0_NVME_LEN +to initialize nvme reipl block when 'scp_data' sysfs attribute is +being updated. This bug had not been detected before because +the corresponding fcp and nvme symbolic constants are equal. + +Fixes: 23a457b8d57d ("s390: nvme reipl") +Reviewed-by: Heiko Carstens +Signed-off-by: Alexander Egorenkov +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/ipl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c +index 834b1ec5dd7a0..77246ff5b0141 100644 +--- a/arch/s390/kernel/ipl.c ++++ b/arch/s390/kernel/ipl.c +@@ -833,8 +833,8 @@ static ssize_t reipl_nvme_scpdata_write(struct file *filp, struct kobject *kobj, + scpdata_len += padding; + } + +- reipl_block_nvme->hdr.len = IPL_BP_FCP_LEN + scpdata_len; +- reipl_block_nvme->nvme.len = IPL_BP0_FCP_LEN + scpdata_len; ++ reipl_block_nvme->hdr.len = IPL_BP_NVME_LEN + scpdata_len; ++ reipl_block_nvme->nvme.len = IPL_BP0_NVME_LEN + scpdata_len; + reipl_block_nvme->nvme.scp_data_len = scpdata_len; + + return count; +-- +2.43.0 + diff --git a/queue-5.15/s390-ipl-fix-incorrect-initialization-of-nvme-dump-b.patch b/queue-5.15/s390-ipl-fix-incorrect-initialization-of-nvme-dump-b.patch new file mode 100644 index 00000000000..d188fc5dcf7 --- /dev/null +++ b/queue-5.15/s390-ipl-fix-incorrect-initialization-of-nvme-dump-b.patch @@ -0,0 +1,43 @@ +From 9b18f13d575d76e694a5df1a063d1dcbcc7ad85b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 May 2024 12:41:26 +0200 +Subject: s390/ipl: Fix incorrect initialization of nvme dump block + +From: Alexander Egorenkov + +[ Upstream commit 7faacaeaf6ce12fae78751de5ad869d8f1e1cd7a ] + +Initialize the correct fields of the nvme dump block. +This bug had not been detected before because first, the fcp and nvme fields +of struct ipl_parameter_block are part of the same union and, therefore, +overlap in memory and second, they are identical in structure and size. + +Fixes: d70e38cb1dee ("s390: nvme dump support") +Reviewed-by: Heiko Carstens +Signed-off-by: Alexander Egorenkov +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/ipl.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c +index 77246ff5b0141..d2ba82873abfd 100644 +--- a/arch/s390/kernel/ipl.c ++++ b/arch/s390/kernel/ipl.c +@@ -1603,9 +1603,9 @@ static int __init dump_nvme_init(void) + } + dump_block_nvme->hdr.len = IPL_BP_NVME_LEN; + dump_block_nvme->hdr.version = IPL_PARM_BLOCK_VERSION; +- dump_block_nvme->fcp.len = IPL_BP0_NVME_LEN; +- dump_block_nvme->fcp.pbt = IPL_PBT_NVME; +- dump_block_nvme->fcp.opt = IPL_PB0_NVME_OPT_DUMP; ++ dump_block_nvme->nvme.len = IPL_BP0_NVME_LEN; ++ dump_block_nvme->nvme.pbt = IPL_PBT_NVME; ++ dump_block_nvme->nvme.opt = IPL_PB0_NVME_OPT_DUMP; + dump_capabilities |= DUMP_TYPE_NVME; + return 0; + } +-- +2.43.0 + diff --git a/queue-5.15/s390-vdso-filter-out-mno-pic-data-is-text-relative-c.patch b/queue-5.15/s390-vdso-filter-out-mno-pic-data-is-text-relative-c.patch new file mode 100644 index 00000000000..7a430f62913 --- /dev/null +++ b/queue-5.15/s390-vdso-filter-out-mno-pic-data-is-text-relative-c.patch @@ -0,0 +1,58 @@ +From aca8226ceea7c863915eeb86ab745076604d7c24 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Jun 2023 15:12:05 +0200 +Subject: s390/vdso: filter out mno-pic-data-is-text-relative cflag + +From: Sumanth Korikkar + +[ Upstream commit d15e4314abec83e4f910659437bc809b0889e3a5 ] + +cmd_vdso_check checks if there are any dynamic relocations in +vdso64.so.dbg. When kernel is compiled with +-mno-pic-data-is-text-relative, R_390_RELATIVE relocs are generated and +this results in kernel build error. + +kpatch uses -mno-pic-data-is-text-relative option when building the +kernel to prevent relative addressing between code and data. The flag +avoids relocation error when klp text and data are too far apart + +kpatch does not patch vdso code and hence the +mno-pic-data-is-text-relative flag is not essential. + +Signed-off-by: Sumanth Korikkar +Acked-by: Ilya Leoshkevich +Signed-off-by: Alexander Gordeev +Stable-dep-of: 10f705253651 ("s390/vdso: Generate unwind information for C modules") +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/vdso32/Makefile | 1 + + arch/s390/kernel/vdso64/Makefile | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile +index cc513add48eb5..1783e4d335136 100644 +--- a/arch/s390/kernel/vdso32/Makefile ++++ b/arch/s390/kernel/vdso32/Makefile +@@ -20,6 +20,7 @@ KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS)) + KBUILD_AFLAGS_32 += -m31 -s + + KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS)) ++KBUILD_CFLAGS_32 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_32)) + KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin + + LDFLAGS_vdso32.so.dbg += -shared -soname=linux-vdso32.so.1 \ +diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile +index 42d918d50a1ff..08e87b083647c 100644 +--- a/arch/s390/kernel/vdso64/Makefile ++++ b/arch/s390/kernel/vdso64/Makefile +@@ -25,6 +25,7 @@ KBUILD_AFLAGS_64 := $(filter-out -m64,$(KBUILD_AFLAGS)) + KBUILD_AFLAGS_64 += -m64 -s + + KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS)) ++KBUILD_CFLAGS_64 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_64)) + KBUILD_CFLAGS_64 += -m64 -fPIC -fno-common -fno-builtin + ldflags-y := -shared -soname=linux-vdso64.so.1 \ + --hash-style=both --build-id=sha1 -T +-- +2.43.0 + diff --git a/queue-5.15/s390-vdso-generate-unwind-information-for-c-modules.patch b/queue-5.15/s390-vdso-generate-unwind-information-for-c-modules.patch new file mode 100644 index 00000000000..aae97d7967b --- /dev/null +++ b/queue-5.15/s390-vdso-generate-unwind-information-for-c-modules.patch @@ -0,0 +1,55 @@ +From f23f9f3bef3227a22cb8b6ace6c5ea101e8412fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Apr 2024 17:02:52 +0200 +Subject: s390/vdso: Generate unwind information for C modules + +From: Jens Remus + +[ Upstream commit 10f70525365146046dddcc3d36bfaea2aee0376a ] + +GDB fails to unwind vDSO functions with error message "PC not saved", +for instance when stepping through gettimeofday(). + +Add -fasynchronous-unwind-tables to CFLAGS to generate .eh_frame +DWARF unwind information for the vDSO C modules. + +Fixes: 4bff8cb54502 ("s390: convert to GENERIC_VDSO") +Signed-off-by: Jens Remus +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/vdso32/Makefile | 3 ++- + arch/s390/kernel/vdso64/Makefile | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile +index 1783e4d335136..66f7b0c8e6117 100644 +--- a/arch/s390/kernel/vdso32/Makefile ++++ b/arch/s390/kernel/vdso32/Makefile +@@ -21,7 +21,8 @@ KBUILD_AFLAGS_32 += -m31 -s + + KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS)) + KBUILD_CFLAGS_32 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_32)) +-KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin ++KBUILD_CFLAGS_32 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_32)) ++KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin -fasynchronous-unwind-tables + + LDFLAGS_vdso32.so.dbg += -shared -soname=linux-vdso32.so.1 \ + --hash-style=both --build-id=sha1 -melf_s390 -T +diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile +index e2e031e4d9243..e520c548d303e 100644 +--- a/arch/s390/kernel/vdso64/Makefile ++++ b/arch/s390/kernel/vdso64/Makefile +@@ -27,7 +27,8 @@ KBUILD_AFLAGS_64 += -m64 -s + KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS)) + KBUILD_CFLAGS_64 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_64)) + KBUILD_CFLAGS_64 := $(filter-out -munaligned-symbols,$(KBUILD_CFLAGS_64)) +-KBUILD_CFLAGS_64 += -m64 -fPIC -fno-common -fno-builtin ++KBUILD_CFLAGS_64 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_64)) ++KBUILD_CFLAGS_64 += -m64 -fPIC -fno-common -fno-builtin -fasynchronous-unwind-tables + ldflags-y := -shared -soname=linux-vdso64.so.1 \ + --hash-style=both --build-id=sha1 -T + +-- +2.43.0 + diff --git a/queue-5.15/s390-vdso-use-standard-stack-frame-layout.patch b/queue-5.15/s390-vdso-use-standard-stack-frame-layout.patch new file mode 100644 index 00000000000..346783d745f --- /dev/null +++ b/queue-5.15/s390-vdso-use-standard-stack-frame-layout.patch @@ -0,0 +1,56 @@ +From 991b6183640528947f6932388c5e0979329b86f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Apr 2024 14:28:43 +0200 +Subject: s390/vdso: Use standard stack frame layout + +From: Heiko Carstens + +[ Upstream commit 185445c7c137822ad856aae91a41e199370cb534 ] + +By default user space is compiled with standard stack frame layout and not +with the packed stack layout. The vdso code however inherited the +-mpacked-stack compiler option from the kernel. Remove this option to make +sure the vdso is compiled with standard stack frame layout. + +This makes sure that the stack frame backchain location for vdso generated +stack frames is the same like for calling code (if compiled with default +options). This allows to manually walk stack frames without DWARF +information, like the kernel is doing it e.g. with arch_stack_walk_user(). + +Fixes: 4bff8cb54502 ("s390: convert to GENERIC_VDSO") +Reviewed-by: Jens Remus +Signed-off-by: Heiko Carstens +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/vdso32/Makefile | 1 + + arch/s390/kernel/vdso64/Makefile | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile +index 66f7b0c8e6117..6056f2ae02632 100644 +--- a/arch/s390/kernel/vdso32/Makefile ++++ b/arch/s390/kernel/vdso32/Makefile +@@ -20,6 +20,7 @@ KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS)) + KBUILD_AFLAGS_32 += -m31 -s + + KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS)) ++KBUILD_CFLAGS_32 := $(filter-out -mpacked-stack,$(KBUILD_CFLAGS)) + KBUILD_CFLAGS_32 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_32)) + KBUILD_CFLAGS_32 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_32)) + KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin -fasynchronous-unwind-tables +diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile +index e520c548d303e..498d56757c4dc 100644 +--- a/arch/s390/kernel/vdso64/Makefile ++++ b/arch/s390/kernel/vdso64/Makefile +@@ -25,6 +25,7 @@ KBUILD_AFLAGS_64 := $(filter-out -m64,$(KBUILD_AFLAGS)) + KBUILD_AFLAGS_64 += -m64 -s + + KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS)) ++KBUILD_CFLAGS_64 := $(filter-out -mpacked-stack,$(KBUILD_CFLAGS_64)) + KBUILD_CFLAGS_64 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_64)) + KBUILD_CFLAGS_64 := $(filter-out -munaligned-symbols,$(KBUILD_CFLAGS_64)) + KBUILD_CFLAGS_64 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_64)) +-- +2.43.0 + diff --git a/queue-5.15/s390-vdso64-filter-out-munaligned-symbols-flag-for-v.patch b/queue-5.15/s390-vdso64-filter-out-munaligned-symbols-flag-for-v.patch new file mode 100644 index 00000000000..f811c11f15f --- /dev/null +++ b/queue-5.15/s390-vdso64-filter-out-munaligned-symbols-flag-for-v.patch @@ -0,0 +1,56 @@ +From b5771731ee3d2b5174053e3c5c144761ca9c74e1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 19 Feb 2024 14:27:31 +0100 +Subject: s390/vdso64: filter out munaligned-symbols flag for vdso + +From: Sumanth Korikkar + +[ Upstream commit 8192a1b3807510d0ed5be1f8988c08f8d41cced9 ] + +Gcc recently implemented an optimization [1] for loading symbols without +explicit alignment, aligning with the IBM Z ELF ABI. This ABI mandates +symbols to reside on a 2-byte boundary, enabling the use of the larl +instruction. However, kernel linker scripts may still generate unaligned +symbols. To address this, a new -munaligned-symbols option has been +introduced [2] in recent gcc versions. + +[1] https://gcc.gnu.org/pipermail/gcc-patches/2023-June/622872.html +[2] https://gcc.gnu.org/pipermail/gcc-patches/2023-August/625986.html + +However, when -munaligned-symbols is used in vdso code, it leads to the +following compilation error: +`.data.rel.ro.local' referenced in section `.text' of +arch/s390/kernel/vdso64/vdso64_generic.o: defined in discarded section +`.data.rel.ro.local' of arch/s390/kernel/vdso64/vdso64_generic.o + +vdso linker script discards .data section to make it lightweight. +However, -munaligned-symbols in vdso object files references literal +pool and accesses _vdso_data. Hence, compile vdso code without +-munaligned-symbols. This means in the future, vdso code should deal +with alignment of newly introduced unaligned linker symbols. + +Acked-by: Vasily Gorbik +Signed-off-by: Sumanth Korikkar +Link: https://lore.kernel.org/r/20240219132734.22881-2-sumanthk@linux.ibm.com +Signed-off-by: Heiko Carstens +Stable-dep-of: 10f705253651 ("s390/vdso: Generate unwind information for C modules") +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/vdso64/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile +index 08e87b083647c..e2e031e4d9243 100644 +--- a/arch/s390/kernel/vdso64/Makefile ++++ b/arch/s390/kernel/vdso64/Makefile +@@ -26,6 +26,7 @@ KBUILD_AFLAGS_64 += -m64 -s + + KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS)) + KBUILD_CFLAGS_64 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_64)) ++KBUILD_CFLAGS_64 := $(filter-out -munaligned-symbols,$(KBUILD_CFLAGS_64)) + KBUILD_CFLAGS_64 += -m64 -fPIC -fno-common -fno-builtin + ldflags-y := -shared -soname=linux-vdso64.so.1 \ + --hash-style=both --build-id=sha1 -T +-- +2.43.0 + diff --git a/queue-5.15/serial-max3100-fix-bitwise-types.patch b/queue-5.15/serial-max3100-fix-bitwise-types.patch new file mode 100644 index 00000000000..74f0e8ceb89 --- /dev/null +++ b/queue-5.15/serial-max3100-fix-bitwise-types.patch @@ -0,0 +1,53 @@ +From c2f0f5810ae22e11e6c9c51b19a7aeb5bfefd5a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Apr 2024 22:50:30 +0300 +Subject: serial: max3100: Fix bitwise types + +From: Andy Shevchenko + +[ Upstream commit e60955dbecb97f080848a57524827e2db29c70fd ] + +Sparse is not happy about misuse of bitwise types: + + .../max3100.c:194:13: warning: incorrect type in assignment (different base types) + .../max3100.c:194:13: expected unsigned short [addressable] [usertype] etx + .../max3100.c:194:13: got restricted __be16 [usertype] + .../max3100.c:202:15: warning: cast to restricted __be16 + +Fix this by choosing proper types for the respective variables. + +Fixes: 7831d56b0a35 ("tty: MAX3100") +Signed-off-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20240402195306.269276-4-andriy.shevchenko@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/max3100.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c +index 24cd345ea6e3d..8290ab72c05a3 100644 +--- a/drivers/tty/serial/max3100.c ++++ b/drivers/tty/serial/max3100.c +@@ -45,6 +45,9 @@ + #include + #include + #include ++#include ++ ++#include + + #include + +@@ -191,7 +194,7 @@ static void max3100_timeout(struct timer_list *t) + static int max3100_sr(struct max3100_port *s, u16 tx, u16 *rx) + { + struct spi_message message; +- u16 etx, erx; ++ __be16 etx, erx; + int status; + struct spi_transfer tran = { + .tx_buf = &etx, +-- +2.43.0 + diff --git a/queue-5.15/serial-max3100-lock-port-lock-when-calling-uart_hand.patch b/queue-5.15/serial-max3100-lock-port-lock-when-calling-uart_hand.patch new file mode 100644 index 00000000000..f1b2fbdabbd --- /dev/null +++ b/queue-5.15/serial-max3100-lock-port-lock-when-calling-uart_hand.patch @@ -0,0 +1,66 @@ +From 3352d38c95bf7e2f70597a68f6d55e20507d3354 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Apr 2024 22:50:28 +0300 +Subject: serial: max3100: Lock port->lock when calling + uart_handle_cts_change() + +From: Andy Shevchenko + +[ Upstream commit 77ab53371a2066fdf9b895246505f5ef5a4b5d47 ] + +uart_handle_cts_change() has to be called with port lock taken, +Since we run it in a separate work, the lock may not be taken at +the time of running. Make sure that it's taken by explicitly doing +that. Without it we got a splat: + + WARNING: CPU: 0 PID: 10 at drivers/tty/serial/serial_core.c:3491 uart_handle_cts_change+0xa6/0xb0 + ... + Workqueue: max3100-0 max3100_work [max3100] + RIP: 0010:uart_handle_cts_change+0xa6/0xb0 + ... + max3100_handlerx+0xc5/0x110 [max3100] + max3100_work+0x12a/0x340 [max3100] + +Fixes: 7831d56b0a35 ("tty: MAX3100") +Signed-off-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20240402195306.269276-2-andriy.shevchenko@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/max3100.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c +index 3c92d4e014887..b3b77ffd5b423 100644 +--- a/drivers/tty/serial/max3100.c ++++ b/drivers/tty/serial/max3100.c +@@ -213,7 +213,7 @@ static int max3100_sr(struct max3100_port *s, u16 tx, u16 *rx) + return 0; + } + +-static int max3100_handlerx(struct max3100_port *s, u16 rx) ++static int max3100_handlerx_unlocked(struct max3100_port *s, u16 rx) + { + unsigned int ch, flg, status = 0; + int ret = 0, cts; +@@ -253,6 +253,17 @@ static int max3100_handlerx(struct max3100_port *s, u16 rx) + return ret; + } + ++static int max3100_handlerx(struct max3100_port *s, u16 rx) ++{ ++ unsigned long flags; ++ int ret; ++ ++ uart_port_lock_irqsave(&s->port, &flags); ++ ret = max3100_handlerx_unlocked(s, rx); ++ uart_port_unlock_irqrestore(&s->port, flags); ++ return ret; ++} ++ + static void max3100_work(struct work_struct *w) + { + struct max3100_port *s = container_of(w, struct max3100_port, work); +-- +2.43.0 + diff --git a/queue-5.15/serial-max3100-update-uart_driver_registered-on-driv.patch b/queue-5.15/serial-max3100-update-uart_driver_registered-on-driv.patch new file mode 100644 index 00000000000..9e34db1badf --- /dev/null +++ b/queue-5.15/serial-max3100-update-uart_driver_registered-on-driv.patch @@ -0,0 +1,73 @@ +From 0e4340345b185a41a11e3e4adbbadcc370297c32 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Apr 2024 22:50:29 +0300 +Subject: serial: max3100: Update uart_driver_registered on driver removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Andy Shevchenko + +[ Upstream commit 712a1fcb38dc7cac6da63ee79a88708fbf9c45ec ] + +The removal of the last MAX3100 device triggers the removal of +the driver. However, code doesn't update the respective global +variable and after insmod — rmmod — insmod cycle the kernel +oopses: + + max3100 spi-PRP0001:01: max3100_probe: adding port 0 + BUG: kernel NULL pointer dereference, address: 0000000000000408 + ... + RIP: 0010:serial_core_register_port+0xa0/0x840 + ... + max3100_probe+0x1b6/0x280 [max3100] + spi_probe+0x8d/0xb0 + +Update the actual state so next time UART driver will be registered +again. + +Hugo also noticed, that the error path in the probe also affected +by having the variable set, and not cleared. Instead of clearing it +move the assignment after the successfull uart_register_driver() call. + +Fixes: 7831d56b0a35 ("tty: MAX3100") +Signed-off-by: Andy Shevchenko +Reviewed-by: Hugo Villeneuve +Link: https://lore.kernel.org/r/20240402195306.269276-3-andriy.shevchenko@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/max3100.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c +index b3b77ffd5b423..24cd345ea6e3d 100644 +--- a/drivers/tty/serial/max3100.c ++++ b/drivers/tty/serial/max3100.c +@@ -751,13 +751,14 @@ static int max3100_probe(struct spi_device *spi) + mutex_lock(&max3100s_lock); + + if (!uart_driver_registered) { +- uart_driver_registered = 1; + retval = uart_register_driver(&max3100_uart_driver); + if (retval) { + printk(KERN_ERR "Couldn't register max3100 uart driver\n"); + mutex_unlock(&max3100s_lock); + return retval; + } ++ ++ uart_driver_registered = 1; + } + + for (i = 0; i < MAX_MAX3100; i++) +@@ -843,6 +844,7 @@ static int max3100_remove(struct spi_device *spi) + } + pr_debug("removing max3100 driver\n"); + uart_unregister_driver(&max3100_uart_driver); ++ uart_driver_registered = 0; + + mutex_unlock(&max3100s_lock); + return 0; +-- +2.43.0 + diff --git a/queue-5.15/serial-sc16is7xx-add-proper-sched.h-include-for-sche.patch b/queue-5.15/serial-sc16is7xx-add-proper-sched.h-include-for-sche.patch new file mode 100644 index 00000000000..b3879495eff --- /dev/null +++ b/queue-5.15/serial-sc16is7xx-add-proper-sched.h-include-for-sche.patch @@ -0,0 +1,44 @@ +From 9ee02fe572adcd15af0289c5795e15eb868192d1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Apr 2024 11:42:49 -0400 +Subject: serial: sc16is7xx: add proper sched.h include for sched_set_fifo() + +From: Hugo Villeneuve + +[ Upstream commit 2a8e4ab0c93fad30769479f86849e22d63cd0e12 ] + +Replace incorrect include with the proper one for sched_set_fifo() +declaration. + +Fixes: 28d2f209cd16 ("sched,serial: Convert to sched_set_fifo()") +Signed-off-by: Hugo Villeneuve +Link: https://lore.kernel.org/r/20240409154253.3043822-2-hugo@hugovil.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/sc16is7xx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c +index 0066a0e235164..35f8675db1d89 100644 +--- a/drivers/tty/serial/sc16is7xx.c ++++ b/drivers/tty/serial/sc16is7xx.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -25,7 +26,6 @@ + #include + #include + #include +-#include + + #define SC16IS7XX_NAME "sc16is7xx" + #define SC16IS7XX_MAX_DEVS 8 +-- +2.43.0 + diff --git a/queue-5.15/serial-sh-sci-protect-invalidating-rxdma-on-shutdown.patch b/queue-5.15/serial-sh-sci-protect-invalidating-rxdma-on-shutdown.patch new file mode 100644 index 00000000000..293caee54b7 --- /dev/null +++ b/queue-5.15/serial-sh-sci-protect-invalidating-rxdma-on-shutdown.patch @@ -0,0 +1,47 @@ +From 7c62d5910530ee673a72267220ed1546622173a4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 May 2024 13:40:17 +0200 +Subject: serial: sh-sci: protect invalidating RXDMA on shutdown + +From: Wolfram Sang + +[ Upstream commit aae20f6e34cd0cbd67a1d0e5877561c40109a81b ] + +The to-be-fixed commit removed locking when invalidating the DMA RX +descriptors on shutdown. It overlooked that there is still a rx_timer +running which may still access the protected data. So, re-add the +locking. + +Reported-by: Dirk Behme +Closes: https://lore.kernel.org/r/ee6c9e16-9f29-450e-81da-4a8dceaa8fc7@de.bosch.com +Fixes: 2c4ee23530ff ("serial: sh-sci: Postpone DMA release when falling back to PIO") +Signed-off-by: Wolfram Sang +Link: https://lore.kernel.org/r/20240506114016.30498-7-wsa+renesas@sang-engineering.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/sh-sci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c +index 25318176091b2..6cd7bd7b6782d 100644 +--- a/drivers/tty/serial/sh-sci.c ++++ b/drivers/tty/serial/sh-sci.c +@@ -1255,9 +1255,14 @@ static void sci_dma_rx_chan_invalidate(struct sci_port *s) + static void sci_dma_rx_release(struct sci_port *s) + { + struct dma_chan *chan = s->chan_rx_saved; ++ struct uart_port *port = &s->port; ++ unsigned long flags; + ++ uart_port_lock_irqsave(port, &flags); + s->chan_rx_saved = NULL; + sci_dma_rx_chan_invalidate(s); ++ uart_port_unlock_irqrestore(port, flags); ++ + dmaengine_terminate_sync(chan); + dma_free_coherent(chan->device->dev, s->buf_len_rx * 2, s->rx_buf[0], + sg_dma_address(&s->sg_rx[0])); +-- +2.43.0 + diff --git a/queue-5.15/series b/queue-5.15/series index c43d531b990..a2ceaa2acf9 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -175,3 +175,72 @@ netrom-fix-possible-dead-lock-in-nr_rt_ioctl.patch af_packet-do-not-call-packet_read_pending-from-tpack.patch sched-fair-allow-disabling-sched_balance_newidle-wit.patch sched-core-fix-incorrect-initialization-of-the-burst.patch +perf-record-delete-session-after-stopping-sideband-t.patch +perf-probe-add-missing-libgen.h-header-needed-for-us.patch +greybus-lights-check-return-of-get_channel_from_mode.patch +f2fs-delete-f2fs_copy_page-and-replace-with-memcpy_p.patch +f2fs-fix-to-wait-on-page-writeback-in-__clone_blkadd.patch +perf-annotate-get-rid-of-duplicate-group-option-item.patch +soundwire-cadence-fix-invalid-pdi-offset.patch +dmaengine-idma64-add-check-for-dma_set_max_seg_size.patch +firmware-dmi-id-add-a-release-callback-function.patch +serial-max3100-lock-port-lock-when-calling-uart_hand.patch +serial-max3100-update-uart_driver_registered-on-driv.patch +serial-max3100-fix-bitwise-types.patch +greybus-arche-ctrl-move-device-table-to-its-right-lo.patch +pci-tegra194-fix-probe-path-for-endpoint-mode.patch +serial-sc16is7xx-add-proper-sched.h-include-for-sche.patch +dt-bindings-pci-rcar-pci-host-add-optional-regulator.patch +dt-bindings-pci-rcar-pci-host-add-missing-iommu-prop.patch +f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch +f2fs-convert-to-use-sbi-directly.patch +f2fs-compress-fix-to-relocate-check-condition-in-f2f.patch-5887 +f2fs-do-not-allow-partial-truncation-on-pinned-file.patch +f2fs-fix-typos-in-comments.patch +f2fs-fix-to-relocate-check-condition-in-f2fs_falloca.patch +f2fs-fix-to-check-pinfile-flag-in-f2fs_move_file_ran.patch +coresight-etm4x-fix-unbalanced-pm_runtime_enable.patch +perf-docs-document-bpf-event-modifier.patch +iio-pressure-dps310-support-negative-temperature-val.patch +coresight-etm4x-do-not-hardcode-iomem-access-for-reg.patch +coresight-etm4x-do-not-save-restore-data-trace-contr.patch +coresight-no-op-refactor-to-make-instp0-check-more-i.patch +coresight-etm4x-cleanup-trcidr0-register-accesses.patch +coresight-etm4x-safe-access-for-trcqcltr.patch +coresight-etm4x-fix-access-to-resource-selector-regi.patch +fpga-region-use-standard-dev_release-for-class-drive.patch +fpga-region-add-owner-module-and-take-its-refcount.patch +microblaze-remove-gcc-flag-for-non-existing-early_pr.patch +microblaze-remove-early-printk-call-from-cpuinfo-sta.patch +perf-intel-pt-fix-unassigned-instruction-op-discover.patch +ovl-remove-upper-umask-handling-from-ovl_create_uppe.patch +dt-bindings-pinctrl-mediatek-mt7622-fix-array-proper.patch +watchdog-bd9576_wdt-switch-to-using-devm_fwnode_gpio.patch +watchdog-bd9576-drop-always-running-property.patch +usb-gadget-u_audio-clear-uac-pointer-when-freed.patch +stm-class-fix-a-double-free-in-stm_register_device.patch +ppdev-remove-usage-of-the-deprecated-ida_simple_xx-a.patch +ppdev-add-an-error-check-in-register_device.patch +perf-bench-internals-inject-build-id-fix-trap-divide.patch +perf-top-fix-tui-exit-screen-refresh-race-condition.patch +perf-ui-update-use-of-pthread-mutex.patch +perf-ui-browser-don-t-save-pointer-to-stack-memory.patch +extcon-max8997-select-irq_domain-instead-of-dependin.patch +pci-edr-align-edr_port_dpc_enable_dsm-with-pci-firmw.patch +pci-edr-align-edr_port_locate_dsm-with-pci-firmware-.patch +perf-ui-browser-avoid-segv-on-title.patch +perf-report-avoid-segv-in-report__setup_sample_type.patch +f2fs-compress-fix-to-cover-reserve-release-_compress.patch +f2fs-fix-to-release-node-block-count-in-error-path-o.patch +f2fs-compress-don-t-allow-unaligned-truncation-on-re.patch +serial-sh-sci-protect-invalidating-rxdma-on-shutdown.patch +libsubcmd-fix-parse-options-memory-leak.patch +perf-daemon-fix-file-leak-in-daemon_session__control.patch +perf-stat-don-t-display-metric-header-for-non-leader.patch +s390-vdso-filter-out-mno-pic-data-is-text-relative-c.patch +s390-vdso64-filter-out-munaligned-symbols-flag-for-v.patch +s390-vdso-generate-unwind-information-for-c-modules.patch +s390-vdso-use-standard-stack-frame-layout.patch +s390-ipl-fix-incorrect-initialization-of-len-fields-.patch +s390-ipl-fix-incorrect-initialization-of-nvme-dump-b.patch +s390-boot-remove-alt_stfle_fac_list-from-decompresso.patch diff --git a/queue-5.15/soundwire-cadence-fix-invalid-pdi-offset.patch b/queue-5.15/soundwire-cadence-fix-invalid-pdi-offset.patch new file mode 100644 index 00000000000..aeaf861188a --- /dev/null +++ b/queue-5.15/soundwire-cadence-fix-invalid-pdi-offset.patch @@ -0,0 +1,48 @@ +From 1add9e152227b09db390240a5f7be1dc52fc5758 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Mar 2024 09:01:16 +0000 +Subject: soundwire: cadence: fix invalid PDI offset + +From: Pierre-Louis Bossart + +[ Upstream commit 8ee1b439b1540ae543149b15a2a61b9dff937d91 ] + +For some reason, we add an offset to the PDI, presumably to skip the +PDI0 and PDI1 which are reserved for BPT. + +This code is however completely wrong and leads to an out-of-bounds +access. We were just lucky so far since we used only a couple of PDIs +and remained within the PDI array bounds. + +A Fixes: tag is not provided since there are no known platforms where +the out-of-bounds would be accessed, and the initial code had problems +as well. + +A follow-up patch completely removes this useless offset. + +Signed-off-by: Pierre-Louis Bossart +Reviewed-by: Rander Wang +Signed-off-by: Bard Liao +Link: https://lore.kernel.org/r/20240326090122.1051806-2-yung-chuan.liao@linux.intel.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/soundwire/cadence_master.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c +index 7b340f3832133..fb37e14404ec8 100644 +--- a/drivers/soundwire/cadence_master.c ++++ b/drivers/soundwire/cadence_master.c +@@ -1830,7 +1830,7 @@ struct sdw_cdns_pdi *sdw_cdns_alloc_pdi(struct sdw_cdns *cdns, + + /* check if we found a PDI, else find in bi-directional */ + if (!pdi) +- pdi = cdns_find_pdi(cdns, 2, stream->num_bd, stream->bd, ++ pdi = cdns_find_pdi(cdns, 0, stream->num_bd, stream->bd, + dai_id); + + if (pdi) { +-- +2.43.0 + diff --git a/queue-5.15/stm-class-fix-a-double-free-in-stm_register_device.patch b/queue-5.15/stm-class-fix-a-double-free-in-stm_register_device.patch new file mode 100644 index 00000000000..a0c81d40a0d --- /dev/null +++ b/queue-5.15/stm-class-fix-a-double-free-in-stm_register_device.patch @@ -0,0 +1,57 @@ +From 3f958a7b592acbea42f47691657bdedfb1233f0f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Apr 2024 16:01:05 +0300 +Subject: stm class: Fix a double free in stm_register_device() + +From: Dan Carpenter + +[ Upstream commit 3df463865ba42b8f88a590326f4c9ea17a1ce459 ] + +The put_device(&stm->dev) call will trigger stm_device_release() which +frees "stm" so the vfree(stm) on the next line is a double free. + +Fixes: 389b6699a2aa ("stm class: Fix stm device initialization order") +Signed-off-by: Dan Carpenter +Reviewed-by: Amelie Delaunay +Reviewed-by: Andy Shevchenko +Signed-off-by: Alexander Shishkin +Link: https://lore.kernel.org/r/20240429130119.1518073-2-alexander.shishkin@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/hwtracing/stm/core.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c +index 2712e699ba08c..ae9ea3a1fa2aa 100644 +--- a/drivers/hwtracing/stm/core.c ++++ b/drivers/hwtracing/stm/core.c +@@ -868,8 +868,11 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, + return -ENOMEM; + + stm->major = register_chrdev(0, stm_data->name, &stm_fops); +- if (stm->major < 0) +- goto err_free; ++ if (stm->major < 0) { ++ err = stm->major; ++ vfree(stm); ++ return err; ++ } + + device_initialize(&stm->dev); + stm->dev.devt = MKDEV(stm->major, 0); +@@ -913,10 +916,8 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, + err_device: + unregister_chrdev(stm->major, stm_data->name); + +- /* matches device_initialize() above */ ++ /* calls stm_device_release() */ + put_device(&stm->dev); +-err_free: +- vfree(stm); + + return err; + } +-- +2.43.0 + diff --git a/queue-5.15/usb-gadget-u_audio-clear-uac-pointer-when-freed.patch b/queue-5.15/usb-gadget-u_audio-clear-uac-pointer-when-freed.patch new file mode 100644 index 00000000000..f980c0708a0 --- /dev/null +++ b/queue-5.15/usb-gadget-u_audio-clear-uac-pointer-when-freed.patch @@ -0,0 +1,40 @@ +From b54bde6e3a0be59933ffc5aec0b943134d9d3094 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Apr 2024 15:20:20 +0000 +Subject: usb: gadget: u_audio: Clear uac pointer when freed. + +From: Chris Wulff + +[ Upstream commit a2cf936ebef291ef7395172b9e2f624779fb6dc0 ] + +This prevents use of a stale pointer if functions are called after +g_cleanup that shouldn't be. This doesn't fix any races, but converts +a possibly silent kernel memory corruption into an obvious NULL pointer +dereference report. + +Fixes: eb9fecb9e69b ("usb: gadget: f_uac2: split out audio core") +Signed-off-by: Chris Wulff +Link: https://lore.kernel.org/stable/CO1PR17MB54194226DA08BFC9EBD8C163E1172%40CO1PR17MB5419.namprd17.prod.outlook.com +Link: https://lore.kernel.org/r/CO1PR17MB54194226DA08BFC9EBD8C163E1172@CO1PR17MB5419.namprd17.prod.outlook.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/u_audio.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c +index 200eb788a74b3..5e34a7ff1b63d 100644 +--- a/drivers/usb/gadget/function/u_audio.c ++++ b/drivers/usb/gadget/function/u_audio.c +@@ -1172,6 +1172,8 @@ void g_audio_cleanup(struct g_audio *g_audio) + return; + + uac = g_audio->uac; ++ g_audio->uac = NULL; ++ + card = uac->card; + if (card) + snd_card_free_when_closed(card); +-- +2.43.0 + diff --git a/queue-5.15/watchdog-bd9576-drop-always-running-property.patch b/queue-5.15/watchdog-bd9576-drop-always-running-property.patch new file mode 100644 index 00000000000..4d3ffcbf7e9 --- /dev/null +++ b/queue-5.15/watchdog-bd9576-drop-always-running-property.patch @@ -0,0 +1,84 @@ +From b84b435fde75ac6d70e010a37915d837a66eccfc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Apr 2024 13:02:31 +0300 +Subject: watchdog: bd9576: Drop "always-running" property + +From: Matti Vaittinen + +[ Upstream commit e3b3afd34d84efcbe4543deb966b1990f43584b8 ] + +The always-running (from linux,wdt-gpio.yaml) is abused by the BD9576 +watchdog driver. It's defined meaning is "the watchdog is always running +and can not be stopped". The BD9576 watchdog driver has implemented it +as "start watchdog when loading the module and prevent it from being +stopped". + +Furthermore, the implementation does not set the WDOG_HW_RUNNING when +enabling the watchdog due to the "always-running" at module loading. +This will end up resulting a watchdog timeout if the device is not +opened. + +The culprit was pointed out by Guenter, discussion can be found from +https://lore.kernel.org/lkml/4fa3a64b-60fb-4e5e-8785-0f14da37eea2@roeck-us.net/ + +Drop the invalid "always-running" handling. + +Signed-off-by: Matti Vaittinen +Reported-by: Guenter Roeck +Fixes: b237bcac557a ("wdt: Support wdt on ROHM BD9576MUF and BD9573MUF") +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/ZhPAt76yaJMersXf@fedora +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/bd9576_wdt.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/drivers/watchdog/bd9576_wdt.c b/drivers/watchdog/bd9576_wdt.c +index 4a20e07fbb699..f00ea1b4e40b6 100644 +--- a/drivers/watchdog/bd9576_wdt.c ++++ b/drivers/watchdog/bd9576_wdt.c +@@ -29,7 +29,6 @@ struct bd9576_wdt_priv { + struct gpio_desc *gpiod_en; + struct device *dev; + struct regmap *regmap; +- bool always_running; + struct watchdog_device wdd; + }; + +@@ -62,10 +61,7 @@ static int bd9576_wdt_stop(struct watchdog_device *wdd) + { + struct bd9576_wdt_priv *priv = watchdog_get_drvdata(wdd); + +- if (!priv->always_running) +- bd9576_wdt_disable(priv); +- else +- set_bit(WDOG_HW_RUNNING, &wdd->status); ++ bd9576_wdt_disable(priv); + + return 0; + } +@@ -264,9 +260,6 @@ static int bd9576_wdt_probe(struct platform_device *pdev) + if (ret) + return ret; + +- priv->always_running = device_property_read_bool(dev->parent, +- "always-running"); +- + watchdog_set_drvdata(&priv->wdd, priv); + + priv->wdd.info = &bd957x_wdt_ident; +@@ -281,9 +274,6 @@ static int bd9576_wdt_probe(struct platform_device *pdev) + + watchdog_stop_on_reboot(&priv->wdd); + +- if (priv->always_running) +- bd9576_wdt_start(&priv->wdd); +- + return devm_watchdog_register_device(dev, &priv->wdd); + } + +-- +2.43.0 + diff --git a/queue-5.15/watchdog-bd9576_wdt-switch-to-using-devm_fwnode_gpio.patch b/queue-5.15/watchdog-bd9576_wdt-switch-to-using-devm_fwnode_gpio.patch new file mode 100644 index 00000000000..55f36a092d9 --- /dev/null +++ b/queue-5.15/watchdog-bd9576_wdt-switch-to-using-devm_fwnode_gpio.patch @@ -0,0 +1,127 @@ +From 79030963e7d438bb118eee401677ace65d128f01 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 4 Sep 2022 23:31:02 -0700 +Subject: watchdog: bd9576_wdt: switch to using devm_fwnode_gpiod_get() + +From: Dmitry Torokhov + +[ Upstream commit 4f719022a753bb15720c9ddeb0387a93caa372ce ] + +I would like to stop exporting OF-specific devm_gpiod_get_from_of_node() +so that gpiolib can be cleaned a bit, so let's switch to the generic +fwnode property API. + +While at it, switch the rest of the calls to read properties in +bd9576_wdt_probe() to the generic device property API as well. + +Signed-off-by: Dmitry Torokhov +Reviewed-by: Guenter Roeck +Reviewed-by: Linus Walleij +Link: https://lore.kernel.org/r/20220903-gpiod_get_from_of_node-remove-v1-10-b29adfb27a6c@gmail.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Stable-dep-of: e3b3afd34d84 ("watchdog: bd9576: Drop "always-running" property") +Signed-off-by: Sasha Levin +--- + drivers/watchdog/bd9576_wdt.c | 51 +++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 20 deletions(-) + +diff --git a/drivers/watchdog/bd9576_wdt.c b/drivers/watchdog/bd9576_wdt.c +index 0b6999f3b6e83..4a20e07fbb699 100644 +--- a/drivers/watchdog/bd9576_wdt.c ++++ b/drivers/watchdog/bd9576_wdt.c +@@ -9,8 +9,8 @@ + #include + #include + #include +-#include + #include ++#include + #include + #include + +@@ -202,10 +202,10 @@ static int bd957x_set_wdt_mode(struct bd9576_wdt_priv *priv, int hw_margin, + static int bd9576_wdt_probe(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; +- struct device_node *np = dev->parent->of_node; + struct bd9576_wdt_priv *priv; + u32 hw_margin[2]; + u32 hw_margin_max = BD957X_WDT_DEFAULT_MARGIN, hw_margin_min = 0; ++ int count; + int ret; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); +@@ -221,40 +221,51 @@ static int bd9576_wdt_probe(struct platform_device *pdev) + return -ENODEV; + } + +- priv->gpiod_en = devm_gpiod_get_from_of_node(dev, dev->parent->of_node, +- "rohm,watchdog-enable-gpios", +- 0, GPIOD_OUT_LOW, +- "watchdog-enable"); ++ priv->gpiod_en = devm_fwnode_gpiod_get(dev, dev_fwnode(dev->parent), ++ "rohm,watchdog-enable", ++ GPIOD_OUT_LOW, ++ "watchdog-enable"); + if (IS_ERR(priv->gpiod_en)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_en), + "getting watchdog-enable GPIO failed\n"); + +- priv->gpiod_ping = devm_gpiod_get_from_of_node(dev, dev->parent->of_node, +- "rohm,watchdog-ping-gpios", +- 0, GPIOD_OUT_LOW, +- "watchdog-ping"); ++ priv->gpiod_ping = devm_fwnode_gpiod_get(dev, dev_fwnode(dev->parent), ++ "rohm,watchdog-ping", ++ GPIOD_OUT_LOW, ++ "watchdog-ping"); + if (IS_ERR(priv->gpiod_ping)) + return dev_err_probe(dev, PTR_ERR(priv->gpiod_ping), + "getting watchdog-ping GPIO failed\n"); + +- ret = of_property_read_variable_u32_array(np, "rohm,hw-timeout-ms", +- &hw_margin[0], 1, 2); +- if (ret < 0 && ret != -EINVAL) +- return ret; ++ count = device_property_count_u32(dev->parent, "rohm,hw-timeout-ms"); ++ if (count < 0 && count != -EINVAL) ++ return count; ++ ++ if (count > 0) { ++ if (count > ARRAY_SIZE(hw_margin)) ++ return -EINVAL; + +- if (ret == 1) +- hw_margin_max = hw_margin[0]; ++ ret = device_property_read_u32_array(dev->parent, ++ "rohm,hw-timeout-ms", ++ hw_margin, count); ++ if (ret < 0) ++ return ret; + +- if (ret == 2) { +- hw_margin_max = hw_margin[1]; +- hw_margin_min = hw_margin[0]; ++ if (count == 1) ++ hw_margin_max = hw_margin[0]; ++ ++ if (count == 2) { ++ hw_margin_max = hw_margin[1]; ++ hw_margin_min = hw_margin[0]; ++ } + } + + ret = bd957x_set_wdt_mode(priv, hw_margin_max, hw_margin_min); + if (ret) + return ret; + +- priv->always_running = of_property_read_bool(np, "always-running"); ++ priv->always_running = device_property_read_bool(dev->parent, ++ "always-running"); + + watchdog_set_drvdata(&priv->wdd, priv); + +-- +2.43.0 + -- 2.47.3