diff mbox

[dpdk-dev] qede: fix 32-bit build with debug enabled

Message ID 1463679482-2312-1-git-send-email-thomas.monjalon@6wind.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Commit Message

Thomas Monjalon May 19, 2016, 5:38 p.m. UTC 
  Some 64-bit variables are printed for debug.
%PRIx64 qualifier must be used because %lx is not long enough
on 32-bit systems

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 drivers/net/qede/base/bcm_osal.c    | 4 ++--
 drivers/net/qede/base/ecore_cxt.c   | 6 +++---
 drivers/net/qede/base/ecore_mcp.c   | 4 ++--
 drivers/net/qede/base/ecore_sriov.c | 8 ++++----
 drivers/net/qede/base/ecore_vf.c    | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

Comments

Harish Patil May 19, 2016, 6:18 p.m. UTC | #1 
>

>Some 64-bit variables are printed for debug.

>%PRIx64 qualifier must be used because %lx is not long enough

>on 32-bit systems

>

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

>---

> drivers/net/qede/base/bcm_osal.c    | 4 ++--

> drivers/net/qede/base/ecore_cxt.c   | 6 +++---

> drivers/net/qede/base/ecore_mcp.c   | 4 ++--

> drivers/net/qede/base/ecore_sriov.c | 8 ++++----

> drivers/net/qede/base/ecore_vf.c    | 6 +++---

> 5 files changed, 14 insertions(+), 14 deletions(-)

>

>diff --git a/drivers/net/qede/base/bcm_osal.c

>b/drivers/net/qede/base/bcm_osal.c

>index 9540c4b..ae5a8bc 100644

>--- a/drivers/net/qede/base/bcm_osal.c

>+++ b/drivers/net/qede/base/bcm_osal.c

>@@ -115,7 +115,7 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,

> 	}

> 	*phys = mz->phys_addr;

> 	DP_VERBOSE(p_dev, ECORE_MSG_PROBE,

>-		   "size=%zu phys=0x%lx virt=%p on socket=%u\n",

>+		   "size=%zu phys=0x%" PRIx64 " virt=%p on socket=%u\n",

> 		   mz->len, mz->phys_addr, mz->addr, socket_id);

> 	return mz->addr;

> }

>@@ -144,7 +144,7 @@ void *osal_dma_alloc_coherent_aligned(struct

>ecore_dev *p_dev,

> 	}

> 	*phys = mz->phys_addr;

> 	DP_VERBOSE(p_dev, ECORE_MSG_PROBE,

>-		   "aligned memory size=%zu phys=0x%lx virt=%p core=%d\n",

>+		   "aligned memory size=%zu phys=0x%" PRIx64 " virt=%p core=%d\n",

> 		   mz->len, mz->phys_addr, mz->addr, core_id);

> 	return mz->addr;

> }

>diff --git a/drivers/net/qede/base/ecore_cxt.c

>b/drivers/net/qede/base/ecore_cxt.c

>index 8436621..1201c1a 100644

>--- a/drivers/net/qede/base/ecore_cxt.c

>+++ b/drivers/net/qede/base/ecore_cxt.c

>@@ -876,8 +876,8 @@ ecore_ilt_blk_alloc(struct ecore_hwfn *p_hwfn,

> 		ilt_shadow[line].size = size;

> 

> 		DP_VERBOSE(p_hwfn, ECORE_MSG_ILT,

>-			   "ILT shadow: Line [%d] Physical 0x%lx "

>-			   "Virtual %p Size %d\n",

>+			   "ILT shadow: Line [%d] Physical 0x%" PRIx64

>+			   " Virtual %p Size %d\n",

> 			   line, (u64)p_phys, p_virt, size);

> 

> 		sz_left -= size;

>@@ -1474,7 +1474,7 @@ static void ecore_ilt_init_pf(struct ecore_hwfn

>*p_hwfn)

> 				DP_VERBOSE(p_hwfn, ECORE_MSG_ILT,

> 					"Setting RT[0x%08x] from"

> 					" ILT[0x%08x] [Client is %d] to"

>-					" Physical addr: 0x%lx\n",

>+					" Physical addr: 0x%" PRIx64 "\n",

> 					rt_offst, line, i,

> 					(u64)(p_shdw[line].p_phys >> 12));

> 			}

