diff options
Diffstat (limited to 'meta-arm/recipes-kernel/linux')
15 files changed, 48 insertions, 889 deletions
diff --git a/meta-arm/recipes-kernel/linux/arm-ffa-transport.inc b/meta-arm/recipes-kernel/linux/arm-ffa-transport.inc new file mode 100644 index 00000000..b3d377b4 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/arm-ffa-transport.inc @@ -0,0 +1,6 @@ +FILESEXTRAPATHS:prepend := "${ARMFILESPATHS}" + +# Enable ARM-FFA transport +SRC_URI:append = " \ + file://arm-ffa-transport.cfg \ + " diff --git a/meta-arm/recipes-kernel/linux/files/arm-ffa-transport.cfg b/meta-arm/recipes-kernel/linux/files/arm-ffa-transport.cfg new file mode 100644 index 00000000..34de78e8 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/arm-ffa-transport.cfg @@ -0,0 +1 @@ +CONFIG_ARM_FFA_TRANSPORT=y diff --git a/meta-arm/recipes-kernel/linux/files/efi.cfg b/meta-arm/recipes-kernel/linux/files/efi.cfg new file mode 100644 index 00000000..00be1bc6 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/efi.cfg @@ -0,0 +1,2 @@ +CONFIG_ACPI=y +CONFIG_EFI=y diff --git a/meta-arm/recipes-kernel/linux/files/no-strict-devmem.cfg b/meta-arm/recipes-kernel/linux/files/no-strict-devmem.cfg new file mode 100644 index 00000000..d372acae --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/no-strict-devmem.cfg @@ -0,0 +1 @@ +CONFIG_STRICT_DEVMEM=n diff --git a/meta-arm/recipes-kernel/linux/files/tee.cfg b/meta-arm/recipes-kernel/linux/files/tee.cfg new file mode 100644 index 00000000..53c452d4 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/tee.cfg @@ -0,0 +1,11 @@ +CONFIG_HW_RANDOM_OPTEE=y +CONFIG_TEE=y + +# +# TEE drivers +# +CONFIG_OPTEE=y +# end of TEE drivers + +CONFIG_TCG_TPM=y +CONFIG_TCG_FTPM_TEE=y diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack.inc b/meta-arm/recipes-kernel/linux/linux-arm64-ack.inc deleted file mode 100644 index a9d561b2..00000000 --- a/meta-arm/recipes-kernel/linux/linux-arm64-ack.inc +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (c) 2020 Arm Limited -# - -DESCRIPTION = "Linux Android Common Kernel" -SECTION = "kernel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -require recipes-kernel/linux/linux-yocto.inc - -COMPATIBLE_MACHINE ?= "invalid" - -ARCH = "arm64" - -S = "${WORKDIR}/git" - -LINUX_VERSION ?= "${PV}" -KERNEL_VERSION_SANITY_SKIP = "1" -KBRANCH = "" diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch b/meta-arm/recipes-kernel/linux/linux-arm64-ack/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch deleted file mode 100644 index 94ab4357..00000000 --- a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch +++ /dev/null @@ -1,69 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 28c69b683210b5d5321ceb71e44a77bc31a32c8a Mon Sep 17 00:00:00 2001 -From: Leo Yan <leo.yan@linaro.org> -Date: Tue, 5 May 2020 21:36:42 +0800 -Subject: [PATCH 1/4] perf cs-etm: Move definition of 'traceid_list' global - variable from header file - -The variable 'traceid_list' is defined in the header file cs-etm.h, -if multiple C files include cs-etm.h the compiler might complaint for -multiple definition of 'traceid_list'. - -To fix multiple definition error, move the definition of 'traceid_list' -into cs-etm.c. - -Fixes: cd8bfd8c973e ("perf tools: Add processing of coresight metadata") -Reported-by: Thomas Backlund <tmb@mageia.org> -Signed-off-by: Leo Yan <leo.yan@linaro.org> -Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> -Reviewed-by: Mike Leach <mike.leach@linaro.org> -Tested-by: Mike Leach <mike.leach@linaro.org> -Tested-by: Thomas Backlund <tmb@mageia.org> -Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> -Cc: Jiri Olsa <jolsa@redhat.com> -Cc: Mark Rutland <mark.rutland@arm.com> -Cc: Namhyung Kim <namhyung@kernel.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Suzuki Poulouse <suzuki.poulose@arm.com> -Cc: Tor Jeremiassen <tor@ti.com> -Cc: linux-arm-kernel@lists.infradead.org -Link: http://lore.kernel.org/lkml/20200505133642.4756-1-leo.yan@linaro.org -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> ---- - tools/perf/util/cs-etm.c | 3 +++ - tools/perf/util/cs-etm.h | 3 --- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c -index f5f855fff412..50de6a1ed0ce 100644 ---- a/tools/perf/util/cs-etm.c -+++ b/tools/perf/util/cs-etm.c -@@ -94,6 +94,9 @@ struct cs_etm_queue { - struct cs_etm_traceid_queue **traceid_queues; - }; - -+/* RB tree for quick conversion between traceID and metadata pointers */ -+static struct intlist *traceid_list; -+ - static int cs_etm__update_queues(struct cs_etm_auxtrace *etm); - static int cs_etm__process_queues(struct cs_etm_auxtrace *etm); - static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm, -diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h -index 650ecc2a6349..4ad925d6d799 100644 ---- a/tools/perf/util/cs-etm.h -+++ b/tools/perf/util/cs-etm.h -@@ -114,9 +114,6 @@ enum cs_etm_isa { - CS_ETM_ISA_T32, - }; - --/* RB tree for quick conversion between traceID and metadata pointers */ --struct intlist *traceid_list; -- - struct cs_etm_queue; - - struct cs_etm_packet { --- -2.25.1 - diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0002-perf-tests-bp_account-Make-global-variable-static.patch b/meta-arm/recipes-kernel/linux/linux-arm64-ack/0002-perf-tests-bp_account-Make-global-variable-static.patch deleted file mode 100644 index 142d4b7c..00000000 --- a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0002-perf-tests-bp_account-Make-global-variable-static.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From b28dc646b4c5cd3844bd591af841494dd1de0a9f Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo <acme@redhat.com> -Date: Mon, 2 Mar 2020 11:13:19 -0300 -Subject: [PATCH 2/4] perf tests bp_account: Make global variable static - -To fix the build with newer gccs, that without this patch exit with: - - LD /tmp/build/perf/tests/perf-in.o - ld: /tmp/build/perf/tests/bp_account.o:/git/perf/tools/perf/tests/bp_account.c:22: multiple definition of `the_var'; /tmp/build/perf/tests/bp_signal.o:/git/perf/tools/perf/tests/bp_signal.c:38: first defined here - make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/tests/perf-in.o] Error 1 - -First noticed in fedora:rawhide/32 with: - - [perfbuilder@a5ff49d6e6e4 ~]$ gcc --version - gcc (GCC) 10.0.1 20200216 (Red Hat 10.0.1-0.8) - -Reported-by: Jiri Olsa <jolsa@kernel.org> -Cc: Adrian Hunter <adrian.hunter@intel.com> -Cc: Namhyung Kim <namhyung@kernel.org> -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> ---- - tools/perf/tests/bp_account.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/perf/tests/bp_account.c b/tools/perf/tests/bp_account.c -index 016bba2c142d..55a9de311d7b 100644 ---- a/tools/perf/tests/bp_account.c -+++ b/tools/perf/tests/bp_account.c -@@ -23,7 +23,7 @@ - #include "../perf-sys.h" - #include "cloexec.h" - --volatile long the_var; -+static volatile long the_var; - - static noinline int test_function(void) - { --- -2.25.1 - diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch b/meta-arm/recipes-kernel/linux/linux-arm64-ack/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch deleted file mode 100644 index 965cc384..00000000 --- a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0003-perf-bench-Share-some-global-variables-to-fix-build-.patch +++ /dev/null @@ -1,240 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From e6ae6031755b6781af42af28f11186bb18e94842 Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo <acme@redhat.com> -Date: Mon, 2 Mar 2020 12:09:38 -0300 -Subject: [PATCH 3/4] perf bench: Share some global variables to fix build with - gcc 10 - -Noticed with gcc 10 (fedora rawhide) that those variables were not being -declared as static, so end up with: - - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/bench/perf-in.o] Error 1 - -Prefix those with bench__ and add them to bench/bench.h, so that we can -share those on the tools needing to access those variables from signal -handlers. - -Acked-by: Thomas Gleixner <tglx@linutronix.de> -Cc: Adrian Hunter <adrian.hunter@intel.com> -Cc: Davidlohr Bueso <dave@stgolabs.net> -Cc: Jiri Olsa <jolsa@kernel.org> -Cc: Namhyung Kim <namhyung@kernel.org> -Link: http://lore.kernel.org/lkml/20200303155811.GD13702@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> ---- - tools/perf/bench/bench.h | 4 ++++ - tools/perf/bench/epoll-ctl.c | 7 +++---- - tools/perf/bench/epoll-wait.c | 11 +++++------ - tools/perf/bench/futex-hash.c | 12 ++++++------ - tools/perf/bench/futex-lock-pi.c | 11 +++++------ - 5 files changed, 23 insertions(+), 22 deletions(-) - -diff --git a/tools/perf/bench/bench.h b/tools/perf/bench/bench.h -index fddb3ced9db6..4aa6de1aa67d 100644 ---- a/tools/perf/bench/bench.h -+++ b/tools/perf/bench/bench.h -@@ -2,6 +2,10 @@ - #ifndef BENCH_H - #define BENCH_H - -+#include <sys/time.h> -+ -+extern struct timeval bench__start, bench__end, bench__runtime; -+ - /* - * The madvise transparent hugepage constants were added in glibc - * 2.13. For compatibility with older versions of glibc, define these -diff --git a/tools/perf/bench/epoll-ctl.c b/tools/perf/bench/epoll-ctl.c -index bb617e568841..a7526c05df38 100644 ---- a/tools/perf/bench/epoll-ctl.c -+++ b/tools/perf/bench/epoll-ctl.c -@@ -35,7 +35,6 @@ - - static unsigned int nthreads = 0; - static unsigned int nsecs = 8; --struct timeval start, end, runtime; - static bool done, __verbose, randomize; - - /* -@@ -94,8 +93,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void nest_epollfd(void) -@@ -361,7 +360,7 @@ int bench_epoll_ctl(int argc, const char **argv) - - threads_starting = nthreads; - -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - - do_threads(worker, cpu); - -diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c -index 7af694437f4e..d1c5cb526b9f 100644 ---- a/tools/perf/bench/epoll-wait.c -+++ b/tools/perf/bench/epoll-wait.c -@@ -90,7 +90,6 @@ - - static unsigned int nthreads = 0; - static unsigned int nsecs = 8; --struct timeval start, end, runtime; - static bool wdone, done, __verbose, randomize, nonblocking; - - /* -@@ -276,8 +275,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void print_summary(void) -@@ -287,7 +286,7 @@ static void print_summary(void) - - printf("\nAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - static int do_threads(struct worker *worker, struct perf_cpu_map *cpu) -@@ -479,7 +478,7 @@ int bench_epoll_wait(int argc, const char **argv) - - threads_starting = nthreads; - -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - - do_threads(worker, cpu); - -@@ -519,7 +518,7 @@ int bench_epoll_wait(int argc, const char **argv) - qsort(worker, nthreads, sizeof(struct worker), cmpworker); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - - update_stats(&throughput_stats, t); - -diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c -index 8ba0c3330a9a..21776862e940 100644 ---- a/tools/perf/bench/futex-hash.c -+++ b/tools/perf/bench/futex-hash.c -@@ -37,7 +37,7 @@ static unsigned int nfutexes = 1024; - static bool fshared = false, done = false, silent = false; - static int futex_flag = 0; - --struct timeval start, end, runtime; -+struct timeval bench__start, bench__end, bench__runtime; - static pthread_mutex_t thread_lock; - static unsigned int threads_starting; - static struct stats throughput_stats; -@@ -103,8 +103,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void print_summary(void) -@@ -114,7 +114,7 @@ static void print_summary(void) - - printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - int bench_futex_hash(int argc, const char **argv) -@@ -161,7 +161,7 @@ int bench_futex_hash(int argc, const char **argv) - - threads_starting = nthreads; - pthread_attr_init(&thread_attr); -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - for (i = 0; i < nthreads; i++) { - worker[i].tid = i; - worker[i].futex = calloc(nfutexes, sizeof(*worker[i].futex)); -@@ -204,7 +204,7 @@ int bench_futex_hash(int argc, const char **argv) - pthread_mutex_destroy(&thread_lock); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - update_stats(&throughput_stats, t); - if (!silent) { - if (nfutexes == 1) -diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c -index d0cae8125423..30d97121dc4f 100644 ---- a/tools/perf/bench/futex-lock-pi.c -+++ b/tools/perf/bench/futex-lock-pi.c -@@ -37,7 +37,6 @@ static bool silent = false, multi = false; - static bool done = false, fshared = false; - static unsigned int nthreads = 0; - static int futex_flag = 0; --struct timeval start, end, runtime; - static pthread_mutex_t thread_lock; - static unsigned int threads_starting; - static struct stats throughput_stats; -@@ -64,7 +63,7 @@ static void print_summary(void) - - printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - static void toggle_done(int sig __maybe_unused, -@@ -73,8 +72,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void *workerfn(void *arg) -@@ -185,7 +184,7 @@ int bench_futex_lock_pi(int argc, const char **argv) - - threads_starting = nthreads; - pthread_attr_init(&thread_attr); -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - - create_threads(worker, thread_attr, cpu); - pthread_attr_destroy(&thread_attr); -@@ -211,7 +210,7 @@ int bench_futex_lock_pi(int argc, const char **argv) - pthread_mutex_destroy(&thread_lock); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - - update_stats(&throughput_stats, t); - if (!silent) --- -2.25.1 - diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0004-libtraceevent-Fix-build-with-binutils-2.35.patch b/meta-arm/recipes-kernel/linux/linux-arm64-ack/0004-libtraceevent-Fix-build-with-binutils-2.35.patch deleted file mode 100644 index 5e181577..00000000 --- a/meta-arm/recipes-kernel/linux/linux-arm64-ack/0004-libtraceevent-Fix-build-with-binutils-2.35.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From c2c2c58915def6cda401d1782048d23b2b02ed85 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sat, 25 Jul 2020 02:06:23 +0100 -Subject: [PATCH 4/4] libtraceevent: Fix build with binutils 2.35 - -In binutils 2.35, 'nm -D' changed to show symbol versions along with -symbol names, with the usual @@ separator. When generating -libtraceevent-dynamic-list we need just the names, so strip off the -version suffix if present. - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Tested-by: Salvatore Bonaccorso <carnil@debian.org> -Reviewed-by: Steven Rostedt <rostedt@goodmis.org> -Cc: linux-trace-devel@vger.kernel.org -Cc: stable@vger.kernel.org -Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> ---- - tools/lib/traceevent/plugins/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile -index f440989fa55e..23c3535bcbd6 100644 ---- a/tools/lib/traceevent/plugins/Makefile -+++ b/tools/lib/traceevent/plugins/Makefile -@@ -196,7 +196,7 @@ define do_generate_dynamic_list_file - xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ - if [ "$$symbol_type" = "U W" ];then \ - (echo '{'; \ -- $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ -+ $(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\ - echo '};'; \ - ) > $2; \ - else \ --- -2.25.1 - diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb b/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb deleted file mode 100644 index aab2fd1c..00000000 --- a/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright (c) 2020 Arm Limited -# -require linux-arm64-ack.inc - -SRC_URI = " \ - git://android.googlesource.com/kernel/common.git;protocol=https;branch=android11-5.4-lts \ - file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \ - file://0002-perf-tests-bp_account-Make-global-variable-static.patch \ - file://0003-perf-bench-Share-some-global-variables-to-fix-build-.patch \ - file://0004-libtraceevent-Fix-build-with-binutils-2.35.patch \ - " - -# ASB-2020-07-05_5.4-stable tag commit -SRCREV = "056684c0d252f75c13be4abb7408f692eedab653" diff --git a/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend new file mode 100644 index 00000000..a287d0e1 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend @@ -0,0 +1,27 @@ +ARMFILESPATHS := "${THISDIR}/files:" + +FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}" +SRC_URI:append:qemuarm64-secureboot = " \ + file://tee.cfg \ + " + +# for Trusted Services uefi-test tool if SMM-Gateway is included +SRC_URI:append:qemuarm64-secureboot = "\ + ${@bb.utils.contains('MACHINE_FEATURES', 'ts-smm-gateway', 'file://no-strict-devmem.cfg', '' , d)} \ + " + +FILESEXTRAPATHS:prepend:qemuarm-secureboot = "${ARMFILESPATHS}" +SRC_URI:append:qemuarm-secureboot = " \ + file://tee.cfg \ + " + +FILESEXTRAPATHS:prepend:qemuarm64 = "${ARMFILESPATHS}" +SRC_URI:append:qemuarm64 = " file://efi.cfg" + +FILESEXTRAPATHS:prepend:qemuarm = "${ARMFILESPATHS}" +SRC_URI:append:qemuarm = " \ + file://efi.cfg \ + " + +FFA_TRANSPORT_INCLUDE = "${@bb.utils.contains('MACHINE_FEATURES', 'arm-ffa', 'arm-ffa-transport.inc', '' , d)}" +require ${FFA_TRANSPORT_INCLUDE} diff --git a/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch b/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch deleted file mode 100644 index afbbabe2..00000000 --- a/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch +++ /dev/null @@ -1,318 +0,0 @@ -From c72967164b63ea16c7c0276a306b66797998b62a Mon Sep 17 00:00:00 2001 -From: Jon Mason <jdmason@kudzu.us> -Date: Sat, 1 May 2021 17:18:37 -0400 -Subject: [PATCH] Change USB_CONN_GPIO to 'y' by default and regenerate the - defconfig via `make savedefconfig`. - -Upstream-Status: Inappropriate [not needed in newer kernels] -Signed-off-by: Jon Mason <jon.mason@arm.com> ---- - arch/arm64/configs/defconfig | 65 +++++++++++++----------------------- - 1 file changed, 24 insertions(+), 41 deletions(-) - -diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 6d84761d1285..8a2f7e075ba9 100644 ---- a/arch/arm64/configs/defconfig -+++ b/arch/arm64/configs/defconfig -@@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y - CONFIG_NUMA_BALANCING=y - CONFIG_MEMCG=y --CONFIG_MEMCG_SWAP=y - CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_HUGETLB=y -@@ -65,7 +64,6 @@ CONFIG_ARM64_VA_BITS_48=y - CONFIG_SCHED_MC=y - CONFIG_SCHED_SMT=y - CONFIG_NUMA=y --CONFIG_SECCOMP=y - CONFIG_KEXEC=y - CONFIG_KEXEC_FILE=y - CONFIG_CRASH_DUMP=y -@@ -83,7 +81,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m - CONFIG_CPU_FREQ_GOV_USERSPACE=y - CONFIG_CPU_FREQ_GOV_ONDEMAND=y - CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m --CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y - CONFIG_CPUFREQ_DT=y - CONFIG_ACPI_CPPC_CPUFREQ=m - CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m -@@ -105,7 +102,6 @@ CONFIG_IMX_SCU_PD=y - CONFIG_ACPI=y - CONFIG_ACPI_APEI=y - CONFIG_ACPI_APEI_GHES=y --CONFIG_PCIEAER=y - CONFIG_ACPI_APEI_PCIEAER=y - CONFIG_ACPI_APEI_MEMORY_FAILURE=y - CONFIG_ACPI_APEI_EINJ=y -@@ -181,12 +177,11 @@ CONFIG_QRTR_SMD=m - CONFIG_QRTR_TUN=m - CONFIG_BPF_JIT=y - CONFIG_CAN=m -+CONFIG_CAN_FLEXCAN=m - CONFIG_CAN_RCAR=m - CONFIG_CAN_RCAR_CANFD=m --CONFIG_CAN_FLEXCAN=m - CONFIG_BT=m - CONFIG_BT_HIDP=m --# CONFIG_BT_HS is not set - # CONFIG_BT_LE is not set - CONFIG_BT_LEDS=y - # CONFIG_BT_DEBUGFS is not set -@@ -206,6 +201,7 @@ CONFIG_NFC_NCI=m - CONFIG_NFC_S3FWRN5_I2C=m - CONFIG_PCI=y - CONFIG_PCIEPORTBUS=y -+CONFIG_PCIEAER=y - CONFIG_PCI_IOV=y - CONFIG_PCI_PASID=y - CONFIG_HOTPLUG_PCI=y -@@ -223,13 +219,13 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y - CONFIG_PCIE_ROCKCHIP_HOST=m - CONFIG_PCIE_BRCMSTB=m - CONFIG_PCI_LAYERSCAPE=y --CONFIG_PCIE_LAYERSCAPE_GEN4=y - CONFIG_PCI_HISI=y - CONFIG_PCIE_QCOM=y - CONFIG_PCIE_ARMADA_8K=y - CONFIG_PCIE_KIRIN=y - CONFIG_PCIE_HISI_STB=y - CONFIG_PCIE_TEGRA194_HOST=m -+CONFIG_PCIE_LAYERSCAPE_GEN4=y - CONFIG_PCI_ENDPOINT=y - CONFIG_PCI_ENDPOINT_CONFIGFS=y - CONFIG_PCI_EPF_TEST=m -@@ -239,7 +235,6 @@ CONFIG_FW_LOADER_USER_HELPER=y - CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y - CONFIG_HISILICON_LPC=y - CONFIG_SIMPLE_PM_BUS=y --CONFIG_FSL_MC_BUS=y - CONFIG_TEGRA_ACONNECT=m - CONFIG_MTD=y - CONFIG_MTD_BLOCK=y -@@ -258,7 +253,6 @@ CONFIG_MTD_NAND_MARVELL=y - CONFIG_MTD_NAND_FSL_IFC=y - CONFIG_MTD_NAND_QCOM=y - CONFIG_MTD_SPI_NOR=y --CONFIG_SPI_CADENCE_QUADSPI=y - CONFIG_BLK_DEV_LOOP=y - CONFIG_BLK_DEV_NBD=m - CONFIG_VIRTIO_BLK=y -@@ -343,18 +337,18 @@ CONFIG_SNI_NETSEC=y - CONFIG_STMMAC_ETH=m - CONFIG_TI_K3_AM65_CPSW_NUSS=y - CONFIG_QCOM_IPA=m --CONFIG_MDIO_BUS_MUX_MMIOREG=y --CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y -+CONFIG_MESON_GXL_PHY=m - CONFIG_AQUANTIA_PHY=y - CONFIG_MARVELL_PHY=m - CONFIG_MARVELL_10G_PHY=m --CONFIG_MESON_GXL_PHY=m - CONFIG_MICREL_PHY=y - CONFIG_MICROSEMI_PHY=y - CONFIG_AT803X_PHY=y - CONFIG_REALTEK_PHY=m - CONFIG_ROCKCHIP_PHY=y - CONFIG_VITESSE_PHY=y -+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y -+CONFIG_MDIO_BUS_MUX_MMIOREG=y - CONFIG_USB_PEGASUS=m - CONFIG_USB_RTL8150=m - CONFIG_USB_RTL8152=m -@@ -454,6 +448,7 @@ CONFIG_SPI=y - CONFIG_SPI_ARMADA_3700=y - CONFIG_SPI_BCM2835=m - CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_CADENCE_QUADSPI=y - CONFIG_SPI_FSL_LPSPI=y - CONFIG_SPI_FSL_QUADSPI=y - CONFIG_SPI_NXP_FLEXSPI=y -@@ -514,9 +509,6 @@ CONFIG_GPIO_PCA953X_IRQ=y - CONFIG_GPIO_BD9571MWV=m - CONFIG_GPIO_MAX77620=y - CONFIG_GPIO_SL28CPLD=m --CONFIG_POWER_AVS=y --CONFIG_QCOM_CPR=y --CONFIG_ROCKCHIP_IODOMAIN=y - CONFIG_POWER_RESET_MSM=y - CONFIG_POWER_RESET_XGENE=y - CONFIG_POWER_RESET_SYSCON=y -@@ -533,10 +525,10 @@ CONFIG_SENSORS_INA3221=m - CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y - CONFIG_CPU_THERMAL=y - CONFIG_THERMAL_EMULATION=y --CONFIG_QORIQ_THERMAL=m --CONFIG_SUN8I_THERMAL=y - CONFIG_IMX_SC_THERMAL=m - CONFIG_IMX8MM_THERMAL=m -+CONFIG_QORIQ_THERMAL=m -+CONFIG_SUN8I_THERMAL=y - CONFIG_ROCKCHIP_THERMAL=m - CONFIG_RCAR_THERMAL=y - CONFIG_RCAR_GEN3_THERMAL=y -@@ -553,7 +545,6 @@ CONFIG_WATCHDOG=y - CONFIG_SL28CPLD_WATCHDOG=m - CONFIG_ARM_SP805_WATCHDOG=y - CONFIG_ARM_SBSA_WATCHDOG=y --CONFIG_ARM_SMC_WATCHDOG=y - CONFIG_S3C2410_WATCHDOG=y - CONFIG_DW_WATCHDOG=y - CONFIG_SUNXI_WATCHDOG=m -@@ -562,6 +553,7 @@ CONFIG_IMX_SC_WDT=m - CONFIG_QCOM_WDT=m - CONFIG_MESON_GXBB_WATCHDOG=m - CONFIG_MESON_WATCHDOG=m -+CONFIG_ARM_SMC_WATCHDOG=y - CONFIG_RENESAS_WDT=y - CONFIG_UNIPHIER_WATCHDOG=y - CONFIG_BCM2835_WDT=y -@@ -608,13 +600,12 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y - CONFIG_MEDIA_ANALOG_TV_SUPPORT=y - CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y - CONFIG_MEDIA_SDR_SUPPORT=y --CONFIG_MEDIA_CONTROLLER=y --CONFIG_VIDEO_V4L2_SUBDEV_API=y - CONFIG_MEDIA_PLATFORM_SUPPORT=y - # CONFIG_DVB_NET is not set - CONFIG_MEDIA_USB_SUPPORT=y - CONFIG_USB_VIDEO_CLASS=m - CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_VIDEO_QCOM_CAMSS=m - CONFIG_VIDEO_RCAR_CSI2=m - CONFIG_VIDEO_RCAR_VIN=m - CONFIG_VIDEO_SUN6I_CSI=m -@@ -629,7 +620,6 @@ CONFIG_SDR_PLATFORM_DRIVERS=y - CONFIG_VIDEO_RCAR_DRIF=m - CONFIG_VIDEO_IMX219=m - CONFIG_VIDEO_OV5645=m --CONFIG_VIDEO_QCOM_CAMSS=m - CONFIG_DRM=m - CONFIG_DRM_I2C_NXP_TDA998X=m - CONFIG_DRM_MALI_DISPLAY=m -@@ -661,8 +651,8 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=m - CONFIG_DRM_PANEL_SITRONIX_ST7703=m - CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m - CONFIG_DRM_DISPLAY_CONNECTOR=m --CONFIG_DRM_NWL_MIPI_DSI=m - CONFIG_DRM_LONTIUM_LT9611=m -+CONFIG_DRM_NWL_MIPI_DSI=m - CONFIG_DRM_SII902X=m - CONFIG_DRM_SIMPLE_BRIDGE=m - CONFIG_DRM_THINE_THC63LVD1024=m -@@ -683,7 +673,6 @@ CONFIG_DRM_PANFROST=m - CONFIG_FB=y - CONFIG_FB_MODE_HELPERS=y - CONFIG_FB_EFI=y --CONFIG_BACKLIGHT_GENERIC=m - CONFIG_BACKLIGHT_PWM=m - CONFIG_BACKLIGHT_LP855X=m - CONFIG_LOGO=y -@@ -727,7 +716,6 @@ CONFIG_SND_SOC_WSA881X=m - CONFIG_SND_SIMPLE_CARD=m - CONFIG_SND_AUDIO_GRAPH_CARD=m - CONFIG_I2C_HID=m --CONFIG_USB_CONN_GPIO=m - CONFIG_USB=y - CONFIG_USB_OTG=y - CONFIG_USB_XHCI_HCD=y -@@ -859,7 +847,6 @@ CONFIG_VIRTIO_BALLOON=y - CONFIG_VIRTIO_MMIO=y - CONFIG_XEN_GNTDEV=y - CONFIG_XEN_GRANT_DEV_ALLOC=y --CONFIG_MFD_CROS_EC_DEV=y - CONFIG_CHROME_PLATFORMS=y - CONFIG_CROS_EC=y - CONFIG_CROS_EC_I2C=y -@@ -885,8 +872,8 @@ CONFIG_QCOM_A53PLL=y - CONFIG_QCOM_CLK_APCS_MSM8916=y - CONFIG_QCOM_CLK_SMD_RPM=y - CONFIG_QCOM_CLK_RPMH=y --CONFIG_IPQ_GCC_8074=y - CONFIG_IPQ_GCC_6018=y -+CONFIG_IPQ_GCC_8074=y - CONFIG_MSM_GCC_8916=y - CONFIG_MSM_GCC_8994=y - CONFIG_MSM_MMCC_8996=y -@@ -894,12 +881,9 @@ CONFIG_MSM_GCC_8998=y - CONFIG_QCS_GCC_404=y - CONFIG_SC_GCC_7180=y - CONFIG_SDM_CAMCC_845=m --CONFIG_SDM_GCC_845=y - CONFIG_SDM_GPUCC_845=y - CONFIG_SDM_VIDEOCC_845=y - CONFIG_SDM_DISPCC_845=y --CONFIG_SM_GCC_8150=y --CONFIG_SM_GCC_8250=y - CONFIG_SM_GPUCC_8150=y - CONFIG_SM_GPUCC_8250=y - CONFIG_QCOM_HFPLL=y -@@ -930,6 +914,7 @@ CONFIG_RASPBERRYPI_POWER=y - CONFIG_FSL_DPAA=y - CONFIG_FSL_MC_DPIO=y - CONFIG_QCOM_AOSS_QMP=y -+CONFIG_QCOM_CPR=y - CONFIG_QCOM_GENI_SE=y - CONFIG_QCOM_RMTFS_MEM=m - CONFIG_QCOM_RPMH=y -@@ -941,19 +926,20 @@ CONFIG_QCOM_SMP2P=y - CONFIG_QCOM_SMSM=y - CONFIG_QCOM_SOCINFO=m - CONFIG_QCOM_APR=m --CONFIG_ARCH_R8A774A1=y --CONFIG_ARCH_R8A774B1=y --CONFIG_ARCH_R8A774C0=y --CONFIG_ARCH_R8A774E1=y -+CONFIG_ARCH_R8A77995=y -+CONFIG_ARCH_R8A77990=y - CONFIG_ARCH_R8A77950=y - CONFIG_ARCH_R8A77951=y -+CONFIG_ARCH_R8A77965=y - CONFIG_ARCH_R8A77960=y - CONFIG_ARCH_R8A77961=y --CONFIG_ARCH_R8A77965=y --CONFIG_ARCH_R8A77970=y - CONFIG_ARCH_R8A77980=y --CONFIG_ARCH_R8A77990=y --CONFIG_ARCH_R8A77995=y -+CONFIG_ARCH_R8A77970=y -+CONFIG_ARCH_R8A774C0=y -+CONFIG_ARCH_R8A774E1=y -+CONFIG_ARCH_R8A774A1=y -+CONFIG_ARCH_R8A774B1=y -+CONFIG_ROCKCHIP_IODOMAIN=y - CONFIG_ROCKCHIP_PM_DOMAINS=y - CONFIG_ARCH_TEGRA_132_SOC=y - CONFIG_ARCH_TEGRA_210_SOC=y -@@ -1017,9 +1003,9 @@ CONFIG_PHY_UNIPHIER_USB3=y - CONFIG_PHY_TEGRA_XUSB=y - CONFIG_ARM_SMMU_V3_PMU=m - CONFIG_FSL_IMX8_DDR_PMU=m --CONFIG_HISI_PMU=y - CONFIG_QCOM_L2_PMU=y - CONFIG_QCOM_L3_PMU=y -+CONFIG_HISI_PMU=y - CONFIG_NVMEM_IMX_OCOTP=y - CONFIG_NVMEM_IMX_OCOTP_SCU=y - CONFIG_QCOM_QFPROM=y -@@ -1035,10 +1021,9 @@ CONFIG_FPGA_REGION=m - CONFIG_OF_FPGA_REGION=m - CONFIG_TEE=y - CONFIG_OPTEE=y --CONFIG_SLIMBUS=m -+CONFIG_MUX_MMIO=y - CONFIG_SLIM_QCOM_CTRL=m - CONFIG_SLIM_QCOM_NGD_CTRL=m --CONFIG_MUX_MMIO=y - CONFIG_INTERCONNECT=y - CONFIG_INTERCONNECT_QCOM=y - CONFIG_INTERCONNECT_QCOM_MSM8916=m -@@ -1059,7 +1044,6 @@ CONFIG_CUSE=m - CONFIG_OVERLAY_FS=m - CONFIG_VFAT_FS=y - CONFIG_HUGETLBFS=y --CONFIG_CONFIGFS_FS=y - CONFIG_EFIVAR_FS=y - CONFIG_SQUASHFS=y - CONFIG_NFS_FS=y diff --git a/meta-arm/recipes-kernel/linux/linux-yocto/zone_dma_revert.patch b/meta-arm/recipes-kernel/linux/linux-yocto/zone_dma_revert.patch deleted file mode 100644 index 12954162..00000000 --- a/meta-arm/recipes-kernel/linux/linux-yocto/zone_dma_revert.patch +++ /dev/null @@ -1,126 +0,0 @@ -Revert ZONE_DMA patches - -Upstream-Status: Inappropriate -Signed-off-by: Jon Mason <jon.mason@arm.com> - -diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 916e0547fdcc..7fbb9c85af8a 100644 ---- a/arch/arm64/mm/init.c -+++ b/arch/arm64/mm/init.c -@@ -29,7 +29,6 @@ - #include <linux/kexec.h> - #include <linux/crash_dump.h> - #include <linux/hugetlb.h> --#include <linux/acpi_iort.h> - - #include <asm/boot.h> - #include <asm/fixmap.h> -@@ -43,6 +42,8 @@ - #include <asm/tlb.h> - #include <asm/alternative.h> - -+#define ARM64_ZONE_DMA_BITS 30 -+ - /* - * We need to be able to catch inadvertent references to memstart_addr - * that occur (potentially in generic code) before arm64_memblock_init() -@@ -187,13 +188,9 @@ static phys_addr_t __init max_zone_phys(unsigned int zone_bits) - static void __init zone_sizes_init(unsigned long min, unsigned long max) - { - unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; -- unsigned int __maybe_unused acpi_zone_dma_bits; -- unsigned int __maybe_unused dt_zone_dma_bits; - - #ifdef CONFIG_ZONE_DMA -- acpi_zone_dma_bits = fls64(acpi_iort_dma_get_max_cpu_address()); -- dt_zone_dma_bits = fls64(of_dma_get_max_cpu_address(NULL)); -- zone_dma_bits = min3(32U, dt_zone_dma_bits, acpi_zone_dma_bits); -+ zone_dma_bits = ARM64_ZONE_DMA_BITS; - arm64_dma_phys_limit = max_zone_phys(zone_dma_bits); - max_zone_pfns[ZONE_DMA] = PFN_DOWN(arm64_dma_phys_limit); - #endif -diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c -index 2494138a6905..94f34109695c 100644 ---- a/drivers/acpi/arm64/iort.c -+++ b/drivers/acpi/arm64/iort.c -@@ -1730,58 +1730,3 @@ void __init acpi_iort_init(void) - - iort_init_platform_devices(); - } -- --#ifdef CONFIG_ZONE_DMA --/* -- * Extract the highest CPU physical address accessible to all DMA masters in -- * the system. PHYS_ADDR_MAX is returned when no constrained device is found. -- */ --phys_addr_t __init acpi_iort_dma_get_max_cpu_address(void) --{ -- phys_addr_t limit = PHYS_ADDR_MAX; -- struct acpi_iort_node *node, *end; -- struct acpi_table_iort *iort; -- acpi_status status; -- int i; -- -- if (acpi_disabled) -- return limit; -- -- status = acpi_get_table(ACPI_SIG_IORT, 0, -- (struct acpi_table_header **)&iort); -- if (ACPI_FAILURE(status)) -- return limit; -- -- node = ACPI_ADD_PTR(struct acpi_iort_node, iort, iort->node_offset); -- end = ACPI_ADD_PTR(struct acpi_iort_node, iort, iort->header.length); -- -- for (i = 0; i < iort->node_count; i++) { -- if (node >= end) -- break; -- -- switch (node->type) { -- struct acpi_iort_named_component *ncomp; -- struct acpi_iort_root_complex *rc; -- phys_addr_t local_limit; -- -- case ACPI_IORT_NODE_NAMED_COMPONENT: -- ncomp = (struct acpi_iort_named_component *)node->node_data; -- local_limit = DMA_BIT_MASK(ncomp->memory_address_limit); -- limit = min_not_zero(limit, local_limit); -- break; -- -- case ACPI_IORT_NODE_PCI_ROOT_COMPLEX: -- if (node->revision < 1) -- break; -- -- rc = (struct acpi_iort_root_complex *)node->node_data; -- local_limit = DMA_BIT_MASK(rc->memory_address_limit); -- limit = min_not_zero(limit, local_limit); -- break; -- } -- node = ACPI_ADD_PTR(struct acpi_iort_node, node, node->length); -- } -- acpi_put_table(&iort->header); -- return limit; --} --#endif -diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h -index 1a12baa58e40..20a32120bb88 100644 ---- a/include/linux/acpi_iort.h -+++ b/include/linux/acpi_iort.h -@@ -38,7 +38,6 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *size); - const struct iommu_ops *iort_iommu_configure_id(struct device *dev, - const u32 *id_in); - int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head); --phys_addr_t acpi_iort_dma_get_max_cpu_address(void); - #else - static inline void acpi_iort_init(void) { } - static inline u32 iort_msi_map_id(struct device *dev, u32 id) -@@ -56,9 +55,6 @@ static inline const struct iommu_ops *iort_iommu_configure_id( - static inline - int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head) - { return 0; } -- --static inline phys_addr_t acpi_iort_dma_get_max_cpu_address(void) --{ return PHYS_ADDR_MAX; } - #endif - - #endif /* __ACPI_IORT_H__ */ diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend deleted file mode 100644 index b9995e04..00000000 --- a/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -ARMFILESPATHS := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_generic-arm64 = "generic-arm64" -FILESEXTRAPATHS_prepend_generic-arm64 = "${ARMFILESPATHS}" -SRC_URI_append_generic-arm64 = " \ - file://defconfig.patch \ - " - -FILESEXTRAPATHS_prepend_qemuarm64-sbsa = "${ARMFILESPATHS}" -LINUX_VERSION_qemuarm64-sbsa = "5.10.30" -SRCREV_machine_qemuarm64-sbsa = "d6e20b2257ecfa6e796a45a4175863862a28fa11" -SRC_URI_append_qemuarm64-sbsa = " \ - file://defconfig.patch \ - " - -FILESEXTRAPATHS_prepend_qemuarm64-secureboot = "${ARMFILESPATHS}" -SRC_URI_append_qemuarm64-secureboot = " file://zone_dma_revert.patch" |