[src/trunk]: src/sys/dev/pci Provide a generic bus_space_write_8 function tha...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/729f66c2adb5
branches:  trunk
changeset: 950269:729f66c2adb5
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 23 20:00:19 2021 +0000

description:
Provide a generic bus_space_write_8 function that is bi-endian.

diffstat:

 sys/dev/pci/virtio_pci.c |  35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diffs (78 lines):

diff -r ec62b4bd38c1 -r 729f66c2adb5 sys/dev/pci/virtio_pci.c
--- a/sys/dev/pci/virtio_pci.c  Sat Jan 23 19:41:16 2021 +0000
+++ b/sys/dev/pci/virtio_pci.c  Sat Jan 23 20:00:19 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_pci.c,v 1.18 2021/01/21 20:48:33 reinoud Exp $ */
+/* $NetBSD: virtio_pci.c,v 1.19 2021/01/23 20:00:19 christos Exp $ */
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,12 +28,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.18 2021/01/21 20:48:33 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.19 2021/01/23 20:00:19 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
+#include <sys/endian.h>
 #include <sys/interrupt.h>
 
 #include <sys/device.h>
@@ -731,9 +732,20 @@
  * By definition little endian only in v1.0 and 8 byters are allowed to be
  * written as two 4 byters
  */
-#define bus_space_write_le_8(iot, ioh, reg, val) \
-       bus_space_write_4(iot, ioh, reg, ((uint64_t) (val)) & 0xffffffff); \
-       bus_space_write_4(iot, ioh, reg + 4, ((uint64_t) (val)) >> 32);
+#ifndef __HAVE_BUS_SPACE_8
+static __inline void
+bus_space_write_8(bus_space_tag_t iot, bus_space_handle_t ioh,
+     bus_size_t offset, uint64_t value)
+{
+#if _QUAD_HIGHWORD
+       bus_space_write_4(iot, ioh, offset, BUS_ADDR_LO32(value));
+       bus_space_write_4(iot, ioh, offset + 4, BUS_ADDR_HI32(value));
+#else
+       bus_space_write_4(iot, ioh, offset, BUS_ADDR_HI32(value));
+       bus_space_write_4(iot, ioh, offset + 4, BUS_ADDR_LO32(value));
+#endif
+}
+#endif
 
 static void
 virtio_pci_setup_queue_10(struct virtio_softc *sc, uint16_t idx, uint64_t addr)
@@ -747,15 +759,15 @@
        bus_space_write_2(iot, ioh, VIRTIO_CONFIG1_QUEUE_SELECT, vq->vq_index);
        if (addr == 0) {
                bus_space_write_2(iot, ioh, VIRTIO_CONFIG1_QUEUE_ENABLE, 0);
-               bus_space_write_le_8(iot, ioh, VIRTIO_CONFIG1_QUEUE_DESC,   0);
-               bus_space_write_le_8(iot, ioh, VIRTIO_CONFIG1_QUEUE_AVAIL,  0);
-               bus_space_write_le_8(iot, ioh, VIRTIO_CONFIG1_QUEUE_USED,   0);
+               bus_space_write_8(iot, ioh, VIRTIO_CONFIG1_QUEUE_DESC,   0);
+               bus_space_write_8(iot, ioh, VIRTIO_CONFIG1_QUEUE_AVAIL,  0);
+               bus_space_write_8(iot, ioh, VIRTIO_CONFIG1_QUEUE_USED,   0);
        } else {
-               bus_space_write_le_8(iot, ioh,
+               bus_space_write_8(iot, ioh,
                        VIRTIO_CONFIG1_QUEUE_DESC, addr);
-               bus_space_write_le_8(iot, ioh,
+               bus_space_write_8(iot, ioh,
                        VIRTIO_CONFIG1_QUEUE_AVAIL, addr + vq->vq_availoffset);
-               bus_space_write_le_8(iot, ioh,
+               bus_space_write_8(iot, ioh,
                        VIRTIO_CONFIG1_QUEUE_USED, addr + vq->vq_usedoffset);
                bus_space_write_2(iot, ioh,
                        VIRTIO_CONFIG1_QUEUE_ENABLE, 1);
@@ -771,7 +783,6 @@
                        VIRTIO_CONFIG1_QUEUE_MSIX_VECTOR, vec);
        }
 }
-#undef bus_space_write_le_8
 
 static void
 virtio_pci_set_status_10(struct virtio_softc *sc, int status)