summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2016-09-16 15:20:50 +0000
committerjdolecek <jdolecek@NetBSD.org>2016-09-16 15:20:50 +0000
commit9c84788c6f2a698bcb239deb4e9232bb7d7fc003 (patch)
treec3d0ff31722b08a359b0eed974d840060f48eeda /sys/dev
parentd2de90c575ba04ca842bfc33f2eefb19d8615fc0 (diff)
modify ldattach() to have default strategy as a parameter
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ld_ataraid.c8
-rw-r--r--sys/dev/i2o/ld_iop.c6
-rw-r--r--sys/dev/ic/ld_aac.c6
-rw-r--r--sys/dev/ic/ld_cac.c6
-rw-r--r--sys/dev/ic/ld_icp.c6
-rw-r--r--sys/dev/ic/ld_mlx.c6
-rw-r--r--sys/dev/ic/ld_nvme.c7
-rw-r--r--sys/dev/ld.c8
-rw-r--r--sys/dev/ldvar.h4
-rw-r--r--sys/dev/pci/ld_amr.c6
-rw-r--r--sys/dev/pci/ld_twa.c6
-rw-r--r--sys/dev/pci/ld_twe.c6
-rw-r--r--sys/dev/pci/ld_virtio.c7
-rw-r--r--sys/dev/sdmmc/ld_sdmmc.c6
14 files changed, 45 insertions, 43 deletions
diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c
index afed62ae8f0..d64658b5582 100644
--- a/sys/dev/ata/ld_ataraid.c
+++ b/sys/dev/ata/ld_ataraid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_ataraid.c,v 1.41 2016/05/02 19:18:29 christos Exp $ */
+/* $NetBSD: ld_ataraid.c,v 1.42 2016/09/16 15:20:50 jdolecek Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.41 2016/05/02 19:18:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.42 2016/09/16 15:20:50 jdolecek Exp $");
#include "bio.h"
@@ -249,8 +249,8 @@ ld_ataraid_attach(device_t parent, device_t self, void *aux)
panic("%s: bioctl registration failed\n",
device_xname(ld->sc_dv));
#endif
- SIMPLEQ_INIT(&sc->sc_cbufq);
- ldattach(ld);
+ SIMPLEQ_INIT(&sc->sc_cbufq);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
static int
diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c
index 069210a3705..6e2526a5dcc 100644
--- a/sys/dev/i2o/ld_iop.c
+++ b/sys/dev/i2o/ld_iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_iop.c,v 1.35 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: ld_iop.c,v 1.36 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.35 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.36 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -266,7 +266,7 @@ ld_iop_attach(device_t parent, device_t self, void *aux)
else
aprint_error_dev(self, "device not yet supported\n");
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
return;
bad:
diff --git a/sys/dev/ic/ld_aac.c b/sys/dev/ic/ld_aac.c
index 434451705a0..6531be3d03e 100644
--- a/sys/dev/ic/ld_aac.c
+++ b/sys/dev/ic/ld_aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_aac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: ld_aac.c,v 1.29 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.29 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,7 +95,7 @@ ld_aac_attach(device_t parent, device_t self, void *aux)
aprint_normal(": %s\n",
aac_describe_code(aac_container_types, hdr->hd_devtype));
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
static int
diff --git a/sys/dev/ic/ld_cac.c b/sys/dev/ic/ld_cac.c
index 84333c985af..f305e662dea 100644
--- a/sys/dev/ic/ld_cac.c
+++ b/sys/dev/ic/ld_cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_cac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: ld_cac.c,v 1.29 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.28 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.29 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,7 @@ ld_cac_attach(device_t parent, device_t self, void *aux)
/* XXX We should verify this... */
ld->sc_flags = LDF_ENABLED;
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
int
diff --git a/sys/dev/ic/ld_icp.c b/sys/dev/ic/ld_icp.c
index 095842bf0c6..5711a7cee69 100644
--- a/sys/dev/ic/ld_icp.c
+++ b/sys/dev/ic/ld_icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_icp.c,v 1.27 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: ld_icp.c,v 1.28 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.27 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.28 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,7 +158,7 @@ ld_icp_attach(device_t parent, device_t self, void *aux)
aprint_normal("status: %s\n", str);
out:
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
int
diff --git a/sys/dev/ic/ld_mlx.c b/sys/dev/ic/ld_mlx.c
index fc6395578ba..09fc3a2cb8e 100644
--- a/sys/dev/ic/ld_mlx.c
+++ b/sys/dev/ic/ld_mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_mlx.c,v 1.21 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: ld_mlx.c,v 1.22 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.21 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.22 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,7 @@ ld_mlx_attach(device_t parent, device_t self, void *aux)
else
aprint_normal(": RAID%d, %s\n", ms->ms_raidlevel, statestr);
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
static int
diff --git a/sys/dev/ic/ld_nvme.c b/sys/dev/ic/ld_nvme.c
index 15f71df56a0..ce716185b99 100644
--- a/sys/dev/ic/ld_nvme.c
+++ b/sys/dev/ic/ld_nvme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_nvme.c,v 1.1 2016/05/01 10:21:02 nonaka Exp $ */
+/* $NetBSD: ld_nvme.c,v 1.2 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (C) 2016 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -26,13 +26,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.1 2016/05/01 10:21:02 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.2 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bufq.h>
#include <sys/disk.h>
#include <sys/kmem.h>
@@ -113,7 +114,7 @@ ld_nvme_attach(device_t parent, device_t self, void *aux)
ld->sc_dump = ld_nvme_dump;
ld->sc_flush = ld_nvme_flush;
ld->sc_flags = LDF_ENABLED;
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
static int
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index 5637d526ad0..db6e09221e9 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.94 2016/02/27 08:54:49 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.95 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.94 2016/02/27 08:54:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.95 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@ static struct dkdriver lddkdriver = {
};
void
-ldattach(struct ld_softc *sc)
+ldattach(struct ld_softc *sc, const char *default_strategy)
{
device_t self = sc->sc_dv;
struct dk_softc *dksc = &sc->sc_dksc;
@@ -153,7 +153,7 @@ ldattach(struct ld_softc *sc)
disk_attach(&dksc->sc_dkdev);
ld_set_geometry(sc);
- bufq_alloc(&dksc->sc_bufq, BUFQ_DISK_DEFAULT_STRAT, BUFQ_SORT_RAWBLOCK);
+ bufq_alloc(&dksc->sc_bufq, default_strategy, BUFQ_SORT_RAWBLOCK);
/* Register with PMF */
if (!pmf_device_register1(dksc->sc_dev, ld_suspend, NULL, ld_shutdown))
diff --git a/sys/dev/ldvar.h b/sys/dev/ldvar.h
index 149afafbd19..0bec99ecdc1 100644
--- a/sys/dev/ldvar.h
+++ b/sys/dev/ldvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ldvar.h,v 1.27 2015/08/28 17:41:49 mlelstv Exp $ */
+/* $NetBSD: ldvar.h,v 1.28 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@ struct ld_softc {
#define LDFL_POLL 0x001 /* poll for completion */
int ldadjqparam(struct ld_softc *, int);
-void ldattach(struct ld_softc *);
+void ldattach(struct ld_softc *, const char *);
int ldbegindetach(struct ld_softc *, int);
void ldenddetach(struct ld_softc *);
void lddone(struct ld_softc *, struct buf *);
diff --git a/sys/dev/pci/ld_amr.c b/sys/dev/pci/ld_amr.c
index fada53c306c..f78bb15de87 100644
--- a/sys/dev/pci/ld_amr.c
+++ b/sys/dev/pci/ld_amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_amr.c,v 1.23 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: ld_amr.c,v 1.24 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.23 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.24 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ ld_amr_attach(device_t parent, device_t self, void *aux)
amr->amr_drive[sc->sc_hwunit].al_properties & AMR_DRV_RAID_MASK,
statestr);
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
CFATTACH_DECL_NEW(ld_amr, sizeof(struct ld_amr_softc),
diff --git a/sys/dev/pci/ld_twa.c b/sys/dev/pci/ld_twa.c
index 2da417ed574..5eae3d9351e 100644
--- a/sys/dev/pci/ld_twa.c
+++ b/sys/dev/pci/ld_twa.c
@@ -1,5 +1,5 @@
/* $wasabi: ld_twa.c,v 1.9 2006/02/14 18:44:37 jordanr Exp $ */
-/* $NetBSD: ld_twa.c,v 1.17 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: ld_twa.c,v 1.18 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.17 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.18 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ ld_twa_attach(device_t parent, device_t self, void *aux)
ld->sc_start = ld_twa_start;
ld->sc_dump = ld_twa_dump;
ld->sc_flush = ld_twa_flush;
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
static int
diff --git a/sys/dev/pci/ld_twe.c b/sys/dev/pci/ld_twe.c
index 252ad050bdc..7b85e611c90 100644
--- a/sys/dev/pci/ld_twe.c
+++ b/sys/dev/pci/ld_twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_twe.c,v 1.37 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: ld_twe.c,v 1.38 2016/09/16 15:20:50 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.37 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.38 2016/09/16 15:20:50 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,7 +148,7 @@ ld_twe_attach(device_t parent, device_t self, void *aux)
}
aprint_normal(": %s%s, status: %s\n", stripebuf, typestr, statstr);
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
}
static int
diff --git a/sys/dev/pci/ld_virtio.c b/sys/dev/pci/ld_virtio.c
index cc723ba7fb8..bb207d4e118 100644
--- a/sys/dev/pci/ld_virtio.c
+++ b/sys/dev/pci/ld_virtio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_virtio.c,v 1.10 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: ld_virtio.c,v 1.11 2016/09/16 15:20:50 jdolecek Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,12 +26,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.10 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.11 2016/09/16 15:20:50 jdolecek 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>
@@ -350,7 +351,7 @@ ld_virtio_attach(device_t parent, device_t self, void *aux)
ld->sc_start = ld_virtio_start;
ld->sc_flags = LDF_ENABLED;
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
return;
diff --git a/sys/dev/sdmmc/ld_sdmmc.c b/sys/dev/sdmmc/ld_sdmmc.c
index 0d04e5dec55..efa34a85fba 100644
--- a/sys/dev/sdmmc/ld_sdmmc.c
+++ b/sys/dev/sdmmc/ld_sdmmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_sdmmc.c,v 1.21 2015/08/28 06:04:43 mlelstv Exp $ */
+/* $NetBSD: ld_sdmmc.c,v 1.22 2016/09/16 15:20:50 jdolecek Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.21 2015/08/28 06:04:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v 1.22 2016/09/16 15:20:50 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -147,7 +147,7 @@ ld_sdmmc_doattach(void *arg)
struct ld_softc *ld = &sc->sc_ld;
struct sdmmc_softc *ssc = device_private(device_parent(ld->sc_dv));
- ldattach(ld);
+ ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
aprint_normal_dev(ld->sc_dv, "%d-bit width,", sc->sc_sf->width);
if (ssc->sc_transfer_mode != NULL)
aprint_normal(" %s,", ssc->sc_transfer_mode);