>diff --git a/drivers/net/qede/base/ecore_mcp.c

>b/drivers/net/qede/base/ecore_mcp.c

>index bdc6a5e..9dd2eed 100644

>--- a/drivers/net/qede/base/ecore_mcp.c

>+++ b/drivers/net/qede/base/ecore_mcp.c

>@@ -1197,8 +1197,8 @@ enum _ecore_status_t

>ecore_mcp_fill_shmem_func_info(struct ecore_hwfn *p_hwfn,

> 	DP_VERBOSE(p_hwfn, (ECORE_MSG_SP | ECORE_MSG_IFUP),

> 		   "Read configuration from shmem: pause_on_host %02x"

> 		    " protocol %02x BW [%02x - %02x]"

>-		    " MAC %02x:%02x:%02x:%02x:%02x:%02x wwn port %lx"

>-		    " node %lx ovlan %04x\n",

>+		    " MAC %02x:%02x:%02x:%02x:%02x:%02x wwn port %" PRIx64

>+		    " node %" PRIx64 " ovlan %04x\n",

> 		   info->pause_on_host, info->protocol,

> 		   info->bandwidth_min, info->bandwidth_max,

> 		   info->mac[0], info->mac[1], info->mac[2],

>diff --git a/drivers/net/qede/base/ecore_sriov.c

>b/drivers/net/qede/base/ecore_sriov.c

>index 7cd48ea..1b3119d 100644

>--- a/drivers/net/qede/base/ecore_sriov.c

>+++ b/drivers/net/qede/base/ecore_sriov.c

>@@ -297,9 +297,9 @@ static enum _ecore_status_t

>ecore_iov_allocate_vfdb(struct ecore_hwfn *p_hwfn)

> 		return ECORE_NOMEM;

> 

> 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,

>-		   "PF's Requests mailbox [%p virt 0x%lx phys],  Response"

>-		   " mailbox [%p virt 0x%lx phys] Bulletins"

>-		   " [%p virt 0x%lx phys]\n",

>+		   "PF's Requests mailbox [%p virt 0x%" PRIx64 " phys], "

>+		   "Response mailbox [%p virt 0x%" PRIx64 " phys] Bulletins"

>+		   " [%p virt 0x%" PRIx64 " phys]\n",

> 		   p_iov_info->mbx_msg_virt_addr,

> 		   (u64)p_iov_info->mbx_msg_phys_addr,

> 		   p_iov_info->mbx_reply_virt_addr,

>@@ -1250,7 +1250,7 @@ static void ecore_iov_vf_mbx_acquire(struct

>ecore_hwfn *p_hwfn,

> 

> 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,

> 		   "VF[%d] ACQUIRE_RESPONSE: pfdev_info- chip_num=0x%x,"

>-		   " db_size=%d, idx_per_sb=%d, pf_cap=0x%lx\n"

>+		   " db_size=%d, idx_per_sb=%d, pf_cap=0x%" PRIx64 "\n"

> 		   "resources- n_rxq-%d, n_txq-%d, n_sbs-%d, n_macs-%d,"

> 		   " n_vlans-%d, n_mcs-%d\n",

> 		   vf->abs_vf_id, resp->pfdev_info.chip_num,

>diff --git a/drivers/net/qede/base/ecore_vf.c

>b/drivers/net/qede/base/ecore_vf.c

>index 4073aaf..d32fb35 100644

>--- a/drivers/net/qede/base/ecore_vf.c

>+++ b/drivers/net/qede/base/ecore_vf.c

>@@ -325,8 +325,8 @@ enum _ecore_status_t ecore_vf_hw_prepare(struct

>ecore_dev *p_dev)

> 	}

> 

> 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,

>-		   "VF's Request mailbox [%p virt 0x%lx phys], Response"

>-		   " mailbox [%p virt 0x%lx phys]\n",

>+		   "VF's Request mailbox [%p virt 0x%" PRIx64 " phys], "

>+		   "Response mailbox [%p virt 0x%" PRIx64 " phys]\n",

> 		   p_sriov->vf2pf_request,

> 		   (u64)p_sriov->vf2pf_request_phys,

> 		   p_sriov->pf2vf_reply, (u64)p_sriov->pf2vf_reply_phys);

>@@ -339,7 +339,7 @@ enum _ecore_status_t ecore_vf_hw_prepare(struct

>ecore_dev *p_dev)

> 							   p_sriov->bulletin.

> 							   size);

