summaryrefslogtreecommitdiff
path: root/plat/marvell/common/marvell_topology.c
diff options
context:
space:
mode:
authorKonstantin Porotchkin <kostap@marvell.com>2018-07-23 13:56:54 +0300
committerKonstantin Porotchkin <kostap@marvell.com>2018-09-03 14:48:32 +0300
commit77d5a2b3e2635002bfc7042abb0388395648bf71 (patch)
treedbc422ee19a2e7315a3d40840e9bc69e5a521daa /plat/marvell/common/marvell_topology.c
parent71b6429c5769b0c5b7165217dd441ea2a0318bfa (diff)
plat: marvell: align the sources with mainline TF-A
Following the acception of Marvell platform support in the mainline TF-A code, some changes triggered by the TF-A team review should be ported back. This patch introduces changes (mostly cosmetic) that sync between the mainline and LSP code bases. - Limit line length to 80 characters for passing through Linux checkpatch - Make all comment blocks comply the Linux kernel coduing style - Arrange all includes in alphabetical order - Rename plat_config.h to armada_common.h (a8k_common in the mainline, but we should take into account next platform support as well) - Rename plat_private.h to marvell_plat_priv.h - Rename plat_def.h to mvebu_def.h Change-Id: Idd542c8a7d4ff8d8fb67c3601410308be5aed8e5 Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Reviewed-on: http://vgitil04.il.marvell.com:8080/58282 Tested-by: iSoC Platform CI <ykjenk@marvell.com> Reviewed-by: Igal Liberman <igall@marvell.com>
Diffstat (limited to 'plat/marvell/common/marvell_topology.c')
-rw-r--r--plat/marvell/common/marvell_topology.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/plat/marvell/common/marvell_topology.c b/plat/marvell/common/marvell_topology.c
index 9418307a..a40ff6f5 100644
--- a/plat/marvell/common/marvell_topology.c
+++ b/plat/marvell/common/marvell_topology.c
@@ -1,23 +1,20 @@
/*
- * Copyright (C) 2016 - 2018 Marvell International Ltd.
+ * Copyright (C) 2018 Marvell International Ltd.
*
* SPDX-License-Identifier: BSD-3-Clause
* https://spdx.org/licenses
*/
-/*
- * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
+
#include <plat_marvell.h>
/* The power domain tree descriptor */
unsigned char marvell_power_domain_tree_desc[PLAT_MARVELL_CLUSTER_COUNT + 1];
-/*******************************************************************************
+/*****************************************************************************
* This function dynamically constructs the topology according to
* PLAT_MARVELL_CLUSTER_COUNT and returns it.
- ******************************************************************************/
+ *****************************************************************************
+ */
const unsigned char *plat_get_power_domain_tree_desc(void)
{
int i;
@@ -38,18 +35,20 @@ const unsigned char *plat_get_power_domain_tree_desc(void)
return marvell_power_domain_tree_desc;
}
-/*******************************************************************************
+/*****************************************************************************
* This function validates an MPIDR by checking whether it falls within the
* acceptable bounds. An error code (-1) is returned if an incorrect mpidr
* is passed.
- ******************************************************************************/
+ *****************************************************************************
+ */
int marvell_check_mpidr(u_register_t mpidr)
{
unsigned int nb_id, cluster_id, cpu_id;
mpidr &= MPIDR_AFFINITY_MASK;
- if (mpidr & ~(MPIDR_CLUSTER_MASK | MPIDR_CPU_MASK | MPIDR_AFFLVL_MASK << MPIDR_AFF2_SHIFT))
+ if (mpidr & ~(MPIDR_CLUSTER_MASK | MPIDR_CPU_MASK |
+ MPIDR_AFFLVL_MASK << MPIDR_AFF2_SHIFT))
return -1;
/* Get north bridge ID */
@@ -69,12 +68,13 @@ int marvell_check_mpidr(u_register_t mpidr)
return 0;
}
-/*******************************************************************************
- * This function implements a part of the critical interface between the psci
+/*****************************************************************************
+ * This function implements a part of the critical interface between the PSCI
* generic layer and the platform that allows the former to query the platform
* to convert an MPIDR to a unique linear index. An error code (-1) is returned
* in case the MPIDR is invalid.
- ******************************************************************************/
+ *****************************************************************************
+ */
int plat_core_pos_by_mpidr(u_register_t mpidr)
{
if (marvell_check_mpidr(mpidr) == -1)