From bc73c106736eb9344c41e2745e730c8927a99253 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Thu, 14 Apr 2016 01:05:54 +0100 Subject: sun50i: MHU, SCPI: remove code Without the arisc we don't need client side mailboxes and SCPI support, so remove the code for that. Signed-off-by: Andre Przywara --- plat/sun50iw1p1/mhu.c | 136 -------------------------------------- plat/sun50iw1p1/mhu.h | 43 ------------ plat/sun50iw1p1/platform.mk | 2 - plat/sun50iw1p1/scpi.c | 140 ---------------------------------------- plat/sun50iw1p1/scpi.h | 82 ----------------------- plat/sun50iw1p1/sunxi_private.h | 5 -- 6 files changed, 408 deletions(-) delete mode 100644 plat/sun50iw1p1/mhu.c delete mode 100644 plat/sun50iw1p1/mhu.h delete mode 100644 plat/sun50iw1p1/scpi.c delete mode 100644 plat/sun50iw1p1/scpi.h (limited to 'plat/sun50iw1p1') diff --git a/plat/sun50iw1p1/mhu.c b/plat/sun50iw1p1/mhu.c deleted file mode 100644 index a817b4d..0000000 --- a/plat/sun50iw1p1/mhu.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include "sunxi_def.h" -#include "mhu.h" -#include "scpi.h" - -#if 1 -void mhu_secure_message_start(void) -{ - -} - -void mhu_secure_message_send(uint32_t command) -{ - switch(command&0xf) - { - case SCPI_CMD_SCP_READY: - NOTICE("send cmd to scp: SCPI_CMD_SCP_READY\n"); - break; - case SCPI_CMD_SET_CSS_POWER_STATE: - NOTICE("send cmd to scp: SCPI_CMD_SET_CSS_POWER_STATE\n"); - break; - case SCPI_CMD_SYS_POWER_STATE: - NOTICE("send cmd to scp: SCPI_CMD_SYS_POWER_STATE\n"); - break; - } -} - -uint32_t mhu_secure_message_wait(void) -{ - /* Wait for response from SCP */ - - return 1; -} - -void mhu_secure_message_end(void) -{ - -} - -void mhu_secure_init(void) -{ - -} -#else -/* SCP MHU secure channel registers */ -#define SCP_INTR_S_STAT 0x200 -#define SCP_INTR_S_SET 0x208 -#define SCP_INTR_S_CLEAR 0x210 - -/* CPU MHU secure channel registers */ -#define CPU_INTR_S_STAT 0x300 -#define CPU_INTR_S_SET 0x308 -#define CPU_INTR_S_CLEAR 0x310 - - -static bakery_lock_t mhu_secure_lock __attribute__ ((section("tzfw_coherent_mem"))); - -void mhu_secure_message_start(void) -{ - bakery_lock_get(&mhu_secure_lock); - - /* Make sure any previous command has finished */ - while (mmio_read_32(MHU_BASE + CPU_INTR_S_STAT) != 0) - ; -} - -void mhu_secure_message_send(uint32_t command) -{ - /* Send command to SCP and wait for it to pick it up */ - mmio_write_32(MHU_BASE + CPU_INTR_S_SET, command); - while (mmio_read_32(MHU_BASE + CPU_INTR_S_STAT) != 0) - ; -} - -uint32_t mhu_secure_message_wait(void) -{ - /* Wait for response from SCP */ - uint32_t response; - while (!(response = mmio_read_32(MHU_BASE + SCP_INTR_S_STAT))) - ; - - return response; -} - -void mhu_secure_message_end(void) -{ - /* Clear any response we got by writing all ones to the CLEAR register */ - mmio_write_32(MHU_BASE + SCP_INTR_S_CLEAR, 0xffffffffu); - - bakery_lock_release(&mhu_secure_lock); -} - -void mhu_secure_init(void) -{ - bakery_lock_init(&mhu_secure_lock); - - /* - * Clear the CPU's INTR register to make sure we don't see a stale - * or garbage value and think it's a message we've already sent. - */ - mmio_write_32(MHU_BASE + CPU_INTR_S_CLEAR, 0xffffffffu); -} -#endif diff --git a/plat/sun50iw1p1/mhu.h b/plat/sun50iw1p1/mhu.h deleted file mode 100644 index 5149c82..0000000 --- a/plat/sun50iw1p1/mhu.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __MHU_H__ -#define __MHU_H__ - -#include - -extern void mhu_secure_message_start(void); -extern void mhu_secure_message_send(uint32_t command); -extern uint32_t mhu_secure_message_wait(void); -extern void mhu_secure_message_end(void); - -extern void mhu_secure_init(void); - -#endif /* __MHU_H__ */ diff --git a/plat/sun50iw1p1/platform.mk b/plat/sun50iw1p1/platform.mk index a0cad55..99bd367 100644 --- a/plat/sun50iw1p1/platform.mk +++ b/plat/sun50iw1p1/platform.mk @@ -78,8 +78,6 @@ BL31_SOURCES += drivers/arm/gic/arm_gic.c \ plat/common/aarch64/platform_mp_stack.S \ plat/sun50iw1p1/bl31_sunxi_setup.c \ plat/sun50iw1p1/plat_pm.c \ - plat/sun50iw1p1/mhu.c \ - plat/sun50iw1p1/scpi.c \ plat/sun50iw1p1/sunxi_security.c \ plat/sun50iw1p1/sunxi_cpu_ops.c \ plat/sun50iw1p1/plat_topology.c \ diff --git a/plat/sun50iw1p1/scpi.c b/plat/sun50iw1p1/scpi.c deleted file mode 100644 index e09ed90..0000000 --- a/plat/sun50iw1p1/scpi.c +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include "sunxi_def.h" -#include "mhu.h" -#include "scpi.h" - -#define MHU_SECURE_SCP_TO_AP_PAYLOAD (MHU_SECURE_BASE+0x0080) -#define MHU_SECURE_AP_TO_SCP_PAYLOAD (MHU_SECURE_BASE+0x0280) - -#define SIZE_SHIFT 20 /* Bit position for size value in MHU header */ -#define SIZE_MASK 0x1ff /* Mask to extract size value in MHU header*/ - - -void *scpi_secure_message_start(void) -{ - mhu_secure_message_start(); - - /* Return address of payload area. */ - return (void *)MHU_SECURE_AP_TO_SCP_PAYLOAD; -} - -void scpi_secure_message_send(unsigned command, size_t size) -{ - /* Make sure payload can be seen by SCP */ - if (MHU_PAYLOAD_CACHED) - flush_dcache_range(MHU_SECURE_AP_TO_SCP_PAYLOAD, size); - - mhu_secure_message_send(command | (size << SIZE_SHIFT)); -} - -unsigned scpi_secure_message_receive(void **message_out, size_t *size_out) -{ - uint32_t response = mhu_secure_message_wait(); - - /* Get size of payload */ - size_t size = (response >> SIZE_SHIFT) & SIZE_MASK; - - /* Clear size from response */ - response &= ~(SIZE_MASK << SIZE_SHIFT); - - /* Make sure we don't read stale data */ - if (MHU_PAYLOAD_CACHED) - inv_dcache_range(MHU_SECURE_SCP_TO_AP_PAYLOAD, size); - - if (size_out) - *size_out = size; - - if (message_out) - *message_out = (void *)MHU_SECURE_SCP_TO_AP_PAYLOAD; - - return response; -} - -void scpi_secure_message_end(void) -{ - mhu_secure_message_end(); -} - -static void scpi_secure_send32(unsigned command, uint32_t message) -{ - *(__typeof__(message) *)scpi_secure_message_start() = message; - scpi_secure_message_send(command, sizeof(message)); - scpi_secure_message_end(); -} - -int scpi_wait_ready(void) -{ - /* Get a message from the SCP */ - scpi_secure_message_start(); - size_t size; - unsigned command = scpi_secure_message_receive(NULL, &size); - scpi_secure_message_end(); - - /* We are expecting 'SCP Ready', produce correct error if it's not */ - scpi_status_t response = SCP_OK; - if (command != SCPI_CMD_SCP_READY) - response = SCP_E_SUPPORT; - else if (size != 0) - response = SCP_E_SIZE; - - /* Send our response back to SCP */ - scpi_secure_send32(command, response); - - return response == SCP_OK ? 0 : -1; -} - -void scpi_set_css_power_state(unsigned mpidr, scpi_power_state_t cpu_state, - scpi_power_state_t cluster_state, scpi_power_state_t css_state) -{ - uint32_t state = mpidr & 0x0f; /* CPU ID */ - state |= (mpidr & 0xf00) >> 4; /* Cluster ID */ - state |= cpu_state << 8; - state |= cluster_state << 12; - state |= css_state << 16; - scpi_secure_send32(SCPI_CMD_SET_CSS_POWER_STATE, state); -} - -uint32_t scpi_sys_power_state(scpi_system_state_t system_state) -{ - uint32_t *response; - size_t size; - uint8_t state = system_state & 0xff; - - /* Send the command */ - *(__typeof__(state) *)scpi_secure_message_start() = state; - scpi_secure_message_send(SCPI_CMD_SYS_POWER_STATE, sizeof(state)); - scpi_secure_message_receive((void *)&response, &size); - scpi_secure_message_end(); - return *response; -} diff --git a/plat/sun50iw1p1/scpi.h b/plat/sun50iw1p1/scpi.h deleted file mode 100644 index 8a5ef65..0000000 --- a/plat/sun50iw1p1/scpi.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __SCPI_H__ -#define __SCPI_H__ - -#include -#include - -extern void *scpi_secure_message_start(void); -extern void scpi_secure_message_send(unsigned command, size_t size); -extern unsigned scpi_secure_message_receive(void **message_out, size_t *size_out); -extern void scpi_secure_message_end(void); - - -enum { - SCP_OK = 0, /* Success */ - SCP_E_PARAM, /* Invalid parameter(s) */ - SCP_E_ALIGN, /* Invalid alignment */ - SCP_E_SIZE, /* Invalid size */ - SCP_E_HANDLER, /* Invalid handler or callback */ - SCP_E_ACCESS, /* Invalid access or permission denied */ - SCP_E_RANGE, /* Value out of range */ - SCP_E_TIMEOUT, /* Time out has ocurred */ - SCP_E_NOMEM, /* Invalid memory area or pointer */ - SCP_E_PWRSTATE, /* Invalid power state */ - SCP_E_SUPPORT, /* Feature not supported or disabled */ -}; - -typedef uint32_t scpi_status_t; - -typedef enum { - SCPI_CMD_SCP_READY = 0x01, - SCPI_CMD_SET_CSS_POWER_STATE = 0x04, - SCPI_CMD_SYS_POWER_STATE = 0x08 -} scpi_command_t; - -typedef enum { - scpi_power_on = 0, - scpi_power_retention = 1, - scpi_power_off = 3, -} scpi_power_state_t; - -typedef enum { - scpi_system_shutdown = 0, - scpi_system_reboot = 1, - scpi_system_reset = 2 -} scpi_system_state_t; - -extern int scpi_wait_ready(void); -extern void scpi_set_css_power_state(unsigned mpidr, scpi_power_state_t cpu_state, - scpi_power_state_t cluster_state, scpi_power_state_t css_state); -uint32_t scpi_sys_power_state(scpi_system_state_t system_state); - -#endif /* __SCPI_H__ */ diff --git a/plat/sun50iw1p1/sunxi_private.h b/plat/sun50iw1p1/sunxi_private.h index 434f91d..afb5943 100644 --- a/plat/sun50iw1p1/sunxi_private.h +++ b/plat/sun50iw1p1/sunxi_private.h @@ -34,11 +34,6 @@ #include #include -typedef volatile struct mailbox { - unsigned long value - __attribute__((__aligned__(CACHE_WRITEBACK_GRANULE))); -} mailbox_t; - /******************************************************************************* * Forward declarations ******************************************************************************/ -- cgit v1.2.3