andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes from topic "raspberry-pi-4-support" into integration 

* changes:
  rpi3: Move rng driver to drivers
  rpi3: Move VC mailbox driver into generic drivers directory
  rpi3: Move rpi3_hw.h header file to include/rpi_hw.h
This commit is contained in:
Sandrine Bailleux 2019-09-16 12:31:55 +00:00 committed by TrustedFirmware Code Review
parent b7ef641d3d 990ab78e78
commit c011d7d5fa
13 changed files with 202 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
drivers/rpi3/mailbox/rpi3_mbox.c Normal file
View File

@ -0,0 +1,82 @@
/*
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <platform_def.h>
#include <arch_helpers.h>
#include <common/debug.h>
#include <lib/mmio.h>
#include <rpi_hw.h>
#include <drivers/rpi3/mailbox/rpi3_mbox.h>
#define RPI3_MAILBOX_MAX_RETRIES U(1000000)
/*******************************************************************************
* Routine to send requests to the VideoCore using the mailboxes.
******************************************************************************/
void rpi3_vc_mailbox_request_send(rpi3_mbox_request_t *req, int req_size)
{
uint32_t st, data;
uintptr_t resp_addr, addr;
unsigned int retries;
/* This is the location of the request buffer */
addr = (uintptr_t)req;
/* Make sure that the changes are seen by the VideoCore */
flush_dcache_range(addr, req_size);
/* Wait until the outbound mailbox is empty */
retries = 0U;
do {
st = mmio_read_32(RPI3_MBOX_BASE + RPI3_MBOX1_STATUS_OFFSET);
retries++;
if (retries == RPI3_MAILBOX_MAX_RETRIES) {
ERROR("rpi3: mbox: Send request timeout\n");
return;
}
} while ((st & RPI3_MBOX_STATUS_EMPTY_MASK) == 0U);
/* Send base address of this message to start request */
mmio_write_32(RPI3_MBOX_BASE + RPI3_MBOX1_WRITE_OFFSET,
RPI3_CHANNEL_ARM_TO_VC | (uint32_t) addr);
/* Wait until the inbound mailbox isn't empty */
retries = 0U;
do {
st = mmio_read_32(RPI3_MBOX_BASE + RPI3_MBOX0_STATUS_OFFSET);
retries++;
if (retries == RPI3_MAILBOX_MAX_RETRIES) {
ERROR("rpi3: mbox: Receive response timeout\n");
return;
}
} while ((st & RPI3_MBOX_STATUS_EMPTY_MASK) != 0U);
/* Get location and channel */
data = mmio_read_32(RPI3_MBOX_BASE + RPI3_MBOX0_READ_OFFSET);
if ((data & RPI3_CHANNEL_MASK) != RPI3_CHANNEL_ARM_TO_VC) {
ERROR("rpi3: mbox: Wrong channel: 0x%08x\n", data);
panic();
}
resp_addr = (uintptr_t)(data & ~RPI3_CHANNEL_MASK);
if (addr != resp_addr) {
ERROR("rpi3: mbox: Unexpected address: 0x%08x\n", data);
panic();
}
/* Make sure that the data seen by the CPU is up to date */
inv_dcache_range(addr, req_size);
}

2
plat/rpi/rpi3/rpi3_rng.c → drivers/rpi3/rng/rpi3_rng.c
View File

@ -9,7 +9,7 @@
#include <lib/mmio.h>
#include "rpi3_hw.h"
#include <rpi_hw.h>
/* Initial amount of values to discard */
#define RNG_WARMUP_COUNT U(0x40000)

