mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
kernel: bump 6.1 to 6.1.2
This commit is contained in:
coolsnowwolf
parent
55ce447162
commit
5d4863cab0
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.1 = .1
|
LINUX_VERSION-6.1 = .2
|
||||||
LINUX_KERNEL_HASH-6.1.1 = a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb
|
LINUX_KERNEL_HASH-6.1.2 = ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae
|
||||||
|
|||||||
@ -0,0 +1,47 @@
|
|||||||
|
From 26422ac78e9d8767bd4aabfbae616b15edbf6a1b Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Date: Sat, 22 Oct 2022 23:13:18 +0200
|
||||||
|
Subject: [PATCH] mtd: core: set ROOT_DEV for partitions marked as rootfs in DT
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
This adds support for "linux,rootfs" binding that is used to mark flash
|
||||||
|
partition containing rootfs. It's useful for devices using device tree
|
||||||
|
that don't have bootloader passing root info in cmdline.
|
||||||
|
|
||||||
|
Signed-off-by: Rafa? Mi?ecki <rafal@milecki.pl>
|
||||||
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||||||
|
Link: https://lore.kernel.org/linux-mtd/20221022211318.32009-2-zajec5@gmail.com
|
||||||
|
---
|
||||||
|
drivers/mtd/mtdcore.c | 12 ++++++++++++
|
||||||
|
1 file changed, 12 insertions(+)
|
||||||
|
|
||||||
|
--- a/drivers/mtd/mtdcore.c
|
||||||
|
+++ b/drivers/mtd/mtdcore.c
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#include <linux/leds.h>
|
||||||
|
#include <linux/debugfs.h>
|
||||||
|
#include <linux/nvmem-provider.h>
|
||||||
|
+#include <linux/root_dev.h>
|
||||||
|
|
||||||
|
#include <linux/mtd/mtd.h>
|
||||||
|
#include <linux/mtd/partitions.h>
|
||||||
|
@@ -737,6 +738,17 @@ int add_mtd_device(struct mtd_info *mtd)
|
||||||
|
not->add(mtd);
|
||||||
|
|
||||||
|
mutex_unlock(&mtd_table_mutex);
|
||||||
|
+
|
||||||
|
+ if (of_find_property(mtd_get_of_node(mtd), "linux,rootfs", NULL)) {
|
||||||
|
+ if (IS_BUILTIN(CONFIG_MTD)) {
|
||||||
|
+ pr_info("mtd: setting mtd%d (%s) as root device\n", mtd->index, mtd->name);
|
||||||
|
+ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
|
||||||
|
+ } else {
|
||||||
|
+ pr_warn("mtd: can't set mtd%d (%s) as root device - mtd must be builtin\n",
|
||||||
|
+ mtd->index, mtd->name);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* We _know_ we aren't being removed, because
|
||||||
|
our caller is still holding us here. So none
|
||||||
|
of this try_ nonsense, and no bitching about it
|
||||||
@ -1,22 +0,0 @@
|
|||||||
From d3c5b26768dbe990c4e1bd79e420c11ce7491d51 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 11:36:00 +0200
|
|
||||||
Subject: [PATCH] swab: use stddefs.h instead of compiler.h
|
|
||||||
|
|
||||||
Fix an issue with kernel headers that broke perf.
|
|
||||||
|
|
||||||
---
|
|
||||||
include/uapi/linux/swab.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/include/uapi/linux/swab.h
|
|
||||||
+++ b/include/uapi/linux/swab.h
|
|
||||||
@@ -3,7 +3,7 @@
|
|
||||||
#define _UAPI_LINUX_SWAB_H
|
|
||||||
|
|
||||||
#include <linux/types.h>
|
|
||||||
-#include <linux/compiler.h>
|
|
||||||
+#include <linux/stddef.h>
|
|
||||||
#include <asm/bitsperlong.h>
|
|
||||||
#include <asm/swab.h>
|
|
||||||
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Thu, 3 Nov 2022 17:46:25 +0100
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_eth_soc: drop packets to WDMA if the
|
|
||||||
ring is full
|
|
||||||
|
|
||||||
Improves handling of DMA ring overflow.
|
|
||||||
Clarify other WDMA drop related comment.
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
||||||
@@ -3585,9 +3585,12 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
||||||
mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
|
|
||||||
|
|
||||||
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
|
|
||||||
- /* PSE should not drop port8 and port9 packets */
|
|
||||||
+ /* PSE should not drop port8 and port9 packets from WDMA Tx */
|
|
||||||
mtk_w32(eth, 0x00000300, PSE_DROP_CFG);
|
|
||||||
|
|
||||||
+ /* PSE should drop packets to port 8/9 on WDMA Rx ring full */
|
|
||||||
+ mtk_w32(eth, 0x00000300, PSE_PPE0_DROP);
|
|
||||||
+
|
|
||||||
/* PSE Free Queue Flow Control */
|
|
||||||
mtk_w32(eth, 0x01fa01f4, PSE_FQFC_CFG2);
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
||||||
@@ -127,6 +127,7 @@
|
|
||||||
#define PSE_FQFC_CFG1 0x100
|
|
||||||
#define PSE_FQFC_CFG2 0x104
|
|
||||||
#define PSE_DROP_CFG 0x108
|
|
||||||
+#define PSE_PPE0_DROP 0x110
|
|
||||||
|
|
||||||
/* PSE Input Queue Reservation Register*/
|
|
||||||
#define PSE_IQ_REV(x) (0x140 + (((x) - 1) << 2))
|
|
||||||
Loading…
Reference in New Issue
Block a user