Commit 5efe9ed4 authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Ignore fsr from get_phys_addr() in do_ats_write() 



In do_ats_write(), rather than using the FSR value from get_phys_addr(),
construct the PAR values using the information in the ARMMMUFaultInfo
struct. This allows us to create a PAR of the correct format regardless
of what the translation table format is.

For the moment we leave the condition for "when should this be a
64 bit PAR" as it was previously; this will need to be fixed to
properly support AArch32 Hyp mode.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
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>
Message-id: 1512503192-2239-11-git-send-email-peter.maydell@linaro.org
parent 681f9a89

target/arm/helper.c

+10 −6
Original line number Diff line number Diff line
@@ -2160,7 +2160,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value, 
    hwaddr phys_addr;

    target_ulong page_size;

    int prot;

    uint32_t fsr;

    uint32_t fsr_unused;

    bool ret;

    uint64_t par64;

    MemTxAttrs attrs = {};
@@ -2168,12 +2168,12 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value, 
    ARMCacheAttrs cacheattrs = {};



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

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

    if (arm_s1_regime_using_lpae_format(env, mmu_idx)) {

        /* fsr is a DFSR/IFSR value for the long descriptor

         * translation table format, but with WnR always clear.

         * Convert it to a 64-bit PAR.

                        &prot, &page_size, &fsr_unused, &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 (arm_s1_regime_using_lpae_format(env, mmu_idx)) {

        /* Create a 64-bit PAR */

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

        if (!ret) {

            par64 |= phys_addr & ~0xfffULL;
@@ -2183,6 +2183,8 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value, 
            par64 |= (uint64_t)cacheattrs.attrs << 56; /* ATTR */

            par64 |= cacheattrs.shareability << 7; /* SH */

        } else {

            uint32_t fsr = arm_fi_to_lfsc(&fi);



            par64 |= 1; /* F */

            par64 |= (fsr & 0x3f) << 1; /* FS */

            /* Note that S2WLK and FSTAGE are always zero, because we don't
@@ -2207,6 +2209,8 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value, 
                par64 |= (1 << 9); /* NS */

            }

        } else {

            uint32_t fsr = arm_fi_to_sfsc(&fi);



            par64 = ((fsr & (1 << 10)) >> 5) | ((fsr & (1 << 12)) >> 6) |

                    ((fsr & 0xf) << 1) | 1;

        }