Commit 1b2ac5a6 authored by Heiko Carstens's avatar Heiko Carstens

s390/3270: use new address translation helpers

Use virt_to_dma32() and friends to properly convert virtual to physical and
physical to virtual addresses so that "make C=1" does not generate any
warnings anymore.
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent e6ccda51
...@@ -160,7 +160,7 @@ struct raw3270_request *raw3270_request_alloc(size_t size) ...@@ -160,7 +160,7 @@ struct raw3270_request *raw3270_request_alloc(size_t size)
/* /*
* Setup ccw. * Setup ccw.
*/ */
rq->ccw.cda = __pa(rq->buffer); rq->ccw.cda = virt_to_dma32(rq->buffer);
rq->ccw.flags = CCW_FLAG_SLI; rq->ccw.flags = CCW_FLAG_SLI;
return rq; return rq;
...@@ -186,7 +186,7 @@ int raw3270_request_reset(struct raw3270_request *rq) ...@@ -186,7 +186,7 @@ int raw3270_request_reset(struct raw3270_request *rq)
return -EBUSY; return -EBUSY;
rq->ccw.cmd_code = 0; rq->ccw.cmd_code = 0;
rq->ccw.count = 0; rq->ccw.count = 0;
rq->ccw.cda = __pa(rq->buffer); rq->ccw.cda = virt_to_dma32(rq->buffer);
rq->ccw.flags = CCW_FLAG_SLI; rq->ccw.flags = CCW_FLAG_SLI;
rq->rescnt = 0; rq->rescnt = 0;
rq->rc = 0; rq->rc = 0;
...@@ -221,7 +221,7 @@ EXPORT_SYMBOL(raw3270_request_add_data); ...@@ -221,7 +221,7 @@ EXPORT_SYMBOL(raw3270_request_add_data);
*/ */
void raw3270_request_set_data(struct raw3270_request *rq, void *data, size_t size) void raw3270_request_set_data(struct raw3270_request *rq, void *data, size_t size)
{ {
rq->ccw.cda = __pa(data); rq->ccw.cda = virt_to_dma32(data);
rq->ccw.count = size; rq->ccw.count = size;
} }
EXPORT_SYMBOL(raw3270_request_set_data); EXPORT_SYMBOL(raw3270_request_set_data);
...@@ -231,7 +231,7 @@ EXPORT_SYMBOL(raw3270_request_set_data); ...@@ -231,7 +231,7 @@ EXPORT_SYMBOL(raw3270_request_set_data);
*/ */
void raw3270_request_set_idal(struct raw3270_request *rq, struct idal_buffer *ib) void raw3270_request_set_idal(struct raw3270_request *rq, struct idal_buffer *ib)
{ {
rq->ccw.cda = __pa(ib->data); rq->ccw.cda = virt_to_dma32(ib->data);
rq->ccw.count = ib->size; rq->ccw.count = ib->size;
rq->ccw.flags |= CCW_FLAG_IDA; rq->ccw.flags |= CCW_FLAG_IDA;
} }
...@@ -577,7 +577,7 @@ static void raw3270_read_modified(struct raw3270 *rp) ...@@ -577,7 +577,7 @@ static void raw3270_read_modified(struct raw3270 *rp)
rp->init_readmod.ccw.cmd_code = TC_READMOD; rp->init_readmod.ccw.cmd_code = TC_READMOD;
rp->init_readmod.ccw.flags = CCW_FLAG_SLI; rp->init_readmod.ccw.flags = CCW_FLAG_SLI;
rp->init_readmod.ccw.count = sizeof(rp->init_data); rp->init_readmod.ccw.count = sizeof(rp->init_data);
rp->init_readmod.ccw.cda = (__u32)__pa(rp->init_data); rp->init_readmod.ccw.cda = virt_to_dma32(rp->init_data);
rp->init_readmod.callback = raw3270_read_modified_cb; rp->init_readmod.callback = raw3270_read_modified_cb;
rp->init_readmod.callback_data = rp->init_data; rp->init_readmod.callback_data = rp->init_data;
rp->state = RAW3270_STATE_READMOD; rp->state = RAW3270_STATE_READMOD;
...@@ -597,7 +597,7 @@ static void raw3270_writesf_readpart(struct raw3270 *rp) ...@@ -597,7 +597,7 @@ static void raw3270_writesf_readpart(struct raw3270 *rp)
rp->init_readpart.ccw.cmd_code = TC_WRITESF; rp->init_readpart.ccw.cmd_code = TC_WRITESF;
rp->init_readpart.ccw.flags = CCW_FLAG_SLI; rp->init_readpart.ccw.flags = CCW_FLAG_SLI;
rp->init_readpart.ccw.count = sizeof(wbuf); rp->init_readpart.ccw.count = sizeof(wbuf);
rp->init_readpart.ccw.cda = (__u32)__pa(&rp->init_data); rp->init_readpart.ccw.cda = virt_to_dma32(&rp->init_data);
rp->state = RAW3270_STATE_W4ATTN; rp->state = RAW3270_STATE_W4ATTN;
raw3270_start_irq(&rp->init_view, &rp->init_readpart); raw3270_start_irq(&rp->init_view, &rp->init_readpart);
} }
...@@ -635,7 +635,7 @@ static int __raw3270_reset_device(struct raw3270 *rp) ...@@ -635,7 +635,7 @@ static int __raw3270_reset_device(struct raw3270 *rp)
rp->init_reset.ccw.cmd_code = TC_EWRITEA; rp->init_reset.ccw.cmd_code = TC_EWRITEA;
rp->init_reset.ccw.flags = CCW_FLAG_SLI; rp->init_reset.ccw.flags = CCW_FLAG_SLI;
rp->init_reset.ccw.count = 1; rp->init_reset.ccw.count = 1;
rp->init_reset.ccw.cda = (__u32)__pa(rp->init_data); rp->init_reset.ccw.cda = virt_to_dma32(rp->init_data);
rp->init_reset.callback = raw3270_reset_device_cb; rp->init_reset.callback = raw3270_reset_device_cb;
rc = __raw3270_start(rp, &rp->init_view, &rp->init_reset); rc = __raw3270_start(rp, &rp->init_view, &rp->init_reset);
if (rc == 0 && rp->state == RAW3270_STATE_INIT) if (rc == 0 && rp->state == RAW3270_STATE_INIT)
......
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