Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Feb 2018 16:26:06 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r329220 - in head/sys/dev: mpr mps
Message-ID:  <201802131626.w1DGQ6W0059792@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu (ports committer)
Date: Tue Feb 13 16:26:06 2018
New Revision: 329220
URL: https://svnweb.freebsd.org/changeset/base/329220

Log:
  Fix non-64-bit platform build by printing bus_addr_t values using %#jx
  
  Reviewed by:	slm
  Differential Revision:	https://reviews.freebsd.org/D14344

Modified:
  head/sys/dev/mpr/mpr.c
  head/sys/dev/mps/mps.c

Modified: head/sys/dev/mpr/mpr.c
==============================================================================
--- head/sys/dev/mpr/mpr.c	Tue Feb 13 16:25:43 2018	(r329219)
+++ head/sys/dev/mpr/mpr.c	Tue Feb 13 16:26:06 2018	(r329220)
@@ -1356,10 +1356,10 @@ mpr_alloc_hw_queues(struct mpr_softc *sc)
 	sc->free_busaddr = queues_busaddr;
 	sc->post_queue = (MPI2_REPLY_DESCRIPTORS_UNION *)(queues + fqsize);
 	sc->post_busaddr = queues_busaddr + fqsize;
-	mpr_dprint(sc, MPR_INIT, "free queue busaddr= %#016lx size= %d\n",
-	    sc->free_busaddr, fqsize);
-	mpr_dprint(sc, MPR_INIT, "reply queue busaddr= %#016lx size= %d\n",
-	    sc->post_busaddr, pqsize);
+	mpr_dprint(sc, MPR_INIT, "free queue busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->free_busaddr, fqsize);
+	mpr_dprint(sc, MPR_INIT, "reply queue busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->post_busaddr, pqsize);
 
 	return (0);
 }
@@ -1402,8 +1402,8 @@ mpr_alloc_replies(struct mpr_softc *sc)
         bzero(sc->reply_frames, rsize);
         bus_dmamap_load(sc->reply_dmat, sc->reply_map, sc->reply_frames, rsize,
 	    mpr_memaddr_cb, &sc->reply_busaddr, 0);
-	mpr_dprint(sc, MPR_INIT, "reply frames busaddr= %#016lx size= %d\n",
-	    sc->reply_busaddr, rsize);
+	mpr_dprint(sc, MPR_INIT, "reply frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->reply_busaddr, rsize);
 
 	return (0);
 }
@@ -1438,8 +1438,8 @@ mpr_alloc_requests(struct mpr_softc *sc)
         bzero(sc->req_frames, rsize);
         bus_dmamap_load(sc->req_dmat, sc->req_map, sc->req_frames, rsize,
 	    mpr_memaddr_cb, &sc->req_busaddr, 0);
-	mpr_dprint(sc, MPR_INIT, "request frames busaddr= %#016lx size= %d\n",
-	    sc->req_busaddr, rsize);
+	mpr_dprint(sc, MPR_INIT, "request frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->req_busaddr, rsize);
 
 	rsize = sc->chain_frame_size * sc->num_chains;
         if (bus_dma_tag_create( sc->mpr_parent_dmat,    /* parent */
@@ -1464,8 +1464,8 @@ mpr_alloc_requests(struct mpr_softc *sc)
         bzero(sc->chain_frames, rsize);
         bus_dmamap_load(sc->chain_dmat, sc->chain_map, sc->chain_frames, rsize,
 	    mpr_memaddr_cb, &sc->chain_busaddr, 0);
-	mpr_dprint(sc, MPR_INIT, "chain frames busaddr= %#016lx size= %d\n",
-	    sc->chain_busaddr, rsize);
+	mpr_dprint(sc, MPR_INIT, "chain frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->chain_busaddr, rsize);
 
 	rsize = MPR_SENSE_LEN * sc->num_reqs;
 	if (bus_dma_tag_create( sc->mpr_parent_dmat,    /* parent */
@@ -1490,8 +1490,8 @@ mpr_alloc_requests(struct mpr_softc *sc)
         bzero(sc->sense_frames, rsize);
         bus_dmamap_load(sc->sense_dmat, sc->sense_map, sc->sense_frames, rsize,
 	    mpr_memaddr_cb, &sc->sense_busaddr, 0);
-	mpr_dprint(sc, MPR_INIT, "sense frames busaddr= %#016lx size= %d\n",
-	    sc->sense_busaddr, rsize);
+	mpr_dprint(sc, MPR_INIT, "sense frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->sense_busaddr, rsize);
 
 	sc->chains = malloc(sizeof(struct mpr_chain) * sc->num_chains, M_MPR,
 	    M_WAITOK | M_ZERO);

Modified: head/sys/dev/mps/mps.c
==============================================================================
--- head/sys/dev/mps/mps.c	Tue Feb 13 16:25:43 2018	(r329219)
+++ head/sys/dev/mps/mps.c	Tue Feb 13 16:26:06 2018	(r329220)
@@ -1313,10 +1313,10 @@ mps_alloc_hw_queues(struct mps_softc *sc)
 	sc->free_busaddr = queues_busaddr;
 	sc->post_queue = (MPI2_REPLY_DESCRIPTORS_UNION *)(queues + fqsize);
 	sc->post_busaddr = queues_busaddr + fqsize;
-	mps_dprint(sc, MPS_INIT, "free queue busaddr= %#016lx size= %d\n",
-	    sc->free_busaddr, fqsize);
-	mps_dprint(sc, MPS_INIT, "reply queue busaddr= %#016lx size= %d\n",
-	    sc->post_busaddr, pqsize);
+	mps_dprint(sc, MPS_INIT, "free queue busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->free_busaddr, fqsize);
+	mps_dprint(sc, MPS_INIT, "reply queue busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->post_busaddr, pqsize);
 
 	return (0);
 }
@@ -1360,8 +1360,8 @@ mps_alloc_replies(struct mps_softc *sc)
         bus_dmamap_load(sc->reply_dmat, sc->reply_map, sc->reply_frames, rsize,
 	    mps_memaddr_cb, &sc->reply_busaddr, 0);
 
-	mps_dprint(sc, MPS_INIT, "reply frames busaddr= %#016lx size= %d\n",
-	    sc->reply_busaddr, rsize);
+	mps_dprint(sc, MPS_INIT, "reply frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->reply_busaddr, rsize);
 
 	return (0);
 }
@@ -1396,8 +1396,8 @@ mps_alloc_requests(struct mps_softc *sc)
         bzero(sc->req_frames, rsize);
         bus_dmamap_load(sc->req_dmat, sc->req_map, sc->req_frames, rsize,
 	    mps_memaddr_cb, &sc->req_busaddr, 0);
-	mps_dprint(sc, MPS_INIT, "request frames busaddr= %#016lx size= %d\n",
-	    sc->req_busaddr, rsize);
+	mps_dprint(sc, MPS_INIT, "request frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->req_busaddr, rsize);
 
 	rsize = sc->reqframesz * sc->num_chains;
         if (bus_dma_tag_create( sc->mps_parent_dmat,    /* parent */
@@ -1422,8 +1422,8 @@ mps_alloc_requests(struct mps_softc *sc)
         bzero(sc->chain_frames, rsize);
         bus_dmamap_load(sc->chain_dmat, sc->chain_map, sc->chain_frames, rsize,
 	    mps_memaddr_cb, &sc->chain_busaddr, 0);
-	mps_dprint(sc, MPS_INIT, "chain frames busaddr= %#016lx size= %d\n",
-	    sc->chain_busaddr, rsize);
+	mps_dprint(sc, MPS_INIT, "chain frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->chain_busaddr, rsize);
 
 	rsize = MPS_SENSE_LEN * sc->num_reqs;
         if (bus_dma_tag_create( sc->mps_parent_dmat,    /* parent */
@@ -1448,8 +1448,8 @@ mps_alloc_requests(struct mps_softc *sc)
         bzero(sc->sense_frames, rsize);
         bus_dmamap_load(sc->sense_dmat, sc->sense_map, sc->sense_frames, rsize,
 	    mps_memaddr_cb, &sc->sense_busaddr, 0);
-	mps_dprint(sc, MPS_INIT, "sense frames busaddr= %#016lx size= %d\n",
-	    sc->sense_busaddr, rsize);
+	mps_dprint(sc, MPS_INIT, "sense frames busaddr= %#016jx size= %d\n",
+	    (uintmax_t)sc->sense_busaddr, rsize);
 
 	sc->chains = malloc(sizeof(struct mps_chain) * sc->num_chains, M_MPT2,
 	    M_WAITOK | M_ZERO);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802131626.w1DGQ6W0059792>