mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 20/25] usb: xhci-hcd: replace opencoded non-atomic 64-bit MMIO with lo_hi helper
Date: Tue,  2 Jun 2020 10:54:07 +0200	[thread overview]
Message-ID: <20200602085412.16554-21-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20200602085412.16554-1-a.fatoum@pengutronix.de>

Commit 3c5317e9046 ("usb: xhci-hcd: Make use of lo_hi_readq/writeq()")
had made use of lo_hi_readq/writeq() to implement xhci_read/write_64(),
like Linux does, but this was removed in commit fddd1c7c51a8
("usb: host: remove xhci driver"). Reinstate it to make code clearer.

No functional change.

[Note: Linux doesn't use any readq/writeq, but does two 32-bit access
 always, even on 64-bit systems]

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/usb/host/xhci.h | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 1a3f7e7642bc..9ffbb103d562 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -18,6 +18,7 @@
 
 #include <asm/types.h>
 #include <io.h>
+#include <io-64-nonatomic-lo-hi.h>
 #include <linux/list.h>
 
 #define MAX_EP_CTX_NUM		31
@@ -1112,10 +1113,7 @@ static inline u64 xhci_readq(__le64 volatile *regs)
 #if BITS_PER_LONG == 64
 	return readq(regs);
 #else
-	__u32 *ptr = (__u32 *)regs;
-	u64 val_lo = readl(ptr);
-	u64 val_hi = readl(ptr + 1);
-	return val_lo + (val_hi << 32);
+	return lo_hi_readq(regs);
 #endif
 }
 
@@ -1124,12 +1122,7 @@ static inline void xhci_writeq(__le64 volatile *regs, const u64 val)
 #if BITS_PER_LONG == 64
 	writeq(val, regs);
 #else
-	__u32 *ptr = (__u32 *)regs;
-	u32 val_lo = lower_32_bits(val);
-	/* FIXME */
-	u32 val_hi = upper_32_bits(val);
-	writel(val_lo, ptr);
-	writel(val_hi, ptr + 1);
+	lo_hi_writeq(val, regs);
 #endif
 }
 
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-06-02  8:54 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-02  8:53 [PATCH v2 00/25] sandbox: support COMPILE_TESTing drivers Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 01/25] scripts: import Linux Kconfig.include Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 02/25] sandbox: define CONFIG_64BIT as appropriate Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 03/25] sandbox: asm: bitsperlong.h: detect bitness according to 64BIT symbol Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 04/25] sandbox: support forcing 32-bit x86 Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 05/25] include: asm-generic: provide (in|out)_(le|be)(16|32) helpers for all archs Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 06/25] ARM: asm/io.h: fall back to <asm-generic/bitio.h> out_be32 and friends Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 07/25] sandbox: <asm/io.h>: include bitio accessors Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 08/25] clocksource: arm_global_timer.c: remove unused asm/ header Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 09/25] mtd: nand: orion: depend on ARM Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 10/25] ddr: fsl: " Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 11/25] net: fec_imx: depend on HAS_DMA Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 12/25] net: macb: " Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 13/25] sandbox: implement stub physical virtual translation Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 14/25] sandbox: asm: implement stub DMA functions Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 15/25] sandbox: select HAS_DMA Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 16/25] ARM: atomic.h: move generic implementation to asm-generic Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 17/25] include: <asm-generic/atomic.h>: remove stub IRQ save/restore Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 18/25] sandbox: asm: implement <asm/atomic.h> Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 19/25] usb: xhci-hcd: remove unused #include <asm/cache.h> Ahmad Fatoum
2020-06-02  8:54 ` Ahmad Fatoum [this message]
2020-06-02  8:54 ` [PATCH v2 21/25] include: bitops: fix dead increment in fls() and ffs() Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 22/25] commands: tftp: drop unused variable Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 23/25] commands: test: drop dead assignment Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 24/25] sandbox: os: add_image: fix memory leak Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 25/25] mtd: nand: base: fix use of uninitialized struct member Ahmad Fatoum
2020-06-03  8:04 ` [PATCH v2 00/25] sandbox: support COMPILE_TESTing drivers Sascha Hauer

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=20200602085412.16554-21-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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