Commit 1313e2d7 authored by Edgar E. Iglesias's avatar Edgar E. Iglesias Committed by Peter Maydell
Browse files

target/arm: Extend PAR format determination 



Now that do_ats_write() is entirely in control of whether to
generate a 32-bit PAR or a 64-bit PAR, we can make it use the
correct (complicated) condition for doing so.

Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1512503192-2239-13-git-send-email-peter.maydell@linaro.org
[PMM: Rebased Edgar's patch on top of get_phys_addr() refactoring;
 use arm_s1_regime_using_lpae_format() rather than
 regime_using_lpae_format() because the latter will assert
 if passed ARMMMUIdx_S12NSE0 or ARMMMUIdx_S12NSE1;
 updated commit message appropriately]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent bc52bfeb

target/arm/helper.c

+29 −4
Original line number Diff line number Diff line
@@ -2162,16 +2162,41 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value, 
    int prot;

    bool ret;

    uint64_t par64;

    bool format64 = false;

    MemTxAttrs attrs = {};

    ARMMMUFaultInfo fi = {};

    ARMCacheAttrs cacheattrs = {};



    ret = get_phys_addr(env, value, access_type, mmu_idx, &phys_addr, &attrs,

                        &prot, &page_size, &fi, &cacheattrs);

    /* TODO: this is not the correct condition to use to decide whether

     * to report a PAR in 64-bit or 32-bit format.



    if (is_a64(env)) {

        format64 = true;

    } else if (arm_feature(env, ARM_FEATURE_LPAE)) {

        /*

         * ATS1Cxx:

         * * TTBCR.EAE determines whether the result is returned using the

         *   32-bit or the 64-bit PAR format

         * * Instructions executed in Hyp mode always use the 64bit format

         *

         * ATS1S2NSOxx uses the 64bit format if any of the following is true:

         * * The Non-secure TTBCR.EAE bit is set to 1

         * * The implementation includes EL2, and the value of HCR.VM is 1

         *

         * ATS1Hx always uses the 64bit format (not supported yet).

         */

    if (arm_s1_regime_using_lpae_format(env, mmu_idx)) {

        format64 = arm_s1_regime_using_lpae_format(env, mmu_idx);



        if (arm_feature(env, ARM_FEATURE_EL2)) {

            if (mmu_idx == ARMMMUIdx_S12NSE0 || mmu_idx == ARMMMUIdx_S12NSE1) {

                format64 |= env->cp15.hcr_el2 & HCR_VM;

            } else {

                format64 |= arm_current_el(env) == 2;

            }

        }

    }



    if (format64) {

        /* Create a 64-bit PAR */

        par64 = (1 << 11); /* LPAE bit always set */

        if (!ret) {