project/bcm63xx/atf.git
8 years agoClarify dependency for PSCI_EXTENDED_STATE_ID
Douglas Raillard [Mon, 7 Nov 2016 17:29:34 +0000 (17:29 +0000)]
Clarify dependency for PSCI_EXTENDED_STATE_ID

Add dependency information in the user guide for ARM_RECOM_STATE_ID_ENC
that needs to be set when using PSCI_EXTENDED_STATE_ID on ARM
platforms. Also clarify the build error message.

Change-Id: Id125a0299b179f5f222bca4e2503204bf89a3c59
Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
8 years agoMerge pull request #757 from douglas-raillard-arm/dr/doc_plat_psci_ops
danh-arm [Wed, 16 Nov 2016 11:36:01 +0000 (11:36 +0000)]
Merge pull request #757 from douglas-raillard-arm/dr/doc_plat_psci_ops

Document plat_psci_ops.(system_off|system_reset)

8 years agoMerge pull request #756 from douglas-raillard-arm/dr/doc_fix_link_fw_design
danh-arm [Wed, 16 Nov 2016 11:35:49 +0000 (11:35 +0000)]
Merge pull request #756 from douglas-raillard-arm/dr/doc_fix_link_fw_design

firmware-design.md: Fix broken link

8 years agoMerge pull request #754 from davidcunado-arm/dc/reset_debug_reg
danh-arm [Wed, 16 Nov 2016 11:35:31 +0000 (11:35 +0000)]
Merge pull request #754 from davidcunado-arm/dc/reset_debug_reg

Reset debug registers MDCR-EL3/SDCR and MDCR_EL2/HDCR

8 years agofirmware-design.md: Fix broken link
Douglas Raillard [Wed, 9 Nov 2016 14:00:04 +0000 (14:00 +0000)]
firmware-design.md: Fix broken link

Fix a link broken by a missing space that turned
it into a link to an non-existent anchor.

Change-Id: Ie863e963db28afa3a28b69d3f63bd7638bdf5af9
Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
8 years agoDocument plat_psci_ops.(system_off|system_reset)
Douglas Raillard [Mon, 31 Oct 2016 13:26:03 +0000 (13:26 +0000)]
Document plat_psci_ops.(system_off|system_reset)

fixes ARM-Software/tf-issues#346

Change-Id: I946c8eab650bba7407775462ce91f394d767e079
Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
8 years agoReset debug registers MDCR-EL3/SDCR and MDCR_EL2/HDCR
David Cunado [Mon, 31 Oct 2016 17:37:34 +0000 (17:37 +0000)]
Reset debug registers MDCR-EL3/SDCR and MDCR_EL2/HDCR

In order to avoid unexpected traps into EL3/MON mode, this patch
resets the debug registers, MDCR_EL3 and MDCR_EL2 for AArch64,
and SDCR and HDCR for AArch32.

MDCR_EL3/SDCR is zero'ed when EL3/MON mode is entered, at the
start of BL1 and BL31/SMP_MIN.

For MDCR_EL2/HDCR, this patch zero's the bits that are
architecturally UNKNOWN values on reset. This is done when
exiting from EL3/MON mode but only on platforms that support
EL2/HYP mode but choose to exit to EL1/SVC mode.

Fixes ARM-software/tf-issues#430

Change-Id: Idb992232163c072faa08892251b5626ae4c3a5b6
Signed-off-by: David Cunado <david.cunado@arm.com>
8 years agoMerge pull request #753 from douglas-raillard-arm/dr/readme_linaro_release
danh-arm [Wed, 9 Nov 2016 15:38:26 +0000 (15:38 +0000)]
Merge pull request #753 from douglas-raillard-arm/dr/readme_linaro_release

readme.md: Add tested Linaro release information for FVPs

8 years agoreadme.md: Add tested Linaro release information for FVPs
Douglas Raillard [Wed, 26 Oct 2016 10:32:41 +0000 (11:32 +0100)]
readme.md: Add tested Linaro release information for FVPs

The platform testing information in the readme currently states which
Linaro release has been tested on Juno platform.

This patch adds the same information for the AArch64/32 FVPs platforms.

Change-Id: Ifa89843ee1744e5030367197648b7a2f4c44cc24
Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
8 years agoMerge pull request #752 from rockchip-linux/rk3399/fixes-s2r-1107
danh-arm [Tue, 8 Nov 2016 12:17:44 +0000 (12:17 +0000)]
Merge pull request #752 from rockchip-linux/rk3399/fixes-s2r-1107

rk3399: fixes and updates for s2r

8 years agoMerge pull request #751 from jeenu-arm/ug-reorder
danh-arm [Tue, 8 Nov 2016 11:30:31 +0000 (11:30 +0000)]
Merge pull request #751 from jeenu-arm/ug-reorder

Alphabetical reordering for build options and make files

8 years agoMerge pull request #750 from jwerner-chromium/m0_build
danh-arm [Tue, 8 Nov 2016 11:29:43 +0000 (11:29 +0000)]
Merge pull request #750 from jwerner-chromium/m0_build

RK3399 M0 build system improvements

8 years agobuild: Reorder build variables alphabetically
Jeenu Viswambharan [Mon, 24 Oct 2016 13:31:51 +0000 (14:31 +0100)]
build: Reorder build variables alphabetically

When build variables are assigned or processed en masse, they'd appear
neater in alphabetical order.

Static initializations are moved to a separate file,
make_helpers/defaults.mk, which in itself is sorted alphabetically.

No functional changes.

Change-Id: I966010042b33de6b67592fb9ffcef8fc44d7d128
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
8 years agodocs: Reorder build options alphabetically
Jeenu Viswambharan [Mon, 24 Oct 2016 13:31:51 +0000 (14:31 +0100)]
docs: Reorder build options alphabetically

At present, build options in the user guide aren't listed in any
specific order. Ordering them alphabetically is a standard practice, and
is also easier on the reader.

