From 635b0e6b5b24fc1567f673fd5e92c409ad4eb81b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 13 May 2023 15:53:15 +0900 Subject: [PATCH] 5.4-stable patches added patches: arm-dts-exynos-fix-wm8960-clock-name-in-itop-elite.patch arm-dts-s5pv210-correct-mipi-csis-clock-name.patch btrfs-don-t-free-qgroup-space-unless-specified.patch btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch drm-panel-otm8009a-set-backlight-parent-to-panel-device.patch f2fs-fix-potential-corruption-when-moving-a-directory.patch inotify-avoid-reporting-event-with-invalid-wd.patch platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch remoteproc-st-call-of_node_put-on-iteration-error.patch remoteproc-stm32-call-of_node_put-on-iteration-error.patch sh-init-use-of_early_flattree-for-early-init.patch sh-math-emu-fix-macro-redefined-warning.patch sh-nmi_debug-fix-return-value-of-__setup-handler.patch --- ...-fix-wm8960-clock-name-in-itop-elite.patch | 32 +++++ ...s5pv210-correct-mipi-csis-clock-name.patch | 32 +++++ ...t-free-qgroup-space-unless-specified.patch | 87 +++++++++++ ...eaf-to-not-return-the-same-key-twice.patch | 136 ++++++++++++++++++ ...ytenr-must-be-aligned-to-sector-size.patch | 42 ++++++ ...-length-type-in-smb2_copychunk_range.patch | 34 +++++ ...set-backlight-parent-to-panel-device.patch | 37 +++++ ...l-corruption-when-moving-a-directory.patch | 65 +++++++++ ...void-reporting-event-with-invalid-wd.patch | 61 ++++++++ ...-return-incorrect-build_id-size-in-e.patch | 9 +- ...i-add-info-for-the-dexp-ursus-kx210i.patch | 61 ++++++++ ...k-for-gdix1002-ts-on-the-juno-tablet.patch | 54 +++++++ ...-call-of_node_put-on-iteration-error.patch | 46 ++++++ ...-call-of_node_put-on-iteration-error.patch | 52 +++++++ queue-5.4/series | 16 +++ ...use-of_early_flattree-for-early-init.patch | 89 ++++++++++++ ...math-emu-fix-macro-redefined-warning.patch | 47 ++++++ ...-fix-return-value-of-__setup-handler.patch | 53 +++++++ 18 files changed, 946 insertions(+), 7 deletions(-) create mode 100644 queue-5.4/arm-dts-exynos-fix-wm8960-clock-name-in-itop-elite.patch create mode 100644 queue-5.4/arm-dts-s5pv210-correct-mipi-csis-clock-name.patch create mode 100644 queue-5.4/btrfs-don-t-free-qgroup-space-unless-specified.patch create mode 100644 queue-5.4/btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch create mode 100644 queue-5.4/btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch create mode 100644 queue-5.4/cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch create mode 100644 queue-5.4/drm-panel-otm8009a-set-backlight-parent-to-panel-device.patch create mode 100644 queue-5.4/f2fs-fix-potential-corruption-when-moving-a-directory.patch create mode 100644 queue-5.4/inotify-avoid-reporting-event-with-invalid-wd.patch create mode 100644 queue-5.4/platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch create mode 100644 queue-5.4/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch create mode 100644 queue-5.4/remoteproc-st-call-of_node_put-on-iteration-error.patch create mode 100644 queue-5.4/remoteproc-stm32-call-of_node_put-on-iteration-error.patch create mode 100644 queue-5.4/sh-init-use-of_early_flattree-for-early-init.patch create mode 100644 queue-5.4/sh-math-emu-fix-macro-redefined-warning.patch create mode 100644 queue-5.4/sh-nmi_debug-fix-return-value-of-__setup-handler.patch diff --git a/queue-5.4/arm-dts-exynos-fix-wm8960-clock-name-in-itop-elite.patch b/queue-5.4/arm-dts-exynos-fix-wm8960-clock-name-in-itop-elite.patch new file mode 100644 index 00000000000..18a5c877499 --- /dev/null +++ b/queue-5.4/arm-dts-exynos-fix-wm8960-clock-name-in-itop-elite.patch @@ -0,0 +1,32 @@ +From 6c950c20da38debf1ed531e0b972bd8b53d1c11f Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Fri, 17 Feb 2023 16:06:27 +0100 +Subject: ARM: dts: exynos: fix WM8960 clock name in Itop Elite + +From: Krzysztof Kozlowski + +commit 6c950c20da38debf1ed531e0b972bd8b53d1c11f upstream. + +The WM8960 Linux driver expects the clock to be named "mclk". Otherwise +the clock will be ignored and not prepared/enabled by the driver. + +Cc: +Fixes: 339b2fb36a67 ("ARM: dts: exynos: Add TOPEET itop elite based board") +Link: https://lore.kernel.org/r/20230217150627.779764-3-krzysztof.kozlowski@linaro.org +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/exynos4412-itop-elite.dts ++++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts +@@ -179,7 +179,7 @@ + compatible = "wlf,wm8960"; + reg = <0x1a>; + clocks = <&pmu_system_controller 0>; +- clock-names = "MCLK1"; ++ clock-names = "mclk"; + wlf,shared-lrclk; + #sound-dai-cells = <0>; + }; diff --git a/queue-5.4/arm-dts-s5pv210-correct-mipi-csis-clock-name.patch b/queue-5.4/arm-dts-s5pv210-correct-mipi-csis-clock-name.patch new file mode 100644 index 00000000000..c9a059115ba --- /dev/null +++ b/queue-5.4/arm-dts-s5pv210-correct-mipi-csis-clock-name.patch @@ -0,0 +1,32 @@ +From 665b9459bb53b8f19bd1541567e1fe9782c83c4b Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Sun, 12 Feb 2023 19:58:18 +0100 +Subject: ARM: dts: s5pv210: correct MIPI CSIS clock name + +From: Krzysztof Kozlowski + +commit 665b9459bb53b8f19bd1541567e1fe9782c83c4b upstream. + +The Samsung S5P/Exynos MIPI CSIS bindings and Linux driver expect first +clock name to be "csis". Otherwise the driver fails to probe. + +Fixes: 94ad0f6d9278 ("ARM: dts: Add Device tree for s5pv210 SoC") +Cc: +Link: https://lore.kernel.org/r/20230212185818.43503-2-krzysztof.kozlowski@linaro.org +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/s5pv210.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/s5pv210.dtsi ++++ b/arch/arm/boot/dts/s5pv210.dtsi +@@ -571,7 +571,7 @@ + interrupts = <29>; + clocks = <&clocks CLK_CSIS>, + <&clocks SCLK_CSIS>; +- clock-names = "clk_csis", ++ clock-names = "csis", + "sclk_csis"; + bus-width = <4>; + status = "disabled"; diff --git a/queue-5.4/btrfs-don-t-free-qgroup-space-unless-specified.patch b/queue-5.4/btrfs-don-t-free-qgroup-space-unless-specified.patch new file mode 100644 index 00000000000..5bcc15177e7 --- /dev/null +++ b/queue-5.4/btrfs-don-t-free-qgroup-space-unless-specified.patch @@ -0,0 +1,87 @@ +From d246331b78cbef86237f9c22389205bc9b4e1cc1 Mon Sep 17 00:00:00 2001 +From: Josef Bacik +Date: Tue, 2 May 2023 16:00:06 -0400 +Subject: btrfs: don't free qgroup space unless specified + +From: Josef Bacik + +commit d246331b78cbef86237f9c22389205bc9b4e1cc1 upstream. + +Boris noticed in his simple quotas testing that he was getting a leak +with Sweet Tea's change to subvol create that stopped doing a +transaction commit. This was just a side effect of that change. + +In the delayed inode code we have an optimization that will free extra +reservations if we think we can pack a dir item into an already modified +leaf. Previously this wouldn't be triggered in the subvolume create +case because we'd commit the transaction, it was still possible but +much harder to trigger. It could actually be triggered if we did a +mkdir && subvol create with qgroups enabled. + +This occurs because in btrfs_insert_delayed_dir_index(), which gets +called when we're adding the dir item, we do the following: + + btrfs_block_rsv_release(fs_info, trans->block_rsv, bytes, NULL); + +if we're able to skip reserving space. + +The problem here is that trans->block_rsv points at the temporary block +rsv for the subvolume create, which has qgroup reservations in the block +rsv. + +This is a problem because btrfs_block_rsv_release() will do the +following: + + if (block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) { + qgroup_to_release = block_rsv->qgroup_rsv_reserved - + block_rsv->qgroup_rsv_size; + block_rsv->qgroup_rsv_reserved = block_rsv->qgroup_rsv_size; + } + +The temporary block rsv just has ->qgroup_rsv_reserved set, +->qgroup_rsv_size == 0. The optimization in +btrfs_insert_delayed_dir_index() sets ->qgroup_rsv_reserved = 0. Then +later on when we call btrfs_subvolume_release_metadata() which has + + btrfs_block_rsv_release(fs_info, rsv, (u64)-1, &qgroup_to_release); + btrfs_qgroup_convert_reserved_meta(root, qgroup_to_release); + +qgroup_to_release is set to 0, and we do not convert the reserved +metadata space. + +The problem here is that the block rsv code has been unconditionally +messing with ->qgroup_rsv_reserved, because the main place this is used +is delalloc, and any time we call btrfs_block_rsv_release() we do it +with qgroup_to_release set, and thus do the proper accounting. + +The subvolume code is the only other code that uses the qgroup +reservation stuff, but it's intermingled with the above optimization, +and thus was getting its reservation freed out from underneath it and +thus leaking the reserved space. + +The solution is to simply not mess with the qgroup reservations if we +don't have qgroup_to_release set. This works with the existing code as +anything that messes with the delalloc reservations always have +qgroup_to_release set. This fixes the leak that Boris was observing. + +Reviewed-by: Qu Wenruo +CC: stable@vger.kernel.org # 5.4+ +Signed-off-by: Josef Bacik +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/block-rsv.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/btrfs/block-rsv.c ++++ b/fs/btrfs/block-rsv.c +@@ -29,7 +29,8 @@ static u64 block_rsv_release_bytes(struc + } else { + num_bytes = 0; + } +- if (block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) { ++ if (qgroup_to_release_ret && ++ block_rsv->qgroup_rsv_reserved >= block_rsv->qgroup_rsv_size) { + qgroup_to_release = block_rsv->qgroup_rsv_reserved - + block_rsv->qgroup_rsv_size; + block_rsv->qgroup_rsv_reserved = block_rsv->qgroup_rsv_size; diff --git a/queue-5.4/btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch b/queue-5.4/btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch new file mode 100644 index 00000000000..f96c32732dc --- /dev/null +++ b/queue-5.4/btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch @@ -0,0 +1,136 @@ +From 6f932d4ef007d6a4ae03badcb749fbb8f49196f6 Mon Sep 17 00:00:00 2001 +From: Filipe Manana +Date: Wed, 12 Apr 2023 11:33:09 +0100 +Subject: btrfs: fix btrfs_prev_leaf() to not return the same key twice + +From: Filipe Manana + +commit 6f932d4ef007d6a4ae03badcb749fbb8f49196f6 upstream. + +A call to btrfs_prev_leaf() may end up returning a path that points to the +same item (key) again. This happens if while btrfs_prev_leaf(), after we +release the path, a concurrent insertion happens, which moves items off +from a sibling into the front of the previous leaf, and an item with the +computed previous key does not exists. + +For example, suppose we have the two following leaves: + + Leaf A + + ------------------------------------------------------------- + | ... key (300 96 10) key (300 96 15) key (300 96 16) | + ------------------------------------------------------------- + slot 20 slot 21 slot 22 + + Leaf B + + ------------------------------------------------------------- + | key (300 96 20) key (300 96 21) key (300 96 22) ... | + ------------------------------------------------------------- + slot 0 slot 1 slot 2 + +If we call btrfs_prev_leaf(), from btrfs_previous_item() for example, with +a path pointing to leaf B and slot 0 and the following happens: + +1) At btrfs_prev_leaf() we compute the previous key to search as: + (300 96 19), which is a key that does not exists in the tree; + +2) Then we call btrfs_release_path() at btrfs_prev_leaf(); + +3) Some other task inserts a key at leaf A, that sorts before the key at + slot 20, for example it has an objectid of 299. In order to make room + for the new key, the key at slot 22 is moved to the front of leaf B. + This happens at push_leaf_right(), called from split_leaf(). + + After this leaf B now looks like: + + -------------------------------------------------------------------------------- + | key (300 96 16) key (300 96 20) key (300 96 21) key (300 96 22) ... | + -------------------------------------------------------------------------------- + slot 0 slot 1 slot 2 slot 3 + +4) At btrfs_prev_leaf() we call btrfs_search_slot() for the computed + previous key: (300 96 19). Since the key does not exists, + btrfs_search_slot() returns 1 and with a path pointing to leaf B + and slot 1, the item with key (300 96 20); + +5) This makes btrfs_prev_leaf() return a path that points to slot 1 of + leaf B, the same key as before it was called, since the key at slot 0 + of leaf B (300 96 16) is less than the computed previous key, which is + (300 96 19); + +6) As a consequence btrfs_previous_item() returns a path that points again + to the item with key (300 96 20). + +For some users of btrfs_prev_leaf() or btrfs_previous_item() this may not +be functional a problem, despite not making sense to return a new path +pointing again to the same item/key. However for a caller such as +tree-log.c:log_dir_items(), this has a bad consequence, as it can result +in not logging some dir index deletions in case the directory is being +logged without holding the inode's VFS lock (logging triggered while +logging a child inode for example) - for the example scenario above, in +case the dir index keys 17, 18 and 19 were deleted in the current +transaction. + +CC: stable@vger.kernel.org # 4.14+ +Reviewed-by: Josef Bacik +Signed-off-by: Filipe Manana +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/ctree.c | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) + +--- a/fs/btrfs/ctree.c ++++ b/fs/btrfs/ctree.c +@@ -5138,10 +5138,12 @@ int btrfs_del_items(struct btrfs_trans_h + int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path) + { + struct btrfs_key key; ++ struct btrfs_key orig_key; + struct btrfs_disk_key found_key; + int ret; + + btrfs_item_key_to_cpu(path->nodes[0], &key, 0); ++ orig_key = key; + + if (key.offset > 0) { + key.offset--; +@@ -5158,8 +5160,36 @@ int btrfs_prev_leaf(struct btrfs_root *r + + btrfs_release_path(path); + ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); +- if (ret < 0) ++ if (ret <= 0) + return ret; ++ ++ /* ++ * Previous key not found. Even if we were at slot 0 of the leaf we had ++ * before releasing the path and calling btrfs_search_slot(), we now may ++ * be in a slot pointing to the same original key - this can happen if ++ * after we released the path, one of more items were moved from a ++ * sibling leaf into the front of the leaf we had due to an insertion ++ * (see push_leaf_right()). ++ * If we hit this case and our slot is > 0 and just decrement the slot ++ * so that the caller does not process the same key again, which may or ++ * may not break the caller, depending on its logic. ++ */ ++ if (path->slots[0] < btrfs_header_nritems(path->nodes[0])) { ++ btrfs_item_key(path->nodes[0], &found_key, path->slots[0]); ++ ret = comp_keys(&found_key, &orig_key); ++ if (ret == 0) { ++ if (path->slots[0] > 0) { ++ path->slots[0]--; ++ return 0; ++ } ++ /* ++ * At slot 0, same key as before, it means orig_key is ++ * the lowest, leftmost, key in the tree. We're done. ++ */ ++ return 1; ++ } ++ } ++ + btrfs_item_key(path->nodes[0], &found_key, 0); + ret = comp_keys(&found_key, &key); + /* diff --git a/queue-5.4/btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch b/queue-5.4/btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch new file mode 100644 index 00000000000..984547ab91a --- /dev/null +++ b/queue-5.4/btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch @@ -0,0 +1,42 @@ +From c87f318e6f47696b4040b58f460d5c17ea0280e6 Mon Sep 17 00:00:00 2001 +From: Anastasia Belova +Date: Wed, 26 Apr 2023 14:53:23 +0300 +Subject: btrfs: print-tree: parent bytenr must be aligned to sector size + +From: Anastasia Belova + +commit c87f318e6f47696b4040b58f460d5c17ea0280e6 upstream. + +Check nodesize to sectorsize in alignment check in print_extent_item. +The comment states that and this is correct, similar check is done +elsewhere in the functions. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Fixes: ea57788eb76d ("btrfs: require only sector size alignment for parent eb bytenr") +CC: stable@vger.kernel.org # 4.14+ +Reviewed-by: Qu Wenruo +Signed-off-by: Anastasia Belova +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/print-tree.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/fs/btrfs/print-tree.c ++++ b/fs/btrfs/print-tree.c +@@ -109,10 +109,10 @@ static void print_extent_item(struct ext + pr_cont("shared data backref parent %llu count %u\n", + offset, btrfs_shared_data_ref_count(eb, sref)); + /* +- * offset is supposed to be a tree block which +- * must be aligned to nodesize. ++ * Offset is supposed to be a tree block which must be ++ * aligned to sectorsize. + */ +- if (!IS_ALIGNED(offset, eb->fs_info->nodesize)) ++ if (!IS_ALIGNED(offset, eb->fs_info->sectorsize)) + pr_info( + "\t\t\t(parent %llu not aligned to sectorsize %u)\n", + offset, eb->fs_info->sectorsize); diff --git a/queue-5.4/cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch b/queue-5.4/cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch new file mode 100644 index 00000000000..006ccfb0b0f --- /dev/null +++ b/queue-5.4/cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch @@ -0,0 +1,34 @@ +From d66cde50c3c868af7abddafce701bb86e4a93039 Mon Sep 17 00:00:00 2001 +From: Pawel Witek +Date: Fri, 5 May 2023 17:14:59 +0200 +Subject: cifs: fix pcchunk length type in smb2_copychunk_range + +From: Pawel Witek + +commit d66cde50c3c868af7abddafce701bb86e4a93039 upstream. + +Change type of pcchunk->Length from u32 to u64 to match +smb2_copychunk_range arguments type. Fixes the problem where performing +server-side copy with CIFS_IOC_COPYCHUNK_FILE ioctl resulted in incomplete +copy of large files while returning -EINVAL. + +Fixes: 9bf0c9cd4314 ("CIFS: Fix SMB2/SMB3 Copy offload support (refcopy) for large files") +Cc: +Signed-off-by: Pawel Witek +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/cifs/smb2ops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/cifs/smb2ops.c ++++ b/fs/cifs/smb2ops.c +@@ -1678,7 +1678,7 @@ smb2_copychunk_range(const unsigned int + pcchunk->SourceOffset = cpu_to_le64(src_off); + pcchunk->TargetOffset = cpu_to_le64(dest_off); + pcchunk->Length = +- cpu_to_le32(min_t(u32, len, tcon->max_bytes_chunk)); ++ cpu_to_le32(min_t(u64, len, tcon->max_bytes_chunk)); + + /* Request server copy to target from src identified by key */ + kfree(retbuf); diff --git a/queue-5.4/drm-panel-otm8009a-set-backlight-parent-to-panel-device.patch b/queue-5.4/drm-panel-otm8009a-set-backlight-parent-to-panel-device.patch new file mode 100644 index 00000000000..919cf3012ab --- /dev/null +++ b/queue-5.4/drm-panel-otm8009a-set-backlight-parent-to-panel-device.patch @@ -0,0 +1,37 @@ +From ab4f869fba6119997f7630d600049762a2b014fa Mon Sep 17 00:00:00 2001 +From: James Cowgill +Date: Wed, 12 Apr 2023 17:35:07 +0000 +Subject: drm/panel: otm8009a: Set backlight parent to panel device + +From: James Cowgill + +commit ab4f869fba6119997f7630d600049762a2b014fa upstream. + +This is the logical place to put the backlight device, and it also +fixes a kernel crash if the MIPI host is removed. Previously the +backlight device would be unregistered twice when this happened - once +as a child of the MIPI host through `mipi_dsi_host_unregister`, and +once when the panel device is destroyed. + +Fixes: 12a6cbd4f3f1 ("drm/panel: otm8009a: Use new backlight API") +Signed-off-by: James Cowgill +Cc: stable@vger.kernel.org +Reviewed-by: Neil Armstrong +Signed-off-by: Neil Armstrong +Link: https://patchwork.freedesktop.org/patch/msgid/20230412173450.199592-1-james.cowgill@blaize.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c ++++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c +@@ -460,7 +460,7 @@ static int otm8009a_probe(struct mipi_ds + ctx->panel.funcs = &otm8009a_drm_funcs; + + ctx->bl_dev = devm_backlight_device_register(dev, dev_name(dev), +- dsi->host->dev, ctx, ++ dev, ctx, + &otm8009a_backlight_ops, + NULL); + if (IS_ERR(ctx->bl_dev)) { diff --git a/queue-5.4/f2fs-fix-potential-corruption-when-moving-a-directory.patch b/queue-5.4/f2fs-fix-potential-corruption-when-moving-a-directory.patch new file mode 100644 index 00000000000..6e964971c79 --- /dev/null +++ b/queue-5.4/f2fs-fix-potential-corruption-when-moving-a-directory.patch @@ -0,0 +1,65 @@ +From d94772154e524b329a168678836745d2773a6e02 Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Thu, 6 Apr 2023 11:18:48 -0700 +Subject: f2fs: fix potential corruption when moving a directory + +From: Jaegeuk Kim + +commit d94772154e524b329a168678836745d2773a6e02 upstream. + +F2FS has the same issue in ext4_rename causing crash revealed by +xfstests/generic/707. + +See also commit 0813299c586b ("ext4: Fix possible corruption when moving a directory") + +CC: stable@vger.kernel.org +Signed-off-by: Jaegeuk Kim +Signed-off-by: Greg Kroah-Hartman +--- + fs/f2fs/namei.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +--- a/fs/f2fs/namei.c ++++ b/fs/f2fs/namei.c +@@ -892,12 +892,20 @@ static int f2fs_rename(struct inode *old + goto out; + } + ++ /* ++ * Copied from ext4_rename: we need to protect against old.inode ++ * directory getting converted from inline directory format into ++ * a normal one. ++ */ ++ if (S_ISDIR(old_inode->i_mode)) ++ inode_lock_nested(old_inode, I_MUTEX_NONDIR2); ++ + err = -ENOENT; + old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page); + if (!old_entry) { + if (IS_ERR(old_page)) + err = PTR_ERR(old_page); +- goto out; ++ goto out_unlock_old; + } + + if (S_ISDIR(old_inode->i_mode)) { +@@ -1025,6 +1033,9 @@ static int f2fs_rename(struct inode *old + + f2fs_unlock_op(sbi); + ++ if (S_ISDIR(old_inode->i_mode)) ++ inode_unlock(old_inode); ++ + if (IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir)) + f2fs_sync_fs(sbi->sb, 1); + +@@ -1040,6 +1051,9 @@ out_dir: + f2fs_put_page(old_dir_page, 0); + out_old: + f2fs_put_page(old_page, 0); ++out_unlock_old: ++ if (S_ISDIR(old_inode->i_mode)) ++ inode_unlock(old_inode); + out: + if (whiteout) + iput(whiteout); diff --git a/queue-5.4/inotify-avoid-reporting-event-with-invalid-wd.patch b/queue-5.4/inotify-avoid-reporting-event-with-invalid-wd.patch new file mode 100644 index 00000000000..2e6faf839b2 --- /dev/null +++ b/queue-5.4/inotify-avoid-reporting-event-with-invalid-wd.patch @@ -0,0 +1,61 @@ +From c915d8f5918bea7c3962b09b8884ca128bfd9b0c Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Mon, 24 Apr 2023 18:32:19 +0200 +Subject: inotify: Avoid reporting event with invalid wd + +From: Jan Kara + +commit c915d8f5918bea7c3962b09b8884ca128bfd9b0c upstream. + +When inotify_freeing_mark() races with inotify_handle_inode_event() it +can happen that inotify_handle_inode_event() sees that i_mark->wd got +already reset to -1 and reports this value to userspace which can +confuse the inotify listener. Avoid the problem by validating that wd is +sensible (and pretend the mark got removed before the event got +generated otherwise). + +CC: stable@vger.kernel.org +Fixes: 7e790dd5fc93 ("inotify: fix error paths in inotify_update_watch") +Message-Id: <20230424163219.9250-1-jack@suse.cz> +Reported-by: syzbot+4a06d4373fd52f0b2f9c@syzkaller.appspotmail.com +Reviewed-by: Amir Goldstein +Signed-off-by: Jan Kara +Signed-off-by: Greg Kroah-Hartman +--- + fs/notify/inotify/inotify_fsnotify.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/fs/notify/inotify/inotify_fsnotify.c ++++ b/fs/notify/inotify/inotify_fsnotify.c +@@ -66,7 +66,7 @@ int inotify_handle_event(struct fsnotify + struct inotify_event_info *event; + struct fsnotify_event *fsn_event; + int ret; +- int len = 0; ++ int len = 0, wd; + int alloc_len = sizeof(struct inotify_event_info); + + if (WARN_ON(fsnotify_iter_vfsmount_mark(iter_info))) +@@ -91,6 +91,13 @@ int inotify_handle_event(struct fsnotify + fsn_mark); + + /* ++ * We can be racing with mark being detached. Don't report event with ++ * invalid wd. ++ */ ++ wd = READ_ONCE(i_mark->wd); ++ if (wd == -1) ++ return 0; ++ /* + * Whoever is interested in the event, pays for the allocation. Do not + * trigger OOM killer in the target monitoring memcg as it may have + * security repercussion. +@@ -120,7 +127,7 @@ int inotify_handle_event(struct fsnotify + fsn_event = &event->fse; + fsnotify_init_event(fsn_event, (unsigned long)inode); + event->mask = mask; +- event->wd = i_mark->wd; ++ event->wd = wd; + event->sync_cookie = cookie; + event->name_len = len; + if (len) diff --git a/queue-5.4/perf-symbols-fix-return-incorrect-build_id-size-in-e.patch b/queue-5.4/perf-symbols-fix-return-incorrect-build_id-size-in-e.patch index 93d761b73c8..c26c314f05f 100644 --- a/queue-5.4/perf-symbols-fix-return-incorrect-build_id-size-in-e.patch +++ b/queue-5.4/perf-symbols-fix-return-incorrect-build_id-size-in-e.patch @@ -31,14 +31,12 @@ Link: https://lore.kernel.org/r/20230427012841.231729-1-yangjihong1@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- - tools/perf/util/symbol-elf.c | 2 +- + tools/perf/util/symbol-elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c -index 4fef8d6bc2255..73f890664be5e 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c -@@ -546,7 +546,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size) +@@ -546,7 +546,7 @@ static int elf_read_build_id(Elf *elf, v size_t sz = min(size, descsz); memcpy(bf, ptr, sz); memset(bf + sz, 0, size - sz); @@ -47,6 +45,3 @@ index 4fef8d6bc2255..73f890664be5e 100644 break; } } --- -2.39.2 - diff --git a/queue-5.4/platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch b/queue-5.4/platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch new file mode 100644 index 00000000000..9c67160583f --- /dev/null +++ b/queue-5.4/platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch @@ -0,0 +1,61 @@ +From 4b65f95c87c35699bc6ad540d6b9dd7f950d0924 Mon Sep 17 00:00:00 2001 +From: Andrey Avdeev +Date: Sun, 30 Apr 2023 11:01:10 +0300 +Subject: platform/x86: touchscreen_dmi: Add info for the Dexp Ursus KX210i + +From: Andrey Avdeev + +commit 4b65f95c87c35699bc6ad540d6b9dd7f950d0924 upstream. + +Add touchscreen info for the Dexp Ursus KX210i + +Signed-off-by: Andrey Avdeev +Link: https://lore.kernel.org/r/ZE4gRgzRQCjXFYD0@avdeevavpc +Cc: stable@vger.kernel.org +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Signed-off-by: Greg Kroah-Hartman +--- + drivers/platform/x86/touchscreen_dmi.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +--- a/drivers/platform/x86/touchscreen_dmi.c ++++ b/drivers/platform/x86/touchscreen_dmi.c +@@ -232,6 +232,22 @@ static const struct ts_dmi_data dexp_urs + .properties = dexp_ursus_7w_props, + }; + ++static const struct property_entry dexp_ursus_kx210i_props[] = { ++ PROPERTY_ENTRY_U32("touchscreen-min-x", 5), ++ PROPERTY_ENTRY_U32("touchscreen-min-y", 2), ++ PROPERTY_ENTRY_U32("touchscreen-size-x", 1720), ++ PROPERTY_ENTRY_U32("touchscreen-size-y", 1137), ++ PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-dexp-ursus-kx210i.fw"), ++ PROPERTY_ENTRY_U32("silead,max-fingers", 10), ++ PROPERTY_ENTRY_BOOL("silead,home-button"), ++ { } ++}; ++ ++static const struct ts_dmi_data dexp_ursus_kx210i_data = { ++ .acpi_name = "MSSL1680:00", ++ .properties = dexp_ursus_kx210i_props, ++}; ++ + static const struct property_entry digma_citi_e200_props[] = { + PROPERTY_ENTRY_U32("touchscreen-size-x", 1980), + PROPERTY_ENTRY_U32("touchscreen-size-y", 1500), +@@ -779,6 +795,14 @@ static const struct dmi_system_id touchs + }, + }, + { ++ /* DEXP Ursus KX210i */ ++ .driver_data = (void *)&dexp_ursus_kx210i_data, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "INSYDE Corp."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "S107I"), ++ }, ++ }, ++ { + /* Digma Citi E200 */ + .driver_data = (void *)&digma_citi_e200_data, + .matches = { diff --git a/queue-5.4/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch b/queue-5.4/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch new file mode 100644 index 00000000000..a39dba80ca9 --- /dev/null +++ b/queue-5.4/platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch @@ -0,0 +1,54 @@ +From 6abfa99ce52f61a31bcfc2aaaae09006f5665495 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Fri, 5 May 2023 23:03:23 +0200 +Subject: platform/x86: touchscreen_dmi: Add upside-down quirk for GDIX1002 ts on the Juno Tablet + +From: Hans de Goede + +commit 6abfa99ce52f61a31bcfc2aaaae09006f5665495 upstream. + +The Juno Computers Juno Tablet has an upside-down mounted Goodix +touchscreen. Add a quirk to invert both axis to correct for this. + +Link: https://junocomputers.com/us/product/juno-tablet/ +Cc: stable@vger.kernel.org +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20230505210323.43177-1-hdegoede@redhat.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/platform/x86/touchscreen_dmi.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +--- a/drivers/platform/x86/touchscreen_dmi.c ++++ b/drivers/platform/x86/touchscreen_dmi.c +@@ -258,6 +258,11 @@ static const struct ts_dmi_data estar_be + .properties = estar_beauty_hd_props, + }; + ++static const struct ts_dmi_data gdix1002_00_upside_down_data = { ++ .acpi_name = "GDIX1002:00", ++ .properties = gdix1001_upside_down_props, ++}; ++ + static const struct property_entry gp_electronic_t701_props[] = { + PROPERTY_ENTRY_U32("touchscreen-size-x", 960), + PROPERTY_ENTRY_U32("touchscreen-size-y", 640), +@@ -864,6 +869,18 @@ static const struct dmi_system_id touchs + }, + }, + { ++ /* Juno Tablet */ ++ .driver_data = (void *)&gdix1002_00_upside_down_data, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Default string"), ++ /* Both product- and board-name being "Default string" is somewhat rare */ ++ DMI_MATCH(DMI_PRODUCT_NAME, "Default string"), ++ DMI_MATCH(DMI_BOARD_NAME, "Default string"), ++ /* Above matches are too generic, add partial bios-version match */ ++ DMI_MATCH(DMI_BIOS_VERSION, "JP2V1."), ++ }, ++ }, ++ { + /* Mediacom WinPad 7.0 W700 (same hw as Wintron surftab 7") */ + .driver_data = (void *)&trekstor_surftab_wintron70_data, + .matches = { diff --git a/queue-5.4/remoteproc-st-call-of_node_put-on-iteration-error.patch b/queue-5.4/remoteproc-st-call-of_node_put-on-iteration-error.patch new file mode 100644 index 00000000000..fc03f58bc8b --- /dev/null +++ b/queue-5.4/remoteproc-st-call-of_node_put-on-iteration-error.patch @@ -0,0 +1,46 @@ +From 8a74918948b40317a5b5bab9739d13dcb5de2784 Mon Sep 17 00:00:00 2001 +From: Mathieu Poirier +Date: Mon, 20 Mar 2023 16:18:23 -0600 +Subject: remoteproc: st: Call of_node_put() on iteration error + +From: Mathieu Poirier + +commit 8a74918948b40317a5b5bab9739d13dcb5de2784 upstream. + +Function of_phandle_iterator_next() calls of_node_put() on the last +device_node it iterated over, but when the loop exits prematurely it has +to be called explicitly. + +Fixes: 3df52ed7f269 ("remoteproc: st: add reserved memory support") +Cc: stable@vger.kernel.org +Signed-off-by: Mathieu Poirier +Reviewed-by: Arnaud Pouliquen +Link: https://lore.kernel.org/r/20230320221826.2728078-3-mathieu.poirier@linaro.org +Signed-off-by: Mathieu Poirier +Signed-off-by: Greg Kroah-Hartman +--- + drivers/remoteproc/st_remoteproc.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/remoteproc/st_remoteproc.c ++++ b/drivers/remoteproc/st_remoteproc.c +@@ -129,6 +129,7 @@ static int st_rproc_parse_fw(struct rpro + while (of_phandle_iterator_next(&it) == 0) { + rmem = of_reserved_mem_lookup(it.node); + if (!rmem) { ++ of_node_put(it.node); + dev_err(dev, "unable to acquire memory-region\n"); + return -EINVAL; + } +@@ -150,8 +151,10 @@ static int st_rproc_parse_fw(struct rpro + it.node->name); + } + +- if (!mem) ++ if (!mem) { ++ of_node_put(it.node); + return -ENOMEM; ++ } + + rproc_add_carveout(rproc, mem); + index++; diff --git a/queue-5.4/remoteproc-stm32-call-of_node_put-on-iteration-error.patch b/queue-5.4/remoteproc-stm32-call-of_node_put-on-iteration-error.patch new file mode 100644 index 00000000000..dd4404c7fb6 --- /dev/null +++ b/queue-5.4/remoteproc-stm32-call-of_node_put-on-iteration-error.patch @@ -0,0 +1,52 @@ +From ccadca5baf5124a880f2bb50ed1ec265415f025b Mon Sep 17 00:00:00 2001 +From: Mathieu Poirier +Date: Mon, 20 Mar 2023 16:18:22 -0600 +Subject: remoteproc: stm32: Call of_node_put() on iteration error + +From: Mathieu Poirier + +commit ccadca5baf5124a880f2bb50ed1ec265415f025b upstream. + +Function of_phandle_iterator_next() calls of_node_put() on the last +device_node it iterated over, but when the loop exits prematurely it has +to be called explicitly. + +Fixes: 13140de09cc2 ("remoteproc: stm32: add an ST stm32_rproc driver") +Cc: stable@vger.kernel.org +Signed-off-by: Mathieu Poirier +Reviewed-by: Arnaud Pouliquen +Link: https://lore.kernel.org/r/20230320221826.2728078-2-mathieu.poirier@linaro.org +Signed-off-by: Mathieu Poirier +Signed-off-by: Greg Kroah-Hartman +--- + drivers/remoteproc/stm32_rproc.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/drivers/remoteproc/stm32_rproc.c ++++ b/drivers/remoteproc/stm32_rproc.c +@@ -211,11 +211,13 @@ static int stm32_rproc_parse_fw(struct r + while (of_phandle_iterator_next(&it) == 0) { + rmem = of_reserved_mem_lookup(it.node); + if (!rmem) { ++ of_node_put(it.node); + dev_err(dev, "unable to acquire memory-region\n"); + return -EINVAL; + } + + if (stm32_rproc_pa_to_da(rproc, rmem->base, &da) < 0) { ++ of_node_put(it.node); + dev_err(dev, "memory region not valid %pa\n", + &rmem->base); + return -EINVAL; +@@ -242,8 +244,10 @@ static int stm32_rproc_parse_fw(struct r + it.node->name); + } + +- if (!mem) ++ if (!mem) { ++ of_node_put(it.node); + return -ENOMEM; ++ } + + rproc_add_carveout(rproc, mem); + index++; diff --git a/queue-5.4/series b/queue-5.4/series index 985a11c85ed..16bd59e6ff3 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -237,3 +237,19 @@ net-bcmgenet-remove-phy_stop-from-bcmgenet_netif_sto.patch perf-vendor-events-power9-remove-utf-8-characters-fr.patch perf-map-delete-two-variable-initialisations-before-.patch perf-symbols-fix-return-incorrect-build_id-size-in-e.patch +btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch +btrfs-don-t-free-qgroup-space-unless-specified.patch +btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch +cifs-fix-pcchunk-length-type-in-smb2_copychunk_range.patch +platform-x86-touchscreen_dmi-add-upside-down-quirk-for-gdix1002-ts-on-the-juno-tablet.patch +platform-x86-touchscreen_dmi-add-info-for-the-dexp-ursus-kx210i.patch +inotify-avoid-reporting-event-with-invalid-wd.patch +sh-math-emu-fix-macro-redefined-warning.patch +sh-init-use-of_early_flattree-for-early-init.patch +sh-nmi_debug-fix-return-value-of-__setup-handler.patch +remoteproc-stm32-call-of_node_put-on-iteration-error.patch +remoteproc-st-call-of_node_put-on-iteration-error.patch +arm-dts-exynos-fix-wm8960-clock-name-in-itop-elite.patch +arm-dts-s5pv210-correct-mipi-csis-clock-name.patch +f2fs-fix-potential-corruption-when-moving-a-directory.patch +drm-panel-otm8009a-set-backlight-parent-to-panel-device.patch diff --git a/queue-5.4/sh-init-use-of_early_flattree-for-early-init.patch b/queue-5.4/sh-init-use-of_early_flattree-for-early-init.patch new file mode 100644 index 00000000000..b2988420e73 --- /dev/null +++ b/queue-5.4/sh-init-use-of_early_flattree-for-early-init.patch @@ -0,0 +1,89 @@ +From 6cba655543c7959f8a6d2979b9d40a6a66b7ed4f Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Sun, 5 Mar 2023 20:00:33 -0800 +Subject: sh: init: use OF_EARLY_FLATTREE for early init + +From: Randy Dunlap + +commit 6cba655543c7959f8a6d2979b9d40a6a66b7ed4f upstream. + +When CONFIG_OF_EARLY_FLATTREE and CONFIG_SH_DEVICE_TREE are not set, +SH3 build fails with a call to early_init_dt_scan(), so in +arch/sh/kernel/setup.c and arch/sh/kernel/head_32.S, use +CONFIG_OF_EARLY_FLATTREE instead of CONFIG_OF_FLATTREE. + +Fixes this build error: +../arch/sh/kernel/setup.c: In function 'sh_fdt_init': +../arch/sh/kernel/setup.c:262:26: error: implicit declaration of function 'early_init_dt_scan' [-Werror=implicit-function-declaration] + 262 | if (!dt_virt || !early_init_dt_scan(dt_virt)) { + +Fixes: 03767daa1387 ("sh: fix build regression with CONFIG_OF && !CONFIG_OF_FLATTREE") +Fixes: eb6b6930a70f ("sh: fix memory corruption of unflattened device tree") +Signed-off-by: Randy Dunlap +Suggested-by: Rob Herring +Cc: Frank Rowand +Cc: devicetree@vger.kernel.org +Cc: Rich Felker +Cc: Yoshinori Sato +Cc: Geert Uytterhoeven +Cc: John Paul Adrian Glaubitz +Cc: linux-sh@vger.kernel.org +Cc: stable@vger.kernel.org +Reviewed-by: John Paul Adrian Glaubitz +Link: https://lore.kernel.org/r/20230306040037.20350-4-rdunlap@infradead.org +Signed-off-by: John Paul Adrian Glaubitz +Signed-off-by: Greg Kroah-Hartman +--- + arch/sh/kernel/head_32.S | 6 +++--- + arch/sh/kernel/setup.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/arch/sh/kernel/head_32.S ++++ b/arch/sh/kernel/head_32.S +@@ -64,7 +64,7 @@ ENTRY(_stext) + ldc r0, r6_bank + #endif + +-#ifdef CONFIG_OF_FLATTREE ++#ifdef CONFIG_OF_EARLY_FLATTREE + mov r4, r12 ! Store device tree blob pointer in r12 + #endif + +@@ -315,7 +315,7 @@ ENTRY(_stext) + 10: + #endif + +-#ifdef CONFIG_OF_FLATTREE ++#ifdef CONFIG_OF_EARLY_FLATTREE + mov.l 8f, r0 ! Make flat device tree available early. + jsr @r0 + mov r12, r4 +@@ -346,7 +346,7 @@ ENTRY(stack_start) + 5: .long start_kernel + 6: .long cpu_init + 7: .long init_thread_union +-#if defined(CONFIG_OF_FLATTREE) ++#if defined(CONFIG_OF_EARLY_FLATTREE) + 8: .long sh_fdt_init + #endif + +--- a/arch/sh/kernel/setup.c ++++ b/arch/sh/kernel/setup.c +@@ -243,7 +243,7 @@ void __init __weak plat_early_device_set + { + } + +-#ifdef CONFIG_OF_FLATTREE ++#ifdef CONFIG_OF_EARLY_FLATTREE + void __ref sh_fdt_init(phys_addr_t dt_phys) + { + static int done = 0; +@@ -330,7 +330,7 @@ void __init setup_arch(char **cmdline_p) + /* Let earlyprintk output early console messages */ + early_platform_driver_probe("earlyprintk", 1, 1); + +-#ifdef CONFIG_OF_FLATTREE ++#ifdef CONFIG_OF_EARLY_FLATTREE + #ifdef CONFIG_USE_BUILTIN_DTB + unflatten_and_copy_device_tree(); + #else diff --git a/queue-5.4/sh-math-emu-fix-macro-redefined-warning.patch b/queue-5.4/sh-math-emu-fix-macro-redefined-warning.patch new file mode 100644 index 00000000000..de8de10da1a --- /dev/null +++ b/queue-5.4/sh-math-emu-fix-macro-redefined-warning.patch @@ -0,0 +1,47 @@ +From 58a49ad90939386a8682e842c474a0d2c00ec39c Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Sun, 5 Mar 2023 20:00:34 -0800 +Subject: sh: math-emu: fix macro redefined warning + +From: Randy Dunlap + +commit 58a49ad90939386a8682e842c474a0d2c00ec39c upstream. + +Fix a warning that was reported by the kernel test robot: + +In file included from ../include/math-emu/soft-fp.h:27, + from ../arch/sh/math-emu/math.c:22: +../arch/sh/include/asm/sfp-machine.h:17: warning: "__BYTE_ORDER" redefined + 17 | #define __BYTE_ORDER __BIG_ENDIAN +In file included from ../arch/sh/math-emu/math.c:21: +../arch/sh/math-emu/sfp-util.h:71: note: this is the location of the previous definition + 71 | #define __BYTE_ORDER __LITTLE_ENDIAN + +Fixes: b929926f01f2 ("sh: define __BIG_ENDIAN for math-emu") +Signed-off-by: Randy Dunlap +Reported-by: kernel test robot +Link: lore.kernel.org/r/202111121827.6v6SXtVv-lkp@intel.com +Cc: John Paul Adrian Glaubitz +Cc: Yoshinori Sato +Cc: Rich Felker +Cc: linux-sh@vger.kernel.org +Reviewed-by: Geert Uytterhoeven +Cc: stable@vger.kernel.org +Reviewed-by: John Paul Adrian Glaubitz +Link: https://lore.kernel.org/r/20230306040037.20350-5-rdunlap@infradead.org +Signed-off-by: John Paul Adrian Glaubitz +Signed-off-by: Greg Kroah-Hartman +--- + arch/sh/math-emu/sfp-util.h | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/arch/sh/math-emu/sfp-util.h ++++ b/arch/sh/math-emu/sfp-util.h +@@ -67,7 +67,3 @@ + } while (0) + + #define abort() return 0 +- +-#define __BYTE_ORDER __LITTLE_ENDIAN +- +- diff --git a/queue-5.4/sh-nmi_debug-fix-return-value-of-__setup-handler.patch b/queue-5.4/sh-nmi_debug-fix-return-value-of-__setup-handler.patch new file mode 100644 index 00000000000..18170e9313f --- /dev/null +++ b/queue-5.4/sh-nmi_debug-fix-return-value-of-__setup-handler.patch @@ -0,0 +1,53 @@ +From d1155e4132de712a9d3066e2667ceaad39a539c5 Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Sun, 5 Mar 2023 20:00:32 -0800 +Subject: sh: nmi_debug: fix return value of __setup handler + +From: Randy Dunlap + +commit d1155e4132de712a9d3066e2667ceaad39a539c5 upstream. + +__setup() handlers should return 1 to obsolete_checksetup() in +init/main.c to indicate that the boot option has been handled. +A return of 0 causes the boot option/value to be listed as an Unknown +kernel parameter and added to init's (limited) argument or environment +strings. Also, error return codes don't mean anything to +obsolete_checksetup() -- only non-zero (usually 1) or zero. +So return 1 from nmi_debug_setup(). + +Fixes: 1e1030dccb10 ("sh: nmi_debug support.") +Signed-off-by: Randy Dunlap +Reported-by: Igor Zhbanov +Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru +Cc: John Paul Adrian Glaubitz +Cc: Yoshinori Sato +Cc: Rich Felker +Cc: linux-sh@vger.kernel.org +Cc: stable@vger.kernel.org +Reviewed-by: John Paul Adrian Glaubitz +Link: https://lore.kernel.org/r/20230306040037.20350-3-rdunlap@infradead.org +Signed-off-by: John Paul Adrian Glaubitz +Signed-off-by: Greg Kroah-Hartman +--- + arch/sh/kernel/nmi_debug.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/sh/kernel/nmi_debug.c ++++ b/arch/sh/kernel/nmi_debug.c +@@ -49,7 +49,7 @@ static int __init nmi_debug_setup(char * + register_die_notifier(&nmi_debug_nb); + + if (*str != '=') +- return 0; ++ return 1; + + for (p = str + 1; *p; p = sep + 1) { + sep = strchr(p, ','); +@@ -70,6 +70,6 @@ static int __init nmi_debug_setup(char * + break; + } + +- return 0; ++ return 1; + } + __setup("nmi_debug", nmi_debug_setup); -- 2.47.3