lkml.org 
[lkml]   [2021]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.15 29/68] parisc: Convert PTE lookup to use extru_safe() macro
    Date
    From: Helge Deller <deller@gmx.de>

    [ Upstream commit 3fbdc121bd051d9f1b3b2e232ad734c44b47d32c ]

    Convert the PTE lookup functions to use the safer extru_safe macro.

    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/parisc/kernel/entry.S | 14 +++-----------
    1 file changed, 3 insertions(+), 11 deletions(-)

    diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
    index 437c8d31f3907..625c19884905b 100644
    --- a/arch/parisc/kernel/entry.S
    +++ b/arch/parisc/kernel/entry.S
    @@ -393,17 +393,9 @@
    */
    .macro L2_ptep pmd,pte,index,va,fault
    #if CONFIG_PGTABLE_LEVELS == 3
    - extru \va,31-ASM_PMD_SHIFT,ASM_BITS_PER_PMD,\index
    + extru_safe \va,31-ASM_PMD_SHIFT,ASM_BITS_PER_PMD,\index
    #else
    -# if defined(CONFIG_64BIT)
    - extrd,u \va,63-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index
    - #else
    - # if PAGE_SIZE > 4096
    - extru \va,31-ASM_PGDIR_SHIFT,32-ASM_PGDIR_SHIFT,\index
    - # else
    - extru \va,31-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index
    - # endif
    -# endif
    + extru_safe \va,31-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index
    #endif
    dep %r0,31,PAGE_SHIFT,\pmd /* clear offset */
    #if CONFIG_PGTABLE_LEVELS < 3
    @@ -413,7 +405,7 @@
    bb,>=,n \pmd,_PxD_PRESENT_BIT,\fault
    dep %r0,31,PxD_FLAG_SHIFT,\pmd /* clear flags */
    SHLREG \pmd,PxD_VALUE_SHIFT,\pmd
    - extru \va,31-PAGE_SHIFT,ASM_BITS_PER_PTE,\index
    + extru_safe \va,31-PAGE_SHIFT,ASM_BITS_PER_PTE,\index
    dep %r0,31,PAGE_SHIFT,\pmd /* clear offset */
    shladd \index,BITS_PER_PTE_ENTRY,\pmd,\pmd /* pmd is now pte */
    .endm
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-11-30 16:11    [W:4.024 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site