forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.139 Removed upstreamed: backport-5.15/830-v6.6-2-leds-turris-omnia-Drop-unnecessary-mutex-locking.patch[1] backport-5.15/830-v6.7-1-leds-turris-omnia-Do-not-use-SMBUS-calls.patch[2] x86/patches-5.15/120-hwrng-geode-fix-accessing-registers.patch[3] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.139&id=aec3706971b332af8321b2beccba981b8061489a 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.139&id=893eedf596dd81c7a7f0cd80b345956ae000eab9 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.139&id=a5c83c8043d70b9a28d1bd78a2dbbab340f43889 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <[email protected]>
- Loading branch information
Showing
13 changed files
with
20 additions
and
278 deletions.
There are no files selected for viewing
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 |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-5.15 = .138 | ||
LINUX_KERNEL_HASH-5.15.138 = af84e54164e1c01f59764ba528448ed36b377d22aafbd81b4b0cf47792ef4aaa | ||
LINUX_VERSION-5.15 = .139 | ||
LINUX_KERNEL_HASH-5.15.139 = 9c68c10dfe18e59b892e940436dea6a18d167160d55e62563cf7282244d8044e |
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 |
---|---|---|
|
@@ -414,7 +414,7 @@ Signed-off-by: Andrew Morton <[email protected]> | |
/* forking complete and child started to run, tell ptracer */ | ||
--- a/kernel/sched/core.c | ||
+++ b/kernel/sched/core.c | ||
@@ -5010,6 +5010,7 @@ context_switch(struct rq *rq, struct tas | ||
@@ -5014,6 +5014,7 @@ context_switch(struct rq *rq, struct tas | ||
* finish_task_switch()'s mmdrop(). | ||
*/ | ||
switch_mm_irqs_off(prev->active_mm, next->mm, next); | ||
|
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 |
---|---|---|
|
@@ -37,31 +37,31 @@ Signed-off-by: Mark Brown <[email protected]> | |
map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8); | ||
map->format.buf_size = DIV_ROUND_UP(config->reg_bits + | ||
config->val_bits + config->pad_bits, 8); | ||
@@ -1735,6 +1736,7 @@ static int _regmap_raw_write_impl(struct | ||
@@ -1737,6 +1738,7 @@ static int _regmap_raw_write_impl(struct | ||
return ret; | ||
} | ||
|
||
+ reg >>= map->format.reg_downshift; | ||
map->format.format_reg(map->work_buf, reg, map->reg_shift); | ||
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes, | ||
map->write_flag_mask); | ||
@@ -1905,6 +1907,7 @@ static int _regmap_bus_formatted_write(v | ||
@@ -1907,6 +1909,7 @@ static int _regmap_bus_formatted_write(v | ||
return ret; | ||
} | ||
|
||
+ reg >>= map->format.reg_downshift; | ||
map->format.format_write(map, reg, val); | ||
|
||
trace_regmap_hw_write_start(map, reg, 1); | ||
@@ -2346,6 +2349,7 @@ static int _regmap_raw_multi_reg_write(s | ||
@@ -2348,6 +2351,7 @@ static int _regmap_raw_multi_reg_write(s | ||
unsigned int reg = regs[i].reg; | ||
unsigned int val = regs[i].def; | ||
trace_regmap_hw_write_start(map, reg, 1); | ||
+ reg >>= map->format.reg_downshift; | ||
map->format.format_reg(u8, reg, map->reg_shift); | ||
u8 += reg_bytes + pad_bytes; | ||
map->format.format_val(u8, val, 0); | ||
@@ -2673,6 +2677,7 @@ static int _regmap_raw_read(struct regma | ||
@@ -2675,6 +2679,7 @@ static int _regmap_raw_read(struct regma | ||
return ret; | ||
} | ||
|
||
|
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 |
---|---|---|
|
@@ -42,31 +42,31 @@ Signed-off-by: Mark Brown <[email protected]> | |
map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8); | ||
map->format.pad_bytes = config->pad_bits / 8; | ||
map->format.reg_downshift = config->reg_downshift; | ||
@@ -1736,6 +1738,7 @@ static int _regmap_raw_write_impl(struct | ||
@@ -1738,6 +1740,7 @@ static int _regmap_raw_write_impl(struct | ||
return ret; | ||
} | ||
|
||
+ reg += map->reg_base; | ||
reg >>= map->format.reg_downshift; | ||
map->format.format_reg(map->work_buf, reg, map->reg_shift); | ||
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes, | ||
@@ -1907,6 +1910,7 @@ static int _regmap_bus_formatted_write(v | ||
@@ -1909,6 +1912,7 @@ static int _regmap_bus_formatted_write(v | ||
return ret; | ||
} | ||
|
||
+ reg += map->reg_base; | ||
reg >>= map->format.reg_downshift; | ||
map->format.format_write(map, reg, val); | ||
|
||
@@ -2349,6 +2353,7 @@ static int _regmap_raw_multi_reg_write(s | ||
@@ -2351,6 +2355,7 @@ static int _regmap_raw_multi_reg_write(s | ||
unsigned int reg = regs[i].reg; | ||
unsigned int val = regs[i].def; | ||
trace_regmap_hw_write_start(map, reg, 1); | ||
+ reg += map->reg_base; | ||
reg >>= map->format.reg_downshift; | ||
map->format.format_reg(u8, reg, map->reg_shift); | ||
u8 += reg_bytes + pad_bytes; | ||
@@ -2677,6 +2682,7 @@ static int _regmap_raw_read(struct regma | ||
@@ -2679,6 +2684,7 @@ static int _regmap_raw_read(struct regma | ||
return ret; | ||
} | ||
|
||
|
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 |
---|---|---|
|
@@ -28,7 +28,7 @@ Signed-off-by: Mark Brown <[email protected]> | |
|
||
--- a/drivers/base/regmap/regmap.c | ||
+++ b/drivers/base/regmap/regmap.c | ||
@@ -1929,6 +1929,8 @@ static int _regmap_bus_reg_write(void *c | ||
@@ -1931,6 +1931,8 @@ static int _regmap_bus_reg_write(void *c | ||
{ | ||
struct regmap *map = context; | ||
|
||
|
@@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <[email protected]> | |
return map->bus->reg_write(map->bus_context, reg, val); | ||
} | ||
|
||
@@ -2703,6 +2705,8 @@ static int _regmap_bus_reg_read(void *co | ||
@@ -2705,6 +2707,8 @@ static int _regmap_bus_reg_read(void *co | ||
{ | ||
struct regmap *map = context; | ||
|
||
|
@@ -46,7 +46,7 @@ Signed-off-by: Mark Brown <[email protected]> | |
return map->bus->reg_read(map->bus_context, reg, val); | ||
} | ||
|
||
@@ -3078,6 +3082,8 @@ static int _regmap_update_bits(struct re | ||
@@ -3080,6 +3084,8 @@ static int _regmap_update_bits(struct re | ||
*change = false; | ||
|
||
if (regmap_volatile(map, reg) && map->reg_update_bits) { | ||
|
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 |
---|---|---|
|
@@ -25,7 +25,7 @@ Signed-off-by: Pavel Machek <[email protected]> | |
|
||
--- a/drivers/leds/leds-turris-omnia.c | ||
+++ b/drivers/leds/leds-turris-omnia.c | ||
@@ -239,9 +239,6 @@ static int omnia_leds_probe(struct i2c_c | ||
@@ -260,9 +260,6 @@ static int omnia_leds_probe(struct i2c_c | ||
led += ret; | ||
} | ||
|
||
|
@@ -35,7 +35,7 @@ Signed-off-by: Pavel Machek <[email protected]> | |
return 0; | ||
} | ||
|
||
@@ -283,6 +280,7 @@ static struct i2c_driver omnia_leds_driv | ||
@@ -304,6 +301,7 @@ static struct i2c_driver omnia_leds_driv | ||
.driver = { | ||
.name = "leds-turris-omnia", | ||
.of_match_table = of_omnia_leds_match, | ||
|
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 |
---|---|---|
|
@@ -20,7 +20,7 @@ Signed-off-by: Lee Jones <[email protected]> | |
|
||
--- a/drivers/leds/leds-turris-omnia.c | ||
+++ b/drivers/leds/leds-turris-omnia.c | ||
@@ -166,7 +166,7 @@ static ssize_t brightness_show(struct de | ||
@@ -194,7 +194,7 @@ static ssize_t brightness_show(struct de | ||
if (ret < 0) | ||
return ret; | ||
|
||
|
66 changes: 0 additions & 66 deletions
66
...x/generic/backport-5.15/830-v6.6-2-leds-turris-omnia-Drop-unnecessary-mutex-locking.patch
This file was deleted.
Oops, something went wrong.
145 changes: 0 additions & 145 deletions
145
target/linux/generic/backport-5.15/830-v6.7-1-leds-turris-omnia-Do-not-use-SMBUS-calls.patch
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#include <linux/mutex.h> | ||
#include <linux/err.h> | ||
#include <linux/property.h> | ||
@@ -3358,3 +3359,5 @@ static int __init regmap_initcall(void) | ||
@@ -3360,3 +3361,5 @@ static int __init regmap_initcall(void) | ||
return 0; | ||
} | ||
postcore_initcall(regmap_initcall); | ||
|
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 |
---|---|---|
|
@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
+MODULE_LICENSE("GPL"); | ||
--- a/kernel/sched/core.c | ||
+++ b/kernel/sched/core.c | ||
@@ -4216,6 +4216,7 @@ int wake_up_state(struct task_struct *p, | ||
@@ -4220,6 +4220,7 @@ int wake_up_state(struct task_struct *p, | ||
{ | ||
return try_to_wake_up(p, state, 0); | ||
} | ||
|
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 |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/netfilter/nf_tables_api.c | ||
+++ b/net/netfilter/nf_tables_api.c | ||
@@ -7707,7 +7707,7 @@ static int nft_register_flowtable_net_ho | ||
@@ -7703,7 +7703,7 @@ static int nft_register_flowtable_net_ho | ||
err = flowtable->data.type->setup(&flowtable->data, | ||
hook->ops.dev, | ||
FLOW_BLOCK_BIND); | ||
|
Oops, something went wrong.