From 22db5865d9accd04b11ebcc327c08f2e4f6484e6 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Thu, 18 Aug 2022 14:49:25 +0200 Subject: [PATCH 01/18] tools/xz: update to 5.2.6 This update contains a security fix to xzgrep (CVE-2022-1271, ZDI-CAN-16587). Release notes: https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;hb=HEAD Signed-off-by: Nick Hainke --- tools/xz/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/xz/Makefile b/tools/xz/Makefile index 4b13f727da4db6..ef0ed02396bf34 100644 --- a/tools/xz/Makefile +++ b/tools/xz/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz -PKG_VERSION:=5.2.5 +PKG_VERSION:=5.2.6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/lzmautils \ http://tukaani.org/xz -PKG_HASH:=5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df +PKG_HASH:=13e3402e301b6018f6a71ef0e497f714c6d11e214ae82dab156b81c2a64acb25 PKG_CPE_ID:=cpe:/a:tukaani:xz HOST_BUILD_PARALLEL:=1 From 606b06891f6114fba903e215b56f7db1b8c4d7b1 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Thu, 18 Aug 2022 14:42:01 +0200 Subject: [PATCH 02/18] tools/isl: update to 0.25 Update isl to latest version. Signed-off-by: Nick Hainke --- tools/isl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/isl/Makefile b/tools/isl/Makefile index 32c3cda9a20961..e9674debc2e0e0 100644 --- a/tools/isl/Makefile +++ b/tools/isl/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isl -PKG_VERSION:=0.24 +PKG_VERSION:=0.25 PKG_SOURCE_URL:=https://libisl.sourceforge.io/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad +PKG_HASH:=be7b210647ccadf90a2f0b000fca11a4d40546374a850db67adb32fad4b230d9 HOST_BUILD_PARALLEL:=1 From bcd3daf54f7b8d6b7385a85fd1f407e628f14f18 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Mar 2022 20:30:53 -0800 Subject: [PATCH 03/18] tools/cmake: update to 3.22.3 Seems to be mostly pthread fixes. Signed-off-by: Rosen Penev --- tools/cmake/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index d1d5b58a47f19f..f0af6dfeaa0d6e 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.22.2 +PKG_VERSION:=3.22.3 PKG_RELEASE:=1 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ https://cmake.org/files/v3.19/ -PKG_HASH:=3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced +PKG_HASH:=9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 From 1490a1a001c6a3e251c17bf976a45954849ad2df Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Thu, 18 Aug 2022 07:22:52 +0200 Subject: [PATCH 04/18] tools/cmake: update to 3.24.1 Update cmake to newest version. Signed-off-by: Nick Hainke --- tools/cmake/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index f0af6dfeaa0d6e..9650755ba082b7 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.22.3 +PKG_VERSION:=3.24.1 PKG_RELEASE:=1 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ - https://cmake.org/files/v3.19/ -PKG_HASH:=9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 + https://cmake.org/files/v3.24/ +PKG_HASH:=4931e277a4db1a805f13baa7013a7757a0cbfe5b7932882925c7061d9d1fa82b HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 From 009ca51099bd197b26948a204ce7c41ee5123af5 Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Sat, 5 Feb 2022 12:41:44 +0300 Subject: [PATCH 05/18] argp-standalone: add host-compile ability This patch adds host-compile ability to argp-standalone for build hosts without glibc and argp lib, e.g. MacOS. iucode-tool/host can not be built on MacOS due to lack of argp. Signed-off-by: Sergey V. Lobanov --- package/libs/argp-standalone/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/libs/argp-standalone/Makefile b/package/libs/argp-standalone/Makefile index 8fad739d85d01b..21b154f29d8e3f 100644 --- a/package/libs/argp-standalone/Makefile +++ b/package/libs/argp-standalone/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=argp-standalone PKG_VERSION:=1.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lysator.liu.se/~nisse/misc/ @@ -20,6 +20,7 @@ PKG_LICENSE:=LGPL-2.1 PKG_LICENSE:=Makefile.am include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/argp-standalone SECTION:=libs @@ -45,4 +46,14 @@ define Build/InstallDev $(1)/usr/lib/ endef +define Host/Install + $(INSTALL_DIR) $(1)/include + $(CP) $(HOST_BUILD_DIR)/argp.h \ + $(1)/include/ + $(INSTALL_DIR) $(1)/lib + $(CP) $(HOST_BUILD_DIR)/libargp.a \ + $(1)/lib/ +endef + $(eval $(call BuildPackage,argp-standalone)) +$(eval $(call HostBuild)) From 7ad3d04a03797536d0c7e2dda2bb2ae536d5686c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 19 Mar 2022 16:51:43 -0700 Subject: [PATCH 06/18] elfutils: fix host compilation with Alpine Linux intl is not included in libc, disable it as is done with the target package. argp is also not included. Add build depends for argp-standalone. fts is also not included. Add build depends for musl-fts. Disable shared libraries to avoid having to manually add rpath. Signed-off-by: Rosen Penev --- package/libs/elfutils/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index 9aa78d8352b997..07b3ea66c66a1d 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -24,6 +24,8 @@ PKG_INSTALL:=1 PKG_USE_MIPS16:=1 PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone +HOST_BUILD_DEPENDS:=argp-standalone/host musl-fts/host + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/host-build.mk @@ -62,6 +64,8 @@ CONFIGURE_ARGS += --disable-nls endif HOST_CONFIGURE_ARGS += \ + --disable-shared \ + --disable-nls \ --disable-debuginfod \ --disable-libdebuginfod \ --without-lzma \ From 9d2215976c0d5323e108b7d865273f1b81967559 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 27 Jan 2022 13:25:39 +0100 Subject: [PATCH 07/18] tools: build bash on macOS and use it for ipkg-build On macOS, system binaries silently drop the environment variables for injecting extra shared libraries (used by fakeroot). This is done for security reasons. Work around this by building bash from source, so that it gets an ad-hoc signature and does not have these restrictions Signed-off-by: Felix Fietkau --- include/package-ipkg.mk | 2 +- tools/Makefile | 3 +++ tools/bash/Makefile | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tools/bash/Makefile diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 19f09c2311d941..18c68da01eb1f1 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -263,7 +263,7 @@ $(_endef) endif $(INSTALL_DIR) $$(PDIR_$(1)) - $(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1)) + $(FAKEROOT) $(STAGING_DIR_HOST)/bin/bash $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1)) @[ -f $$(IPKG_$(1)) ] $(1)-clean: diff --git a/tools/Makefile b/tools/Makefile index c3d9980c38104d..08e882fc035ab7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -82,6 +82,9 @@ ifneq ($(HOST_OS),Linux) $(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile tools-y += coreutils endif +ifeq ($(HOST_OS),Darwin) + tools-y += bash +endif ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) $(foreach tool, $(filter-out xz zstd patch pkgconf libressl ninja cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile)) diff --git a/tools/bash/Makefile b/tools/bash/Makefile new file mode 100644 index 00000000000000..7c25b83327d548 --- /dev/null +++ b/tools/bash/Makefile @@ -0,0 +1,21 @@ +# +# Copyright (C) 2015 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:=bash +PKG_CPE_ID:=cpe:/a:gnu:bash +PKG_VERSION:=5.1.16 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/bash +PKG_HASH:=5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 + +HOST_BUILD_PARALLEL := 1 + +include $(INCLUDE_DIR)/host-build.mk + +$(eval $(call HostBuild)) From 4f70247621a3f07104ec54827c5f4c7ba8a44917 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 28 Mar 2022 18:40:30 +0300 Subject: [PATCH 08/18] elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel --- package/libs/elfutils/Makefile | 4 ---- tools/Makefile | 3 +++ tools/elfutils/Makefile | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 tools/elfutils/Makefile diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index 07b3ea66c66a1d..2a7b5c50e2d343 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -24,11 +24,8 @@ PKG_INSTALL:=1 PKG_USE_MIPS16:=1 PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone -HOST_BUILD_DEPENDS:=argp-standalone/host musl-fts/host - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -include $(INCLUDE_DIR)/host-build.mk define Package/elfutils/Default SECTION:=libs @@ -114,7 +111,6 @@ define Package/libelf/install endef # these lines need to be ordered by dependency because of ABI versioning -$(eval $(call HostBuild)) $(eval $(call BuildPackage,libelf)) $(eval $(call BuildPackage,libdw)) $(eval $(call BuildPackage,libasm)) diff --git a/tools/Makefile b/tools/Makefile index 08e882fc035ab7..14234e23c78530 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -84,6 +84,9 @@ ifneq ($(HOST_OS),Linux) endif ifeq ($(HOST_OS),Darwin) tools-y += bash +else + $(curdir)/elfutils/compile := $(curdir)/zlib/compile + tools-y += elfutils endif ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) diff --git a/tools/elfutils/Makefile b/tools/elfutils/Makefile new file mode 100644 index 00000000000000..98694beb0effc2 --- /dev/null +++ b/tools/elfutils/Makefile @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0-only + +include $(TOPDIR)/rules.mk + +PKG_NAME:=elfutils +PKG_VERSION:=0.186 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION) +PKG_HASH:=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 + +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3 +PKG_CPE_ID:=cpe:/a:elfutils_project:elfutils + +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +HOST_BUILD_DEPENDS:=argp-standalone/host musl-fts/host + +include $(INCLUDE_DIR)/host-build.mk + +HOST_CONFIGURE_ARGS += \ + --disable-debuginfod \ + --disable-libdebuginfod \ + --disable-nls \ + --disable-shared \ + --without-lzma \ + --without-zstd + +$(eval $(call HostBuild)) From 68e802c1b97ef4f9b2d48fe39088a98d1f013b15 Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Tue, 24 Nov 2020 14:15:09 -0800 Subject: [PATCH 09/18] tools/dwarves: add host package dwarves is a set of tools that use the debugging information inserted in ELF binaries by compilers such as GCC. Utilities in the dwarves suite include pahole, which can be used to find alignment holes in structs and classes, and also extracts other information such as CPU cacheline alignment, helping pack those structures to achieve more cache hits. These tools are also used to encode and read the BTF type information format used with the bpf syscall, making this a Linux build dependency when using kernel BTF information. Signed-off-by: Tony Ambardar Signed-off-by: Felix Fietkau [bump to 1.23, add elfutils dep, drop host lib usage, drop cmake release target, use RM macro] Signed-off-by: Stijn Tintel --- toolchain/Config.in | 8 ++++++++ tools/Makefile | 2 ++ tools/dwarves/Makefile | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 tools/dwarves/Makefile diff --git a/toolchain/Config.in b/toolchain/Config.in index 80b23c03843ed6..2d29ec09e760a4 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -246,6 +246,14 @@ comment "Binary tools" source "toolchain/binutils/Config.in" +config DWARVES + bool + prompt "Build pahole" if TOOLCHAINOPTS + depends on !HOST_OS_MACOS + default n + help + Enable if you want to build pahole and the dwarves tools. + comment "Compiler" depends on TOOLCHAINOPTS diff --git a/tools/Makefile b/tools/Makefile index 14234e23c78530..6359ab3e20e79d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -85,7 +85,9 @@ endif ifeq ($(HOST_OS),Darwin) tools-y += bash else + $(curdir)/dwarves/compile += $(curdir)/elfutils/compile $(curdir)/elfutils/compile := $(curdir)/zlib/compile + tools-$(CONFIG_DWARVES) += dwarves tools-y += elfutils endif diff --git a/tools/dwarves/Makefile b/tools/dwarves/Makefile new file mode 100644 index 00000000000000..41f05327011bf4 --- /dev/null +++ b/tools/dwarves/Makefile @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: GPL-2.0-only + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dwarves + +PKG_SOURCE_VERSION:=v1.23 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/devel/pahole/pahole.git +PKG_MIRROR_HASH:=6ab1bb1dbdf6c73ffcf485d909229dc1da1a3d24efd213e92c56489b58d6a4bd +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=COPYING + +HOST_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk + +CMAKE_HOST_OPTIONS += \ + -D__LIB=lib \ + -DCMAKE_INSTALL_RPATH="$(STAGING_DIR_HOST)/lib" \ + -DCMAKE_SKIP_RPATH=FALSE + +define Host/Clean + $(RM) $(STAGING_DIR_HOST)/bin/{codiff,ctracer,dtagnames,pahole,pdwtags} + $(RM) $(STAGING_DIR_HOST)/bin/{pfunct,pglobal,prefcnt,scncopy,syscse} + $(RM) $(STAGING_DIR_HOST)/bin/{ostra-cg,btfdiff,fullcircle} + $(RM) $(STAGING_DIR_HOST)/lib/libdwarves*.so* + $(RM) $(STAGING_DIR_HOST)/share/man/man1/pahole.1 + rm -rf $(STAGING_DIR_HOST)/include/dwarves + rm -rf $(STAGING_DIR_HOST)/share/dwarves + $(call Host/Clean/Default) +endef + +$(eval $(call HostBuild)) From 75c72b79205e8a11623ecaab62322c224bd9e645 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Wed, 18 May 2022 16:15:09 +0300 Subject: [PATCH 10/18] tools/elfutils: depend on m4 Some buildbots fail to build elfutils due to m4 being missing. Add m4 as a dependency for elfutils to fix this. Fixes: ad79b9271949 ("elfutils: move host build to tools") Signed-off-by: Stijn Tintel --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 6359ab3e20e79d..7e73747a73db73 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -86,7 +86,7 @@ ifeq ($(HOST_OS),Darwin) tools-y += bash else $(curdir)/dwarves/compile += $(curdir)/elfutils/compile - $(curdir)/elfutils/compile := $(curdir)/zlib/compile + $(curdir)/elfutils/compile := $(curdir)/m4/compile $(curdir)/zlib/compile tools-$(CONFIG_DWARVES) += dwarves tools-y += elfutils endif From 0dc61a0d373f3fdf1e8ab2926bbbdabf39350d55 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 19 May 2022 01:53:49 +0300 Subject: [PATCH 11/18] tools/elfutils: only build required components Building all of the components results in strip being installed in staging_dir/host/bin. This strip binary will take precedence over binutils strip that is installed in the toolchain directory. This will not work on host systems that do not have libdw installed, as we do not set HOST_LDFLAGS to override rpath to staging_dir/host/lib. However, rather than overriding rpath, we should just avoid using elfutils strip entirely. Override the SUBDIRS variable in the Makefile to only build and install the libraries we require for dwarves and frr. Fixes the following build failure in toolchain/gdb: strip: error while loading shared libraries: libdw.so.1: cannot open shared object file: No such file or directory Fixes: ad79b9271949 ("elfutils: move host build to tools") Reported-by: Dominick Grift Reported-by: Lucian Cristian Signed-off-by: Stijn Tintel --- tools/elfutils/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/elfutils/Makefile b/tools/elfutils/Makefile index 98694beb0effc2..2f4dd8f25303c8 100644 --- a/tools/elfutils/Makefile +++ b/tools/elfutils/Makefile @@ -29,4 +29,7 @@ HOST_CONFIGURE_ARGS += \ --without-lzma \ --without-zstd +HOST_MAKE_FLAGS += \ + SUBDIRS="lib libelf libcpu backends libebl libdwelf libdwfl libdw" + $(eval $(call HostBuild)) From 70571fb6dc94a7763b91b19b0126cf0242284d26 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 19 May 2022 02:28:42 +0300 Subject: [PATCH 12/18] tools/elfutils: drop HOST_BUILD_DEPENDS This is only effective for host build of normal packages, not tools. Fixes: ad79b9271949 ("elfutils: move host build to tools") Reported-by: Rosen Penev Signed-off-by: Stijn Tintel --- tools/elfutils/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/elfutils/Makefile b/tools/elfutils/Makefile index 2f4dd8f25303c8..d49bc07f27fb1d 100644 --- a/tools/elfutils/Makefile +++ b/tools/elfutils/Makefile @@ -17,8 +17,6 @@ PKG_CPE_ID:=cpe:/a:elfutils_project:elfutils PKG_FIXUP:=autoreconf PKG_INSTALL:=1 -HOST_BUILD_DEPENDS:=argp-standalone/host musl-fts/host - include $(INCLUDE_DIR)/host-build.mk HOST_CONFIGURE_ARGS += \ From 2666c297993fd82367943935d877d5cc19935af7 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 7 Aug 2022 19:58:19 +0200 Subject: [PATCH 13/18] tools: elfutils: Update to version 0.187 Update to most recent version of elfutils and sync with version from package folder. Signed-off-by: Hauke Mehrtens --- tools/elfutils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/elfutils/Makefile b/tools/elfutils/Makefile index d49bc07f27fb1d..92a916ec4dc818 100644 --- a/tools/elfutils/Makefile +++ b/tools/elfutils/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=elfutils -PKG_VERSION:=0.186 +PKG_VERSION:=0.187 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION) -PKG_HASH:=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 +PKG_HASH:=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3 From 7987b041592950c05d043079477552d6b047147f Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 3 Aug 2022 07:13:08 +0200 Subject: [PATCH 14/18] elfutils: update to 0.187 Changes: debuginfod: Support -C option for connection thread pooling. debuginfod-client: Negative cache file are now zero sized instead of no-permission files. addr2line: The -A, --absolute option, which shows file names including the full compilation directory is now the default. To get the old behavior use the new option --relative. readelf, elflint: Recognize FDO Packaging Metadata ELF notes libdw, debuginfo-client: Load libcurl lazily only when files need to be fetched remotely. libcurl is now never loaded when DEBUGINFOD_URLS is unset. And when DEBUGINFOD_URLS is set, libcurl is only loaded when the debuginfod_begin function is called. Signed-off-by: Nick Hainke --- package/libs/elfutils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index 2a7b5c50e2d343..4ca37d3b06d223 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=elfutils -PKG_VERSION:=0.186 +PKG_VERSION:=0.187 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION) -PKG_HASH:=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 +PKG_HASH:=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8 PKG_MAINTAINER:=Luiz Angelo Daros de Luca PKG_LICENSE:=GPL-3.0-or-later From 8943750549ea463ea20367345e799472ed89057c Mon Sep 17 00:00:00 2001 From: lovehackintosh <92633080+lovehackintosh@users.noreply.github.com> Date: Wed, 24 Aug 2022 13:20:32 +0800 Subject: [PATCH 15/18] kernel: bump 5.10 to 5.10.137 (#9990) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All other patches automagically rebased. Signed-off-by: Petr Štetiar Signed-off-by: Petr Štetiar Co-authored-by: Petr Štetiar --- include/kernel-5.10 | 4 ++-- ...-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch | 2 +- .../bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch | 6 +++--- ...ilter-nftables-update-table-flags-from-the-commi.patch | 8 ++++---- .../hack-5.10/800-GPIO-add-named-gpio-exports.patch | 2 +- target/linux/generic/hack-5.10/904-debloat_dma_buf.patch | 2 +- .../generic/pending-5.10/420-mtd-redboot_space.patch | 2 +- .../pending-5.10/811-pci_disable_usb_common_quirks.patch | 2 +- .../patches-5.10/0001-MIPS-lantiq-add-pcie-driver.patch | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 14b00f4002e609..762e4674686ccf 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .136 -LINUX_KERNEL_HASH-5.10.136 = 1c099d0d59e7d9f671dfc947e16891b7a3a45efd7dfcc6b1e55a194961e45159 +LINUX_VERSION-5.10 = .137 +LINUX_KERNEL_HASH-5.10.137 = c16bcd4d1453d7e645007d0a25270f52401331c7df81c364f57bde914e1616c8 diff --git a/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 045a3bc826de36..47677075ed25f3 100644 --- a/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski if (ret < 0) { pr_err("%s: failed to add hogs for %pOF\n", __func__, rd->dn); -@@ -1035,9 +1045,11 @@ int of_gpiochip_add(struct gpio_chip *ch +@@ -1037,9 +1047,11 @@ int of_gpiochip_add(struct gpio_chip *ch of_node_get(chip->of_node); diff --git a/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch index 5a9532c3214890..bb43576b85ccc9 100644 --- a/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch +++ b/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch @@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe .width = 2, --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -84,6 +84,7 @@ static int parse_redboot_partitions(stru +@@ -85,6 +85,7 @@ static int parse_redboot_partitions(stru int nulllen = 0; int numslots; unsigned long offset; @@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; #endif -@@ -190,6 +191,16 @@ static int parse_redboot_partitions(stru +@@ -191,6 +192,16 @@ static int parse_redboot_partitions(stru goto out; } @@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe for (i = 0; i < numslots; i++) { struct fis_list *new_fl, **prev; -@@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru +@@ -211,10 +222,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch index d2076031ca3b86..5ab2718ecbf54e 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso struct nft_set *set; --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -892,6 +892,12 @@ static void nf_tables_table_disable(stru +@@ -893,6 +893,12 @@ static void nf_tables_table_disable(stru nft_table_disable(net, table, 0); } @@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso static int nf_tables_updtable(struct nft_ctx *ctx) { struct nft_trans *trans; -@@ -915,19 +921,17 @@ static int nf_tables_updtable(struct nft +@@ -916,19 +922,17 @@ static int nf_tables_updtable(struct nft if ((flags & NFT_TABLE_F_DORMANT) && !(ctx->table->flags & NFT_TABLE_F_DORMANT)) { @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso nft_trans_table_update(trans) = true; list_add_tail(&trans->list, &ctx->net->nft.commit_list); return 0; -@@ -7923,11 +7927,10 @@ static int nf_tables_commit(struct net * +@@ -7931,11 +7935,10 @@ static int nf_tables_commit(struct net * switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso } else { nft_clear(net, trans->ctx.table); } -@@ -8140,11 +8143,9 @@ static int __nf_tables_abort(struct net +@@ -8148,11 +8151,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { diff --git a/target/linux/generic/hack-5.10/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-5.10/800-GPIO-add-named-gpio-exports.patch index 2d67353ed9d41a..6367ee9a0b6ad6 100644 --- a/target/linux/generic/hack-5.10/800-GPIO-add-named-gpio-exports.patch +++ b/target/linux/generic/hack-5.10/800-GPIO-add-named-gpio-exports.patch @@ -15,7 +15,7 @@ Signed-off-by: John Crispin #include "gpiolib.h" #include "gpiolib-of.h" -@@ -1044,3 +1046,72 @@ void of_gpiochip_remove(struct gpio_chip +@@ -1046,3 +1048,72 @@ void of_gpiochip_remove(struct gpio_chip { of_node_put(chip->of_node); } diff --git a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch index 3c97b0e07c9f76..333ed12b06693d 100644 --- a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch @@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3066,6 +3066,7 @@ int wake_up_state(struct task_struct *p, +@@ -3071,6 +3071,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/pending-5.10/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.10/420-mtd-redboot_space.patch index a3cd4ecf1f9bf7..5be2a2246e379c 100644 --- a/target/linux/generic/pending-5.10/420-mtd-redboot_space.patch +++ b/target/linux/generic/pending-5.10/420-mtd-redboot_space.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -279,14 +279,21 @@ static int parse_redboot_partitions(stru +@@ -280,14 +280,21 @@ static int parse_redboot_partitions(stru #endif names += strlen(names)+1; diff --git a/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch index cf52fa36ca0662..488f90a8d4f91f 100644 --- a/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -486,7 +486,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -487,7 +487,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/lantiq/patches-5.10/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-5.10/0001-MIPS-lantiq-add-pcie-driver.patch index 786091a57e049f..1903b4b0ca0296 100644 --- a/target/linux/lantiq/patches-5.10/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-5.10/0001-MIPS-lantiq-add-pcie-driver.patch @@ -5492,7 +5492,7 @@ Signed-off-by: John Crispin unsigned long type); --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -1076,6 +1076,12 @@ +@@ -1079,6 +1079,12 @@ #define PCI_DEVICE_ID_SGI_IOC3 0x0003 #define PCI_DEVICE_ID_SGI_LITHIUM 0x1002 From cd264e8258cd64c49e532deb556bc88daeee3ae8 Mon Sep 17 00:00:00 2001 From: benihi <88561480+benihi@users.noreply.github.com> Date: Wed, 24 Aug 2022 07:45:26 -0400 Subject: [PATCH 16/18] ipq807x: fixes build error and refresh 5.10 patches (#9991) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit adjusted: target/linux/ipq807x/patches-5.10/125-ipq8074-gcc-Added-support-for-NSS-clocks.patch https://kernel.source.codeaurora.cn/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/clk/qcom/gcc-ipq8074.c?h=v5.10.137&id=b28ebe7d2f10e5ca574be3d4188a744674e8e0d5 https://kernel.source.codeaurora.cn/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/clk/qcom/gcc-ipq8074.c?h=v5.10.137&id=e2330494f0f8f168ae5bd17df01cb61363593c46 removed: target/linux/ipq807x/patches-5.10/128-qcom-clk-ipq8074-fix-port-6-clock-issue-for-1G.patch target/linux/ipq807x/patches-5.10/129-clk-qcom-ipq8074-Add-NSS-PORT-clocks-frequencies.patch target/linux/ipq807x/patches-5.10/130-clk-qcom-ipq8074-change-freq-table-for-port5_tx_clk_.patch https://kernel.source.codeaurora.cn/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/clk/qcom/gcc-ipq8074.c?h=v5.10.137&id=b83af7b4ec1d1c54de7d7115c9e0b4c3d60fdc47 Signed-off-by: José Hwong Signed-off-by: José Hwong --- ...oc-sysmon-Expose-the-shutdown-result.patch | 20 +-- ...wc-Drop-the-.set_num_vectors-host-op.patch | 6 +- ...-interrupt-setup-into-DWC-common-cod.patch | 4 +- ...-Move-link-handling-into-common-code.patch | 6 +- ...-dwc-Move-dw_pcie_msi_init-into-core.patch | 4 +- .../109-clk-qcom-Add-WCSSAON-reset.patch | 2 +- ...-support-for-IPQ60xx-PCIe-controller.patch | 6 +- ...I-qcom-Add-IPQ8074-PCIe-Gen3-support.patch | 4 +- ...074-gcc-Added-support-for-NSS-clocks.patch | 137 +----------------- ...ort-added-for-necessary-clocks-and-r.patch | 16 +- ...-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch | 4 +- ...pq8074-fix-port-6-clock-issue-for-1G.patch | 35 ----- ...8074-Add-NSS-PORT-clocks-frequencies.patch | 41 ------ ...-change-freq-table-for-port5_tx_clk_.patch | 38 ----- ...-disable-SW_COLLAPSE-for-USB-GDSCR-s.patch | 6 +- ...q8074-SW-workaround-for-UBI-PLL-lock.patch | 2 +- .../600-qca-nss-ecm-support-CORE.patch | 6 +- 17 files changed, 45 insertions(+), 292 deletions(-) delete mode 100644 target/linux/ipq807x/patches-5.10/128-qcom-clk-ipq8074-fix-port-6-clock-issue-for-1G.patch delete mode 100644 target/linux/ipq807x/patches-5.10/129-clk-qcom-ipq8074-Add-NSS-PORT-clocks-frequencies.patch delete mode 100644 target/linux/ipq807x/patches-5.10/130-clk-qcom-ipq8074-change-freq-table-for-port5_tx_clk_.patch diff --git a/target/linux/ipq807x/patches-5.10/001-v5.11-remoteproc-sysmon-Expose-the-shutdown-result.patch b/target/linux/ipq807x/patches-5.10/001-v5.11-remoteproc-sysmon-Expose-the-shutdown-result.patch index 57d2cbf6e18ea8..ee14509aa4d003 100644 --- a/target/linux/ipq807x/patches-5.10/001-v5.11-remoteproc-sysmon-Expose-the-shutdown-result.patch +++ b/target/linux/ipq807x/patches-5.10/001-v5.11-remoteproc-sysmon-Expose-the-shutdown-result.patch @@ -54,7 +54,7 @@ Signed-off-by: Bjorn Andersson #endif --- a/drivers/remoteproc/qcom_sysmon.c +++ b/drivers/remoteproc/qcom_sysmon.c -@@ -44,6 +44,7 @@ struct qcom_sysmon { +@@ -45,6 +45,7 @@ struct qcom_sysmon { struct mutex lock; bool ssr_ack; @@ -62,7 +62,7 @@ Signed-off-by: Bjorn Andersson struct qmi_handle qmi; struct sockaddr_qrtr ssctl; -@@ -115,10 +116,13 @@ out_unlock: +@@ -116,10 +117,13 @@ out_unlock: /** * sysmon_request_shutdown() - request graceful shutdown of remote * @sysmon: sysmon context @@ -77,7 +77,7 @@ Signed-off-by: Bjorn Andersson int ret; mutex_lock(&sysmon->lock); -@@ -141,9 +145,13 @@ static void sysmon_request_shutdown(stru +@@ -142,9 +146,13 @@ static void sysmon_request_shutdown(stru if (!sysmon->ssr_ack) dev_err(sysmon->dev, "unexpected response to sysmon shutdown request\n"); @@ -91,7 +91,7 @@ Signed-off-by: Bjorn Andersson } static int sysmon_callback(struct rpmsg_device *rpdev, void *data, int count, -@@ -297,14 +305,33 @@ static struct qmi_msg_handler qmi_indica +@@ -298,14 +306,33 @@ static struct qmi_msg_handler qmi_indica {} }; @@ -126,7 +126,7 @@ Signed-off-by: Bjorn Andersson int ret; reinit_completion(&sysmon->ind_comp); -@@ -312,7 +339,7 @@ static void ssctl_request_shutdown(struc +@@ -313,7 +340,7 @@ static void ssctl_request_shutdown(struc ret = qmi_txn_init(&sysmon->qmi, &txn, ssctl_shutdown_resp_ei, &resp); if (ret < 0) { dev_err(sysmon->dev, "failed to allocate QMI txn\n"); @@ -135,7 +135,7 @@ Signed-off-by: Bjorn Andersson } ret = qmi_send_request(&sysmon->qmi, &sysmon->ssctl, &txn, -@@ -320,27 +347,23 @@ static void ssctl_request_shutdown(struc +@@ -321,27 +348,23 @@ static void ssctl_request_shutdown(struc if (ret < 0) { dev_err(sysmon->dev, "failed to send shutdown request\n"); qmi_txn_cancel(&txn); @@ -173,7 +173,7 @@ Signed-off-by: Bjorn Andersson } /** -@@ -510,6 +533,9 @@ static void sysmon_stop(struct rproc_sub +@@ -514,6 +537,9 @@ static void sysmon_stop(struct rproc_sub .subsys_name = sysmon->name, .ssr_event = SSCTL_SSR_EVENT_BEFORE_SHUTDOWN }; @@ -183,8 +183,8 @@ Signed-off-by: Bjorn Andersson mutex_lock(&sysmon->state_lock); sysmon->state = SSCTL_SSR_EVENT_BEFORE_SHUTDOWN; -@@ -521,9 +547,11 @@ static void sysmon_stop(struct rproc_sub - return; +@@ -530,9 +556,11 @@ static void sysmon_stop(struct rproc_sub + } if (sysmon->ssctl_version) - ssctl_request_shutdown(sysmon); @@ -197,7 +197,7 @@ Signed-off-by: Bjorn Andersson } static void sysmon_unprepare(struct rproc_subdev *subdev) -@@ -682,6 +710,22 @@ void qcom_remove_sysmon_subdev(struct qc +@@ -692,6 +720,22 @@ void qcom_remove_sysmon_subdev(struct qc EXPORT_SYMBOL_GPL(qcom_remove_sysmon_subdev); /** diff --git a/target/linux/ipq807x/patches-5.10/010-v5.11-PCI-dwc-Drop-the-.set_num_vectors-host-op.patch b/target/linux/ipq807x/patches-5.10/010-v5.11-PCI-dwc-Drop-the-.set_num_vectors-host-op.patch index c8bdec864c7145..3320ed3a856ea4 100644 --- a/target/linux/ipq807x/patches-5.10/010-v5.11-PCI-dwc-Drop-the-.set_num_vectors-host-op.patch +++ b/target/linux/ipq807x/patches-5.10/010-v5.11-PCI-dwc-Drop-the-.set_num_vectors-host-op.patch @@ -90,7 +90,7 @@ Cc: linux-tegra@vger.kernel.org --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c -@@ -990,11 +990,6 @@ static int tegra_pcie_dw_link_up(struct +@@ -988,11 +988,6 @@ static int tegra_pcie_dw_link_up(struct return !!(val & PCI_EXP_LNKSTA_DLLLA); } @@ -102,7 +102,7 @@ Cc: linux-tegra@vger.kernel.org static int tegra_pcie_dw_start_link(struct dw_pcie *pci) { struct tegra_pcie_dw *pcie = to_tegra_pcie(pci); -@@ -1019,7 +1014,6 @@ static const struct dw_pcie_ops tegra_dw +@@ -1017,7 +1012,6 @@ static const struct dw_pcie_ops tegra_dw static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = { .host_init = tegra_pcie_dw_host_init, @@ -110,7 +110,7 @@ Cc: linux-tegra@vger.kernel.org }; static void tegra_pcie_disable_phy(struct tegra_pcie_dw *pcie) -@@ -2003,6 +1997,7 @@ static int tegra_pcie_dw_probe(struct pl +@@ -2002,6 +1996,7 @@ static int tegra_pcie_dw_probe(struct pl pci->n_fts[1] = FTS_VAL; pp = &pci->pp; diff --git a/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch b/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch index 59e4b365aa7144..0479c4849bced6 100644 --- a/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch +++ b/target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch @@ -229,7 +229,7 @@ Cc: linux-tegra@vger.kernel.org return dw_pcie_host_init(&pci->pp); --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c -@@ -1428,14 +1428,6 @@ static int qcom_pcie_probe(struct platfo +@@ -1426,14 +1426,6 @@ static int qcom_pcie_probe(struct platfo pp->ops = &qcom_pcie_dw_ops; @@ -256,7 +256,7 @@ Cc: linux-tegra@vger.kernel.org if (ret) { --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c -@@ -1554,14 +1554,6 @@ static int tegra_pcie_config_rp(struct t +@@ -1552,14 +1552,6 @@ static int tegra_pcie_config_rp(struct t char *name; int ret; diff --git a/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch b/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch index faabd176884a25..65681c0e784f56 100644 --- a/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch +++ b/target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch @@ -525,7 +525,7 @@ Cc: linux-tegra@vger.kernel.org } static void qcom_pcie_2_1_0_ltssm_enable(struct qcom_pcie *pcie) -@@ -1284,15 +1281,8 @@ static int qcom_pcie_host_init(struct pc +@@ -1282,15 +1279,8 @@ static int qcom_pcie_host_init(struct pc qcom_ep_reset_deassert(pcie); @@ -542,7 +542,7 @@ Cc: linux-tegra@vger.kernel.org err_disable_phy: phy_power_off(pcie->phy); err_deinit: -@@ -1359,6 +1349,7 @@ static const struct qcom_pcie_ops ops_2_ +@@ -1357,6 +1347,7 @@ static const struct qcom_pcie_ops ops_2_ static const struct dw_pcie_ops dw_pcie_ops = { .link_up = qcom_pcie_link_up, @@ -552,7 +552,7 @@ Cc: linux-tegra@vger.kernel.org static int qcom_pcie_probe(struct platform_device *pdev) --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c -@@ -1549,7 +1549,6 @@ static int tegra_pcie_deinit_controller( +@@ -1547,7 +1547,6 @@ static int tegra_pcie_deinit_controller( static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie) { diff --git a/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch b/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch index 9a168ed97789db..9704330a063e2c 100644 --- a/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch +++ b/target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch @@ -220,7 +220,7 @@ Cc: linux-tegra@vger.kernel.org } --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c -@@ -1277,8 +1277,6 @@ static int qcom_pcie_host_init(struct pc +@@ -1275,8 +1275,6 @@ static int qcom_pcie_host_init(struct pc } dw_pcie_setup_rc(pp); @@ -251,7 +251,7 @@ Cc: linux-tegra@vger.kernel.org static int spear13xx_pcie_link_up(struct dw_pcie *pci) --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c -@@ -765,8 +765,6 @@ static void tegra_pcie_enable_msi_interr +@@ -763,8 +763,6 @@ static void tegra_pcie_enable_msi_interr struct tegra_pcie_dw *pcie = to_tegra_pcie(pci); u32 val; diff --git a/target/linux/ipq807x/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch b/target/linux/ipq807x/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch index f36b560a9bee73..36a539c217e637 100644 --- a/target/linux/ipq807x/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch +++ b/target/linux/ipq807x/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch @@ -15,7 +15,7 @@ Acked-by: Stephen Boyd --- a/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -4744,6 +4744,7 @@ static const struct qcom_reset_map gcc_i +@@ -4789,6 +4789,7 @@ static const struct qcom_reset_map gcc_i [GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 }, [GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, [GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, diff --git a/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch b/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch index 5c711d12b279de..5c820ad982b1b1 100644 --- a/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch +++ b/target/linux/ipq807x/patches-5.10/117-PCI-qcom-add-support-for-IPQ60xx-PCIe-controller.patch @@ -73,7 +73,7 @@ Signed-off-by: Baruch Siach }; struct qcom_pcie; -@@ -1246,6 +1262,130 @@ static void qcom_pcie_post_deinit_2_7_0( +@@ -1244,6 +1260,130 @@ static void qcom_pcie_post_deinit_2_7_0( clk_disable_unprepare(res->pipe_clk); } @@ -204,7 +204,7 @@ Signed-off-by: Baruch Siach static int qcom_pcie_link_up(struct dw_pcie *pci) { u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); -@@ -1345,6 +1485,15 @@ static const struct qcom_pcie_ops ops_2_ +@@ -1343,6 +1483,15 @@ static const struct qcom_pcie_ops ops_2_ .post_deinit = qcom_pcie_post_deinit_2_7_0, }; @@ -220,7 +220,7 @@ Signed-off-by: Baruch Siach static const struct dw_pcie_ops dw_pcie_ops = { .link_up = qcom_pcie_link_up, .start_link = qcom_pcie_start_link, -@@ -1450,6 +1599,7 @@ static const struct of_device_id qcom_pc +@@ -1448,6 +1597,7 @@ static const struct of_device_id qcom_pc { .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 }, { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 }, { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 }, diff --git a/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch b/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch index 71306caa2f275e..1caa21388c3629 100644 --- a/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch +++ b/target/linux/ipq807x/patches-5.10/120-PCI-qcom-Add-IPQ8074-PCIe-Gen3-support.patch @@ -25,7 +25,7 @@ Signed-off-by: Robert Marko struct reset_control *rst; }; -@@ -1273,8 +1273,10 @@ static int qcom_pcie_get_resources_2_9_0 +@@ -1271,8 +1271,10 @@ static int qcom_pcie_get_resources_2_9_0 res->clks[0].id = "iface"; res->clks[1].id = "axi_m"; res->clks[2].id = "axi_s"; @@ -38,7 +38,7 @@ Signed-off-by: Robert Marko ret = devm_clk_bulk_get(dev, ARRAY_SIZE(res->clks), res->clks); if (ret < 0) -@@ -1601,6 +1603,7 @@ static const struct of_device_id qcom_pc +@@ -1599,6 +1601,7 @@ static const struct of_device_id qcom_pc { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 }, { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 }, { .compatible = "qcom,pcie-ipq6018", .data = &ops_2_9_0 }, diff --git a/target/linux/ipq807x/patches-5.10/125-ipq8074-gcc-Added-support-for-NSS-clocks.patch b/target/linux/ipq807x/patches-5.10/125-ipq8074-gcc-Added-support-for-NSS-clocks.patch index ff3c7d0489c50f..4a6ba193cf29ad 100644 --- a/target/linux/ipq807x/patches-5.10/125-ipq8074-gcc-Added-support-for-NSS-clocks.patch +++ b/target/linux/ipq807x/patches-5.10/125-ipq8074-gcc-Added-support-for-NSS-clocks.patch @@ -34,7 +34,7 @@ Signed-off-by: Rajkumar Ayyasamy }; --- a/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -3174,6 +3174,24 @@ static struct clk_branch gcc_nss_ptp_ref +@@ -3182,6 +3182,24 @@ static struct clk_branch gcc_nss_ptp_ref }, }; @@ -59,121 +59,7 @@ Signed-off-by: Rajkumar Ayyasamy static struct clk_branch gcc_nssnoc_ce_apb_clk = { .halt_reg = 0x6830c, .clkr = { -@@ -3346,6 +3364,7 @@ static struct clk_branch gcc_nssnoc_ubi1 - - static struct clk_branch gcc_ubi0_ahb_clk = { - .halt_reg = 0x6820c, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x6820c, - .enable_mask = BIT(0), -@@ -3363,6 +3382,7 @@ static struct clk_branch gcc_ubi0_ahb_cl - - static struct clk_branch gcc_ubi0_axi_clk = { - .halt_reg = 0x68200, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68200, - .enable_mask = BIT(0), -@@ -3380,6 +3400,7 @@ static struct clk_branch gcc_ubi0_axi_cl - - static struct clk_branch gcc_ubi0_nc_axi_clk = { - .halt_reg = 0x68204, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68204, - .enable_mask = BIT(0), -@@ -3397,6 +3418,7 @@ static struct clk_branch gcc_ubi0_nc_axi - - static struct clk_branch gcc_ubi0_core_clk = { - .halt_reg = 0x68210, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68210, - .enable_mask = BIT(0), -@@ -3414,6 +3436,7 @@ static struct clk_branch gcc_ubi0_core_c - - static struct clk_branch gcc_ubi0_mpt_clk = { - .halt_reg = 0x68208, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68208, - .enable_mask = BIT(0), -@@ -3431,6 +3454,7 @@ static struct clk_branch gcc_ubi0_mpt_cl - - static struct clk_branch gcc_ubi1_ahb_clk = { - .halt_reg = 0x6822c, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x6822c, - .enable_mask = BIT(0), -@@ -3448,6 +3472,7 @@ static struct clk_branch gcc_ubi1_ahb_cl - - static struct clk_branch gcc_ubi1_axi_clk = { - .halt_reg = 0x68220, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68220, - .enable_mask = BIT(0), -@@ -3465,6 +3490,7 @@ static struct clk_branch gcc_ubi1_axi_cl - - static struct clk_branch gcc_ubi1_nc_axi_clk = { - .halt_reg = 0x68224, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68224, - .enable_mask = BIT(0), -@@ -3482,6 +3508,7 @@ static struct clk_branch gcc_ubi1_nc_axi - - static struct clk_branch gcc_ubi1_core_clk = { - .halt_reg = 0x68230, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68230, - .enable_mask = BIT(0), -@@ -3499,6 +3526,7 @@ static struct clk_branch gcc_ubi1_core_c - - static struct clk_branch gcc_ubi1_mpt_clk = { - .halt_reg = 0x68228, -+ .halt_check = BRANCH_HALT_DELAY, - .clkr = { - .enable_reg = 0x68228, - .enable_mask = BIT(0), -@@ -4381,6 +4409,33 @@ static struct clk_hw *gcc_ipq8074_hws[] - &nss_ppe_cdiv_clk_src.hw, - }; - -+static const struct alpha_pll_config ubi32_pll_config = { -+ .l = 0x4e, -+ .config_ctl_val = 0x200d4aa8, -+ .config_ctl_hi_val = 0x3c2, -+ .main_output_mask = BIT(0), -+ .aux_output_mask = BIT(1), -+ .pre_div_val = 0x0, -+ .pre_div_mask = BIT(12), -+ .post_div_val = 0x0, -+ .post_div_mask = GENMASK(9, 8), -+}; -+ -+static const struct alpha_pll_config nss_crypto_pll_config = { -+ .l = 0x3e, -+ .alpha = 0x0, -+ .alpha_hi = 0x80, -+ .config_ctl_val = 0x4001055b, -+ .main_output_mask = BIT(0), -+ .pre_div_val = 0x0, -+ .pre_div_mask = GENMASK(14, 12), -+ .post_div_val = 0x1 << 8, -+ .post_div_mask = GENMASK(11, 8), -+ .vco_mask = GENMASK(21, 20), -+ .vco_val = 0x0, -+ .alpha_en_mask = BIT(24), -+}; -+ - static struct clk_regmap *gcc_ipq8074_clks[] = { - [GPLL0_MAIN] = &gpll0_main.clkr, - [GPLL0] = &gpll0.clkr, -@@ -4562,6 +4617,7 @@ static struct clk_regmap *gcc_ipq8074_cl +@@ -4607,6 +4625,7 @@ static struct clk_regmap *gcc_ipq8074_cl [GCC_CMN_12GPLL_AHB_CLK] = &gcc_cmn_12gpll_ahb_clk.clkr, [GCC_CMN_12GPLL_SYS_CLK] = &gcc_cmn_12gpll_sys_clk.clkr, [GCC_MDIO_AHB_CLK] = &gcc_mdio_ahb_clk.clkr, @@ -181,25 +67,6 @@ Signed-off-by: Rajkumar Ayyasamy [GCC_UNIPHY0_AHB_CLK] = &gcc_uniphy0_ahb_clk.clkr, [GCC_UNIPHY0_SYS_CLK] = &gcc_uniphy0_sys_clk.clkr, [GCC_UNIPHY1_AHB_CLK] = &gcc_uniphy1_ahb_clk.clkr, -@@ -4773,7 +4829,17 @@ static const struct qcom_cc_desc gcc_ipq - - static int gcc_ipq8074_probe(struct platform_device *pdev) - { -- return qcom_cc_probe(pdev, &gcc_ipq8074_desc); -+ struct regmap *regmap; -+ -+ regmap = qcom_cc_map(pdev, &gcc_ipq8074_desc); -+ if (IS_ERR(regmap)) -+ return PTR_ERR(regmap); -+ -+ clk_alpha_pll_configure(&ubi32_pll_main, regmap, &ubi32_pll_config); -+ clk_alpha_pll_configure(&nss_crypto_pll_main, regmap, -+ &nss_crypto_pll_config); -+ -+ return qcom_cc_really_probe(pdev, &gcc_ipq8074_desc, regmap); - } - - static struct platform_driver gcc_ipq8074_driver = { --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h @@ -233,6 +233,7 @@ diff --git a/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch b/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch index be3bc35c644e68..c32d772ba23b17 100644 --- a/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch +++ b/target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch @@ -50,7 +50,7 @@ Signed-off-by: Rajkumar Ayyasamy static struct clk_rcg2 pcie0_axi_clk_src = { .cmd_rcgr = 0x75054, .freq_tbl = ftbl_pcie_axi_clk_src, -@@ -2013,6 +2035,78 @@ static struct clk_rcg2 gp3_clk_src = { +@@ -2021,6 +2043,78 @@ static struct clk_rcg2 gp3_clk_src = { }, }; @@ -129,7 +129,7 @@ Signed-off-by: Rajkumar Ayyasamy static struct clk_branch gcc_blsp1_ahb_clk = { .halt_reg = 0x01008, .clkr = { -@@ -4344,13 +4438,7 @@ static struct clk_branch gcc_gp3_clk = { +@@ -4352,13 +4446,7 @@ static struct clk_branch gcc_gp3_clk = { }, }; @@ -144,8 +144,8 @@ Signed-off-by: Rajkumar Ayyasamy .cmd_rcgr = 0x75070, .freq_tbl = ftbl_pcie_rchng_clk_src, .hid_width = 5, -@@ -4399,6 +4487,114 @@ static struct clk_branch gcc_pcie0_axi_s - }, +@@ -4434,6 +4522,114 @@ static struct clk_branch gcc_pcie0_axi_s + .alpha_en_mask = BIT(24), }; +static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = { @@ -259,15 +259,15 @@ Signed-off-by: Rajkumar Ayyasamy static struct clk_hw *gcc_ipq8074_hws[] = { &gpll0_out_main_div2.hw, &gpll6_out_main_div2.hw, -@@ -4407,6 +4603,7 @@ static struct clk_hw *gcc_ipq8074_hws[] +@@ -4442,6 +4638,7 @@ static struct clk_hw *gcc_ipq8074_hws[] &gcc_xo_div4_clk_src.hw, &nss_noc_clk_src.hw, &nss_ppe_cdiv_clk_src.hw, + &qdss_dap_sync_clk_src.hw, }; - static const struct alpha_pll_config ubi32_pll_config = { -@@ -4665,6 +4862,15 @@ static struct clk_regmap *gcc_ipq8074_cl + static struct clk_regmap *gcc_ipq8074_clks[] = { +@@ -4673,6 +4870,15 @@ static struct clk_regmap *gcc_ipq8074_cl [GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr, [GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr, [GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr, @@ -283,7 +283,7 @@ Signed-off-by: Rajkumar Ayyasamy }; static const struct qcom_reset_map gcc_ipq8074_resets[] = { -@@ -4801,6 +5007,20 @@ static const struct qcom_reset_map gcc_i +@@ -4809,6 +5015,20 @@ static const struct qcom_reset_map gcc_i [GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, [GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, [GCC_WCSSAON_RESET] = { 0x59010, 0 }, diff --git a/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch b/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch index 978aa4e66660f3..97b847ee48aa05 100644 --- a/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch +++ b/target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch @@ -16,7 +16,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan --- a/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -4488,10 +4488,10 @@ static struct clk_branch gcc_pcie0_axi_s +@@ -4523,10 +4523,10 @@ static struct clk_branch gcc_pcie0_axi_s }; static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = { @@ -29,7 +29,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan .enable_mask = BIT(0), .hw.init = &(struct clk_init_data){ .name = "gcc_snoc_bus_timeout2_ahb_clk", -@@ -4506,10 +4506,10 @@ static struct clk_branch gcc_snoc_bus_ti +@@ -4541,10 +4541,10 @@ static struct clk_branch gcc_snoc_bus_ti }; static struct clk_branch gcc_snoc_bus_timeout3_ahb_clk = { diff --git a/target/linux/ipq807x/patches-5.10/128-qcom-clk-ipq8074-fix-port-6-clock-issue-for-1G.patch b/target/linux/ipq807x/patches-5.10/128-qcom-clk-ipq8074-fix-port-6-clock-issue-for-1G.patch deleted file mode 100644 index 5f648d341bbdd0..00000000000000 --- a/target/linux/ipq807x/patches-5.10/128-qcom-clk-ipq8074-fix-port-6-clock-issue-for-1G.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d4f5b0945dd4ec3638009fca0b4d13098155dca9 Mon Sep 17 00:00:00 2001 -From: zhongjia -Date: Thu, 13 Aug 2020 00:38:46 +0800 -Subject: [PATCH 6/8] qcom: clk: ipq8074: fix port 6 clock issue for 1G - -Change-Id: I279321a33f77404f75d4c60c607892df36fb25be -Signed-off-by: zhongjia ---- - drivers/clk/qcom/gcc-ipq8074.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/clk/qcom/gcc-ipq8074.c -+++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -1889,8 +1889,10 @@ static struct clk_regmap_div nss_port5_t - - static const struct freq_tbl ftbl_nss_port6_rx_clk_src[] = { - F(19200000, P_XO, 1, 0, 0), -+ F(25000000, P_UNIPHY2_RX, 5, 0, 0), - F(25000000, P_UNIPHY2_RX, 12.5, 0, 0), - F(78125000, P_UNIPHY2_RX, 4, 0, 0), -+ F(125000000, P_UNIPHY2_RX, 1, 0, 0), - F(125000000, P_UNIPHY2_RX, 2.5, 0, 0), - F(156250000, P_UNIPHY2_RX, 2, 0, 0), - F(312500000, P_UNIPHY2_RX, 1, 0, 0), -@@ -1929,8 +1931,10 @@ static struct clk_regmap_div nss_port6_r - - static const struct freq_tbl ftbl_nss_port6_tx_clk_src[] = { - F(19200000, P_XO, 1, 0, 0), -+ F(25000000, P_UNIPHY2_TX, 5, 0, 0), - F(25000000, P_UNIPHY2_TX, 12.5, 0, 0), - F(78125000, P_UNIPHY2_TX, 4, 0, 0), -+ F(125000000, P_UNIPHY2_TX, 1, 0, 0), - F(125000000, P_UNIPHY2_TX, 2.5, 0, 0), - F(156250000, P_UNIPHY2_TX, 2, 0, 0), - F(312500000, P_UNIPHY2_TX, 1, 0, 0), diff --git a/target/linux/ipq807x/patches-5.10/129-clk-qcom-ipq8074-Add-NSS-PORT-clocks-frequencies.patch b/target/linux/ipq807x/patches-5.10/129-clk-qcom-ipq8074-Add-NSS-PORT-clocks-frequencies.patch deleted file mode 100644 index 174db4bdec89ad..00000000000000 --- a/target/linux/ipq807x/patches-5.10/129-clk-qcom-ipq8074-Add-NSS-PORT-clocks-frequencies.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6cc04849eea4d87b3b274cc900c6a14a1ac866f5 Mon Sep 17 00:00:00 2001 -From: Praveenkumar I -Date: Wed, 12 Jul 2017 21:42:11 +0530 -Subject: [PATCH 7/8] clk: qcom: ipq8074: Add NSS PORT clocks frequencies - -The port clock uses different frequency which depends upon -ethernet PHY mode. - -Signed-off-by: Abhishek Sahu -(cherry picked from commit ae5f033e8929d0ffc34320c89b5683f801c3121c) -Signed-off-by: Praveenkumar I - -Change-Id: I7f5d24bc400b3c35d68ef08ae73ab8395b7dd87b ---- - drivers/clk/qcom/gcc-ipq8074.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/clk/qcom/gcc-ipq8074.c -+++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -1810,8 +1810,10 @@ static struct clk_regmap_div nss_port4_t - static const struct freq_tbl ftbl_nss_port5_rx_clk_src[] = { - F(19200000, P_XO, 1, 0, 0), - F(25000000, P_UNIPHY1_RX, 12.5, 0, 0), -+ F(25000000, P_UNIPHY0_RX, 5, 0, 0), - F(78125000, P_UNIPHY1_RX, 4, 0, 0), - F(125000000, P_UNIPHY1_RX, 2.5, 0, 0), -+ F(125000000, P_UNIPHY0_RX, 1, 0, 0), - F(156250000, P_UNIPHY1_RX, 2, 0, 0), - F(312500000, P_UNIPHY1_RX, 1, 0, 0), - { } -@@ -1849,8 +1851,10 @@ static struct clk_regmap_div nss_port5_r - - static const struct freq_tbl ftbl_nss_port5_tx_clk_src[] = { - F(19200000, P_XO, 1, 0, 0), -+ F(25000000, P_UNIPHY0_TX, 5, 0, 0), - F(25000000, P_UNIPHY1_TX, 12.5, 0, 0), - F(78125000, P_UNIPHY1_TX, 4, 0, 0), -+ F(125000000, P_UNIPHY0_TX, 1, 0, 0), - F(125000000, P_UNIPHY1_TX, 2.5, 0, 0), - F(156250000, P_UNIPHY1_TX, 2, 0, 0), - F(312500000, P_UNIPHY1_TX, 1, 0, 0), diff --git a/target/linux/ipq807x/patches-5.10/130-clk-qcom-ipq8074-change-freq-table-for-port5_tx_clk_.patch b/target/linux/ipq807x/patches-5.10/130-clk-qcom-ipq8074-change-freq-table-for-port5_tx_clk_.patch deleted file mode 100644 index ad02baa6ed4182..00000000000000 --- a/target/linux/ipq807x/patches-5.10/130-clk-qcom-ipq8074-change-freq-table-for-port5_tx_clk_.patch +++ /dev/null @@ -1,38 +0,0 @@ -From be45ad064b7afdbc1e4f36c5a04c27cc364900c2 Mon Sep 17 00:00:00 2001 -From: Praveenkumar I -Date: Tue, 7 Nov 2017 15:03:52 +0530 -Subject: [PATCH 8/8] clk: qcom: ipq8074: change freq table for - port5_tx_clk_src - -Originally QCOM clock framework assumes that there will be -only one entry for each freq but in port5, the same freq can be -supplied by 2 sources, uniphy0 and uniphy1. We need to move -uniphy1 above uniphy0 in frequency table so that uniphy1 will be -selected instead of uniphy0 if uniphy0 is running in -125 Mhz and uniphy1 is running in 312 Mhz. - -Signed-off-by: Abhishek Sahu -(cherry picked from commit 559fcf09e9681f7d1fcbd981a5de7957ffb3e496) -Signed-off-by: Praveenkumar I - -Change-Id: I91c17714922afc1ef4cdb5e6e47e2e813e2e9777 ---- - drivers/clk/qcom/gcc-ipq8074.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/clk/qcom/gcc-ipq8074.c -+++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -1851,11 +1851,11 @@ static struct clk_regmap_div nss_port5_r - - static const struct freq_tbl ftbl_nss_port5_tx_clk_src[] = { - F(19200000, P_XO, 1, 0, 0), -- F(25000000, P_UNIPHY0_TX, 5, 0, 0), - F(25000000, P_UNIPHY1_TX, 12.5, 0, 0), -+ F(25000000, P_UNIPHY0_TX, 5, 0, 0), - F(78125000, P_UNIPHY1_TX, 4, 0, 0), -- F(125000000, P_UNIPHY0_TX, 1, 0, 0), - F(125000000, P_UNIPHY1_TX, 2.5, 0, 0), -+ F(125000000, P_UNIPHY0_TX, 1, 0, 0), - F(156250000, P_UNIPHY1_TX, 2, 0, 0), - F(312500000, P_UNIPHY1_TX, 1, 0, 0), - { } diff --git a/target/linux/ipq807x/patches-5.10/145-clk-qcom-ipq8074-disable-SW_COLLAPSE-for-USB-GDSCR-s.patch b/target/linux/ipq807x/patches-5.10/145-clk-qcom-ipq8074-disable-SW_COLLAPSE-for-USB-GDSCR-s.patch index 47abf9e03c3410..a35ef1f43b635a 100644 --- a/target/linux/ipq807x/patches-5.10/145-clk-qcom-ipq8074-disable-SW_COLLAPSE-for-USB-GDSCR-s.patch +++ b/target/linux/ipq807x/patches-5.10/145-clk-qcom-ipq8074-disable-SW_COLLAPSE-for-USB-GDSCR-s.patch @@ -15,9 +15,9 @@ Change-Id: I17beca334be79d738a35587860847aa0b1f96fa9 --- a/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -5063,6 +5063,11 @@ static int gcc_ipq8074_probe(struct plat - if (IS_ERR(regmap)) - return PTR_ERR(regmap); +@@ -5066,6 +5066,11 @@ static int gcc_ipq8074_probe(struct plat + /* SW Workaround for UBI32 Huayra PLL */ + regmap_update_bits(regmap, 0x2501c, BIT(26), BIT(26)); + /* Disable SW_COLLAPSE for USB0 GDSCR */ + regmap_update_bits(regmap, 0x3e078, BIT(0), 0x0); diff --git a/target/linux/ipq807x/patches-5.10/146-clk-qcom-ipq8074-SW-workaround-for-UBI-PLL-lock.patch b/target/linux/ipq807x/patches-5.10/146-clk-qcom-ipq8074-SW-workaround-for-UBI-PLL-lock.patch index c90462e0f86535..a9a2a6ce07a136 100644 --- a/target/linux/ipq807x/patches-5.10/146-clk-qcom-ipq8074-SW-workaround-for-UBI-PLL-lock.patch +++ b/target/linux/ipq807x/patches-5.10/146-clk-qcom-ipq8074-SW-workaround-for-UBI-PLL-lock.patch @@ -34,7 +34,7 @@ Signed-off-by: Abhishek Sahu --- a/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c -@@ -5068,6 +5068,9 @@ static int gcc_ipq8074_probe(struct plat +@@ -5071,6 +5071,9 @@ static int gcc_ipq8074_probe(struct plat /* Disable SW_COLLAPSE for USB1 GDSCR */ regmap_update_bits(regmap, 0x3f078, BIT(0), 0x0); diff --git a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch index 7f9e336a84cd58..c05c220d988f57 100644 --- a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch @@ -608,7 +608,7 @@ struct fib_table *tb; --- a/include/net/addrconf.h +++ b/include/net/addrconf.h -@@ -503,4 +503,9 @@ int if6_proc_init(void); +@@ -506,4 +506,9 @@ int if6_proc_init(void); void if6_proc_exit(void); #endif @@ -620,7 +620,7 @@ #endif --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -7274,3 +7274,35 @@ void addrconf_cleanup(void) +@@ -7270,3 +7270,35 @@ void addrconf_cleanup(void) destroy_workqueue(addrconf_wq); } @@ -699,7 +699,7 @@ out: fib6_info_release(rt); return err; -@@ -6180,6 +6190,20 @@ static int ip6_route_dev_notify(struct n +@@ -6187,6 +6197,20 @@ static int ip6_route_dev_notify(struct n return NOTIFY_OK; } From c5fdfb9edb130c479904624613c7a8347600f526 Mon Sep 17 00:00:00 2001 From: lean Date: Thu, 25 Aug 2022 02:10:35 +0800 Subject: [PATCH 17/18] rockchip: add sdhi pinctrl for nanopi5 --- .../arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts b/target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts index 5b3e2cb135d445..3cda9452dc6edd 100644 --- a/target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts +++ b/target/linux/rockchip/files-5.19/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts @@ -16,6 +16,10 @@ ethernet0 = &gmac0; mmc0 = &sdmmc0; mmc1 = &sdhci; + led-boot = &sys_led; + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; }; chosen: chosen { @@ -700,10 +704,10 @@ &sdhci { bus-width = <8>; - no-sdio; - no-sd; non-removable; max-frequency = <200000000>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; status = "okay"; }; From d496bf88a4c726e938f027088227a058f37b3092 Mon Sep 17 00:00:00 2001 From: lean Date: Thu, 25 Aug 2022 02:55:42 +0800 Subject: [PATCH 18/18] mac80211: fix ath10k 5.19 support --- .../mac80211/patches/ath10k/991-ath10k-5.19.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 package/kernel/mac80211/patches/ath10k/991-ath10k-5.19.patch diff --git a/package/kernel/mac80211/patches/ath10k/991-ath10k-5.19.patch b/package/kernel/mac80211/patches/ath10k/991-ath10k-5.19.patch new file mode 100644 index 00000000000000..31169747c96556 --- /dev/null +++ b/package/kernel/mac80211/patches/ath10k/991-ath10k-5.19.patch @@ -0,0 +1,14 @@ +--- a/drivers/net/wireless/ath/ath10k/core.c ++++ b/drivers/net/wireless/ath/ath10k/core.c +@@ -3333,7 +3333,11 @@ + ath10k_debug_print_board_info(ar); + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) + device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr)); ++#else ++ device_get_mac_address(ar->dev, ar->mac_addr); ++#endif + + of_get_mac_address(ar->dev->of_node, ar->mac_addr); +