Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 23:04:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(imx8mq): fix compilation with gcc >= 12.x" into integration

Browse source
This commit is contained in:
André Przywara 2023-04-12 14:40:36 +02:00 • committed by TrustedFirmware Code Review
commit 2237e562fd
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
View file

@ -30,6 +30,20 @@
#define TRUSTY_PARAMS_LEN_BYTES (4096*2) #define TRUSTY_PARAMS_LEN_BYTES (4096*2)
/*
* Avoid the pointer dereference of the canonical mmio_read_8() implementation.
* This prevents the compiler from mis-interpreting the MMIO access as an
* illegal memory access to a very low address (the IMX ROM is mapped at 0).
*/
static uint8_t mmio_read_8_ldrb(uintptr_t address)
{
uint8_t reg;
__asm__ volatile ("ldrb %w0, [%1]" : "=r" (reg) : "r" (address));
return reg;
}
static const mmap_region_t imx_mmap[] = { static const mmap_region_t imx_mmap[] = {
MAP_REGION_FLAT(GPV_BASE, GPV_SIZE, MT_DEVICE | MT_RW), /* GPV map */ MAP_REGION_FLAT(GPV_BASE, GPV_SIZE, MT_DEVICE | MT_RW), /* GPV map */
MAP_REGION_FLAT(IMX_ROM_BASE, IMX_ROM_SIZE, MT_MEMORY | MT_RO), /* ROM map */ MAP_REGION_FLAT(IMX_ROM_BASE, IMX_ROM_SIZE, MT_MEMORY | MT_RO), /* ROM map */
@ -70,11 +84,11 @@ static void imx8mq_soc_info_init(void)
uint32_t ocotp_val; uint32_t ocotp_val;
imx_soc_revision = mmio_read_32(IMX_ANAMIX_BASE + ANAMIX_DIGPROG); imx_soc_revision = mmio_read_32(IMX_ANAMIX_BASE + ANAMIX_DIGPROG);
rom_version = mmio_read_8(IMX_ROM_BASE + ROM_SOC_INFO_A0); rom_version = mmio_read_8_ldrb(IMX_ROM_BASE + ROM_SOC_INFO_A0);
if (rom_version == 0x10) if (rom_version == 0x10)
return; return;
rom_version = mmio_read_8(IMX_ROM_BASE + ROM_SOC_INFO_B0); rom_version = mmio_read_8_ldrb(IMX_ROM_BASE + ROM_SOC_INFO_B0);
if (rom_version == 0x20) { if (rom_version == 0x20) {
imx_soc_revision &= ~0xff; imx_soc_revision &= ~0xff;
imx_soc_revision |= rom_version; imx_soc_revision |= rom_version;