From e40eb6cacaa1e9ab4c90a44c41f1fb3718cb9a75 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 2 Oct 2022 11:55:03 +0200 Subject: [PATCH] 5.10-stable patches added patches: libata-add-ata_horkage_nolpm-for-pioneer-bdr-207m-and-bdr-205.patch mmc-hsq-fix-data-stomping-during-mmc-recovery.patch mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch net-mt7531-only-do-pll-once-after-the-reset.patch ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch --- ...lpm-for-pioneer-bdr-207m-and-bdr-205.patch | 58 +++++++++++++ ...ix-data-stomping-during-mmc-recovery.patch | 38 +++++++++ ...bus-width-and-remove-8-bit-bus-width.patch | 75 +++++++++++++++++ ...531-only-do-pll-once-after-the-reset.patch | 75 +++++++++++++++++ ...-bug_on-in-ntfs_lookup_inode_by_name.patch | 81 +++++++++++++++++++ ...ast-ipi-for-radix-pmd-collapse-flush.patch | 55 +++++++++++++ queue-5.10/series | 6 ++ 7 files changed, 388 insertions(+) create mode 100644 queue-5.10/libata-add-ata_horkage_nolpm-for-pioneer-bdr-207m-and-bdr-205.patch create mode 100644 queue-5.10/mmc-hsq-fix-data-stomping-during-mmc-recovery.patch create mode 100644 queue-5.10/mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch create mode 100644 queue-5.10/net-mt7531-only-do-pll-once-after-the-reset.patch create mode 100644 queue-5.10/ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch create mode 100644 queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch diff --git a/queue-5.10/libata-add-ata_horkage_nolpm-for-pioneer-bdr-207m-and-bdr-205.patch b/queue-5.10/libata-add-ata_horkage_nolpm-for-pioneer-bdr-207m-and-bdr-205.patch new file mode 100644 index 00000000000..0f50c7197b5 --- /dev/null +++ b/queue-5.10/libata-add-ata_horkage_nolpm-for-pioneer-bdr-207m-and-bdr-205.patch @@ -0,0 +1,58 @@ +From ea08aec7e77bfd6599489ec430f9f859ab84575a Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Mon, 26 Sep 2022 18:38:09 +0000 +Subject: libata: add ATA_HORKAGE_NOLPM for Pioneer BDR-207M and BDR-205 + +From: Niklas Cassel + +commit ea08aec7e77bfd6599489ec430f9f859ab84575a upstream. + +Commit 1527f69204fe ("ata: ahci: Add Green Sardine vendor ID as +board_ahci_mobile") added an explicit entry for AMD Green Sardine +AHCI controller using the board_ahci_mobile configuration (this +configuration has later been renamed to board_ahci_low_power). + +The board_ahci_low_power configuration enables support for low power +modes. + +This explicit entry takes precedence over the generic AHCI controller +entry, which does not enable support for low power modes. + +Therefore, when commit 1527f69204fe ("ata: ahci: Add Green Sardine +vendor ID as board_ahci_mobile") was backported to stable kernels, +it make some Pioneer optical drives, which was working perfectly fine +before the commit was backported, stop working. + +The real problem is that the Pioneer optical drives do not handle low +power modes correctly. If these optical drives would have been tested +on another AHCI controller using the board_ahci_low_power configuration, +this issue would have been detected earlier. + +Unfortunately, the board_ahci_low_power configuration is only used in +less than 15% of the total AHCI controller entries, so many devices +have never been tested with an AHCI controller with low power modes. + +Fixes: 1527f69204fe ("ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile") +Cc: stable@vger.kernel.org +Reported-by: Jaap Berkhout +Signed-off-by: Niklas Cassel +Reviewed-by: Mario Limonciello +Signed-off-by: Damien Le Moal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/ata/libata-core.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -3936,6 +3936,10 @@ static const struct ata_blacklist_entry + { "PIONEER DVD-RW DVR-212D", NULL, ATA_HORKAGE_NOSETXFER }, + { "PIONEER DVD-RW DVR-216D", NULL, ATA_HORKAGE_NOSETXFER }, + ++ /* These specific Pioneer models have LPM issues */ ++ { "PIONEER BD-RW BDR-207M", NULL, ATA_HORKAGE_NOLPM }, ++ { "PIONEER BD-RW BDR-205", NULL, ATA_HORKAGE_NOLPM }, ++ + /* Crucial BX100 SSD 500GB has broken LPM support */ + { "CT500BX100SSD1", NULL, ATA_HORKAGE_NOLPM }, + diff --git a/queue-5.10/mmc-hsq-fix-data-stomping-during-mmc-recovery.patch b/queue-5.10/mmc-hsq-fix-data-stomping-during-mmc-recovery.patch new file mode 100644 index 00000000000..9b9e60ad0dc --- /dev/null +++ b/queue-5.10/mmc-hsq-fix-data-stomping-during-mmc-recovery.patch @@ -0,0 +1,38 @@ +From e7afa79a3b35a27a046a2139f8b20bd6b98155c2 Mon Sep 17 00:00:00 2001 +From: Wenchao Chen +Date: Fri, 16 Sep 2022 17:05:06 +0800 +Subject: mmc: hsq: Fix data stomping during mmc recovery + +From: Wenchao Chen + +commit e7afa79a3b35a27a046a2139f8b20bd6b98155c2 upstream. + +The block device uses multiple queues to access emmc. There will be up to 3 +requests in the hsq of the host. The current code will check whether there +is a request doing recovery before entering the queue, but it will not check +whether there is a request when the lock is issued. The request is in recovery +mode. If there is a request in recovery, then a read and write request is +initiated at this time, and the conflict between the request and the recovery +request will cause the data to be trampled. + +Signed-off-by: Wenchao Chen +Fixes: 511ce378e16f ("mmc: Add MMC host software queue support") +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20220916090506.10662-1-wenchao.chen666@gmail.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/host/mmc_hsq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mmc/host/mmc_hsq.c ++++ b/drivers/mmc/host/mmc_hsq.c +@@ -34,7 +34,7 @@ static void mmc_hsq_pump_requests(struct + spin_lock_irqsave(&hsq->lock, flags); + + /* Make sure we are not already running a request now */ +- if (hsq->mrq) { ++ if (hsq->mrq || hsq->recovery_halt) { + spin_unlock_irqrestore(&hsq->lock, flags); + return; + } diff --git a/queue-5.10/mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch b/queue-5.10/mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch new file mode 100644 index 00000000000..687dc33bea7 --- /dev/null +++ b/queue-5.10/mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch @@ -0,0 +1,75 @@ +From 35ca91d1338ae158f6dcc0de5d1e86197924ffda Mon Sep 17 00:00:00 2001 +From: Sergei Antonov +Date: Wed, 7 Sep 2022 23:57:53 +0300 +Subject: mmc: moxart: fix 4-bit bus width and remove 8-bit bus width + +From: Sergei Antonov + +commit 35ca91d1338ae158f6dcc0de5d1e86197924ffda upstream. + +According to the datasheet [1] at page 377, 4-bit bus width is turned on by +bit 2 of the Bus Width Register. Thus the current bitmask is wrong: define +BUS_WIDTH_4 BIT(1) + +BIT(1) does not work but BIT(2) works. This has been verified on real MOXA +hardware with FTSDC010 controller revision 1_6_0. + +The corrected value of BUS_WIDTH_4 mask collides with: define BUS_WIDTH_8 +BIT(2). Additionally, 8-bit bus width mode isn't supported according to the +datasheet, so let's remove the corresponding code. + +[1] +https://bitbucket.org/Kasreyn/mkrom-uc7112lx/src/master/documents/FIC8120_DS_v1.2.pdf + +Fixes: 1b66e94e6b99 ("mmc: moxart: Add MOXA ART SD/MMC driver") +Signed-off-by: Sergei Antonov +Cc: Jonas Jensen +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20220907205753.1577434-1-saproj@gmail.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/host/moxart-mmc.c | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +--- a/drivers/mmc/host/moxart-mmc.c ++++ b/drivers/mmc/host/moxart-mmc.c +@@ -111,8 +111,8 @@ + #define CLK_DIV_MASK 0x7f + + /* REG_BUS_WIDTH */ +-#define BUS_WIDTH_8 BIT(2) +-#define BUS_WIDTH_4 BIT(1) ++#define BUS_WIDTH_4_SUPPORT BIT(3) ++#define BUS_WIDTH_4 BIT(2) + #define BUS_WIDTH_1 BIT(0) + + #define MMC_VDD_360 23 +@@ -527,9 +527,6 @@ static void moxart_set_ios(struct mmc_ho + case MMC_BUS_WIDTH_4: + writel(BUS_WIDTH_4, host->base + REG_BUS_WIDTH); + break; +- case MMC_BUS_WIDTH_8: +- writel(BUS_WIDTH_8, host->base + REG_BUS_WIDTH); +- break; + default: + writel(BUS_WIDTH_1, host->base + REG_BUS_WIDTH); + break; +@@ -654,16 +651,8 @@ static int moxart_probe(struct platform_ + dmaengine_slave_config(host->dma_chan_rx, &cfg); + } + +- switch ((readl(host->base + REG_BUS_WIDTH) >> 3) & 3) { +- case 1: ++ if (readl(host->base + REG_BUS_WIDTH) & BUS_WIDTH_4_SUPPORT) + mmc->caps |= MMC_CAP_4_BIT_DATA; +- break; +- case 2: +- mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; +- break; +- default: +- break; +- } + + writel(0, host->base + REG_INTERRUPT_MASK); + diff --git a/queue-5.10/net-mt7531-only-do-pll-once-after-the-reset.patch b/queue-5.10/net-mt7531-only-do-pll-once-after-the-reset.patch new file mode 100644 index 00000000000..8a1bc1ca23e --- /dev/null +++ b/queue-5.10/net-mt7531-only-do-pll-once-after-the-reset.patch @@ -0,0 +1,75 @@ +From 42bc4fafe359ed6b73602b7a2dba0dd99588f8ce Mon Sep 17 00:00:00 2001 +From: Alexander Couzens +Date: Sat, 17 Sep 2022 02:07:33 +0200 +Subject: net: mt7531: only do PLL once after the reset + +From: Alexander Couzens + +commit 42bc4fafe359ed6b73602b7a2dba0dd99588f8ce upstream. + +Move the PLL init of the switch out of the pad configuration of the port +6 (usally cpu port). + +Fix a unidirectional 100 mbit limitation on 1 gbit or 2.5 gbit links for +outbound traffic on port 5 or port 6. + +Fixes: c288575f7810 ("net: dsa: mt7530: Add the support of MT7531 switch") +Cc: stable@vger.kernel.org +Signed-off-by: Alexander Couzens +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/dsa/mt7530.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +--- a/drivers/net/dsa/mt7530.c ++++ b/drivers/net/dsa/mt7530.c +@@ -502,14 +502,19 @@ static bool mt7531_dual_sgmii_supported( + static int + mt7531_pad_setup(struct dsa_switch *ds, phy_interface_t interface) + { +- struct mt7530_priv *priv = ds->priv; ++ return 0; ++} ++ ++static void ++mt7531_pll_setup(struct mt7530_priv *priv) ++{ + u32 top_sig; + u32 hwstrap; + u32 xtal; + u32 val; + + if (mt7531_dual_sgmii_supported(priv)) +- return 0; ++ return; + + val = mt7530_read(priv, MT7531_CREV); + top_sig = mt7530_read(priv, MT7531_TOP_SIG_SR); +@@ -588,8 +593,6 @@ mt7531_pad_setup(struct dsa_switch *ds, + val |= EN_COREPLL; + mt7530_write(priv, MT7531_PLLGP_EN, val); + usleep_range(25, 35); +- +- return 0; + } + + static void +@@ -1731,6 +1734,8 @@ mt7531_setup(struct dsa_switch *ds) + SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST | + SYS_CTRL_REG_RST); + ++ mt7531_pll_setup(priv); ++ + if (mt7531_dual_sgmii_supported(priv)) { + priv->p5_intf_sel = P5_INTF_SEL_GMAC5_SGMII; + +@@ -2281,8 +2286,6 @@ mt7531_cpu_port_config(struct dsa_switch + case 6: + interface = PHY_INTERFACE_MODE_2500BASEX; + +- mt7531_pad_setup(ds, interface); +- + priv->p6_interface = interface; + break; + default: diff --git a/queue-5.10/ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch b/queue-5.10/ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch new file mode 100644 index 00000000000..999ba3c5868 --- /dev/null +++ b/queue-5.10/ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch @@ -0,0 +1,81 @@ +From 1b513f613731e2afc05550e8070d79fac80c661e Mon Sep 17 00:00:00 2001 +From: ChenXiaoSong +Date: Tue, 9 Aug 2022 14:47:30 +0800 +Subject: ntfs: fix BUG_ON in ntfs_lookup_inode_by_name() + +From: ChenXiaoSong + +commit 1b513f613731e2afc05550e8070d79fac80c661e upstream. + +Syzkaller reported BUG_ON as follows: + +------------[ cut here ]------------ +kernel BUG at fs/ntfs/dir.c:86! +invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI +CPU: 3 PID: 758 Comm: a.out Not tainted 5.19.0-next-20220808 #5 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 +RIP: 0010:ntfs_lookup_inode_by_name+0xd11/0x2d10 +Code: ff e9 b9 01 00 00 e8 1e fe d6 fe 48 8b 7d 98 49 8d 5d 07 e8 91 85 29 ff 48 c7 45 98 00 00 00 00 e9 5a fb ff ff e8 ff fd d6 fe <0f> 0b e8 f8 fd d6 fe 0f 0b e8 f1 fd d6 fe 48 8b b5 50 ff ff ff 4c +RSP: 0018:ffff888079607978 EFLAGS: 00010293 +RAX: 0000000000000000 RBX: 0000000000008000 RCX: 0000000000000000 +RDX: ffff88807cf10000 RSI: ffffffff82a4a081 RDI: 0000000000000003 +RBP: ffff888079607a70 R08: 0000000000000001 R09: ffff88807a6d01d7 +R10: ffffed100f4da03a R11: 0000000000000000 R12: ffff88800f0fb110 +R13: ffff88800f0ee000 R14: ffff88800f0fb000 R15: 0000000000000001 +FS: 00007f33b63c7540(0000) GS:ffff888108580000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00007f33b635c090 CR3: 000000000f39e005 CR4: 0000000000770ee0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +PKRU: 55555554 +Call Trace: + + load_system_files+0x1f7f/0x3620 + ntfs_fill_super+0xa01/0x1be0 + mount_bdev+0x36a/0x440 + ntfs_mount+0x3a/0x50 + legacy_get_tree+0xfb/0x210 + vfs_get_tree+0x8f/0x2f0 + do_new_mount+0x30a/0x760 + path_mount+0x4de/0x1880 + __x64_sys_mount+0x2b3/0x340 + do_syscall_64+0x38/0x90 + entry_SYSCALL_64_after_hwframe+0x63/0xcd +RIP: 0033:0x7f33b62ff9ea +Code: 48 8b 0d a9 f4 0b 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 49 89 ca b8 a5 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 76 f4 0b 00 f7 d8 64 89 01 48 +RSP: 002b:00007ffd0c471aa8 EFLAGS: 00000202 ORIG_RAX: 00000000000000a5 +RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f33b62ff9ea +RDX: 0000000020000000 RSI: 0000000020000100 RDI: 00007ffd0c471be0 +RBP: 00007ffd0c471c60 R08: 00007ffd0c471ae0 R09: 00007ffd0c471c24 +R10: 0000000000000000 R11: 0000000000000202 R12: 000055bac5afc160 +R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 + +Modules linked in: +---[ end trace 0000000000000000 ]--- + +Fix this by adding sanity check on extended system files' directory inode +to ensure that it is directory, just like ntfs_extend_init() when mounting +ntfs3. + +Link: https://lkml.kernel.org/r/20220809064730.2316892-1-chenxiaosong2@huawei.com +Signed-off-by: ChenXiaoSong +Cc: Anton Altaparmakov +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/ntfs/super.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/ntfs/super.c ++++ b/fs/ntfs/super.c +@@ -2092,7 +2092,8 @@ get_ctx_vol_failed: + // TODO: Initialize security. + /* Get the extended system files' directory inode. */ + vol->extend_ino = ntfs_iget(sb, FILE_Extend); +- if (IS_ERR(vol->extend_ino) || is_bad_inode(vol->extend_ino)) { ++ if (IS_ERR(vol->extend_ino) || is_bad_inode(vol->extend_ino) || ++ !S_ISDIR(vol->extend_ino->i_mode)) { + if (!IS_ERR(vol->extend_ino)) + iput(vol->extend_ino); + ntfs_error(sb, "Failed to load $Extend."); diff --git a/queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch b/queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch new file mode 100644 index 00000000000..a439f4c3380 --- /dev/null +++ b/queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch @@ -0,0 +1,55 @@ +From bedf03416913d88c796288f9dca109a53608c745 Mon Sep 17 00:00:00 2001 +From: Yang Shi +Date: Wed, 7 Sep 2022 11:01:44 -0700 +Subject: powerpc/64s/radix: don't need to broadcast IPI for radix pmd collapse flush + +From: Yang Shi + +commit bedf03416913d88c796288f9dca109a53608c745 upstream. + +The IPI broadcast is used to serialize against fast-GUP, but fast-GUP will +move to use RCU instead of disabling local interrupts in fast-GUP. Using +an IPI is the old-styled way of serializing against fast-GUP although it +still works as expected now. + +And fast-GUP now fixed the potential race with THP collapse by checking +whether PMD is changed or not. So IPI broadcast in radix pmd collapse +flush is not necessary anymore. But it is still needed for hash TLB. + +Link: https://lkml.kernel.org/r/20220907180144.555485-2-shy828301@gmail.com +Suggested-by: Aneesh Kumar K.V +Signed-off-by: Yang Shi +Acked-by: David Hildenbrand +Acked-by: Peter Xu +Cc: Christophe Leroy +Cc: Hugh Dickins +Cc: Jason Gunthorpe +Cc: John Hubbard +Cc: "Kirill A. Shutemov" +Cc: Michael Ellerman +Cc: Nicholas Piggin +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/mm/book3s64/radix_pgtable.c | 9 --------- + 1 file changed, 9 deletions(-) + +--- a/arch/powerpc/mm/book3s64/radix_pgtable.c ++++ b/arch/powerpc/mm/book3s64/radix_pgtable.c +@@ -997,15 +997,6 @@ pmd_t radix__pmdp_collapse_flush(struct + pmd = *pmdp; + pmd_clear(pmdp); + +- /* +- * pmdp collapse_flush need to ensure that there are no parallel gup +- * walk after this call. This is needed so that we can have stable +- * page ref count when collapsing a page. We don't allow a collapse page +- * if we have gup taken on the page. We can ensure that by sending IPI +- * because gup walk happens with IRQ disabled. +- */ +- serialize_against_pte_lookup(vma->vm_mm); +- + radix__flush_tlb_collapsed_pmd(vma->vm_mm, address); + + return pmd; diff --git a/queue-5.10/series b/queue-5.10/series index 2dd2ea4069a..01654812b16 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -14,3 +14,9 @@ net-usb-qmi_wwan-add-new-usb-id-for-dell-branded-em7455.patch input-snvs_pwrkey-fix-snvs_hpvidr1-register-address.patch clk-ingenic-tcu-properly-enable-registers-before-accessing-timers.patch arm-dts-integrator-tag-pci-host-with-device_type.patch +ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch +net-mt7531-only-do-pll-once-after-the-reset.patch +powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch +libata-add-ata_horkage_nolpm-for-pioneer-bdr-207m-and-bdr-205.patch +mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch +mmc-hsq-fix-data-stomping-during-mmc-recovery.patch -- 2.47.3