Skip to content

Reduced vendor non-secret partition size #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nimellis merged 2 commits into from
Jul 13, 2026
Merged

Reduced vendor non-secret partition size #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a4d9ae
Reduced vendor non-secret partition size
Jul 9, 2026
c54c1a6
Manual fix in otp_ctrl_part_pkg after regeneration due to PQCTYPE fie…
Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions src/fuse_ctrl/data/otp_ctrl.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@
{ name: "VendorNonSecretProdPartitionSize",
desc: "Size of the VENDOR_NON_SECRET_PROD_PARTITION partition",
type: "int",
default: "176",
default: "112",
local: "true"
},
{ name: "CptraSsVendorSpecificNonSecretFuse0Offset",
Expand Down Expand Up @@ -816,34 +816,10 @@
default: "32",
local: "true"
},
{ name: "CptraSsVendorSpecificNonSecretFuse3Offset",
desc: "Offset of CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_3",
type: "int",
default: "944",
local: "true"
},
{ name: "CptraSsVendorSpecificNonSecretFuse3Size",
desc: "Size of CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_3",
type: "int",
default: "32",
local: "true"
},
{ name: "CptraSsVendorSpecificNonSecretFuse4Offset",
desc: "Offset of CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_4",
type: "int",
default: "976",
local: "true"
},
{ name: "CptraSsVendorSpecificNonSecretFuse4Size",
desc: "Size of CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_4",
type: "int",
default: "32",
local: "true"
},
{ name: "CptraSsVendorSpecificRsvdOffset",
desc: "Offset of CPTRA_SS_VENDOR_SPECIFIC_RSVD",
type: "int",
default: "1008",
default: "944",
local: "true"
},
{ name: "CptraSsVendorSpecificRsvdSize",
Expand All @@ -855,7 +831,7 @@
{ name: "CsrPartitionOffset",
desc: "Offset of the CSR_PARTITION partition",
type: "int",
default: "1024",
default: "960",
local: "true"
},
{ name: "CsrPartitionSize",
Expand All @@ -867,7 +843,7 @@
{ name: "CsrRegionOffset",
desc: "Offset of CSR_REGION",
type: "int",
default: "1024",
default: "960",
local: "true"
},
{ name: "CsrRegionSize",
Expand Down
12 changes: 0 additions & 12 deletions src/fuse_ctrl/data/otp_ctrl_mmap.hjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,18 +991,6 @@
desc: '''Vendor-specific non-secret fuse 2.
'''
},
{
name: "CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_3",
size: "32",
desc: '''Vendor-specific non-secret fuse 3.
'''
},
{
name: "CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_4",
size: "32",
desc: '''Vendor-specific non-secret fuse 4.
'''
},
{
name: "CPTRA_SS_VENDOR_SPECIFIC_RSVD",
size: "16",
Expand Down
2 changes: 0 additions & 2 deletions src/fuse_ctrl/doc/otp_ctrl_field_descriptions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,5 @@ It has been generated with ./tools/scripts/fuse_ctrl_script/gen_fuse_ctrl_partit
| VENDOR_NON_SECRET_PROD_PARTITION | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_0 | 32 | Vendor-specific non-secret fuse 0. |
| | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_1 | 32 | Vendor-specific non-secret fuse 1. |
| | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_2 | 32 | Vendor-specific non-secret fuse 2. |
| | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_3 | 32 | Vendor-specific non-secret fuse 3. |
| | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_4 | 32 | Vendor-specific non-secret fuse 4. |
| | CPTRA_SS_VENDOR_SPECIFIC_RSVD | 16 | Vendor-specific non-secret fuse. |
| CSR_PARTITION | CSR_REGION | 192 | Access to FMC CSR. |
8 changes: 3 additions & 5 deletions src/fuse_ctrl/doc/otp_ctrl_mmap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ It has been generated with ./tools/scripts/fuse_ctrl_script/gen_fuse_ctrl_partit
| | | | 64bit | [VENDOR_HASHES_OWNER_PROD_PARTITION_DIGEST](#Reg_vendor_hashes_owner_prod_partition_digest_0) | 0x310 | 8 |
| 11 | VENDOR_HASHES_PROD_PARTITION | 56 | 32bit | CPTRA_CORE_VENDOR_PK_HASH_1 | 0x318 | 48 |
| | | | 64bit | [VENDOR_HASHES_PROD_PARTITION_DIGEST](#Reg_vendor_hashes_prod_partition_digest_0) | 0x348 | 8 |
| 12 | VENDOR_NON_SECRET_PROD_PARTITION | 176 | 32bit | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_0 | 0x350 | 32 |
| 12 | VENDOR_NON_SECRET_PROD_PARTITION | 112 | 32bit | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_0 | 0x350 | 32 |
| | | | 32bit | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_1 | 0x370 | 32 |
| | | | 32bit | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_2 | 0x390 | 32 |
| | | | 32bit | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_3 | 0x3B0 | 32 |
| | | | 32bit | CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_4 | 0x3D0 | 32 |
| | | | 32bit | CPTRA_SS_VENDOR_SPECIFIC_RSVD | 0x3F0 | 16 |
| 13 | CSR_PARTITION | 192 | 32bit | CSR_REGION | 0x400 | 192 |
| | | | 32bit | CPTRA_SS_VENDOR_SPECIFIC_RSVD | 0x3B0 | 16 |
| 13 | CSR_PARTITION | 192 | 32bit | CSR_REGION | 0x3C0 | 192 |
14 changes: 6 additions & 8 deletions src/fuse_ctrl/rtl/otp_ctrl_part_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package otp_ctrl_part_pkg;

parameter int NumVendorPkFuses = 2;
parameter int NumVendorSecretFuses = 0;
parameter int NumVendorNonSecretFuses = 5;
parameter int NumVendorNonSecretFuses = 3;

////////////////////////////////////
// Scrambling Constants and Types //
Expand Down Expand Up @@ -340,7 +340,7 @@ package otp_ctrl_part_pkg;
'{
variant: Unbuffered,
offset: 12'd848,
size: 176,
size: 112,
key_sel: key_sel_e'('0),
secret: 1'b0,
sw_digest: 1'b0,
Expand All @@ -355,7 +355,7 @@ package otp_ctrl_part_pkg;
// CSR_PARTITION
'{
variant: Unbuffered,
offset: 12'd1024,
offset: 12'd960,
size: 192,
key_sel: key_sel_e'('0),
secret: 1'b0,
Expand Down Expand Up @@ -480,16 +480,14 @@ package otp_ctrl_part_pkg;


// OTP invalid partition default for buffered partitions.
parameter logic [9727:0] PartInvDefault = 9728'({
parameter logic [9215:0] PartInvDefault = 9216'({
1536'({
1536'h0
}),
1408'({
896'({
128'h0,
256'h0,
256'h0,
256'h0,
256'h0,
256'h0
}),
448'({
Expand Down Expand Up @@ -724,4 +722,4 @@ package otp_ctrl_part_pkg;
parameter int ProdVendorHashStart = CptraCoreVendorPkHash1Offset;
parameter int ProdVendorHashEnd = CptraCoreVendorPkHash1Offset + (ProdVendorHashSize * ProdVendorHashNum);