39
include/drivers/rpi3/mailbox/rpi3_mbox.h Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright (c) 2019, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef RPI3_MBOX_H
#define RPI3_MBOX_H
#include <stdint.h>
/* This struct must be aligned to 16 bytes */
typedef struct __packed __aligned(16) rpi3_mbox_request {
uint32_t size; /* Buffer size in bytes */
uint32_t code; /* Request/response code */
uint32_t tags[0];
} rpi3_mbox_request_t;
#define RPI3_MBOX_BUFFER_SIZE U(256)
/* Constants to perform a request/check the status of a request. */
#define RPI3_MBOX_PROCESS_REQUEST U(0x00000000)
#define RPI3_MBOX_REQUEST_SUCCESSFUL U(0x80000000)
#define RPI3_MBOX_REQUEST_ERROR U(0x80000001)
/* Command constants */
#define RPI3_TAG_HARDWARE_GET_BOARD_REVISION U(0x00010002)
#define RPI3_TAG_END U(0x00000000)
#define RPI3_TAG_REQUEST U(0x00000000)
#define RPI3_TAG_IS_RESPONSE U(0x80000000) /* Set if response */
#define RPI3_TAG_RESPONSE_LENGTH_MASK U(0x7FFFFFFF)
#define RPI3_CHANNEL_ARM_TO_VC U(0x8)
#define RPI3_CHANNEL_MASK U(0xF)
void rpi3_vc_mailbox_request_send(rpi3_mbox_request_t *req, int req_size);
#endif

12
include/drivers/rpi3/rng/rpi3_rng.h Normal file
View File

@ -0,0 +1,12 @@
/*
* Copyright (c) 2019, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef RPI3_RNG_H
#define RPI3_RNG_H
void rpi3_rng_read(void *buf, size_t len);
#endif

2
plat/rpi/rpi3/aarch64/plat_helpers.S
View File

@ -9,7 +9,7 @@
#include <assert_macros.S>
#include <platform_def.h>
#include "../rpi3_hw.h"
#include "../include/rpi_hw.h"
.globl plat_crash_console_flush
.globl plat_crash_console_init

2
plat/rpi/rpi3/include/platform_def.h
View File

@ -12,7 +12,7 @@
#include <lib/utils_def.h>
#include <plat/common/common_def.h>
#include "../rpi3_hw.h"
#include "rpi_hw.h"
/* Special value used to verify platform parameters from BL2 to BL31 */
#define RPI3_BL31_PLAT_PARAM_VAL ULL(0x0F1E2D3C4B5A6978)

6
plat/rpi/rpi3/rpi3_hw.h → plat/rpi/rpi3/include/rpi_hw.h
View File

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef RPI3_HW_H
#define RPI3_HW_H
#ifndef RPI_HW_H
#define RPI_HW_H
#include <lib/utils_def.h>
@ -107,4 +107,4 @@
#define RPI3_INTC_PENDING_FIQ_OFFSET ULL(0x00000070)
#define RPI3_INTC_PENDING_FIQ_MBOX3 ULL(0x00000080)
#endif /* RPI3_HW_H */
#endif /* RPI_HW_H */

7
plat/rpi/rpi3/platform.mk
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
# Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@ -21,7 +21,8 @@ BL1_SOURCES += drivers/io/io_fip.c \
plat/rpi/rpi3/aarch64/plat_helpers.S \
plat/rpi/rpi3/rpi3_bl1_setup.c \
plat/rpi/rpi3/rpi3_io_storage.c \
plat/rpi/rpi3/rpi3_mbox.c
drivers/rpi3/mailbox/rpi3_mbox.c \
plat/rpi/rpi3/rpi_mbox_board.c
BL2_SOURCES += common/desc_image_load.c \
drivers/io/io_fip.c \
@ -158,7 +159,7 @@ ifeq (${ARCH},aarch32)
endif
ifneq ($(ENABLE_STACK_PROTECTOR), 0)
PLAT_BL_COMMON_SOURCES += plat/rpi/rpi3/rpi3_rng.c \
PLAT_BL_COMMON_SOURCES += drivers/rpi3/rng/rpi3_rng.c \
plat/rpi/rpi3/rpi3_stack_protector.c
endif

2
plat/rpi/rpi3/rpi3_common.c
View File

@ -16,7 +16,7 @@
#include <drivers/ti/uart/uart_16550.h>
#include <lib/xlat_tables/xlat_tables_v2.h>
#include "rpi3_hw.h"
#include <rpi_hw.h>
#include "rpi3_private.h"
#define MAP_DEVICE0 MAP_REGION_FLAT(DEVICE0_BASE, \

