From 025c0bcd601698206d8f5ededadb25beb95ebdb7 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Jul 2021 16:58:50 +0100 Subject: [PATCH 01/17] uboot-mediatek: fix board name of Bananapi BPi-R2 As the board name was changed to be identical to the device tree compatible string (just like for other boards), also reflect that change for U-Boot. Signed-off-by: Daniel Golle --- package/boot/uboot-mediatek/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index 673b4d2aed..37af42e664 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -85,7 +85,7 @@ endef define U-Boot/mt7623n_bpir2 NAME:=Banana Pi R2 (mt7623) - BUILD_DEVICES:=bpi_bananapi-r2 + BUILD_DEVICES:=bananapi_bpi-r2 BUILD_SUBTARGET:=mt7623 UBOOT_IMAGE:=u-boot.bin UBOOT_CONFIG:=mt7623n_bpir2 From ddec752890022794a9c035356d7e13e9889a03db Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Jul 2021 17:00:11 +0100 Subject: [PATCH 02/17] mediatek: drop kmod-mmc Support for MMC is built-into the kernel anyway, no need to select the (empty/stub) kmod package. Signed-off-by: Daniel Golle --- target/linux/mediatek/image/mt7623.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index c404b333ba..166086b88e 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -88,7 +88,7 @@ define Device/bananapi_bpi-r2 DEVICE_VENDOR := Bananapi DEVICE_MODEL := BPi-R2 DEVICE_DTS := mt7623n-bananapi-bpi-r2 - DEVICE_PACKAGES := kmod-mmc mkf2fs e2fsprogs kmod-usb3 kmod-ata-ahci + DEVICE_PACKAGES := mkf2fs e2fsprogs kmod-usb3 kmod-ata-ahci UBOOT_ENVSIZE := 0x10000 UBOOT_OFFSET := 320k UBOOT_TARGET := mt7623n_bpir2 From 27deb35af3cfa1dda5a635016fa852c8d201e81f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Jul 2021 17:02:49 +0100 Subject: [PATCH 03/17] mediatek: fix typo in kernel mt7623/config-5.10 Fix typo reported by github user @mans0n. Signed-off-by: Daniel Golle --- target/linux/mediatek/mt7623/config-5.10 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/mt7623/config-5.10 b/target/linux/mediatek/mt7623/config-5.10 index ca1f92ae78..4e240b560d 100644 --- a/target/linux/mediatek/mt7623/config-5.10 +++ b/target/linux/mediatek/mt7623/config-5.10 @@ -229,7 +229,7 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -CINFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_SMP=y CONFIG_HDMI=y CONFIG_HIGHMEM=y From f7ab41acc98682d818a9da997ee5a888b8076656 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Tue, 20 Jul 2021 16:24:50 +0100 Subject: [PATCH 04/17] linux/rockchip: update the USB 3.0 controller node patch This has been added in Linux 5.10.51 [1], but it's broken/incomplete. Update our patch and refresh the remaining patches. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.51&id=421aff50af5e4cdc56b3ac8d6b670e09697bc8ac Signed-off-by: Rui Salvaterra --- ...address-support-to-of_get_mac_addres.patch | 13 +++----- ...et-add-mac-address-increment-support.patch | 9 ++---- ...usb3-controller-node-for-RK3328-SoCs.patch | 32 ++++++++++++------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch index 44a6b6a047..9e16564953 100644 --- a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch +++ b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch @@ -15,8 +15,6 @@ Signed-off-by: Ansuel Smith drivers/of/of_net.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index 6e411821583e..f072e2509cc9 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -11,6 +11,7 @@ @@ -27,7 +25,7 @@ index 6e411821583e..f072e2509cc9 100644 /** * of_get_phy_mode - Get phy mode for given device_node -@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *np, phy_interface_t *interface) +@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node * } EXPORT_SYMBOL_GPL(of_get_phy_mode); @@ -36,7 +34,7 @@ index 6e411821583e..f072e2509cc9 100644 { struct property *pp = of_find_property(np, name, NULL); -@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np) +@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem return mac; } @@ -107,7 +105,7 @@ index 6e411821583e..f072e2509cc9 100644 /** * Search the device tree for the best MAC address to use. 'mac-address' is * checked first, because that is supposed to contain to "most recent" MAC -@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np) +@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists * but is all zeros. * @@ -118,7 +116,7 @@ index 6e411821583e..f072e2509cc9 100644 * Return: Will be a valid pointer on success and ERR_PTR in case of error. */ const void *of_get_mac_address(struct device_node *np) -@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct device_node *np) +@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct de if (addr) return addr; @@ -129,6 +127,3 @@ index 6e411821583e..f072e2509cc9 100644 return of_get_mac_addr_nvmem(np); } EXPORT_SYMBOL(of_get_mac_address); --- -2.30.2 - diff --git a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch index 1c08e23699..0776d7bccc 100644 --- a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch +++ b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch @@ -18,11 +18,9 @@ Signed-off-by: Ansuel Smith drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 14 deletions(-) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index f072e2509cc9..0dbd1f7ef396 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c -@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name) +@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct devi return NULL; } @@ -67,7 +65,7 @@ index f072e2509cc9..0dbd1f7ef396 100644 { #ifdef CONFIG_MTD struct device_node *mtd_np = NULL; -@@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np) +@@ -167,28 +172,54 @@ free: * If a mtd-mac-address property exists, try to fetch the MAC address from the * specified mtd device, and store it as a 'mac-address' property * @@ -128,6 +126,3 @@ index f072e2509cc9..0dbd1f7ef396 100644 + return addr; } EXPORT_SYMBOL(of_get_mac_address); --- -2.30.2 - diff --git a/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch b/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch index 54036c0f6b..2dd6e40ebf 100644 --- a/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch +++ b/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch @@ -26,20 +26,30 @@ use-case. You've been warned. --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -1003,6 +1003,33 @@ - status = "disabled"; +@@ -985,22 +985,30 @@ }; -+ usbdrd3: usb@ff600000 { + usbdrd3: usb@ff600000 { +- compatible = "rockchip,rk3328-dwc3", "snps,dwc3"; +- reg = <0x0 0xff600000 0x0 0x100000>; +- interrupts = ; + compatible = "rockchip,rk3328-dwc3", "rockchip,rk3399-dwc3"; -+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>, -+ <&cru ACLK_USB3OTG>; -+ clock-names = "ref_clk", "suspend_clk", -+ "bus_clk"; + clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>, + <&cru ACLK_USB3OTG>; + clock-names = "ref_clk", "suspend_clk", + "bus_clk"; +- dr_mode = "otg"; +- phy_type = "utmi_wide"; +- snps,dis-del-phy-power-chg-quirk; +- snps,dis_enblslpm_quirk; +- snps,dis-tx-ipgap-linecheck-quirk; +- snps,dis-u2-freeclk-exists-quirk; +- snps,dis_u2_susphy_quirk; +- snps,dis_u3_susphy_quirk; + #address-cells = <2>; + #size-cells = <2>; + ranges; -+ status = "disabled"; + status = "disabled"; + + usbdrd_dwc3: dwc3@ff600000 { + compatible = "snps,dwc3"; @@ -55,8 +65,6 @@ use-case. You've been warned. + snps,dis-tx-ipgap-linecheck-quirk; + status = "disabled"; + }; -+ }; -+ + }; + gic: interrupt-controller@ff811000 { - compatible = "arm,gic-400"; - #interrupt-cells = <3>; From fe7596192e24aadeb163db6bb7078702171d319c Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Jul 2021 18:43:56 +0100 Subject: [PATCH 05/17] mediatek: remove ext4 images from mt7623 build A full read-write rootfs cannot work inside uImage.FIT as the hash will obviously change once writing to it. Disable generating ext4 rootfs images. Signed-off-by: Daniel Golle --- target/linux/mediatek/mt7623/target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/mt7623/target.mk b/target/linux/mediatek/mt7623/target.mk index 224934caa3..8413acb263 100644 --- a/target/linux/mediatek/mt7623/target.mk +++ b/target/linux/mediatek/mt7623/target.mk @@ -8,7 +8,7 @@ BOARDNAME:=MT7623 CPU_TYPE:=cortex-a7 CPU_SUBTYPE:=neon-vfpv4 KERNELNAME:=Image dtbs zImage -FEATURES+=ext4 usb +FEATURES+=usb KERNEL_PATCHVER:=5.10 DEFAULT_PACKAGES+=blockdev uboot-envtools From c5b3c13b6030ef2d7e6e40df2b3e778077e15811 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 21 Jul 2021 10:26:44 +0100 Subject: [PATCH 06/17] mediatek: mt7623: add back needed build steps for U7623 board When reworking the BPi-R2 the mtk-mmc-img build step was removed despite it was still needed to build the image for the UniElec U7623 board. Add it back for now until U7623 gets its facelift. Signed-off-by: Daniel Golle --- target/linux/mediatek/image/mt7623.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index 166086b88e..00c1ac4443 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -113,6 +113,27 @@ endef TARGET_DEVICES += bananapi_bpi-r2 +define Build/mtk-mmc-img + rm -f $@.boot + mkfs.fat -C $@.boot $(BOOTFS_BLOCKS) + + if [ -r $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin ]; then \ + ./gen_mtk_mmc_img.sh emmc $@.emmc \ + $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin; \ + mcopy -i $@.boot $@.emmc ::eMMCboot.bin; \ + fi + mkenvimage -s $(UBOOT_ENVSIZE) -o $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env $(UBOOT_TARGET)-uEnv.txt + mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env ::uboot.env + mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage + ./gen_mtk_mmc_img.sh sd $@ \ + $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin \ + $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-u-boot*.bin \ + $(UBOOT_OFFSET) \ + $@.boot \ + $(IMAGE_ROOTFS) \ + $(CONFIG_MTK_BOOT_PARTSIZE) \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) +endef define Build/scatterfile ./gen_scatterfile.sh $(subst mt,MT,$(SUBTARGET)) "$1" \ From f33fbfa4de3fb1d2e8a0341683e0eb4da40365ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Wed, 21 Jul 2021 10:28:50 +0200 Subject: [PATCH 07/17] bmips: fix missing NVMEM subsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MAC address retrieval was switched to more generic upstream (5.13) NVMEM based solution in commit 32adbfc789f6 ("bmips: convert mtd-mac-address to nvmem implementation"), but NVMEM subsystem wasn't enabled in the kernel, so fix it now. References: https://github.com/openwrt/openwrt/pull/4041#issuecomment-883322801 Fixes: 32adbfc789f6 ("bmips: convert mtd-mac-address to nvmem implementation") Signed-off-by: Petr Štetiar --- target/linux/bmips/config-5.10 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/bmips/config-5.10 b/target/linux/bmips/config-5.10 index 58f40951d3..f10768f99e 100644 --- a/target/linux/bmips/config-5.10 +++ b/target/linux/bmips/config-5.10 @@ -194,6 +194,7 @@ CONFIG_NET_SWITCHDEV=y CONFIG_NO_EXCEPT_FILL=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y CONFIG_NR_CPUS=2 +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y From 373c08bcbb08b49715919597ed400abb4dd169c9 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 21 Jul 2021 10:28:50 +0200 Subject: [PATCH 08/17] ramips: fix missing NVMEM subsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MAC address retrieval was switched to more generic upstream (5.13) NVMEM based solution in commit 06bb4a5018cd ("ramips: convert mtd-mac-address to nvmem implementation") , but NVMEM subsystem wasn't enabled in the kernel, so fix it now. References: https://github.com/openwrt/openwrt/pull/4041#issuecomment-883322801 Fixes: 06bb4a5018cd ("ramips: convert mtd-mac-address to nvmem implementation") Signed-off-by: David Bauer Signed-off-by: Petr Štetiar [commit message] --- target/linux/ramips/mt7620/config-5.10 | 1 + target/linux/ramips/mt7620/config-5.4 | 1 + target/linux/ramips/mt7621/config-5.10 | 1 + target/linux/ramips/mt7621/config-5.4 | 1 + target/linux/ramips/mt76x8/config-5.10 | 1 + target/linux/ramips/mt76x8/config-5.4 | 1 + target/linux/ramips/rt288x/config-5.10 | 1 + target/linux/ramips/rt288x/config-5.4 | 1 + target/linux/ramips/rt305x/config-5.10 | 1 + target/linux/ramips/rt305x/config-5.4 | 1 + target/linux/ramips/rt3883/config-5.10 | 1 + target/linux/ramips/rt3883/config-5.4 | 1 + 12 files changed, 12 insertions(+) diff --git a/target/linux/ramips/mt7620/config-5.10 b/target/linux/ramips/mt7620/config-5.10 index 391449cc51..f91d01bbd8 100644 --- a/target/linux/ramips/mt7620/config-5.10 +++ b/target/linux/ramips/mt7620/config-5.10 @@ -129,6 +129,7 @@ CONFIG_NET_RALINK_SOC=y # CONFIG_NET_VENDOR_MEDIATEK is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/mt7620/config-5.4 b/target/linux/ramips/mt7620/config-5.4 index ca96f09c5b..d6d8ef483f 100644 --- a/target/linux/ramips/mt7620/config-5.4 +++ b/target/linux/ramips/mt7620/config-5.4 @@ -131,6 +131,7 @@ CONFIG_NET_RALINK_SOC=y # CONFIG_NET_VENDOR_MEDIATEK is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/mt7621/config-5.10 b/target/linux/ramips/mt7621/config-5.10 index 92165590f6..b02e59588f 100644 --- a/target/linux/ramips/mt7621/config-5.10 +++ b/target/linux/ramips/mt7621/config-5.10 @@ -190,6 +190,7 @@ CONFIG_NET_VENDOR_MEDIATEK=y CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NR_CPUS=4 +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4 index 0ce300c138..f303d354a8 100644 --- a/target/linux/ramips/mt7621/config-5.4 +++ b/target/linux/ramips/mt7621/config-5.4 @@ -180,6 +180,7 @@ CONFIG_NET_SWITCHDEV=y CONFIG_NET_VENDOR_MEDIATEK=y # CONFIG_NET_VENDOR_RALINK is not set CONFIG_NR_CPUS=4 +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/mt76x8/config-5.10 b/target/linux/ramips/mt76x8/config-5.10 index 3a42a5770f..fd1e03685e 100644 --- a/target/linux/ramips/mt76x8/config-5.10 +++ b/target/linux/ramips/mt76x8/config-5.10 @@ -124,6 +124,7 @@ CONFIG_NET_RALINK_SOC=y # CONFIG_NET_VENDOR_MEDIATEK is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/mt76x8/config-5.4 b/target/linux/ramips/mt76x8/config-5.4 index c69f120899..5b9792b30e 100644 --- a/target/linux/ramips/mt76x8/config-5.4 +++ b/target/linux/ramips/mt76x8/config-5.4 @@ -124,6 +124,7 @@ CONFIG_NET_RALINK_SOC=y # CONFIG_NET_VENDOR_MEDIATEK is not set CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/rt288x/config-5.10 b/target/linux/ramips/rt288x/config-5.10 index 88d06266b9..03b38fcad4 100644 --- a/target/linux/ramips/rt288x/config-5.10 +++ b/target/linux/ramips/rt288x/config-5.10 @@ -112,6 +112,7 @@ CONFIG_NET_RALINK_SOC=y CONFIG_NET_VENDOR_RALINK=y CONFIG_NLS=m CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/rt288x/config-5.4 b/target/linux/ramips/rt288x/config-5.4 index d0de43e29c..2ddcb15741 100644 --- a/target/linux/ramips/rt288x/config-5.4 +++ b/target/linux/ramips/rt288x/config-5.4 @@ -112,6 +112,7 @@ CONFIG_NET_RALINK_SOC=y CONFIG_NET_VENDOR_RALINK=y CONFIG_NLS=m CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/rt305x/config-5.10 b/target/linux/ramips/rt305x/config-5.10 index 1704accf95..a67b525f82 100644 --- a/target/linux/ramips/rt305x/config-5.10 +++ b/target/linux/ramips/rt305x/config-5.10 @@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3050=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/rt305x/config-5.4 b/target/linux/ramips/rt305x/config-5.4 index b4ee93c05b..8ba86b501c 100644 --- a/target/linux/ramips/rt305x/config-5.4 +++ b/target/linux/ramips/rt305x/config-5.4 @@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3050=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/rt3883/config-5.10 b/target/linux/ramips/rt3883/config-5.10 index 16d6fc32f8..664d93f454 100644 --- a/target/linux/ramips/rt3883/config-5.10 +++ b/target/linux/ramips/rt3883/config-5.10 @@ -113,6 +113,7 @@ CONFIG_NET_RALINK_RT3883=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y diff --git a/target/linux/ramips/rt3883/config-5.4 b/target/linux/ramips/rt3883/config-5.4 index f7d6a2cc2b..49e449f8b9 100644 --- a/target/linux/ramips/rt3883/config-5.4 +++ b/target/linux/ramips/rt3883/config-5.4 @@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3883=y CONFIG_NET_RALINK_SOC=y CONFIG_NET_VENDOR_RALINK=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y From 5096f0513b7d2d3fc1004578e8ef3c03fdfa7c1f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 21 Jul 2021 15:32:00 +0100 Subject: [PATCH 09/17] mediatek: mt7623: allow build without ext4 rootfs The image generation code for the U7623 board expects ext4 filesystem to be selected in menuconfig and CONFIG_TARGET_ROOTFS_PARTSIZE to be defined. Now that ext4 isn't enabled any more, the variable was missing and broke the build. Set the default (104) instead of using the config variable to fix that. Signed-off-by: Daniel Golle --- target/linux/mediatek/image/mt7623.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index 00c1ac4443..653da6b2c0 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -132,7 +132,7 @@ define Build/mtk-mmc-img $@.boot \ $(IMAGE_ROOTFS) \ $(CONFIG_MTK_BOOT_PARTSIZE) \ - $(CONFIG_TARGET_ROOTFS_PARTSIZE) + 104 endef define Build/scatterfile From 089c2bb2178daa144baa2e3ed20a55fb9a5c11ab Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 21 Jul 2021 16:18:58 +0100 Subject: [PATCH 10/17] mediatek: mt7623: yet another legacy image variable restored Restore BOOTFS_BLOCKS variable until U7623 gets brushed, so things hopefully build now. Signed-off-by: Daniel Golle --- target/linux/mediatek/image/mt7623.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index 653da6b2c0..9a938662c3 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -113,6 +113,11 @@ endef TARGET_DEVICES += bananapi_bpi-r2 +ifneq ($(CONFIG_MTK_BOOT_PARTSIZE),) +BOOTFS_BLOCK_SIZE := 1024 +BOOTFS_BLOCKS := $(shell echo $$(($(CONFIG_MTK_BOOT_PARTSIZE)*1024*1024/$(BOOTFS_BLOCK_SIZE)))) +endif + define Build/mtk-mmc-img rm -f $@.boot mkfs.fat -C $@.boot $(BOOTFS_BLOCKS) @@ -140,6 +145,7 @@ define Build/scatterfile $(subst -scatter.txt,,$(notdir $@)) "$(DEVICE_TITLE)" > $@ endef + # Full eMMC image including U-Boot and partition table define Device/unielec_u7623-emmc DEVICE_VENDOR := UniElec From b30924873062be47250e6b872347461c8221688d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 20 Jul 2021 22:00:10 +0200 Subject: [PATCH 11/17] generic: add mac-address property for NVMEM mac addresses Traversing the device-tree by referencing a network device to determine a devices labe-mac does not work with the generic nvmem implementation, as the userspace expects the MAC-address to be available as a device-tree property. The legacy mtd-mac-address implementation did create such a node. Do the same when using the nvmem implementation to allow reading the MAC address. Fixes commit d284e6ef0f06 ("treewide: convert mtd-mac-address-increment* to generic implementation") Signed-off-by: David Bauer --- .../683-NET-add-mac-address-property.patch | 59 +++++++++++++++++++ .../683-NET-add-mac-address-property.patch | 59 +++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 target/linux/generic/hack-5.10/683-NET-add-mac-address-property.patch create mode 100644 target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch diff --git a/target/linux/generic/hack-5.10/683-NET-add-mac-address-property.patch b/target/linux/generic/hack-5.10/683-NET-add-mac-address-property.patch new file mode 100644 index 0000000000..de561c5336 --- /dev/null +++ b/target/linux/generic/hack-5.10/683-NET-add-mac-address-property.patch @@ -0,0 +1,59 @@ +From: David Bauer +Date: Tue, 20 Jul 2021 22:00:10 +0200 +Subject: [PATCH] generic: add mac-address property for NVMEM mac addresses + +Traversing the device-tree by referencing a network device to determine +a devices labe-mac does not work with the generic nvmem implementation, +as the userspace expects the MAC-address to be available as a +device-tree property. + +The legacy mtd-mac-address implementation did create such a node. Do the +same when using the nvmem implementation to allow reading the MAC +address. + +Fixes commit d284e6ef0f06 ("treewide: convert mtd-mac-address-increment* +to generic implementation") + +Signed-off-by: David Bauer + +--- a/drivers/of/of_net.c ++++ b/drivers/of/of_net.c +@@ -61,6 +61,7 @@ static void *of_get_mac_addr_nvmem(struc + void *mac; + u8 nvmem_mac[ETH_ALEN]; + struct platform_device *pdev = of_find_device_by_node(np); ++ struct property *prop; + + if (!pdev) { + *err = -ENODEV; +@@ -78,10 +79,29 @@ static void *of_get_mac_addr_nvmem(struc + put_device(&pdev->dev); + if (!mac) { + *err = -ENOMEM; +- return NULL; ++ goto out_err; ++ } ++ ++ prop = devm_kzalloc(&pdev->dev, sizeof(*prop), GFP_KERNEL); ++ if (!prop) { ++ *err = -ENOMEM; ++ goto out_err; ++ } ++ prop->name = "mac-address"; ++ prop->length = ETH_ALEN; ++ prop->value = devm_kmemdup(&pdev->dev, mac, ETH_ALEN, GFP_KERNEL); ++ if (!prop->value || of_add_property(np, prop)) { ++ *err = -ENOMEM; ++ goto out_err; + } + + return mac; ++ ++out_err: ++ devm_kfree(&pdev->dev, prop->value); ++ devm_kfree(&pdev->dev, prop); ++ devm_kfree(&pdev->dev, mac); ++ return NULL; + } + + static void *of_get_mac_address_mtd(struct device_node *np) diff --git a/target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch b/target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch new file mode 100644 index 0000000000..de561c5336 --- /dev/null +++ b/target/linux/generic/hack-5.4/683-NET-add-mac-address-property.patch @@ -0,0 +1,59 @@ +From: David Bauer +Date: Tue, 20 Jul 2021 22:00:10 +0200 +Subject: [PATCH] generic: add mac-address property for NVMEM mac addresses + +Traversing the device-tree by referencing a network device to determine +a devices labe-mac does not work with the generic nvmem implementation, +as the userspace expects the MAC-address to be available as a +device-tree property. + +The legacy mtd-mac-address implementation did create such a node. Do the +same when using the nvmem implementation to allow reading the MAC +address. + +Fixes commit d284e6ef0f06 ("treewide: convert mtd-mac-address-increment* +to generic implementation") + +Signed-off-by: David Bauer + +--- a/drivers/of/of_net.c ++++ b/drivers/of/of_net.c +@@ -61,6 +61,7 @@ static void *of_get_mac_addr_nvmem(struc + void *mac; + u8 nvmem_mac[ETH_ALEN]; + struct platform_device *pdev = of_find_device_by_node(np); ++ struct property *prop; + + if (!pdev) { + *err = -ENODEV; +@@ -78,10 +79,29 @@ static void *of_get_mac_addr_nvmem(struc + put_device(&pdev->dev); + if (!mac) { + *err = -ENOMEM; +- return NULL; ++ goto out_err; ++ } ++ ++ prop = devm_kzalloc(&pdev->dev, sizeof(*prop), GFP_KERNEL); ++ if (!prop) { ++ *err = -ENOMEM; ++ goto out_err; ++ } ++ prop->name = "mac-address"; ++ prop->length = ETH_ALEN; ++ prop->value = devm_kmemdup(&pdev->dev, mac, ETH_ALEN, GFP_KERNEL); ++ if (!prop->value || of_add_property(np, prop)) { ++ *err = -ENOMEM; ++ goto out_err; + } + + return mac; ++ ++out_err: ++ devm_kfree(&pdev->dev, prop->value); ++ devm_kfree(&pdev->dev, prop); ++ devm_kfree(&pdev->dev, mac); ++ return NULL; + } + + static void *of_get_mac_address_mtd(struct device_node *np) From f7374bce00a97fda78ace3acaef48369e8246814 Mon Sep 17 00:00:00 2001 From: Paul Blazejowski Date: Wed, 21 Jul 2021 18:28:20 -0400 Subject: [PATCH 12/17] ath79: kernel: Add missing quote to drivers/mfd/Kconfig A missing quote in target/linux/ath79/patches-5.x/920-mikrotik-rb4xx.patch produces: ... scripts/kconfig/conf --syncconfig Kconfig drivers/mfd/Kconfig:2016:warning: multi-line strings not supported ... This patch adds missing closing quote, fixing the above warning. Signed-off-by: Paul Blazejowski --- target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch | 2 +- target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch index 7c3c91817f..3129fac3ab 100644 --- a/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch +++ b/target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch @@ -5,7 +5,7 @@ device found on several devices in RAVE line of hardware. +config MFD_RB4XX_CPLD -+ tristate "CPLD driver for Mikrotik RB4xx series boards ++ tristate "CPLD driver for Mikrotik RB4xx series boards" + select MFD_CORE + depends on ATH79 || COMPILE_TEST + help diff --git a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch index 60f8bdff79..7f424bbfc6 100644 --- a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch +++ b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch @@ -5,7 +5,7 @@ device found on several devices in RAVE line of hardware. +config MFD_RB4XX_CPLD -+ tristate "CPLD driver for Mikrotik RB4xx series boards ++ tristate "CPLD driver for Mikrotik RB4xx series boards" + select MFD_CORE + depends on ATH79 || COMPILE_TEST + help From 6dc18649a013151f226c9a362e5060c703b6c642 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Wed, 23 Jun 2021 23:37:25 +0800 Subject: [PATCH 13/17] ramips: mt7621: remove bring up DSA master init script With commit 2e17c710954b, there is no need to bring up DSA master port manually. Signed-off-by: DENG Qingfang --- .../lib/preinit/07_mt7621_bringup_dsa_master | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master diff --git a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master deleted file mode 100644 index 0f4660d242..0000000000 --- a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master +++ /dev/null @@ -1,20 +0,0 @@ -. /lib/functions.sh - -mt7621_bringup_dsa_master() { - local board=$(board_name) - local masterif - - case "$board" in - ubnt,edgerouter-x|\ - ubnt,edgerouter-x-sfp) - masterif="dsa" - ;; - *) - masterif="eth0" - ;; - esac - - ip link set $masterif up -} - -boot_hook_add preinit_main mt7621_bringup_dsa_master \ No newline at end of file From 3cb22b277a312445bfe34f5e32626c4448f95b77 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 22 Jul 2021 16:37:12 +0300 Subject: [PATCH 14/17] kernel: add missing symbol to kmod-qlcnic When the kmod-qlcnic package is built on targets that have CONFIG_PCI_IOV enabled, the CONFIG_QLCNIC_SRIOV symbol is exposed. Enable this symbol in the kmod package to fix its build. Signed-off-by: Stijn Tintel --- package/kernel/linux/modules/netdevices.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index b91442748d..6bbaf21e4a 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1199,7 +1199,8 @@ define KernelPackage/qlcnic TITLE:=QLogic QLE8240 and QLE8242 device support KCONFIG:= \ CONFIG_QLCNIC \ - CONFIG_QLCNIC_HWMON=y + CONFIG_QLCNIC_HWMON=y \ + CONFIG_QLCNIC_SRIOV=y FILES:=$(LINUX_DIR)/drivers/net/ethernet/qlogic/qlcnic/qlcnic.ko AUTOLOAD:=$(call AutoProbe,qlcnic) endef From 6bc6a416851b01d7b062a504ba4296a14113d795 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Fri, 23 Jul 2021 12:43:35 +0200 Subject: [PATCH 15/17] generic: fix mediatek and dsa not detecting mac-addr from nvmem Nvmem require the device node to be registered with the of_platform. Register the device node so that nvmem can correctly find the dev and correctly load the mac-addr stored in the nvmem cell declared in the dts. Signed-off-by: Ansuel Smith --- ...atek-register-of_platform-for-every-.patch | 32 +++++++++++++++ ...register-every-port-with-of_platform.patch | 40 +++++++++++++++++++ ...atek-register-of_platform-for-every-.patch | 32 +++++++++++++++ ...register-every-port-with-of_platform.patch | 40 +++++++++++++++++++ 4 files changed, 144 insertions(+) create mode 100644 target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch create mode 100644 target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch create mode 100644 target/linux/generic/hack-5.4/780-drivers-net-mediatek-register-of_platform-for-every-.patch create mode 100644 target/linux/generic/hack-5.4/781-dsa-register-every-port-with-of_platform.patch diff --git a/target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch b/target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch new file mode 100644 index 0000000000..d1383cc2d1 --- /dev/null +++ b/target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch @@ -0,0 +1,32 @@ +From c94b2cfd25c282e2974accc1b07da98ae7139b47 Mon Sep 17 00:00:00 2001 +From: Ansuel Smith +Date: Fri, 23 Jul 2021 12:14:33 +0200 +Subject: [PATCH 1/2] drivers: net: mediatek: register of_platform for every + port + +Currently the nvmem framework require the devicenode to be registred on +the of_platform or of_get_mac_address fail to get the macaddress if +defined using an nvmem cell. Fix this by registrering these special node +so they can be found by of_find_device_by_node. + +Signed-off-by: Ansuel Smith +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +index ed4eacef17ce..666803817540 100644 +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -3015,6 +3015,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) + eth->netdev[id]->dev.of_node = np; + + eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; ++ ++ of_platform_device_create(np, NULL, NULL); + + return 0; + +-- +2.31.1 + diff --git a/target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch b/target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch new file mode 100644 index 0000000000..a8b8910423 --- /dev/null +++ b/target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch @@ -0,0 +1,40 @@ +From 8bab551f44204fc5d43977063cd704112c17c750 Mon Sep 17 00:00:00 2001 +From: Ansuel Smith +Date: Fri, 23 Jul 2021 12:17:27 +0200 +Subject: [PATCH 2/2] dsa: register every port with of_platform + +The declaration of a different mac-addr using the nvmem framework is +currently broken. The dsa code use the generic of_get_mac_address where +the nvmem function require the device node to be registred in the +of_platform to be found by of_find_device_by_node. Register every port +in the of_platform so they can corrently found and a custom mac-addr can +correctly be declared using a nvmem-cell declared in the dts. + +Signed-off-by: Ansuel Smith +--- + net/dsa/dsa2.c | 2 + + 1 file changed, 2 insertion(+) + +diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c +index b71e87909f0e..55bbc1a769ca 100644 +--- a/net/dsa/dsa2.c ++++ b/net/dsa/dsa2.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + + #include "dsa_priv.h" +@@ -392,6 +392,7 @@ static int dsa_port_setup(struct dsa_port *dp) + + break; + case DSA_PORT_TYPE_USER: ++ of_platform_device_create(dp->dn, NULL, NULL); + dp->mac = of_get_mac_address(dp->dn); + err = dsa_slave_create(dp); + if (err) +-- +2.31.1 + diff --git a/target/linux/generic/hack-5.4/780-drivers-net-mediatek-register-of_platform-for-every-.patch b/target/linux/generic/hack-5.4/780-drivers-net-mediatek-register-of_platform-for-every-.patch new file mode 100644 index 0000000000..d1383cc2d1 --- /dev/null +++ b/target/linux/generic/hack-5.4/780-drivers-net-mediatek-register-of_platform-for-every-.patch @@ -0,0 +1,32 @@ +From c94b2cfd25c282e2974accc1b07da98ae7139b47 Mon Sep 17 00:00:00 2001 +From: Ansuel Smith +Date: Fri, 23 Jul 2021 12:14:33 +0200 +Subject: [PATCH 1/2] drivers: net: mediatek: register of_platform for every + port + +Currently the nvmem framework require the devicenode to be registred on +the of_platform or of_get_mac_address fail to get the macaddress if +defined using an nvmem cell. Fix this by registrering these special node +so they can be found by of_find_device_by_node. + +Signed-off-by: Ansuel Smith +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +index ed4eacef17ce..666803817540 100644 +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -3015,6 +3015,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) + eth->netdev[id]->dev.of_node = np; + + eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; ++ ++ of_platform_device_create(np, NULL, NULL); + + return 0; + +-- +2.31.1 + diff --git a/target/linux/generic/hack-5.4/781-dsa-register-every-port-with-of_platform.patch b/target/linux/generic/hack-5.4/781-dsa-register-every-port-with-of_platform.patch new file mode 100644 index 0000000000..f9a684c093 --- /dev/null +++ b/target/linux/generic/hack-5.4/781-dsa-register-every-port-with-of_platform.patch @@ -0,0 +1,40 @@ +From 8bab551f44204fc5d43977063cd704112c17c750 Mon Sep 17 00:00:00 2001 +From: Ansuel Smith +Date: Fri, 23 Jul 2021 12:17:27 +0200 +Subject: [PATCH 2/2] dsa: register every port with of_platform + +The declaration of a different mac-addr using the nvmem framework is +currently broken. The dsa code use the generic of_get_mac_address where +the nvmem function require the device node to be registred in the +of_platform to be found by of_find_device_by_node. Register every port +in the of_platform so they can corrently found and a custom mac-addr can +correctly be declared using a nvmem-cell declared in the dts. + +Signed-off-by: Ansuel Smith +--- + net/dsa/dsa2.c | 2 + + 1 file changed, 2 insertion(+) + +diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c +index b71e87909f0e..55bbc1a769ca 100644 +--- a/net/dsa/dsa2.c ++++ b/net/dsa/dsa2.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + + #include "dsa_priv.h" +@@ -392,6 +392,7 @@ static int dsa_port_setup(struct dsa_port *dp) + break; + devlink_port_registered = true; + ++ of_platform_device_create(dp->dn, NULL, NULL); + dp->mac = of_get_mac_address(dp->dn); + err = dsa_slave_create(dp); + if (err) +-- +2.31.1 + From 5bc898b43e5c87187936151a44136ab0f00484ef Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 24 Jul 2021 00:00:22 +0100 Subject: [PATCH 16/17] fstools: update to git HEAD 59f7c11 blockd: create mountpoint parent folder if needed 9cc96af Revert "block: resolve /dev/mapper/* name for /dev/dm-0 when hotplugging" 06334ac Revert "blockd: detect mountpoint of /dev/mapper/*" 9ab3551 block: use /dev/dm-* instead of /dev/mapper/* 5114595 block: allow remove hotplug event to arrive at blockd Signed-off-by: Daniel Golle --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 5300d35dc4..02f1353cea 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=c57f21db30349f30d70b6169ad9d9c905733069fe14ea6b4ffdfbd82a355dd61 -PKG_SOURCE_DATE:=2021-07-15 -PKG_SOURCE_VERSION:=cdc9939b071427cf2b35134481df27b4bd76dbfc +PKG_MIRROR_HASH:=19a66cd45edee69fe23456e43c428935e30245ad0aa644539100da88f77209a2 +PKG_SOURCE_DATE:=2021-07-23 +PKG_SOURCE_VERSION:=5114595bc37e441a905db6b05b4487ad67fcb3d1 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From ca31755af9877a4539a0268f50b26f003f2059cd Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 24 Jul 2021 01:13:00 +0100 Subject: [PATCH 17/17] fstools: update to git HEAD (again) a846c6b blockd: fix length of timeout int passed to ioctl 1d681ca block: support umount device basename Signed-off-by: Daniel Golle --- package/system/fstools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 02f1353cea..f56a18c70e 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=19a66cd45edee69fe23456e43c428935e30245ad0aa644539100da88f77209a2 -PKG_SOURCE_DATE:=2021-07-23 -PKG_SOURCE_VERSION:=5114595bc37e441a905db6b05b4487ad67fcb3d1 +PKG_MIRROR_HASH:=66811ea1ec6c747ad46978a0dc55a9e620e493cfa39d8acb318d1d1b00dc1fcc +PKG_SOURCE_DATE:=2021-07-24 +PKG_SOURCE_VERSION:=1d681ca59cada118633c6e2d65b882b4c8f0db58 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0