Contents unchanged.

Change-Id: Ibc36f3a2a576edb86c1a402430d2ef5adcb2f144
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
8 years agorockchip: remove no needed code for rk3399
Caesar Wang [Wed, 26 Oct 2016 00:14:40 +0000 (17:14 -0700)]
rockchip: remove no needed code for rk3399

We have do something for clocks gate.

Fox example as the below:
susped:
clk_gate_con_save();
clk_gate_con_disable();

resume:
clk_gate_con_restore();
--

SO, add the plls_suspend_prepare() and plls_resume_finish() are not
necessary to S2R, that will save S2R time if remove them.

BRANCH=none
BUG=chrome-os-partner:58870,chrome-os-partner:55934
TEST=build kevin, two dogfooders with suspend_stress_test
passing 3000 cycles and still going on.

Change-Id: Icfbabc0b3ea8d2b5108d4f3de99a803b6d459669
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: disable watchdog during suspend
Caesar Wang [Fri, 4 Nov 2016 13:13:01 +0000 (21:13 +0800)]
rockchip: disable watchdog during suspend

The CA53 and CM0 WDT clock gating in rk3399 SGRF, and ATF is in charge of
it because the kernel can't touch SGRF.

Basically the WDT didn't stop at suspend time, it just switched from the
24M to the 32k clock. That meant that the WDT would fire if you slept for
long enough. In other word, the watchdog timer over count will increase to
750 (24*1000/32) times.
The RK3399 HW watchdog interval is 21 seconds. When machine enters the
suspend, the watchdog will reset the system after 35.7 (750/21) hours.

BUG=chrome-os-partner:59257
TEST=daisydog checked and set value, powerd_dbus_suspend to verify.

Change-Id: I88bb2a05b7d67d5ffd292f9d05d033ae9a6a3593
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: Add proper dependency tracking to M0 Makefile
Julius Werner [Thu, 3 Nov 2016 19:25:48 +0000 (12:25 -0700)]
rockchip: Add proper dependency tracking to M0 Makefile

This patch adds dependency rule generation and inclusion to the M0
Makefile, so that M0 objects will get correctly remade with an
incremental build if a header file they included changed.

Change-Id: I2067bd9fd4d9dad3e77a09cbf09c7b4db3c1eda5
Signed-off-by: Julius Werner <jwerner@chromium.org>
8 years agorockchip: Clean up parent directory creation for M0
Julius Werner [Tue, 1 Nov 2016 02:18:47 +0000 (19:18 -0700)]
rockchip: Clean up parent directory creation for M0

The dependencies in the M0 Makefile are not correctly laid out, which
may lead to errors with make -j if the binary target gets evaluated
before the target that creates the directory. In addition, the M0
Makefile just calls mkdir without using the platform-independent macros
from the main ARM TF build system. This patch fixes those issues,
removes some unused (and broken) M0 build targets and merges the two M0
output directories into one (since there's no real point splitting it up
and it creates more hassle).

Change-Id: Ia5002479cf9c57fea7aefa8ca88e373df3a51f61
Signed-off-by: Julius Werner <jwerner@chromium.org>
8 years agoMerge pull request #749 from sandrine-bailleux-arm/sb/fix-bl1_plat_mem_check-doc
danh-arm [Thu, 3 Nov 2016 17:49:32 +0000 (17:49 +0000)]
Merge pull request #749 from sandrine-bailleux-arm/sb/fix-bl1_plat_mem_check-doc

Porting guide: Improve bl1_plat_mem_check() doc

8 years agoMerge pull request #748 from dp-arm/dp/arm-sip
danh-arm [Thu, 3 Nov 2016 17:49:16 +0000 (17:49 +0000)]
Merge pull request #748 from dp-arm/dp/arm-sip

BL31 runtime instrumentation fixes and documentation update

8 years agoPorting guide: Improve bl1_plat_mem_check() doc
Sandrine Bailleux [Thu, 3 Nov 2016 14:26:37 +0000 (14:26 +0000)]
Porting guide: Improve bl1_plat_mem_check() doc

This patch fixes the type of the return value of bl1_plat_mem_check()
in the porting guide. It also specifies the expected return value.

Change-Id: I7c437342b8bfb1e621d74b2edf0aaf97b913216a
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
8 years agoPerform a cache flush after ENTER PSCI timestamp capture
dp-arm [Mon, 31 Oct 2016 17:17:21 +0000 (17:17 +0000)]
Perform a cache flush after ENTER PSCI timestamp capture

Without an explicit cache flush, the next timestamp captured might have
a bogus value.

This can happen if the following operations happen in order,
on a CPU that's being powered down.

1) ENTER PSCI timestamp is captured with caches enabled.

2) The next timestamp (ENTER_HW_LOW_PWR) is captured with caches
   disabled.

3) On a system that uses a write-back cache configuration, the
   cache line that holds the PMF timestamps is evicted.

After step 1), the ENTER_PSCI timestamp is cached and not in main memory.
After step 2), the ENTER_HW_LOW_PWR timestamp is stored in main memory.
Before the CPU power down happens, the hardware evicts the cache line that
contains the PMF timestamps for this service.  As a result, the timestamp
captured in step 2) is overwritten with a bogus value.

Change-Id: Ic1bd816498d1a6d4dc16540208ed3a5efe43f529
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
8 years agouser guide: Document `ENABLE_RUNTIME_INSTRUMENTATION` option
dp-arm [Fri, 14 Oct 2016 10:18:09 +0000 (11:18 +0100)]
user guide: Document `ENABLE_RUNTIME_INSTRUMENTATION` option

Change-Id: I8e50df67e860b9589834445761a7b9927690fdce
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
8 years agoMerge pull request #745 from rockchip-linux/support-rk3399-dram
danh-arm [Thu, 3 Nov 2016 15:13:36 +0000 (15:13 +0000)]
Merge pull request #745 from rockchip-linux/support-rk3399-dram

