github
/
arm-trusted-firmware
mirror of https://github.com/ARM-software/arm-trusted-firmware.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1346 from samarthp/sp/support-multiple-mhu-gen 

plat/arm: Add MHUv2 support to SCMI driver
pull/1332/merge
Dimitris Papastamos 7 years ago
committed by GitHub
parent
8b37120065 a427785c83
commit
4af16543b9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 105 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      plat/arm/css/common/css_common.mk
  2. 7
      plat/arm/css/common/sp_min/css_sp_min.mk
  3. 2
      plat/arm/css/drivers/mhu/css_mhu.c
  4. 2
      plat/arm/css/drivers/mhu/css_mhu.h
  5. 37
      plat/arm/css/drivers/mhu/css_mhu_doorbell.c
  6. 43
      plat/arm/css/drivers/mhu/css_mhu_doorbell.h
  7. 6
      plat/arm/css/drivers/scmi/scmi.h
  8. 7
      plat/arm/css/drivers/scmi/scmi_common.c
  9. 8
      plat/arm/css/drivers/scmi/scmi_private.h
  10. 2
      plat/arm/css/drivers/scp/css_bom_bootloader.c
  11. 2
      plat/arm/css/drivers/scp/css_pm_scmi.c
  12. 4
      plat/arm/css/drivers/scpi/css_scpi.c

9
plat/arm/css/common/css_common.mk
View File

@ -28,13 +28,14 @@ BL31_SOURCES += plat/arm/css/common/css_pm.c \
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \ BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \
plat/arm/css/drivers/scpi/css_mhu.c \ plat/arm/css/drivers/mhu/css_mhu.c \
plat/arm/css/drivers/scpi/css_scpi.c plat/arm/css/drivers/scpi/css_scpi.c
else else
BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \ BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \
plat/arm/css/drivers/scmi/scmi_common.c \ plat/arm/css/drivers/scmi/scmi_common.c \
plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \ plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \
plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
endif endif
ifneq (${RESET_TO_BL31},0) ifneq (${RESET_TO_BL31},0)
@ -60,11 +61,11 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1)
plat/arm/css/drivers/sds/sds.c plat/arm/css/drivers/sds/sds.c
else else
BL2U_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \ BL2U_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scpi/css_mhu.c \ plat/arm/css/drivers/mhu/css_mhu.c \
plat/arm/css/drivers/scpi/css_scpi.c plat/arm/css/drivers/scpi/css_scpi.c
BL2_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \ BL2_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \
plat/arm/css/drivers/scpi/css_mhu.c \ plat/arm/css/drivers/mhu/css_mhu.c \
plat/arm/css/drivers/scpi/css_scpi.c plat/arm/css/drivers/scpi/css_scpi.c
# Enable option to detect whether the SCP ROM firmware in use predates version # Enable option to detect whether the SCP ROM firmware in use predates version
# 1.7.0 and therefore, is incompatible. # 1.7.0 and therefore, is incompatible.

7
plat/arm/css/common/sp_min/css_sp_min.mk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -10,11 +10,12 @@ BL32_SOURCES += plat/arm/css/common/css_pm.c \
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0) ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \ BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \
plat/arm/css/drivers/scpi/css_mhu.c \ plat/arm/css/drivers/mhu/css_mhu.c \
plat/arm/css/drivers/scpi/css_scpi.c plat/arm/css/drivers/scpi/css_scpi.c
else else
BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \ BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \
plat/arm/css/drivers/scmi/scmi_common.c \ plat/arm/css/drivers/scmi/scmi_common.c \
plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \ plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \
plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
endif endif

2
plat/arm/css/drivers/scpi/css_mhu.c → plat/arm/css/drivers/mhu/css_mhu.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */

2
plat/arm/css/drivers/scpi/css_mhu.h → plat/arm/css/drivers/mhu/css_mhu.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */

37
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <arch_helpers.h>
#include <platform_def.h>
#include "css_mhu_doorbell.h"
#include "../scmi/scmi.h"
void mhu_ring_doorbell(scmi_channel_plat_info_t *plat_info)
{
MHU_RING_DOORBELL(plat_info->db_reg_addr,
plat_info->db_modify_mask,
plat_info->db_preserve_mask);
return;
}
void mhuv2_ring_doorbell(scmi_channel_plat_info_t *plat_info)
{
/* wake receiver */
MHU_V2_ACCESS_REQUEST(MHUV2_BASE_ADDR);
/* wait for receiver to acknowledge its ready */
while (MHU_V2_IS_ACCESS_READY(MHUV2_BASE_ADDR) == 0)
;
MHU_RING_DOORBELL(plat_info->db_reg_addr,
plat_info->db_modify_mask,
plat_info->db_preserve_mask);
/* clear the access request for the recevier */
MHU_V2_CLEAR_REQUEST(MHUV2_BASE_ADDR);
return;
}

43
plat/arm/css/drivers/mhu/css_mhu_doorbell.h
View File

