 @@ -1,14 +1,14 @@
-/*	$NetBSD: ld_virtio.c,v 1.17 2018/06/03 02:13:09 jakllsch Exp $	*/
+/*	$NetBSD: ld_virtio.c,v 1.18 2018/06/03 19:47:35 jakllsch Exp $	*/
 /*
  * Copyright (c) 2010 Minoura Makoto.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.17 2018/06/03 02:13:09 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.18 2018/06/03 19:47:35 jakllsch Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/mutex.h>
 #include <sys/module.h>
 #include <dev/pci/pcidevs.h>
 @@ -50,62 +50,69 @@ __KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,
 #include "ioconf.h"
 /*
  * ld_virtioreg:
  */
 /* Configuration registers */
 #define VIRTIO_BLK_CONFIG_CAPACITY	0 /* 64bit */
 #define VIRTIO_BLK_CONFIG_SIZE_MAX	8 /* 32bit */
 #define VIRTIO_BLK_CONFIG_SEG_MAX	12 /* 32bit */
 #define VIRTIO_BLK_CONFIG_GEOMETRY_C	16 /* 16bit */
 #define VIRTIO_BLK_CONFIG_GEOMETRY_H	18 /* 8bit */
 #define VIRTIO_BLK_CONFIG_GEOMETRY_S	19 /* 8bit */
 #define VIRTIO_BLK_CONFIG_BLK_SIZE	20 /* 32bit */
 #define VIRTIO_BLK_CONFIG_WRITEBACK	32 /* 8bit */
 /* Feature bits */
 #define VIRTIO_BLK_F_BARRIER	(1<<0)
 #define VIRTIO_BLK_F_SIZE_MAX	(1<<1)
 #define VIRTIO_BLK_F_SEG_MAX	(1<<2)
 #define VIRTIO_BLK_F_GEOMETRY	(1<<4)
 #define VIRTIO_BLK_F_RO		(1<<5)
 #define VIRTIO_BLK_F_BLK_SIZE	(1<<6)
 #define VIRTIO_BLK_F_SCSI	(1<<7)
 #define VIRTIO_BLK_F_FLUSH	(1<<9)
 #define VIRTIO_BLK_F_TOPOLOGY	(1<<10)
 #define VIRTIO_BLK_F_CONFIG_WCE	(1<<11)
 /*
  * Each block request uses at least two segments - one for the header
  * and one for the status.
 */
 #define	VIRTIO_BLK_MIN_SEGMENTS	2
 #define VIRTIO_BLK_FLAG_BITS \
 	VIRTIO_COMMON_FLAG_BITS \
 	"\x0c""CONFIG_WCE" \
 	"\x0b""TOPOLOGY" \
 	"\x0a""FLUSH" \
 	"\x08""SCSI" \
 	"\x07""BLK_SIZE" \
 	"\x06""RO" \
 	"\x05""GEOMETRY" \
 	"\x03""SEG_MAX" \
 	"\x02""SIZE_MAX" \
 	"\x01""BARRIER"
 /* Command */
 #define VIRTIO_BLK_T_IN		0
 #define VIRTIO_BLK_T_OUT	1
 #define VIRTIO_BLK_T_FLUSH	4
 #define VIRTIO_BLK_T_BARRIER	0x80000000
 /* Status */
 #define VIRTIO_BLK_S_OK		0
 #define VIRTIO_BLK_S_IOERR	1
 #define VIRTIO_BLK_S_UNSUPP	2
 /* Request header structure */
 struct virtio_blk_req_hdr {
 	uint32_t	type;	/* VIRTIO_BLK_T_* */
 	uint32_t	ioprio;
 	uint64_t	sector;
 } __packed;
 /* 512*virtio_blk_req_hdr.sector byte payload and 1 byte status follows */
 /*
  * ld_virtiovar:
  */