From patchwork Wed Oct 19 13:39:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 14016 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 507A3C4332F for ; Wed, 19 Oct 2022 13:40:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.8043.1666186795611891472 for ; Wed, 19 Oct 2022 06:39:55 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5CD6F1424; Wed, 19 Oct 2022 06:40:01 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AE2A73F7D8; Wed, 19 Oct 2022 06:39:54 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 1/3] arm-bsp: remove TC0 Date: Wed, 19 Oct 2022 14:39:50 +0100 Message-Id: <20221019133952.3018499-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Oct 2022 13:40:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3983 The Total Compute 2020 BSP is obsolete and unsupported, so remove it from meta-arm. The Total Compute team would like TC1 to be available in langdale, but removed in mickledore. Signed-off-by: Ross Burton --- .gitlab-ci.yml | 5 ----- ci/tc0.yml | 9 --------- meta-arm-bsp/conf/machine/tc0.conf | 7 ------- meta-arm-bsp/documentation/tc0.md | 32 ------------------------------ 4 files changed, 53 deletions(-) delete mode 100644 ci/tc0.yml delete mode 100644 meta-arm-bsp/conf/machine/tc0.conf delete mode 100644 meta-arm-bsp/documentation/tc0.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60c6ed91..98a95c13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,11 +188,6 @@ qemuarmv5: sgi575: extends: .build -tc0: - extends: .build - tags: - - x86_64 - tc1: extends: .build tags: diff --git a/ci/tc0.yml b/ci/tc0.yml deleted file mode 100644 index b2f75d55..00000000 --- a/ci/tc0.yml +++ /dev/null @@ -1,9 +0,0 @@ -header: - version: 11 - includes: - - ci/base.yml - -machine: tc0 - -target: - - tc-artifacts-image diff --git a/meta-arm-bsp/conf/machine/tc0.conf b/meta-arm-bsp/conf/machine/tc0.conf deleted file mode 100644 index b9c762d4..00000000 --- a/meta-arm-bsp/conf/machine/tc0.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for TC0 - -#@TYPE: Machine -#@NAME: TC0 -#@DESCRIPTION: Machine configuration for TC0 - -require conf/machine/include/tc.inc diff --git a/meta-arm-bsp/documentation/tc0.md b/meta-arm-bsp/documentation/tc0.md deleted file mode 100644 index 2ae2592c..00000000 --- a/meta-arm-bsp/documentation/tc0.md +++ /dev/null @@ -1,32 +0,0 @@ -# TC0 Platform Support in meta-arm-bsp - -## Overview -The Total Compute platform provides an envelope for all of Arm's latest IP and -software solutions, optimised to work together. Further information can be -found on the Total Compute community page: -https://community.arm.com/developer/tools-software/oss-platforms/w/docs/606/total-compute - -The user guide for TC0 platform with detailed instructions for -syncing and building the source code and running on TC0 Fixed Virtual Platform -for poky and android distributions is available at: -https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms.git/tree/docs/tc0/user-guide.rst - -## Building -In the local.conf file, MACHINE should be set as follows: -MACHINE = "tc0" - -To build the required binaries for tc0, run the commmand: -```bash$ bitbake tc-artifacts-image``` - -Trusted-firmware-a is the final component to be built with the rest of the -components dependent of it, therefore building tc-artifacts-image which depends -on trusted-firmware-a will build all the required binaries. - -## Running -To run the produced binaries in a TC0 Fixed Virtual Platform please get -the run scripts at: -https://git.linaro.org/landing-teams/working/arm/model-scripts.git/ - -and follow the instructions in the user-guide.rst available in: -https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms.git/tree/docs/tc0/user-guide.rst - From patchwork Wed Oct 19 13:39:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 14015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51013C43217 for ; Wed, 19 Oct 2022 13:40:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.8216.1666186796260505267 for ; Wed, 19 Oct 2022 06:39:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 241EF14BF; Wed, 19 Oct 2022 06:40:02 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5BBD53F7D8; Wed, 19 Oct 2022 06:39:55 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 2/3] arm-bsp/scp-firmware: remove TC0 patches Date: Wed, 19 Oct 2022 14:39:51 +0100 Message-Id: <20221019133952.3018499-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019133952.3018499-1-ross.burton@arm.com> References: <20221019133952.3018499-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Oct 2022 13:40:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3984 These patches are specific to TC0, and are not needed for TC1. Signed-off-by: Ross Burton --- .../files/tc/0002-tc0-fix-mpmm-config.patch | 92 -------- ...form-variant-to-platform-feature-set.patch | 203 ------------------ ...form-feature-set-options-in-firmware.patch | 114 ---------- .../scp-firmware/scp-firmware-tc.inc | 10 +- 4 files changed, 1 insertion(+), 418 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch deleted file mode 100644 index f2044a95..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0002-tc0-fix-mpmm-config.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 736bd8aeceefd474c15a97e4a4ec99f07ef9a82c Mon Sep 17 00:00:00 2001 -From: Arunachalam Ganapathy -Date: Fri, 11 Feb 2022 18:28:43 +0000 -Subject: [PATCH 2/4] tc0: fix mpmm config - -Do not enable MPMM in standard features set. - -Signed-off-by: Arunachalam Ganapathy -Change-Id: I7b273a2055452e2e8cd78a0d932514a6f2947ec5 -Upstream-Status: Pending [Not submitted to upstream yet] ---- - product/tc0/scp_ramfw/config_mpmm.c | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/product/tc0/scp_ramfw/config_mpmm.c b/product/tc0/scp_ramfw/config_mpmm.c -index 3bfe99d3..13d866a5 100644 ---- a/product/tc0/scp_ramfw/config_mpmm.c -+++ b/product/tc0/scp_ramfw/config_mpmm.c -@@ -27,7 +27,6 @@ enum core_pd_idx { - CORE7_IDX - }; - --#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VARIANT_STD) - static struct mod_mpmm_pct_table k_pct[] = { - { .cores_online = 4, - .default_perf_limit = 1153 * 1000000UL, -@@ -115,7 +114,6 @@ static struct mod_mpmm_pct_table m_pct[] = { - }, - } }, - }; --#endif - - static struct mod_mpmm_pct_table m_elp_pct[] = { - { .cores_online = 1, -@@ -132,7 +130,6 @@ static struct mod_mpmm_pct_table m_elp_pct[] = { - } }, - }; - --#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VARIANT_STD) - static const struct mod_mpmm_core_config k_core_config[] = { - [0] = { - .pd_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_POWER_DOMAIN, CORE0_IDX), -@@ -180,7 +177,6 @@ static const struct mod_mpmm_core_config m_core_config[] = { - .core_starts_online = false, - }, - }; --#endif - - static const struct mod_mpmm_core_config m_elp_core_config[] = { - [0] = { -@@ -191,7 +187,6 @@ static const struct mod_mpmm_core_config m_elp_core_config[] = { - }, - }; - --#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VARIANT_STD) - static const struct mod_mpmm_domain_config k_domain_conf[] = { - [0] = { - .perf_id = FWK_ID_ELEMENT_INIT( -@@ -219,7 +214,6 @@ static const struct mod_mpmm_domain_config m_domain_conf[] = { - }, - [1] = {0}, - }; --#endif - - static const struct mod_mpmm_domain_config m_elp_domain_conf[] = { - [0] = { -@@ -236,14 +230,6 @@ static const struct mod_mpmm_domain_config m_elp_domain_conf[] = { - }; - - static const struct fwk_element element_table[] = { --#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VAR_EXPERIMENT_POWER) -- [0] = { -- .name = "MPMM_MATTERHORN_ELP_ARM_ELEM", -- .sub_element_count = 1, -- .data = m_elp_domain_conf, -- }, -- [1] = { 0 }, --#else - [0] = { - .name = "MPMM_KLEIN_ELEM", - .sub_element_count = 4, -@@ -260,7 +246,6 @@ static const struct fwk_element element_table[] = { - .data = m_elp_domain_conf, - }, - [3] = { 0 }, --#endif - }; - - static const struct fwk_element *mpmm_get_element_table(fwk_id_t module_id) --- -2.30.2 - diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch deleted file mode 100644 index 87dfbfac..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0003-tc0-rename-platform-variant-to-platform-feature-set.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 50e63f11762348bcd95d809af248f620f03d9ce4 Mon Sep 17 00:00:00 2001 -From: Arunachalam Ganapathy -Date: Fri, 11 Feb 2022 18:16:54 +0000 -Subject: [PATCH 3/4] tc0: rename platform variant to platform feature set - -THe PLATFORM_VARIANT flag was added to differentiate the software -features enabled in SCP firmware. But this flag misleads to a new -variant of same platform. This commits renames PLATFORM_VARIANT to -PLATFORM_FEATURE_SET - -Signed-off-by: Arunachalam Ganapathy -Change-Id: I93c0bc3e11fe18192bb8246df851345bdc473974 -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Rupinderjit Singh ---- - product/tc0/doc/{variants.md => features.md} | 28 +++++++++----------- - product/tc0/scp_ramfw/CMakeLists.txt | 26 +++--------------- - product/tc0/scp_ramfw/Firmware.cmake | 2 +- - product/tc0/scp_ramfw/config_scmi_perf.c | 8 +++--- - product/tc0/scp_romfw/CMakeLists.txt | 6 ++--- - product/tc0/scp_romfw/Firmware.cmake | 2 +- - 6 files changed, 25 insertions(+), 47 deletions(-) - rename product/tc0/doc/{variants.md => features.md} (77%) - -diff --git a/product/tc0/doc/variants.md b/product/tc0/doc/features.md -similarity index 77% -rename from product/tc0/doc/variants.md -rename to product/tc0/doc/features.md -index fbf616db..3ef520e2 100644 ---- a/product/tc0/doc/variants.md -+++ b/product/tc0/doc/features.md -@@ -1,4 +1,4 @@ --# TC0 Platform Variants -+# TC0 Platform Features - - Copyright (c) 2022, Arm Limited. All rights reserved. - -@@ -7,30 +7,27 @@ Copyright (c) 2022, Arm Limited. All rights reserved. - - Documentation for TC0 platform can be found at [1]. - -+### Standard -+ -+The standard build provides all the features described in [1]. -+For this default features, it's not required to provide any extra parameters in -+the build commands. -+ -+### MPMM/Power/Performance (Experimental) -+ - For the purpose of experimenting some of the software features that have been --introduced in SCP-firmware a new variant of TC0 has been created. --The variant(s) can be chosen at build time by adding: -+introduced in SCP-firmware of TC0. This can be enabled at build time, by adding: - - ```sh - - make -f Makefile.cmake \ - PRODUCT=tc0 \ - MODE= \ -- PLATFORM_VARIANT=<0,1> -+ EXTRA_CONFIG_ARGS+=-DSCP_PLATFORM_FEATURE_SET=1 - - ``` - -- --### Variant 0 (Standard build) -- --The standard build provides all the features described in [1]. --For this default variant, it's not required to provide any extra parameters in --the build commands. -- -- --### Variant 1 (Power/Performance testing) -- --This variant adds support for the following software features: -+This adds support for the following software features: - - Traffic Cop - - MPMM (Maximum Power Mitigation Mechanism) - - Thermal Management -@@ -63,7 +60,6 @@ Once built, the features above will act as: - - ## Limitations - --- The "variant" option is available only with the CMake build. - - The Thermal functionality is limited at this time cause the constant - temperature being sampled. - -diff --git a/product/tc0/scp_ramfw/CMakeLists.txt b/product/tc0/scp_ramfw/CMakeLists.txt -index 96310320..ce3178ee 100644 ---- a/product/tc0/scp_ramfw/CMakeLists.txt -+++ b/product/tc0/scp_ramfw/CMakeLists.txt -@@ -11,25 +11,13 @@ - - add_executable(tc0-bl2) - -+set(SCP_PLATFORM_FEATURE_SET ${SCP_PLATFORM_FEATURE_SET_INIT} CACHE STRING "1") - --# SCP_PLATFORM_VARIANT options: --# - 'TC0_VARIANT_STD' for TC0 standard build --# - 'TC0_VAR_EXPERIMENT_POWER' for TC0 with power/performance plugins used for --# evaluation purposes -- -- --target_compile_definitions(tc0-bl2 PUBLIC -DTC0_VARIANT_STD=0) --target_compile_definitions(tc0-bl2 PUBLIC -DTC0_VAR_EXPERIMENT_POWER=1) -- -- --set(SCP_PLATFORM_VARIANT ${SCP_PLATFORM_VARIANT_INIT} CACHE STRING "1") -- -- --if (SCP_PLATFORM_VARIANT STREQUAL "1") -- message(NOTICE "SCP_PLATFORM_VARIANT set to EXPERIMENT_POWER (tc0-bl2)\n") -+if (SCP_PLATFORM_FEATURE_SET STREQUAL "1") -+ message(NOTICE "TC0 platform features MPMM/POWER/PERFORMANCE is experimental (tc0-bl2)\n") - - target_compile_definitions(tc0-bl2 -- PUBLIC -DPLATFORM_VARIANT=TC0_VAR_EXPERIMENT_POWER) -+ PUBLIC -DTC0_FEATURES_MPMM_POWER_PERF) - - set(SCP_ENABLE_PLUGIN_HANDLER TRUE PARENT_SCOPE) - set(SCP_ENABLE_FAST_CHANNELS TRUE PARENT_SCOPE) -@@ -56,12 +44,6 @@ if (SCP_PLATFORM_VARIANT STREQUAL "1") - list(PREPEND SCP_MODULE_PATHS - "${CMAKE_CURRENT_LIST_DIR}/../module/tc0_power_model") - target_sources(tc0-bl2 PRIVATE "config_tc0_power_model.c") -- --else() -- message(NOTICE "SCP_PLATFORM_VARIANT set to STANDARD (tc0-bl2)\n") -- -- target_compile_definitions(tc0-bl2 -- PUBLIC -DPLATFORM_VARIANT=TC0_VARIANT_STD) - endif() - - -diff --git a/product/tc0/scp_ramfw/Firmware.cmake b/product/tc0/scp_ramfw/Firmware.cmake -index 11d8eaab..4a555296 100644 ---- a/product/tc0/scp_ramfw/Firmware.cmake -+++ b/product/tc0/scp_ramfw/Firmware.cmake -@@ -27,7 +27,7 @@ set(SCP_ENABLE_FAST_CHANNELS_INIT FALSE) - - set(SCP_ENABLE_PLUGIN_HANDLER_INIT FALSE) - --set(SCP_PLATFORM_VARIANT_INIT 0) -+set(SCP_PLATFORM_FEATURE_SET_INIT 0) - - set(SCP_ARCHITECTURE "armv7-m") - -diff --git a/product/tc0/scp_ramfw/config_scmi_perf.c b/product/tc0/scp_ramfw/config_scmi_perf.c -index a4a47b3a..3e91939a 100644 ---- a/product/tc0/scp_ramfw/config_scmi_perf.c -+++ b/product/tc0/scp_ramfw/config_scmi_perf.c -@@ -129,7 +129,7 @@ static const struct mod_scmi_perf_domain_config domains[] = { - }, - }; - --#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VAR_EXPERIMENT_POWER) -+#ifdef TC0_FEATURES_MPMM_POWER_PERF - static const struct mod_scmi_plugin_config plugins_table[] = { - [0] = { - .id = FWK_ID_MODULE_INIT(FWK_MODULE_IDX_TRAFFIC_COP), -@@ -156,9 +156,9 @@ const struct fwk_module_config config_scmi_perf = { - #else - .fast_channels_alarm_id = FWK_ID_NONE_INIT, - #endif --#if defined(PLATFORM_VARIANT) && (PLATFORM_VARIANT == TC0_VAR_EXPERIMENT_POWER) -- .plugins = plugins_table, -- .plugins_count = FWK_ARRAY_SIZE(plugins_table), -+#ifdef TC0_FEATURES_MPMM_POWER_PERF -+ .plugins = plugins_table, -+ .plugins_count = FWK_ARRAY_SIZE(plugins_table), - #endif - }) - }; -diff --git a/product/tc0/scp_romfw/CMakeLists.txt b/product/tc0/scp_romfw/CMakeLists.txt -index f9f40ad3..09cd2f5d 100644 ---- a/product/tc0/scp_romfw/CMakeLists.txt -+++ b/product/tc0/scp_romfw/CMakeLists.txt -@@ -48,6 +48,6 @@ target_include_directories(tc0-bl1 - PUBLIC $) - - cmake_dependent_option( -- SCP_PLATFORM_VARIANT "Choose platform software variant?" -- "${SCP_PLATFORM_VARIANT_INIT}" "DEFINED SCP_PLATFORM_VARIANT_INIT" -- "${SCP_PLATFORM_VARIANT}") -+ SCP_PLATFORM_FEATURE_SET "Choose platform software features?" -+ "${SCP_PLATFORM_FEATURE_SET_INIT}" "DEFINED SCP_PLATFORM_FEATURE_SET_INIT" -+ "${SCP_PLATFORM_FEATURE_SET}") -diff --git a/product/tc0/scp_romfw/Firmware.cmake b/product/tc0/scp_romfw/Firmware.cmake -index ab4468be..e1360159 100644 ---- a/product/tc0/scp_romfw/Firmware.cmake -+++ b/product/tc0/scp_romfw/Firmware.cmake -@@ -21,7 +21,7 @@ set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE) - - set(SCP_ENABLE_IPO_INIT FALSE) - --set(SCP_PLATFORM_VARIANT_INIT 0) -+set(SCP_PLATFORM_FEATURE_SET_INIT 0) - - set(SCP_ARCHITECTURE "armv7-m") - --- -2.30.2 - diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch deleted file mode 100644 index aa83332b..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0004-tc0-support-platform-feature-set-options-in-firmware.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 3e737dd47b228bdeffb06e39bffec7a4a436b244 Mon Sep 17 00:00:00 2001 -From: Arunachalam Ganapathy -Date: Wed, 9 Feb 2022 16:02:10 +0000 -Subject: [PATCH 4/4] tc0: support platform feature set options in firmware.mk - -Support existing platform feature set options that is in cmake to -firmware.mk. Two feature set for TC0 are -0. Standard -1. MPMM/Power/Performance (Experimental) - -Build option to select the feature set is using: -make PRODUCT=tc0 MODE= SCP_PLATFORM_FEATURE_SET=<0,1> - -The default value is set to 0 (Standard). -Refer product/tc0/doc/features.md for more details. - -Signed-off-by: Arunachalam Ganapathy -Change-Id: I4028686a8f8461e0e2c29e15d5e52eb1d37ca60a -Upstream-Status: Pending [Not submitted to upstream yet] ---- - product/tc0/scp_ramfw/firmware.mk | 41 +++++++++++++++++++++++++++++-- - product/tc0/scp_romfw/firmware.mk | 12 +++++++++ - 2 files changed, 51 insertions(+), 2 deletions(-) - -diff --git a/product/tc0/scp_ramfw/firmware.mk b/product/tc0/scp_ramfw/firmware.mk -index ec6e6679..d7515f5b 100644 ---- a/product/tc0/scp_ramfw/firmware.mk -+++ b/product/tc0/scp_ramfw/firmware.mk -@@ -9,8 +9,24 @@ BS_FIRMWARE_CPU := cortex-m3 - BS_FIRMWARE_HAS_NOTIFICATION := yes - BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes - BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes --BS_FIRMWARE_HAS_FAST_CHANNELS := no --BS_FIRMWARE_HAS_PERF_PLUGIN_HANDLER := no -+ -+DEFAULT_SCP_PLATFORM_FEATURE_SET := 0 -+ -+export SCP_PLATFORM_FEATURE_SET ?= $(DEFAULT_SCP_PLATFORM_FEATURE_SET) -+ifneq ($(filter-out 0 1, $(SCP_PLATFORM_FEATURE_SET)),) -+ $(error "Invalid for SCP_PLATFORM_FEATURE_SET parameter. Valid options are \ -+ 0 or 1. Aborting...") -+endif -+ -+ifeq ($(SCP_PLATFORM_FEATURE_SET),0) -+ BS_FIRMWARE_HAS_PERF_PLUGIN_HANDLER := no -+ BS_FIRMWARE_HAS_FAST_CHANNELS := no -+else -+ DEFINES += TC0_FEATURES_MPMM_POWER_PERF -+ BS_FIRMWARE_HAS_PERF_PLUGIN_HANDLER := yes -+ BS_FIRMWARE_HAS_FAST_CHANNELS := yes -+ $(info "TC0 platform features POWER/PERFORMANCE is experimental") -+endif - - BS_FIRMWARE_MODULES := \ - armv7m_mpu \ -@@ -44,6 +60,16 @@ ifeq ($(BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS),yes) - BS_FIRMWARE_MODULES += resource_perms - endif - -+ifeq ($(SCP_PLATFORM_FEATURE_SET),1) -+BS_FIRMWARE_MODULES += \ -+ traffic_cop \ -+ mpmm \ -+ sensor \ -+ reg_sensor \ -+ thermal_mgmt \ -+ tc0_power_model -+endif -+ - BS_FIRMWARE_SOURCES := \ - config_system_power.c \ - config_armv7m_mpu.c \ -@@ -75,4 +101,15 @@ ifeq ($(BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS),yes) - BS_FIRMWARE_SOURCES += config_resource_perms.c - endif - -+ifeq ($(SCP_PLATFORM_FEATURE_SET),1) -+ BS_FIRMWARE_SOURCES += \ -+ config_traffic_cop.c \ -+ config_mpmm.c \ -+ config_sensor.c \ -+ config_reg_sensor.c \ -+ config_thermal_mgmt.c \ -+ config_tc0_power_model.c -+endif -+ -+ - include $(BS_DIR)/firmware.mk -diff --git a/product/tc0/scp_romfw/firmware.mk b/product/tc0/scp_romfw/firmware.mk -index 9977712f..0012b9fa 100644 ---- a/product/tc0/scp_romfw/firmware.mk -+++ b/product/tc0/scp_romfw/firmware.mk -@@ -9,6 +9,18 @@ BS_FIRMWARE_CPU := cortex-m3 - BS_FIRMWARE_HAS_NOTIFICATION := yes - BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes - -+DEFAULT_SCP_PLATFORM_FEATURE_SET := 0 -+ -+export SCP_PLATFORM_FEATURE_SET ?= $(DEFAULT_SCP_PLATFORM_FEATURE_SET) -+ifneq ($(filter-out 0 1, $(SCP_PLATFORM_FEATURE_SET)),) -+ $(error "Invalid for SCP_PLATFORM_FEATURE_SET parameter. Valid options are \ -+ 0 or 1. Aborting...") -+endif -+ -+ifeq ($(SCP_PLATFORM_FEATURE_SET),1) -+ $(info "TC0 platform features POWER/PERFORMANCE is experimental") -+endif -+ - BS_FIRMWARE_MODULE_HEADERS_ONLY := \ - power_domain \ - timer --- -2.30.2 - diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc index a6a005c1..3cbadad8 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc @@ -1,14 +1,6 @@ # TC specific SCP configuration -FILESEXTRAPATHS:prepend := "${THISDIR}/files/tc:" -SRC_URI:append:tc = " \ - file://0002-tc0-fix-mpmm-config.patch \ - file://0003-tc0-rename-platform-variant-to-platform-feature-set.patch \ - file://0004-tc0-support-platform-feature-set-options-in-firmware.patch \ - " +COMPATIBLE_MACHINE = "(tc1)" -COMPATIBLE_MACHINE = "(tc?)" - -SCP_PLATFORM:tc0 = "tc0" SCP_PLATFORM:tc1 = "tc1" FW_TARGETS = "scp" From patchwork Wed Oct 19 13:39:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 14014 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CC3FC433FE for ; Wed, 19 Oct 2022 13:40:03 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.7912.1666186797023877508 for ; Wed, 19 Oct 2022 06:39:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C4E3A1424; Wed, 19 Oct 2022 06:40:02 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 233F03F7D8; Wed, 19 Oct 2022 06:39:56 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 3/3] arm/fvp-tc0: remove Total Compute 2020 FVP Date: Wed, 19 Oct 2022 14:39:52 +0100 Message-Id: <20221019133952.3018499-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019133952.3018499-1-ross.burton@arm.com> References: <20221019133952.3018499-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Oct 2022 13:40:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3985 This FVP doesn't support TC1, so remove it now that we don't support TC0. Signed-off-by: Ross Burton --- ci/fvps.yml | 1 - meta-arm/recipes-devtools/fvp/fvp-tc0.bb | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 meta-arm/recipes-devtools/fvp/fvp-tc0.bb diff --git a/ci/fvps.yml b/ci/fvps.yml index 576faa31..e3bc5fe5 100644 --- a/ci/fvps.yml +++ b/ci/fvps.yml @@ -17,4 +17,3 @@ target: - nativesdk-fvp-sgi575 - nativesdk-fvp-corstone500 - nativesdk-fvp-corstone1000 - - nativesdk-fvp-tc0 diff --git a/meta-arm/recipes-devtools/fvp/fvp-tc0.bb b/meta-arm/recipes-devtools/fvp/fvp-tc0.bb deleted file mode 100644 index 78f2fc22..00000000 --- a/meta-arm/recipes-devtools/fvp/fvp-tc0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require fvp-ecosystem.inc - -MODEL = "TotalCompute" -MODEL_CODE = "FVP_TC0" -PV = "11.17.18" - -# Unconventional URI structure for this release -SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/TotalCompute/Total%20Compute%20Update%202022/FVP_TC0_11.17_18.tgz;subdir=${BP}" -SRC_URI[sha256sum] = "0bd78354e036a7e92bd7f8cbd78cd2b5197dc0872fe2b25c95ea734929fe83b8" - -LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ - file://license_terms/third_party_licenses.txt;md5=41029e71051b1c786bae3112a29905a7"