Support rk3399 dram

8 years agoMerge pull request #746 from antonio-nino-diaz-arm/an/fix-checkpatch
danh-arm [Thu, 3 Nov 2016 12:17:38 +0000 (12:17 +0000)]
Merge pull request #746 from antonio-nino-diaz-arm/an/fix-checkpatch

Fix format of patches passed to checkpatch

8 years agoMerge pull request #742 from masahir0y/misc
davidcunado-arm [Mon, 31 Oct 2016 23:12:03 +0000 (23:12 +0000)]
Merge pull request #742 from masahir0y/misc

Comment fixes and .gitignore update

8 years agoMerge pull request #744 from masahir0y/fiptool
davidcunado-arm [Fri, 28 Oct 2016 22:18:16 +0000 (23:18 +0100)]
Merge pull request #744 from masahir0y/fiptool

fiptool: fix Segmentation fault when only --verbose option is given

8 years agoFix format of patches passed to checkpatch
Antonio Nino Diaz [Thu, 27 Oct 2016 08:36:09 +0000 (09:36 +0100)]
Fix format of patches passed to checkpatch

Checkpatch is a script developed to verify the style of Linux kernel
patches. As Kernel developers use emails to send patches for review,
checkpatch is prepared for that specific format. This change adapts
the Makefile to use said format.

As a result, indentation in the commit message has been removed, thus
fixing the warnings about Signed-off-by lines being preceded by
whitespace.

Fixes ARM-software/tf-issues#432

Change-Id: I00cb86365fe15f7e2c3a99a306c8eb51cf02fe86
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
8 years agoMerge pull request #741 from sandrine-bailleux-arm/sb/checkpatch-signoff
davidcunado-arm [Thu, 27 Oct 2016 08:31:29 +0000 (09:31 +0100)]
Merge pull request #741 from sandrine-bailleux-arm/sb/checkpatch-signoff

Mandate 'Signed-off-by' line in commit messages

8 years agoMerge pull request #738 from dp-arm/dp/fiptool-uuid
davidcunado-arm [Thu, 27 Oct 2016 08:31:00 +0000 (09:31 +0100)]
Merge pull request #738 from dp-arm/dp/fiptool-uuid

fiptool: Link `toc_entry` and `image` structures via UUID

8 years agorockchip: close the PD center logic during suspend
Caesar Wang [Wed, 26 Oct 2016 17:13:34 +0000 (01:13 +0800)]
rockchip: close the PD center logic during suspend

The RK3399 supports close the center logic enter power mode,
so we can close PD_CENTER to save more power during suspend.
Therefore, we need to support save/restore the DDR PHY and
controller registers during suspend/resume.

