commit c90d5abd0d047acb7c37fc5b67ccc9f3a9a942e5
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Tue Jan 10 22:40:33 2012 +1100
committer David Gibson <david@gibson.dropbear.id.au> Wed Jan 11 11:54:24 2012 +1100
tree a5ca6284c30a3e07396c8a1d17c3605260bce108
parent 59f6d802f39f733e79850cb71eeeeecaa46a2347

Fix virtio access size

We don't support 8-bytes PIO

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

lib/libhvcall/virtio.c

diff --git a/lib/libhvcall/virtio.c b/lib/libhvcall/virtio.c
index 91d60d2..0a3e91b 100644
--- a/lib/libhvcall/virtio.c
+++ b/lib/libhvcall/virtio.c
@@ -49,7 +49,8 @@
 	int size = 0;
 
 	if (dev->type == VIRTIO_TYPE_PCI) {
-		ci_write_16(dev->base+VIRTIOHDR_QUEUE_SELECT, cpu_to_le16(queue));
+		ci_write_16(dev->base+VIRTIOHDR_QUEUE_SELECT,
+			    cpu_to_le16(queue));
 		eieio();
 		size = le16_to_cpu(ci_read_16(dev->base+VIRTIOHDR_QUEUE_SIZE));
 	}
@@ -69,10 +70,11 @@
 	struct vring_desc *desc = 0;
 
 	if (dev->type == VIRTIO_TYPE_PCI) {
-		ci_write_16(dev->base+VIRTIOHDR_QUEUE_SELECT, cpu_to_le16(queue));
+		ci_write_16(dev->base+VIRTIOHDR_QUEUE_SELECT,
+			    cpu_to_le16(queue));
 		eieio();
 		desc = (void*)(4096L *
-			  le32_to_cpu(ci_read_32(dev->base+VIRTIOHDR_QUEUE_ADDRESS)));
+		   le32_to_cpu(ci_read_32(dev->base+VIRTIOHDR_QUEUE_ADDRESS)));
 	}
 
 	return desc;
@@ -166,7 +168,6 @@
 	 default:
 		return ~0ULL;
 	}
-
 	switch (size) {
 	 case 1:
 		val = ci_read_8(confbase+offset);
@@ -178,7 +179,12 @@
 		val = ci_read_32(confbase+offset);
 		break;
 	 case 8:
-		val = ci_read_64(confbase+offset);
+		/* We don't support 8 bytes PIO accesses
+		 * in qemu and this is all PIO
+		 */
+		val = ci_read_32(confbase+offset);
+		val <<= 32;
+		val |= ci_read_32(confbase+offset+4);
 		break;
 	}