| Message ID | 20230224103940.1328725-1-nysal@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b0bbe5a2915201e3231e788d716d39dc54493b03 |
| Headers | show |
| Series | powerpc/atomics: Remove unused function | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
Michael, Any comments on this one? On Fri, Feb 24, 2023 at 11:02:31AM +0000, Christophe Leroy wrote: > > > Le 24/02/2023 à 11:39, Nysal Jan K.A a écrit : > > [Vous ne recevez pas souvent de courriers de nysal@linux.ibm.com. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] > > > > Remove arch_atomic_try_cmpxchg_lock function as it is no longer used > > since commit 9f61521c7a28 ("powerpc/qspinlock: powerpc qspinlock > > implementation") > > > > Signed-off-by: Nysal Jan K.A <nysal@linux.ibm.com> > > Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> > > > --- > > arch/powerpc/include/asm/atomic.h | 29 ----------------------------- > > 1 file changed, 29 deletions(-) > > > > diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h > > index 486ab7889121..b3a53830446b 100644 > > --- a/arch/powerpc/include/asm/atomic.h > > +++ b/arch/powerpc/include/asm/atomic.h > > @@ -130,35 +130,6 @@ ATOMIC_OPS(xor, xor, "", K) > > #define arch_atomic_xchg_relaxed(v, new) \ > > arch_xchg_relaxed(&((v)->counter), (new)) > > > > -/* > > - * Don't want to override the generic atomic_try_cmpxchg_acquire, because > > - * we add a lock hint to the lwarx, which may not be wanted for the > > - * _acquire case (and is not used by the other _acquire variants so it > > - * would be a surprise). > > - */ > > -static __always_inline bool > > -arch_atomic_try_cmpxchg_lock(atomic_t *v, int *old, int new) > > -{ > > - int r, o = *old; > > - unsigned int eh = IS_ENABLED(CONFIG_PPC64); > > - > > - __asm__ __volatile__ ( > > -"1: lwarx %0,0,%2,%[eh] # atomic_try_cmpxchg_acquire \n" > > -" cmpw 0,%0,%3 \n" > > -" bne- 2f \n" > > -" stwcx. %4,0,%2 \n" > > -" bne- 1b \n" > > -"\t" PPC_ACQUIRE_BARRIER " \n" > > -"2: \n" > > - : "=&r" (r), "+m" (v->counter) > > - : "r" (&v->counter), "r" (o), "r" (new), [eh] "n" (eh) > > - : "cr0", "memory"); > > - > > - if (unlikely(r != o)) > > - *old = r; > > - return likely(r == o); > > -} > > - > > /** > > * atomic_fetch_add_unless - add unless the number is a given value > > * @v: pointer of type atomic_t > > -- > > 2.39.2 > >
On Fri, 24 Feb 2023 16:09:40 +0530, Nysal Jan K.A wrote: > Remove arch_atomic_try_cmpxchg_lock function as it is no longer used > since commit 9f61521c7a28 ("powerpc/qspinlock: powerpc qspinlock > implementation") > > Applied to powerpc/next. [1/1] powerpc/atomics: Remove unused function https://git.kernel.org/powerpc/c/b0bbe5a2915201e3231e788d716d39dc54493b03 cheers
diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h index 486ab7889121..b3a53830446b 100644 --- a/arch/powerpc/include/asm/atomic.h +++ b/arch/powerpc/include/asm/atomic.h @@ -130,35 +130,6 @@ ATOMIC_OPS(xor, xor, "", K) #define arch_atomic_xchg_relaxed(v, new) \ arch_xchg_relaxed(&((v)->counter), (new)) -/* - * Don't want to override the generic atomic_try_cmpxchg_acquire, because - * we add a lock hint to the lwarx, which may not be wanted for the - * _acquire case (and is not used by the other _acquire variants so it - * would be a surprise). - */ -static __always_inline bool -arch_atomic_try_cmpxchg_lock(atomic_t *v, int *old, int new) -{ - int r, o = *old; - unsigned int eh = IS_ENABLED(CONFIG_PPC64); - - __asm__ __volatile__ ( -"1: lwarx %0,0,%2,%[eh] # atomic_try_cmpxchg_acquire \n" -" cmpw 0,%0,%3 \n" -" bne- 2f \n" -" stwcx. %4,0,%2 \n" -" bne- 1b \n" -"\t" PPC_ACQUIRE_BARRIER " \n" -"2: \n" - : "=&r" (r), "+m" (v->counter) - : "r" (&v->counter), "r" (o), "r" (new), [eh] "n" (eh) - : "cr0", "memory"); - - if (unlikely(r != o)) - *old = r; - return likely(r == o); -} - /** * atomic_fetch_add_unless - add unless the number is a given value * @v: pointer of type atomic_t
Remove arch_atomic_try_cmpxchg_lock function as it is no longer used since commit 9f61521c7a28 ("powerpc/qspinlock: powerpc qspinlock implementation") Signed-off-by: Nysal Jan K.A <nysal@linux.ibm.com> --- arch/powerpc/include/asm/atomic.h | 29 ----------------------------- 1 file changed, 29 deletions(-)