powerpc/32s: mfsrin()/mtsrin() become mfsr()/mtsr()

Function names should tell what the function does, not how.

mfsrin() and mtsrin() are read/writing segment registers.

They are called that way because they are using mfsrin and mtsrin
instructions, but it doesn't matter for the caller.

In preparation of following patch, change their name to mfsr() and mtsr()
in order to make it obvious they manipulate segment registers without
messing up with how they do it.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f92d99f4349391b77766745900231aa880a0efb5.1612612022.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h
index a0117a9d5b06cd45ac4ed317d0a2410cc890e0ad..73bc5d2c431dfaa42ba1f9904087f99b652fff57 100644 (file)
--- a/arch/powerpc/include/asm/book3s/32/kup.h
+++ b/arch/powerpc/include/asm/book3s/32/kup.h
@@ -95,12 +95,12 @@ static inline void kuap_update_sr(u32 sr, u32 addr, u32 end)
        addr &= 0xf0000000;     /* align addr to start of segment */
        barrier();      /* make sure thread.kuap is updated before playing with SRs */
        while (addr < end) {
-               mtsrin(sr, addr);
+               mtsr(sr, addr);
                sr += 0x111;            /* next VSID */
                sr &= 0xf0ffffff;       /* clear VSID overflow */
                addr += 0x10000000;     /* address of next segment */
        }
-       isync();        /* Context sync required after mtsrin() */
+       isync();        /* Context sync required after mtsr() */
 }
 
 static __always_inline void allow_user_access(void __user *to, const void __user *from,
@@ -122,7 +122,7 @@ static __always_inline void allow_user_access(void __user *to, const void __user
        end = min(addr + size, TASK_SIZE);
 
        current->thread.kuap = (addr & 0xf0000000) | ((((end - 1) >> 28) + 1) & 0xf);
-       kuap_update_sr(mfsrin(addr) & ~SR_KS, addr, end);       /* Clear Ks */
+       kuap_update_sr(mfsr(addr) & ~SR_KS, addr, end); /* Clear Ks */
 }
 
 static __always_inline void prevent_user_access(void __user *to, const void __user *from,
@@ -151,7 +151,7 @@ static __always_inline void prevent_user_access(void __user *to, const void __us
        }
 
        current->thread.kuap = 0;
-       kuap_update_sr(mfsrin(addr) | SR_KS, addr, end);        /* set Ks */
+       kuap_update_sr(mfsr(addr) | SR_KS, addr, end);  /* set Ks */
 }
 
 static inline unsigned long prevent_user_access_return(void)

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index c006f33f68ada97cbdc25656f6fe23dbec8fac22..83a7fc37d4900ebb3d4eabd04dd8e7f3bbed8a0a 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -1413,7 +1413,7 @@ static inline void msr_check_and_clear(unsigned long bits)
 }
 
 #ifdef CONFIG_PPC32
-static inline u32 mfsrin(u32 idx)
+static inline u32 mfsr(u32 idx)
 {
        u32 val;
 
@@ -1422,7 +1422,7 @@ static inline u32 mfsrin(u32 idx)
        return val;
 }
 
-static inline void mtsrin(u32 val, u32 idx)
+static inline void mtsr(u32 val, u32 idx)
 {
        asm volatile("mtsrin %0, %1" : : "r" (val), "r" (idx));
 }

diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c
index 859e5bd603ac82fe39a9c8fe7ac63fd6eae5b718..d7eb266a3f7ad83840229cc4bfd95810ec1d4550 100644 (file)
--- a/arch/powerpc/mm/book3s32/mmu.c
+++ b/arch/powerpc/mm/book3s32/mmu.c
@@ -234,7 +234,7 @@ void mmu_mark_initmem_nx(void)
                if (is_module_segment(i << 28))
                        continue;
 
-               mtsrin(mfsrin(i << 28) | 0x10000000, i << 28);
+               mtsr(mfsr(i << 28) | 0x10000000, i << 28);
        }
 }
 

diff --git a/arch/powerpc/mm/ptdump/segment_regs.c b/arch/powerpc/mm/ptdump/segment_regs.c
index dde2fe8de4b2a867093158981442dab4ac41ef51..565048a0c9be3b45e4c2283ea6e906a191cee9e1 100644 (file)
--- a/arch/powerpc/mm/ptdump/segment_regs.c
+++ b/arch/powerpc/mm/ptdump/segment_regs.c
@@ -10,7 +10,7 @@
 
 static void seg_show(struct seq_file *m, int i)
 {
-       u32 val = mfsrin(i << 28);
+       u32 val = mfsr(i << 28);
 
        seq_printf(m, "0x%01x0000000-0x%01xfffffff ", i, i);
        seq_printf(m, "Kern key %d ", (val >> 30) & 1);

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index cec432eb9189e6a072de0b33d213b0aa687fe784..3fe37495f63dc7ecf2e5550c98d07953caed10df 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -3719,7 +3719,7 @@ void dump_segments(void)
 
        printf("sr0-15 =");
        for (i = 0; i < 16; ++i)
-               printf(" %x", mfsrin(i << 28));
+               printf(" %x", mfsr(i << 28));
        printf("\n");
 }
 #endif