From 3fc8e440de76df0268c4d52f019efd0b1a256940 Mon Sep 17 00:00:00 2001 From: Mingyen Hung Date: Thu, 31 Oct 2019 12:26:48 +0800 Subject: [PATCH] dts: km3: Device ID attestation for ac214 [1/1] MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit PD#SWPL-12224 Problem: Need to add support for device ID attestation Solution: 1. Add new key slot, attestationdevidbox, to unify keys Verify: 1. Android Q + Newton↵ 2. run cts -m CtsKeystoreTestCases -t \ android.keystore.cts.KeyAttestationTest#testDeviceIdAttestation Change-Id: If16a35af4b63d19dcecf1319d6f0ea974ce64dd2 Signed-off-by: Mingyen Hung --- arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts | 8 +++++++- arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts index 1358561..4938da7 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts @@ -392,7 +392,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>; @@ -409,6 +409,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"; @@ -492,6 +493,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{ diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts index e98f33d..e69d194a 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts @@ -451,7 +451,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>; @@ -469,6 +469,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"; @@ -558,6 +559,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{ -- 2.7.4