endpackage : otp_ctrl_part_pkg
endpackage : otp_ctrl_part_pkg
12 changes: 4 additions & 8 deletions src/fuse_ctrl/rtl/otp_ctrl_reg_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,18 @@ package otp_ctrl_reg_pkg;
parameter int VendorHashesProdPartitionDigestOffset = 840;
parameter int VendorHashesProdPartitionDigestSize = 8;
parameter int VendorNonSecretProdPartitionOffset = 848;
parameter int VendorNonSecretProdPartitionSize = 176;
parameter int VendorNonSecretProdPartitionSize = 112;
parameter int CptraSsVendorSpecificNonSecretFuse0Offset = 848;
parameter int CptraSsVendorSpecificNonSecretFuse0Size = 32;
parameter int CptraSsVendorSpecificNonSecretFuse1Offset = 880;
parameter int CptraSsVendorSpecificNonSecretFuse1Size = 32;
parameter int CptraSsVendorSpecificNonSecretFuse2Offset = 912;
parameter int CptraSsVendorSpecificNonSecretFuse2Size = 32;
parameter int CptraSsVendorSpecificNonSecretFuse3Offset = 944;
parameter int CptraSsVendorSpecificNonSecretFuse3Size = 32;
parameter int CptraSsVendorSpecificNonSecretFuse4Offset = 976;
parameter int CptraSsVendorSpecificNonSecretFuse4Size = 32;
parameter int CptraSsVendorSpecificRsvdOffset = 1008;
parameter int CptraSsVendorSpecificRsvdOffset = 944;
parameter int CptraSsVendorSpecificRsvdSize = 16;
parameter int CsrPartitionOffset = 1024;
parameter int CsrPartitionOffset = 960;
parameter int CsrPartitionSize = 192;
parameter int CsrRegionOffset = 1024;
parameter int CsrRegionOffset = 960;
parameter int CsrRegionSize = 192;
parameter int NumAlerts = 5;

Expand Down
12 changes: 4 additions & 8 deletions src/integration/rtl/fuse_ctrl_mmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ typedef enum {
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_0 = 0x0350,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_1 = 0x0370,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_2 = 0x0390,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_3 = 0x03B0,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_4 = 0x03D0,
CPTRA_SS_VENDOR_SPECIFIC_RSVD = 0x03F0,
CPTRA_SS_VENDOR_SPECIFIC_RSVD = 0x03B0,
// CSR_PARTITION
CSR_REGION = 0x0400
CSR_REGION = 0x03C0
} fuse_k;

typedef enum {
Expand Down Expand Up @@ -157,8 +155,6 @@ uint32_t vendor_non_secret_prod_partition_fuses[] = {
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_0,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_1,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_2,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_3,
CPTRA_SS_VENDOR_SPECIFIC_NON_SECRET_FUSE_4,
CPTRA_SS_VENDOR_SPECIFIC_RSVD
};
uint32_t csr_partition_fuses[] = {
Expand Down Expand Up @@ -384,13 +380,13 @@ partition_t partitions[NUM_PARTITIONS] = {
.has_ecc = false,
.lc_phase = 17,
.is_lifecycle = false,
.num_fuses = 5,
.num_fuses = 3,
.fuses = vendor_non_secret_prod_partition_fuses
},
// CSR_PARTITION
{
.index = 13,
.address = 0x0400,
.address = 0x03C0,
.digest_address = 0x0000,
.variant = 1,
.granularity = 32,
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/fuse_ctrl_script/gen_fuse_ctrl_partitions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
num_vendor_pk_fuses: 2
num_vendor_secret_fuses: 0
num_vendor_non_secret_fuses: 5
num_vendor_non_secret_fuses: 3
Loading