Edgar E. Iglesias <edgar.igles...@gmail.com> writes:
> From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
>
> Make pamax an argument to check_s2_startlevel in preparation
> for future reuse.
>
> No functional change.
>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
> ---
> target-arm/helper.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 8aedce9..4abeb4d 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -6579,7 +6579,8 @@ typedef enum {
> * Returns true if the suggested starting level is OK and false otherwise.
> */
> static bool check_s2_startlevel(ARMCPU *cpu, bool is_aa64, int level,
> - int inputsize, int stride)
> + int inputsize, int stride,
> + unsigned int pamax)
I'm not convinced about this as we only use pamax in one leg and we can
get it via *cpu when needed. If it will eventually be used you would
also have to update the docstring above.
> {
> const int grainsize = stride + 3;
> int startsizecheck;
> @@ -6595,8 +6596,6 @@ static bool check_s2_startlevel(ARMCPU *cpu, bool
> is_aa64, int level,
> }
>
> if (is_aa64) {
> - unsigned int pamax = arm_pamax(cpu);
> -
> switch (stride) {
> case 13: /* 64KB Pages. */
> if (level == 0 || (level == 1 && pamax <= 42)) {
> @@ -6808,6 +6807,7 @@ static bool get_phys_addr_lpae(CPUARMState *env,
> target_ulong address,
> * VTCR_EL2.SL0 field (whose interpretation depends on the page size)
> */
> int startlevel = extract32(tcr->raw_tcr, 6, 2);
> + unsigned int pamax = arm_pamax(cpu);
> bool ok;
>
> if (va_size == 32 || stride == 9) {
> @@ -6820,7 +6820,7 @@ static bool get_phys_addr_lpae(CPUARMState *env,
> target_ulong address,
>
> /* Check that the starting level is valid. */
> ok = check_s2_startlevel(cpu, va_size == 64, level,
> - inputsize, stride);
> + inputsize, stride, pamax);
> if (!ok) {
> /* AArch64 reports these as level 0 faults.
> * AArch32 reports these as level 1 faults.
--
Alex Bennée
