From 80f79beb952dcb87d967a130d326cb1dd5a077ed Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 30 Mar 2022 01:43:17 +0100 Subject: [PATCH 01/39] CI: usability improvements for tools * Always store build logs * Store .config as an artifact * Rename job to `tools-{ os }` for log archive without spaces * Run CI job on changes to the CI file itself Signed-off-by: Paul Spooren --- .github/workflows/tools.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 76cbd30db7..be967833cb 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -4,10 +4,11 @@ on: pull_request: paths: - 'tools/**' + - '.github/workflows/tools.yml' jobs: build: - name: Build tools on ${{ matrix.os }} + name: tools-${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: fail-fast: False @@ -122,13 +123,22 @@ jobs: make tools/install -j$(nproc) BUILD_LOG=1 - name: Move logs to GITHUB_WORKSPACE - if: failure() + if: always() run: | cp -r "$WORKPATH/logs" "$GITHUB_WORKSPACE" + cp -r "$WORKPATH/.config" "$GITHUB_WORKSPACE/config" + - name: Upload logs - if: failure() + if: always() uses: actions/upload-artifact@v2 with: name: ${{ matrix.os }}-logs path: "logs" + + - name: Upload config + if: always() + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.os }}-config + path: "config" From f8e65fecee1a60a5cde827d4f5df751a02916156 Mon Sep 17 00:00:00 2001 From: Oskari Lemmela Date: Wed, 26 Jan 2022 08:38:43 +0200 Subject: [PATCH 02/39] ath79: fix ar934x spi driver delays Backport spi driver delay fixes from the 5.17-rc1 kernel. Signed-off-by: Oskari Lemmela [port also to kernel 5.15] Signed-off-by: Koen Vandeputte --- ...-ar934x-fix-transfer-and-word-delays.patch | 27 ++++++++ ...3-v5.17-spi-ar934x-fix-transfer-size.patch | 62 +++++++++++++++++++ ...-ar934x-fix-transfer-and-word-delays.patch | 27 ++++++++ ...3-v5.17-spi-ar934x-fix-transfer-size.patch | 62 +++++++++++++++++++ 4 files changed, 178 insertions(+) create mode 100644 target/linux/ath79/patches-5.10/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch create mode 100644 target/linux/ath79/patches-5.10/403-v5.17-spi-ar934x-fix-transfer-size.patch create mode 100644 target/linux/ath79/patches-5.15/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch create mode 100644 target/linux/ath79/patches-5.15/403-v5.17-spi-ar934x-fix-transfer-size.patch diff --git a/target/linux/ath79/patches-5.10/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch b/target/linux/ath79/patches-5.10/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch new file mode 100644 index 0000000000..7ce6df6d7b --- /dev/null +++ b/target/linux/ath79/patches-5.10/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch @@ -0,0 +1,27 @@ +From c70282457c380db7deb57c81a6894debc8f88efa Mon Sep 17 00:00:00 2001 +From: Oskari Lemmela +Date: Wed, 22 Dec 2021 07:59:58 +0200 +Subject: [PATCH] spi: ar934x: fix transfer and word delays + +Add missing delay between transferred messages and words. + +Signed-off-by: Oskari Lemmela +Link: https://lore.kernel.org/r/20211222055958.1383233-3-oskari@lemmela.net +Signed-off-by: Mark Brown +--- + drivers/spi/spi-ar934x.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/spi/spi-ar934x.c ++++ b/drivers/spi/spi-ar934x.c +@@ -137,8 +137,10 @@ static int ar934x_spi_transfer_one_messa + reg >>= 8; + } + } ++ spi_delay_exec(&t->word_delay, t); + } + m->actual_length += t->len; ++ spi_transfer_delay_exec(t); + } + + msg_done: diff --git a/target/linux/ath79/patches-5.10/403-v5.17-spi-ar934x-fix-transfer-size.patch b/target/linux/ath79/patches-5.10/403-v5.17-spi-ar934x-fix-transfer-size.patch new file mode 100644 index 0000000000..87f5da2c60 --- /dev/null +++ b/target/linux/ath79/patches-5.10/403-v5.17-spi-ar934x-fix-transfer-size.patch @@ -0,0 +1,62 @@ +From ebe33e5a98dcf14a9630845f3f10c193584ac054 Mon Sep 17 00:00:00 2001 +From: Oskari Lemmela +Date: Wed, 22 Dec 2021 07:59:57 +0200 +Subject: [PATCH] spi: ar934x: fix transfer size + +If bits_per_word is configured, transfer only word amount +of data per iteration. + +Signed-off-by: Oskari Lemmela +Link: https://lore.kernel.org/r/20211222055958.1383233-2-oskari@lemmela.net +Signed-off-by: Mark Brown +--- + drivers/spi/spi-ar934x.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +--- a/drivers/spi/spi-ar934x.c ++++ b/drivers/spi/spi-ar934x.c +@@ -82,7 +82,7 @@ static int ar934x_spi_transfer_one_messa + struct spi_device *spi = m->spi; + unsigned long trx_done, trx_cur; + int stat = 0; +- u8 term = 0; ++ u8 bpw, term = 0; + int div, i; + u32 reg; + const u8 *tx_buf; +@@ -90,6 +90,11 @@ static int ar934x_spi_transfer_one_messa + + m->actual_length = 0; + list_for_each_entry(t, &m->transfers, transfer_list) { ++ if (t->bits_per_word >= 8 && t->bits_per_word < 32) ++ bpw = t->bits_per_word >> 3; ++ else ++ bpw = 4; ++ + if (t->speed_hz) + div = ar934x_spi_clk_div(sp, t->speed_hz); + else +@@ -105,10 +110,10 @@ static int ar934x_spi_transfer_one_messa + iowrite32(reg, sp->base + AR934X_SPI_REG_CTRL); + iowrite32(0, sp->base + AR934X_SPI_DATAOUT); + +- for (trx_done = 0; trx_done < t->len; trx_done += 4) { ++ for (trx_done = 0; trx_done < t->len; trx_done += bpw) { + trx_cur = t->len - trx_done; +- if (trx_cur > 4) +- trx_cur = 4; ++ if (trx_cur > bpw) ++ trx_cur = bpw; + else if (list_is_last(&t->transfer_list, &m->transfers)) + term = 1; + +@@ -193,7 +198,8 @@ static int ar934x_spi_probe(struct platf + ctlr->mode_bits = SPI_LSB_FIRST; + ctlr->setup = ar934x_spi_setup; + ctlr->transfer_one_message = ar934x_spi_transfer_one_message; +- ctlr->bits_per_word_mask = SPI_BPW_MASK(8); ++ ctlr->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(24) | ++ SPI_BPW_MASK(16) | SPI_BPW_MASK(8); + ctlr->dev.of_node = pdev->dev.of_node; + ctlr->num_chipselect = 3; + diff --git a/target/linux/ath79/patches-5.15/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch b/target/linux/ath79/patches-5.15/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch new file mode 100644 index 0000000000..7ce6df6d7b --- /dev/null +++ b/target/linux/ath79/patches-5.15/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch @@ -0,0 +1,27 @@ +From c70282457c380db7deb57c81a6894debc8f88efa Mon Sep 17 00:00:00 2001 +From: Oskari Lemmela +Date: Wed, 22 Dec 2021 07:59:58 +0200 +Subject: [PATCH] spi: ar934x: fix transfer and word delays + +Add missing delay between transferred messages and words. + +Signed-off-by: Oskari Lemmela +Link: https://lore.kernel.org/r/20211222055958.1383233-3-oskari@lemmela.net +Signed-off-by: Mark Brown +--- + drivers/spi/spi-ar934x.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/spi/spi-ar934x.c ++++ b/drivers/spi/spi-ar934x.c +@@ -137,8 +137,10 @@ static int ar934x_spi_transfer_one_messa + reg >>= 8; + } + } ++ spi_delay_exec(&t->word_delay, t); + } + m->actual_length += t->len; ++ spi_transfer_delay_exec(t); + } + + msg_done: diff --git a/target/linux/ath79/patches-5.15/403-v5.17-spi-ar934x-fix-transfer-size.patch b/target/linux/ath79/patches-5.15/403-v5.17-spi-ar934x-fix-transfer-size.patch new file mode 100644 index 0000000000..87f5da2c60 --- /dev/null +++ b/target/linux/ath79/patches-5.15/403-v5.17-spi-ar934x-fix-transfer-size.patch @@ -0,0 +1,62 @@ +From ebe33e5a98dcf14a9630845f3f10c193584ac054 Mon Sep 17 00:00:00 2001 +From: Oskari Lemmela +Date: Wed, 22 Dec 2021 07:59:57 +0200 +Subject: [PATCH] spi: ar934x: fix transfer size + +If bits_per_word is configured, transfer only word amount +of data per iteration. + +Signed-off-by: Oskari Lemmela +Link: https://lore.kernel.org/r/20211222055958.1383233-2-oskari@lemmela.net +Signed-off-by: Mark Brown +--- + drivers/spi/spi-ar934x.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +--- a/drivers/spi/spi-ar934x.c ++++ b/drivers/spi/spi-ar934x.c +@@ -82,7 +82,7 @@ static int ar934x_spi_transfer_one_messa + struct spi_device *spi = m->spi; + unsigned long trx_done, trx_cur; + int stat = 0; +- u8 term = 0; ++ u8 bpw, term = 0; + int div, i; + u32 reg; + const u8 *tx_buf; +@@ -90,6 +90,11 @@ static int ar934x_spi_transfer_one_messa + + m->actual_length = 0; + list_for_each_entry(t, &m->transfers, transfer_list) { ++ if (t->bits_per_word >= 8 && t->bits_per_word < 32) ++ bpw = t->bits_per_word >> 3; ++ else ++ bpw = 4; ++ + if (t->speed_hz) + div = ar934x_spi_clk_div(sp, t->speed_hz); + else +@@ -105,10 +110,10 @@ static int ar934x_spi_transfer_one_messa + iowrite32(reg, sp->base + AR934X_SPI_REG_CTRL); + iowrite32(0, sp->base + AR934X_SPI_DATAOUT); + +- for (trx_done = 0; trx_done < t->len; trx_done += 4) { ++ for (trx_done = 0; trx_done < t->len; trx_done += bpw) { + trx_cur = t->len - trx_done; +- if (trx_cur > 4) +- trx_cur = 4; ++ if (trx_cur > bpw) ++ trx_cur = bpw; + else if (list_is_last(&t->transfer_list, &m->transfers)) + term = 1; + +@@ -193,7 +198,8 @@ static int ar934x_spi_probe(struct platf + ctlr->mode_bits = SPI_LSB_FIRST; + ctlr->setup = ar934x_spi_setup; + ctlr->transfer_one_message = ar934x_spi_transfer_one_message; +- ctlr->bits_per_word_mask = SPI_BPW_MASK(8); ++ ctlr->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(24) | ++ SPI_BPW_MASK(16) | SPI_BPW_MASK(8); + ctlr->dev.of_node = pdev->dev.of_node; + ctlr->num_chipselect = 3; + From aff4ffb3f04c7befee845b839f0b4fc8533a1786 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 5 Apr 2022 12:28:42 +0200 Subject: [PATCH 03/39] kernel: add missing symbol for 5.15 Driver for the National Semiconductor DP83640 PHYTER (DP83640_PHY) [N/m/y/?] (NEW) Signed-off-by: Koen Vandeputte --- target/linux/generic/config-5.15 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index 04c5d51409..dd030107af 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -1466,6 +1466,7 @@ CONFIG_DMA_NONCOHERENT_MMAP=y # CONFIG_DNOTIFY is not set # CONFIG_DNS_RESOLVER is not set CONFIG_DOUBLEFAULT=y +# CONFIG_DP83640_PHY is not set # CONFIG_DP83822_PHY is not set # CONFIG_DP83848_PHY is not set # CONFIG_DP83867_PHY is not set From 5af9aafabbc0c3306e638d89846e1b424259478d Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 5 Apr 2022 13:53:20 +0200 Subject: [PATCH 04/39] ath79: mikrotik: add 5.15 support for mikrotik subtarget Tested on RB922 Signed-off-by: Koen Vandeputte --- target/linux/ath79/mikrotik/target.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/linux/ath79/mikrotik/target.mk b/target/linux/ath79/mikrotik/target.mk index f5df904487..697aa003c8 100644 --- a/target/linux/ath79/mikrotik/target.mk +++ b/target/linux/ath79/mikrotik/target.mk @@ -5,6 +5,8 @@ IMAGES_DIR := ../../.. DEFAULT_PACKAGES += wpad-basic-wolfssl +KERNEL_TESTING_PATCHVER:=5.15 + define Target/Description Build firmware images for MikroTik devices based on Qualcomm Atheros MIPS SoCs (AR71xx, AR72xx, AR91xx, AR93xx, QCA95xx). From d1456a4ad9fce88014d5d8ade9d11c16b517e2d1 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 5 Apr 2022 13:52:25 +0200 Subject: [PATCH 05/39] ath79: mikrotik: enable ecc hamming algorithm for kernel 5.15 This algorithm has it's own symbol now. Enable it to fix nand support Signed-off-by: Koen Vandeputte --- target/linux/ath79/mikrotik/config-default | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ath79/mikrotik/config-default b/target/linux/ath79/mikrotik/config-default index 2ff8a14f1d..67d4ca6edc 100644 --- a/target/linux/ath79/mikrotik/config-default +++ b/target/linux/ath79/mikrotik/config-default @@ -15,6 +15,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_AR934X=y CONFIG_MTD_NAND_CORE=y CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_NAND_RB91X=y CONFIG_MTD_RAW_NAND=y From 120e2d91dc70127553e054c21881fc2d95ab14a9 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 1 Apr 2022 10:50:25 +0200 Subject: [PATCH 06/39] kernel: package mhi bus driver Signed-off-by: Koen Vandeputte --- package/kernel/linux/modules/other.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index f3ad5bd9fe..7fef26b523 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1338,3 +1338,19 @@ define KernelPackage/f71808e-wdt/description endef $(eval $(call KernelPackage,f71808e-wdt)) + +define KernelPackage/mhi-bus + SUBMENU:=$(OTHER_MENU) + TITLE:=MHI bus + DEPENDS:=@LINUX_5_15 + KCONFIG:=CONFIG_MHI_BUS \ + CONFIG_MHI_BUS_DEBUG=y + FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko + AUTOLOAD:=$(call AutoProbe,mhi) +endef + +define KernelPackage/mhi-bus/description + Kernel module for the Qualcomm MHI bus. +endef + +$(eval $(call KernelPackage,mhi-bus)) From 8da3de825a90405351519c3a886959aac42c8364 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 5 Apr 2022 14:53:01 +0200 Subject: [PATCH 07/39] kernel: package mhi pci driver This driver provides MHI PCI controller driver for devices such as Qualcomm SDX55 based PCIe modems Signed-off-by: Koen Vandeputte --- package/kernel/linux/modules/other.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 7fef26b523..c8fea034c4 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1354,3 +1354,18 @@ define KernelPackage/mhi-bus/description endef $(eval $(call KernelPackage,mhi-bus)) + +define KernelPackage/mhi-pci-generic + SUBMENU:=$(OTHER_MENU) + TITLE:=MHI PCI controller driver + DEPENDS:=@LINUX_5_15 +kmod-mhi-bus + KCONFIG:=CONFIG_MHI_BUS_PCI_GENERIC + FILES:=$(LINUX_DIR)/drivers/bus/mhi/mhi_pci_generic.ko + AUTOLOAD:=$(call AutoProbe,mhi_pci_generic) +endef + +define KernelPackage/mhi-pci-generic/description + Kernel module for the MHI PCI controller driver. +endef + +$(eval $(call KernelPackage,mhi-pci-generic)) From de840a5e011debda789ce38d2126f65222494d62 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 1 Apr 2022 10:50:46 +0200 Subject: [PATCH 08/39] kernel: package mhi network driver Signed-off-by: Koen Vandeputte --- package/kernel/linux/modules/netdevices.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index c991808aed..539afff475 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1315,3 +1315,18 @@ define KernelPackage/sfc-falcon/description endef $(eval $(call KernelPackage,sfc-falcon)) + +define KernelPackage/mhi-net + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=MHI Network Device + DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus + KCONFIG:=CONFIG_MHI_NET + FILES:=$(LINUX_DIR)/drivers/net/mhi_net.ko + AUTOLOAD:=$(call AutoProbe,mhi_net) +endef + +define KernelPackage/mhi-net/description + Driver for MHI network interface +endef + +$(eval $(call KernelPackage,mhi-net)) From 2519190fec9b6e16e307f88e0825f4080c399886 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 5 Apr 2022 15:05:02 +0200 Subject: [PATCH 09/39] kernel: package mhi wwan ctrl driver MHI WWAN CTRL allows QCOM-based PCIe modems to expose different modem control protocols/ports to userspace, including AT, MBIM, QMI, DIAG and FIREHOSE. These protocols can be accessed directly from userspace (e.g. AT commands) or via libraries/tools (e.g. libmbim, libqmi, libqcdm) Signed-off-by: Koen Vandeputte --- package/kernel/linux/modules/netdevices.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 539afff475..d864e4eb38 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1330,3 +1330,19 @@ define KernelPackage/mhi-net/description endef $(eval $(call KernelPackage,mhi-net)) + +define KernelPackage/mhi-wwan-ctrl + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=MHI WWAN Control + DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus + KCONFIG:=CONFIG_MHI_WWAN_CTRL + FILES:=$(LINUX_DIR)/drivers/net/mhi_wwan_ctrl.ko + AUTOLOAD:=$(call AutoProbe,mhi_wwan_ctrl) +endef + +define KernelPackage/mhi-wwan-ctrl/description + Driver for MHI WWAN Control + This exposes all modem control ports like AT, MBIM, QMI, DIAG, .. +endef + +$(eval $(call KernelPackage,mhi-wwan-ctrl)) From 6af46796faf9f3b5f4537e35ec97be20fc30a65e Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 5 Apr 2022 15:07:36 +0200 Subject: [PATCH 10/39] kernel: package mhi mbim driver Signed-off-by: Koen Vandeputte --- package/kernel/linux/modules/netdevices.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index d864e4eb38..fa1a9e8caa 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1346,3 +1346,19 @@ define KernelPackage/mhi-wwan-ctrl/description endef $(eval $(call KernelPackage,mhi-wwan-ctrl)) + +define KernelPackage/mhi-wwan-mbim + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=MHI MBIM + DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus + KCONFIG:=CONFIG_MHI_WWAN_MBIM + FILES:=$(LINUX_DIR)/drivers/net/mhi_wwan_mbim.ko + AUTOLOAD:=$(call AutoProbe,mhi_wwan_mbim) +endef + +define KernelPackage/mhi-wwan-mbim/description + Driver for MHI MBIM + This implements MBIM over MHI +endef + +$(eval $(call KernelPackage,mhi-wwan-mbim)) From 0b98a55ad6de0564b31476c0f348980b0d802e83 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 5 Apr 2022 17:32:40 +0200 Subject: [PATCH 11/39] ubox: update to the latest version b87a4fdca634 kmodloader: support loading module options and blacklist from /etc/modules.conf Signed-off-by: Felix Fietkau --- package/system/ubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 8bc2fcde6e..5f5570cd22 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git -PKG_SOURCE_DATE:=2021-08-03 -PKG_SOURCE_VERSION:=205defb597295a4a8966db3e618cfe41a29bed99 -PKG_MIRROR_HASH:=22da1601424c13af8751424b4216f32910a26da49408b6f309158ed8cee93034 +PKG_SOURCE_DATE:=2022-01-06 +PKG_SOURCE_VERSION:=b87a4fdca6346a01c19e94fe0461fb9ef7493815 +PKG_MIRROR_HASH:=4b41596fa00637134b23175a4952de66ff80b2edb956f685347f146d90d910c5 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From c38b2c5f161aed5bcfa2df3df9042b4979dea255 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 5 Apr 2022 21:27:40 +0200 Subject: [PATCH 12/39] qosify: update to the latest version Replace the tc-full dependency with tc + libnl-tiny 1cd5e12eecdc loader/interface: attach bpf program directly using netlink Signed-off-by: Felix Fietkau --- package/network/config/qosify/Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile index d0cff54053..b15bde926d 100644 --- a/package/network/config/qosify/Makefile +++ b/package/network/config/qosify/Makefile @@ -11,9 +11,9 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=qosify PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2022-03-22 -PKG_SOURCE_VERSION:=57c7817f91c2ff2f247b2d7eb8554e861c4aec33 -PKG_MIRROR_HASH:=409f7db13a36334557de861a016a8d9f241070b2bbf6f738e992281b36f41cd4 +PKG_SOURCE_DATE:=2022-04-05 +PKG_SOURCE_VERSION:=1cd5e12eecdcab0845eda71383c4c0ba17092c6f +PKG_MIRROR_HASH:=f16748114ad5cad8fe1fe40ea43959873c5b0e8b75ddc99fc4323e12f0ab3b53 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=GPL-2.0 @@ -31,10 +31,16 @@ define Package/qosify SECTION:=utils CATEGORY:=Base system TITLE:=A simple QoS solution based eBPF + CAKE - DEPENDS:=+libbpf +libubox +libubus +kmod-sched-cake +kmod-sched-bpf +kmod-ifb +tc-full $(BPF_DEPENDS) + DEPENDS:=+libbpf +libubox +libubus +libnl-tiny +kmod-sched-cake +kmod-sched-bpf +kmod-ifb +tc $(BPF_DEPENDS) endef -TARGET_CFLAGS += -Wno-error=deprecated-declarations +TARGET_CFLAGS += \ + -Wno-error=deprecated-declarations \ + -I$(STAGING_DIR)/usr/include/libnl-tiny \ + -I$(STAGING_DIR)/usr/include + +CMAKE_OPTIONS += \ + -DLIBNL_LIBS=-lnl-tiny define Build/Compile $(call CompileBPF,$(PKG_BUILD_DIR)/qosify-bpf.c) From 54bcf586b0beb510345fdbac731ce1c04b6fa56b Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 6 Apr 2022 12:19:31 +0100 Subject: [PATCH 13/39] kernel: set SOURCE_DATE_EPOCH for initramfs root dir Make sure the timestamp of the root directory of the initramfs is set to SOURCE_DATE_EPOCH as well. Fixes: 29d7461d11 ("kernel: set options to make external initramfs reproducible") Signed-off-by: Daniel Golle --- include/kernel-defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 1e82f7d739..2e21392016 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -168,7 +168,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) define Kernel/CompileImage/Initramfs $(call Kernel/Configure/Initramfs) $(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init - $(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init) + $(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR) $(TARGET_DIR)/init) rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio* ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y) ifneq ($(qstrip $(CONFIG_EXTERNAL_CPIO)),) From 64f629e2078b0c76bfe176a6f2f56877391b1b4e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 6 Apr 2022 14:09:34 +0200 Subject: [PATCH 14/39] bridger: add bridge forwarding accelerator This package uses BPF to create a fast path which improves bridging performance by bypassing the bridge layer. It also supports creating tc offload rules for hardware that supports it. Hardware offload support can be used with MT7622 + MT7915 once it is merged Signed-off-by: Felix Fietkau --- package/network/services/bridger/Makefile | 62 +++++++++++++++++++ .../services/bridger/files/bridger.conf | 3 + .../services/bridger/files/bridger.init | 44 +++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 package/network/services/bridger/Makefile create mode 100644 package/network/services/bridger/files/bridger.conf create mode 100644 package/network/services/bridger/files/bridger.init diff --git a/package/network/services/bridger/Makefile b/package/network/services/bridger/Makefile new file mode 100644 index 0000000000..dc32b1a6af --- /dev/null +++ b/package/network/services/bridger/Makefile @@ -0,0 +1,62 @@ +# +# Copyright (C) 2022 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=bridger +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL=https://github.com/nbd168/bridger +PKG_SOURCE_DATE:=2022-04-06 +PKG_SOURCE_VERSION:=e8f6814a85b4ea951657e7018c5d77597400f44a +PKG_MIRROR_HASH:=f917e099a9ab2a55745a7254239efabe695a722d5c448342198cdc847a4a24ac + +PKG_LICENSE:=GPL-2.0 +PKG_MAINTAINER:=Felix Fietkau + +PKG_BUILD_DEPENDS:=bpf-headers + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk +include $(INCLUDE_DIR)/bpf.mk +include $(INCLUDE_DIR)/nls.mk + +define Package/bridger + SECTION:=utils + CATEGORY:=Base system + TITLE:=Bridge forwarding accelerator + DEPENDS:=+libbpf +libubox +libubus +libnl-tiny +kmod-sched-core +kmod-sched-flower +kmod-sched-bpf +kmod-sched-act-vlan $(BPF_DEPENDS) +endef + +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/usr/include/libnl-tiny \ + -I$(STAGING_DIR)/usr/include + +CMAKE_OPTIONS += \ + -DLIBNL_LIBS=-lnl-tiny + +define Build/Compile + $(call CompileBPF,$(PKG_BUILD_DIR)/bridger-bpf.c) + $(Build/Compile/Default) +endef + +define Package/bridger/install + $(INSTALL_DIR) \ + $(1)/etc/config \ + $(1)/etc/init.d \ + $(1)/lib/bpf \ + $(1)/usr/sbin + $(INSTALL_DATA) $(PKG_BUILD_DIR)/bridger-bpf.o $(1)/lib/bpf + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/bridger \ + $(1)/usr/sbin/ + $(INSTALL_DATA) ./files/bridger.conf $(1)/etc/config/bridger + $(INSTALL_BIN) ./files/bridger.init $(1)/etc/init.d/bridger +endef + +$(eval $(call BuildPackage,bridger)) diff --git a/package/network/services/bridger/files/bridger.conf b/package/network/services/bridger/files/bridger.conf new file mode 100644 index 0000000000..cb43deff79 --- /dev/null +++ b/package/network/services/bridger/files/bridger.conf @@ -0,0 +1,3 @@ +config defaults + # example for blacklisting individual devices or bridges + # list blacklist eth0 diff --git a/package/network/services/bridger/files/bridger.init b/package/network/services/bridger/files/bridger.init new file mode 100644 index 0000000000..2ba9f06b65 --- /dev/null +++ b/package/network/services/bridger/files/bridger.init @@ -0,0 +1,44 @@ +#!/bin/sh /etc/rc.common +# Copyright (c) 2021 OpenWrt.org + +START=19 + +USE_PROCD=1 +PROG=/usr/sbin/bridger + +add_blacklist() { + cfg="$1" + + config_get blacklist "$cfg" blacklist + for i in $blacklist; do + json_add_string "" "$i" + done +} + +reload_service() { + config_load bridger + + json_init + json_add_string name "config" + json_add_array devices + config_foreach add_blacklist defaults + json_close_array + + ubus call bridger set_blacklist "$(json_dump)" +} + +service_triggers() { + procd_add_reload_trigger bridger +} + +start_service() { + procd_open_instance + procd_set_param command "$PROG" + procd_set_param respawn + procd_close_instance +} + +service_started() { + ubus -t 10 wait_for bridger + [ $? = 0 ] && reload_service +} From 76f55e3c3f32dea63a385e9b3c8eaed1322089c7 Mon Sep 17 00:00:00 2001 From: Valentyn Datsko Date: Wed, 6 Apr 2022 16:13:13 +0300 Subject: [PATCH 15/39] dnsmasq: add procd interface index tracking Problem exist when dnsmasq is exclusively bind to particular interface. After reconfiguring or restarting this interface, its index changes, but dnsmasq uses the old one. When this problem occurs, dnsmasq does not listen on the correct interface so DHCP does not work, and clients do not get an IP address. Procd netdev param can be added to restart dnsmasq when the interface index is changed. Signed-off-by: Valentyn Datsko [combined into a single &&-connected statement] Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/files/dnsmasq.init | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 09dce0a78d..d95502c0da 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1156,6 +1156,11 @@ dnsmasq_start() [ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript" procd_set_param respawn + local instance_ifc instance_netdev + config_get instance_ifc "$cfg" interface + [ -n "$instance_ifc" ] && network_get_device instance_netdev "$instance_ifc" && + [ -n "$instance_netdev" ] && procd_set_param netdev $instance_netdev + procd_add_jail dnsmasq ubus log procd_add_jail_mount $CONFIGFILE $DHCPBOGUSHOSTNAMEFILE $DHCPSCRIPT $DHCPSCRIPT_DEPENDS procd_add_jail_mount $EXTRA_MOUNT $RFC6761FILE $TRUSTANCHORSFILE From 1d77dca3b32dd883bcc2213675cf21111ac1beca Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 6 Apr 2022 17:25:16 +0100 Subject: [PATCH 16/39] scripts: make sure sort-order is independent from locale Set LC_ALL=C environment variable when calling 'sort' as the sort order otherwise depends on the locale set. Fixes: 56ce110b73 ("scripts: make sure conffiles are sorted") Signed-off-by: Daniel Golle --- scripts/ipkg-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ipkg-build b/scripts/ipkg-build index 32bc4b6d50..19df621048 100755 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -58,7 +58,7 @@ pkg_appears_sane() { rm "$CONTROL"/conffiles if [ -f "$CONTROL"/conffiles.resolved ]; then - sort -o "$CONTROL"/conffiles "$CONTROL"/conffiles.resolved + LC_ALL=C sort -o "$CONTROL"/conffiles "$CONTROL"/conffiles.resolved rm "$CONTROL"/conffiles.resolved chmod 0644 "$CONTROL"/conffiles fi From 0d3850dc5af4896ab3679dc4d8ef9a664e5e705f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 6 Apr 2022 19:59:52 +0100 Subject: [PATCH 17/39] libselinux: add missing host-build dependency on libsepol/host The host-build of libselinux requires libsepol/host. Add the libsepol/host to HOST_BUILD_DEPENDS to allow build on hosts which don't have libsepol installed. Signed-off-by: Daniel Golle --- package/libs/libselinux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libs/libselinux/Makefile b/package/libs/libselinux/Makefile index 9520afc771..6bda72b5de 100644 --- a/package/libs/libselinux/Makefile +++ b/package/libs/libselinux/Makefile @@ -18,7 +18,7 @@ PKG_LICENSE:=libselinux-1.0 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Thomas Petazzoni -HOST_BUILD_DEPENDS:=musl-fts/host pcre/host +HOST_BUILD_DEPENDS:=libsepol/host musl-fts/host pcre/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk From d6a3949922dc108043ff1650087a3e0cf9e00cd2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 6 Apr 2022 20:04:22 +0100 Subject: [PATCH 18/39] kernel: add missing CONFIG_SECURITY_LANDLOCK symbol for 5.15 Building with SELinux enabled unveiled a missing Kconfig symbol. Signed-off-by: Daniel Golle --- target/linux/generic/config-5.15 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index dd030107af..39957abfa3 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -5292,6 +5292,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y # CONFIG_SECURITYFS is not set # CONFIG_SECURITY_APPARMOR is not set CONFIG_SECURITY_DMESG_RESTRICT=y +# CONFIG_SECURITY_LANDLOCK is not set # CONFIG_SECURITY_LOADPIN is not set # CONFIG_SECURITY_LOCKDOWN_LSM is not set # CONFIG_SECURITY_NETWORK_XFRM is not set From e21337589473696c37d32b3e91b503808975e59e Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Fri, 1 Apr 2022 15:11:34 +0200 Subject: [PATCH 19/39] uboot-imx: bump to 2022.01 release Two patches were removed because of the changes introduced in upstream: 1. 110-mx6cuboxi-mmc-fallback.patch Looks like similar changes were introduced in 6c3fbf3e456c ("mx6cuboxi: customize board_boot_order to access eMMC"). 2. 111-mx6cuboxi_defconfig-force-mmc-boot.patch The 'CONFIG_SPL_FORCE_MMC_BOOT' was removed in 15aec318ef03 ("Revert "imx: Introduce CONFIG_SPL_FORCE_MMC_BOOT to force MMC boot on falcon mode"). Signed-off-by: Piotr Dymacz --- package/boot/uboot-imx/Makefile | 4 ++-- ...efconfig-enable-some-useful-commands.patch | 21 ++++------------- .../patches/110-mx6cuboxi-mmc-fallback.patch | 15 ------------ ...1-mx6cuboxi_defconfig-force-mmc-boot.patch | 23 ------------------- 4 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch delete mode 100644 package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch diff --git a/package/boot/uboot-imx/Makefile b/package/boot/uboot-imx/Makefile index 2faa48bd73..d5f5555595 100644 --- a/package/boot/uboot-imx/Makefile +++ b/package/boot/uboot-imx/Makefile @@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2020.04 +PKG_VERSION:=2022.01 PKG_RELEASE:=$(AUTORELEASE) -PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 +PKG_HASH:=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch b/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch index 10ed918e77..ee50b071e0 100644 --- a/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch +++ b/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch @@ -16,22 +16,11 @@ Signed-off-by: Petr Štetiar --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig -@@ -44,6 +44,7 @@ CONFIG_CMD_GPIO=y - CONFIG_CMD_GPT=y - CONFIG_CMD_I2C=y - CONFIG_CMD_MMC=y -+CONFIG_CMD_PART=y - CONFIG_CMD_USB=y - CONFIG_CMD_USB_SDP=y - CONFIG_CMD_USB_MASS_STORAGE=y -@@ -53,6 +54,10 @@ CONFIG_CMD_PMIC=y +@@ -60,6 +60,7 @@ CONFIG_CMD_CACHE=y + CONFIG_CMD_TIME=y + CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y - CONFIG_OF_CONTROL=y - CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis" -+CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y -+CONFIG_CMD_FAT=y -+CONFIG_CMD_FS_GENERIC=y + CONFIG_OF_CONTROL=y + CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch deleted file mode 100644 index 9d490ddf7e..0000000000 --- a/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/board/solidrun/mx6cuboxi/mx6cuboxi.c -+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c -@@ -286,6 +286,12 @@ static void setup_iomux_enet(void) - gpio_free_list_nodev(&desc, 1); - } - -+void board_boot_order(u32 *spl_boot_list) -+{ -+ spl_boot_list[0] = spl_boot_device(); -+ spl_boot_list[1] = BOOT_DEVICE_MMC1; -+} -+ - int board_phy_config(struct phy_device *phydev) - { - if (phydev->drv->config) diff --git a/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch b/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch deleted file mode 100644 index 4c3dc4ce20..0000000000 --- a/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 00ad8b42dfe801107db25ead8249cb10afcd0f94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20=C5=A0tetiar?= -Date: Sun, 1 Mar 2020 22:10:23 +0100 -Subject: [PATCH] mx6cuboxi_defconfig: force mmc boot -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Štetiar ---- - configs/mx6cuboxi_defconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/configs/mx6cuboxi_defconfig -+++ b/configs/mx6cuboxi_defconfig -@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000 - CONFIG_ENV_OFFSET=0xFE000 - CONFIG_DM_GPIO=y - CONFIG_SPL_MMC_SUPPORT=y -+CONFIG_SPL_FORCE_MMC_BOOT=y - CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_NR_DRAM_BANKS=1 - CONFIG_SPL=y From bfbf235a1282485732fadc80840900d6c856e871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Fri, 1 Apr 2022 15:11:35 +0200 Subject: [PATCH 20/39] imx: bootscript-apalis: make it working with U-Boot 2022.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream in commit 8b9c0cb46471 ("apalis_imx6: boot env configuration updates") removed emmc legacy wrappers, but so far didn't included any replacements. Fix it by simply defining the missing variables and UUID gathering directly into the boot script. Signed-off-by: Petr Štetiar [pepe2k@gmail.com: updated commit title for 2022.01] Signed-off-by: Piotr Dymacz --- target/linux/imx/image/bootscript-toradex_apalis | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/imx/image/bootscript-toradex_apalis b/target/linux/imx/image/bootscript-toradex_apalis index 3a3a6dadb1..f163b92ed0 100644 --- a/target/linux/imx/image/bootscript-toradex_apalis +++ b/target/linux/imx/image/bootscript-toradex_apalis @@ -1,13 +1,15 @@ echo "Toradex Apalis OpenWrt Boot script v1.1" -run emmcfinduuid +setenv mmcdev 0 +setenv mmcrootpart 2 +part uuid mmc ${mmcdev}:${mmcrootpart} uuid setenv nextcon 0 setenv boot_file uImage setenv fdt_file imx6q-apalis-ixora.dtb setenv root root=PARTUUID=${uuid} rootfstype=squashfs rootwait setenv bootargs earlyprintk console=${console},${baudrate}n8 ${root} -setenv fsload ext4load mmc ${emmcdev}:${emmcbootpart} +setenv fsload ext4load mmc ${mmcdev}:${mmcbootpart} if ${fsload} ${kernel_addr_r} ${boot_file}; then if ${fsload} ${fdt_addr_r} ${fdt_file}; then From a0528cab445ad6bb4b372d4484bac10f638c433f Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Fri, 1 Apr 2022 15:11:36 +0200 Subject: [PATCH 21/39] imx: image: use 'u-boot-dtb.img' filename for SPL payload For targets in U-Boot which were migrated to DM, the correct binary image filename will be 'u-boot-dtb.img'. For backward compatibility, keep support for both files and use the one which was generated with our 'uboot-imx' package. See also 'CONFIG_SPL_FS_LOAD_PAYLOAD_NAME' and 'CONFIG_OF_CONTROL' in mainline U-Boot sources. Signed-off-by: Piotr Dymacz --- target/linux/imx/image/cortexa9.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/target/linux/imx/image/cortexa9.mk b/target/linux/imx/image/cortexa9.mk index 75e19dc694..17a507b8da 100644 --- a/target/linux/imx/image/cortexa9.mk +++ b/target/linux/imx/image/cortexa9.mk @@ -80,7 +80,16 @@ endef define Build/imx6-sdcard $(Build/imx6-combined-image-prepare) - $(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img $@.boot/u-boot.img + if [ -f $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img ]; then \ + $(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img \ + $@.boot/u-boot.img; \ + fi + + if [ -f $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot-dtb.img ]; then \ + $(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot-dtb.img \ + $@.boot/u-boot-dtb.img; \ + fi + $(Build/imx6-combined-image) dd if=$(STAGING_DIR_IMAGE)/$(UBOOT)-SPL of=$@ bs=1024 seek=1 conv=notrunc From 0892fd9920588e8cc70016255c23a52d359e49c6 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Fri, 1 Apr 2022 15:11:37 +0200 Subject: [PATCH 22/39] uboot-imx: build 'u-boot-dtb.img' for SolidRun CuBox-i Signed-off-by: Piotr Dymacz --- package/boot/uboot-imx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/uboot-imx/Makefile b/package/boot/uboot-imx/Makefile index d5f5555595..63f145798d 100644 --- a/package/boot/uboot-imx/Makefile +++ b/package/boot/uboot-imx/Makefile @@ -30,8 +30,8 @@ endef define U-Boot/mx6cuboxi NAME:=SolidRun Cubox-i boards - UBOOT_IMAGE:=SPL u-boot.img - UBOOT_MAKE_FLAGS:=SPL u-boot.img + UBOOT_IMAGE:=SPL u-boot-dtb.img + UBOOT_MAKE_FLAGS:=SPL u-boot-dtb.img BUILD_SUBTARGET:=cortexa9 BUILD_DEVICES:=solidrun_cubox-i endef From ff09905a468b4cc44f039a76568e8fe6cbaea8d9 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Wed, 6 Apr 2022 23:07:55 +0200 Subject: [PATCH 23/39] bcm27xx: include 'rtc' in target's 'FEATURES' There are many ways to add external RTC to Raspberry Pi boards. Let's include support for this for the whole target and while at it, sort features alphabetically. Fixes: #9594 Signed-off-by: Piotr Dymacz --- target/linux/bcm27xx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/bcm27xx/Makefile b/target/linux/bcm27xx/Makefile index 29546049ed..a62d72ffc4 100644 --- a/target/linux/bcm27xx/Makefile +++ b/target/linux/bcm27xx/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=bcm27xx BOARDNAME:=Broadcom BCM27xx -FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs rootfs-part boot-part +FEATURES:=audio boot-part display ext4 fpu gpio rootfs-part rtc squashfs usb usbgadget SUBTARGETS:=bcm2708 bcm2709 bcm2710 bcm2711 KERNEL_PATCHVER=5.10 From 4ec10da2fe73eb4dd17993a475673472d5e1047f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 7 Apr 2022 12:01:44 +0200 Subject: [PATCH 24/39] ubox: add example /etc/modules.conf + conffiles entry Signed-off-by: Felix Fietkau --- package/system/ubox/Makefile | 7 ++++++- package/system/ubox/files/modules.conf | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 package/system/ubox/files/modules.conf diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 5f5570cd22..d295778e60 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -33,6 +33,10 @@ define Package/ubox 100:/sbin/modprobe:/sbin/kmodloader endef +define Package/ubox/conffiles +/etc/modules.conf +endef + define Package/getrandom SECTION:=base CATEGORY:=Base system @@ -53,10 +57,11 @@ define Package/getrandom/install endef define Package/ubox/install - $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin + $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin $(1)/etc $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib + $(INSTALL_DATA) ./files/modules.conf $(1)/etc/modules.conf endef define Package/logd/install diff --git a/package/system/ubox/files/modules.conf b/package/system/ubox/files/modules.conf new file mode 100644 index 0000000000..f54345fe4f --- /dev/null +++ b/package/system/ubox/files/modules.conf @@ -0,0 +1,3 @@ +# examples: +# options mod1 option=val +# blacklist mod2 From fd354ffac99e1a37965f3113bdeb98ef7cc0b314 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 7 Apr 2022 12:23:52 +0200 Subject: [PATCH 25/39] mt76: update to the latest version 5beb87716e70 mt76: dma: add wrapper macro for accessing queue registers e0bc736d5617 mt76: add support for overriding the device used for DMA mapping b8c842daa081 mt76: make number of tokens configurable dynamically 87a962e0608f mt76: mt7915: add Wireless Ethernet Dispatch support 2accb74e6be3 mt76: mt7915: fix using null pointer when wfsys on e5227f2f3120 mt76: mt7921: Fix the error handling path of mt7921_pci_probe() ec0e9f4da32f mt76: mt7915: fix possible uninitialized pointer dereference in mt7986_wmac_gpio_setup 5a87be892ba7 mt76: mt7915: fix possible NULL pointer dereference in mt7915_mac_fill_rx_vector fe441e5d3dcf mt76: mt7915: do not pass data pointer to mt7915_mcu_muru_debug_set f3ddfe886283 mt76: mt7915: report rx mode value in mt7915_mac_fill_rx_rate 2a0d370cb5fe mt76: mt7915: use 0xff to initialize bitrate_mask in mt7915_init_bitrate_mask 506bb0605e3e mt76: mt7921: Add AP mode support Signed-off-by: Felix Fietkau --- package/kernel/mt76/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index dcdc8bcdeb..b6dfa5e2b9 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2022-03-29 -PKG_SOURCE_VERSION:=eed44048ca575863ebdf1dc73f441cb9604cd388 -PKG_MIRROR_HASH:=fdc2ef82dfcb1880445d6d07d6fdd68373aec263fff15ad26a2d18133dc4fd6b +PKG_SOURCE_DATE:=2022-04-07 +PKG_SOURCE_VERSION:=506bb0605e3e2fa4c5285e6c8866167691a6d71b +PKG_MIRROR_HASH:=4c60255d5899e2aac48dad6129d000163aa9ce18ed3ed0cd7e223298a10cc4e7 PKG_MAINTAINER:=Felix Fietkau PKG_USE_NINJA:=0 From a5916a53b864d11ee0ba95070481c007a5ef1d0a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 7 Apr 2022 13:07:30 +0200 Subject: [PATCH 26/39] kernel: remove duplicate patch that is already in the 5.15 kernel tree Signed-off-by: Felix Fietkau --- ..._eth_soc-avoid-creating-duplicate-of.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch diff --git a/target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch b/target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch deleted file mode 100644 index 6323e5e966..0000000000 --- a/target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Felix Fietkau -Date: Thu, 8 Jul 2021 07:08:29 +0200 -Subject: [PATCH] net: ethernet: mtk_eth_soc: avoid creating duplicate offload - entries - -Sometimes multiple CLS_REPLACE calls are issued for the same connection. -rhashtable_insert_fast does not check for these duplicates, so multiple -hardware flow entries can be created. -Fix this by checking for an existing entry early - -Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support") -Signed-off-by: Felix Fietkau ---- - ---- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c -+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c -@@ -189,6 +189,9 @@ mtk_flow_offload_replace(struct mtk_eth - if (rhashtable_lookup(ð->flow_table, &f->cookie, mtk_flow_ht_params)) - return -EEXIST; - -+ if (rhashtable_lookup(ð->flow_table, &f->cookie, mtk_flow_ht_params)) -+ return -EEXIST; -+ - if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) { - struct flow_match_meta match; - From 5a84a8764d9f6e753eb6f11f214b0a3e5cb5ff80 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 5 Apr 2022 22:14:16 +0200 Subject: [PATCH 27/39] at91/sama7: Remove config options build as module Remove the configuration options which are building modules for the sub target configuration. These kernel modules are not packaged. Kernel options should only be build as a module when they are selected by a kmod package and not by setting them to =m in the target kernel configuration. Tested-by: Claudiu Beznea Reviewed-by: Claudiu Beznea Signed-off-by: Hauke Mehrtens --- target/linux/at91/sama7/config-default | 40 ++------------------------ 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/target/linux/at91/sama7/config-default b/target/linux/at91/sama7/config-default index 8c453659dc..86fb4d4af6 100644 --- a/target/linux/at91/sama7/config-default +++ b/target/linux/at91/sama7/config-default @@ -49,7 +49,6 @@ CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_SD=y CONFIG_BLK_SCSI_REQUEST=y -CONFIG_BRIDGE=m CONFIG_BT=y CONFIG_BT_DEBUGFS=y CONFIG_BT_HCIUART=y @@ -57,14 +56,6 @@ CONFIG_BT_HCIUART=y CONFIG_BT_HCIVHCI=y # CONFIG_CACHE_L2X0 is not set CONFIG_CAN=y -CONFIG_CFG80211=m -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_CFG80211_DEBUGFS=y -# CONFIG_CFG80211_DEFAULT_PS is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y -CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y -CONFIG_CFG80211_WEXT=y CONFIG_CGROUPS=y # CONFIG_CGROUP_BPF is not set # CONFIG_CGROUP_CPUACCT is not set @@ -194,6 +185,7 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_IDLE_POLL_SETUP=y @@ -215,7 +207,6 @@ CONFIG_GLOB=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GRACE_PERIOD=y -CONFIG_GRO_CELLS=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y @@ -256,23 +247,12 @@ CONFIG_JBD2=y CONFIG_KEYS=y CONFIG_LEDS_GPIO=y CONFIG_LIBFDT=y -CONFIG_LLC=m CONFIG_LOCKD=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_LSM="N" CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y -CONFIG_MAC80211=m -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_MAC80211_HAS_RC=y -# CONFIG_MAC80211_HWSIM is not set -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_MESH is not set -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MACB=y CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y @@ -311,12 +291,9 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NEON=y # CONFIG_NET_CLS_CGROUP is not set -CONFIG_NET_DEVLINK=y -CONFIG_NET_DSA=m CONFIG_NET_NS=y CONFIG_NET_SWITCHDEV=y CONFIG_NFS_FS=y -# CONFIG_NL80211_TESTMODE is not set CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_850=y @@ -348,7 +325,6 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_PINCTRL_AT91PIO4=y CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS7_TEST_KEY is not set # CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set CONFIG_PM_OPP=y CONFIG_POWER_RESET=y @@ -374,7 +350,6 @@ CONFIG_RTC_DRV_AT91RM9200=y CONFIG_RTC_DRV_AT91SAM9=y CONFIG_RTC_I2C_AND_SPI=y CONFIG_RTC_MC146818_LIB=y -# CONFIG_RTL8723BS is not set # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_SAMA5D4_WATCHDOG=y CONFIG_SCSI=y @@ -405,10 +380,9 @@ CONFIG_SND_SIMPLE_CARD_UTILS=y CONFIG_SND_SOC=y CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y CONFIG_SND_SOC_I2C_AND_SPI=y -CONFIG_SND_SOC_MIKROE_PROTO=m +# CONFIG_SND_SOC_MIKROE_PROTO is not set CONFIG_SND_SOC_PCM5102A=y CONFIG_SND_SOC_SPDIF=y -CONFIG_SND_SOC_WM8731=m CONFIG_SOC_BUS=y # CONFIG_SOC_SAMA5D2 is not set # CONFIG_SOC_SAMA5D3 is not set @@ -425,18 +399,15 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_ATMEL_QUADSPI is not set CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y -CONFIG_SPI_SPIDEV=m CONFIG_SRCU=y CONFIG_STACKTRACE=y # CONFIG_STANDALONE is not set -CONFIG_STP=m CONFIG_SUNRPC=y # CONFIG_SWAP is not set CONFIG_SWPHY=y # CONFIG_SWP_EMULATE is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -449,26 +420,19 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y # CONFIG_USER_NS is not set CONFIG_USE_OF=y -CONFIG_V4L2_FWNODE=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VFAT_FS=y CONFIG_VFP=y CONFIG_VFPv3=y # CONFIG_VIDEO_ATMEL_XISC is not set CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_IMX219=m -CONFIG_VIDEO_IMX274=m -CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2_SUBDEV_API=y -# CONFIG_VIRT_WIFI is not set -CONFIG_VLAN_8021Q=m CONFIG_VT=y CONFIG_VT_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_WATCHDOG_CORE=y -# CONFIG_WFX is not set CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 From a2f1db99f62554699b30de5d379f5b16c1138f41 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 5 Apr 2022 22:22:04 +0200 Subject: [PATCH 28/39] at91/sama7: Do not activate cgroups and namespaces cgroups and namespaces should be configured by the generic OpenWrt configuration and not for a specific target. Tested-by: Claudiu Beznea Reviewed-by: Claudiu Beznea Signed-off-by: Hauke Mehrtens --- target/linux/at91/sama7/config-default | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/target/linux/at91/sama7/config-default b/target/linux/at91/sama7/config-default index 86fb4d4af6..6737cd79ed 100644 --- a/target/linux/at91/sama7/config-default +++ b/target/linux/at91/sama7/config-default @@ -42,7 +42,6 @@ CONFIG_ATMEL_TCB_CLKSRC=y CONFIG_AT_XDMAC=y CONFIG_AUTO_ZRELADDR=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y -# CONFIG_BLK_CGROUP is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 @@ -56,17 +55,6 @@ CONFIG_BT_HCIUART=y CONFIG_BT_HCIVHCI=y # CONFIG_CACHE_L2X0 is not set CONFIG_CAN=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_BPF is not set -# CONFIG_CGROUP_CPUACCT is not set -CONFIG_CGROUP_DEBUG=y -# CONFIG_CGROUP_DEVICE is not set -# CONFIG_CGROUP_FREEZER is not set -# CONFIG_CGROUP_NET_CLASSID is not set -# CONFIG_CGROUP_NET_PRIO is not set -# CONFIG_CGROUP_PIDS is not set -# CONFIG_CGROUP_RDMA is not set -# CONFIG_CGROUP_SCHED is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y CONFIG_CLONE_BACKWARDS=y @@ -262,7 +250,6 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_SUPPORT_FILTER=y -# CONFIG_MEMCG is not set CONFIG_MEMFD_CREATE=y CONFIG_MEMORY=y CONFIG_MEMORY_ISOLATION=y @@ -286,12 +273,9 @@ CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MPILIB=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_NAMESPACES=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NEON=y -# CONFIG_NET_CLS_CGROUP is not set -CONFIG_NET_NS=y CONFIG_NET_SWITCHDEV=y CONFIG_NFS_FS=y CONFIG_NLS=y @@ -418,7 +402,6 @@ CONFIG_TINY_SRCU=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y -# CONFIG_USER_NS is not set CONFIG_USE_OF=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VFAT_FS=y From ac2bc4b893999709776bc93c46e907147aef3a44 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 5 Apr 2022 22:24:00 +0200 Subject: [PATCH 29/39] at91/sama7: Deactivate certification and key system This was probably activated by mac80211 which was activated before. mac80211 is build from backports in OpenWrt. Tested-by: Claudiu Beznea Reviewed-by: Claudiu Beznea Signed-off-by: Hauke Mehrtens --- target/linux/at91/sama7/config-default | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/target/linux/at91/sama7/config-default b/target/linux/at91/sama7/config-default index 6737cd79ed..819e4da5d5 100644 --- a/target/linux/at91/sama7/config-default +++ b/target/linux/at91/sama7/config-default @@ -24,10 +24,6 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y -CONFIG_ASN1=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y # CONFIG_AT91SAM9X_WATCHDOG is not set # CONFIG_AT91_ADC is not set CONFIG_AT91_SAMA5D2_ADC=y @@ -58,7 +54,6 @@ CONFIG_CAN=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y CONFIG_CLONE_BACKWARDS=y -CONFIG_CLZ_TAB=y CONFIG_CMA=y CONFIG_CMA_ALIGNMENT=9 CONFIG_CMA_AREAS=7 @@ -117,7 +112,6 @@ CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_ECC=y CONFIG_CRYPTO_ECDH=y -CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_JITTERENTROPY=y CONFIG_CRYPTO_LIB_SHA256=y @@ -125,7 +119,6 @@ CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_SHA256=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_AT91_SAMA7G5_FLEXCOM3=y @@ -232,7 +225,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_ISDN_CAPI=y CONFIG_JBD2=y -CONFIG_KEYS=y CONFIG_LEDS_GPIO=y CONFIG_LIBFDT=y CONFIG_LOCKD=y @@ -271,7 +263,6 @@ CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MPILIB=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y @@ -296,7 +287,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OID_REGISTRY=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PAGE_OFFSET=0xC0000000 @@ -308,8 +298,6 @@ CONFIG_PHYLINK=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_PINCTRL_AT91PIO4=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set CONFIG_PM_OPP=y CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_AT91_POWEROFF is not set @@ -337,7 +325,6 @@ CONFIG_RTC_MC146818_LIB=y # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_SAMA5D4_WATCHDOG=y CONFIG_SCSI=y -# CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y @@ -392,8 +379,6 @@ CONFIG_SWPHY=y # CONFIG_SWP_EMULATE is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y -# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y @@ -416,7 +401,6 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_WATCHDOG_CORE=y -CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZLIB_DEFLATE=y From 6709b67265d04ee82b1e79e2a6c8eaeca9d5dfe4 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 5 Apr 2022 22:27:41 +0200 Subject: [PATCH 30/39] at91/sama7: Use ext4 driver for ext2 and ext3 Use the ext4 driver for ext2 and ext3 too. This feature is activated in the OpenWrt generic configuration. Tested-by: Claudiu Beznea Reviewed-by: Claudiu Beznea Signed-off-by: Hauke Mehrtens --- target/linux/at91/sama7/config-default | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/linux/at91/sama7/config-default b/target/linux/at91/sama7/config-default index 819e4da5d5..76e2e3d622 100644 --- a/target/linux/at91/sama7/config-default +++ b/target/linux/at91/sama7/config-default @@ -147,12 +147,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y # CONFIG_EFI_PARTITION is not set -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_POSIX_ACL is not set -# CONFIG_EXT2_FS_SECURITY is not set -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set CONFIG_EXT4_FS=y CONFIG_FANOTIFY=y CONFIG_FAT_FS=y From 3296881a1d631bc6db38fe72ab73adaa27af6f8c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 5 Apr 2022 22:28:30 +0200 Subject: [PATCH 31/39] at91/sama7: Do not build in Bluetooth Bluetooth should be activated as an optional kmod package instead of compiling it into the kernel. Tested-by: Claudiu Beznea Reviewed-by: Claudiu Beznea Signed-off-by: Hauke Mehrtens --- target/linux/at91/sama7/config-default | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/linux/at91/sama7/config-default b/target/linux/at91/sama7/config-default index 76e2e3d622..6b69c43d7a 100644 --- a/target/linux/at91/sama7/config-default +++ b/target/linux/at91/sama7/config-default @@ -44,11 +44,6 @@ CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_SD=y CONFIG_BLK_SCSI_REQUEST=y -CONFIG_BT=y -CONFIG_BT_DEBUGFS=y -CONFIG_BT_HCIUART=y -# CONFIG_BT_HCIUART_INTEL is not set -CONFIG_BT_HCIVHCI=y # CONFIG_CACHE_L2X0 is not set CONFIG_CAN=y CONFIG_CLKDEV_LOOKUP=y @@ -217,7 +212,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y -CONFIG_ISDN_CAPI=y CONFIG_JBD2=y CONFIG_LEDS_GPIO=y CONFIG_LIBFDT=y From f6d566301ee3dc12fd41e131f89dfc4777b002f3 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 7 Apr 2022 00:36:25 +0200 Subject: [PATCH 32/39] at91: Automatically detect USB feature The sama7 sub target does not have USB support, the feature should not be activated there. OpenWrt can automatically detect if the target supports USB by using the scripts/target-metadata.pl script. With the automatic detection USB support will only get activated on subtargest which actually support USB like sam9x and sama5. Signed-off-by: Hauke Mehrtens --- target/linux/at91/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 36804a1eeb..af0dc3f338 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=at91 BOARDNAME:=Microchip (Atmel AT91) -FEATURES:=ext4 squashfs targz usb usbgadget ubifs +FEATURES:=ext4 squashfs targz usbgadget ubifs SUBTARGETS:=sama7 sama5 sam9x KERNEL_PATCHVER:=5.10 From 2ca5c3da04c3f05a7477ae484768e03d4ca30711 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 31 Mar 2022 18:06:02 +0200 Subject: [PATCH 33/39] hostapd: add support for enabling link measurements Allow external processes to enable advertisement of link-measurement RRM capability. Signed-off-by: David Bauer --- package/network/services/hostapd/src/src/ap/ubus.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c index bdab8fa7b8..83de03b05b 100644 --- a/package/network/services/hostapd/src/src/ap/ubus.c +++ b/package/network/services/hostapd/src/src/ap/ubus.c @@ -995,6 +995,7 @@ hostapd_rrm_print_nr(struct hostapd_neighbor_entry *nr) enum { BSS_MGMT_EN_NEIGHBOR, BSS_MGMT_EN_BEACON, + BSS_MGMT_EN_LINK_MEASUREMENT, #ifdef CONFIG_WNM_AP BSS_MGMT_EN_BSS_TRANSITION, #endif @@ -1022,6 +1023,14 @@ __hostapd_bss_mgmt_enable_f(struct hostapd_data *hapd, int flag) WLAN_RRM_CAPS_BEACON_REPORT_ACTIVE | WLAN_RRM_CAPS_BEACON_REPORT_TABLE; + if (bss->radio_measurements[0] & flags == flags) + return false; + + bss->radio_measurements[0] |= (u8) flags; + return true; + case BSS_MGMT_EN_LINK_MEASUREMENT: + flags = WLAN_RRM_CAPS_LINK_MEASUREMENT; + if (bss->radio_measurements[0] & flags == flags) return false; @@ -1059,6 +1068,7 @@ __hostapd_bss_mgmt_enable(struct hostapd_data *hapd, uint32_t flags) static const struct blobmsg_policy bss_mgmt_enable_policy[__BSS_MGMT_EN_MAX] = { [BSS_MGMT_EN_NEIGHBOR] = { "neighbor_report", BLOBMSG_TYPE_BOOL }, [BSS_MGMT_EN_BEACON] = { "beacon_report", BLOBMSG_TYPE_BOOL }, + [BSS_MGMT_EN_LINK_MEASUREMENT] = { "link_measurement", BLOBMSG_TYPE_BOOL }, #ifdef CONFIG_WNM_AP [BSS_MGMT_EN_BSS_TRANSITION] = { "bss_transition", BLOBMSG_TYPE_BOOL }, #endif From 965aa33a18c76bb2d5a1eeb0cfa01501b08e784a Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 30 Mar 2022 00:31:26 +0200 Subject: [PATCH 34/39] hostapd: add ubus method for requesting link measurements Add a ubus method to request link-measurements from connected STAs. In addition to the STAs address, the used and maximum transmit power can be provided by the external process for the link-measurement. If they are not provided, 0 is used as the default value. Signed-off-by: David Bauer --- .../services/hostapd/src/src/ap/ubus.c | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c index 83de03b05b..5aad5a7dd5 100644 --- a/package/network/services/hostapd/src/src/ap/ubus.c +++ b/package/network/services/hostapd/src/src/ap/ubus.c @@ -1347,6 +1347,70 @@ hostapd_rrm_beacon_req(struct ubus_context *ctx, struct ubus_object *obj, return 0; } +enum { + LM_REQ_ADDR, + LM_REQ_TX_POWER_USED, + LM_REQ_TX_POWER_MAX, + __LM_REQ_MAX, +}; + +static const struct blobmsg_policy lm_req_policy[__LM_REQ_MAX] = { + [LM_REQ_ADDR] = { "addr", BLOBMSG_TYPE_STRING }, + [LM_REQ_TX_POWER_USED] = { "tx-power-used", BLOBMSG_TYPE_INT32 }, + [LM_REQ_TX_POWER_MAX] = { "tx-power-max", BLOBMSG_TYPE_INT32 }, +}; + +static int +hostapd_rrm_lm_req(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *ureq, const char *method, + struct blob_attr *msg) +{ + struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj); + struct blob_attr *tb[__LM_REQ_MAX]; + struct wpabuf *buf; + u8 addr[ETH_ALEN]; + int ret; + int8_t txp_used, txp_max; + + txp_used = 0; + txp_max = 0; + + blobmsg_parse(lm_req_policy, __LM_REQ_MAX, tb, blob_data(msg), blob_len(msg)); + + if (!tb[LM_REQ_ADDR]) + return UBUS_STATUS_INVALID_ARGUMENT; + + if (tb[LM_REQ_TX_POWER_USED]) + txp_used = (int8_t) blobmsg_get_u32(tb[LM_REQ_TX_POWER_USED]); + + if (tb[LM_REQ_TX_POWER_MAX]) + txp_max = (int8_t) blobmsg_get_u32(tb[LM_REQ_TX_POWER_MAX]); + + if (hwaddr_aton(blobmsg_data(tb[LM_REQ_ADDR]), addr)) + return UBUS_STATUS_INVALID_ARGUMENT; + + buf = wpabuf_alloc(5); + if (!buf) + return UBUS_STATUS_UNKNOWN_ERROR; + + wpabuf_put_u8(buf, WLAN_ACTION_RADIO_MEASUREMENT); + wpabuf_put_u8(buf, WLAN_RRM_LINK_MEASUREMENT_REQUEST); + wpabuf_put_u8(buf, 1); + /* TX-Power used */ + wpabuf_put_u8(buf, txp_used); + /* Max TX Power */ + wpabuf_put_u8(buf, txp_max); + + ret = hostapd_drv_send_action(hapd, hapd->iface->freq, 0, addr, + wpabuf_head(buf), wpabuf_len(buf)); + + wpabuf_free(buf); + if (ret < 0) + return -ret; + + return 0; +} + #ifdef CONFIG_WNM_AP @@ -1604,6 +1668,7 @@ static const struct ubus_method bss_methods[] = { UBUS_METHOD_NOARG("rrm_nr_list", hostapd_rrm_nr_list), UBUS_METHOD("rrm_nr_set", hostapd_rrm_nr_set, nr_set_policy), UBUS_METHOD("rrm_beacon_req", hostapd_rrm_beacon_req, beacon_req_policy), + UBUS_METHOD("link_measurement_req", hostapd_rrm_lm_req, lm_req_policy), #ifdef CONFIG_WNM_AP UBUS_METHOD("wnm_disassoc_imminent", hostapd_wnm_disassoc_imminent, wnm_disassoc_policy), UBUS_METHOD("bss_transition_request", hostapd_bss_transition_request, bss_tr_policy), From f6445cfa1acb32676723c49da3e3158b64a4b3d2 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 31 Mar 2022 22:39:04 +0200 Subject: [PATCH 35/39] hostapd: add ubus link-measurements notifications Notify external ubus subscribers of received link-measurement reports. Signed-off-by: David Bauer --- .../hostapd/patches/600-ubus_support.patch | 10 +++++++ .../services/hostapd/src/src/ap/ubus.c | 28 +++++++++++++++++++ .../services/hostapd/src/src/ap/ubus.h | 5 ++++ 3 files changed, 43 insertions(+) diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch index 6a0acbb318..4abb6887f6 100644 --- a/package/network/services/hostapd/patches/600-ubus_support.patch +++ b/package/network/services/hostapd/patches/600-ubus_support.patch @@ -423,6 +423,16 @@ } +@@ -352,6 +355,9 @@ void hostapd_handle_radio_measurement(st + mgmt->u.action.u.rrm.action, MAC2STR(mgmt->sa)); + + switch (mgmt->u.action.u.rrm.action) { ++ case WLAN_RRM_LINK_MEASUREMENT_REPORT: ++ hostapd_ubus_handle_link_measurement(hapd, buf, len); ++ break; + case WLAN_RRM_RADIO_MEASUREMENT_REPORT: + hostapd_handle_radio_msmt_report(hapd, buf, len); + break; --- a/src/ap/vlan_init.c +++ b/src/ap/vlan_init.c @@ -22,6 +22,7 @@ diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c index 5aad5a7dd5..fa325ea6e5 100644 --- a/package/network/services/hostapd/src/src/ap/ubus.c +++ b/package/network/services/hostapd/src/src/ap/ubus.c @@ -1412,6 +1412,34 @@ hostapd_rrm_lm_req(struct ubus_context *ctx, struct ubus_object *obj, } +void hostapd_ubus_handle_link_measurement(struct hostapd_data *hapd, const u8 *data, size_t len) +{ + const struct ieee80211_mgmt *mgmt = (const struct ieee80211_mgmt *) data; + const u8 *pos, *end; + u8 token; + + end = data + len; + token = mgmt->u.action.u.rrm.dialog_token; + pos = mgmt->u.action.u.rrm.variable; + + if (end - pos < 8) + return; + + if (!hapd->ubus.obj.has_subscribers) + return; + + blob_buf_init(&b, 0); + blobmsg_add_macaddr(&b, "address", mgmt->sa); + blobmsg_add_u16(&b, "dialog-token", token); + blobmsg_add_u16(&b, "rx-antenna-id", pos[4]); + blobmsg_add_u16(&b, "tx-antenna-id", pos[5]); + blobmsg_add_u16(&b, "rcpi", pos[6]); + blobmsg_add_u16(&b, "rsni", pos[7]); + + ubus_notify(ctx, &hapd->ubus.obj, "link-measurement-report", b.head, -1); +} + + #ifdef CONFIG_WNM_AP static int diff --git a/package/network/services/hostapd/src/src/ap/ubus.h b/package/network/services/hostapd/src/src/ap/ubus.h index f1bc093e57..5a33b624d0 100644 --- a/package/network/services/hostapd/src/src/ap/ubus.h +++ b/package/network/services/hostapd/src/src/ap/ubus.h @@ -47,6 +47,7 @@ void hostapd_ubus_add_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan) void hostapd_ubus_remove_vlan(struct hostapd_data *hapd, struct hostapd_vlan *vlan); int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct hostapd_ubus_request *req); +void hostapd_ubus_handle_link_measurement(struct hostapd_data *hapd, const u8 *data, size_t len); void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *mac); void hostapd_ubus_notify_beacon_report(struct hostapd_data *hapd, const u8 *addr, u8 token, u8 rep_mode, @@ -98,6 +99,10 @@ static inline int hostapd_ubus_handle_event(struct hostapd_data *hapd, struct ho return 0; } +static inline void hostapd_ubus_handle_link_measurement(struct hostapd_data *hapd, const u8 *data, size_t len) +{ +} + static inline void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *mac) { } From cef3e6a69c4751189e946cf2ff0e00304f9fff6e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 22 Mar 2022 20:26:59 +0100 Subject: [PATCH 36/39] ucode: update to latest Git HEAD 33f1e0b treewide: move json-c compat shims into internal header file e0e9431 vm: move unhandled exception reporting out of `uc_vm_execute_chunk()` 2b59140 vm: fix callframe double free on unhanded exceptions 7d7e950 main: abort when failing to load a preload library 1032a67 lib: let `json()` accept input objects implementing `read()` method 5ee68d5 fs: implement `fs.readfile()` and `fs.writefile()` df6b861 ci: debian: change path before attempting to invoke Git operations dfaf05a ci: debian: automatically update changelog from Git tag 34f3c45 ci: fix YAML syntax of Debian workflow e956bcf fs: fix off-by-one in fs.dirname() function 6fc4b6c .gitignore: fix overmatching patterns, blacklist cram .venv 7c2e082 build: remove legacy json-c check 77942af build: add polyfills for older libjson-c versions 0b4aaa3 CI: build Debian package f404285 debian: Add package definition a37f654 types: fix escape sequence encoding of high byte values in JSON strings aae5312 Update README.md 8134e25 build: fix symlink install target 87c7296 treewide: replace some leftover "utpl" occurrences, update .gitignore 7d27ad5 build: only stage ucc symlink if compile support is enabled 171402f lib: add date and time related functions 8b5dc60 lib: provide API function to obtain stdlib function implementations eb0d2f1 main: turn ucode into multicall executable 28ee7e1 uloop: add support for tasks 753dea9 CI: build on macOS 668c5c0 lib: add argument position support (`%m$`) to `sprintf()` and `printf()` ab46fdf treewide: remove legacy json-c include directives b8f49b1 tests: 21_regex_literals: generalize syntax error test case fd2e5e7 tests: 16_sort: fix logic flaw exposed on OS X 2c71bf2 tests: run_tests.sh: pass dummy value to `-T` flag 55c4a90 lib: disallow zero padding for %s formats 0d05cb5 tests: run_tests.sh: use greadlink if available 271e520 resolv: make OS X compatible d13c320 fs: avoid Linux specific sys/sysmacros.h include on OS X 33397a3 uloop: use execvp() on OS X bafdc8f lib: add naive sigtimedwait() stub for OS X ada1585 build: consolidate CMakeLists.txt and cover OS X deviations befbb69 include: add OS X compatible endian.h header 49838a8 include: rename include guards to avoid clashes with system headers 91f65de nl80211: add missing attributes and correct some attribute flags b4a1fd5 lib: adjust require(), render() and include() raw mode semantics 4618807 main: rework CLI frontend 73dcd78 lib: fix potential integer underflow on empty render output c402551 vm: fix crash on object literals with non-string computed properties efe8a02 syntax: support add new operators 078d686 ubus: add event support 6c66c83 ubus: refactor error and argument handling 1cb04f9 ubus: add object publishing, notify and subscribe support 0e85974 uloop: clear errno before integer conversion attempts 05bd7ed types: treat resource type prototypes as GC roots a2a26ca lib: introduce uloop binding 6b6d01f vm: release this context on exception in managed method call 1af23a9 tests: fix proto() testcase 4ce69a8 fs: implement access(), mkstemp(), file.flush() and proc.flush() Signed-off-by: Jo-Philipp Wich --- package/utils/ucode/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile index ea317ad49c..6df5d2aee0 100644 --- a/package/utils/ucode/Makefile +++ b/package/utils/ucode/Makefile @@ -12,13 +12,13 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/jow-/ucode.git -PKG_SOURCE_DATE:=2022-02-11 -PKG_SOURCE_VERSION:=a29bad9454edcc285f7f37410b6822affede44d1 -PKG_MIRROR_HASH:=eaba0f12c469ef82b772a64f8763e8855dbba81551a78d05f547c0922a7dacad +PKG_SOURCE_DATE:=2022-04-07 +PKG_SOURCE_VERSION:=33f1e0b0926e973fb5ae445e9a995848762143bb +PKG_MIRROR_HASH:=e419678244c5402c739e3a200d6d1d7cd6989a711c73744bc68b2d5b76bae33a PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC -PKG_ABI_VERSION:=20220206 +PKG_ABI_VERSION:=20220322 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -152,7 +152,7 @@ endef define Package/ucode/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucode $(1)/usr/bin/ucode + $(CP) $(PKG_INSTALL_DIR)/usr/bin/u* $(1)/usr/bin/ endef define Package/libucode/install From 1a35ac99905adc35059489d6e19c7de42ef4cc01 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 22 Mar 2022 21:09:27 +0100 Subject: [PATCH 37/39] firewall4: update to latest Git HEAD a378883 fw4: fix emitting family specific redirect rules without any addrs 11feddf fw4: bracketize IPv6 addresses in dnat addr:port notation 9972f7d fw4: ensure to capitalize weekday names fde8070 treewide: forward compatibility changes Signed-off-by: Jo-Philipp Wich --- package/network/config/firewall4/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile index baf947bc0d..4a456e7b04 100644 --- a/package/network/config/firewall4/Makefile +++ b/package/network/config/firewall4/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git -PKG_SOURCE_DATE:=2022-02-12 -PKG_SOURCE_VERSION:=53caa1a762125a71389a486aa913e4fbdf3650cf -PKG_MIRROR_HASH:=9052a779b12c0c9b21914bf38daf11a2d98879c2f9c9b39f091d7ebb7f0f877b +PKG_SOURCE_DATE:=2022-04-02 +PKG_SOURCE_VERSION:=a3788839d61742799b6c62f2d8790c464b7374fc +PKG_MIRROR_HASH:=9b1c5d27d7d0022388693db679f9518216932ed1f39c096e1242c4d9e3fd897a PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC @@ -26,7 +26,7 @@ define Package/firewall4 +kmod-nft-nat +kmod-nft-nat6 \ +nftables-json \ +ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci - EXTRA_DEPENDS:=ucode (>= 2022-01-26) + EXTRA_DEPENDS:=ucode (>= 2022-03-22) PROVIDES:=uci-firewall endef From dd8957604bd77a223a23224c5c6919621ebb1841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 8 Apr 2022 10:49:31 +0200 Subject: [PATCH 38/39] bcm53xx: refresh kernel 5.15 config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- target/linux/bcm53xx/config-5.15 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/target/linux/bcm53xx/config-5.15 b/target/linux/bcm53xx/config-5.15 index 6049641898..c4394487bf 100644 --- a/target/linux/bcm53xx/config-5.15 +++ b/target/linux/bcm53xx/config-5.15 @@ -1,3 +1,4 @@ +CONFIG_AF_UNIX_OOB=y CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_BCM=y @@ -28,6 +29,7 @@ CONFIG_ARM_ERRATA_764369=y CONFIG_ARM_ERRATA_775420=y CONFIG_ARM_GIC=y CONFIG_ARM_GLOBAL_TIMER=y +CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=1 CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_HEAVY_MB=y CONFIG_ARM_L1_CACHE_SHIFT=6 @@ -62,12 +64,12 @@ CONFIG_BCM_SR_THERMAL=y CONFIG_BGMAC=y CONFIG_BGMAC_BCMA=y # CONFIG_BGMAC_PLATFORM is not set +CONFIG_BINARY_PRINTF=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_MQ_PCI=y CONFIG_BOUNCE=y CONFIG_BROADCOM_PHY=y CONFIG_CACHE_L2X0=y -CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y CONFIG_CLKSRC_MMIO=y # CONFIG_CLK_BCM_NS2 is not set @@ -119,6 +121,7 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EXTCON=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_GENERIC_ALLOCATOR=y @@ -127,6 +130,7 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_IDLE_POLL_SETUP=y @@ -134,6 +138,7 @@ CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PINCONF=y @@ -149,6 +154,7 @@ CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_74X164=y CONFIG_GPIO_BCM_XGS_IPROC=y +CONFIG_GPIO_CDEV=y CONFIG_GPIO_GENERIC=y CONFIG_GRO_CELLS=y CONFIG_HANDLE_DOMAIN_IRQ=y @@ -171,9 +177,12 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y +CONFIG_KMAP_LOCAL=y +CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_LTO_NONE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MDIO_BCM_IPROC=y @@ -212,6 +221,8 @@ CONFIG_NET_DSA_TAG_BRCM_COMMON=y CONFIG_NET_DSA_TAG_BRCM_LEGACY=y CONFIG_NET_DSA_TAG_BRCM_PREPEND=y CONFIG_NET_FLOW_LIMIT=y +CONFIG_NET_SELFTESTS=y +CONFIG_NET_SOCK_MSG=y CONFIG_NET_SWITCHDEV=y CONFIG_NR_CPUS=2 CONFIG_NVMEM=y @@ -225,7 +236,6 @@ CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y -CONFIG_OF_NET=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y @@ -252,6 +262,7 @@ CONFIG_PINCTRL=y # CONFIG_PINCTRL_IPROC_GPIO is not set CONFIG_PINCTRL_NS=y # CONFIG_PINCTRL_NS2_MUX is not set +CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_PWM=y CONFIG_PWM_BCM_IPROC=y CONFIG_PWM_SYSFS=y @@ -267,6 +278,7 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SGL_ALLOC=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y +CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_SPARSE_IRQ=y CONFIG_SPI=y CONFIG_SPI_BCM_QSPI=y From 0392644083968a73db95c6a948f9225c1f4b1026 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 8 Apr 2022 13:07:36 +0200 Subject: [PATCH 39/39] qosify: update to the latest version 92f5e18675bf interface: fix ifname present check in interface status ef82defaae26 ubus: add active devices to bridger blacklist Signed-off-by: Felix Fietkau --- package/network/config/qosify/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile index b15bde926d..be0bc6657c 100644 --- a/package/network/config/qosify/Makefile +++ b/package/network/config/qosify/Makefile @@ -11,9 +11,9 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=qosify PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2022-04-05 -PKG_SOURCE_VERSION:=1cd5e12eecdcab0845eda71383c4c0ba17092c6f -PKG_MIRROR_HASH:=f16748114ad5cad8fe1fe40ea43959873c5b0e8b75ddc99fc4323e12f0ab3b53 +PKG_SOURCE_DATE:=2022-04-08 +PKG_SOURCE_VERSION:=ef82defaae26619e5b2ebddfdd86e9de61c399f1 +PKG_MIRROR_HASH:=8e4ca65d23a85aad774af51dc62cfaa4615111ffd2c7922258ac8f026a62b013 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=GPL-2.0