05d8b931fb
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.97
Remove upstream patches:
generic/backport-6.6/001-powerpc-kernel-Fix-pcc_save_regs-inclusion.patch [1]
Manually rebased patch:
bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch[2]
New Kconfig symbol:
x86: enable MITIGATION_TSA [3]
All other patches are automatically refreshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.97&id=8a7ac2737211451b8b98657b919c4c4e0a4c0c2f
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.97&id=7609899eb6b70b536123eb58eeab27c764752b82
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.97&id=90293047df18caf7ed0fe566d89af0720f2dc98a
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Co-authored-by: John Audia <therealgraysky@proton.me>
Tested-by: Konstantin Demin <rockdrilla@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19317
(cherry picked from commit 04d764576b)
Co-authored-by: Goetz Goerisch <ggoerisch@gmail.com>
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19354
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 30a04cf5b6ffa1249df72ccd98cef05f37890f89 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Thu, 6 Feb 2025 05:07:20 +0000
|
|
Subject: [PATCH] mtd: spinand: add work-around to prevent bootloader wiping
|
|
mtdparts
|
|
|
|
ASUS makes use of U-Boot's fdt_fixup_mtdparts() function which applies
|
|
the partitions defined in U-Boot's mtdparts and mtdids environment
|
|
variables to the devicetree passed over to Linux.
|
|
|
|
The undesired side-effect is that in this way also all additional
|
|
properties and child nodes get wiped, preventing NVMEM cells to be
|
|
defined for MTD partitions or UBI volumes.
|
|
|
|
To work-around this issue, add an additional compatible string
|
|
'u-boot-dont-touch-spi-nand' which can be used instead of 'spi-nand' in
|
|
case the replacement of the MTD partitions by U-Boot should be skipped
|
|
alltogether.
|
|
|
|
In practise this is mostly relevant for SPI-NAND which anyway comes only
|
|
with two partitions nowadays: 'Bootloader' and 'UBI_DEV'. Hence this
|
|
work-around is applicable for SPI-NAND only. Similar work-arounds for
|
|
other MTD devices can be created as well should they actually be needed.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/mtd/nand/spi/core.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/mtd/nand/spi/core.c
|
|
+++ b/drivers/mtd/nand/spi/core.c
|
|
@@ -1442,6 +1442,7 @@ static int spinand_remove(struct spi_mem
|
|
|
|
static const struct spi_device_id spinand_ids[] = {
|
|
{ .name = "spi-nand" },
|
|
+ { .name = "u-boot-dont-touch-spi-nand" },
|
|
{ /* sentinel */ },
|
|
};
|
|
MODULE_DEVICE_TABLE(spi, spinand_ids);
|
|
@@ -1449,6 +1450,7 @@ MODULE_DEVICE_TABLE(spi, spinand_ids);
|
|
#ifdef CONFIG_OF
|
|
static const struct of_device_id spinand_of_ids[] = {
|
|
{ .compatible = "spi-nand" },
|
|
+ { .compatible = "u-boot-dont-touch-spi-nand" },
|
|
{ /* sentinel */ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, spinand_of_ids);
|