Skip to content

Commit a8b576d

Browse files
committed
s390/zfcp: use new address translation helpers
Use virt_to_dma64() and friends to properly convert virtual to physical and physical to virtual addresses so that "make C=1" does not generate any warnings anymore. Reviewed-by: Steffen Maier <maier@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent e8be820 commit a8b576d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

drivers/s390/scsi/zfcp_fsf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2742,7 +2742,7 @@ void zfcp_fsf_reqid_check(struct zfcp_qdio *qdio, int sbal_idx)
27422742
for (idx = 0; idx < QDIO_MAX_ELEMENTS_PER_BUFFER; idx++) {
27432743

27442744
sbale = &sbal->element[idx];
2745-
req_id = sbale->addr;
2745+
req_id = dma64_to_u64(sbale->addr);
27462746
fsf_req = zfcp_reqlist_find_rm(adapter->req_list, req_id);
27472747

27482748
if (!fsf_req) {

drivers/s390/scsi/zfcp_qdio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,
125125
memset(pl, 0,
126126
ZFCP_QDIO_MAX_SBALS_PER_REQ * sizeof(void *));
127127
sbale = qdio->res_q[idx]->element;
128-
req_id = sbale->addr;
128+
req_id = dma64_to_u64(sbale->addr);
129129
scount = min(sbale->scount + 1,
130130
ZFCP_QDIO_MAX_SBALS_PER_REQ + 1);
131131
/* incl. signaling SBAL */
@@ -256,7 +256,7 @@ int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
256256
q_req->sbal_number);
257257
return -EINVAL;
258258
}
259-
sbale->addr = sg_phys(sg);
259+
sbale->addr = u64_to_dma64(sg_phys(sg));
260260
sbale->length = sg->length;
261261
}
262262
return 0;

drivers/s390/scsi/zfcp_qdio.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ void zfcp_qdio_req_init(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
129129
% QDIO_MAX_BUFFERS_PER_Q;
130130

131131
sbale = zfcp_qdio_sbale_req(qdio, q_req);
132-
sbale->addr = req_id;
132+
sbale->addr = u64_to_dma64(req_id);
133133
sbale->eflags = 0;
134134
sbale->sflags = SBAL_SFLAGS0_COMMAND | sbtype;
135135

136136
if (unlikely(!data))
137137
return;
138138
sbale++;
139-
sbale->addr = virt_to_phys(data);
139+
sbale->addr = virt_to_dma64(data);
140140
sbale->length = len;
141141
}
142142

@@ -159,7 +159,7 @@ void zfcp_qdio_fill_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
159159
BUG_ON(q_req->sbale_curr == qdio->max_sbale_per_sbal - 1);
160160
q_req->sbale_curr++;
161161
sbale = zfcp_qdio_sbale_curr(qdio, q_req);
162-
sbale->addr = virt_to_phys(data);
162+
sbale->addr = virt_to_dma64(data);
163163
sbale->length = len;
164164
}
165165

0 commit comments

Comments
 (0)