From: Greg Kroah-Hartman Date: Mon, 19 Jun 2023 10:11:35 +0000 (+0200) Subject: drop mips-restore-au1300-support.patch from 5.15, 5.10, and 5.4 X-Git-Tag: v4.14.319~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70f0d3efb118bb46b39b44fd71ca03b6e1268763;p=thirdparty%2Fkernel%2Fstable-queue.git drop mips-restore-au1300-support.patch from 5.15, 5.10, and 5.4 --- diff --git a/queue-5.10/mips-restore-au1300-support.patch b/queue-5.10/mips-restore-au1300-support.patch deleted file mode 100644 index 5a05385d260..00000000000 --- a/queue-5.10/mips-restore-au1300-support.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b3a32f288e6eeb0dde653ad1a4f2057529b13b5a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 May 2023 12:33:23 +0200 -Subject: MIPS: Restore Au1300 support - -From: Manuel Lauss - -[ Upstream commit f2041708dee30a3425f680265c337acd28293782 ] - -The Au1300, at least the one I have to test, uses the NetLogic vendor -ID, but commit 95b8a5e0111a ("MIPS: Remove NETLOGIC support") also -dropped Au1300 detection. Restore Au1300 detection. - -Tested on DB1300 with Au1380 chip. - -Signed-off-by: Manuel Lauss -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/kernel/cpu-probe.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c -index d120201910acf..954ef0513c404 100644 ---- a/arch/mips/kernel/cpu-probe.c -+++ b/arch/mips/kernel/cpu-probe.c -@@ -1555,6 +1555,10 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu) - break; - } - break; -+ case PRID_IMP_NETLOGIC_AU13XX: -+ c->cputype = CPU_ALCHEMY; -+ __cpu_name[cpu] = "Au1300"; -+ break; - } - } - -@@ -1992,6 +1996,7 @@ void cpu_probe(void) - cpu_probe_mips(c, cpu); - break; - case PRID_COMP_ALCHEMY: -+ case PRID_COMP_NETLOGIC: - cpu_probe_alchemy(c, cpu); - break; - case PRID_COMP_SIBYTE: --- -2.39.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 54ec332aabd..8ab64d6c076 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -18,7 +18,6 @@ btrfs-handle-memory-allocation-failure-in-btrfs_csum.patch asoc-soc-pcm-test-if-a-be-can-be-prepared.patch parisc-improve-cache-flushing-for-pcxl-in-arch_sync_.patch parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch -mips-restore-au1300-support.patch mips-alchemy-fix-dbdma2.patch mips-move-initrd_start-check-after-initrd-address-sa.patch asoc-dwc-move-dma-init-to-snd_soc_dai_driver-probe.patch diff --git a/queue-5.15/mips-restore-au1300-support.patch b/queue-5.15/mips-restore-au1300-support.patch deleted file mode 100644 index 4507f61f3c7..00000000000 --- a/queue-5.15/mips-restore-au1300-support.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 599caaf5f2a1b25fdb4bdd5dc4221d576aa90f97 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 May 2023 12:33:23 +0200 -Subject: MIPS: Restore Au1300 support - -From: Manuel Lauss - -[ Upstream commit f2041708dee30a3425f680265c337acd28293782 ] - -The Au1300, at least the one I have to test, uses the NetLogic vendor -ID, but commit 95b8a5e0111a ("MIPS: Remove NETLOGIC support") also -dropped Au1300 detection. Restore Au1300 detection. - -Tested on DB1300 with Au1380 chip. - -Signed-off-by: Manuel Lauss -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/kernel/cpu-probe.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c -index 7c861e6a89529..df40880d84495 100644 ---- a/arch/mips/kernel/cpu-probe.c -+++ b/arch/mips/kernel/cpu-probe.c -@@ -1565,6 +1565,10 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu) - break; - } - break; -+ case PRID_IMP_NETLOGIC_AU13XX: -+ c->cputype = CPU_ALCHEMY; -+ __cpu_name[cpu] = "Au1300"; -+ break; - } - } - -@@ -2005,6 +2009,7 @@ void cpu_probe(void) - cpu_probe_mips(c, cpu); - break; - case PRID_COMP_ALCHEMY: -+ case PRID_COMP_NETLOGIC: - cpu_probe_alchemy(c, cpu); - break; - case PRID_COMP_SIBYTE: --- -2.39.2 - diff --git a/queue-5.15/series b/queue-5.15/series index a6a9740dc6d..35f5682e010 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -22,7 +22,6 @@ asoc-soc-pcm-test-if-a-be-can-be-prepared.patch parisc-improve-cache-flushing-for-pcxl-in-arch_sync_.patch parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch mips-unhide-pata_platform.patch -mips-restore-au1300-support.patch mips-alchemy-fix-dbdma2.patch mips-move-initrd_start-check-after-initrd-address-sa.patch asoc-dwc-move-dma-init-to-snd_soc_dai_driver-probe.patch diff --git a/queue-5.4/mips-restore-au1300-support.patch b/queue-5.4/mips-restore-au1300-support.patch deleted file mode 100644 index 3594ba56a75..00000000000 --- a/queue-5.4/mips-restore-au1300-support.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 08396271c918fbd2764ed4d8b459483c742783b0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 May 2023 12:33:23 +0200 -Subject: MIPS: Restore Au1300 support - -From: Manuel Lauss - -[ Upstream commit f2041708dee30a3425f680265c337acd28293782 ] - -The Au1300, at least the one I have to test, uses the NetLogic vendor -ID, but commit 95b8a5e0111a ("MIPS: Remove NETLOGIC support") also -dropped Au1300 detection. Restore Au1300 detection. - -Tested on DB1300 with Au1380 chip. - -Signed-off-by: Manuel Lauss -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Sasha Levin ---- - arch/mips/kernel/cpu-probe.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c -index f521cbf934e76..0307ff2337d5b 100644 ---- a/arch/mips/kernel/cpu-probe.c -+++ b/arch/mips/kernel/cpu-probe.c -@@ -1763,6 +1763,10 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu) - break; - } - break; -+ case PRID_IMP_NETLOGIC_AU13XX: -+ c->cputype = CPU_ALCHEMY; -+ __cpu_name[cpu] = "Au1300"; -+ break; - } - } - -@@ -2092,6 +2096,7 @@ void cpu_probe(void) - cpu_probe_mips(c, cpu); - break; - case PRID_COMP_ALCHEMY: -+ case PRID_COMP_NETLOGIC: - cpu_probe_alchemy(c, cpu); - break; - case PRID_COMP_SIBYTE: --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 814ea0870b0..e59725815a5 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -14,7 +14,6 @@ power-supply-fix-logic-checking-if-system-is-running.patch btrfs-handle-memory-allocation-failure-in-btrfs_csum.patch parisc-improve-cache-flushing-for-pcxl-in-arch_sync_.patch parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch -mips-restore-au1300-support.patch mips-alchemy-fix-dbdma2.patch mips-move-initrd_start-check-after-initrd-address-sa.patch xen-blkfront-only-check-req_fua-for-writes.patch