linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Simek <michal.simek@xilinx.com>
To: linux-kernel@vger.kernel.org, monstr@monstr.eu,
	michal.simek@xilinx.com, git@xilinx.com, arnd@arndb.de
Cc: Stefan Asserhall <stefan.asserhall@xilinx.com>
Subject: [PATCH 10/10] microblaze: Use asm generic cmpxchg.h for !SMP case
Date: Wed, 12 Feb 2020 09:58:07 +0100	[thread overview]
Message-ID: <4d8c08bc549fc663eba0237a4ccd5e1e0e1bc01c.1581497860.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <cover.1581497860.git.michal.simek@xilinx.com>

The whole implementation is done in asm-generic/cmpxchg.h file and there is
no reason to duplicate it.
Also do not include asm-generic/cmpxchg-local.h because it is already
included from asm-generic/cmpxchg.h

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Stefan Asserhall <stefan.asserhall@xilinx.com>
---

 arch/microblaze/include/asm/cmpxchg.h | 40 ++-------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/arch/microblaze/include/asm/cmpxchg.h b/arch/microblaze/include/asm/cmpxchg.h
index 596300c74509..3523b51aab36 100644
--- a/arch/microblaze/include/asm/cmpxchg.h
+++ b/arch/microblaze/include/asm/cmpxchg.h
@@ -2,42 +2,8 @@
 #ifndef _ASM_MICROBLAZE_CMPXCHG_H
 #define _ASM_MICROBLAZE_CMPXCHG_H
 
-#include <linux/irqflags.h>
-
-void __bad_xchg(volatile void *ptr, int size);
-
-static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
-								int size)
-{
-	unsigned long ret;
-	unsigned long flags;
-
-	switch (size) {
-	case 1:
-		local_irq_save(flags);
-		ret = *(volatile unsigned char *)ptr;
-		*(volatile unsigned char *)ptr = x;
-		local_irq_restore(flags);
-		break;
-
-	case 4:
-		local_irq_save(flags);
-		ret = *(volatile unsigned long *)ptr;
-		*(volatile unsigned long *)ptr = x;
-		local_irq_restore(flags);
-		break;
-	default:
-		__bad_xchg(ptr, size), ret = 0;
-		break;
-	}
-
-	return ret;
-}
-
-#define xchg(ptr, x) \
-	((__typeof__(*(ptr))) __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
-
-#include <asm-generic/cmpxchg.h>
-#include <asm-generic/cmpxchg-local.h>
+#ifndef CONFIG_SMP
+# include <asm-generic/cmpxchg.h>
+#endif
 
 #endif /* _ASM_MICROBLAZE_CMPXCHG_H */
-- 
2.25.0


  parent reply	other threads:[~2020-02-12  8:58 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-12  8:57 [PATCH 00/10] Hi, Michal Simek
2020-02-12  8:57 ` [PATCH 01/10] microblaze: Convert headers to SPDX license Michal Simek
2020-02-12  8:57 ` [PATCH 02/10] microblaze: Remove architecture tlb.h and use generic one Michal Simek
2020-02-12  8:58 ` [PATCH 03/10] microblaze: Remove early printk setup Michal Simek
2020-02-12  8:58 ` [PATCH 04/10] microblaze: Remove empty headers Michal Simek
2020-02-12  8:58 ` [PATCH 05/10] microblaze: Define microblaze barrier Michal Simek
2020-02-12  8:58 ` [PATCH 06/10] microblaze: Add sync to tlb operations Michal Simek
2020-02-12 13:00   ` Arnd Bergmann
2020-02-12 13:01     ` Michal Simek
2020-02-12  8:58 ` [PATCH 07/10] microblaze: Add missing irqflags.h header Michal Simek
2020-02-12  8:58 ` [PATCH 08/10] microblaze: Remove unused boot_cpuid variable Michal Simek
2020-02-12  8:58 ` [PATCH 09/10] microblaze: Define percpu sestion in linker file Michal Simek
2020-02-12  8:58 ` Michal Simek [this message]
2020-02-12 13:02 ` [PATCH 00/10] Hi, Arnd Bergmann
2020-02-12 13:32   ` Michal Simek
2020-02-13 23:47 ` Rob Herring
2020-02-17 14:27   ` Michal Simek
2020-02-25 16:32     ` Rob Herring
2020-02-27  7:31       ` Michal Simek
     [not found]         ` <BYAPR02MB5559708A5A584D05516D77EBA58A0@BYAPR02MB5559.namprd02.prod.outlook.com>
2020-06-01 14:05           ` Rob Herring
2020-02-25 11:34 ` Michal Simek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4d8c08bc549fc663eba0237a4ccd5e1e0e1bc01c.1581497860.git.michal.simek@xilinx.com \
    --to=michal.simek@xilinx.com \
    --cc=arnd@arndb.de \
    --cc=git@xilinx.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=monstr@monstr.eu \
    --cc=stefan.asserhall@xilinx.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).