9261e7447e
This makes the patches which were just copied in the previous commit apply on top of kernel 4.19. The patches in the backports-4.19 folder were checked if they are really in kernel 4.19 based on the title and only removed if they were found in the upstream kernel. The following additional patches form the pending folder went into upstream Linux 4.19: pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch Bigger changes were introduced to the m25p80 spi nor driver, as far as I saw it in the new code, it now has the functionality provided in this patch: pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch Part of this patch went upstream independent of OpenWrt: hack-4.19/220-gc_sections.patch This patch was reworked to match the changes done upstream. The MIPS DMA API changed a lot, this patch was rewritten to match the new DMA handling: pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch I did bigger manual changes to the following patches and I am not 100% sure if they are all correct: pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch pending-4.19/411-mtd-partial_eraseblock_write.patch pending-4.19/600-netfilter_conntrack_flush.patch pending-4.19/611-netfilter_match_bypass_default_table.patch pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch hack-4.19/211-host_tools_portability.patch hack-4.19/221-module_exports.patch hack-4.19/321-powerpc_crtsavres_prereq.patch hack-4.19/902-debloat_proc.patch This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
98 lines
2.5 KiB
Diff
98 lines
2.5 KiB
Diff
From: Daniel Golle <daniel@makrotopia.org>
|
|
Subject: ubi: auto-attach mtd device named "ubi" or "data" on boot
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/mtd/ubi/build.c | 36 ++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 36 insertions(+)
|
|
|
|
--- a/drivers/mtd/ubi/build.c
|
|
+++ b/drivers/mtd/ubi/build.c
|
|
@@ -1181,6 +1181,73 @@ static struct mtd_info * __init open_mtd
|
|
return mtd;
|
|
}
|
|
|
|
+/*
|
|
+ * This function tries attaching mtd partitions named either "ubi" or "data"
|
|
+ * during boot.
|
|
+ */
|
|
+static void __init ubi_auto_attach(void)
|
|
+{
|
|
+ int err;
|
|
+ struct mtd_info *mtd;
|
|
+ loff_t offset = 0;
|
|
+ size_t len;
|
|
+ char magic[4];
|
|
+
|
|
+ /* try attaching mtd device named "ubi" or "data" */
|
|
+ mtd = open_mtd_device("ubi");
|
|
+ if (IS_ERR(mtd))
|
|
+ mtd = open_mtd_device("data");
|
|
+
|
|
+ if (IS_ERR(mtd))
|
|
+ return;
|
|
+
|
|
+ /* get the first not bad block */
|
|
+ if (mtd_can_have_bb(mtd))
|
|
+ while (mtd_block_isbad(mtd, offset)) {
|
|
+ offset += mtd->erasesize;
|
|
+
|
|
+ if (offset > mtd->size) {
|
|
+ pr_err("UBI error: Failed to find a non-bad "
|
|
+ "block on mtd%d\n", mtd->index);
|
|
+ goto cleanup;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /* check if the read from flash was successful */
|
|
+ err = mtd_read(mtd, offset, 4, &len, (void *) magic);
|
|
+ if ((err && !mtd_is_bitflip(err)) || len != 4) {
|
|
+ pr_err("UBI error: unable to read from mtd%d\n", mtd->index);
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ /* check for a valid ubi magic */
|
|
+ if (strncmp(magic, "UBI#", 4)) {
|
|
+ pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index);
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ /* don't auto-add media types where UBI doesn't makes sense */
|
|
+ if (mtd->type != MTD_NANDFLASH &&
|
|
+ mtd->type != MTD_NORFLASH &&
|
|
+ mtd->type != MTD_DATAFLASH &&
|
|
+ mtd->type != MTD_MLCNANDFLASH)
|
|
+ goto cleanup;
|
|
+
|
|
+ mutex_lock(&ubi_devices_mutex);
|
|
+ pr_notice("UBI: auto-attach mtd%d\n", mtd->index);
|
|
+ err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
|
|
+ mutex_unlock(&ubi_devices_mutex);
|
|
+ if (err < 0) {
|
|
+ pr_err("UBI error: cannot attach mtd%d\n", mtd->index);
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ return;
|
|
+
|
|
+cleanup:
|
|
+ put_mtd_device(mtd);
|
|
+}
|
|
+
|
|
static int __init ubi_init(void)
|
|
{
|
|
int err, i, k;
|
|
@@ -1264,6 +1331,12 @@ static int __init ubi_init(void)
|
|
}
|
|
}
|
|
|
|
+ /* auto-attach mtd devices only if built-in to the kernel and no ubi.mtd
|
|
+ * parameter was given */
|
|
+ if (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
|
|
+ !ubi_is_module() && !mtd_devs)
|
|
+ ubi_auto_attach();
|
|
+
|
|
err = ubiblock_init();
|
|
if (err) {
|
|
pr_err("UBI error: block: cannot initialize, error %d\n", err);
|