summaryrefslogtreecommitdiff
path: root/big-little/virtualisor/virt_context.c
diff options
context:
space:
mode:
authorRobin Randhawa <robin.randhawa@arm.com>2011-12-20 15:54:33 +0000
committerRobin Randhawa <robin.randhawa@arm.com>2011-12-20 15:54:33 +0000
commit06193b40307e17cf6b675000abb5859838b0c841 (patch)
treebc792d2f9e8be28dd8ffc2913df4bc0cd6a2b5eb /big-little/virtualisor/virt_context.c
parent0656dea51f48c51a57e77187de4d5f66a6ba1337 (diff)
downloadswitcher-06193b40307e17cf6b675000abb5859838b0c841.tar.gz
Updated to release v2.1.
Intended to be the basis for the VSM development.
Diffstat (limited to 'big-little/virtualisor/virt_context.c')
-rw-r--r--big-little/virtualisor/virt_context.c38
1 files changed, 22 insertions, 16 deletions
diff --git a/big-little/virtualisor/virt_context.c b/big-little/virtualisor/virt_context.c
index 941f3dc..80a79b2 100644
--- a/big-little/virtualisor/virt_context.c
+++ b/big-little/virtualisor/virt_context.c
@@ -1,18 +1,24 @@
/*
- * $Copyright:
- * ----------------------------------------------------------------
- * This confidential and proprietary software may be used only as
- * authorised by a licensing agreement from ARM Limited
- * (C) COPYRIGHT 2008-2011 ARM Limited
- * ALL RIGHTS RESERVED
- * The entire notice above must be reproduced on all authorised
- * copies and copies may only be made to the extent permitted
- * by a licensing agreement from ARM Limited.
- * ----------------------------------------------------------------
- * File: virt_context.c
- * ----------------------------------------------------------------
- * $
- */
+ * Copyright (c) 2011, ARM Limited. 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.
+ */
#include "virtualisor.h"
#include "misc.h"
@@ -32,7 +38,7 @@ extern cache_stats cm_op_stats[NUM_CPUS][MAX_CACHE_LEVELS];
*/
void SaveVirtualisor(unsigned first_cpu)
{
- unsigned len = 0, ctr = 0, cpu_id = read_cpuid(), cpu_no = read_midr();
+ unsigned len = 0, ctr = 0, cpu_id = read_cpuid(), cpu_no = PART_NO(read_midr());
unsigned cluster_id = read_clusterid(), index = 0, vd_len = 0, rc = 0;
mem_trap_data *s2_td = &s2_trap_section$$Base;
unsigned long long *cd_ptr = 0x0;
@@ -135,7 +141,7 @@ void SaveVirtualisor(unsigned first_cpu)
*/
void RestoreVirtualisor(unsigned first_cpu)
{
- unsigned len = 0, ctr = 0, cpu_id = read_cpuid(), cpu_no = read_midr();
+ unsigned len = 0, ctr = 0, cpu_id = read_cpuid(), cpu_no = PART_NO(read_midr());
unsigned cluster_id = read_clusterid(), index = 0, vd_len = 0, rc = 0;
mem_trap_data *s2_td = &s2_trap_section$$Base;
unsigned long long *cd_ptr = 0x0;