> 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,

>-		   "VF's bulletin Board [%p virt 0x%lx phys 0x%08x bytes]\n",

>+		   "VF's bulletin Board [%p virt 0x%" PRIx64 " phys 0x%08x bytes]\n",

> 		   p_sriov->bulletin.p_virt, (u64)p_sriov->bulletin.phys,

> 		   p_sriov->bulletin.size);

> 

>-- 

>2.7.0

>

>


Looks good, thanks.

Acked-by: Harish Patil <harish.patil@qlogic.com>
Thomas Monjalon May 24, 2016, 2:11 p.m. UTC | #2 
2016-05-19 18:18, Harish Patil:
> >
> >Some 64-bit variables are printed for debug.
> >%PRIx64 qualifier must be used because %lx is not long enough
> >on 32-bit systems
> >
> >Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> 
> Looks good, thanks.
> 
> Acked-by: Harish Patil <harish.patil@qlogic.com>

Applied

PS: please remove useless context when ack'ing, thanks
diff mbox

Patch

diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index 9540c4b..ae5a8bc 100644
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -115,7 +115,7 @@  void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
 	}
 	*phys = mz->phys_addr;
 	DP_VERBOSE(p_dev, ECORE_MSG_PROBE,
-		   "size=%zu phys=0x%lx virt=%p on socket=%u\n",
+		   "size=%zu phys=0x%" PRIx64 " virt=%p on socket=%u\n",
 		   mz->len, mz->phys_addr, mz->addr, socket_id);
 	return mz->addr;
 }
@@ -144,7 +144,7 @@  void *osal_dma_alloc_coherent_aligned(struct ecore_dev *p_dev,
 	}
 	*phys = mz->phys_addr;
 	DP_VERBOSE(p_dev, ECORE_MSG_PROBE,
-		   "aligned memory size=%zu phys=0x%lx virt=%p core=%d\n",
+		   "aligned memory size=%zu phys=0x%" PRIx64 " virt=%p core=%d\n",
 		   mz->len, mz->phys_addr, mz->addr, core_id);
 	return mz->addr;
 }
diff --git a/drivers/net/qede/base/ecore_cxt.c b/drivers/net/qede/base/ecore_cxt.c
index 8436621..1201c1a 100644
--- a/drivers/net/qede/base/ecore_cxt.c
+++ b/drivers/net/qede/base/ecore_cxt.c
@@ -876,8 +876,8 @@  ecore_ilt_blk_alloc(struct ecore_hwfn *p_hwfn,
 		ilt_shadow[line].size = size;
 
 		DP_VERBOSE(p_hwfn, ECORE_MSG_ILT,
-			   "ILT shadow: Line [%d] Physical 0x%lx "
-			   "Virtual %p Size %d\n",
+			   "ILT shadow: Line [%d] Physical 0x%" PRIx64
+			   " Virtual %p Size %d\n",
 			   line, (u64)p_phys, p_virt, size);
 
 		sz_left -= size;
@@ -1474,7 +1474,7 @@  static void ecore_ilt_init_pf(struct ecore_hwfn *p_hwfn)
 				DP_VERBOSE(p_hwfn, ECORE_MSG_ILT,
 					"Setting RT[0x%08x] from"
 					" ILT[0x%08x] [Client is %d] to"
-					" Physical addr: 0x%lx\n",
+					" Physical addr: 0x%" PRIx64 "\n",
 					rt_offst, line, i,
 					(u64)(p_shdw[line].p_phys >> 12));
 			}
