[dpdk-dev] [PATCH] e1000: fix e1000 PCI access endian issue.

[dpdk-dev] [PATCH] e1000: fix e1000 PCI access endian issue.

[xuelin.shi]

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

e1000 is little endian, but cpu maybe not.
add necessary conversions.

rte_cpu_to_le_32(...) for PCI write
rte_le_to_cpu_32(...) for PCI read.

Signed-off-by: Xuelin Shi <xuelin.shi@freescale.com>
---
 lib/librte_pmd_e1000/e1000/e1000_osdep.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_pmd_e1000/e1000/e1000_osdep.h b/lib/librte_pmd_e1000/e1000/e1000_osdep.h
index 438641e..d04ec73 100644
--- a/lib/librte_pmd_e1000/e1000/e1000_osdep.h
+++ b/lib/librte_pmd_e1000/e1000/e1000_osdep.h
@@ -43,6 +43,7 @@
 #include <rte_cycles.h>
 #include <rte_log.h>
 #include <rte_debug.h>
+#include <rte_byteorder.h>
 
 #include "../e1000_logs.h"
 
@@ -96,7 +97,7 @@ typedef int		bool;
 #define E1000_PCI_REG(reg) (*((volatile uint32_t *)(reg)))
 
 #define E1000_PCI_REG_WRITE(reg, value) do { \
-	E1000_PCI_REG((reg)) = (value); \
+	E1000_PCI_REG((reg)) = (rte_cpu_to_le_32(value)); \
 } while (0)
 
 #define E1000_PCI_REG_ADDR(hw, reg) \
@@ -107,7 +108,7 @@ typedef int		bool;
 
 static inline uint32_t e1000_read_addr(volatile void* addr)
 {
-	return E1000_PCI_REG(addr);
+	return rte_le_to_cpu_32(E1000_PCI_REG(addr));
 }
 
 /* Necessary defines */
-- 
1.9.1

Re: [dpdk-dev] [PATCH] e1000: fix e1000 PCI access endian issue.

[Thomas Monjalon]

> e1000 is little endian, but cpu maybe not.
> add necessary conversions.
> 
> rte_cpu_to_le_32(...) for PCI write
> rte_le_to_cpu_32(...) for PCI read.
> 
> Signed-off-by: Xuelin Shi <xuelin.shi@freescale.com>

Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>

Applied, thanks

Re: [dpdk-dev] [PATCH] e1000: fix e1000 PCI access endian issue.

[Zhang, Helin]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of
> xuelin.shi@freescale.com
> Sent: Thursday, February 12, 2015 9:27 AM
> To: thomas.monjalon@6wind.com
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] e1000: fix e1000 PCI access endian issue.
> 
> From: Xuelin Shi <xuelin.shi@freescale.com>
> 
> e1000 is little endian, but cpu maybe not.
> add necessary conversions.
> 
> rte_cpu_to_le_32(...) for PCI write
> rte_le_to_cpu_32(...) for PCI read.
> 
> Signed-off-by: Xuelin Shi <xuelin.shi@freescale.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>

> ---
>  lib/librte_pmd_e1000/e1000/e1000_osdep.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_pmd_e1000/e1000/e1000_osdep.h
> b/lib/librte_pmd_e1000/e1000/e1000_osdep.h
> index 438641e..d04ec73 100644
> --- a/lib/librte_pmd_e1000/e1000/e1000_osdep.h
> +++ b/lib/librte_pmd_e1000/e1000/e1000_osdep.h
> @@ -43,6 +43,7 @@
>  #include <rte_cycles.h>
>  #include <rte_log.h>
>  #include <rte_debug.h>
> +#include <rte_byteorder.h>
> 
>  #include "../e1000_logs.h"
> 
> @@ -96,7 +97,7 @@ typedef int		bool;
>  #define E1000_PCI_REG(reg) (*((volatile uint32_t *)(reg)))
> 
>  #define E1000_PCI_REG_WRITE(reg, value) do { \
> -	E1000_PCI_REG((reg)) = (value); \
> +	E1000_PCI_REG((reg)) = (rte_cpu_to_le_32(value)); \
>  } while (0)
> 
>  #define E1000_PCI_REG_ADDR(hw, reg) \
> @@ -107,7 +108,7 @@ typedef int		bool;
> 
>  static inline uint32_t e1000_read_addr(volatile void* addr)  {
> -	return E1000_PCI_REG(addr);
> +	return rte_le_to_cpu_32(E1000_PCI_REG(addr));
>  }
> 
>  /* Necessary defines */
> --
> 1.9.1