From: Sasha Levin Date: Sun, 19 Apr 2026 14:02:58 +0000 (-0400) Subject: Drop mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb7e6e8757c9e2e18318a36b6dad17dda38241f;p=thirdparty%2Fkernel%2Fstable-queue.git Drop mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch b/queue-5.10/mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch deleted file mode 100644 index f3f8a0aed2..0000000000 --- a/queue-5.10/mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 353d17604763b2d17d7c5763272247cae0349827 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Mar 2026 18:57:23 +0000 -Subject: MIPS: mm: Suppress TLB uniquification on EHINV hardware - -From: Maciej W. Rozycki - -[ Upstream commit 74283cfe216392c7b776ebf6045b5b15ed9dffcd ] - -Hardware that supports the EHINV feature, mandatory for R6 ISA and FTLB -implementation, lets software mark TLB entries invalid, which eliminates -the need to ensure no duplicate matching entries are ever created. This -feature is already used by local_flush_tlb_all(), via the UNIQUE_ENTRYHI -macro, making the preceding call to r4k_tlb_uniquify() superfluous. - -The next change will also modify uniquification code such that it'll -become incompatible with the FTLB and MMID features, as well as MIPSr6 -CPUs that do not implement 4KiB pages. - -Therefore prevent r4k_tlb_uniquify() from being used on EHINV hardware, -as denoted by `cpu_has_tlbinv'. - -Signed-off-by: Maciej W. Rozycki -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/mm/tlb-r4k.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c -index d9a5ede8869bd..8a49adfef8b86 100644 ---- a/arch/mips/mm/tlb-r4k.c -+++ b/arch/mips/mm/tlb-r4k.c -@@ -616,7 +616,8 @@ static void r4k_tlb_configure(void) - temp_tlb_entry = current_cpu_data.tlbsize - 1; - - /* From this point on the ARC firmware is dead. */ -- r4k_tlb_uniquify(); -+ if (!cpu_has_tlbinv) -+ r4k_tlb_uniquify(); - local_flush_tlb_all(); - - /* Did I tell you that ARC SUCKS? */ --- -2.53.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 4cab65019d..305b8b17f8 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -7,7 +7,6 @@ srcu-use-irq_work-to-start-gp-in-tiny-srcu.patch netfilter-nft_set_pipapo_avx2-don-t-return-non-match.patch wifi-wl1251-validate-packet-ids-before-indexing-tx_f.patch asoc-soc-core-call-missing-init_list_head-for-card_a.patch -mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch hid-quirks-add-hid_quirk_always_poll-for-8bitdo-pro-.patch hid-roccat-fix-use-after-free-in-roccat_report_event.patch ata-ahci-force-32-bit-dma-for-jmicron-jmb582-jmb585.patch diff --git a/queue-5.15/mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch b/queue-5.15/mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch deleted file mode 100644 index 1a057a6248..0000000000 --- a/queue-5.15/mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 27961de2993d658472010c56bb7b02321685d08f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Mar 2026 18:57:23 +0000 -Subject: MIPS: mm: Suppress TLB uniquification on EHINV hardware - -From: Maciej W. Rozycki - -[ Upstream commit 74283cfe216392c7b776ebf6045b5b15ed9dffcd ] - -Hardware that supports the EHINV feature, mandatory for R6 ISA and FTLB -implementation, lets software mark TLB entries invalid, which eliminates -the need to ensure no duplicate matching entries are ever created. This -feature is already used by local_flush_tlb_all(), via the UNIQUE_ENTRYHI -macro, making the preceding call to r4k_tlb_uniquify() superfluous. - -The next change will also modify uniquification code such that it'll -become incompatible with the FTLB and MMID features, as well as MIPSr6 -CPUs that do not implement 4KiB pages. - -Therefore prevent r4k_tlb_uniquify() from being used on EHINV hardware, -as denoted by `cpu_has_tlbinv'. - -Signed-off-by: Maciej W. Rozycki -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/mm/tlb-r4k.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c -index d9a5ede8869bd..8a49adfef8b86 100644 ---- a/arch/mips/mm/tlb-r4k.c -+++ b/arch/mips/mm/tlb-r4k.c -@@ -616,7 +616,8 @@ static void r4k_tlb_configure(void) - temp_tlb_entry = current_cpu_data.tlbsize - 1; - - /* From this point on the ARC firmware is dead. */ -- r4k_tlb_uniquify(); -+ if (!cpu_has_tlbinv) -+ r4k_tlb_uniquify(); - local_flush_tlb_all(); - - /* Did I tell you that ARC SUCKS? */ --- -2.53.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 7e869f8acb..6b4b30fa37 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -9,7 +9,6 @@ wifi-wl1251-validate-packet-ids-before-indexing-tx_f.patch asoc-soc-core-call-missing-init_list_head-for-card_a.patch alsa-usb-audio-fix-quirk-flags-for-neuraldsp-quad-co.patch fs-smb-client-fix-out-of-bounds-read-in-cifs_sanitiz.patch -mips-mm-suppress-tlb-uniquification-on-ehinv-hardwar.patch pinctrl-intel-fix-the-revision-for-new-features-1koh.patch hid-quirks-add-hid_quirk_always_poll-for-8bitdo-pro-.patch hid-roccat-fix-use-after-free-in-roccat_report_event.patch