Commit 2aca9eaf authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/iucv: 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 6b9875ae

include/net/iucv/iucv.h

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include <linux/types.h>

#include <linux/slab.h>

#include <asm/dma-types.h>

#include <asm/debug.h>



/*
@@ -76,7 +77,7 @@ 
 * and iucv_message_reply if IUCV_IPBUFLST or IUCV_IPANSLST are used.

 */

struct iucv_array {

	u32 address;

	dma32_t address;

	u32 length;

} __attribute__ ((aligned (8)));

net/iucv/af_iucv.c

+4 −4
Original line number Diff line number Diff line
@@ -1060,12 +1060,12 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg, 
			int i;



			/* skip iucv_array lying in the headroom */

			iba[0].address = (u32)virt_to_phys(skb->data);

			iba[0].address = virt_to_dma32(skb->data);

			iba[0].length = (u32)skb_headlen(skb);

			for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

				skb_frag_t *frag = &skb_shinfo(skb)->frags[i];



				iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));

				iba[i + 1].address = virt_to_dma32(skb_frag_address(frag));

				iba[i + 1].length = (u32)skb_frag_size(frag);

			}

			err = pr_iucv->message_send(iucv->path, &txmsg,
@@ -1161,12 +1161,12 @@ static void iucv_process_message(struct sock *sk, struct sk_buff *skb, 
			struct iucv_array *iba = (struct iucv_array *)skb->head;

			int i;



			iba[0].address = (u32)virt_to_phys(skb->data);

			iba[0].address = virt_to_dma32(skb->data);

			iba[0].length = (u32)skb_headlen(skb);

			for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

				skb_frag_t *frag = &skb_shinfo(skb)->frags[i];



				iba[i + 1].address = (u32)virt_to_phys(skb_frag_address(frag));

				iba[i + 1].address = virt_to_dma32(skb_frag_address(frag));

				iba[i + 1].length = (u32)skb_frag_size(frag);

			}

			rc = pr_iucv->message_receive(path, msg,

net/iucv/iucv.c

+11 −11
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ struct iucv_cmd_dpl { 
	u8  iprmmsg[8];

	u32 ipsrccls;

	u32 ipmsgtag;

	u32 ipbfadr2;

	dma32_t ipbfadr2;

	u32 ipbfln2f;

	u32 res;

} __attribute__ ((packed,aligned(8)));
@@ -226,11 +226,11 @@ struct iucv_cmd_db { 
	u8  iprcode;

	u32 ipmsgid;

	u32 iptrgcls;

	u32 ipbfadr1;

	dma32_t ipbfadr1;

	u32 ipbfln1f;

	u32 ipsrccls;

	u32 ipmsgtag;

	u32 ipbfadr2;

	dma32_t ipbfadr2;

	u32 ipbfln2f;

	u32 res;

} __attribute__ ((packed,aligned(8)));
@@ -432,7 +432,7 @@ static void iucv_declare_cpu(void *data) 
	/* Declare interrupt buffer. */

	parm = iucv_param_irq[cpu];

	memset(parm, 0, sizeof(union iucv_param));

	parm->db.ipbfadr1 = virt_to_phys(iucv_irq_data[cpu]);

	parm->db.ipbfadr1 = virt_to_dma32(iucv_irq_data[cpu]);

	rc = iucv_call_b2f0(IUCV_DECLARE_BUFFER, parm);

	if (rc) {

		char *err = "Unknown";
@@ -1081,7 +1081,7 @@ static int iucv_message_receive_iprmdata(struct iucv_path *path, 
		size = (size < 8) ? size : 8;

		for (array = buffer; size > 0; array++) {

			copy = min_t(size_t, size, array->length);

			memcpy(phys_to_virt(array->address), rmmsg, copy);

			memcpy(dma32_to_virt(array->address), rmmsg, copy);

			rmmsg += copy;

			size -= copy;

		}
@@ -1123,7 +1123,7 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg, 


	parm = iucv_param[smp_processor_id()];

	memset(parm, 0, sizeof(union iucv_param));

	parm->db.ipbfadr1 = (u32)virt_to_phys(buffer);

	parm->db.ipbfadr1 = virt_to_dma32(buffer);

	parm->db.ipbfln1f = (u32) size;

	parm->db.ipmsgid = msg->id;

	parm->db.ippathid = path->pathid;
@@ -1241,7 +1241,7 @@ int iucv_message_reply(struct iucv_path *path, struct iucv_message *msg, 
		parm->dpl.iptrgcls = msg->class;

		memcpy(parm->dpl.iprmmsg, reply, min_t(size_t, size, 8));

	} else {

		parm->db.ipbfadr1 = (u32)virt_to_phys(reply);

		parm->db.ipbfadr1 = virt_to_dma32(reply);

		parm->db.ipbfln1f = (u32) size;

		parm->db.ippathid = path->pathid;

		parm->db.ipflags1 = flags;
@@ -1293,7 +1293,7 @@ int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg, 
		parm->dpl.ipmsgtag = msg->tag;

		memcpy(parm->dpl.iprmmsg, buffer, 8);

	} else {

		parm->db.ipbfadr1 = (u32)virt_to_phys(buffer);

		parm->db.ipbfadr1 = virt_to_dma32(buffer);

		parm->db.ipbfln1f = (u32) size;

		parm->db.ippathid = path->pathid;

		parm->db.ipflags1 = flags | IUCV_IPNORPY;
@@ -1378,7 +1378,7 @@ int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg, 
		parm->dpl.iptrgcls = msg->class;

		parm->dpl.ipsrccls = srccls;

		parm->dpl.ipmsgtag = msg->tag;

		parm->dpl.ipbfadr2 = (u32)virt_to_phys(answer);

		parm->dpl.ipbfadr2 = virt_to_dma32(answer);

		parm->dpl.ipbfln2f = (u32) asize;

		memcpy(parm->dpl.iprmmsg, buffer, 8);

	} else {
@@ -1387,9 +1387,9 @@ int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg, 
		parm->db.iptrgcls = msg->class;

		parm->db.ipsrccls = srccls;

		parm->db.ipmsgtag = msg->tag;

		parm->db.ipbfadr1 = (u32)virt_to_phys(buffer);

		parm->db.ipbfadr1 = virt_to_dma32(buffer);

		parm->db.ipbfln1f = (u32) size;

		parm->db.ipbfadr2 = (u32)virt_to_phys(answer);

		parm->db.ipbfadr2 = virt_to_dma32(answer);

		parm->db.ipbfln2f = (u32) asize;

	}

	rc = iucv_call_b2f0(IUCV_SEND, parm);