Browse Source

refactor(rss)!: remove PLAT_RSS_NOT_SUPPORTED build option

Removed the PLAT_RSS_NOT_SUPPORTED build option, which was initially
introduced for building the Base AEM FVP platform platform with RSS.
However, we now have a well-defined TC2 platform with RSS, making it
unnecessary to keep this flag.

Note -
Theoretically this is a breaking change. Other platforms could be
using the PLAT_RSS_NOT_SUPPORTED build option. Among upstream platforms,
only the Base AEM FVP uses it right now but we don't know about
downstream platforms.

Change-Id: I931905a4c6ac1ebe3895ab6e0287d0fa07721707
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
pull/1993/merge
Manish V Badarkhe 1 year ago
parent
commit
878354a845
  1. 2
      Makefile
  2. 5
      docs/getting_started/build-options.rst
  3. 47
      lib/psa/measured_boot.c
  4. 3
      make_helpers/defaults.mk

2
Makefile

@ -1191,7 +1191,6 @@ $(eval $(call assert_booleans,\
NS_TIMER_SWITCH \ NS_TIMER_SWITCH \
OVERRIDE_LIBC \ OVERRIDE_LIBC \
PL011_GENERIC_UART \ PL011_GENERIC_UART \
PLAT_RSS_NOT_SUPPORTED \
PROGRAMMABLE_RESET_ADDRESS \ PROGRAMMABLE_RESET_ADDRESS \
PSCI_EXTENDED_STATE_ID \ PSCI_EXTENDED_STATE_ID \
PSCI_OS_INIT_MODE \ PSCI_OS_INIT_MODE \
@ -1354,7 +1353,6 @@ $(eval $(call add_defines,\
NS_TIMER_SWITCH \ NS_TIMER_SWITCH \
PL011_GENERIC_UART \ PL011_GENERIC_UART \
PLAT_${PLAT} \ PLAT_${PLAT} \
PLAT_RSS_NOT_SUPPORTED \
PROGRAMMABLE_RESET_ADDRESS \ PROGRAMMABLE_RESET_ADDRESS \
PSCI_EXTENDED_STATE_ID \ PSCI_EXTENDED_STATE_ID \
PSCI_OS_INIT_MODE \ PSCI_OS_INIT_MODE \

5
docs/getting_started/build-options.rst

@ -1167,11 +1167,6 @@ Common build options
if FEAT_TRF is implemented. This flag can take the values 0 to 2, to align if FEAT_TRF is implemented. This flag can take the values 0 to 2, to align
with the ``FEATURE_DETECTION`` mechanism. This flag is disabled by default. with the ``FEATURE_DETECTION`` mechanism. This flag is disabled by default.
- ``PLAT_RSS_NOT_SUPPORTED``: Boolean option to enable the usage of the PSA
APIs on platforms that doesn't support RSS (providing Arm CCA HES
functionalities). When enabled (``1``), a mocked version of the APIs are used.
The default value is 0.
- ``CONDITIONAL_CMO``: Boolean option to enable call to platform-defined routine - ``CONDITIONAL_CMO``: Boolean option to enable call to platform-defined routine
``plat_can_cmo`` which will return zero if cache management operations should ``plat_can_cmo`` which will return zero if cache management operations should
be skipped and non-zero otherwise. By default, this option is disabled which be skipped and non-zero otherwise. By default, this option is disabled which

47
lib/psa/measured_boot.c

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022, Arm Limited. All rights reserved. * Copyright (c) 2022-2023, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
@ -61,7 +61,6 @@ static void log_measurement(uint8_t index,
INFO(" - locking : %s\n", lock_measurement ? "true" : "false"); INFO(" - locking : %s\n", lock_measurement ? "true" : "false");
} }
#if !PLAT_RSS_NOT_SUPPORTED
psa_status_t psa_status_t
rss_measured_boot_extend_measurement(uint8_t index, rss_measured_boot_extend_measurement(uint8_t index,
const uint8_t *signer_id, const uint8_t *signer_id,
@ -175,47 +174,3 @@ psa_status_t rss_measured_boot_read_measurement(uint8_t index,
return status; return status;
} }
#else /* !PLAT_RSS_NOT_SUPPORTED */
psa_status_t
rss_measured_boot_extend_measurement(uint8_t index,
const uint8_t *signer_id,
size_t signer_id_size,
const uint8_t *version,
size_t version_size,
uint32_t measurement_algo,
const uint8_t *sw_type,
size_t sw_type_size,
const uint8_t *measurement_value,
size_t measurement_value_size,
bool lock_measurement)
{
log_measurement(index, signer_id, signer_id_size,
version, version_size, sw_type, sw_type_size,
measurement_algo, measurement_value,
measurement_value_size, lock_measurement);
return PSA_SUCCESS;
}
psa_status_t rss_measured_boot_read_measurement(uint8_t index,
uint8_t *signer_id,
size_t signer_id_size,
size_t *signer_id_len,
uint8_t *version,
size_t version_size,
size_t *version_len,
uint32_t *measurement_algo,
uint8_t *sw_type,
size_t sw_type_size,
size_t *sw_type_len,
uint8_t *measurement_value,
size_t measurement_value_size,
size_t *measurement_value_len,
bool *is_locked)
{
return PSA_SUCCESS;
}
#endif /* !PLAT_RSS_NOT_SUPPORTED */

3
make_helpers/defaults.mk

@ -347,9 +347,6 @@ NR_OF_IMAGES_IN_FW_BANK := 1
# Disable Firmware update support by default # Disable Firmware update support by default
PSA_FWU_SUPPORT := 0 PSA_FWU_SUPPORT := 0
# By default, disable the mocking of RSS provided services
PLAT_RSS_NOT_SUPPORTED := 0
# Dynamic Root of Trust for Measurement support # Dynamic Root of Trust for Measurement support
DRTM_SUPPORT := 0 DRTM_SUPPORT := 0

Loading…
Cancel
Save