Corstone700: add support for mhuv2 in arm TF-A
Note: This patch implements in-band messaging protocol only. ARM has launched a next version of MHU i.e. MHUv2 with its latest subsystems. The main change is that the MHUv2 is now a distributed IP with different peripheral views (registers) for the sender and receiver. Another main difference is that MHUv1 duplex channels are now split into simplex/half duplex in MHUv2. MHUv2 has a configurable number of communication channels. There is a capability register (MSG_NO_CAP) to find out how many channels are available in a system. The register offsets have also changed for STAT, SET & CLEAR registers from 0x0, 0x8 & 0x10 in MHUv1 to 0x0, 0xC & 0x8 in MHUv2 respectively. 0x0 0x4 0x8 0xC 0x1F ------------------------....----- | STAT | | | SET | | | ------------------------....----- Transmit Channel 0x0 0x4 0x8 0xC 0x1F ------------------------....----- | STAT | | CLR | | | | ------------------------....----- Receive Channel The MHU controller can request the receiver to wake-up and once the request is removed, the receiver may go back to sleep, but the MHU itself does not actively put a receiver to sleep. So, in order to wake-up the receiver when the sender wants to send data, the sender has to set ACCESS_REQUEST register first in order to wake-up receiver, state of which can be detected using ACCESS_READY register. ACCESS_REQUEST has an offset of 0xF88 & ACCESS_READY has an offset of 0xF8C and are accessible only on any sender channel. This patch adds necessary changes in a new file required to support the latest MHUv2 controller. This patch also needs an update in DT binding for ARM MHUv2 as we need a second register base (tx base) which would be used as the send channel base. Change-Id: I1455e08b3d88671a191c558790c503eabe07a8e6 Signed-off-by: Tushar Khandelwal <tushar.khandelwal@arm.com>
This commit is contained in:
parent
956059385c
commit
c6fe43b726
|
@ -1,10 +1,12 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2019, Arm Limited and Contributors. All rights reserved.
|
* Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common/bl_common.h>
|
#include <common/bl_common.h>
|
||||||
|
|
||||||
|
#include <mhu.h>
|
||||||
#include <plat/arm/common/plat_arm.h>
|
#include <plat/arm/common/plat_arm.h>
|
||||||
#include <plat/common/platform.h>
|
#include <plat/common/platform.h>
|
||||||
#include <platform_def.h>
|
#include <platform_def.h>
|
||||||
|
@ -26,6 +28,7 @@ const mmap_region_t plat_arm_mmap[] = {
|
||||||
*/
|
*/
|
||||||
void __init plat_arm_pwrc_setup(void)
|
void __init plat_arm_pwrc_setup(void)
|
||||||
{
|
{
|
||||||
|
mhu_secure_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int plat_get_syscnt_freq2(void)
|
unsigned int plat_get_syscnt_freq2(void)
|
||||||
|
|
|
@ -0,0 +1,117 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019-2020, ARM Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include <arch_helpers.h>
|
||||||
|
#include <common/debug.h>
|
||||||
|
#include <drivers/delay_timer.h>
|
||||||
|
#include <lib/bakery_lock.h>
|
||||||
|
#include <lib/mmio.h>
|
||||||
|
|
||||||
|
#include "mhu.h"
|
||||||
|
#include <plat_arm.h>
|
||||||
|
#include <platform_def.h>
|
||||||
|
|
||||||
|
ARM_INSTANTIATE_LOCK;
|
||||||
|
|
||||||
|
#pragma weak plat_arm_pwrc_setup
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Slot 31 is reserved because the MHU hardware uses this register bit to
|
||||||
|
* indicate a non-secure access attempt. The total number of available slots is
|
||||||
|
* therefore 31 [30:0].
|
||||||
|
*/
|
||||||
|
#define MHU_MAX_SLOT_ID 30
|
||||||
|
|
||||||
|
void mhu_secure_message_start(uintptr_t address, unsigned int slot_id)
|
||||||
|
{
|
||||||
|
unsigned int intr_stat_check;
|
||||||
|
uint64_t timeout_cnt;
|
||||||
|
volatile uint8_t expiration;
|
||||||
|
|
||||||
|
assert(slot_id <= MHU_MAX_SLOT_ID);
|
||||||
|
arm_lock_get();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Make sure any previous command has finished
|
||||||
|
* and polling timeout not expired
|
||||||
|
*/
|
||||||
|
|
||||||
|
timeout_cnt = timeout_init_us(MHU_POLL_INTR_STAT_TIMEOUT);
|
||||||
|
|
||||||
|
do {
|
||||||
|
intr_stat_check = (mmio_read_32(address + CPU_INTR_S_STAT) &
|
||||||
|
(1 << slot_id));
|
||||||
|
|
||||||
|
expiration = timeout_elapsed(timeout_cnt);
|
||||||
|
|
||||||
|
} while ((intr_stat_check != 0U) && (expiration == 0U));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Note: No risk of timer overflows while waiting
|
||||||
|
* for the timeout expiration.
|
||||||
|
* According to Armv8 TRM: System counter roll-over
|
||||||
|
* time of not less than 40 years
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
void mhu_secure_message_send(uintptr_t address,
|
||||||
|
unsigned int slot_id,
|
||||||
|
unsigned int message)
|
||||||
|
{
|
||||||
|
unsigned char access_ready;
|
||||||
|
uint64_t timeout_cnt;
|
||||||
|
volatile uint8_t expiration;
|
||||||
|
|
||||||
|
assert(slot_id <= MHU_MAX_SLOT_ID);
|
||||||
|
assert((mmio_read_32(address + CPU_INTR_S_STAT) &
|
||||||
|
(1 << slot_id)) == 0U);
|
||||||
|
|
||||||
|
MHU_V2_ACCESS_REQUEST(address);
|
||||||
|
|
||||||
|
timeout_cnt = timeout_init_us(MHU_POLL_INTR_STAT_TIMEOUT);
|
||||||
|
|
||||||
|
do {
|
||||||
|
access_ready = MHU_V2_IS_ACCESS_READY(address);
|
||||||
|
expiration = timeout_elapsed(timeout_cnt);
|
||||||
|
|
||||||
|
} while ((access_ready == 0U) && (expiration == 0U));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Note: No risk of timer overflows while waiting
|
||||||
|
* for the timeout expiration.
|
||||||
|
* According to Armv8 TRM: System counter roll-over
|
||||||
|
* time of not less than 40 years
|
||||||
|
*/
|
||||||
|
|
||||||
|
mmio_write_32(address + CPU_INTR_S_SET, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
void mhu_secure_message_end(uintptr_t address, unsigned int slot_id)
|
||||||
|
{
|
||||||
|
assert(slot_id <= MHU_MAX_SLOT_ID);
|
||||||
|
/*
|
||||||
|
* Clear any response we got by writing one in the relevant slot bit to
|
||||||
|
* the CLEAR register
|
||||||
|
*/
|
||||||
|
MHU_V2_CLEAR_REQUEST(address);
|
||||||
|
|
||||||
|
arm_lock_release();
|
||||||
|
}
|
||||||
|
|
||||||
|
void __init mhu_secure_init(void)
|
||||||
|
{
|
||||||
|
arm_lock_init();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The STAT register resets to zero. Ensure it is in the expected state,
|
||||||
|
* as a stale or garbage value would make us think it's a message we've
|
||||||
|
* already sent.
|
||||||
|
*/
|
||||||
|
|
||||||
|
assert(mmio_read_32(PLAT_SDK700_MHU0_SEND + CPU_INTR_S_STAT) == 0);
|
||||||
|
}
|
|
@ -0,0 +1,37 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019-2020, ARM Limited. All rights reserved.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MHU_H
|
||||||
|
#define MHU_H
|
||||||
|
|
||||||
|
#define MHU_POLL_INTR_STAT_TIMEOUT 50000 /*timeout value in us*/
|
||||||
|
|
||||||
|
/* CPU MHU secure channel registers */
|
||||||
|
#define CPU_INTR_S_STAT 0x00
|
||||||
|
#define CPU_INTR_S_SET 0x0C
|
||||||
|
|
||||||
|
/* MHUv2 Control Registers Offsets */
|
||||||
|
#define MHU_V2_MSG_CFG_OFFSET 0xF80
|
||||||
|
#define MHU_V2_ACCESS_REQ_OFFSET 0xF88
|
||||||
|
#define MHU_V2_ACCESS_READY_OFFSET 0xF8C
|
||||||
|
|
||||||
|
#define MHU_V2_ACCESS_REQUEST(addr) \
|
||||||
|
mmio_write_32((addr) + MHU_V2_ACCESS_REQ_OFFSET, 0x1)
|
||||||
|
|
||||||
|
#define MHU_V2_CLEAR_REQUEST(addr) \
|
||||||
|
mmio_write_32((addr) + MHU_V2_ACCESS_REQ_OFFSET, 0x0)
|
||||||
|
|
||||||
|
#define MHU_V2_IS_ACCESS_READY(addr) \
|
||||||
|
(mmio_read_32((addr) + MHU_V2_ACCESS_READY_OFFSET) & 0x1)
|
||||||
|
|
||||||
|
void mhu_secure_message_start(uintptr_t address, unsigned int slot_id);
|
||||||
|
void mhu_secure_message_send(uintptr_t address,
|
||||||
|
unsigned int slot_id,
|
||||||
|
unsigned int message);
|
||||||
|
void mhu_secure_message_end(uintptr_t address, unsigned int slot_id);
|
||||||
|
void mhu_secure_init(void);
|
||||||
|
|
||||||
|
#endif /* MHU_H */
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2019, Arm Limited and Contributors. All rights reserved.
|
* Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -88,6 +88,10 @@
|
||||||
#define PLAT_ARM_GICD_BASE 0x1C010000
|
#define PLAT_ARM_GICD_BASE 0x1C010000
|
||||||
#define PLAT_ARM_GICC_BASE 0x1C02F000
|
#define PLAT_ARM_GICC_BASE 0x1C02F000
|
||||||
|
|
||||||
|
/* MHUv2 Secure Channel receiver and sender */
|
||||||
|
#define PLAT_SDK700_MHU0_SEND 0x1B800000
|
||||||
|
#define PLAT_SDK700_MHU0_RECV 0x1B810000
|
||||||
|
|
||||||
/* Timer/watchdog related constants */
|
/* Timer/watchdog related constants */
|
||||||
#define ARM_SYS_CNTCTL_BASE UL(0x1a200000)
|
#define ARM_SYS_CNTCTL_BASE UL(0x1a200000)
|
||||||
#define ARM_SYS_CNTREAD_BASE UL(0x1a210000)
|
#define ARM_SYS_CNTREAD_BASE UL(0x1a210000)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019, Arm Limited and Contributors. All rights reserved.
|
# Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
#
|
#
|
||||||
|
@ -11,16 +11,19 @@ BL32_SOURCES += plat/arm/common/aarch32/arm_helpers.S \
|
||||||
plat/arm/common/arm_common.c \
|
plat/arm/common/arm_common.c \
|
||||||
lib/xlat_tables/aarch32/xlat_tables.c \
|
lib/xlat_tables/aarch32/xlat_tables.c \
|
||||||
lib/xlat_tables/xlat_tables_common.c \
|
lib/xlat_tables/xlat_tables_common.c \
|
||||||
${CORSTONE700_CPU_LIBS}
|
${CORSTONE700_CPU_LIBS} \
|
||||||
|
plat/arm/board/corstone700/drivers/mhu/mhu.c
|
||||||
|
|
||||||
PLAT_INCLUDES := -Iplat/arm/board/corstone700/include
|
PLAT_INCLUDES := -Iplat/arm/board/corstone700/include \
|
||||||
|
-Iinclude/plat/arm/common \
|
||||||
|
-Iplat/arm/board/corstone700/drivers/mhu
|
||||||
|
|
||||||
NEED_BL32 := yes
|
NEED_BL32 := yes
|
||||||
|
|
||||||
CORSTONE700_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
|
CORSTONE700_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
|
||||||
drivers/arm/gic/v2/gicv2_main.c \
|
drivers/arm/gic/v2/gicv2_main.c \
|
||||||
drivers/arm/gic/v2/gicv2_helpers.c \
|
drivers/arm/gic/v2/gicv2_helpers.c \
|
||||||
plat/common/plat_gicv2.c \
|
plat/common/plat_gicv2.c \
|
||||||
plat/arm/common/arm_gicv2.c
|
plat/arm/common/arm_gicv2.c
|
||||||
|
|
||||||
# BL1/BL2 Image not a part of the capsule Image for Corstone700
|
# BL1/BL2 Image not a part of the capsule Image for Corstone700
|
||||||
|
|
Loading…
Reference in New Issue