Merge pull request #1799 from soby-mathew/sm/gicr_probe

GICv3: Allow probe for fewer GICR interfaces than exposed by the frame
This commit is contained in:
Antonio Niño Díaz 2019-02-04 18:19:07 +00:00 committed by GitHub
commit 5c8a7732e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -341,8 +341,10 @@ void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs,
proc_num = (typer_val >> TYPER_PROC_NUM_SHIFT) &
TYPER_PROC_NUM_MASK;
}
assert(proc_num < rdistif_num);
rdistif_base_addrs[proc_num] = rdistif_base;
if (proc_num < rdistif_num)
rdistif_base_addrs[proc_num] = rdistif_base;
rdistif_base += (1U << GICR_PCPUBASE_SHIFT);
} while ((typer_val & TYPER_LAST_BIT) == 0U);
}