Update kernel and OpenWrt

root/target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch

@@ -262,7 +262,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
  #ifdef CONFIG_SMP
  /*
 @@ -181,9 +183,15 @@ kexec_indirection_page:
- 	PTR		0
+ 	PTR_WD		0
  	.size		kexec_indirection_page, PTRSIZE
  
 -relocate_new_kernel_end:
@@ -278,7 +278,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
  
 -relocate_new_kernel_size:
 -	EXPORT(relocate_new_kernel_size)
--	PTR		relocate_new_kernel_end - relocate_new_kernel
+-	PTR_WD		relocate_new_kernel_end - relocate_new_kernel
 -	.size		relocate_new_kernel_size, PTRSIZE
 +kexec_relocate_new_kernel_end:
 +	EXPORT(kexec_relocate_new_kernel_end)

root/target/linux/generic/pending-5.15/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch

@@ -1,102 +0,0 @@
-From 6f8e5369ae054ec6c9265581d5a7e39738a5cd84 Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Tue, 30 Mar 2021 13:16:38 +0200
-Subject: [PATCH 1/2] NET: add mtd-mac-address support to of_get_mac_address()
-
-Many embedded devices have information such as mac addresses stored inside mtd
-devices. This patch allows us to add a property inside a node describing a
-network interface. The new property points at a mtd partition with an offset
-where the mac address can be found.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
----
- drivers/of/of_net.c | 75 ++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 74 insertions(+), 1 deletion(-)
-
---- a/drivers/of/of_net.c
-+++ b/drivers/of/of_net.c
-@@ -12,6 +12,7 @@
- #include <linux/export.h>
- #include <linux/device.h>
- #include <linux/nvmem-consumer.h>
-+#include <linux/mtd/mtd.h>
- 
- /**
-  * of_get_phy_mode - Get phy mode for given device_node
-@@ -95,6 +96,52 @@ static int of_get_mac_addr_nvmem(struct
- 	return 0;
- }
- 
-+static int of_get_mac_address_mtd(struct device_node *np, u8 *addr)
-+{
-+#ifdef CONFIG_MTD
-+	struct platform_device *pdev = of_find_device_by_node(np);
-+	struct device_node *mtd_np = NULL;
-+	size_t retlen;
-+	int size, ret;
-+	struct mtd_info *mtd;
-+	const char *part;
-+	const __be32 *list;
-+	phandle phandle;
-+	u8 mac[ETH_ALEN];
-+
-+	list = of_get_property(np, "mtd-mac-address", &size);
-+	if (!list || (size != (2 * sizeof(*list))))
-+		return -ENODEV;
-+
-+	phandle = be32_to_cpup(list++);
-+	if (phandle)
-+		mtd_np = of_find_node_by_phandle(phandle);
-+
-+	if (!mtd_np)
-+		return -ENODEV;
-+
-+	part = of_get_property(mtd_np, "label", NULL);
-+	if (!part)
-+		part = mtd_np->name;
-+
-+	mtd = get_mtd_device_nm(part);
-+	if (IS_ERR(mtd))
-+		return -ENODEV;
-+
-+	ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
-+	put_mtd_device(mtd);
-+
-+	if (!is_valid_ether_addr(mac))
-+		return -EINVAL;
-+
-+	memcpy(addr, mac, ETH_ALEN);
-+
-+	return 0;
-+#endif
-+	return -EINVAL;
-+}
-+
-+
- /**
-  * of_get_mac_address()
-  * @np:		Caller's Device Node
-@@ -119,6 +166,10 @@ static int of_get_mac_addr_nvmem(struct
-  * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
-  * but is all zeros.
-  *
-+ *
-+ * If a mtd-mac-address property exists, try to fetch the MAC address from the
-+ * specified mtd device.
-+ *
-  * Return: 0 on success and errno in case of error.
- */
- int of_get_mac_address(struct device_node *np, u8 *addr)
-@@ -140,6 +191,10 @@ int of_get_mac_address(struct device_nod
- 	if (!ret)
- 		return 0;
- 
-+	ret = of_get_mac_address_mtd(np, addr);
-+	if (!ret)
-+		return 0;
-+
- 	return of_get_mac_addr_nvmem(np, addr);
- }
- EXPORT_SYMBOL(of_get_mac_address);

root/target/linux/generic/pending-5.15/682-of_net-add-mac-address-increment-support.patch

@@ -1,84 +0,0 @@
-From 639dba857aa554f2a78572adc4cf3c32de9ec2e2 Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Tue, 30 Mar 2021 18:21:14 +0200
-Subject: [PATCH 2/2] of_net: add mac-address-increment support
-
-Lots of embedded devices use the mac-address of other interface
-extracted from nvmem cells and increments it by one or two. Add two
-bindings to integrate this and directly use the right mac-address for
-the interface. Some example are some routers that use the gmac
-mac-address stored in the art partition and increments it by one for the
-wifi. mac-address-increment-byte bindings is used to tell what byte of
-the mac-address has to be increased (if not defined the last byte is
-increased) and mac-address-increment tells how much the byte decided
-early has to be increased.
-
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
----
- drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 45 insertions(+), 14 deletions(-)
-
---- a/drivers/of/of_net.c
-+++ b/drivers/of/of_net.c
-@@ -170,31 +170,56 @@ static int of_get_mac_address_mtd(struct
-  * If a mtd-mac-address property exists, try to fetch the MAC address from the
-  * specified mtd device.
-  *
-+ * DT can tell the system to increment the mac-address after is extracted by
-+ * using:
-+ * - mac-address-increment-byte to decide what byte to increase
-+ *   (if not defined is increased the last byte)
-+ * - mac-address-increment to decide how much to increase. The value will
-+ *   not overflow to other bytes if the increment is over 255.
-+ *   (example 00:01:02:03:04:ff + 1 == 00:01:02:03:04:00)
-+ *
-  * Return: 0 on success and errno in case of error.
- */
- int of_get_mac_address(struct device_node *np, u8 *addr)
- {
-+	u32 inc_idx, mac_inc;
- 	int ret;
- 
-+	/* Check first if the increment byte is present and valid.
-+	 * If not set assume to increment the last byte if found.
-+	 */
-+	if (of_property_read_u32(np, "mac-address-increment-byte", &inc_idx))
-+		inc_idx = 5;
-+	if (inc_idx < 3 || inc_idx > 5)
-+		return -EINVAL;
-+
- 	if (!np)
- 		return -ENODEV;
- 
- 	ret = of_get_mac_addr(np, "mac-address", addr);
- 	if (!ret)
--		return 0;
-+		goto found;
- 
- 	ret = of_get_mac_addr(np, "local-mac-address", addr);
- 	if (!ret)
--		return 0;
-+		goto found;
- 
- 	ret = of_get_mac_addr(np, "address", addr);
- 	if (!ret)
--		return 0;
-+		goto found;
- 
- 	ret = of_get_mac_address_mtd(np, addr);
- 	if (!ret)
--		return 0;
-+		goto found;
-+
-+	ret = of_get_mac_addr_nvmem(np, addr);
-+	if (ret)
-+		return ret;
-+
-+found:
-+	if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
-+		addr[inc_idx] += mac_inc;
- 
--	return of_get_mac_addr_nvmem(np, addr);
-+	return ret;
- }
- EXPORT_SYMBOL(of_get_mac_address);

root/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch

@@ -1,37 +0,0 @@
---- a/drivers/of/of_net.c
-+++ b/drivers/of/of_net.c
-@@ -141,6 +141,26 @@ static int of_get_mac_address_mtd(struct
- 	return -EINVAL;
- }
- 
-+static int of_add_mac_address(struct device_node *np, u8* addr)
-+{
-+	struct property *prop;
-+
-+	prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-+	if (!prop)
-+		return -ENOMEM;
-+
-+	prop->name = "mac-address";
-+	prop->length = ETH_ALEN;
-+	prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL);
-+	if (!prop->value || of_update_property(np, prop))
-+		goto free;
-+
-+	return 0;
-+free:
-+	kfree(prop->value);
-+	kfree(prop);
-+	return -ENOMEM;
-+}
- 
- /**
-  * of_get_mac_address()
-@@ -220,6 +240,7 @@ found:
- 	if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
- 		addr[inc_idx] += mac_inc;
- 
-+	of_add_mac_address(np, addr);
- 	return ret;
- }
- EXPORT_SYMBOL(of_get_mac_address);