From 7793860123f40729695ed7a9930461d60781d700 Mon Sep 17 00:00:00 2001 From: Rupinderjit Singh Date: Thu, 5 May 2022 11:25:33 +0100 Subject: [PATCH] arm-bsp/scp-firmware: upgrade TC to version 2.10 * Removed 0001-tc0-fix-sensor-data-api-call.patch as it has now been upstreamed. * updated 0003-tc0-rename-platform-variant-to-platform-feature-set.patch to fix merge error. Signed-off-by: Rupinderjit Singh Change-Id: I71eafbea9e1f0b9f01a504fe0c8b81e43c24d613 Signed-off-by: Jon Mason --- .../0001-tc0-fix-sensor-data-api-call.patch | 65 ------------------- ...form-variant-to-platform-feature-set.patch | 3 +- .../scp-firmware/scp-firmware-tc.inc | 6 -- .../scp-firmware/scp-firmware_2.10.%.bbappend | 7 ++ 4 files changed, 9 insertions(+), 72 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch create mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch b/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch deleted file mode 100644 index 227d9112..00000000 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/files/tc/0001-tc0-fix-sensor-data-api-call.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 33a2173e13453ecc4f766f0e69302524401df1b0 Mon Sep 17 00:00:00 2001 -From: Arunachalam Ganapathy -Date: Mon, 14 Feb 2022 08:28:46 +0000 -Subject: [PATCH 1/4] tc0: fix sensor data api call - -Signed-off-by: Arunachalam Ganapathy -Change-Id: I827abeeac8317e4dd466cc0c4d493cdc90e7e39d -Upstream-Status: Pending [Not submitted to upstream yet] ---- - module/thermal_mgmt/src/mod_thermal_mgmt.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/module/thermal_mgmt/src/mod_thermal_mgmt.c b/module/thermal_mgmt/src/mod_thermal_mgmt.c -index dbd45c74..6e2ff5ba 100644 ---- a/module/thermal_mgmt/src/mod_thermal_mgmt.c -+++ b/module/thermal_mgmt/src/mod_thermal_mgmt.c -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - - #include - #include -@@ -372,7 +372,7 @@ static int read_temperature(void) - .id = mod_thermal_event_id_read_temp, - }; - -- return fwk_thread_put_event(&event); -+ return fwk_put_event(&event); - #else - int status; - uint64_t value; -@@ -574,22 +574,22 @@ static int thermal_mgmt_process_event( - struct fwk_event *resp_event) - { - struct mod_sensor_event_params *params; -- uint64_t value; -+ struct mod_sensor_data ms_data; - int status; - - if (fwk_id_is_equal(event->id, mod_thermal_event_id_read_temp)) { - /* Temperature-reading event */ - status = -- mod_ctx.sensor_api->get_value(mod_ctx.config->sensor_id, &value); -+ mod_ctx.sensor_api->get_data(mod_ctx.config->sensor_id, &ms_data); - if (status == FWK_SUCCESS) { -- mod_ctx.cur_temp = (uint32_t)value; -+ mod_ctx.cur_temp = (uint32_t)ms_data.value; - } - } else if (fwk_id_is_equal(event->id, mod_sensor_event_id_read_request)) { - /* Response event from Sensor HAL */ - params = (struct mod_sensor_event_params *)event->params; - -- if (params->status == FWK_SUCCESS) { -- mod_ctx.cur_temp = (uint32_t)params->value; -+ if (params->sensor_data->status == FWK_SUCCESS) { -+ mod_ctx.cur_temp = (uint32_t)params->sensor_data->value; - status = FWK_SUCCESS; - } else { - status = FWK_E_DEVICE; --- -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 index 5e995253..87dfbfac 100644 --- 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 @@ -11,6 +11,7 @@ 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 +++--------------- @@ -56,7 +57,7 @@ index fbf616db..3ef520e2 100644 make -f Makefile.cmake \ PRODUCT=tc0 \ MODE= \ -- EXTRA_CONFIG_ARGS+=-DSCP_PLATFORM_VARIANT=<0,1> +- PLATFORM_VARIANT=<0,1> + EXTRA_CONFIG_ARGS+=-DSCP_PLATFORM_FEATURE_SET=1 ``` 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 08bdfb28..a6a005c1 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,13 +1,7 @@ # TC specific SCP configuration -# Intermediate SHA with 2.9 baseline version -# This has support for SCP features MPMM/POWER/PERFORMANCE for TC0 -SRCREV = "027b567fde5e3767fb1678bda28cf59fa7aac06d" -PV = "2.9.0+git${SRCPV}" - FILESEXTRAPATHS:prepend := "${THISDIR}/files/tc:" SRC_URI:append:tc = " \ - file://0001-tc0-fix-sensor-data-api-call.patch \ 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 \ diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend new file mode 100644 index 00000000..b4f5487d --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend @@ -0,0 +1,7 @@ +# Include machine specific SCP configurations + +MACHINE_SCP_REQUIRE ?= "" + +MACHINE_SCP_REQUIRE:tc = "scp-firmware-tc.inc" + +require ${MACHINE_SCP_REQUIRE}