148
plat/rpi/rpi3/rpi3_mbox.c
View File

@ -1,148 +0,0 @@
/*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <assert.h>
#include <platform_def.h>
#include <arch_helpers.h>
#include <common/debug.h>
#include <lib/mmio.h>
#include "rpi3_hw.h"
/* This struct must be aligned to 16 bytes */
typedef struct __packed __aligned(16) rpi3_mbox_request {
uint32_t size; /* Buffer size in bytes */
uint32_t code; /* Request/response code */
uint32_t tags[0];
} rpi3_mbox_request_t;
#define RPI3_MBOX_BUFFER_SIZE U(256)
static uint8_t __aligned(16) rpi3_mbox_buffer[RPI3_MBOX_BUFFER_SIZE];
/* Constants to perform a request/check the status of a request. */
#define RPI3_MBOX_PROCESS_REQUEST U(0x00000000)
#define RPI3_MBOX_REQUEST_SUCCESSFUL U(0x80000000)
#define RPI3_MBOX_REQUEST_ERROR U(0x80000001)
/* Command constants */
#define RPI3_TAG_HARDWARE_GET_BOARD_REVISION U(0x00010002)
#define RPI3_TAG_END U(0x00000000)
#define RPI3_TAG_REQUEST U(0x00000000)
#define RPI3_TAG_IS_RESPONSE U(0x80000000) /* Set if response */
#define RPI3_TAG_RESPONSE_LENGTH_MASK U(0x7FFFFFFF)
#define RPI3_CHANNEL_ARM_TO_VC U(0x8)
#define RPI3_CHANNEL_MASK U(0xF)
#define RPI3_MAILBOX_MAX_RETRIES U(1000000)
/*******************************************************************************
* Helpers to send requests to the VideoCore using the mailboxes.
******************************************************************************/
static void rpi3_vc_mailbox_request_send(void)
{
uint32_t st, data;
uintptr_t resp_addr, addr;
unsigned int retries;
/* This is the location of the request buffer */
addr = (uintptr_t) &rpi3_mbox_buffer;
/* Make sure that the changes are seen by the VideoCore */
flush_dcache_range(addr, RPI3_MBOX_BUFFER_SIZE);
/* Wait until the outbound mailbox is empty */
retries = 0U;
do {
st = mmio_read_32(RPI3_MBOX_BASE + RPI3_MBOX1_STATUS_OFFSET);
retries++;
if (retries == RPI3_MAILBOX_MAX_RETRIES) {
ERROR("rpi3: mbox: Send request timeout\n");
return;
}
} while ((st & RPI3_MBOX_STATUS_EMPTY_MASK) == 0U);
/* Send base address of this message to start request */
mmio_write_32(RPI3_MBOX_BASE + RPI3_MBOX1_WRITE_OFFSET,
RPI3_CHANNEL_ARM_TO_VC | (uint32_t) addr);
/* Wait until the inbound mailbox isn't empty */
retries = 0U;
do {
st = mmio_read_32(RPI3_MBOX_BASE + RPI3_MBOX0_STATUS_OFFSET);
retries++;
if (retries == RPI3_MAILBOX_MAX_RETRIES) {
ERROR("rpi3: mbox: Receive response timeout\n");
return;
}
} while ((st & RPI3_MBOX_STATUS_EMPTY_MASK) != 0U);
/* Get location and channel */
data = mmio_read_32(RPI3_MBOX_BASE + RPI3_MBOX0_READ_OFFSET);
if ((data & RPI3_CHANNEL_MASK) != RPI3_CHANNEL_ARM_TO_VC) {
ERROR("rpi3: mbox: Wrong channel: 0x%08x\n", data);
panic();
}
resp_addr = (uintptr_t)(data & ~RPI3_CHANNEL_MASK);
if (addr != resp_addr) {
ERROR("rpi3: mbox: Unexpected address: 0x%08x\n", data);
panic();
}
/* Make sure that the data seen by the CPU is up to date */
inv_dcache_range(addr, RPI3_MBOX_BUFFER_SIZE);
}
/*******************************************************************************
* Request board revision. Returns the revision and 0 on success, -1 on error.
******************************************************************************/
int rpi3_vc_hardware_get_board_revision(uint32_t *revision)
{
uint32_t tag_request_size = sizeof(uint32_t);
rpi3_mbox_request_t *req = (rpi3_mbox_request_t *) rpi3_mbox_buffer;
assert(revision != NULL);
VERBOSE("rpi3: mbox: Sending request at %p\n", (void *)req);
req->size = sizeof(rpi3_mbox_buffer);
req->code = RPI3_MBOX_PROCESS_REQUEST;
req->tags[0] = RPI3_TAG_HARDWARE_GET_BOARD_REVISION;
req->tags[1] = tag_request_size; /* Space available for the response */
req->tags[2] = RPI3_TAG_REQUEST;
req->tags[3] = 0; /* Placeholder for the response */
req->tags[4] = RPI3_TAG_END;
rpi3_vc_mailbox_request_send();
if (req->code != RPI3_MBOX_REQUEST_SUCCESSFUL) {
ERROR("rpi3: mbox: Code = 0x%08x\n", req->code);
return -1;
}
if (req->tags[2] != (RPI3_TAG_IS_RESPONSE | tag_request_size)) {
ERROR("rpi3: mbox: get board revision failed (0x%08x)\n",
req->tags[2]);
return -1;
}
*revision = req->tags[3];
return 0;
}

