DPDK patches and discussions
 help / color / mirror / Atom feed
From: <xuelin.shi@freescale.com>
To: <thomas.monjalon@6wind.com>
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] kni/ethtool/ixgbe: enforce access between ixgbe PCI and CPU
Date: Wed, 11 Feb 2015 14:49:45 +0800	[thread overview]
Message-ID: <1423637385-25077-1-git-send-email-xuelin.shi@freescale.com> (raw)

From: Xuelin Shi <xuelin.shi@freescale.com>

make sure:
	CPU read from ixgbe with IXGBE_LE32_TO_CPUS
        CPU write to ixgbe with IXGBE_CPU_TO_LE32

otherwise, there is endian issue for ixgbe on BIG_ENDIAN CPU.

Signed-off-by: Xuelin Shi <xuelin.shi@freescale.com>
---
 .../linuxapp/kni/ethtool/ixgbe/ixgbe_osdep.h       | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_osdep.h b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_osdep.h
index d161600..0612632 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_osdep.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_osdep.h
@@ -53,6 +53,16 @@
 
 #undef ASSERT
 
+static inline uint32_t ixgbe_read_addr(volatile void* addr)
+{
+	return IXGBE_LE32_TO_CPUS(*((volatile uint32_t *)addr));
+}
+
+static inline uint32_t ixgbe_write_addr(u32 value, volatile void* addr)
+{
+	return writel(IXGBE_CPU_TO_LE32(value), addr);
+}
+
 #ifdef DBG
 #define hw_dbg(hw, S, A...)	printk(KERN_DEBUG S, ## A)
 #else
@@ -91,19 +101,20 @@
 	default: \
 		break; \
 	} \
-	writel((value), ((a)->hw_addr + (reg))); \
+	ixgbe_write_addr((value), ((a)->hw_addr + (reg))); \
 } while (0)
 #else
-#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
+#define IXGBE_WRITE_REG(a, reg, value) \
+	ixgbe_write_addr((value), ((a)->hw_addr + (reg)))
 #endif
 
-#define IXGBE_READ_REG(a, reg) readl((a)->hw_addr + (reg))
+#define IXGBE_READ_REG(a, reg) ixgbe_read_addr((a)->hw_addr + (reg))
 
 #define IXGBE_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-	writel((value), ((a)->hw_addr + (reg) + ((offset) << 2))))
+	ixgbe_write_addr((value), ((a)->hw_addr + (reg) + ((offset) << 2))))
 
 #define IXGBE_READ_REG_ARRAY(a, reg, offset) ( \
-	readl((a)->hw_addr + (reg) + ((offset) << 2)))
+	ixgbe_read_addr((a)->hw_addr + (reg) + ((offset) << 2)))
 
 #ifndef writeq
 #define writeq(val, addr)	do { writel((u32) (val), addr); \
@@ -111,7 +122,8 @@
 				} while (0);
 #endif
 
-#define IXGBE_WRITE_REG64(a, reg, value) writeq((value), ((a)->hw_addr + (reg)))
+#define IXGBE_WRITE_REG64(a, reg, value) \
+	writeq((cpu_to_le64(value)), ((a)->hw_addr + (reg)))
 
 #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
 struct ixgbe_hw;
-- 
1.9.1

             reply	other threads:[~2015-02-11  7:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-11  6:49 xuelin.shi [this message]
2015-02-20 10:55 ` Thomas Monjalon
2015-03-23 13:58   ` Thomas Monjalon
2015-03-24  1:54 ` Zhang, Helin
2015-06-15  0:52 ` Zhang, Helin

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=1423637385-25077-1-git-send-email-xuelin.shi@freescale.com \
    --to=xuelin.shi@freescale.com \
    --cc=dev@dpdk.org \
    --cc=thomas.monjalon@6wind.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).