| Message ID | 20230327124520.2707537-7-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | powerpc: updates, P10, PNV support | expand |
On 27/03/2023 14.45, Nicholas Piggin wrote: > Move some common helpers and defines to processor.h. > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > Since v2: > - New patch > > lib/powerpc/asm/processor.h | 38 +++++++++++++++++++++++++++++++++---- > powerpc/spapr_hcall.c | 9 +-------- > powerpc/sprs.c | 9 --------- > 3 files changed, 35 insertions(+), 21 deletions(-) > > diff --git a/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h > index ebfeff2..4ad6612 100644 > --- a/lib/powerpc/asm/processor.h > +++ b/lib/powerpc/asm/processor.h > @@ -9,13 +9,43 @@ void handle_exception(int trap, void (*func)(struct pt_regs *, void *), void *); > void do_handle_exception(struct pt_regs *regs); > #endif /* __ASSEMBLY__ */ > > -static inline uint64_t get_tb(void) > +#define SPR_TB 0x10c > +#define SPR_SPRG0 0x110 > +#define SPR_SPRG1 0x111 > +#define SPR_SPRG2 0x112 > +#define SPR_SPRG3 0x113 > + > +static inline uint64_t mfspr(int nr) > { > - uint64_t tb; > + uint64_t ret; > + > + asm volatile("mfspr %0,%1" : "=r"(ret) : "i"(nr) : "memory"); > + > + return ret; > +} > > - asm volatile ("mfspr %[tb],268" : [tb] "=r" (tb)); > +static inline void mtspr(int nr, uint64_t val) > +{ > + asm volatile("mtspr %0,%1" : : "i"(nr), "r"(val) : "memory"); > +} I'd maybe use __always_inline for the above two helper functions, since "nr" is used with immediate constraint in the asm part. Did you also check whether this works with Clang ? (IIRC I saw issues with that on other occasions in the past) Anyway: Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h index ebfeff2..4ad6612 100644 --- a/lib/powerpc/asm/processor.h +++ b/lib/powerpc/asm/processor.h @@ -9,13 +9,43 @@ void handle_exception(int trap, void (*func)(struct pt_regs *, void *), void *); void do_handle_exception(struct pt_regs *regs); #endif /* __ASSEMBLY__ */ -static inline uint64_t get_tb(void) +#define SPR_TB 0x10c +#define SPR_SPRG0 0x110 +#define SPR_SPRG1 0x111 +#define SPR_SPRG2 0x112 +#define SPR_SPRG3 0x113 + +static inline uint64_t mfspr(int nr) { - uint64_t tb; + uint64_t ret; + + asm volatile("mfspr %0,%1" : "=r"(ret) : "i"(nr) : "memory"); + + return ret; +} - asm volatile ("mfspr %[tb],268" : [tb] "=r" (tb)); +static inline void mtspr(int nr, uint64_t val) +{ + asm volatile("mtspr %0,%1" : : "i"(nr), "r"(val) : "memory"); +} + +static inline uint64_t mfmsr(void) +{ + uint64_t msr; - return tb; + asm volatile ("mfmsr %[msr]" : [msr] "=r" (msr) :: "memory"); + + return msr; +} + +static inline void mtmsr(uint64_t msr) +{ + asm volatile ("mtmsrd %[msr]" :: [msr] "r" (msr) : "memory"); +} + +static inline uint64_t get_tb(void) +{ + return mfspr(SPR_TB); } extern void delay(uint64_t cycles); diff --git a/powerpc/spapr_hcall.c b/powerpc/spapr_hcall.c index 823a574..0d0f25a 100644 --- a/powerpc/spapr_hcall.c +++ b/powerpc/spapr_hcall.c @@ -9,20 +9,13 @@ #include <util.h> #include <alloc.h> #include <asm/hcall.h> +#include <asm/processor.h> #define PAGE_SIZE 4096 #define H_ZERO_PAGE (1UL << (63-48)) #define H_COPY_PAGE (1UL << (63-49)) -#define mfspr(nr) ({ \ - uint64_t ret; \ - asm volatile("mfspr %0,%1" : "=r"(ret) : "i"(nr)); \ - ret; \ -}) - -#define SPR_SPRG0 0x110 - /** * Test the H_SET_SPRG0 h-call by setting some values and checking whether * the SPRG0 register contains the correct values afterwards diff --git a/powerpc/sprs.c b/powerpc/sprs.c index 6ee6dba..57e487c 100644 --- a/powerpc/sprs.c +++ b/powerpc/sprs.c @@ -28,15 +28,6 @@ #include <asm/processor.h> #include <asm/barrier.h> -#define mfspr(nr) ({ \ - uint64_t ret; \ - asm volatile("mfspr %0,%1" : "=r"(ret) : "i"(nr)); \ - ret; \ -}) - -#define mtspr(nr, val) \ - asm volatile("mtspr %0,%1" : : "i"(nr), "r"(val)) - uint64_t before[1024], after[1024]; /* Common SPRs for all PowerPC CPUs */
Move some common helpers and defines to processor.h. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- Since v2: - New patch lib/powerpc/asm/processor.h | 38 +++++++++++++++++++++++++++++++++---- powerpc/spapr_hcall.c | 9 +-------- powerpc/sprs.c | 9 --------- 3 files changed, 35 insertions(+), 21 deletions(-)