2
plat/rpi/rpi3/rpi3_pm.c
View File

@ -15,7 +15,7 @@
#include <lib/psci/psci.h>
#include <plat/common/platform.h>
#include "rpi3_hw.h"
#include <rpi_hw.h>
/* Make composite power state parameter till power level 0 */
#if PSCI_EXTENDED_STATE_ID

5
plat/rpi/rpi3/rpi3_private.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -33,9 +33,6 @@ uint32_t rpi3_get_spsr_for_bl33_entry(void);
/* IO storage utility functions */
void plat_rpi3_io_setup(void);
/* Hardware RNG functions */
void rpi3_rng_read(void *buf, size_t len);
/* VideoCore firmware commands */
int rpi3_vc_hardware_get_board_revision(uint32_t *revision);

56
plat/rpi/rpi3/rpi_mbox_board.c Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <assert.h>
#include <platform_def.h>
#include <arch_helpers.h>
#include <drivers/rpi3/mailbox/rpi3_mbox.h>
#define RPI3_MBOX_BUFFER_SIZE U(256)
static uint8_t __aligned(16) rpi3_mbox_buffer[RPI3_MBOX_BUFFER_SIZE];
/*******************************************************************************
* Request board revision. Returns the revision and 0 on success, -1 on error.
******************************************************************************/
int rpi3_vc_hardware_get_board_revision(uint32_t *revision)
{
uint32_t tag_request_size = sizeof(uint32_t);
rpi3_mbox_request_t *req = (rpi3_mbox_request_t *) rpi3_mbox_buffer;
assert(revision != NULL);
VERBOSE("rpi3: mbox: Sending request at %p\n", (void *)req);
req->size = sizeof(rpi3_mbox_buffer);
req->code = RPI3_MBOX_PROCESS_REQUEST;
req->tags[0] = RPI3_TAG_HARDWARE_GET_BOARD_REVISION;
req->tags[1] = tag_request_size; /* Space available for the response */
req->tags[2] = RPI3_TAG_REQUEST;
req->tags[3] = 0; /* Placeholder for the response */
req->tags[4] = RPI3_TAG_END;
rpi3_vc_mailbox_request_send(req, RPI3_MBOX_BUFFER_SIZE);
if (req->code != RPI3_MBOX_REQUEST_SUCCESSFUL) {
ERROR("rpi3: mbox: Code = 0x%08x\n", req->code);
return -1;
}
if (req->tags[2] != (RPI3_TAG_IS_RESPONSE | tag_request_size)) {
ERROR("rpi3: mbox: get board revision failed (0x%08x)\n",
req->tags[2]);
return -1;
}
*revision = req->tags[3];
return 0;
}