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>
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 1186af457cc186c5ed01708da71b1ffbdf0a2638 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Tue, 20 Nov 2018 09:55:45 +0100
|
|
Subject: [PATCH] mtd: keep original flags for every struct mtd_info
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When allocating a new partition mtd subsystem runs internal tests in the
|
|
allocate_partition(). They may result in modifying specified flags (e.g.
|
|
dropping some /features/ like write access).
|
|
|
|
Those constraints don't have to be necessary true for subpartitions. It
|
|
may happen parent partition isn't block aligned (effectively disabling
|
|
write access) while subpartition may fit blocks nicely. In such case all
|
|
checks should be run again (starting with original flags value).
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
|
---
|
|
drivers/mtd/mtdcore.c | 2 ++
|
|
drivers/mtd/mtdpart.c | 3 ++-
|
|
include/linux/mtd/mtd.h | 1 +
|
|
3 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mtd/mtdcore.c
|
|
+++ b/drivers/mtd/mtdcore.c
|
|
@@ -665,6 +665,8 @@ static void mtd_set_dev_defaults(struct
|
|
} else {
|
|
pr_debug("mtd device won't show a device symlink in sysfs\n");
|
|
}
|
|
+
|
|
+ mtd->orig_flags = mtd->flags;
|
|
}
|
|
|
|
/**
|
|
--- a/drivers/mtd/mtdpart.c
|
|
+++ b/drivers/mtd/mtdpart.c
|
|
@@ -346,7 +346,8 @@ static struct mtd_part *allocate_partiti
|
|
|
|
/* set up the MTD object for this partition */
|
|
slave->mtd.type = parent->type;
|
|
- slave->mtd.flags = parent->flags & ~part->mask_flags;
|
|
+ slave->mtd.flags = parent->orig_flags & ~part->mask_flags;
|
|
+ slave->mtd.orig_flags = slave->mtd.flags;
|
|
slave->mtd.size = part->size;
|
|
slave->mtd.writesize = parent->writesize;
|
|
slave->mtd.writebufsize = parent->writebufsize;
|
|
--- a/include/linux/mtd/mtd.h
|
|
+++ b/include/linux/mtd/mtd.h
|
|
@@ -207,6 +207,7 @@ struct mtd_debug_info {
|
|
struct mtd_info {
|
|
u_char type;
|
|
uint32_t flags;
|
|
+ uint32_t orig_flags; /* Flags as before running mtd checks */
|
|
uint64_t size; // Total size of the MTD
|
|
|
|
/* "Major" erase size for the device. Naïve users may take this
|