commit 08b8f02c1d62a9ad38f5bbb5482be67e0bf8005c
parent 9eb5751a4abd7fd1817bafd8cd6634f0c078f0b2
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date: Fri, 19 Oct 2018 18:58:48 +0100
Mark which RMU commands are used by the rom/ram fw
Change-Id: I88dbb4d3c3f95c13ba497c91726ba9cdbed2466e
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>
Diffstat:
4 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/scripts/gentbl.sh b/scripts/gentbl.sh
@@ -3,6 +3,7 @@
in=rmu.cmd
out=rmutbl.c
tmp=gentbl.$$
+img=rom
for i
do
@@ -11,6 +12,10 @@ do
out=$2
shift 2
;;
+ -b)
+ img=$2
+ shift 2
+ ;;
-i)
in=$2
shift 2
@@ -34,18 +39,13 @@ BEGIN {
print "#define from0(f) ((char *) (f) - (char *) 0)\n"
};
-NF == 3 && $1 ~ /[0-9]*/ && $2 ~ /[0-9]*/ {
+NF == 4 && $1 ~ /[0-9]*/ && $2 ~ /[0-9]*/ && /'$img'/ {
rowcnt[$1]++
gsub(/\./, "_", $3)
cmds[$1,$2] = $3
next
}
-{
- print "Invalid RMU command description" > "/dev/stderr"
- exit -1
-}
-
END {
for (cmd in cmds)
print "extern void hdl_" cmds[cmd] "(Rmucmd *cmd);"
diff --git a/scripts/rmu.cmd b/scripts/rmu.cmd
@@ -1,68 +1,68 @@
-0 0 RMU.System.InterfaceVersion
-0 1 RMU.System.Status
-0 2 RMU.System.Enable
-1 0 RMU.Local.Status
-1 1 RMU.Local.Load
-1 2 RMU.Local.Validate
-2 0 RMU.Crypto.Random
-3 0 RMU.Realm.Register
-3 1 RMU.Realm.Release
-4 0 RMU.Realm.InvalidateCurrent
-5 0 RMU.Realm.Invalidate
-5 1 RMU.Realm.GetParameterValue
-5 2 RMU.Realm.SetParameterValue
-5 3 RMU.Realm.GetParameterInheritance
-5 4 RMU.Realm.SetParameterInheritance
-5 5 RMU.Realm.Initialize
-5 6 RMU.Realm.Prepare
-5 7 RMU.Realm.Populate
-5 8 RMU.Realm.Activate
-5 9 RMU.Realm.Info
-5 10 RMU.Realm.ReadMemory
-5 11 RMU.Realm.WriteMemory
-5 12 RMU.Realm.SetMetadata
-5 13 RMU.Realm.GetMetadata
-5 14 RMU.Realm.CreateZeroMetadata
-6 0 RMU.Realm.SetCommandTrap
-7 0 RMU.Realm.AttestationReportSize
-7 1 RMU.Realm.AttestationReportInit
-7 2 RMU.Realm.AttestationReport
-8 0 RMU.Realm.ExtendBindingKeySeedValue
-8 1 RMU.Realm.SetBindingKeySeedLock
-8 2 RMU.Realm.DeriveBindingKey
-8 3 RMU.Realm.GetBindingKeySeedValue
-9 0 RMU.REC.Size
-9 1 RMU.REC.Register
-9 2 RMU.REC.Prepare
-9 3 RMU.REC.Release
-9 4 RMU.REC.ReadGeneralPurposeRegister
-9 5 RMU.REC.WriteGeneralPurposeRegister
-9 6 RMU.REC.ReadVectorRegister
-9 7 RMU.REC.WriteVectorRegister
-9 8 RMU.REC.ReadSystemRegister
-9 9 RMU.REC.WriteSystemRegister
-10 0 RMU.MDT.BufferSize
-10 1 RMU.MDT.Register
-10 2 RMU.MDT.Release
-10 3 RMU.MDT.Info
-10 4 RMU.MDT.WriteStorage
-10 5 RMU.MDT.ReadStorage
-10 6 RMU.MDT.Move
-11 0 RMU.Granule.Invalidate
-11 1 RMU.Granule.Clean
-11 2 RMU.Granule.Info
-11 3 RMU.Granule.Detail
-11 4 RMU.Granule.SetPermissions
-11 5 RMU.Granule.Sync
-12 0 RMU.Granule.Claim
-12 1 RMU.Granule.Release
-13 0 RMU.Granule.AddInit
-13 1 RMU.Granule.Add
-13 2 RMU.Granule.Reclaim
-14 0 RMU.Granule.Fuse
-14 1 RMU.Granule.Shatter
-15 0 RMU.Granule.SetGlobalVisibility
-16 0 RMU.Granule.ExportInit
-16 1 RMU.Granule.Export
-16 2 RMU.Granule.ImportInit
-16 3 RMU.Granule.Import
+0 0 RMU.System.InterfaceVersion rom|ram
+0 1 RMU.System.Status rom|ram
+0 2 RMU.System.Enable rom|ram
+1 0 RMU.Local.Status ram
+1 1 RMU.Local.Load ram
+1 2 RMU.Local.Validate ram
+2 0 RMU.Crypto.Random ram
+3 0 RMU.Realm.Register ram
+3 1 RMU.Realm.Release ram
+4 0 RMU.Realm.InvalidateCurrent ram
+5 0 RMU.Realm.Invalidate ram
+5 1 RMU.Realm.GetParameterValue ram
+5 2 RMU.Realm.SetParameterValue ram
+5 3 RMU.Realm.GetParameterInheritance ram
+5 4 RMU.Realm.SetParameterInheritance ram
+5 5 RMU.Realm.Initialize ram
+5 6 RMU.Realm.Prepare ram
+5 7 RMU.Realm.Populate ram
+5 8 RMU.Realm.Activate ram
+5 9 RMU.Realm.Info ram
+5 10 RMU.Realm.ReadMemory ram
+5 11 RMU.Realm.WriteMemory ram
+5 12 RMU.Realm.SetMetadata ram
+5 13 RMU.Realm.GetMetadata ram
+5 14 RMU.Realm.CreateZeroMetadata ram
+6 0 RMU.Realm.SetCommandTrap ram
+7 0 RMU.Realm.AttestationReportSize ram
+7 1 RMU.Realm.AttestationReportInit ram
+7 2 RMU.Realm.AttestationReport ram
+8 0 RMU.Realm.ExtendBindingKeySeedValue ram
+8 1 RMU.Realm.SetBindingKeySeedLock ram
+8 2 RMU.Realm.DeriveBindingKey ram
+8 3 RMU.Realm.GetBindingKeySeedValue ram
+9 0 RMU.REC.Size ram
+9 1 RMU.REC.Register ram
+9 2 RMU.REC.Prepare ram
+9 3 RMU.REC.Release ram
+9 4 RMU.REC.ReadGeneralPurposeRegister ram
+9 5 RMU.REC.WriteGeneralPurposeRegister ram
+9 6 RMU.REC.ReadVectorRegister ram
+9 7 RMU.REC.WriteVectorRegister ram
+9 8 RMU.REC.ReadSystemRegister ram
+9 9 RMU.REC.WriteSystemRegister ram
+10 0 RMU.MDT.BufferSize ram
+10 1 RMU.MDT.Register ram
+10 2 RMU.MDT.Release ram
+10 3 RMU.MDT.Info ram
+10 4 RMU.MDT.WriteStorage ram
+10 5 RMU.MDT.ReadStorage ram
+10 6 RMU.MDT.Move ram
+11 0 RMU.Granule.Invalidate ram
+11 1 RMU.Granule.Clean ram
+11 2 RMU.Granule.Info ram
+11 3 RMU.Granule.Detail ram
+11 4 RMU.Granule.SetPermissions ram
+11 5 RMU.Granule.Sync ram
+12 0 RMU.Granule.Claim ram
+12 1 RMU.Granule.Release ram
+13 0 RMU.Granule.AddInit ram
+13 1 RMU.Granule.Add ram
+13 2 RMU.Granule.Reclaim ram
+14 0 RMU.Granule.Fuse ram
+14 1 RMU.Granule.Shatter ram
+15 0 RMU.Granule.SetGlobalVisibility ram
+16 0 RMU.Granule.ExportInit ram
+16 1 RMU.Granule.Export ram
+16 2 RMU.Granule.ImportInit ram
+16 3 RMU.Granule.Import ram
diff --git a/src/ramfw/Makefile b/src/ramfw/Makefile
@@ -11,7 +11,7 @@ builtin.o: $(OBJS)
$(LD) $(RCODE_LDFLAGS) -r -o $@ $(OBJS)
rmctbl.c: $(SCRIPTDIR)/rmu.cmd
- $(SCRIPTDIR)/gentbl.sh -o $@ -i $(SCRIPTDIR)/rmu.cmd
+ $(SCRIPTDIR)/gentbl.sh -o $@ -b ram -i $(SCRIPTDIR)/rmu.cmd
clean:
rm -f rmctbl.c
diff --git a/src/romfw/Makefile b/src/romfw/Makefile
@@ -11,7 +11,7 @@ builtin.o: $(OBJS)
$(LD) $(RCODE_LDFLAGS) -r -o $@ $(OBJS)
rmctbl.c: $(SCRIPTDIR)/rmu.cmd
- $(SCRIPTDIR)/gentbl.sh -o $@ -i $(SCRIPTDIR)/rmu.cmd
+ $(SCRIPTDIR)/gentbl.sh -o $@ -b rom -i $(SCRIPTDIR)/rmu.cmd
clean:
rm -f rmctbl.c
