dts: km3: add attestationdevidbox to more platforms [1/1]

PD#SWPL-12224

Problem:
Support Device ID attestation on multiple platforms

Solution:
1. Add new key slot, attestationdevidbox, to unify keys

Verify:
1. Android P + all android platforms
2. run cts -m CtsKeystoreTestCases -t \
android.keystore.cts.KeyAttestationTest#testDeviceIdAttestation

Change-Id: I95ba42b2df808a4aec5ad47d00ec9684c36e4ad3
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
This commit is contained in:
Mingyen Hung
2019-11-05 16:34:59 +08:00
committed by Jianxin Pan
parent f698b3c413
commit f5badaa803
22 changed files with 154 additions and 22 deletions

View File

@@ -396,7 +396,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -414,6 +414,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -503,6 +504,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -400,7 +400,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -418,6 +418,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -507,6 +508,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -437,7 +437,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -454,6 +454,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
key-device = "normal";
@@ -537,6 +538,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -360,7 +360,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -377,6 +377,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -461,6 +462,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -1114,7 +1114,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1132,6 +1132,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
@@ -1222,6 +1223,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
dvb {
compatible = "amlogic, dvb";

View File

@@ -416,7 +416,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -434,6 +434,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -523,6 +524,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -389,7 +389,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -406,6 +406,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
key-device = "normal";
@@ -489,6 +490,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -719,7 +719,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <21>;
unifykey-num = <22>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -741,6 +741,7 @@
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
unifykey-index-21 = <&keysn_21>;
keysn_0: key_0{
key-name = "usid";
@@ -852,6 +853,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_21:key_21{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
amlvideo2_0 {

View File

@@ -714,7 +714,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <21>;
unifykey-num = <22>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -736,6 +736,7 @@
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
unifykey-index-21 = <&keysn_21>;
keysn_0: key_0{
key-name = "usid";
@@ -847,6 +848,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_21:key_21{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
amlvideo2_0 {

View File

@@ -688,7 +688,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <20>;
unifykey-num = <21>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -709,6 +709,7 @@
unifykey-index-17 = <&keysn_17>;
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
keysn_0: key_0{
key-name = "usid";
@@ -815,6 +816,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_20:key_20{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
amlvideo2_0 {

View File

@@ -786,7 +786,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <21>;
unifykey-num = <22>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -808,6 +808,7 @@
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
unifykey-index-21 = <&keysn_21>;
keysn_0: key_0{
key-name = "usid";
@@ -919,6 +920,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_21:key_21{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
cvbsout {

View File

@@ -395,7 +395,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -413,6 +413,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -502,6 +503,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -394,7 +394,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -412,6 +412,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -501,6 +502,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -399,7 +399,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -416,6 +416,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
key-device = "normal";
@@ -499,6 +500,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -361,7 +361,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -378,6 +378,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -462,6 +463,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -1110,7 +1110,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1128,6 +1128,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -1217,6 +1218,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -414,7 +414,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -432,6 +432,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -521,6 +522,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -446,7 +446,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <17>;
unifykey-num = <18>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -464,6 +464,7 @@
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
unifykey-index-17= <&keysn_17>;
keysn_0: key_0{
key-name = "usid";
@@ -553,6 +554,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_17:key_17{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -716,7 +716,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <21>;
unifykey-num = <22>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -738,6 +738,7 @@
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
unifykey-index-21 = <&keysn_21>;
keysn_0: key_0{
key-name = "usid";
@@ -849,6 +850,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_21:key_21{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
amlvideo2_0 {

View File

@@ -710,7 +710,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <21>;
unifykey-num = <22>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -732,6 +732,7 @@
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
unifykey-index-21 = <&keysn_21>;
keysn_0: key_0{
key-name = "usid";
@@ -843,6 +844,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_21:key_21{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
amlvideo2_0 {

View File

@@ -684,7 +684,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <20>;
unifykey-num = <21>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -705,6 +705,7 @@
unifykey-index-17 = <&keysn_17>;
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
keysn_0: key_0{
key-name = "usid";
@@ -811,6 +812,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_20:key_20{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
amlvideo2_0 {

View File

@@ -785,7 +785,7 @@
compatible = "amlogic, unifykey";
status = "okay";
unifykey-num = <21>;
unifykey-num = <22>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -807,6 +807,7 @@
unifykey-index-18 = <&keysn_18>;
unifykey-index-19 = <&keysn_19>;
unifykey-index-20 = <&keysn_20>;
unifykey-index-21 = <&keysn_21>;
keysn_0: key_0{
key-name = "usid";
@@ -918,6 +919,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_21:key_21{
key-name = "attestationdevidbox";// attest dev id box
key-device = "secure";
key-permit = "read","write","del";
};
}; /* End unifykey */
cvbsout {