@ -0,0 +1,43 @@
/*
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef CSS_MHU_DOORBELL_H
#define CSS_MHU_DOORBELL_H
#include <mmio.h>
#include <stdint.h>
/* MHUv2 Base Address */
#define MHUV2_BASE_ADDR PLAT_CSS_MHU_BASE
/* MHUv2 Control Registers Offsets */
#define MHU_V2_MSG_NO_CAP_OFFSET 0xF80
#define MHU_V2_ACCESS_REQ_OFFSET 0xF88
#define MHU_V2_ACCESS_READY_OFFSET 0xF8C
#define SENDER_REG_STAT(CHANNEL) (0x20 * (CHANNEL))
#define SENDER_REG_SET(CHANNEL) (0x20 * (CHANNEL)) + 0xC
/* Helper macro to ring doorbell */
#define MHU_RING_DOORBELL(addr, modify_mask, preserve_mask) do { \
uint32_t db = mmio_read_32(addr) & (preserve_mask); \
mmio_write_32(addr, db | (modify_mask)); \
} while (0)
#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)
struct scmi_channel_plat_info;
void mhu_ring_doorbell(struct scmi_channel_plat_info *plat_info);
void mhuv2_ring_doorbell(struct scmi_channel_plat_info *plat_info);
#endif /* CSS_MHU_DOORBELL_H */

6
plat/arm/css/drivers/scmi/scmi.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -96,6 +96,10 @@ typedef struct scmi_channel_plat_info {
uint32_t db_preserve_mask; uint32_t db_preserve_mask;
/* The bit mask that need to be set to ring doorbell */ /* The bit mask that need to be set to ring doorbell */
uint32_t db_modify_mask; uint32_t db_modify_mask;
/* The handler for ringing doorbell */
void (*ring_doorbell)(struct scmi_channel_plat_info *plat_info);
/* cookie is unused now. But added for future enhancements. */
void *cookie;
} scmi_channel_plat_info_t; } scmi_channel_plat_info_t;
/* /*

7
plat/arm/css/drivers/scmi/scmi_common.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -39,9 +39,7 @@ void scmi_send_sync_command(scmi_channel_t *ch)
*/ */
dmbst(); dmbst();
SCMI_RING_DOORBELL(ch->info->db_reg_addr, ch->info->db_modify_mask, ch->info->ring_doorbell(ch->info);
ch->info->db_preserve_mask);
/* /*
* Ensure that the write to the doorbell register is ordered prior to * Ensure that the write to the doorbell register is ordered prior to
* checking whether the channel is free. * checking whether the channel is free.
@ -150,6 +148,7 @@ void *scmi_init(scmi_channel_t *ch)
assert(ch->info->db_reg_addr); assert(ch->info->db_reg_addr);
assert(ch->info->db_modify_mask); assert(ch->info->db_modify_mask);
assert(ch->info->db_preserve_mask); assert(ch->info->db_preserve_mask);
assert(ch->info->ring_doorbell != NULL);
assert(ch->lock); assert(ch->lock);

8
plat/arm/css/drivers/scmi/scmi_private.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -113,12 +113,6 @@
(val3) = mmio_read_32((uintptr_t)&payld_arr[2]); \ (val3) = mmio_read_32((uintptr_t)&payld_arr[2]); \
} while (0) } while (0)
/* Helper macro to ring doorbell */
#define SCMI_RING_DOORBELL(addr, modify_mask, preserve_mask) do { \
uint32_t db = mmio_read_32(addr) & (preserve_mask); \
mmio_write_32(addr, db | (modify_mask)); \
} while (0)
/* /*
* Private data structure for representing the mailbox memory layout. Refer * Private data structure for representing the mailbox memory layout. Refer
* the SCMI specification for more details. * the SCMI specification for more details.

2
plat/arm/css/drivers/scp/css_bom_bootloader.c
View File

@ -10,7 +10,7 @@
#include <debug.h> #include <debug.h>
#include <platform.h> #include <platform.h>
#include <stdint.h> #include <stdint.h>
#include "../scpi/css_mhu.h" #include "../mhu/css_mhu.h"
#include "../scpi/css_scpi.h" #include "../scpi/css_scpi.h"
#include "css_scp.h" #include "css_scp.h"

2
plat/arm/css/drivers/scp/css_pm_scmi.c
View File

@ -13,6 +13,7 @@
#include <platform.h> #include <platform.h>
#include <string.h> #include <string.h>
#include "../scmi/scmi.h" #include "../scmi/scmi.h"
#include "../mhu/css_mhu_doorbell.h"
#include "css_scp.h" #include "css_scp.h"
/* /*
@ -302,6 +303,7 @@ scmi_channel_plat_info_t plat_css_scmi_plat_info = {
.db_reg_addr = PLAT_CSS_MHU_BASE + CSS_SCMI_MHU_DB_REG_OFF, .db_reg_addr = PLAT_CSS_MHU_BASE + CSS_SCMI_MHU_DB_REG_OFF,
.db_preserve_mask = 0xfffffffe, .db_preserve_mask = 0xfffffffe,
.db_modify_mask = 0x1, .db_modify_mask = 0x1,
.ring_doorbell = &mhu_ring_doorbell,
}; };
void plat_arm_pwrc_setup(void) void plat_arm_pwrc_setup(void)

4
plat/arm/css/drivers/scpi/css_scpi.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -11,7 +11,7 @@
#include <platform.h> #include <platform.h>
#include <string.h> #include <string.h>
#include <utils.h> #include <utils.h>
#include "css_mhu.h" #include "../mhu/css_mhu.h"
#include "css_scpi.h" #include "css_scpi.h"
#define SCPI_SHARED_MEM_SCP_TO_AP PLAT_CSS_SCP_COM_SHARED_MEM_BASE #define SCPI_SHARED_MEM_SCP_TO_AP PLAT_CSS_SCP_COM_SHARED_MEM_BASE

Write Preview
Loading…
Cancel
Save