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

allwinner: Add SPC security setup for H6

Browse source 
The H6 has a "secure port controller" similar to the A64/H5, but with
more ports and a different register layout. Split the platform-specific
parts out into a header, and add the missing MMIO base address.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Change-Id: I3703868bc595459ecf9568b9d1605cb1be014bf5
This commit is contained in:
Samuel Holland 2020-12-13 21:56:15 -06:00
parent 978a824091
commit 49d98cd549
4 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plat/allwinner/common/sunxi_security.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -10,12 +10,7 @@
#include <sunxi_ccu.h> #include <sunxi_ccu.h>
#include <sunxi_mmap.h> #include <sunxi_mmap.h>
#include <sunxi_private.h> #include <sunxi_private.h>
#include <sunxi_spc.h>
#ifdef SUNXI_SPC_BASE
#define SPC_DECPORT_STA_REG(p) (SUNXI_SPC_BASE + ((p) * 0x0c) + 0x4)
#define SPC_DECPORT_SET_REG(p) (SUNXI_SPC_BASE + ((p) * 0x0c) + 0x8)
#define SPC_DECPORT_CLR_REG(p) (SUNXI_SPC_BASE + ((p) * 0x0c) + 0xc)
#endif
#define DMA_SEC_REG 0x20 #define DMA_SEC_REG 0x20
@ -27,14 +22,12 @@
*/ */
void sunxi_security_setup(void) void sunxi_security_setup(void)
{ {
#ifdef SUNXI_SPC_BASE
int i; int i;
INFO("Configuring SPC Controller\n"); INFO("Configuring SPC Controller\n");
/* SPC setup: set all devices to non-secure */ /* SPC setup: set all devices to non-secure */
for (i = 0; i < 6; i++) for (i = 0; i < SUNXI_SPC_NUM_PORTS; i++)
mmio_write_32(SPC_DECPORT_SET_REG(i), 0xff); mmio_write_32(SUNXI_SPC_DECPORT_SET_REG(i), 0xffffffff);
#endif
/* set MBUS clocks, bus clocks (AXI/AHB/APB) and PLLs to non-secure */ /* set MBUS clocks, bus clocks (AXI/AHB/APB) and PLLs to non-secure */
mmio_write_32(SUNXI_CCU_SEC_SWITCH_REG, 0x7); mmio_write_32(SUNXI_CCU_SEC_SWITCH_REG, 0x7);

16
plat/allwinner/sun50i_a64/include/sunxi_spc.h Normal file
View file

@ -0,0 +1,16 @@
/*
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef SUNXI_SPC_H
#define SUNXI_SPC_H
#define SUNXI_SPC_NUM_PORTS 6
#define SUNXI_SPC_DECPORT_STA_REG(p) (SUNXI_SPC_BASE + 0x0004 + 0x0c * (p))
#define SUNXI_SPC_DECPORT_SET_REG(p) (SUNXI_SPC_BASE + 0x0008 + 0x0c * (p))
#define SUNXI_SPC_DECPORT_CLR_REG(p) (SUNXI_SPC_BASE + 0x000c + 0x0c * (p))
#endif /* SUNXI_SPC_H */

1
plat/allwinner/sun50i_h6/include/sunxi_mmap.h
View file

@ -31,6 +31,7 @@
#define SUNXI_MSGBOX_BASE 0x03003000 #define SUNXI_MSGBOX_BASE 0x03003000
#define SUNXI_CCU_BASE 0x03001000 #define SUNXI_CCU_BASE 0x03001000
#define SUNXI_PIO_BASE 0x0300b000 #define SUNXI_PIO_BASE 0x0300b000
#define SUNXI_SPC_BASE 0x03008000
#define SUNXI_TIMER_BASE 0x03009000 #define SUNXI_TIMER_BASE 0x03009000
#define SUNXI_WDOG_BASE 0x030090a0 #define SUNXI_WDOG_BASE 0x030090a0
#define SUNXI_THS_BASE 0x05070400 #define SUNXI_THS_BASE 0x05070400

16
plat/allwinner/sun50i_h6/include/sunxi_spc.h Normal file
View file

@ -0,0 +1,16 @@
/*
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef SUNXI_SPC_H
#define SUNXI_SPC_H
#define SUNXI_SPC_NUM_PORTS 14
#define SUNXI_SPC_DECPORT_STA_REG(p) (SUNXI_SPC_BASE + 0x0000 + 0x10 * (p))
#define SUNXI_SPC_DECPORT_SET_REG(p) (SUNXI_SPC_BASE + 0x0004 + 0x10 * (p))
#define SUNXI_SPC_DECPORT_CLR_REG(p) (SUNXI_SPC_BASE + 0x0008 + 0x10 * (p))
#endif /* SUNXI_SPC_H */