diff --git a/drivers/net/qede/base/ecore_mcp.c b/drivers/net/qede/base/ecore_mcp.c
index bdc6a5e..9dd2eed 100644
--- a/drivers/net/qede/base/ecore_mcp.c
+++ b/drivers/net/qede/base/ecore_mcp.c
@@ -1197,8 +1197,8 @@  enum _ecore_status_t ecore_mcp_fill_shmem_func_info(struct ecore_hwfn *p_hwfn,
 	DP_VERBOSE(p_hwfn, (ECORE_MSG_SP | ECORE_MSG_IFUP),
 		   "Read configuration from shmem: pause_on_host %02x"
 		    " protocol %02x BW [%02x - %02x]"
-		    " MAC %02x:%02x:%02x:%02x:%02x:%02x wwn port %lx"
-		    " node %lx ovlan %04x\n",
+		    " MAC %02x:%02x:%02x:%02x:%02x:%02x wwn port %" PRIx64
+		    " node %" PRIx64 " ovlan %04x\n",
 		   info->pause_on_host, info->protocol,
 		   info->bandwidth_min, info->bandwidth_max,
 		   info->mac[0], info->mac[1], info->mac[2],
diff --git a/drivers/net/qede/base/ecore_sriov.c b/drivers/net/qede/base/ecore_sriov.c
index 7cd48ea..1b3119d 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -297,9 +297,9 @@  static enum _ecore_status_t ecore_iov_allocate_vfdb(struct ecore_hwfn *p_hwfn)
 		return ECORE_NOMEM;
 
 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
-		   "PF's Requests mailbox [%p virt 0x%lx phys],  Response"
-		   " mailbox [%p virt 0x%lx phys] Bulletins"
-		   " [%p virt 0x%lx phys]\n",
+		   "PF's Requests mailbox [%p virt 0x%" PRIx64 " phys], "
+		   "Response mailbox [%p virt 0x%" PRIx64 " phys] Bulletins"
+		   " [%p virt 0x%" PRIx64 " phys]\n",
 		   p_iov_info->mbx_msg_virt_addr,
 		   (u64)p_iov_info->mbx_msg_phys_addr,
 		   p_iov_info->mbx_reply_virt_addr,
@@ -1250,7 +1250,7 @@  static void ecore_iov_vf_mbx_acquire(struct ecore_hwfn *p_hwfn,
 
 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
 		   "VF[%d] ACQUIRE_RESPONSE: pfdev_info- chip_num=0x%x,"
-		   " db_size=%d, idx_per_sb=%d, pf_cap=0x%lx\n"
+		   " db_size=%d, idx_per_sb=%d, pf_cap=0x%" PRIx64 "\n"
 		   "resources- n_rxq-%d, n_txq-%d, n_sbs-%d, n_macs-%d,"
 		   " n_vlans-%d, n_mcs-%d\n",
 		   vf->abs_vf_id, resp->pfdev_info.chip_num,
diff --git a/drivers/net/qede/base/ecore_vf.c b/drivers/net/qede/base/ecore_vf.c
index 4073aaf..d32fb35 100644
--- a/drivers/net/qede/base/ecore_vf.c
+++ b/drivers/net/qede/base/ecore_vf.c
@@ -325,8 +325,8 @@  enum _ecore_status_t ecore_vf_hw_prepare(struct ecore_dev *p_dev)
 	}
 
 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
-		   "VF's Request mailbox [%p virt 0x%lx phys], Response"
-		   " mailbox [%p virt 0x%lx phys]\n",
+		   "VF's Request mailbox [%p virt 0x%" PRIx64 " phys], "
+		   "Response mailbox [%p virt 0x%" PRIx64 " phys]\n",
 		   p_sriov->vf2pf_request,
 		   (u64)p_sriov->vf2pf_request_phys,
 		   p_sriov->pf2vf_reply, (u64)p_sriov->pf2vf_reply_phys);
@@ -339,7 +339,7 @@  enum _ecore_status_t ecore_vf_hw_prepare(struct ecore_dev *p_dev)
 							   p_sriov->bulletin.
 							   size);
 	DP_VERBOSE(p_hwfn, ECORE_MSG_IOV,
-		   "VF's bulletin Board [%p virt 0x%lx phys 0x%08x bytes]\n",
+		   "VF's bulletin Board [%p virt 0x%" PRIx64 " phys 0x%08x bytes]\n",
 		   p_sriov->bulletin.p_virt, (u64)p_sriov->bulletin.phys,
 		   p_sriov->bulletin.size);