@@ -156,18 +156,18 @@ impl AlertRegs {
156
156
LcStateVal :: Test => return Ok ( alert) ,
157
157
} ;
158
158
159
- let class_enable = otp. read32 ( "ROM_ALERT_CLASS_EN " ) ?;
160
- let class_escalate = otp. read32 ( "ROM_ALERT_ESCALATION " ) ?;
159
+ let class_enable = otp. read32 ( "OWNER_SW_CFG_ROM_ALERT_CLASS_EN " ) ?;
160
+ let class_escalate = otp. read32 ( "OWNER_SW_CFG_ROM_ALERT_ESCALATION " ) ?;
161
161
162
162
for i in 0 ..ALERT_HANDLER_ALERT_CLASS_SHADOWED_MULTIREG_COUNT as usize {
163
- let value = otp. read32_offset ( Some ( "ROM_ALERT_CLASSIFICATION" ) , i * 4 ) ?;
163
+ let value = otp. read32_offset ( "OWNER_SW_CFG_ROM_ALERT_CLASSIFICATION" , i * 4 ) ?;
164
164
let cls = AlertClass :: try_from ( value. to_le_bytes ( ) [ lc_shift] ) ?;
165
165
let enable = AlertEnable :: try_from ( class_enable. to_le_bytes ( ) [ cls. index ( ) ] ) ?;
166
166
alert. configure ( i, cls, enable) ?;
167
167
}
168
168
169
169
for i in 0 ..ALERT_HANDLER_LOC_ALERT_CLASS_SHADOWED_MULTIREG_COUNT as usize {
170
- let value = otp. read32_offset ( Some ( "ROM_LOCAL_ALERT_CLASSIFICATION" ) , i * 4 ) ?;
170
+ let value = otp. read32_offset ( "OWNER_SW_CFG_ROM_LOCAL_ALERT_CLASSIFICATION" , i * 4 ) ?;
171
171
let cls = AlertClass :: try_from ( value. to_le_bytes ( ) [ lc_shift] ) ?;
172
172
let enable = AlertEnable :: try_from ( class_enable. to_le_bytes ( ) [ cls. index ( ) ] ) ?;
173
173
alert. local_configure ( i, cls, enable) ?;
@@ -177,15 +177,15 @@ impl AlertRegs {
177
177
let mut phase_cycs = [ 0 ; ALERT_HANDLER_PARAM_N_PHASES as usize ] ;
178
178
for phase in 0 ..ALERT_HANDLER_PARAM_N_PHASES as usize {
179
179
phase_cycs[ phase] = otp. read32_offset (
180
- Some ( "ROM_ALERT_PHASE_CYCLES" ) ,
180
+ "OWNER_SW_CFG_ROM_ALERT_PHASE_CYCLES" ,
181
181
( i * phase_cycs. len ( ) + phase) * 4 ,
182
182
) ?;
183
183
}
184
184
let config = AlertClassConfig {
185
185
enabled : AlertEnable :: try_from ( class_enable. to_le_bytes ( ) [ i] ) ?,
186
186
escalate : AlertEscalate :: try_from ( class_escalate. to_le_bytes ( ) [ i] ) ?,
187
- accum_thresh : otp. read32_offset ( Some ( "ROM_ALERT_ACCUM_THRESH" ) , i * 4 ) ?,
188
- timeout_cyc : otp. read32_offset ( Some ( "ROM_ALERT_TIMEOUT_CYCLES" ) , i * 4 ) ?,
187
+ accum_thresh : otp. read32_offset ( "OWNER_SW_CFG_ROM_ALERT_ACCUM_THRESH" , i * 4 ) ?,
188
+ timeout_cyc : otp. read32_offset ( "OWNER_SW_CFG_ROM_ALERT_TIMEOUT_CYCLES" , i * 4 ) ?,
189
189
phase_cycs,
190
190
} ;
191
191
alert. class_configure ( AlertClass :: from_index ( i) , & config) ?;
@@ -443,19 +443,21 @@ mod test {
443
443
444
444
// OTP values that corrispond to the above `TEST_REG` values.
445
445
impl OtpRead for TestOtp {
446
- fn read32_offset ( & self , name : Option < & str > , offset : usize ) -> Result < u32 > {
447
- let name = name. unwrap ( ) ;
446
+ fn read32_offset ( & self , name : & str , offset : usize ) -> Result < u32 > {
448
447
Ok ( match name {
449
- "ROM_ALERT_CLASS_EN" => 0xa9a9a9a9 ,
450
- "ROM_ALERT_ESCALATION" => 0xd1d1d1d1 ,
451
- "ROM_ALERT_CLASSIFICATION" | "ROM_LOCAL_ALERT_CLASSIFICATION" => 0x94949494 ,
452
- "ROM_ALERT_PHASE_CYCLES" => [
448
+ "OWNER_SW_CFG_ROM_ALERT_CLASS_EN" => 0xa9a9a9a9 ,
449
+ "OWNER_SW_CFG_ROM_ALERT_ESCALATION" => 0xd1d1d1d1 ,
450
+ "OWNER_SW_CFG_ROM_ALERT_CLASSIFICATION"
451
+ | "OWNER_SW_CFG_ROM_LOCAL_ALERT_CLASSIFICATION" => 0x94949494 ,
452
+ "OWNER_SW_CFG_ROM_ALERT_PHASE_CYCLES" => [
453
453
0x00000000 , 0x0000000a , 0x0000000a , 0xffffffff , // Class 0
454
454
0x00000000 , 0x0000000a , 0x0000000a , 0xffffffff , // Class 1
455
455
0x00000000 , 0x00000000 , 0x00000000 , 0x00000000 , // Class 2
456
456
0x00000000 , 0x00000000 , 0x00000000 , 0x00000000 , // Class 3
457
457
] [ offset / 4 ] ,
458
- "ROM_ALERT_ACCUM_THRESH" | "ROM_ALERT_TIMEOUT_CYCLES" => 0x00000000 ,
458
+ "OWNER_SW_CFG_ROM_ALERT_ACCUM_THRESH" | "OWNER_SW_CFG_ROM_ALERT_TIMEOUT_CYCLES" => {
459
+ 0x00000000
460
+ }
459
461
_ => panic ! ( "No such OTP value {}" , name) ,
460
462
} )
461
463
}
0 commit comments