Commit a8b576d1 authored by Heiko Carstens's avatar Heiko Carstens

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: default avatarSteffen Maier <maier@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent e8be8201
...@@ -2742,7 +2742,7 @@ void zfcp_fsf_reqid_check(struct zfcp_qdio *qdio, int sbal_idx) ...@@ -2742,7 +2742,7 @@ void zfcp_fsf_reqid_check(struct zfcp_qdio *qdio, int sbal_idx)
for (idx = 0; idx < QDIO_MAX_ELEMENTS_PER_BUFFER; idx++) { for (idx = 0; idx < QDIO_MAX_ELEMENTS_PER_BUFFER; idx++) {
sbale = &sbal->element[idx]; sbale = &sbal->element[idx];
req_id = sbale->addr; req_id = dma64_to_u64(sbale->addr);
fsf_req = zfcp_reqlist_find_rm(adapter->req_list, req_id); fsf_req = zfcp_reqlist_find_rm(adapter->req_list, req_id);
if (!fsf_req) { if (!fsf_req) {
......
...@@ -125,7 +125,7 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err, ...@@ -125,7 +125,7 @@ static void zfcp_qdio_int_resp(struct ccw_device *cdev, unsigned int qdio_err,
memset(pl, 0, memset(pl, 0,
ZFCP_QDIO_MAX_SBALS_PER_REQ * sizeof(void *)); ZFCP_QDIO_MAX_SBALS_PER_REQ * sizeof(void *));
sbale = qdio->res_q[idx]->element; sbale = qdio->res_q[idx]->element;
req_id = sbale->addr; req_id = dma64_to_u64(sbale->addr);
scount = min(sbale->scount + 1, scount = min(sbale->scount + 1,
ZFCP_QDIO_MAX_SBALS_PER_REQ + 1); ZFCP_QDIO_MAX_SBALS_PER_REQ + 1);
/* incl. signaling SBAL */ /* incl. signaling SBAL */
...@@ -256,7 +256,7 @@ int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req, ...@@ -256,7 +256,7 @@ int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
q_req->sbal_number); q_req->sbal_number);
return -EINVAL; return -EINVAL;
} }
sbale->addr = sg_phys(sg); sbale->addr = u64_to_dma64(sg_phys(sg));
sbale->length = sg->length; sbale->length = sg->length;
} }
return 0; return 0;
......
...@@ -129,14 +129,14 @@ void zfcp_qdio_req_init(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req, ...@@ -129,14 +129,14 @@ void zfcp_qdio_req_init(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
% QDIO_MAX_BUFFERS_PER_Q; % QDIO_MAX_BUFFERS_PER_Q;
sbale = zfcp_qdio_sbale_req(qdio, q_req); sbale = zfcp_qdio_sbale_req(qdio, q_req);
sbale->addr = req_id; sbale->addr = u64_to_dma64(req_id);
sbale->eflags = 0; sbale->eflags = 0;
sbale->sflags = SBAL_SFLAGS0_COMMAND | sbtype; sbale->sflags = SBAL_SFLAGS0_COMMAND | sbtype;
if (unlikely(!data)) if (unlikely(!data))
return; return;
sbale++; sbale++;
sbale->addr = virt_to_phys(data); sbale->addr = virt_to_dma64(data);
sbale->length = len; sbale->length = len;
} }
...@@ -159,7 +159,7 @@ void zfcp_qdio_fill_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req, ...@@ -159,7 +159,7 @@ void zfcp_qdio_fill_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,
BUG_ON(q_req->sbale_curr == qdio->max_sbale_per_sbal - 1); BUG_ON(q_req->sbale_curr == qdio->max_sbale_per_sbal - 1);
q_req->sbale_curr++; q_req->sbale_curr++;
sbale = zfcp_qdio_sbale_curr(qdio, q_req); sbale = zfcp_qdio_sbale_curr(qdio, q_req);
sbale->addr = virt_to_phys(data); sbale->addr = virt_to_dma64(data);
sbale->length = len; sbale->length = len;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment