Skip to content

Commit 6f04f6e

Browse files
fix(dart): do not store value of bypass DT prop - let iOS do its thing
1 parent 8a3528a commit 6f04f6e

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

hw/arm/apple-silicon/dart.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ struct AppleDARTState {
202202
uint32_t l_mask[3];
203203
uint32_t l_shift[3];
204204
uint64_t sid_mask;
205-
uint32_t bypass_mask;
206205
uint32_t dart_options;
207206
};
208207

@@ -521,8 +520,7 @@ static IOMMUTLBEntry apple_dart_mapper_translate(IOMMUMemoryRegion *mr,
521520
sid = mapper->regs.sid_remap[sid];
522521

523522
// Disabled translation means bypass, not error (?)
524-
if ((dart->bypass_mask & BIT32(sid)) != 0 ||
525-
FIELD_EX32(mapper->regs.sid_config[sid], DART_SID_CONFIG,
523+
if (FIELD_EX32(mapper->regs.sid_config[sid], DART_SID_CONFIG,
526524
TRANSLATION_ENABLE) == 0 ||
527525
FIELD_EX32(mapper->regs.sid_config[sid], DART_SID_CONFIG,
528526
FULL_BYPASS) != 0) {
@@ -697,8 +695,6 @@ AppleDARTState *apple_dart_from_node(AppleDTNode *node)
697695
// but other ones.
698696
dart->sid_mask =
699697
apple_dt_get_prop_u32_or(node, "sids", 0xFFFF, &error_fatal);
700-
dart->bypass_mask =
701-
apple_dt_get_prop_u32_or(node, "bypass", 0, &error_fatal);
702698
dart->dart_options =
703699
apple_dt_get_prop_u32_or(node, "dart-options", 0, &error_fatal);
704700

0 commit comments

Comments
 (0)