diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-06-09 14:19:03 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 00:57:16 +0200 |
commit | 251a382c28854ea68bd46483a58990eafbf671ca (patch) | |
tree | 0f852daca60a71040be3ac1efa932286c1281d4f /target/linux/generic/backport-5.15 | |
parent | aee1215c0e1a7382ef7ab986564d00defcfaf52e (diff) | |
download | upstream-251a382c28854ea68bd46483a58990eafbf671ca.tar.gz upstream-251a382c28854ea68bd46483a58990eafbf671ca.tar.bz2 upstream-251a382c28854ea68bd46483a58990eafbf671ca.zip |
kernel: bump 5.15 to 5.15.46
Deleted (upstreamed):
generic/backport-5.15/400-mtdblock-warn-if-opened-on-NAND.patch [01]
generic/backport-5.15/420-v5.19-01-mtd-spinand-gigadevice-fix-Quad-IO-for-GD5F1GQ5UExxG.patch [02]
bcm27xx/patches-5.15/950-0029-Revert-mailbox-avoid-timer-start-from-callback.patch [03]
bcm27xx/patches-5.15/950-0417-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch [04]
bcm27xx/patches-5.15/950-0740-drm-vc4-hvs-Fix-frame-count-register-readout.patch [05]
bcm27xx/patches-5.15/950-0755-drm-vc4-hvs-Reset-muxes-at-probe-time.patch [06]
bcm27xx/patches-5.15/950-0759-drm-vc4-txp-Don-t-set-TXP_VSTART_AT_EOF.patch [07]
bcm27xx/patches-5.15/950-0760-drm-vc4-txp-Force-alpha-to-be-0xff-if-it-s-disabled.patch [08]
bcm53xx/patches-5.15/031-v5.17-0005-ARM-dts-BCM5301X-update-CRU-block-description.patch [09]
mediatek/patches-5.15/102-mt7629-enable-arch-timer.patch [10]
Manually rebased:
bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch
[01] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=f41c9418c5898c01634675150696da290fb86796
[02] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=d5b66645305c6f3a1b2cf75cee4157b07f293309
[03] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=119f99209d8531359bcb935f252ec435f9d21b13
[04] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=c4e1280abead1552e1764684079a43e222ccd163
[05] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=08465a1889cb48ec64431e9db745b5be15399251
[06] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=0e26a6da02e63b75b629573d13966c36aa6264f0
[07] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=01c9020b2e7c85e394879f34851805179ac3d1d8
[08] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=d47f85cc0171a5d3c5bd8cbb8a98983ca3357cbd
[09] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=5151f24ac937ff7eb1f078257c66e3c0f0296010
[10] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=ffea838686b82fbb2801cdfad6ba5309d15c032d
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.15')
2 files changed, 0 insertions, 126 deletions
diff --git a/target/linux/generic/backport-5.15/400-mtdblock-warn-if-opened-on-NAND.patch b/target/linux/generic/backport-5.15/400-mtdblock-warn-if-opened-on-NAND.patch deleted file mode 100644 index 27c0e6c14b..0000000000 --- a/target/linux/generic/backport-5.15/400-mtdblock-warn-if-opened-on-NAND.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 96a3295c351da82d7af99b2fc004a3cf9f4716a9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no> -Date: Mon, 28 Mar 2022 18:11:08 +0200 -Subject: [PATCH] mtdblock: warn if opened on NAND -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Warning on every translated mtd partition results in excessive log noise -if this driver is loaded: - - nand: device found, Manufacturer ID: 0xc2, Chip ID: 0xf1 - nand: Macronix MX30LF1G18AC - nand: 128 MiB, SLC, erase size: 128 KiB, page size: 2048, OOB size: 64 - mt7621-nand 1e003000.nand: ECC strength adjusted to 4 bits - read_bbt: found bbt at block 1023 - 10 fixed-partitions partitions found on MTD device mt7621-nand - Creating 10 MTD partitions on "mt7621-nand": - 0x000000000000-0x000000080000 : "Bootloader" - mtdblock: MTD device 'Bootloader' is NAND, please consider using UBI block devices instead. - 0x000000080000-0x000000100000 : "Config" - mtdblock: MTD device 'Config' is NAND, please consider using UBI block devices instead. - 0x000000100000-0x000000140000 : "Factory" - mtdblock: MTD device 'Factory' is NAND, please consider using UBI block devices instead. - 0x000000140000-0x000002000000 : "Kernel" - mtdblock: MTD device 'Kernel' is NAND, please consider using UBI block devices instead. - 0x000000540000-0x000002000000 : "ubi" - mtdblock: MTD device 'ubi' is NAND, please consider using UBI block devices instead. - 0x000002140000-0x000004000000 : "Kernel2" - mtdblock: MTD device 'Kernel2' is NAND, please consider using UBI block devices instead. - 0x000004000000-0x000004100000 : "wwan" - mtdblock: MTD device 'wwan' is NAND, please consider using UBI block devices instead. - 0x000004100000-0x000005100000 : "data" - mtdblock: MTD device 'data' is NAND, please consider using UBI block devices instead. - 0x000005100000-0x000005200000 : "rom-d" - mtdblock: MTD device 'rom-d' is NAND, please consider using UBI block devices instead. - 0x000005200000-0x000005280000 : "reserve" - mtdblock: MTD device 'reserve' is NAND, please consider using UBI block devices instead. - mtk_soc_eth 1e100000.ethernet eth0: mediatek frame engine at 0xbe100000, irq 21 - -This is more likely to annoy than to help users of embedded distros where -this driver is enabled by default. Making the blockdevs available does -not imply that they are in use, and warning about bootloader partitions -or other devices which obviously never will be mounted is more confusing -than helpful. - -Move the warning to open(), where it will be of more use - actually warning -anyone who mounts a file system on NAND using mtdblock. - -Fixes: e07403a8c6be ("mtdblock: Warn if added for a NAND device") -Signed-off-by: Bjørn Mork <bjorn@mork.no> -Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> -Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> -Link: https://lore.kernel.org/linux-mtd/20220328161108.87757-1-bjorn@mork.no ---- - drivers/mtd/mtdblock.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/drivers/mtd/mtdblock.c -+++ b/drivers/mtd/mtdblock.c -@@ -257,6 +257,10 @@ static int mtdblock_open(struct mtd_blkt - return 0; - } - -+ if (mtd_type_is_nand(mbd->mtd)) -+ pr_warn("%s: MTD device '%s' is NAND, please consider using UBI block devices instead.\n", -+ mbd->tr->name, mbd->mtd->name); -+ - /* OK, it's not open. Create cache info for it */ - mtdblk->count = 1; - mutex_init(&mtdblk->cache_mutex); -@@ -322,10 +326,6 @@ static void mtdblock_add_mtd(struct mtd_ - if (!(mtd->flags & MTD_WRITEABLE)) - dev->mbd.readonly = 1; - -- if (mtd_type_is_nand(mtd)) -- pr_warn("%s: MTD device '%s' is NAND, please consider using UBI block devices instead.\n", -- tr->name, mtd->name); -- - if (add_mtd_blktrans_dev(&dev->mbd)) - kfree(dev); - } diff --git a/target/linux/generic/backport-5.15/420-v5.19-01-mtd-spinand-gigadevice-fix-Quad-IO-for-GD5F1GQ5UExxG.patch b/target/linux/generic/backport-5.15/420-v5.19-01-mtd-spinand-gigadevice-fix-Quad-IO-for-GD5F1GQ5UExxG.patch deleted file mode 100644 index 1b0b57c2b0..0000000000 --- a/target/linux/generic/backport-5.15/420-v5.19-01-mtd-spinand-gigadevice-fix-Quad-IO-for-GD5F1GQ5UExxG.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a4f9dd55c5e1bb951db6f1dee20e62e0103f3438 Mon Sep 17 00:00:00 2001 -From: Chuanhong Guo <gch981213@gmail.com> -Date: Sun, 20 Mar 2022 17:59:57 +0800 -Subject: [PATCH 1/5] mtd: spinand: gigadevice: fix Quad IO for GD5F1GQ5UExxG - -Read From Cache Quad IO (EBH) uses 2 dummy bytes on this chip according -to page 23 of the datasheet[0]. - -[0]: https://www.gigadevice.com/datasheet/gd5f1gq5xexxg/ - -Fixes: 469b99248985 ("mtd: spinand: gigadevice: Support GD5F1GQ5UExxG") -Signed-off-by: Chuanhong Guo <gch981213@gmail.com> -Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> -Link: https://lore.kernel.org/linux-mtd/20220320100001.247905-2-gch981213@gmail.com ---- - drivers/mtd/nand/spi/gigadevice.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/nand/spi/gigadevice.c -+++ b/drivers/mtd/nand/spi/gigadevice.c -@@ -39,6 +39,14 @@ static SPINAND_OP_VARIANTS(read_cache_va - SPINAND_PAGE_READ_FROM_CACHE_OP_3A(true, 0, 1, NULL, 0), - SPINAND_PAGE_READ_FROM_CACHE_OP_3A(false, 0, 0, NULL, 0)); - -+static SPINAND_OP_VARIANTS(read_cache_variants_1gq5, -+ SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0), -+ SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0)); -+ - static SPINAND_OP_VARIANTS(write_cache_variants, - SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), - SPINAND_PROG_LOAD(true, 0, NULL, 0)); -@@ -339,7 +347,7 @@ static const struct spinand_info gigadev - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x51), - NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), - NAND_ECCREQ(4, 512), -- SPINAND_INFO_OP_VARIANTS(&read_cache_variants, -+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants_1gq5, - &write_cache_variants, - &update_cache_variants), - SPINAND_HAS_QE_BIT, |