mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel:update kernel verson to 3.18.131, 4.9.148, 4.14.91
This commit is contained in:
parent
900fbaf8a5
commit
415d563eeb
@ -2,14 +2,14 @@
|
||||
|
||||
LINUX_RELEASE?=1
|
||||
|
||||
LINUX_VERSION-3.18 = .130
|
||||
LINUX_VERSION-4.9 = .146
|
||||
LINUX_VERSION-4.14 = .90
|
||||
LINUX_VERSION-3.18 = .131
|
||||
LINUX_VERSION-4.9 = .148
|
||||
LINUX_VERSION-4.14 = .91
|
||||
LINUX_VERSION-4.19 = .9
|
||||
|
||||
LINUX_KERNEL_HASH-3.18.130 = d1bf85ed3fd0067b1134178ed5492ae0053cb3fdd5361986fe0b85234fc82723
|
||||
LINUX_KERNEL_HASH-4.9.146 = 58195a8be3085d117c83a2ed1caa3b46ea7c1614c75f951b9f13f7adb03f8e59
|
||||
LINUX_KERNEL_HASH-4.14.90 = 0c1ed0c93085e44ad89cd279647b0e4617d06ce5a482213b5481b612ffa186ca
|
||||
LINUX_KERNEL_HASH-3.18.131 = 04600ce96e4c7642b9eaa4814f4930c79b53010b1c155d23e5ac0aeba6f455e2
|
||||
LINUX_KERNEL_HASH-4.9.148 = 6067151b0225a8de1ab79abc9be7bae237eaca0cd838eb26684169560d88a994
|
||||
LINUX_KERNEL_HASH-4.14.91 = 6a587c8b4160918efa082b0c2eda8c2db0f50d8814ad1d1ac94be1edf66ca6a9
|
||||
LINUX_KERNEL_HASH-4.19.9 = fc116cc6829c73944215d3b3ac0fc368dde9e8235b456744afffde001269dbf2
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
|
@ -50,5 +50,5 @@ produce a noisy warning.
|
||||
/* support xHCI 1.0 spec USB2 hardware LPM */
|
||||
+#define XHCI_FORCE_MSI (1 << 24)
|
||||
unsigned hw_lpm_support:1;
|
||||
/* cached usb2 extened protocol capabilites */
|
||||
u32 *ext_caps;
|
||||
/* Broken Suspend flag for SNPS Suspend resume issue */
|
||||
unsigned broken_suspend:1;
|
||||
|
@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1221,6 +1221,18 @@ static const struct flash_info *spi_nor_
|
||||
@@ -1222,6 +1222,18 @@ static const struct flash_info *spi_nor_
|
||||
}
|
||||
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
|
||||
id[0], id[1], id[2]);
|
||||
|
@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
|
||||
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -1927,7 +1927,8 @@ static const struct usb_device_id option
|
||||
@@ -1934,7 +1934,8 @@ static const struct usb_device_id option
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },
|
||||
|
@ -1,89 +0,0 @@
|
||||
From: Richard Weinberger <richard@nod.at>
|
||||
Date: Wed, 7 Nov 2018 23:04:43 +0100
|
||||
Subject: [PATCH] ubifs: Handle re-linking of inodes correctly while recovery
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
UBIFS's recovery code strictly assumes that a deleted inode will never
|
||||
come back, therefore it removes all data which belongs to that inode
|
||||
as soon it faces an inode with link count 0 in the replay list.
|
||||
Before O_TMPFILE this assumption was perfectly fine. With O_TMPFILE
|
||||
it can lead to data loss upon a power-cut.
|
||||
|
||||
Consider a journal with entries like:
|
||||
0: inode X (nlink = 0) /* O_TMPFILE was created */
|
||||
1: data for inode X /* Someone writes to the temp file */
|
||||
2: inode X (nlink = 0) /* inode was changed, xattr, chmod, … */
|
||||
3: inode X (nlink = 1) /* inode was re-linked via linkat() */
|
||||
|
||||
Upon replay of entry #2 UBIFS will drop all data that belongs to inode X,
|
||||
this will lead to an empty file after mounting.
|
||||
|
||||
As solution for this problem, scan the replay list for a re-link entry
|
||||
before dropping data.
|
||||
|
||||
Fixes: 474b93704f32 ("ubifs: Implement O_TMPFILE")
|
||||
Cc: stable@vger.kernel.org
|
||||
Cc: Russell Senior <russell@personaltelco.net>
|
||||
Cc: Rafał Miłecki <zajec5@gmail.com>
|
||||
Reported-by: Russell Senior <russell@personaltelco.net>
|
||||
Reported-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
Signed-off-by: Richard Weinberger <richard@nod.at>
|
||||
---
|
||||
fs/ubifs/replay.c | 37 +++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 37 insertions(+)
|
||||
|
||||
--- a/fs/ubifs/replay.c
|
||||
+++ b/fs/ubifs/replay.c
|
||||
@@ -210,6 +210,38 @@ static int trun_remove_range(struct ubif
|
||||
}
|
||||
|
||||
/**
|
||||
+ * inode_still_linked - check whether inode in question will be re-linked.
|
||||
+ * @c: UBIFS file-system description object
|
||||
+ * @rino: replay entry to test
|
||||
+ *
|
||||
+ * O_TMPFILE files can be re-linked, this means link count goes from 0 to 1.
|
||||
+ * This case needs special care, otherwise all references to the inode will
|
||||
+ * be removed upon the first replay entry of an inode with link count 0
|
||||
+ * is found.
|
||||
+ */
|
||||
+static bool inode_still_linked(struct ubifs_info *c, struct replay_entry *rino)
|
||||
+{
|
||||
+ struct replay_entry *r;
|
||||
+
|
||||
+ ubifs_assert(rino->deletion);
|
||||
+ ubifs_assert(key_type(c, &rino->key) == UBIFS_INO_KEY);
|
||||
+
|
||||
+ /*
|
||||
+ * Find the most recent entry for the inode behind @rino and check
|
||||
+ * whether it is a deletion.
|
||||
+ */
|
||||
+ list_for_each_entry_reverse(r, &c->replay_list, list) {
|
||||
+ ubifs_assert(r->sqnum >= rino->sqnum);
|
||||
+ if (key_inum(c, &r->key) == key_inum(c, &rino->key))
|
||||
+ return r->deletion == 0;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ ubifs_assert(0);
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* apply_replay_entry - apply a replay entry to the TNC.
|
||||
* @c: UBIFS file-system description object
|
||||
* @r: replay entry to apply
|
||||
@@ -239,6 +271,11 @@ static int apply_replay_entry(struct ubi
|
||||
{
|
||||
ino_t inum = key_inum(c, &r->key);
|
||||
|
||||
+ if (inode_still_linked(c, r)) {
|
||||
+ err = 0;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
err = ubifs_tnc_remove_ino(c, inum);
|
||||
break;
|
||||
}
|
@ -61,11 +61,9 @@ CC: stable@vger.kernel.org # v4.0+
|
||||
arch/arm/mach-cns3xxx/pcie.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
|
||||
index 318394ed5c7a..5e11ad3164e0 100644
|
||||
--- a/arch/arm/mach-cns3xxx/pcie.c
|
||||
+++ b/arch/arm/mach-cns3xxx/pcie.c
|
||||
@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus,
|
||||
@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus
|
||||
} else /* remote PCI bus */
|
||||
base = cnspci->cfg1_regs + ((busno & 0xf) << 20);
|
||||
|
||||
@ -74,6 +72,3 @@ index 318394ed5c7a..5e11ad3164e0 100644
|
||||
}
|
||||
|
||||
static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
@ -1,44 +0,0 @@
|
||||
From a74515604a7b171f2702bdcbd1e231225fb456d0 Mon Sep 17 00:00:00 2001
|
||||
From: Anderson Luiz Alves <alacn1@gmail.com>
|
||||
Date: Fri, 30 Nov 2018 21:58:36 -0200
|
||||
Subject: [PATCH] mv88e6060: disable hardware level MAC learning
|
||||
|
||||
Disable hardware level MAC learning because it breaks station roaming.
|
||||
When enabled it drops all frames that arrive from a MAC address
|
||||
that is on a different port at learning table.
|
||||
|
||||
Signed-off-by: Anderson Luiz Alves <alacn1@gmail.com>
|
||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/dsa/mv88e6060.c | 10 +++-------
|
||||
1 file changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/drivers/net/dsa/mv88e6060.c
|
||||
+++ b/drivers/net/dsa/mv88e6060.c
|
||||
@@ -114,8 +114,7 @@ static int mv88e6060_switch_reset(struct
|
||||
/* Reset the switch. */
|
||||
REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,
|
||||
GLOBAL_ATU_CONTROL_SWRESET |
|
||||
- GLOBAL_ATU_CONTROL_ATUSIZE_1024 |
|
||||
- GLOBAL_ATU_CONTROL_ATE_AGE_5MIN);
|
||||
+ GLOBAL_ATU_CONTROL_LEARNDIS);
|
||||
|
||||
/* Wait up to one second for reset to complete. */
|
||||
timeout = jiffies + 1 * HZ;
|
||||
@@ -140,13 +139,10 @@ static int mv88e6060_setup_global(struct
|
||||
*/
|
||||
REG_WRITE(REG_GLOBAL, GLOBAL_CONTROL, GLOBAL_CONTROL_MAX_FRAME_1536);
|
||||
|
||||
- /* Enable automatic address learning, set the address
|
||||
- * database size to 1024 entries, and set the default aging
|
||||
- * time to 5 minutes.
|
||||
+ /* Disable automatic address learning.
|
||||
*/
|
||||
REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,
|
||||
- GLOBAL_ATU_CONTROL_ATUSIZE_1024 |
|
||||
- GLOBAL_ATU_CONTROL_ATE_AGE_5MIN);
|
||||
+ GLOBAL_ATU_CONTROL_LEARNDIS);
|
||||
|
||||
return 0;
|
||||
}
|
@ -221,13 +221,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!root_irq_dir)
|
||||
--- a/kernel/time/timer_list.c
|
||||
+++ b/kernel/time/timer_list.c
|
||||
@@ -399,6 +399,8 @@ static int __init init_timer_list_procfs
|
||||
@@ -399,6 +399,9 @@ static int __init init_timer_list_procfs
|
||||
{
|
||||
struct proc_dir_entry *pe;
|
||||
|
||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
||||
+ return 0;
|
||||
pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
|
||||
+
|
||||
pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
|
||||
if (!pe)
|
||||
return -ENOMEM;
|
||||
--- a/mm/vmalloc.c
|
||||
|
@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
/**
|
||||
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
||||
* @tf: Target ATA taskfile
|
||||
@@ -4827,6 +4840,9 @@ static struct ata_queued_cmd *ata_qc_new
|
||||
@@ -4828,6 +4841,9 @@ static struct ata_queued_cmd *ata_qc_new
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
return qc;
|
||||
}
|
||||
@@ -5736,6 +5752,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
@@ -5737,6 +5753,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
ap->stats.unhandled_irq = 1;
|
||||
ap->stats.idle_irq = 1;
|
||||
#endif
|
||||
@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
ata_sff_port_init(ap);
|
||||
|
||||
return ap;
|
||||
@@ -5757,6 +5776,12 @@ static void ata_host_release(struct devi
|
||||
@@ -5758,6 +5777,12 @@ static void ata_host_release(struct devi
|
||||
|
||||
kfree(ap->pmp_link);
|
||||
kfree(ap->slave_link);
|
||||
@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
kfree(ap);
|
||||
host->ports[i] = NULL;
|
||||
}
|
||||
@@ -6203,7 +6228,23 @@ int ata_host_register(struct ata_host *h
|
||||
@@ -6204,7 +6229,23 @@ int ata_host_register(struct ata_host *h
|
||||
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
||||
host->ports[i]->local_port_no = i + 1;
|
||||
}
|
||||
|
@ -111,13 +111,14 @@
|
||||
if (!root_irq_dir)
|
||||
--- a/kernel/time/timer_list.c
|
||||
+++ b/kernel/time/timer_list.c
|
||||
@@ -362,6 +362,8 @@ static int __init init_timer_list_procfs
|
||||
@@ -362,6 +362,9 @@ static int __init init_timer_list_procfs
|
||||
{
|
||||
struct proc_dir_entry *pe;
|
||||
|
||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
||||
+ return 0;
|
||||
pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
|
||||
+
|
||||
pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
|
||||
if (!pe)
|
||||
return -ENOMEM;
|
||||
--- a/mm/vmalloc.c
|
||||
|
@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
/**
|
||||
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
||||
* @tf: Target ATA taskfile
|
||||
@@ -4994,6 +5007,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
@@ -4995,6 +5008,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
if (tag < 0)
|
||||
return NULL;
|
||||
}
|
||||
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
qc = __ata_qc_from_tag(ap, tag);
|
||||
qc->tag = tag;
|
||||
@@ -5895,6 +5911,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
@@ -5896,6 +5912,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
ap->stats.unhandled_irq = 1;
|
||||
ap->stats.idle_irq = 1;
|
||||
#endif
|
||||
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
ata_sff_port_init(ap);
|
||||
|
||||
return ap;
|
||||
@@ -5916,6 +5935,12 @@ static void ata_host_release(struct devi
|
||||
@@ -5917,6 +5936,12 @@ static void ata_host_release(struct devi
|
||||
|
||||
kfree(ap->pmp_link);
|
||||
kfree(ap->slave_link);
|
||||
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
kfree(ap);
|
||||
host->ports[i] = NULL;
|
||||
}
|
||||
@@ -6362,7 +6387,23 @@ int ata_host_register(struct ata_host *h
|
||||
@@ -6363,7 +6388,23 @@ int ata_host_register(struct ata_host *h
|
||||
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
||||
host->ports[i]->local_port_no = i + 1;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1031,6 +1031,7 @@ static const struct flash_info spi_nor_i
|
||||
@@ -1032,6 +1032,7 @@ static const struct flash_info spi_nor_i
|
||||
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
|
||||
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
|
||||
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
@ -8,7 +8,7 @@
|
||||
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
|
||||
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
||||
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
@@ -1200,11 +1201,12 @@ static const struct flash_info spi_nor_i
|
||||
@@ -1201,11 +1202,12 @@ static const struct flash_info spi_nor_i
|
||||
{ },
|
||||
};
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
|
||||
if (tmp < 0) {
|
||||
@@ -1215,10 +1217,16 @@ static const struct flash_info *spi_nor_
|
||||
@@ -1216,10 +1218,16 @@ static const struct flash_info *spi_nor_
|
||||
for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
|
||||
info = &spi_nor_ids[tmp];
|
||||
if (info->id_len) {
|
||||
@ -42,7 +42,7 @@
|
||||
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
|
||||
id[0], id[1], id[2]);
|
||||
return ERR_PTR(-ENODEV);
|
||||
@@ -2678,7 +2686,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -2679,7 +2687,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
info = spi_nor_match_id(name);
|
||||
/* Try to auto-detect if chip name wasn't specified or not found */
|
||||
if (!info)
|
||||
@ -51,7 +51,7 @@
|
||||
if (IS_ERR_OR_NULL(info))
|
||||
return -ENOENT;
|
||||
|
||||
@@ -2689,7 +2697,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -2690,7 +2698,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
if (name && info->id_len) {
|
||||
const struct flash_info *jinfo;
|
||||
|
||||
|
@ -11,7 +11,7 @@ the ubi volume created by the other.
|
||||
---
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1030,7 +1030,7 @@ static const struct flash_info spi_nor_i
|
||||
@@ -1031,7 +1031,7 @@ static const struct flash_info spi_nor_i
|
||||
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
|
||||
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
|
||||
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
|
||||
|
@ -760,7 +760,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1146,6 +1146,11 @@ static const struct flash_info spi_nor_i
|
||||
@@ -1147,6 +1147,11 @@ static const struct flash_info spi_nor_i
|
||||
{ "w25x40", INFO(0xef3013, 0, 64 * 1024, 8, SECT_4K) },
|
||||
{ "w25x80", INFO(0xef3014, 0, 64 * 1024, 16, SECT_4K) },
|
||||
{ "w25x16", INFO(0xef3015, 0, 64 * 1024, 32, SECT_4K) },
|
||||
|
@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -2662,6 +2662,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -2663,6 +2663,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
struct device *dev = nor->dev;
|
||||
struct mtd_info *mtd = &nor->mtd;
|
||||
struct device_node *np = spi_nor_get_flash_node(nor);
|
||||
@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
@@ -2737,7 +2738,12 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -2738,7 +2739,12 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
spi_nor_wait_till_ready(nor);
|
||||
}
|
||||
|
||||
|
@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
|
||||
return ret;
|
||||
@@ -1176,7 +1228,7 @@ static const struct flash_info spi_nor_i
|
||||
@@ -1177,7 +1229,7 @@ static const struct flash_info spi_nor_i
|
||||
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
|
||||
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
|
||||
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
|
||||
@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024,
|
||||
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) },
|
||||
|
||||
@@ -1236,6 +1288,9 @@ static int spi_nor_read(struct mtd_info
|
||||
@@ -1237,6 +1289,9 @@ static int spi_nor_read(struct mtd_info
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
while (len) {
|
||||
loff_t addr = from;
|
||||
|
||||
@@ -1260,6 +1315,18 @@ static int spi_nor_read(struct mtd_info
|
||||
@@ -1261,6 +1316,18 @@ static int spi_nor_read(struct mtd_info
|
||||
ret = 0;
|
||||
|
||||
read_err:
|
||||
@ -154,7 +154,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
|
||||
return ret;
|
||||
}
|
||||
@@ -1361,6 +1428,10 @@ static int spi_nor_write(struct mtd_info
|
||||
@@ -1362,6 +1429,10 @@ static int spi_nor_write(struct mtd_info
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
for (i = 0; i < len; ) {
|
||||
ssize_t written;
|
||||
loff_t addr = to + i;
|
||||
@@ -1401,6 +1472,7 @@ static int spi_nor_write(struct mtd_info
|
||||
@@ -1402,6 +1473,7 @@ static int spi_nor_write(struct mtd_info
|
||||
}
|
||||
|
||||
write_err:
|
||||
@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
|
||||
return ret;
|
||||
}
|
||||
@@ -2817,8 +2889,10 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -2818,8 +2890,10 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
} else if (mtd->size > 0x1000000) {
|
||||
/* enable 4-byte addressing if the device exceeds 16MiB */
|
||||
nor->addr_width = 4;
|
||||
|
@ -33,7 +33,7 @@
|
||||
/*
|
||||
* Write status register 1 byte
|
||||
* Returns negative if error occurred.
|
||||
@@ -2889,9 +2898,16 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -2890,9 +2899,16 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
} else if (mtd->size > 0x1000000) {
|
||||
/* enable 4-byte addressing if the device exceeds 16MiB */
|
||||
nor->addr_width = 4;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1060,6 +1060,11 @@ static const struct flash_info spi_nor_i
|
||||
@@ -1061,6 +1061,11 @@ static const struct flash_info spi_nor_i
|
||||
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
|
||||
SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
|
||||
},
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1099,7 +1099,7 @@ static const struct flash_info spi_nor_i
|
||||
@@ -1100,7 +1100,7 @@ static const struct flash_info spi_nor_i
|
||||
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
|
||||
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
||||
|
Loading…
Reference in New Issue
Block a user