forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 1
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/v6.x/ChangeLog-6.6.41 Manually rebased: lantiq/patches-6.6/0028-NET-lantiq-various-etop-fixes.patch All other patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <[email protected]>
- Loading branch information
1 parent
85e1e1a
commit 66177c0
Showing
18 changed files
with
36 additions
and
36 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-6.6 = .40 | ||
LINUX_KERNEL_HASH-6.6.40 = 5c3a3c03c055b8d601a6d7f80d1465ada6b83a12299f6ace2027b47f0baff538 | ||
LINUX_VERSION-6.6 = .41 | ||
LINUX_KERNEL_HASH-6.6.41 = 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef |
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
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 |
---|---|---|
|
@@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci.c | ||
+++ b/drivers/usb/host/xhci.c | ||
@@ -1487,6 +1487,109 @@ command_cleanup: | ||
@@ -1497,6 +1497,109 @@ command_cleanup: | ||
} | ||
|
||
/* | ||
|
@@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
* non-error returns are a promise to giveback() the urb later | ||
* we drop ownership so next owner (or urb unlink) can get it | ||
*/ | ||
@@ -5316,6 +5419,7 @@ static const struct hc_driver xhci_hc_dr | ||
@@ -5326,6 +5429,7 @@ static const struct hc_driver xhci_hc_dr | ||
.endpoint_reset = xhci_endpoint_reset, | ||
.check_bandwidth = xhci_check_bandwidth, | ||
.reset_bandwidth = xhci_reset_bandwidth, | ||
|
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 |
---|---|---|
|
@@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci.c | ||
+++ b/drivers/usb/host/xhci.c | ||
@@ -1576,7 +1576,7 @@ static void xhci_fixup_endpoint(struct u | ||
@@ -1586,7 +1586,7 @@ static void xhci_fixup_endpoint(struct u | ||
return; | ||
} | ||
ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index); | ||
|
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 |
---|---|---|
|
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
mtd->nvmem = nvmem_register(&config); | ||
--- a/drivers/nvmem/core.c | ||
+++ b/drivers/nvmem/core.c | ||
@@ -941,7 +941,7 @@ struct nvmem_device *nvmem_register(cons | ||
@@ -940,7 +940,7 @@ struct nvmem_device *nvmem_register(cons | ||
nvmem->nkeepout = config->nkeepout; | ||
if (config->of_node) | ||
nvmem->dev.of_node = config->of_node; | ||
|
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: Greg Kroah-Hartman <[email protected]> | |
|
||
--- a/drivers/nvmem/core.c | ||
+++ b/drivers/nvmem/core.c | ||
@@ -847,14 +847,6 @@ static int nvmem_add_cells_from_layout(s | ||
@@ -846,14 +846,6 @@ static int nvmem_add_cells_from_layout(s | ||
} | ||
|
||
#if IS_ENABLED(CONFIG_OF) | ||
|
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: Greg Kroah-Hartman <[email protected]> | |
|
||
--- a/drivers/nvmem/core.c | ||
+++ b/drivers/nvmem/core.c | ||
@@ -816,7 +816,7 @@ static int nvmem_add_cells_from_layout(s | ||
@@ -815,7 +815,7 @@ static int nvmem_add_cells_from_layout(s | ||
int ret; | ||
|
||
if (layout && layout->add_cells) { | ||
|
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,15 +25,15 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
--- a/drivers/nvmem/core.c | ||
+++ b/drivers/nvmem/core.c | ||
@@ -675,7 +675,6 @@ static int nvmem_validate_keepouts(struc | ||
@@ -674,7 +674,6 @@ static int nvmem_validate_keepouts(struc | ||
|
||
static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np) | ||
{ | ||
- struct nvmem_layout *layout = nvmem->layout; | ||
struct device *dev = &nvmem->dev; | ||
struct device_node *child; | ||
const __be32 *addr; | ||
@@ -705,8 +704,8 @@ static int nvmem_add_cells_from_dt(struc | ||
@@ -704,8 +703,8 @@ static int nvmem_add_cells_from_dt(struc | ||
|
||
info.np = of_node_get(child); | ||
|
||
|
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
ret = nvmem_add_one_cell(nvmem, &info); | ||
kfree(info.name); | ||
@@ -895,6 +894,7 @@ struct nvmem_device *nvmem_register(cons | ||
@@ -894,6 +893,7 @@ struct nvmem_device *nvmem_register(cons | ||
|
||
kref_init(&nvmem->refcnt); | ||
INIT_LIST_HEAD(&nvmem->cells); | ||
|
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 |
---|---|---|
|
@@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset, | ||
void *val, size_t bytes) | ||
{ | ||
@@ -740,97 +737,22 @@ static int nvmem_add_cells_from_fixed_la | ||
@@ -739,97 +736,22 @@ static int nvmem_add_cells_from_fixed_la | ||
return err; | ||
} | ||
|
||
|
@@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem, | ||
struct nvmem_layout *layout) | ||
{ | ||
@@ -838,7 +760,7 @@ const void *nvmem_layout_get_match_data( | ||
@@ -837,7 +759,7 @@ const void *nvmem_layout_get_match_data( | ||
const struct of_device_id *match; | ||
|
||
layout_np = of_nvmem_layout_get_container(nvmem); | ||
|
@@ -198,7 +198,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
return match ? match->data : NULL; | ||
} | ||
@@ -950,19 +872,6 @@ struct nvmem_device *nvmem_register(cons | ||
@@ -949,19 +871,6 @@ struct nvmem_device *nvmem_register(cons | ||
goto err_put_device; | ||
} | ||
|
||
|
@@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
if (config->cells) { | ||
rval = nvmem_add_cells(nvmem, config->cells, config->ncells); | ||
if (rval) | ||
@@ -983,24 +892,24 @@ struct nvmem_device *nvmem_register(cons | ||
@@ -982,24 +891,24 @@ struct nvmem_device *nvmem_register(cons | ||
if (rval) | ||
goto err_remove_cells; | ||
|
||
|
@@ -249,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
if (config->compat) | ||
nvmem_sysfs_remove_compat(nvmem, config); | ||
err_put_device: | ||
@@ -1022,7 +931,7 @@ static void nvmem_device_release(struct | ||
@@ -1021,7 +930,7 @@ static void nvmem_device_release(struct | ||
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); | ||
|
||
nvmem_device_remove_all_cells(nvmem); | ||
|
@@ -258,7 +258,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
device_unregister(&nvmem->dev); | ||
} | ||
|
||
@@ -1324,6 +1233,12 @@ nvmem_cell_get_from_lookup(struct device | ||
@@ -1323,6 +1232,12 @@ nvmem_cell_get_from_lookup(struct device | ||
return cell; | ||
} | ||
|
||
|
@@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
#if IS_ENABLED(CONFIG_OF) | ||
static struct nvmem_cell_entry * | ||
nvmem_find_cell_entry_by_node(struct nvmem_device *nvmem, struct device_node *np) | ||
@@ -1342,6 +1257,18 @@ nvmem_find_cell_entry_by_node(struct nvm | ||
@@ -1341,6 +1256,18 @@ nvmem_find_cell_entry_by_node(struct nvm | ||
return cell; | ||
} | ||
|
||
|
@@ -290,7 +290,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
/** | ||
* of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id | ||
* | ||
@@ -1404,16 +1331,29 @@ struct nvmem_cell *of_nvmem_cell_get(str | ||
@@ -1403,16 +1330,29 @@ struct nvmem_cell *of_nvmem_cell_get(str | ||
return ERR_CAST(nvmem); | ||
} | ||
|
||
|
@@ -322,15 +322,15 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
return cell; | ||
} | ||
@@ -1527,6 +1467,7 @@ void nvmem_cell_put(struct nvmem_cell *c | ||
@@ -1526,6 +1466,7 @@ void nvmem_cell_put(struct nvmem_cell *c | ||
|
||
kfree(cell); | ||
__nvmem_device_put(nvmem); | ||
+ nvmem_layout_module_put(nvmem); | ||
} | ||
EXPORT_SYMBOL_GPL(nvmem_cell_put); | ||
|
||
@@ -2104,11 +2045,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name); | ||
@@ -2103,11 +2044,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name); | ||
|
||
static int __init nvmem_init(void) | ||
{ | ||
|
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 |
---|---|---|
|
@@ -111,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
static struct bin_attribute bin_attr_nvmem_eeprom_compat = { | ||
.attr = { | ||
.name = "eeprom", | ||
@@ -380,6 +427,68 @@ static void nvmem_sysfs_remove_compat(st | ||
@@ -379,6 +426,68 @@ static void nvmem_sysfs_remove_compat(st | ||
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); | ||
} | ||
|
||
|
@@ -180,7 +180,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
#else /* CONFIG_NVMEM_SYSFS */ | ||
|
||
static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem, | ||
@@ -739,11 +848,25 @@ static int nvmem_add_cells_from_fixed_la | ||
@@ -738,11 +847,25 @@ static int nvmem_add_cells_from_fixed_la | ||
|
||
int nvmem_layout_register(struct nvmem_layout *layout) | ||
{ | ||
|
@@ -207,7 +207,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
} | ||
EXPORT_SYMBOL_GPL(nvmem_layout_register); | ||
|
||
@@ -902,10 +1025,20 @@ struct nvmem_device *nvmem_register(cons | ||
@@ -901,10 +1024,20 @@ struct nvmem_device *nvmem_register(cons | ||
if (rval) | ||
goto err_remove_dev; | ||
|
||
|
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 |
---|---|---|
|
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
--- a/drivers/nvmem/core.c | ||
+++ b/drivers/nvmem/core.c | ||
@@ -854,7 +854,7 @@ int nvmem_layout_register(struct nvmem_l | ||
@@ -853,7 +853,7 @@ int nvmem_layout_register(struct nvmem_l | ||
return -EINVAL; | ||
|
||
/* Populate the cells */ | ||
|
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 |
---|---|---|
|
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
--- a/drivers/nvmem/core.c | ||
+++ b/drivers/nvmem/core.c | ||
@@ -876,19 +876,6 @@ void nvmem_layout_unregister(struct nvme | ||
@@ -875,19 +875,6 @@ void nvmem_layout_unregister(struct nvme | ||
} | ||
EXPORT_SYMBOL_GPL(nvmem_layout_unregister); | ||
|
||
|
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 |
---|---|---|
|
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
--- a/drivers/nvmem/core.c | ||
+++ b/drivers/nvmem/core.c | ||
@@ -2163,6 +2163,19 @@ const char *nvmem_dev_name(struct nvmem_ | ||
@@ -2162,6 +2162,19 @@ const char *nvmem_dev_name(struct nvmem_ | ||
} | ||
EXPORT_SYMBOL_GPL(nvmem_dev_name); | ||
|
||
|
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 |
---|---|---|
|
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (!pe) | ||
--- a/mm/vmalloc.c | ||
+++ b/mm/vmalloc.c | ||
@@ -4447,6 +4447,8 @@ static const struct seq_operations vmall | ||
@@ -4455,6 +4455,8 @@ static const struct seq_operations vmall | ||
|
||
static int __init proc_vmalloc_init(void) | ||
{ | ||
|
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 |
---|---|---|
|
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
+MODULE_LICENSE("GPL"); | ||
--- a/kernel/sched/core.c | ||
+++ b/kernel/sched/core.c | ||
@@ -4487,6 +4487,7 @@ int wake_up_state(struct task_struct *p, | ||
@@ -4486,6 +4486,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
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
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 |
---|---|---|
|
@@ -276,9 +276,9 @@ Signed-off-by: John Crispin <[email protected]> | |
free_irq(ch->dma.irq, priv); | ||
- if (IS_RX(ch->idx)) { | ||
+ if (ch == &priv->txch) { | ||
int desc; | ||
struct ltq_dma_channel *dma = &ch->dma; | ||
|
||
for (desc = 0; desc < LTQ_DESC_NUM; desc++) | ||
for (dma->desc = 0; dma->desc < LTQ_DESC_NUM; dma->desc++) | ||
@@ -228,80 +305,135 @@ static void | ||
ltq_etop_hw_exit(struct net_device *dev) | ||
{ | ||
|