mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-26 23:04:50 +00:00
6e24d79509
Serial output is missing the EOL marker, which makes the output garbled.
Add EOL to the output, which adds a newline and makes log output
consistent.
Fixes: 77850c96f2 ("feat(plat/imx8m): do not release JR0 to NS if HAB is using it")
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Cc: Franck LENORMAND <franck.lenormand@nxp.com>
Cc: Jacky Bai <ping.bai@nxp.com>
Change-Id: I58b67f441016122bc9361d7224d310522917eff0
48 lines
1.2 KiB
C
48 lines
1.2 KiB
C
/*
|
|
* Copyright (c) 2019-2022 NXP. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <common/debug.h>
|
|
#include <lib/mmio.h>
|
|
|
|
#include <imx8m_caam.h>
|
|
|
|
#define HAB_JR0_DID U(0x8011)
|
|
|
|
void imx8m_caam_init(void)
|
|
{
|
|
uint32_t sm_cmd;
|
|
|
|
/* Dealloc part 0 and 2 with current DID */
|
|
sm_cmd = (0 << SMC_PART_SHIFT | SMC_CMD_DEALLOC_PART);
|
|
mmio_write_32(SM_CMD, sm_cmd);
|
|
|
|
sm_cmd = (2 << SMC_PART_SHIFT | SMC_CMD_DEALLOC_PART);
|
|
mmio_write_32(SM_CMD, sm_cmd);
|
|
|
|
/* config CAAM JRaMID set MID to Cortex A */
|
|
if (mmio_read_32(CAAM_JR0MID) == HAB_JR0_DID) {
|
|
NOTICE("Do not release JR0 to NS as it can be used by HAB\n");
|
|
} else {
|
|
mmio_write_32(CAAM_JR0MID, CAAM_NS_MID);
|
|
}
|
|
|
|
mmio_write_32(CAAM_JR1MID, CAAM_NS_MID);
|
|
mmio_write_32(CAAM_JR2MID, CAAM_NS_MID);
|
|
|
|
/* Alloc partition 0 writing SMPO and SMAGs */
|
|
mmio_write_32(SM_P0_PERM, 0xff);
|
|
mmio_write_32(SM_P0_SMAG2, 0xffffffff);
|
|
mmio_write_32(SM_P0_SMAG1, 0xffffffff);
|
|
|
|
/* Allocate page 0 and 1 to partition 0 with DID set */
|
|
sm_cmd = (0 << SMC_PAGE_SHIFT | 0 << SMC_PART_SHIFT |
|
|
SMC_CMD_ALLOC_PAGE);
|
|
mmio_write_32(SM_CMD, sm_cmd);
|
|
|
|
sm_cmd = (1 << SMC_PAGE_SHIFT | 0 << SMC_PART_SHIFT |
|
|
SMC_CMD_ALLOC_PAGE);
|
|
mmio_write_32(SM_CMD, sm_cmd);
|
|
}
|