From: Greg Kroah-Hartman Date: Mon, 13 Sep 2021 09:34:29 +0000 (+0200) Subject: 5.14-stable patches X-Git-Tag: v5.4.146~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=129f838fa40814e0c028ed815d9a10e437f7ffa8;p=thirdparty%2Fkernel%2Fstable-queue.git 5.14-stable patches added patches: f2fs-guarantee-to-write-dirty-data-when-enabling-checkpoint-back.patch iwlwifi-add-support-for-ax201-in-samsung-galaxy-book-flex2-alpha.patch --- diff --git a/queue-5.14/f2fs-guarantee-to-write-dirty-data-when-enabling-checkpoint-back.patch b/queue-5.14/f2fs-guarantee-to-write-dirty-data-when-enabling-checkpoint-back.patch new file mode 100644 index 00000000000..36042c21b6a --- /dev/null +++ b/queue-5.14/f2fs-guarantee-to-write-dirty-data-when-enabling-checkpoint-back.patch @@ -0,0 +1,64 @@ +From dddd3d65293a52c2c3850c19b1e5115712e534d8 Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Thu, 19 Aug 2021 14:00:57 -0700 +Subject: f2fs: guarantee to write dirty data when enabling checkpoint back + +From: Jaegeuk Kim + +commit dddd3d65293a52c2c3850c19b1e5115712e534d8 upstream. + +We must flush all the dirty data when enabling checkpoint back. Let's guarantee +that first by adding a retry logic on sync_inodes_sb(). In addition to that, +this patch adds to flush data in fsync when checkpoint is disabled, which can +mitigate the sync_inodes_sb() failures in advance. + +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Greg Kroah-Hartman +--- + fs/f2fs/file.c | 5 ++--- + fs/f2fs/super.c | 11 ++++++++++- + 2 files changed, 12 insertions(+), 4 deletions(-) + +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -261,8 +261,7 @@ static int f2fs_do_sync_file(struct file + }; + unsigned int seq_id = 0; + +- if (unlikely(f2fs_readonly(inode->i_sb) || +- is_sbi_flag_set(sbi, SBI_CP_DISABLED))) ++ if (unlikely(f2fs_readonly(inode->i_sb))) + return 0; + + trace_f2fs_sync_file_enter(inode); +@@ -276,7 +275,7 @@ static int f2fs_do_sync_file(struct file + ret = file_write_and_wait_range(file, start, end); + clear_inode_flag(inode, FI_NEED_IPU); + +- if (ret) { ++ if (ret || is_sbi_flag_set(sbi, SBI_CP_DISABLED)) { + trace_f2fs_sync_file_exit(inode, cp_reason, datasync, ret); + return ret; + } +--- a/fs/f2fs/super.c ++++ b/fs/f2fs/super.c +@@ -2039,8 +2039,17 @@ restore_flag: + + static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi) + { ++ int retry = DEFAULT_RETRY_IO_COUNT; ++ + /* we should flush all the data to keep data consistency */ +- sync_inodes_sb(sbi->sb); ++ do { ++ sync_inodes_sb(sbi->sb); ++ cond_resched(); ++ congestion_wait(BLK_RW_ASYNC, DEFAULT_IO_TIMEOUT); ++ } while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--); ++ ++ if (unlikely(retry < 0)) ++ f2fs_warn(sbi, "checkpoint=enable has some unwritten data."); + + down_write(&sbi->gc_lock); + f2fs_dirty_to_prefree(sbi); diff --git a/queue-5.14/iwlwifi-add-support-for-ax201-in-samsung-galaxy-book-flex2-alpha.patch b/queue-5.14/iwlwifi-add-support-for-ax201-in-samsung-galaxy-book-flex2-alpha.patch new file mode 100644 index 00000000000..d94e7e17e87 --- /dev/null +++ b/queue-5.14/iwlwifi-add-support-for-ax201-in-samsung-galaxy-book-flex2-alpha.patch @@ -0,0 +1,32 @@ +From 2f32c147a3816d789722c0bd242a9431332ec3ed Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" +Date: Fri, 2 Jul 2021 17:31:53 -0500 +Subject: iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha + +From: Justin M. Forbes + +commit 2f32c147a3816d789722c0bd242a9431332ec3ed upstream. + +The Samsung Galaxy Book Flex2 Alpha uses an ax201 with the ID a0f0/6074. +This works fine with the existing driver once it knows to claim it. +Simple patch to add the device. + +Signed-off-by: Justin M. Forbes +Reviewed-by: Jaehoon Chung +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20210702223155.1981510-1-jforbes@fedoraproject.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +@@ -558,6 +558,7 @@ static const struct iwl_dev_info iwl_dev + IWL_DEV_INFO(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL), + IWL_DEV_INFO(0xA0F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL), + IWL_DEV_INFO(0xA0F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL), ++ IWL_DEV_INFO(0xA0F0, 0x6074, iwl_ax201_cfg_qu_hr, NULL), + IWL_DEV_INFO(0x02F0, 0x0070, iwl_ax201_cfg_quz_hr, NULL), + IWL_DEV_INFO(0x02F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL), + IWL_DEV_INFO(0x02F0, 0x6074, iwl_ax201_cfg_quz_hr, NULL), diff --git a/queue-5.14/series b/queue-5.14/series index b67982f7fab..5f36c057fcb 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -293,3 +293,5 @@ octeontx2-af-fix-static-code-analyzer-reported-issue.patch octeontx2-af-set-proper-errorcode-for-ipv4-checksum-.patch ipv4-fix-endianness-issue-in-inet_rtm_getroute_build.patch asoc-rt5682-remove-unused-variable-in-rt5682_i2c_remove.patch +iwlwifi-add-support-for-ax201-in-samsung-galaxy-book-flex2-alpha.patch +f2fs-guarantee-to-write-dirty-data-when-enabling-checkpoint-back.patch