[fuse_ctrl,dv] Tidy up tests for Caliptra secret addresses

The value in caliptra_ss_fuse_ctrl_manuf_prod_prov hadn't yet been
updated for the change in 275521b. This change should make it so
that test and also caliptra_ss_fuse_ctrl_init_fail get a magic number
from a single (documented) place.

Apply the same change to caliptra_ss_fuse_ctrl_test_unlocked0_prov.

Author: rswarbrick

src/integration/test_suites/caliptra_ss_fuse_ctrl_init_fail/caliptra_ss_fuse_ctrl_init_fail.c

@@ -42,9 +42,6 @@ void init_fail() {
         CMD_FC_LCC_UNCORRECTABLE_FAULT
     };
 
-    const uint32_t partition_lower_addr_bound = partitions[SECRET_MANUF_PARTITION].address;
-    const uint32_t partition_upper_addr_bound = partitions[SECRET_PROD_PARTITION_3].zer_address;
-
     // Collect all buffered partitions with ECC enabled. Their content
     // will be read out after bringup which will trigger the ECC errors.
     partition_t part_sel[NUM_PARTITIONS];
@@ -59,7 +56,7 @@ void init_fail() {
     partition_t partition = part_sel[xorshift32() % count];
     uint32_t fault = faults[xorshift32() % 2];
 
-    if (partition.address > partition_lower_addr_bound && partition.address < partition_upper_addr_bound) {
+    if (is_caliptra_secret_addr(partition.address)) {
         grant_caliptra_core_for_fc_writes();
     } else {
         grant_mcu_for_fc_writes();

src/integration/test_suites/caliptra_ss_fuse_ctrl_manuf_prod_prov/caliptra_ss_fuse_ctrl_manuf_prod_prov.c

@@ -1,6 +1,6 @@
 //********************************************************************************
 // SPDX-License-Identifier: Apache-2.0
-// 
+//
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ void manuf_prod_provision() {
         if (partitions[i].lc_phase == MANUF || partitions[i].lc_phase == PROD) {
             part_sel[count++] = partitions[i];
         }
-    } 
+    }
 
     // 0x2C88: CPTRA_SS_TEST_EXIT_TO_MANUF_TOKEN
     const uint32_t base_address  = CPTRA_SS_TEST_UNLOCK_TOKEN_1;
@@ -90,10 +90,10 @@ void manuf_prod_provision() {
 
     // Check that all the MANUF and PROD partitionss are writeable.
     for (uint32_t i = 0; i < count; i++) {
-        if (part_sel[i].address > 0x40 && part_sel[i].address < 0xF8) {
+        if (is_caliptra_secret_addr(part_sel[i].address)) {
             grant_caliptra_core_for_fc_writes();
         } else {
-            grant_mcu_for_fc_writes(); 
+            grant_mcu_for_fc_writes();
         }
         dai_wr(part_sel[i].address, i, 0, part_sel[i].granularity, 0);
     }
@@ -111,23 +111,23 @@ void manuf_prod_provision() {
 
     // Check that only PROD partitions are writeable and writes to MANUF partitions are blocked.
     for (uint32_t i = 0; i < count; i++) {
-        if (part_sel[i].address > 0x40 && part_sel[i].address < 0xF8) {
+        if (is_caliptra_secret_addr(part_sel[i].address)) {
             grant_caliptra_core_for_fc_writes();
         } else {
-            grant_mcu_for_fc_writes(); 
+            grant_mcu_for_fc_writes();
         }
         dai_wr(part_sel[i].address, i, 0, part_sel[i].granularity, part_sel[i].lc_phase == MANUF ? OTP_CTRL_STATUS_DAI_ERROR_MASK : 0);
     }
 }
 
 void main (void) {
     VPRINTF(LOW, "=================\nMCU Caliptra Boot Go\n=================\n\n")
-    
+
     mcu_cptra_init_d();
     wait_dai_op_idle(0);
-      
+
     lcc_initialization();
-    grant_mcu_for_fc_writes(); 
+    grant_mcu_for_fc_writes();
 
     transition_state_check(TEST_UNLOCKED0, raw_unlock_token[0], raw_unlock_token[1], raw_unlock_token[2], raw_unlock_token[3], 1);
 

src/integration/test_suites/caliptra_ss_fuse_ctrl_test_unlocked0_prov/caliptra_ss_fuse_ctrl_test_unlocked0_prov.c

@@ -51,7 +51,7 @@ void test_unlocked0_provision() {
     uint32_t rnd_fuse_addresses[NUM_PARTITIONS-1];
 
     for (uint32_t i = 0; i < (NUM_PARTITIONS-1); i++) {
-        if (partitions[i].address > 0x40 && partitions[i].address < 0xD0) {
+        if (is_caliptra_secret_addr(part_sel[i].address)) {
             grant_caliptra_core_for_fc_writes();
         } else {
             grant_mcu_for_fc_writes(); 
@@ -77,7 +77,7 @@ void test_unlocked0_provision() {
     wait_dai_op_idle(0);
 
     for (uint32_t i = 0; i < (NUM_PARTITIONS-1); i++) {
-        if (partitions[i].address > 0x40 && partitions[i].address < 0xD0) {
+        if (is_caliptra_secret_addr(part_sel[i].address)) {
             grant_caliptra_core_for_fc_writes();
         } else {
             grant_mcu_for_fc_writes(); 

src/integration/test_suites/libs/fuse_ctrl/fuse_ctrl.c

@@ -16,12 +16,14 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 #include "soc_address_map.h"
 #include "printf.h"
 #include "soc_ifc.h"
 #include "caliptra_ss_lc_ctrl_address_map.h"
 #include "riscv_hw_if.h"
+#include "fuse_ctrl_mmap.h"
 #include "fuse_ctrl.h"
 
 void grant_mcu_for_fc_writes(void) {
@@ -330,4 +332,12 @@ void zeroize_without_addr(uint32_t exp_status) {
 
     wait_dai_op_idle(exp_status);
     return;
-}
+}
+
+bool is_caliptra_secret_addr(uint32_t addr) {
+    // This mirrors CALIPTRA_SECRET_ACCESS_LOWER_ADDR and CALIPTRA_SECRET_ACCESS_UPPER_ADDR in
+    // otp_ctrl_pkg. Here, we're using the fact that the secret partitions are a contiguous block,
+    // starting with SECRET_MANUF_PARTITION and ending with SECRET_PROD_PARTITION_3.
+    return ((addr >= partitions[SECRET_MANUF_PARTITION].address) &&
+            (addr <= partitions[SECRET_PROD_PARTITION_3].zer_address));
+}

src/integration/test_suites/libs/fuse_ctrl/fuse_ctrl.h

@@ -41,5 +41,8 @@ void shuffled_dai_rd(uint32_t addr, uint32_t* rdata0, uint32_t* rdata1, uint32_t
 void calculate_digest_without_addr(uint32_t exp_status);
 void zeroize_without_addr(uint32_t exp_status);
 
+// Returns true if addr is in the range of addresses that are visible
+// to the Caliptra core but not the MCU.
+bool is_caliptra_secret_addr(uint32_t addr);
 
-#endif // FUSE_CTRL_H
+#endif // FUSE_CTRL_H