bdk: refactor several comments and defines

bdk/soc/fuse.h

@@ -34,6 +34,8 @@
 #define FUSE_PRIV2INTFC                       0x20
 #define FUSE_FUSEBYPASS                       0x24
 #define FUSE_PRIVATEKEYDISABLE                0x28
+#define  FUSE_PRIVKEY_DISABLE                  BIT(0)
+#define  FUSE_PRIVKEY_TZ_STICKY_BIT            BIT(4)
 #define FUSE_DISABLEREGPROGRAM                0x2C
 #define FUSE_WRITE_ACCESS_SW                  0x30
 #define FUSE_PWR_GOOD_SW                      0x34

bdk/soc/hw_init.c

@@ -266,6 +266,9 @@ static void _config_se_brom()
 	// Try to set SBK from fuses. If patched, skip.
 	fuse_set_sbk();
 
+	// Make SBK unreadable.
+	//FUSE(FUSE_PRIVATEKEYDISABLE) = FUSE_PRIVKEY_TZ_STICKY_BIT | FUSE_PRIVKEY_DISABLE;
+
 	// Lock SSK (although it's not set and unused anyways).
 	// se_key_acc_ctrl(15, SE_KEY_TBL_DIS_KEYREAD_FLAG);
 
@@ -365,9 +368,8 @@ void hw_init()
 	bool tegra_t210 = hw_get_chip_id() == GP_HIDREV_MAJOR_T210;
 	bool nx_hoag = fuse_read_hw_type() == FUSE_NX_HW_TYPE_HOAG;
 
-	// Bootrom stuff we skipped by going through rcm.
+	// Bootrom stuff we might skipped by going through rcm.
 	_config_se_brom();
-	//FUSE(FUSE_PRIVATEKEYDISABLE) = 0x11;
 
 	// Unset APB2JTAG_OVERRIDE_EN and OBS_OVERRIDE_EN.
 	SYSREG(AHB_AHB_SPARE_REG) &= 0xFFFFFF9F;
@@ -422,9 +424,10 @@ void hw_init()
 	// Set BPMP/SCLK to PLLP_OUT (408MHz).
 	CLOCK(CLK_RST_CONTROLLER_SCLK_BURST_POLICY) = 0x20003333;
 
-	// Power on T210B01 shadow TZRAM and lock the reg.
+	// Disable T210B01 TZRAM power-gating and lock the reg.
 	if (!tegra_t210)
 	{
+		// This is not actually needed since it's done by bootrom. The read locks are extra.
 		PMC(APBDEV_PMC_TZRAM_PWR_CNTRL)      &= ~PMC_TZRAM_PWR_CNTRL_SD;
 		PMC(APBDEV_PMC_TZRAM_NON_SEC_DISABLE) = PMC_TZRAM_DISABLE_REG_WRITE | PMC_TZRAM_DISABLE_REG_READ;
 		PMC(APBDEV_PMC_TZRAM_SEC_DISABLE)     = PMC_TZRAM_DISABLE_REG_WRITE | PMC_TZRAM_DISABLE_REG_READ;

bdk/soc/pmc.h

@@ -154,6 +154,8 @@
 #define APBDEV_PMC_SCRATCH188        0x810
 #define APBDEV_PMC_SCRATCH190        0x818
 #define APBDEV_PMC_SCRATCH200        0x840
+#define  PMC_NX_PANIC_SAFE_MODE            0x20
+#define  PMC_NX_PANIC_BYPASS_FUSES         0x21
 #define APBDEV_PMC_SCRATCH201        0x844
 #define APBDEV_PMC_SCRATCH250        0x908
 #define APBDEV_PMC_SECURE_SCRATCH108 0xB08