Unverified Commit 5c8a7732 authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by GitHub
Browse files

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

GICv3: Allow probe for fewer GICR interfaces than exposed by the frame
parents 6ce30346 5dc2c3f9
...@@ -341,8 +341,10 @@ void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs, ...@@ -341,8 +341,10 @@ void gicv3_rdistif_base_addrs_probe(uintptr_t *rdistif_base_addrs,
proc_num = (typer_val >> TYPER_PROC_NUM_SHIFT) & proc_num = (typer_val >> TYPER_PROC_NUM_SHIFT) &
TYPER_PROC_NUM_MASK; 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); rdistif_base += (1U << GICR_PCPUBASE_SHIFT);
} while ((typer_val & TYPER_LAST_BIT) == 0U); } while ((typer_val & TYPER_LAST_BIT) == 0U);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment