Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
generic: 5.15: copy config and patch from 5.10
Copy config and patches from kernel 5.10 to kernel 5.15 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
- Loading branch information
Showing
441 changed files
with
71,106 additions
and
0 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
...inux/generic/backport-5.15/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From 13b1ecc3401653a355798eb1dee10cc1608202f4 Mon Sep 17 00:00:00 2001 | ||
From: Felix Fietkau <nbd@nbd.name> | ||
Date: Mon, 18 Jan 2016 12:27:49 +0100 | ||
Subject: [PATCH 33/34] Kbuild: don't hardcode path to awk in | ||
scripts/ld-version.sh | ||
|
||
On some systems /usr/bin/awk does not exist, or is broken. Find it via | ||
$PATH instead. | ||
|
||
Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||
--- | ||
scripts/ld-version.sh | 4 +++- | ||
1 file changed, 3 insertions(+), 1 deletion(-) | ||
|
||
--- a/scripts/ld-version.sh | ||
+++ b/scripts/ld-version.sh | ||
@@ -1,6 +1,7 @@ | ||
-#!/usr/bin/awk -f | ||
+#!/bin/sh | ||
# SPDX-License-Identifier: GPL-2.0 | ||
# extract linker version number from stdin and turn into single number | ||
+exec awk ' | ||
{ | ||
gsub(".*\\)", ""); | ||
gsub(".*version ", ""); | ||
@@ -9,3 +10,4 @@ | ||
print a[1]*100000000 + a[2]*1000000 + a[3]*10000; | ||
exit | ||
} | ||
+' |
21 changes: 21 additions & 0 deletions
21
target/linux/generic/backport-5.15/011-kbuild-export-SUBARCH.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
From 173019b66dcc9d68ad9333aa744dad1e369b5aa8 Mon Sep 17 00:00:00 2001 | ||
From: Felix Fietkau <nbd@nbd.name> | ||
Date: Sun, 9 Jul 2017 00:26:53 +0200 | ||
Subject: [PATCH 34/34] kernel: add compile fix for linux 4.9 on x86 | ||
|
||
Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||
--- | ||
Makefile | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -507,7 +507,7 @@ KBUILD_LDFLAGS_MODULE := | ||
KBUILD_LDFLAGS := | ||
CLANG_FLAGS := | ||
|
||
-export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC | ||
+export ARCH SRCARCH SUBARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC | ||
export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL | ||
export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX | ||
export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD |
27 changes: 27 additions & 0 deletions
27
...inux/generic/backport-5.15/026-power-reset-linkstation-poweroff-add-missing-put_dev.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From 1027a42c25cbf8cfc4ade6503c5110aae04866af Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Daniel=20Gonz=C3=A1lez=20Cabanelas?= <dgcbueu@gmail.com> | ||
Date: Fri, 16 Oct 2020 20:22:37 +0200 | ||
Subject: [PATCH] power: reset: linkstation-poweroff: add missing put_device() | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
The of_mdio_find_bus() takes a reference to the underlying device | ||
structure, we should release that reference using a put_device() call. | ||
|
||
Signed-off-by: Daniel González Cabanelas <dgcbueu@gmail.com> | ||
Signed-off-by: Sebastian Reichel <sre@kernel.org> | ||
--- | ||
drivers/power/reset/linkstation-poweroff.c | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
--- a/drivers/power/reset/linkstation-poweroff.c | ||
+++ b/drivers/power/reset/linkstation-poweroff.c | ||
@@ -113,6 +113,7 @@ static int __init linkstation_poweroff_i | ||
return -EPROBE_DEFER; | ||
|
||
phydev = phy_find_first(bus); | ||
+ put_device(&bus->dev); | ||
if (!phydev) | ||
return -EPROBE_DEFER; | ||
|
65 changes: 65 additions & 0 deletions
65
...t/linux/generic/backport-5.15/050-v5.16-00-MIPS-uasm-Enable-muhu-opcode-for-MIPS-R6.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
From: Johan Almbladh <johan.almbladh@anyfinetworks.com> | ||
Date: Tue, 5 Oct 2021 18:54:02 +0200 | ||
Subject: [PATCH] MIPS: uasm: Enable muhu opcode for MIPS R6 | ||
|
||
Enable the 'muhu' instruction, complementing the existing 'mulu', needed | ||
to implement a MIPS32 BPF JIT. | ||
|
||
Also fix a typo in the existing definition of 'dmulu'. | ||
|
||
Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com> | ||
|
||
This patch is a dependency for my 32-bit MIPS eBPF JIT. | ||
|
||
Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> | ||
--- | ||
|
||
--- a/arch/mips/include/asm/uasm.h | ||
+++ b/arch/mips/include/asm/uasm.h | ||
@@ -145,6 +145,7 @@ Ip_u1(_mtlo); | ||
Ip_u3u1u2(_mul); | ||
Ip_u1u2(_multu); | ||
Ip_u3u1u2(_mulu); | ||
+Ip_u3u1u2(_muhu); | ||
Ip_u3u1u2(_nor); | ||
Ip_u3u1u2(_or); | ||
Ip_u2u1u3(_ori); | ||
--- a/arch/mips/mm/uasm-mips.c | ||
+++ b/arch/mips/mm/uasm-mips.c | ||
@@ -90,7 +90,7 @@ static const struct insn insn_table[insn | ||
RS | RT | RD}, | ||
[insn_dmtc0] = {M(cop0_op, dmtc_op, 0, 0, 0, 0), RT | RD | SET}, | ||
[insn_dmultu] = {M(spec_op, 0, 0, 0, 0, dmultu_op), RS | RT}, | ||
- [insn_dmulu] = {M(spec_op, 0, 0, 0, dmult_dmul_op, dmultu_op), | ||
+ [insn_dmulu] = {M(spec_op, 0, 0, 0, dmultu_dmulu_op, dmultu_op), | ||
RS | RT | RD}, | ||
[insn_drotr] = {M(spec_op, 1, 0, 0, 0, dsrl_op), RT | RD | RE}, | ||
[insn_drotr32] = {M(spec_op, 1, 0, 0, 0, dsrl32_op), RT | RD | RE}, | ||
@@ -150,6 +150,8 @@ static const struct insn insn_table[insn | ||
[insn_mtlo] = {M(spec_op, 0, 0, 0, 0, mtlo_op), RS}, | ||
[insn_mulu] = {M(spec_op, 0, 0, 0, multu_mulu_op, multu_op), | ||
RS | RT | RD}, | ||
+ [insn_muhu] = {M(spec_op, 0, 0, 0, multu_muhu_op, multu_op), | ||
+ RS | RT | RD}, | ||
#ifndef CONFIG_CPU_MIPSR6 | ||
[insn_mul] = {M(spec2_op, 0, 0, 0, 0, mul_op), RS | RT | RD}, | ||
#else | ||
--- a/arch/mips/mm/uasm.c | ||
+++ b/arch/mips/mm/uasm.c | ||
@@ -59,7 +59,7 @@ enum opcode { | ||
insn_lddir, insn_ldpte, insn_ldx, insn_lh, insn_lhu, insn_ll, insn_lld, | ||
insn_lui, insn_lw, insn_lwu, insn_lwx, insn_mfc0, insn_mfhc0, insn_mfhi, | ||
insn_mflo, insn_modu, insn_movn, insn_movz, insn_mtc0, insn_mthc0, | ||
- insn_mthi, insn_mtlo, insn_mul, insn_multu, insn_mulu, insn_nor, | ||
+ insn_mthi, insn_mtlo, insn_mul, insn_multu, insn_mulu, insn_muhu, insn_nor, | ||
insn_or, insn_ori, insn_pref, insn_rfe, insn_rotr, insn_sb, insn_sc, | ||
insn_scd, insn_seleqz, insn_selnez, insn_sd, insn_sh, insn_sll, | ||
insn_sllv, insn_slt, insn_slti, insn_sltiu, insn_sltu, insn_sra, | ||
@@ -344,6 +344,7 @@ I_u1(_mtlo) | ||
I_u3u1u2(_mul) | ||
I_u1u2(_multu) | ||
I_u3u1u2(_mulu) | ||
+I_u3u1u2(_muhu) | ||
I_u3u1u2(_nor) | ||
I_u3u1u2(_or) | ||
I_u2u1u3(_ori) |
31 changes: 31 additions & 0 deletions
31
...ric/backport-5.15/050-v5.16-01-mips-uasm-Add-workaround-for-Loongson-2F-nop-CPU-err.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From: Johan Almbladh <johan.almbladh@anyfinetworks.com> | ||
Date: Tue, 5 Oct 2021 18:54:03 +0200 | ||
Subject: [PATCH] mips: uasm: Add workaround for Loongson-2F nop CPU errata | ||
|
||
This patch implements a workaround for the Loongson-2F nop in generated, | ||
code, if the existing option CONFIG_CPU_NOP_WORKAROUND is set. Before, | ||
the binutils option -mfix-loongson2f-nop was enabled, but no workaround | ||
was done when emitting MIPS code. Now, the nop pseudo instruction is | ||
emitted as "or ax,ax,zero" instead of the default "sll zero,zero,0". This | ||
is consistent with the workaround implemented by binutils. | ||
|
||
Link: https://sourceware.org/legacy-ml/binutils/2009-11/msg00387.html | ||
|
||
Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> | ||
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> | ||
--- | ||
|
||
--- a/arch/mips/include/asm/uasm.h | ||
+++ b/arch/mips/include/asm/uasm.h | ||
@@ -249,7 +249,11 @@ static inline void uasm_l##lb(struct uas | ||
#define uasm_i_bnezl(buf, rs, off) uasm_i_bnel(buf, rs, 0, off) | ||
#define uasm_i_ehb(buf) uasm_i_sll(buf, 0, 0, 3) | ||
#define uasm_i_move(buf, a, b) UASM_i_ADDU(buf, a, 0, b) | ||
+#ifdef CONFIG_CPU_NOP_WORKAROUNDS | ||
+#define uasm_i_nop(buf) uasm_i_or(buf, 1, 1, 0) | ||
+#else | ||
#define uasm_i_nop(buf) uasm_i_sll(buf, 0, 0, 0) | ||
+#endif | ||
#define uasm_i_ssnop(buf) uasm_i_sll(buf, 0, 0, 1) | ||
|
||
static inline void uasm_i_drotr_safe(u32 **p, unsigned int a1, |
Oops, something went wrong.