-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.133 Removed upstreamed: bcm47xx/patches-5.15/101-v5.18-mtd-rawnand-brcmnand-Allow-SoC-to-provide-I-O-operations.patch[1] Cherry picked build fix.[2] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.133&id=56cf9f446b331414a15ef0e8dedf23583ec2c427 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.15/fix-up-backport-of-136191703038-interconnect-teach-l.patch 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]> (cherry picked from commit 8989593)
- Loading branch information
Showing
15 changed files
with
62 additions
and
181 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 = .132 | ||
LINUX_KERNEL_HASH-5.15.132 = 4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac | ||
LINUX_VERSION-5.15 = .133 | ||
LINUX_KERNEL_HASH-5.15.133 = ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd |
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 |
---|---|---|
|
@@ -14,15 +14,15 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
|
||
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
@@ -3033,6 +3033,7 @@ int brcmnand_probe(struct platform_devic | ||
@@ -3059,6 +3059,7 @@ int brcmnand_probe(struct platform_devic | ||
|
||
dev_set_drvdata(dev, ctrl); | ||
ctrl->dev = dev; | ||
+ ctrl->soc = soc; | ||
|
||
init_completion(&ctrl->done); | ||
init_completion(&ctrl->dma_done); | ||
@@ -3173,8 +3174,6 @@ int brcmnand_probe(struct platform_devic | ||
/* Enable the static key if the soc provides I/O operations indicating | ||
* that a non-memory mapped IO access path must be used | ||
@@ -3205,8 +3206,6 @@ int brcmnand_probe(struct platform_devic | ||
* interesting ways | ||
*/ | ||
if (soc) { | ||
|
150 changes: 0 additions & 150 deletions
150
...7xx/patches-5.15/101-v5.18-mtd-rawnand-brcmnand-Allow-SoC-to-provide-I-O-operations.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 |
---|---|---|
|
@@ -16,7 +16,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
|
||
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
@@ -2806,7 +2806,7 @@ static const struct nand_controller_ops | ||
@@ -2814,7 +2814,7 @@ static const struct nand_controller_ops | ||
static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) | ||
{ | ||
struct brcmnand_controller *ctrl = host->ctrl; | ||
|
@@ -25,7 +25,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
struct mtd_info *mtd; | ||
struct nand_chip *chip; | ||
int ret; | ||
@@ -2814,7 +2814,7 @@ static int brcmnand_init_cs(struct brcmn | ||
@@ -2822,7 +2822,7 @@ static int brcmnand_init_cs(struct brcmn | ||
|
||
ret = of_property_read_u32(dn, "reg", &host->cs); | ||
if (ret) { | ||
|
@@ -34,7 +34,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
return -ENXIO; | ||
} | ||
|
||
@@ -2823,13 +2823,13 @@ static int brcmnand_init_cs(struct brcmn | ||
@@ -2831,13 +2831,13 @@ static int brcmnand_init_cs(struct brcmn | ||
|
||
nand_set_flash_node(chip, dn); | ||
nand_set_controller_data(chip, host); | ||
|
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 |
---|---|---|
|
@@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
|
||
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
@@ -2803,7 +2803,7 @@ static const struct nand_controller_ops | ||
@@ -2811,7 +2811,7 @@ static const struct nand_controller_ops | ||
.attach_chip = brcmnand_attach_chip, | ||
}; | ||
|
||
|
@@ -26,7 +26,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
{ | ||
struct brcmnand_controller *ctrl = host->ctrl; | ||
struct device *dev = ctrl->dev; | ||
@@ -2812,16 +2812,9 @@ static int brcmnand_init_cs(struct brcmn | ||
@@ -2820,16 +2820,9 @@ static int brcmnand_init_cs(struct brcmn | ||
int ret; | ||
u16 cfg_offs; | ||
|
||
|
@@ -43,7 +43,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
nand_set_controller_data(chip, host); | ||
mtd->name = devm_kasprintf(dev, GFP_KERNEL, "brcmnand.%d", | ||
host->cs); | ||
@@ -3228,7 +3221,16 @@ int brcmnand_probe(struct platform_devic | ||
@@ -3236,7 +3229,16 @@ int brcmnand_probe(struct platform_devic | ||
host->pdev = pdev; | ||
host->ctrl = ctrl; | ||
|
||
|
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 |
---|---|---|
|
@@ -23,7 +23,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
unsigned int dma_irq; | ||
int nand_version; | ||
|
||
@@ -1642,7 +1642,7 @@ static bool brcmstb_nand_wait_for_comple | ||
@@ -1650,7 +1650,7 @@ static bool brcmstb_nand_wait_for_comple | ||
bool err = false; | ||
int sts; | ||
|
||
|
@@ -32,7 +32,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
/* switch to interrupt polling and PIO mode */ | ||
disable_ctrl_irqs(ctrl); | ||
sts = bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY, | ||
@@ -3179,33 +3179,29 @@ int brcmnand_probe(struct platform_devic | ||
@@ -3187,33 +3187,29 @@ int brcmnand_probe(struct platform_devic | ||
} | ||
|
||
/* IRQ */ | ||
|
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 |
---|---|---|
|
@@ -23,7 +23,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
#include <linux/err.h> | ||
#include <linux/completion.h> | ||
#include <linux/interrupt.h> | ||
@@ -2803,7 +2804,8 @@ static const struct nand_controller_ops | ||
@@ -2811,7 +2812,8 @@ static const struct nand_controller_ops | ||
.attach_chip = brcmnand_attach_chip, | ||
}; | ||
|
||
|
@@ -33,7 +33,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
{ | ||
struct brcmnand_controller *ctrl = host->ctrl; | ||
struct device *dev = ctrl->dev; | ||
@@ -2856,7 +2858,7 @@ static int brcmnand_init_cs(struct brcmn | ||
@@ -2864,7 +2866,7 @@ static int brcmnand_init_cs(struct brcmn | ||
if (ret) | ||
return ret; | ||
|
||
|
@@ -42,7 +42,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
if (ret) | ||
nand_cleanup(chip); | ||
|
||
@@ -3025,17 +3027,15 @@ static int brcmnand_edu_setup(struct pla | ||
@@ -3033,17 +3035,15 @@ static int brcmnand_edu_setup(struct pla | ||
|
||
int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) | ||
{ | ||
|
@@ -63,7 +63,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
return -ENODEV; | ||
|
||
ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL); | ||
@@ -3062,7 +3062,7 @@ int brcmnand_probe(struct platform_devic | ||
@@ -3070,7 +3070,7 @@ int brcmnand_probe(struct platform_devic | ||
/* NAND register range */ | ||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
ctrl->nand_base = devm_ioremap_resource(dev, res); | ||
|
@@ -72,15 +72,15 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
return PTR_ERR(ctrl->nand_base); | ||
|
||
/* Enable clock before using NAND registers */ | ||
@@ -3206,7 +3206,6 @@ int brcmnand_probe(struct platform_devic | ||
@@ -3214,7 +3214,6 @@ int brcmnand_probe(struct platform_devic | ||
|
||
for_each_available_child_of_node(dn, child) { | ||
if (of_device_is_compatible(child, "brcm,nandcs")) { | ||
- struct brcmnand_host *host; | ||
|
||
host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL); | ||
if (!host) { | ||
@@ -3226,7 +3225,7 @@ int brcmnand_probe(struct platform_devic | ||
@@ -3234,7 +3233,7 @@ int brcmnand_probe(struct platform_devic | ||
|
||
nand_set_flash_node(&host->chip, child); | ||
|
||
|
@@ -89,7 +89,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
if (ret) { | ||
devm_kfree(dev, host); | ||
continue; /* Try all chip-selects */ | ||
@@ -3236,6 +3235,32 @@ int brcmnand_probe(struct platform_devic | ||
@@ -3244,6 +3243,32 @@ int brcmnand_probe(struct platform_devic | ||
} | ||
} | ||
|
||
|
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 |
---|---|---|
|
@@ -14,7 +14,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
|
||
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
@@ -916,6 +916,12 @@ static void brcmnand_wr_corr_thresh(stru | ||
@@ -951,6 +951,12 @@ static void brcmnand_wr_corr_thresh(stru | ||
|
||
static inline int brcmnand_cmd_shift(struct brcmnand_controller *ctrl) | ||
{ | ||
|
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 |
---|---|---|
|
@@ -187,7 +187,7 @@ Signed-off-by: Florian Fainelli <[email protected]> | |
+MODULE_DESCRIPTION("NAND controller driver glue for BCMA chips"); | ||
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
@@ -598,7 +598,11 @@ enum { | ||
@@ -627,7 +627,11 @@ enum { | ||
|
||
static inline bool brcmnand_non_mmio_ops(struct brcmnand_controller *ctrl) | ||
{ | ||
|
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: Rafał Miłecki <[email protected]> | |
|
||
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c | ||
@@ -37,7 +37,11 @@ | ||
@@ -38,7 +38,11 @@ | ||
* 1: NAND_WP is set by default, cleared for erase/write operations | ||
* 2: NAND_WP is always cleared | ||
*/ | ||
|
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 |
---|---|---|
|
@@ -382,23 +382,23 @@ Signed-off-by: Andrew Morton <[email protected]> | |
} | ||
--- a/kernel/fork.c | ||
+++ b/kernel/fork.c | ||
@@ -1083,6 +1083,7 @@ static struct mm_struct *mm_init(struct | ||
@@ -1091,6 +1091,7 @@ static struct mm_struct *mm_init(struct | ||
goto fail_nocontext; | ||
|
||
mm->user_ns = get_user_ns(user_ns); | ||
+ lru_gen_init_mm(mm); | ||
return mm; | ||
|
||
fail_nocontext: | ||
@@ -1125,6 +1126,7 @@ static inline void __mmput(struct mm_str | ||
@@ -1133,6 +1134,7 @@ static inline void __mmput(struct mm_str | ||
} | ||
if (mm->binfmt) | ||
module_put(mm->binfmt->module); | ||
+ lru_gen_del_mm(mm); | ||
mmdrop(mm); | ||
} | ||
|
||
@@ -2617,6 +2619,13 @@ pid_t kernel_clone(struct kernel_clone_a | ||
@@ -2625,6 +2627,13 @@ pid_t kernel_clone(struct kernel_clone_a | ||
get_task_struct(p); | ||
} | ||
|
||
|
31 changes: 31 additions & 0 deletions
31
target/linux/generic/backport-5.15/894-Fix-up-backport-for-13619703038.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 16c572ef0646f8b0fa19fbf81b302de8a03127f2 Mon Sep 17 00:00:00 2001 | ||
From: Sasha Levin <[email protected]> | ||
Date: Sun, 24 Sep 2023 14:30:44 -0400 | ||
Subject: Fix up backport of 136191703038 ("interconnect: Teach lockdep about | ||
icc_bw_lock order") | ||
|
||
Add a missing include to fix the following build error: | ||
|
||
drivers/interconnect/core.c: In function 'icc_init': | ||
drivers/interconnect/core.c:1148:9: error: implicit declaration of function 'fs_reclaim_acquire' [-Werror=implicit-function-declaration] | ||
1148 | fs_reclaim_acquire(GFP_KERNEL); | ||
| ^~~~~~~~~~~~~~~~~~ | ||
drivers/interconnect/core.c:1150:9: error: implicit declaration of function 'fs_reclaim_release' [-Werror=implicit-function-declaration] | ||
1150 | fs_reclaim_release(GFP_KERNEL); | ||
| ^~~~~~~~~~~~~~~~~~ | ||
|
||
Signed-off-by: Sasha Levin <[email protected]> | ||
--- | ||
drivers/interconnect/core.c | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
--- a/drivers/interconnect/core.c | ||
+++ b/drivers/interconnect/core.c | ||
@@ -13,6 +13,7 @@ | ||
#include <linux/interconnect.h> | ||
#include <linux/interconnect-provider.h> | ||
#include <linux/list.h> | ||
+#include <linux/sched/mm.h> | ||
#include <linux/module.h> | ||
#include <linux/mutex.h> | ||
#include <linux/slab.h> |
Oops, something went wrong.