Also, need CL (http://crosreview.com/397399) to check disabling
center logic.

Change-Id: I288defd8e9caa3846d9fa663a33e4d51df1aaa5d
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: add support save/restore configuration for DDR during enter S3
Caesar Wang [Wed, 26 Oct 2016 17:13:16 +0000 (01:13 +0800)]
rockchip: add support save/restore configuration for DDR during enter S3

This patch intend to support save the registers of the DDR controller
and PHY before suspend, and restore them after resume.

Change-Id: Ia10b476c0b837628ac0f365416a7118292753e96
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: Change dmc register accesses to ATF style for rk3399
Caesar Wang [Wed, 26 Oct 2016 17:12:47 +0000 (01:12 +0800)]
rockchip: Change dmc register accesses to ATF style for rk3399

This changes the style of dmc register accesses to be a read/write on
a base address plus a register offset instead of reinterpretting a
base address as a struct and accessing members within that struct.

Change-Id: Iead097cd6afdb830d8bc193608cd39d01ce5a6bc
Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: Break out common dram code for rk3399
Caesar Wang [Wed, 26 Oct 2016 17:12:34 +0000 (01:12 +0800)]
rockchip: Break out common dram code for rk3399

This renames dram.c and dram.h to dfs.c and dfs.h respectively. This
is to make room for common functionality between frequency scaling and
suspend code for the DRAM in a pair of common files named dram.c and
dram.h. It also removes a duplicate enum definition from
dram_spec_timing.h

Change-Id: Ibfa1041f8781401f9d27901fe8c61862bcb05562
Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: move pmu registers into another header for rk3399
Caesar Wang [Wed, 26 Oct 2016 17:10:28 +0000 (01:10 +0800)]
rockchip: move pmu registers into another header for rk3399

This moves the PMU register definitions into another file for use in
later patches.

Change-Id: I8b5f1e7938b63ada6a743cf9661c3e474e96e4e4
Signed-off-by: Derek Basehore <dbasehore@chromium.org>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agofiptool: fix Segmentation fault when only --verbose option is given
Masahiro Yamada [Wed, 26 Oct 2016 04:24:26 +0000 (13:24 +0900)]
fiptool: fix Segmentation fault when only --verbose option is given

Fix the following bug:

  $ tools/fiptool/fiptool -v
  Segmentation fault (core dumped)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoMerge pull request #724 from rockchip-linux/support-rk3399-sdram
davidcunado-arm [Wed, 26 Oct 2016 08:54:36 +0000 (09:54 +0100)]
Merge pull request #724 from rockchip-linux/support-rk3399-sdram

rockchip: optimize the link mechanism for SRAM code

8 years agoMerge pull request #739 from rockchip-linux/fixes-latency
davidcunado-arm [Wed, 26 Oct 2016 08:53:34 +0000 (09:53 +0100)]
Merge pull request #739 from rockchip-linux/fixes-latency

rockchip: fix A72 L2CTLR_DATA_RAM_LATENCY to 5

8 years agorockchip: fix A72 L2CTLR_DATA_RAM_LATENCY to 5
Caesar Wang [Thu, 4 Aug 2016 12:46:35 +0000 (20:46 +0800)]
rockchip: fix A72 L2CTLR_DATA_RAM_LATENCY to 5

The default value of L2CTLR_DATA_RAM_LATENCY is 2, depends to
the test result on rk3399, the A72 will need lower voltage for
high frequency if it's set to be 5, and almost no effect on performance.

Change-Id: I99a6a43edcc0c58f7775c10f4b85669dc3eff66d
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: clear the power mode status via M0
Caesar Wang [Tue, 11 Oct 2016 17:47:51 +0000 (01:47 +0800)]
rockchip: clear the power mode status via M0

Due to the PMU design, the PMU may not clear the WAKEUP bit after
wakeup, therefore, the state machine at the power mode may enter
the infinite loop during WFI.

There is a solution that we can use the M0 to monitor the WAKEUP
bit and clear it during power mode, then the state machine will be
recovered immediately. Then, the DUT can exit the WFI normally.

Change-Id: I303628553b728c214bf2d436bd3122032b5e669c
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: add M0 source code and build system for RK3399
Caesar Wang [Wed, 12 Oct 2016 00:10:12 +0000 (08:10 +0800)]
rockchip: add M0 source code and build system for RK3399

This CL supports add M0 source code to built into the bl31.bin, the
goal is that we can load the M0 code binary into SRAM and execute it.

We need the M0 help us to clean the power_mode_en bit during the AP
PMU enter the state machine with interrupt, and avoid to the AP can
not exit the loop forever.

Change-Id: I844582c54a1f0d44ca41290d44618df58679f341
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years agorockchip: optimize the link mechanism for SRAM code
Caesar Wang [Tue, 11 Oct 2016 01:36:00 +0000 (09:36 +0800)]
rockchip: optimize the link mechanism for SRAM code

Add the common extra.ld.S and customized rk3399.ld.S to extend
to more features for different platforms.
For example, we can add SRAM section and specific address to
load there if we need it, and the common bl31.ld.S not need to
be modified.

Therefore, we can remove the unused codes which copying explicitly
from the function pmusram_prepare(). It looks like more clear.

Change-Id: Ibffa2da5e8e3d1d2fca80085ebb296ceb967fce8
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
8 years ago.gitignore: ignore editor backup files
Masahiro Yamada [Sat, 3 Sep 2016 02:40:24 +0000 (11:40 +0900)]
.gitignore: ignore editor backup files

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoFix comment of plat_reset_handler stub
Masahiro Yamada [Sat, 24 Sep 2016 09:07:46 +0000 (18:07 +0900)]
Fix comment of plat_reset_handler stub

As described in the Porting Guide, plat_reset_handler should
preserve x19 to x29.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoDocs: fix a typo in Porting Guide about plat_get_my_entrypoint()
Masahiro Yamada [Sat, 22 Oct 2016 16:15:21 +0000 (01:15 +0900)]
Docs: fix a typo in Porting Guide about plat_get_my_entrypoint()

Do not double the phrase "called with the".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoMandate 'Signed-off-by' line in commit messages
Sandrine Bailleux [Mon, 24 Oct 2016 12:09:08 +0000 (13:09 +0100)]
Mandate 'Signed-off-by' line in commit messages

This patch updates the configuration file for the checkpatch.pl
script to check for the presence of a 'Signed-off-by' line in the
commit message. This is now required by TF contribution process.

Change-Id: I8bcd6d39a5dcd85547244d60c10a7cd2148c404f

Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
8 years agoMerge pull request #740 from rockchip-linux/rk3399/fixes-cru-typo
davidcunado-arm [Mon, 24 Oct 2016 11:36:03 +0000 (12:36 +0100)]
Merge pull request #740 from rockchip-linux/rk3399/fixes-cru-typo

rockchip: fixes the wrong CLKSEL_CON count for CRU

8 years agorockchip: fixes the wrong CLKSEL_CON count for CRU
Caesar Wang [Thu, 20 Oct 2016 21:14:45 +0000 (14:14 -0700)]
rockchip: fixes the wrong CLKSEL_CON count for CRU

The CRU_CLKSEL_COUNT value is 108, not 0x108.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ib9db066b8b3ecafcee7f645dd5633b55a808e3d7

8 years agoMerge pull request #677 from hzhuang1/gpt
danh-arm [Tue, 18 Oct 2016 15:32:57 +0000 (16:32 +0100)]
Merge pull request #677 from hzhuang1/gpt

partition: check GPT partition table

8 years agofiptool: Link `toc_entry` and `image` structures via UUID
dp-arm [Tue, 30 Aug 2016 13:18:58 +0000 (14:18 +0100)]
fiptool: Link `toc_entry` and `image` structures via UUID

The `toc_entry` and `image` data structures had a cyclic
relationship.  This patch removes the explicit dependencies and introduces
functions to link them via the UUID.

This change highlights the intent of the code better and makes it more
flexible for future enhancements.

Change-Id: I0c3dd7bfda2a631a3827c8ba4831849c500affe9
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
8 years agoMerge pull request #735 from soby-mathew/sm/aarch32_sctlr
danh-arm [Mon, 17 Oct 2016 11:20:18 +0000 (12:20 +0100)]
Merge pull request #735 from soby-mathew/sm/aarch32_sctlr

Unify SCTLR initialization for AArch32 normal world

8 years agoMerge pull request #734 from afaerber/make-help
danh-arm [Mon, 17 Oct 2016 11:19:45 +0000 (12:19 +0100)]
Merge pull request #734 from afaerber/make-help

Makefile: Add missing space in help output

8 years agoMerge pull request #730 from dp-arm/dp/uuid-cleanup
danh-arm [Mon, 17 Oct 2016 11:19:34 +0000 (12:19 +0100)]
Merge pull request #730 from dp-arm/dp/uuid-cleanup

Remove non-standard <sys/cdefs.h> include from uuid.h

8 years agoMerge pull request #729 from dp-arm/dp/arm-sip
danh-arm [Mon, 17 Oct 2016 11:19:20 +0000 (12:19 +0100)]
Merge pull request #729 from dp-arm/dp/arm-sip

Add instrumentation support for PSCI

8 years agoMerge pull request #721 from rockchip-linux/fixes-the-clock-select-and-divide-register
davidcunado-arm [Fri, 14 Oct 2016 11:25:06 +0000 (12:25 +0100)]
Merge pull request #721 from rockchip-linux/fixes-the-clock-select-and-divide-register

rockchip: fixes the clock select and divide register for rk3399

8 years agoUnify SCTLR initialization for AArch32 normal world
Soby Mathew [Thu, 29 Sep 2016 13:15:57 +0000 (14:15 +0100)]
Unify SCTLR initialization for AArch32 normal world

The values of CP15BEN, nTWI & nTWE bits in SCTLR_EL1 are architecturally
unknown if EL3 is AARCH64 whereas they reset to 1 if EL3 is AArch32. This
might be a compatibility break for legacy AArch32 normal world software if
these bits are not set to 1 when EL3 is AArch64. This patch enables the
CP15BEN, nTWI and nTWE bits in the SCTLR_EL1 if the lower non-secure EL is
AArch32. This unifies the SCTLR settings for lower non-secure EL in AArch32
mode for both AArch64 and AArch32 builds of Trusted Firmware.

Fixes ARM-software/tf-issues#428

Change-Id: I3152d1580e4869c0ea745c5bd9da765f9c254947
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
8 years agoMerge pull request #733 from danh-arm/dh/v1.3-final
davidcunado-arm [Thu, 13 Oct 2016 16:49:06 +0000 (17:49 +0100)]
Merge pull request #733 from danh-arm/dh/v1.3-final

Final updates for v1.3 release

8 years agoMerge pull request #736 from davidcunado-arm/dc/v1.3_update
davidcunado-arm [Thu, 13 Oct 2016 16:48:29 +0000 (17:48 +0100)]
Merge pull request #736 from davidcunado-arm/dc/v1.3_update

Release v1.3: Minor updates to user guide

8 years agoRelease v1.3: Minor updates to user guide
David Cunado [Thu, 13 Oct 2016 15:04:12 +0000 (16:04 +0100)]
Release v1.3: Minor updates to user guide

Updated the user guide to clarify building FIP for AArch32.
The instructions were previously specific to building a FIP for AArch64.

Change-Id: I7bd1a6b8e810cfda411f707e04f479006817858e
Signed-off-by: David Cunado <david.cunado@arm.com>
8 years agoUpdate readme.md for v1.3
Dan Handley [Tue, 11 Oct 2016 15:17:11 +0000 (16:17 +0100)]
Update readme.md for v1.3

Update the release notes (readme.md) for the ARM Trusted Firmware
v1.3 release.

Change-Id: Ia1f4eb1897e63eeab7d69a593ba0ad91d50043f5
Signed-off-by: Dan Handley <dan.handley@arm.com>
8 years agoRelease v1.3: Update minor version number to 3
David Cunado [Tue, 4 Oct 2016 15:06:37 +0000 (16:06 +0100)]
Release v1.3: Update minor version number to 3

Change-Id: I05991543d28e70b67be600b714990af6a8d7ba29

8 years agoRelease v1.3: update change-log.md
David Cunado [Mon, 3 Oct 2016 17:20:35 +0000 (18:20 +0100)]
Release v1.3: update change-log.md

Updated change-log.md with summary of changes since release v1.2.

Change-Id: Ia1e18ff4b0da567cf12dfcb53e6317e995100bdf

8 years agoMerge pull request #732 from dp-arm/dp/pmf-doc
danh-arm [Wed, 12 Oct 2016 16:17:19 +0000 (17:17 +0100)]
Merge pull request #732 from dp-arm/dp/pmf-doc

PMF: Add documentation

8 years agoPMF: Add documentation
dp-arm [Thu, 8 Sep 2016 10:54:22 +0000 (11:54 +0100)]
PMF: Add documentation

Add a Performance Measurement Framework (PMF) section
to the firmware design document.

Change-Id: I5953bd3b1067501f190164c8827d2b0d8022fc0b
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
8 years agoRemove non-standard <sys/cdefs.h> include from uuid.h
dp-arm [Fri, 16 Sep 2016 14:46:47 +0000 (15:46 +0100)]
Remove non-standard <sys/cdefs.h> include from uuid.h

This include provides nothing useful for TF and prevents building
the fiptool using musl libc[0].

[0] https://www.musl-libc.org/

Change-Id: Ied35e16b9ea2b40213433f2a8185dddc59077884
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
8 years agoAdd PMF instrumentation points in TF
dp-arm [Mon, 19 Sep 2016 10:18:44 +0000 (11:18 +0100)]
Add PMF instrumentation points in TF

In order to quantify the overall time spent in the PSCI software
implementation, an initial collection of PMF instrumentation points
has been added.

Instrumentation has been added to the following code paths:

- Entry to PSCI SMC handler.  The timestamp is captured as early
  as possible during the runtime exception and stored in memory
  before entering the PSCI SMC handler.

- Exit from PSCI SMC handler.  The timestamp is captured after
  normal return from the PSCI SMC handler or if a low power state
  was requested it is captured in the bl31 warm boot path before
  return to normal world.

- Entry to low power state.  The timestamp is captured before entry
  to a low power state which implies either standby or power down.
  As these power states are mutually exclusive, only one timestamp
  is defined to describe both.  It is possible to differentiate between
  the two power states using the PSCI STAT interface.

- Exit from low power state.  The timestamp is captured after a standby
  or power up operation has completed.

To calculate the number of cycles spent running code in Trusted Firmware
one can perform the following calculation:

(exit_psci - enter_psci) - (exit_low_pwr - enter_low_pwr).

The resulting number of cycles can be converted to time given the
frequency of the counter.

Change-Id: Ie3b8f3d16409b6703747093b3a2d5c7429ad0166
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
8 years agoIntroduce ARM SiP service
dp-arm [Mon, 19 Sep 2016 10:21:03 +0000 (11:21 +0100)]
Introduce ARM SiP service

This patch adds ARM SiP service for use by ARM standard platforms.
This service is added to support the SMC interface for the Performance
measurement framework(PMF).

Change-Id: I26f5712f9ab54f5f721dd4781e35a16f40aacc44
Signed-off-by: dp-arm <dimitris.papastamos@arm.com>
8 years agoMerge pull request #731 from danh-arm/an/fix-juno-doc
danh-arm [Wed, 12 Oct 2016 10:52:57 +0000 (11:52 +0100)]
Merge pull request #731 from danh-arm/an/fix-juno-doc

Fix documentation of bootwrapper boot on juno

8 years agoFix documentation of bootwrapper boot on juno
Antonio Nino Diaz [Wed, 20 Apr 2016 10:55:14 +0000 (11:55 +0100)]
Fix documentation of bootwrapper boot on juno

The user guide incorrectly claimed that it is possible to load a
bootwrapped kernel over JTAG on Juno in the same manner as an EL3
payload. In the EL3 payload boot flow, some of the platform
initialisations in BL2 are modified. In particular, the TZC settings
are modified to allow unrestricted access to DRAM. This in turn allows
the debugger to access the DRAM and therefore to load the image there.

In the BL33-preloaded boot flow though, BL2 uses the default TZC
programming, which prevent access to most of the DRAM from secure state.
When execution reaches the SPIN_ON_BL1_EXIT loop, the MMU is disabled
and thus DS-5 presumably issues secure access transactions while trying
to load the image, which fails.

One way around it is to stop execution at the end of BL2 instead. At
this point, the MMU is still enabled and the DRAM is mapped as
non-secure memory. Therefore, the debugger is allowed to access this
memory in this context and to sucessfully load the bootwrapped kernel in
DRAM. The user guide is updated to suggest this alternative method.

Co-Authored-By: Sandrine Bailleux <sandrine.bailleux@arm.com>
Signed-off-by: Dan Handley <dan.handley@arm.com>
Change-Id: I537ea1c6d2f96edc06bc3f512e770c748bcabe94

8 years agoMerge pull request #728 from yatharth-arm/yk/AArch32_porting_doc
danh-arm [Wed, 12 Oct 2016 10:15:35 +0000 (11:15 +0100)]
Merge pull request #728 from yatharth-arm/yk/AArch32_porting_doc

AArch32: Update firmware-design.md

8 years agoMerge pull request #727 from soby-mathew/sm/PSCI_lib_doc
danh-arm [Wed, 12 Oct 2016 10:15:06 +0000 (11:15 +0100)]
Merge pull request #727 from soby-mathew/sm/PSCI_lib_doc

AArch32: Update user-guide and add DTBs

8 years agoMerge pull request #726 from soby-mathew/sm/fix_dt
danh-arm [Wed, 12 Oct 2016 10:14:29 +0000 (11:14 +0100)]
Merge pull request #726 from soby-mathew/sm/fix_dt

Fix GICv3 DT to include psci system off/reset

8 years agoMerge pull request #725 from jeenu-arm/fix-duplicate-title
danh-arm [Wed, 12 Oct 2016 10:13:58 +0000 (11:13 +0100)]
Merge pull request #725 from jeenu-arm/fix-duplicate-title

Docs: Rename duplicate title in porting guide

8 years agoAArch32: Update user-guide and add DTBs
Soby Mathew [Wed, 14 Sep 2016 14:51:44 +0000 (15:51 +0100)]
AArch32: Update user-guide and add DTBs

This patch adds necessary updates for building and running Trusted
Firmware for AArch32 to user-guide.md. The instructions for running
on both `FVP_Base_AEMv8A-AEMv8A` in AArch32 mode and
`FVP_Base_Cortex-A32x4` models are added. The device tree files for
AArch32 Linux kernel are also added in the `fdts` folder.

Change-Id: I0023b6b03e05f32637cb5765fdeda8c8df2d0d3e

8 years agoAArch32: Update firmware-design.md
Yatharth Kochar [Wed, 24 Aug 2016 11:20:02 +0000 (12:20 +0100)]
AArch32: Update firmware-design.md

This patch updates the firmware-design.md for AArch32 related changes.

Change-Id: Idf392a44861ab9c1f59f3de4f3435f508b17c678

8 years agoDocs: Rename duplicate title in porting guide
Jeenu Viswambharan [Tue, 11 Oct 2016 10:43:04 +0000 (11:43 +0100)]
Docs: Rename duplicate title in porting guide

Fix one of the two titles that ended up being the same, although both
describe different things.

Change-Id: I66ecf369643709898ee4c014659d8f85c0480643

8 years agoFix GICv3 DT to include psci system off/reset
Soby Mathew [Wed, 5 Oct 2016 14:38:01 +0000 (15:38 +0100)]
Fix GICv3 DT to include psci system off/reset

The `fvp-base-gicv3-psci` and `fvp-foundation-gicv3-psci` device tree source
files did not have psci node entries for `system off` and `system reset`.
Also the DTS files included `rtsm_ve-motherboard-no_psci.dtsi` instead of
`rtsm_ve-motherboard.dtsi`. As a result, the Linux kernel failed to invoke
the PSCI_SYSTEM_OFF/RESET API when being shutdown/reset. This patch corrects
this problem and also updates the corresponding DTB files.

This patch also removes `rtsm_ve-motherboard-no_psci.dtsi` and
`fvp-foundation-motherboard-no_psci.dtsi` files as they are no longer used.

Change-Id: I8ba61a1323035f7508cae663bb490ac0e8a64618

8 years agoMakefile: Add missing space in help output
Andreas Färber [Mon, 10 Oct 2016 03:18:49 +0000 (05:18 +0200)]
Makefile: Add missing space in help output

Insert a cosmetic space before "(FIP)".

Signed-off-by: Andreas Färber <afaerber@suse.de>
8 years agoMerge pull request #719 from yatharth-arm/yk/AArch32_porting_memcpy
davidcunado-arm [Thu, 29 Sep 2016 09:49:29 +0000 (10:49 +0100)]
Merge pull request #719 from yatharth-arm/yk/AArch32_porting_memcpy

AArch32: Add `memcpy4` function in assembly

8 years agoMerge pull request #720 from soby-mathew/sm/PSCI_lib_docs
davidcunado-arm [Thu, 29 Sep 2016 09:49:14 +0000 (10:49 +0100)]
Merge pull request #720 from soby-mathew/sm/PSCI_lib_docs

Docs: Add the PSCI library integration guide

8 years agoMerge pull request #722 from danh-arm/dh/drop-cla
danh-arm [Wed, 28 Sep 2016 22:26:56 +0000 (23:26 +0100)]
Merge pull request #722 from danh-arm/dh/drop-cla

Drop requirement for CLA in contribution.md

8 years agorockchip: fixes the clock select and divide register for rk3399
Caesar Wang [Wed, 28 Sep 2016 01:19:30 +0000 (18:19 -0700)]
rockchip: fixes the clock select and divide register for rk3399

As the new RK3399TRM v1.1, there are some wrong set for CRU_CLKSEL_CON
register.

As the CRU_CLKSEL_CON96~107 high 16-bit isn't write mask and the
CRU_CLKSEL_CON offset is 0x100,not 0x80.

Change-Id: Ie127e9de74b87100af9a0150aad43e89e4972529

8 years agoDocs: Add the PSCI library integration guide
Soby Mathew [Wed, 3 Aug 2016 13:26:51 +0000 (14:26 +0100)]
Docs: Add the PSCI library integration guide

This patch adds the PSCI library integration guide for AArch32 ARMv8-A
systems `psci-lib-integration-guide.md` to the documentation. The
patch also adds appropriate reference to the new document in
the `firmware-design.md` document.

Change-Id: I2d5b5c6b612452371713399702e318e3c73a8ee0

8 years agoAArch32: Add `memcpy4` function in assembly
Yatharth Kochar [Wed, 28 Sep 2016 10:00:05 +0000 (11:00 +0100)]
AArch32: Add `memcpy4` function in assembly

At present the `el3_entrypoint_common` macro uses `memcpy`
function defined in lib/stdlib/mem.c file, to copy data
from ROM to RAM for BL1. Depending on the compiler being
used the stack could potentially be used, in `memcpy`,
for storing the local variables. Since the stack is
initialized much later in `el3_entrypoint_common` it
may result in unknown behaviour.

This patch adds `memcpy4` function definition in assembly so
that it can be used before the stack is initialized and it
also replaces `memcpy` by `memcpy4` in `el3_entrypoint_common`
macro, to copy data from ROM to RAM for BL1.

Change-Id: I3357a0e8095f05f71bbbf0b185585d9499bfd5e0

8 years agoDrop requirement for CLA in contribution.md
Dan Handley [Tue, 20 Sep 2016 16:14:25 +0000 (17:14 +0100)]
Drop requirement for CLA in contribution.md

It is no longer necessary for contributors to send a CLA to ARM
before making contributions. Contributors must instead add a
"Signed-off-by:" line to each commit, which certifies that the
contribution is made under the Developer Certificate of Origin
(DCO).

Update contributing.md to reflect this new policy and add a copy of
the DCO to the repository.

Change-Id: I7ca98bffc3bf57e8bdd51d763c24f13e415a328b
Signed-off-by: Dan Handley <dan.handley@arm.com>
8 years agoMerge pull request #718 from sandrine-bailleux-arm/sb/update-deps-v1.3
davidcunado-arm [Tue, 27 Sep 2016 09:05:29 +0000 (10:05 +0100)]
Merge pull request #718 from sandrine-bailleux-arm/sb/update-deps-v1.3

Upgrade Linaro release, FVPs and mbed TLS versions

8 years agoUpgrade Linaro release, FVPs and mbed TLS versions
Sandrine Bailleux [Fri, 23 Sep 2016 15:20:25 +0000 (16:20 +0100)]
Upgrade Linaro release, FVPs and mbed TLS versions

This patch updates the User Guide to recommend the latest version
of some of the software dependencies of ARM Trusted Firmware.

 - Upgrade Linaro release:     16.02 -> 16.06

 - Upgrade FVPs
    - Foundation v8 FVP:       9.5 -> 10.1
    - Base FVPs:               7.6 -> 7.7

 - Upgrade mbed TLS library:   2.2.0 -> 2.2.1

Note that the latest release of mbed TLS as of today is 2.3.0 but it has
compilations issues with the set of library configuration options that
Trusted Firmware uses. 2.2.1 is the next most recent release known to
build with TF.

This patch also fixes the markdown formatting of a link in the
User Guide.

Change-Id: Ieb7dd336f4d3110fba060afec4ad580ae707a8f1

8 years agoMerge pull request #717 from sandrine-bailleux-arm/sb/foundation-fvp-v10
davidcunado-arm [Mon, 26 Sep 2016 09:20:08 +0000 (10:20 +0100)]
Merge pull request #717 from sandrine-bailleux-arm/sb/foundation-fvp-v10

Whitelist version 9.6 of Foundation FVP

8 years agoMerge pull request #716 from yatharth-arm/yk/AArch32_porting
davidcunado-arm [Fri, 23 Sep 2016 14:54:33 +0000 (15:54 +0100)]
Merge pull request #716 from yatharth-arm/yk/AArch32_porting

AArch32: Fix detection of virtualization support

8 years agoAArch32: Fix detection of virtualization support
Yatharth Kochar [Fri, 23 Sep 2016 09:48:29 +0000 (10:48 +0100)]
AArch32: Fix detection of virtualization support

The Virtualization field in the ID_PFR1 register has only 2
valid values (0 or 1) but it was incorrectly checked against
unrelated value tied to the SPSR register instead.

This patch fixes the detection of virtualization support by
using the valid values in BL1 context management code.

Change-Id: If12592e343770e1da90f0f5fecf0a3376047ac29

8 years agoWhitelist version 9.6 of Foundation FVP
Sandrine Bailleux [Thu, 22 Sep 2016 08:46:50 +0000 (09:46 +0100)]
Whitelist version 9.6 of Foundation FVP

This prevents a warning being emitted in the console during FVP
configuration setup when using the Foundation FVP 9.6 onwards.

Change-Id: I685b8bd0dbd0119af4b0cb3f7d708fcc08e99561

8 years agoMerge pull request #714 from soby-mathew/sm/psci_lib_args
danh-arm [Thu, 22 Sep 2016 16:30:38 +0000 (17:30 +0100)]
Merge pull request #714 from soby-mathew/sm/psci_lib_args

Introduce PSCI Library argument structure

8 years agoPSCI: Do psci_setup() as part of std_svc_setup()
Soby Mathew [Mon, 19 Sep 2016 16:21:15 +0000 (17:21 +0100)]
PSCI: Do psci_setup() as part of std_svc_setup()

This patch moves the invocation of `psci_setup()` from BL31 and SP_MIN
into `std_svc_setup()` as part of ARM Standard Service initialization.
This allows us to consolidate ARM Standard Service initializations which
will be added to in the future. A new function `get_arm_std_svc_args()`
is introduced to get arguments corresponding to each standard service.
This function must be implemented by the EL3 Runtime Firmware and both
SP_MIN and BL31 implement it.

Change-Id: I38e1b644f797fa4089b20574bd4a10f0419de184

8 years agoPSCI: Introduce PSCI Library argument structure
Soby Mathew [Tue, 13 Sep 2016 13:19:08 +0000 (14:19 +0100)]
PSCI: Introduce PSCI Library argument structure

This patch introduces a `psci_lib_args_t` structure which must be
passed into `psci_setup()` which is then used to initialize the PSCI
library. The `psci_lib_args_t` is a versioned structure so as to enable
compatibility checks during library initialization. Both BL31 and SP_MIN
are modified to use the new structure.

SP_MIN is also modified to add version string and build message as part
of its cold boot log just like the other BLs in Trusted Firmware.

NOTE: Please be aware that this patch modifies the prototype of
`psci_setup()`, which breaks compatibility with EL3 Runtime Firmware
(excluding BL31 and SP_MIN) integrated with the PSCI Library.

Change-Id: Ic3761db0b790760a7ad664d8a437c72ea5edbcd6

8 years agoMerge pull request #713 from yatharth-arm/yk/AArch32_porting
danh-arm [Thu, 22 Sep 2016 16:05:32 +0000 (17:05 +0100)]
Merge pull request #713 from yatharth-arm/yk/AArch32_porting

Add basic AArch32 support for BL1 & BL2

8 years agoAArch32: Add support for ARM Cortex-A32 MPCore Processor
Yatharth Kochar [Tue, 12 Jul 2016 14:47:03 +0000 (15:47 +0100)]
AArch32: Add support for ARM Cortex-A32 MPCore Processor

This patch adds ARM Cortex-A32 MPCore Processor support
in the CPU specific operations framework. It also includes
this support for the Base FVP port.

Change-Id: If3697b88678df737c29f79cf3fa1ea2cb6fa565d

8 years agoAArch32: Support in SP_MIN to receive arguments from BL2
Yatharth Kochar [Thu, 30 Jun 2016 13:50:58 +0000 (14:50 +0100)]
AArch32: Support in SP_MIN to receive arguments from BL2

This patch adds support in SP_MIN to receive generic and
platform specific arguments from BL2.

The new signature is as following:
    void sp_min_early_platform_setup(void *from_bl2,
         void *plat_params_from_bl2);

ARM platforms have been modified to use this support.

Note: Platforms may break if using old signature.
      Default value for RESET_TO_SP_MIN is changed to 0.

Change-Id: I008d4b09fd3803c7b6231587ebf02a047bdba8d0

8 years agoAArch32: Refactor SP_MIN to support RESET_TO_SP_MIN
Yatharth Kochar [Thu, 30 Jun 2016 14:02:31 +0000 (15:02 +0100)]
AArch32: Refactor SP_MIN to support RESET_TO_SP_MIN

This patch uses the `el3_entrypoint_common` macro to initialize
CPU registers, in SP_MIN entrypoint.s file, in both cold and warm
boot path. It also adds conditional compilation, in cold and warm
boot entry path, based on RESET_TO_SP_MIN.

Change-Id: Id493ca840dc7b9e26948dc78ee928e9fdb76b9e4

8 years agoAArch32: Add ARM platform changes in BL2
Yatharth Kochar [Mon, 4 Jul 2016 10:26:14 +0000 (11:26 +0100)]
AArch32: Add ARM platform changes in BL2

This patch adds ARM platform changes in BL2 for AArch32 state.
It instantiates a descriptor array for ARM platforms describing
image and entrypoint information for `SCP_BL2`, `BL32` and `BL33`.
It also enables building of BL2 for ARCH=aarch32.

Change-Id: I60dc7a284311eceba401fc789311c50ac746c51e

8 years agoAArch32: Add generic changes in BL2
Yatharth Kochar [Thu, 30 Jun 2016 13:52:12 +0000 (14:52 +0100)]
AArch32: Add generic changes in BL2

This patch adds generic changes in BL2 to support AArch32 state.
New AArch32 specific assembly/C files are introduced and
some files are moved to AArch32/64 specific folders.
BL2 for AArch64 is refactored but functionally identical.

BL2 executes in Secure SVC mode in AArch32 state.

Change-Id: Ifaacbc2a91f8640876385b953adb24744d9dbde3