summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-13Add missing RES1 bit in SCTLR_EL1Vikram Kanigiri
As per Section D7.2.81 in the ARMv8-A Reference Manual (DDI0487A Issue A.h), bits[29:28], bits[23:22], bit[20] and bit[11] in the SCTLR_EL1 are RES1. This patch adds the missing bit[20] to the SCTLR_EL1_RES1 macro. Change-Id: I827982fa2856d04def6b22d8200a79fe6922a28e
2015-11-13Add NULL pointer check before reading BL32 entry point informationJuan Castillo
BL2 is responsible for loading BL32 and passing a pointer to the BL32 entrypoint info to BL31 in the BL31 parameters. If no BL32 image is loaded, a NULL pointer is passed. The platform is responsible for accessing BL31 parameters and extracting the corresponding BL32 EP info. In ARM platforms, arm_bl31_early_platform_setup() dereferences the pointer to the BL32 EP info without checking first if the pointer is NULL. This will cause an exception if a BL32 entrypoint has not been populated by BL2. FVP and Juno are not affected because they always define BL32_BASE, irrespective of whether a BL32 image is included in the FIP or not. This patches fixes the issue by checking the BL32 ep_info pointer before trying to access the data. If `RESET_TO_BL31` is enabled, the BL32 entrypoint is not populated if BL32_BASE is not defined. NOTE: Maintainers of partner platforms should check for this issue in their ports. Fixes ARM-software/tf-issues#320 Change-Id: I31456155503f2765766e8b7cd30ab4a40958fb96
2015-11-11Merge pull request #427 from jcastillo-arm/jc/tf-issues/294Achin Gupta
Add -mstrict-align to the gcc options
2015-11-11Merge pull request #428 from vwadekar/per-soc-system-reset-v2Achin Gupta
Tegra: introduce per-soc system reset handler
2015-11-10Tegra: introduce per-soc system reset handlerVarun Wadekar
This patch adds a per-soc system reset handler for Tegra chips. The handler gets executed before the actual system resets. This allows for custom handling of the system reset sequence on each SoC. Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
2015-11-10Merge pull request #424 from jcastillo-arm/jc/tf-issues/327Achin Gupta
IMF: postpone SCR_EL3 update if context is not initialized
2015-11-10Add -mstrict-align to the gcc optionsJuan Castillo
ARMv8 architecture allows unaligned memory accesses. However, Trusted Firmware disables such feature by setting the SCTLR_A_BIT and SCTLR_SA_BIT in the SCTLR_EL3 register (it enables alignment checks). This patch adds -mstrict-align to the gcc build options. Although there are not explicit unaligned memory accesses in Trusted Firmware, this flag will tell the compiler not to use them. Fixes ARM-software/tf-issues#294 Change-Id: I69748c6cf28504be9ca3dc975a331d14459c9ef1
2015-11-09Merge pull request #425 from achingupta/ag/tf-issues#332Achin Gupta
Re-introduce evaluation of ENABLE_PLAT_COMPAT build flag
2015-11-07Re-introduce evaluation of ENABLE_PLAT_COMPAT build flagAchin Gupta
Commit #73c99d4eb377e0e25f7951be53087bf92e7b4b18 had refactored the top level Makefile. This commit also broke platform ports that still rely on an enabled ENABLE_PLAT_COMPAT build option since the evaluation of this option was also accidentally removed from the Makefile. This patch fixes this break by re-introducing the necessary support to ensure that this build option is enabled by default if a platform port does not disable it explicitly. Fixes ARM-software/tf-issues#332 Change-Id: I2217595d2e0bccae7de98cc6c0ea448b5bf3dae2
2015-11-05IMF: postpone SCR_EL3 update if context is not initializedJuan Castillo
The set_routing_model() function in the Interrupt Management Framework calls the context management library to update the SCR_EL3 register. This context management library assumes that the context has been previously initialized. Consequently, if a Secure Payload Dispatcher (SPD) tries to set the routing model before initializing the context, the system will fail (in debug mode, an assertion will be raised). This patch fixes the issue by checking if the context has been initialized before updating SCR_EL3. If a valid context is not available, SCR_EL3 update will be done when the SPD calls the context initialization function. This function will call get_scr_el3_from_routing_model() to obtain the SCR_EL3 value. If the SPD does not call the context initialization function then it is SPD's responsibility to obtain SCR_EL3 from the IMF and update the context accordingly. Fixes ARM-software/tf-issues#327 Change-Id: Ic2f1c6e899e578a8db858ec43747c63a8539c16f
2015-11-04Merge pull request #423 from jcastillo-arm/jc/genfw/1211Achin Gupta
Remove deprecated IO return definitions
2015-11-04Merge pull request #421 from sandrine-bailleux/sb/improve-display_boot_progressAchin Gupta
Improve images transitions debugging messages
2015-11-04Merge pull request #422 from achingupta/bj/juno_r2_supportAchin Gupta
Add Cortex-A72 support for Juno R2
2015-11-04Add A72 support for Juno R2Brendan Jackman
Cortex-A72 library support is now compiled into the Juno platform port to go with the existing A53/A57 support. This enables a single set of Juno TF binaries to run on Juno R0, R1 and R2 boards. Change-Id: I4a601dc4f671e98bdb19d98bbb66f02f0d8b7fc7
2015-11-02Remove deprecated IO return definitionsJuan Castillo
Patch 7e26fe1f deprecates IO specific return definitions in favour of standard errno codes. This patch removes those definitions and its usage from the IO framework, IO drivers and IO platform layer. Following this patch, standard errno codes must be used when checking the return value of an IO function. Change-Id: Id6e0e9d0a7daf15a81ec598cf74de83d5768650f
2015-11-02Improve display_boot_progress() functionSandrine Bailleux
- Remove out-dated information about the use of printf() in the function comment. - Make the argument const, as the function doesn't need to modify it. - Rename the function into bl1_print_bl31_ep_info() to make its purpose clearer. Change-Id: I2a9d215a37f0ec11aefce0c5c9e050473b7a6b25
2015-11-02Introduce print_entry_point_info() functionSandrine Bailleux
This patch introduces a new function called 'print_entry_point_info' that prints an entry_point_t structure for debugging purposes. As such, it can be used to display the entry point address, SPSR and arguments passed from a firmware image to the next one. This function is now called in the following images transitions: - BL1 to BL2 - BL1 to BL31 - BL31 to the next image (typically BL32 or BL33) The following changes have been introduced: - Fix the output format of the SPSR value : SPSR is a 32-bit value, not a 64-bit one. - Print all arguments values. The entry_point_info_t structure allows to pass up to 8 arguments. In most cases, only the first 2 arguments were printed. print_entry_point_info() now prints all of them as 'VERBOSE' traces. Change-Id: Ieb384bffaa7849e6cb95a01a47c0b7fc2308653a
2015-10-30Merge pull request #418 from soby-mathew/sm/sys_suspenddanh-arm
Support SYSTEM SUSPEND on Juno
2015-10-30Merge pull request #419 from soby-mathew/sm/tf-issues#318danh-arm
Include xlat_tables.h in plat_arm.h
2015-10-30Include xlat_tables.h in plat_arm.hSoby Mathew
This patch fixes a compilation issue for platforms that are aligned to ARM Standard platforms and include the `plat_arm.h` header in their platform port. The compilation would fail for such a platform because `xlat_tables.h` which has the definition for `mmap_region_t` is not included in `plat_arm.h`. This patch fixes this by including `xlat_tables.h` in `plat_arm.h` header. Fixes ARM-Software/tf-issues#318 Change-Id: I75f990cfb4078b3996fc353c8cd37c9de61d555e
2015-10-30Doc: Add instructions to test SYSTEM SUSPENDSoby Mathew
This patch adds instructions to the user-guide.md to test SYSTEM SUSPEND on Juno. Change-Id: Icd01d10e1c1fb14b0db880d0ff134e505f097d2b
2015-10-30Support PSCI SYSTEM SUSPEND on JunoSoby Mathew
This patch adds the capability to power down at system power domain level on Juno via the PSCI SYSTEM SUSPEND API. The CSS power management helpers are modified to add support for power management operations at system power domain level. A new helper for populating `get_sys_suspend_power_state` handler in plat_psci_ops is defined. On entering the system suspend state, the SCP powers down the SYSTOP power domain on the SoC and puts the memory into retention mode. On wakeup from the power down, the system components on the CSS will be reinitialized by the platform layer and the PSCI client is responsible for restoring the context of these system components. According to PSCI Specification, interrupts targeted to cores in PSCI CPU SUSPEND should be able to resume it. On Juno, when the system power domain is suspended, the GIC is also powered down. The SCP resumes the final core to be suspend when an external wake-up event is received. But the other cores cannot be woken up by a targeted interrupt, because GIC doesn't forward these interrupts to the SCP. Due to this hardware limitation, we down-grade PSCI CPU SUSPEND requests targeted to the system power domain level to cluster power domain level in `juno_validate_power_state()` and the CSS default `plat_arm_psci_ops` is overridden in juno_pm.c. A system power domain resume helper `arm_system_pwr_domain_resume()` is defined for ARM standard platforms which resumes/re-initializes the system components on wakeup from system suspend. The security setup also needs to be done on resume from system suspend, which means `plat_arm_security_setup()` must now be included in the BL3-1 image in addition to previous BL images if system suspend need to be supported. Change-Id: Ie293f75f09bad24223af47ab6c6e1268f77bcc47
2015-10-30CSS: Implement topology support for System power domainSoby Mathew
This patch implements the necessary topology changes for supporting system power domain on CSS platforms. The definition of PLAT_MAX_PWR_LVL and PLAT_NUM_PWR_DOMAINS macros are removed from arm_def.h and are made platform specific. In addition, the `arm_power_domain_tree_desc[]` and `arm_pm_idle_states[]` are modified to support the system power domain at level 2. With this patch, even though the power management operations involving the system power domain will not return any error, the platform layer will silently ignore any operations to the power domain. The actual power management support for the system power domain will be added later. Change-Id: I791867eded5156754fe898f9cdc6bba361e5a379
2015-10-28Merge pull request #415 from jcastillo-arm/jc/plat_err_handlerdanh-arm
Add optional platform error handler API
2015-10-28Merge pull request #416 from davwan01/dw/css-commondanh-arm
Allow CSS to redefine function `plat_arm_calc_core_pos`
2015-10-28Add optional platform error handler APIJuan Castillo
This patch adds an optional API to the platform port: void plat_error_handler(int err) __dead2; The platform error handler is called when there is a specific error condition after which Trusted Firmware cannot continue. While panic() simply prints the crash report (if enabled) and spins, the platform error handler can be used to hand control over to the platform port so it can perform specific bookeeping or post-error actions (for example, reset the system). This function must not return. The parameter indicates the type of error using standard codes from errno.h. Possible errors reported by the generic code are: -EAUTH : a certificate or image could not be authenticated (when Trusted Board Boot is enabled) -ENOENT : the requested image or certificate could not be found or an IO error was detected -ENOMEM : resources exhausted. Trusted Firmware does not use dynamic memory, so this error is usually an indication of an incorrect array size A default weak implementation of this function has been provided. It simply implements an infinite loop. Change-Id: Iffaf9eee82d037da6caa43b3aed51df555e597a3
2015-10-27Merge pull request #417 from jcastillo-arm/jc/makefile_2danh-arm
Makefile rework and bug fix #2
2015-10-27Make: fix dependency files generationJuan Castillo
Currently, if no make goal is specified in the command line, 'all' is assumed by default, but the dependency files are not generated. This might lead to a successful but inconsistent build. This patch provides a fix to the problem. Change-Id: I0148719e114dbdbe46f8a57c7d05da7cbc212c92
2015-10-27Rework MakefileJuan Castillo
This patch is a complete rework of the main Makefile. Functionality remains the same but the code has been reorganized in sections in order to improve readability and facilitate adding future extensions. A new file 'build_macros.mk' has been created and will contain common definitions (variables, macros, etc) that may be used from the main Makefile and other platform specific makefiles. A new macro 'FIP_ADD_IMG' has been introduced and it will allow the platform to specify binary images and the necessary checks for a successful build. Platforms that require a BL30 image no longer need to specify the NEED_BL30 option. The main Makefile is now completely unaware of additional images not built as part of Trusted Firmware, like BL30. It is the platform responsibility to specify images using the macro 'FIP_ADD_IMG'. Juno uses this macro to include the BL30 image in the build. BL33 image is specified in the main Makefile to preserve backward compatibility with the NEED_BL33 option. Otherwise, platform ports that rely on the definition of NEED_BL33 might break. All Trusted Board Boot related definitions have been moved to a separate file 'tbbr_tools.mk'. The main Makefile will include this file unless the platform indicates otherwise by setting the variable 'INCLUDE_TBBR_MK := 0' in the corresponding platform.mk file. This will keep backward compatibility but ideally each platform should include the corresponding TBB .mk file in platform.mk. Change-Id: I35e7bc9930d38132412e950e20aa2a01e2b26801
2015-10-27Allow CSS to redefine function `plat_arm_calc_core_pos`David Wang
Currently all ARM CSS platforms which include css_helpers.S use the same strong definition of `plat_arm_calc_core_pos`. This patch allows these CSS platforms to define their own strong definition of this function. * Replace the strong definition of `plat_arm_calc_core_pos` in css_helpers.S with a utility function `css_calc_core_pos_swap_cluster` does the same thing (swaps cluster IDs). ARM CSS platforms may choose to use this function or not. * Add a Juno strong definition of `plat_arm_calc_core_pos`, which uses `css_calc_core_pos_swap_cluster`. Change-Id: Ib5385ed10e44adf6cd1398a93c25973eb3506d9d
2015-10-26Merge pull request #413 from jcastillo-arm/jc/tbb_cert_optdanh-arm
Certificate create tool flexibility improvements
2015-10-26Merge pull request #414 from jcastillo-arm/jc/io_ret_valuesdanh-arm
Use standard error code definitions
2015-10-23Use standard errno definitions in load_auth_image()Juan Castillo
This patch replaces custom definitions used as return values for the load_auth_image() function with standard error codes defined in errno.h. The custom definitions have been removed. It also replaces the usage of IO framework error custom definitions, which have been deprecated. Standard errno definitions are used instead. Change-Id: I1228477346d3876151c05b470d9669c37fd231be
2015-10-23IO Framework: use standard errno codes as return valuesJuan Castillo
This patch redefines the values of IO_FAIL, IO_NOT_SUPPORTED and IO_RESOURCES_EXHAUSTED to match the corresponding definitions in errno.h: #define IO_FAIL (-ENOENT) #define IO_NOT_SUPPORTED (-ENODEV) #define IO_RESOURCES_EXHAUSTED (-ENOMEM) NOTE: please note that the IO_FAIL, IO_NOT_SUPPORTED and IO_RESOURCES_EXHAUSTED definitions are considered deprecated and their usage should be avoided. Callers should rely on errno.h definitions when checking the return values of IO functions. Change-Id: Ic8491aa43384b6ee44951ebfc053a3ded16a80be
2015-10-23cert_create: specify command line options in the CoTJuan Castillo
This patch introduces a new API that allows to specify command line options in the Chain of Trust description. These command line options may be used to specify parameters related to the CoT (i.e. keys or certificates), instead of keeping a hardcoded list of options in main.c. Change-Id: I282b0b01cb9add557b26bddc238a28253ce05e44
2015-10-23cert_create: improve command line argument checkJuan Castillo
The certificate generation tool currently checks if all command line options required to create all certificates in the CoT have been specified. This prevents using the tool to create individual certificates when the whole CoT is not required. This patch improves the checking function so only those options required by the certificates specified in the command line are verified. Change-Id: I2c426a8e2e2dec85b15f2d98fd4ba949c1aed385
2015-10-21Merge pull request #410 from soby-mathew/sm/psci_handler_reorgdanh-arm
Reorganise PSCI PM handler setup on ARM Standard platforms
2015-10-21Merge pull request #411 from jcastillo-arm/jc/plat_bl1_exitdanh-arm
Jc/plat bl1 exit
2015-10-20Merge pull request #409 from sandrine-bailleux/sb/break-down-bl1-sync-exceptionsdanh-arm
Break down BL1 AArch64 synchronous exception handler
2015-10-20Add optional bl1_plat_prepare_exit() APIJuan Castillo
This patch adds an optional API to the platform port: void bl1_plat_prepare_exit(void); This function is called prior to exiting BL1 in response to the RUN_IMAGE_SMC request raised by BL2. It should be used to perform platform specific clean up or bookkeeping operations before transferring control to the next image. A weak empty definition of this function has been provided to preserve platform backwards compatibility. Change-Id: Iec09697de5c449ae84601403795cdb6aca166ba1
2015-10-20Reorganise PSCI PM handler setup on ARM Standard platformsSoby Mathew
This patch does the following reorganization to psci power management (PM) handler setup for ARM standard platform ports : 1. The mailbox programming required during `plat_setup_psci_ops()` is identical for all ARM platforms. Hence the implementation of this API is now moved to the common `arm_pm.c` file. Each ARM platform now must define the PLAT_ARM_TRUSTED_MAILBOX_BASE macro, which in current platforms is the same as ARM_SHARED_RAM_BASE. 2. The PSCI PM handler callback structure, `plat_psci_ops`, must now be exported via `plat_arm_psci_pm_ops`. This allows the common implementation of `plat_setup_psci_ops()` to return a platform specific `plat_psci_ops`. In the case of CSS platforms, a default weak implementation of the same is provided in `css_pm.c` which can be overridden by each CSS platform. 3. For CSS platforms, the PSCI PM handlers defined in `css_pm.c` are now made library functions and a new header file `css_pm.h` is added to export these generic PM handlers. This allows the platform to reuse the adequate CSS PM handlers and redefine others which need to be customized when overriding the default `plat_arm_psci_pm_ops` in `css_pm.c`. Change-Id: I277910f609e023ee5d5ff0129a80ecfce4356ede
2015-10-19Break down BL1 AArch64 synchronous exception handlerSandrine Bailleux
The AArch64 synchronous exception vector code in BL1 is almost reaching its architectural limit of 32 instructions. This means there is very little space for this code to grow. This patch reduces the size of the exception vector code by moving most of its code in a function to which we branch from SynchronousExceptionA64. Change-Id: Ib35351767a685fb2c2398029d32e54026194f7ed
2015-10-19Merge pull request #408 from sandrine-bailleux/sb/cassertdanh-arm
Make CASSERT() macro callable from anywhere
2015-10-19Merge pull request #407 from sandrine-bailleux/sb/fix-arm-bl1-setup-includedanh-arm
Fix #include path in ARM platform BL1 setup code
2015-10-19Make CASSERT() macro callable from anywhereSandrine Bailleux
The CASSERT() macro introduces a typedef for the sole purpose of triggering a compilation error if the condition to check is false. This typedef is not used afterwards. As a consequence, when the CASSERT() macro is called from withing a function block, the compiler complains and outputs the following error message: error: typedef 'msg' locally defined but not used [-Werror=unused-local-typedefs] This patch adds the "unused" attribute for the aforementioned typedef. This silences the compiler warning and thus makes the CASSERT() macro callable from within function blocks as well. Change-Id: Ie36b58fcddae01a21584c48bb6ef43ec85590479
2015-10-19Fix #include path in ARM platform BL1 setup codeSandrine Bailleux
This patch fixes the relative path to the 'bl1_private.h' header file included from 'arm_bl1_setup.c'. Note that, although the path was incorrect, it wasn't causing a compilation error because the header file still got included through an alternative include search path. Change-Id: I28e4f3dbe50e3550ca6cad186502c88a9fb5e260
2015-10-14Merge pull request #405 from vwadekar/tlkd-resume-fid-v3danh-arm
TLKD: pass results with TLK_RESUME_FID function ID
2015-10-14Merge pull request #406 from sandrine-bailleux/sb/cci-init-fix-assertiondanh-arm
Fix debug assertion in deprecated CCI-400 driver
2015-10-12Fix debug assertion in deprecated CCI-400 driverSandrine Bailleux
This patch fixes a copy and paste issue that resulted in the cluster indexes not being checked as intended. Note that this fix applies to the deprecated CCI-400 driver, not the unified one. Change-Id: I497132a91c236690e5eaff908f2db5c8c65e85ab
2015-10-09TLKD: pass results with TLK_RESUME_FID function IDVarun Wadekar
TLK sends the "preempted" event to the NS world along with an identifier for certain use cases. The NS world driver is then expected to take appropriate action depending on the identifier value. Upon completion, the NS world driver then sends the results to TLK (via x1-x3) with the TLK_RESUME_FID function ID. This patch uses the already present code to pass the results from the NS world to TLK for the TLK_RESUME_FID function ID. Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>