CVS commit: src/libexec/httpd
Module Name:src
Committed By: mrg
Date: Tue Dec 4 02:52:42 UTC 2018
Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c dir-index-bozo.c
Log Message:
use html tables for directory index.
from "Rajeev V. Pillai"
call this bozohttpd 20181204.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.74 -r1.75 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.100 -r1.101 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.28 -r1.29 src/libexec/httpd/dir-index-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.30 src/libexec/httpd/CHANGES:1.31
--- src/libexec/httpd/CHANGES:1.30 Sun Nov 25 23:48:14 2018
+++ src/libexec/httpd/CHANGES Tue Dec 4 02:52:42 2018
@@ -1,4 +1,8 @@
-$NetBSD: CHANGES,v 1.30 2018/11/25 23:48:14 mrg Exp $
+$NetBSD: CHANGES,v 1.31 2018/12/04 02:52:42 mrg Exp $
+
+changes in bozohttpd 20181204:
+ o change directory indexing to use html tables. from
+ rajeev_v_pil...@yahoo.com
changes in bozohttpd 20181125:
o fixes for option parsing introduced in bozohttpd 20181123
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.74 src/libexec/httpd/bozohttpd.8:1.75
--- src/libexec/httpd/bozohttpd.8:1.74 Fri Nov 23 08:11:20 2018
+++ src/libexec/httpd/bozohttpd.8 Tue Dec 4 02:52:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: bozohttpd.8,v 1.74 2018/11/23 08:11:20 mrg Exp $
+.\" $NetBSD: bozohttpd.8,v 1.75 2018/12/04 02:52:42 mrg Exp $
.\"
.\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\"
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 19, 2018
+.Dd December 4, 2018
.Dt BOZOHTTPD 8
.Os
.Sh NAME
@@ -599,7 +599,7 @@ The focus has always been simplicity and
and regular code audits.
This manual documents
.Nm
-version 20181123.
+version 20181204.
.Sh AUTHORS
.An -nosplit
.Nm
@@ -717,7 +717,7 @@ HTTP basic authorization support and muc
.It
.An Rajeev V. Pillai
.Aq Mt rajeev_v_pil...@yahoo.com
-provided several fixes for virtual hosting
+provided several fixes for virtual hosting and directory indexing
.It
.An Jeremy C. Reed
.Aq Mt r...@netbsd.org
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.100 src/libexec/httpd/bozohttpd.c:1.101
--- src/libexec/httpd/bozohttpd.c:1.100 Tue Dec 4 00:26:15 2018
+++ src/libexec/httpd/bozohttpd.c Tue Dec 4 02:52:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.100 2018/12/04 00:26:15 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.101 2018/12/04 02:52:42 mrg Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -1441,7 +1441,7 @@ check_bzredirect(bozo_httpreq_t *request
bozohttpd_t *httpd = request->hr_httpd;
struct stat sb;
char dir[MAXPATHLEN], redir[MAXPATHLEN], redirpath[MAXPATHLEN + 1],
- path[MAXPATHLEN];
+ path[MAXPATHLEN + 1];
char *basename, *finalredir;
int rv, absolute;
@@ -2076,6 +2076,9 @@ bozo_escape_html(bozohttpd_t *httpd, con
case '&':
j += 5;
break;
+ case '"':
+ j += 6;
+ break;
}
}
@@ -2106,6 +2109,10 @@ bozo_escape_html(bozohttpd_t *httpd, con
memcpy(tmp + j, "", 5);
j += 5;
break;
+ case '"':
+ memcpy(tmp + j, "", 6);
+ j += 6;
+ break;
default:
tmp[j++] = url[i];
}
Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.28 src/libexec/httpd/dir-index-bozo.c:1.29
--- src/libexec/httpd/dir-index-bozo.c:1.28 Thu Nov 22 08:54:08 2018
+++ src/libexec/httpd/dir-index-bozo.c Tue Dec 4 02:52:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dir-index-bozo.c,v 1.28 2018/11/22 08:54:08 mrg Exp $ */
+/* $NetBSD: dir-index-bozo.c,v 1.29 2018/12/04 02:52:42 mrg Exp $ */
/* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */
@@ -45,14 +45,6 @@
#include "bozohttpd.h"
-static void
-directory_hr(bozohttpd_t *httpd)
-{
-
- bozo_printf(httpd,
- "\r\n\r\n");
-}
-
/*
* output a directory index. return 1 if it actually did something..
*/
@@ -62,12 +54,10 @@ bozo_dir_index(bozo_httpreq_t *request,
bozohttpd_t *httpd = request->hr_httpd;
struct stat sb;
struct dirent **de, **deo;
- struct tm *tm;
DIR *dp;
char buf[MAXPATHLEN];
- char spacebuf[48];
char *file = NULL, *printname = NULL;
- int l, k, j, i;
+ int k, j, i;
if (!isindex || !httpd->dir_indexing)
return 0;
@@ -117,23 +107,19 @@ bozo_dir_index(bozo_httpreq_t *request,
printname = bozostrdup(httpd, request, request->hr_file);
#endif /* !NO_USER_SUPPORT */
- bozo_printf(httpd,
- "Index of %s\r\n",
+ bozo_printf(httpd, "\r\n");
+ bozo_printf(httpd, "\r\n");
+ bozo_printf(httpd, "tr.o {background:#f4f4f4;}\r\n");
+ bozo_printf(httpd, "Index of %s\r\n",
printname);
bozo_printf(httpd, "Index of %s\r\n",
printname);
- bozo_printf(httpd,
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: rin
Date: Tue Dec 4 01:35:15 UTC 2018
Modified Files:
src/sys/dev/usb: if_mue.c
Log Message:
Remove duplicate ;'s. No binary changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/if_mue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.18 src/sys/dev/usb/if_mue.c:1.19
--- src/sys/dev/usb/if_mue.c:1.18 Sun Sep 16 02:00:36 2018
+++ src/sys/dev/usb/if_mue.c Tue Dec 4 01:35:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mue.c,v 1.18 2018/09/16 02:00:36 rin Exp $ */
+/* $NetBSD: if_mue.c,v 1.19 2018/12/04 01:35:15 rin Exp $ */
/* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Microchip LAN7500/LAN7800 chipsets. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.18 2018/09/16 02:00:36 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.19 2018/12/04 01:35:15 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1390,11 +1390,11 @@ mue_sethwcsum(struct mue_softc *sc)
val = mue_csr_read(sc, reg);
if (ifp->if_capenable & (IFCAP_CSUM_TCPv4_Rx|IFCAP_CSUM_UDPv4_Rx)) {
- DPRINTF(sc, "enabled\n");;
+ DPRINTF(sc, "enabled\n");
val |= MUE_RFE_CTL_IGMP_COE | MUE_RFE_CTL_ICMP_COE;
val |= MUE_RFE_CTL_TCPUDP_COE | MUE_RFE_CTL_IP_COE;
} else {
- DPRINTF(sc, "disabled\n");;
+ DPRINTF(sc, "disabled\n");
val &=
~(MUE_RFE_CTL_IGMP_COE | MUE_RFE_CTL_ICMP_COE);
val &=
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Tue Dec 4 00:26:15 UTC 2018 Modified Files: src/libexec/httpd: bozohttpd.c Log Message: avoid sign extension in % handling (and printing 0xFF before wanted values.) from Rajeev V. Pillai. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.c diff -u src/libexec/httpd/bozohttpd.c:1.99 src/libexec/httpd/bozohttpd.c:1.100 --- src/libexec/httpd/bozohttpd.c:1.99 Sun Nov 25 07:37:20 2018 +++ src/libexec/httpd/bozohttpd.c Tue Dec 4 00:26:15 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: bozohttpd.c,v 1.99 2018/11/25 07:37:20 mrg Exp $ */ +/* $NetBSD: bozohttpd.c,v 1.100 2018/12/04 00:26:15 mrg Exp $ */ /* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */ @@ -1023,7 +1023,7 @@ bozo_escape_rfc3986(bozohttpd_t *httpd, case '\r': case ' ': encode_it: - snprintf(d, 4, "%%%02X", *s++); + snprintf(d, 4, "%%%02X", (unsigned char)*s++); d += 3; len += 3; break;
CVS commit: src/sys/kern
Module Name:src
Committed By: maya
Date: Tue Dec 4 00:18:05 UTC 2018
Modified Files:
src/sys/kern: sys_socket.c
Log Message:
soo_fcntl is identical to fnullop_fcntl, use the latter
ok kamil mrg
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/kern/sys_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.77 src/sys/kern/sys_socket.c:1.78
--- src/sys/kern/sys_socket.c:1.77 Wed Aug 1 23:35:32 2018
+++ src/sys/kern/sys_socket.c Tue Dec 4 00:18:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_socket.c,v 1.77 2018/08/01 23:35:32 rjs Exp $ */
+/* $NetBSD: sys_socket.c,v 1.78 2018/12/04 00:18:05 maya Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.77 2018/08/01 23:35:32 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.78 2018/12/04 00:18:05 maya Exp $");
#include
#include
@@ -85,7 +85,7 @@ const struct fileops socketops = {
.fo_read = soo_read,
.fo_write = soo_write,
.fo_ioctl = soo_ioctl,
- .fo_fcntl = soo_fcntl,
+ .fo_fcntl = fnullop_fcntl,
.fo_poll = soo_poll,
.fo_stat = soo_stat,
.fo_close = soo_close,
@@ -224,16 +224,6 @@ soo_ioctl(file_t *fp, u_long cmd, void *
}
int
-soo_fcntl(file_t *fp, u_int cmd, void *data)
-{
-
- if (cmd == F_SETFL)
- return 0;
- else
- return EOPNOTSUPP;
-}
-
-int
soo_poll(file_t *fp, int events)
{
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Mon Dec 3 23:23:30 UTC 2018 Modified Files: src/sys/dev/pci: mpii.c Log Message: Also tell the scsi layer that we are MPSAFE To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/mpii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/mpii.c diff -u src/sys/dev/pci/mpii.c:1.15 src/sys/dev/pci/mpii.c:1.16 --- src/sys/dev/pci/mpii.c:1.15 Mon Dec 3 22:34:36 2018 +++ src/sys/dev/pci/mpii.c Mon Dec 3 23:23:30 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: mpii.c,v 1.15 2018/12/03 22:34:36 bouyer Exp $ */ +/* $NetBSD: mpii.c,v 1.16 2018/12/03 23:23:30 bouyer Exp $ */ /* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */ /* * Copyright (c) 2010, 2012 Mike Belopuhov @@ -20,7 +20,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.15 2018/12/03 22:34:36 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.16 2018/12/03 23:23:30 bouyer Exp $"); #include "bio.h" @@ -615,6 +615,7 @@ mpii_attach(device_t parent, device_t se adapt->adapt_max_periph = adapt->adapt_openings; adapt->adapt_request = mpii_scsipi_request; adapt->adapt_minphys = minphys; + adapt->adapt_flags = SCSIPI_ADAPT_MPSAFE; memset(chan, 0, sizeof(*chan)); chan->chan_adapter = adapt;
CVS commit: src/share/man/man4
Module Name:src Committed By: bouyer Date: Mon Dec 3 22:41:56 UTC 2018 Modified Files: src/share/man/man4: mpii.4 Log Message: Update for the new mpii(4) driver, mostly from OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/mpii.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/mpii.4 diff -u src/share/man/man4/mpii.4:1.2 src/share/man/man4/mpii.4:1.3 --- src/share/man/man4/mpii.4:1.2 Thu Apr 19 20:13:48 2012 +++ src/share/man/man4/mpii.4 Mon Dec 3 22:41:56 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: mpii.4,v 1.2 2012/04/19 20:13:48 wiz Exp $ +.\" $NetBSD: mpii.4,v 1.3 2018/12/03 22:41:56 bouyer Exp $ .\" OpenBSD: mpii.4,v 1.8 2010/10/01 12:27:36 mikeb Exp .\" .\" Copyright (c) 2010 Marco Peereboom @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 19, 2012 +.Dd December 3, 2018 .Dt MPII 4 .Os .Sh NAME @@ -34,20 +34,39 @@ family of chipsets: .Bl -dash -offset indent -compact .It LSISAS2004, -LSISAS2008 +LSISAS2008, +LSISAS2108, +LSISAS2208, +LSISAS2216, +LSISAS2308, +LSISAS3004, +LSISAS3008, +LSISAS3108, +LSISAS3408, +LSISAS3416, +LSISAS3508, +LSISAS3516 .El .Pp These chipsets can be found on the following controllers: .Pp .Bl -dash -offset indent -compact .It -Dell PERC H200 +Dell PERC H200, HBA330, 12Gbps SAS HBA .It -LSI SAS 9200-8e, SAS 9211-4i, SAS 9211-8i +IBM ServeRAID H1110 +.It +Lenovo N2215, ThinkSystem 430 +.It +LSI SAS 9200-8e, SAS 9207-8i, SAS 9211-4i, SAS 9211-8i +.It +Broadcom SAS 9300, HBA 9400 .El .Pp -Some models of these controllers have varying degrees of support for RAID 0 -and RAID 1. +Some models of these controllers carry an Integrated RAID (IR) firmware +providing support for RAID 0, RAID 1, RAID10 or RAID5 using SAS or SATA +drives. +All RAID configuration is done through the controllers' BIOSes. .Pp .Nm supports monitoring of the logical disks in the controller through the @@ -94,4 +113,4 @@ do not use a SCSI-like identifier. Instead they use an opaque ID and leave discovery order up to the operating system. The code to handle this is currently not implemented and therefore it is not a -good idea to run this driver on a multi-boot machine or with more than 1 drive. +good idea to run this driver on a multi-boot machine.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Mon Dec 3 22:34:36 UTC 2018
Modified Files:
src/sys/dev/pci: mfii.c mpii.c mpiireg.h
Log Message:
Update the mpii(4) driver to the latest OpenBSD version.
This adds support for the SAS3xxx LSI controllers, and this also makes the
driver MP-safe.
adjust mfii.c for changes in mpiireg.h
Tested with a
mpii0: SMC2008-IR, firmware 9.0.0.0 IR, MPI 2.0
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/mfii.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/mpii.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/mpiireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.2 src/sys/dev/pci/mfii.c:1.3
--- src/sys/dev/pci/mfii.c:1.2 Sat Nov 24 18:37:16 2018
+++ src/sys/dev/pci/mfii.c Mon Dec 3 22:34:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.2 2018/11/24 18:37:16 bouyer Exp $ */
+/* $NetBSD: mfii.c,v 1.3 2018/12/03 22:34:36 bouyer Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.2 2018/11/24 18:37:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.3 2018/12/03 22:34:36 bouyer Exp $");
#include "bio.h"
@@ -1935,11 +1935,15 @@ mfii_initialise_firmware(struct mfii_sof
iiq->sense_buffer_address_high = htole32(
MFII_DMA_DVA(sc->sc_sense) >> 32);
- iiq->reply_descriptor_post_queue_address = htole64(
- MFII_DMA_DVA(sc->sc_reply_postq));
-
- iiq->system_request_frame_base_address =
- htole64(MFII_DMA_DVA(sc->sc_requests));
+ iiq->reply_descriptor_post_queue_address_lo =
+ htole32(MFII_DMA_DVA(sc->sc_reply_postq));
+ iiq->reply_descriptor_post_queue_address_hi =
+ htole32(MFII_DMA_DVA(sc->sc_reply_postq) >> 32);
+
+ iiq->system_request_frame_base_address_lo =
+ htole32(MFII_DMA_DVA(sc->sc_requests));
+ iiq->system_request_frame_base_address_hi =
+ htole32(MFII_DMA_DVA(sc->sc_requests) >> 32);
iiq->timestamp = htole64(time_uptime);
Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.14 src/sys/dev/pci/mpii.c:1.15
--- src/sys/dev/pci/mpii.c:1.14 Sun Dec 2 13:22:28 2018
+++ src/sys/dev/pci/mpii.c Mon Dec 3 22:34:36 2018
@@ -1,7 +1,7 @@
-/* $NetBSD: mpii.c,v 1.14 2018/12/02 13:22:28 jdolecek Exp $ */
-/* OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp */
+/* $NetBSD: mpii.c,v 1.15 2018/12/03 22:34:36 bouyer Exp $ */
+/* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */
/*
- * Copyright (c) 2010 Mike Belopuhov
+ * Copyright (c) 2010, 2012 Mike Belopuhov
* Copyright (c) 2009 James Giannoules
* Copyright (c) 2005 - 2010 David Gwynne
* Copyright (c) 2005 - 2010 Marco Peereboom
@@ -20,7 +20,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.14 2018/12/02 13:22:28 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.15 2018/12/03 22:34:36 bouyer Exp $");
#include "bio.h"
@@ -44,15 +44,15 @@ __KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.1
#include
#include
-#include
-
#if NBIO > 0
#include
-#include
+#include
#include
#endif
-/* #define MPII_DEBUG */
+#include
+
+// #define MPII_DEBUG
#ifdef MPII_DEBUG
#define DPRINTF(x...) do { if (mpii_debug) printf(x); } while(0)
#define DNPRINTF(n,x...) do { if (mpii_debug & (n)) printf(x); } while(0)
@@ -69,42 +69,29 @@ __KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.1
#define MPII_D_EVT (0x0400)
#define MPII_D_CFG (0x0800)
#define MPII_D_MAP (0x1000)
-#if 0
+
u_int32_t mpii_debug = 0
- | MPII_D_CMD
- | MPII_D_INTR
- | MPII_D_MISC
- | MPII_D_DMA
- | MPII_D_IOCTL
- | MPII_D_RW
- | MPII_D_MEM
- | MPII_D_CCB
- | MPII_D_PPR
- | MPII_D_RAID
- | MPII_D_EVT
- | MPII_D_CFG
- | MPII_D_MAP
+// | MPII_D_CMD
+// | MPII_D_INTR
+// | MPII_D_MISC
+// | MPII_D_DMA
+// | MPII_D_IOCTL
+// | MPII_D_RW
+// | MPII_D_MEM
+// | MPII_D_CCB
+// | MPII_D_PPR
+// | MPII_D_RAID
+// | MPII_D_EVT
+// | MPII_D_CFG
+// | MPII_D_MAP
;
-#endif
-u_int32_t mpii_debug = MPII_D_MISC;
#else
#define DPRINTF(x...)
#define DNPRINTF(n,x...)
#endif
-#define MPII_REQUEST_SIZE (512)
-#define MPII_REPLY_SIZE (128)
-#define MPII_REPLY_COUNT PAGE_SIZE / MPII_REPLY_SIZE
-
-/*
- * this is the max number of sge's we can stuff in a request frame:
- * sizeof(scsi_io) + sizeof(sense) + sizeof(sge) * 32 = MPII_REQUEST_SIZE
- */
-#define MPII_MAX_SGL (32)
-
-#define MPII_MAX_REQUEST_CREDIT (128)
-
-#define MPII_MAXFER MAXPHYS /* XXX bogus */
+#define MPII_REQUEST_SIZE (512)
+#define MPII_REQUEST_CREDIT (128)
struct mpii_dmamem {
bus_dmamap_t mdm_map;
@@ -112,23 +99,14 @@ struct mpii_dmamem {
size_t mdm_size;
void *mdm_kva;
};
-#define MPII_DMA_MAP(_mdm) (_mdm)->mdm_map
-#define MPII_DMA_DVA(_mdm) (_mdm)->mdm_map->dm_segs[0].ds_addr
-#define MPII_DMA_KVA(_mdm) (void *)(_mdm)->mdm_kva
-
-struct mpii_ccb_bundle {
- struct
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jdolecek
Date: Mon Dec 3 20:00:16 UTC 2018
Modified Files:
src/sys/dev/ic: ahcisatareg.h
Log Message:
fix typo in comment, NFC
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/ahcisatareg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ahcisatareg.h
diff -u src/sys/dev/ic/ahcisatareg.h:1.13 src/sys/dev/ic/ahcisatareg.h:1.14
--- src/sys/dev/ic/ahcisatareg.h:1.13 Sat Oct 7 16:05:32 2017
+++ src/sys/dev/ic/ahcisatareg.h Mon Dec 3 20:00:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisatareg.h,v 1.13 2017/10/07 16:05:32 jdolecek Exp $ */
+/* $NetBSD: ahcisatareg.h,v 1.14 2018/12/03 20:00:16 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -97,7 +97,7 @@ struct ahci_r_fis {
/* class Mass storage, subclass SATA, interface AHCI */
#define PCI_INTERFACE_SATA_AHCI 0x01
-#define AHCI_PCI_ABAR 0x24 /* native ACHI registers (memory mapped) */
+#define AHCI_PCI_ABAR 0x24 /* native AHCI registers (memory mapped) */
/* ABAR registers */
/* Global registers */
CVS commit: src/sys/arch/x86/isa
Module Name:src
Committed By: cherry
Date: Mon Dec 3 19:51:09 UTC 2018
Modified Files:
src/sys/arch/x86/isa: isa_machdep.c
Log Message:
Allow isa_machdep.c to compile in the case of no ioapic support.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/isa/isa_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.40 src/sys/arch/x86/isa/isa_machdep.c:1.41
--- src/sys/arch/x86/isa/isa_machdep.c:1.40 Mon Sep 10 07:04:08 2018
+++ src/sys/arch/x86/isa/isa_machdep.c Mon Dec 3 19:51:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.40 2018/09/10 07:04:08 cherry Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.41 2018/12/03 19:51:09 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.40 2018/09/10 07:04:08 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.41 2018/12/03 19:51:09 cherry Exp $");
#include
#include
@@ -210,8 +210,8 @@ isa_intr_establish_xname(isa_chipset_tag
{
struct pic *pic;
int pin;
- intr_handle_t mpih = 0;
#if NIOAPIC > 0
+ intr_handle_t mpih = 0;
struct ioapic_softc *ioapic = NULL;
#endif
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: cherry Date: Mon Dec 3 19:46:43 UTC 2018 Modified Files: src/sys/arch/x86/x86: efi.c Log Message: Do not assume that all uses of efi are pci aware. Allow efi.c to compile in the case where pci is not enabled. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/x86/efi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/efi.c diff -u src/sys/arch/x86/x86/efi.c:1.18 src/sys/arch/x86/x86/efi.c:1.19 --- src/sys/arch/x86/x86/efi.c:1.18 Thu Nov 15 16:58:56 2018 +++ src/sys/arch/x86/x86/efi.c Mon Dec 3 19:46:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: efi.c,v 1.18 2018/11/15 16:58:56 riastradh Exp $ */ +/* $NetBSD: efi.c,v 1.19 2018/12/03 19:46:43 cherry Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.18 2018/11/15 16:58:56 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.19 2018/12/03 19:46:43 cherry Exp $"); #include #include @@ -40,7 +40,9 @@ __KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.18 #include #include +#if NPCI > 0 #include /* for pci_mapreg_map_enable_decode */ +#endif const struct uuid EFI_UUID_ACPI20 = EFI_TABLE_ACPI20; const struct uuid EFI_UUID_ACPI10 = EFI_TABLE_ACPI10; @@ -419,7 +421,9 @@ efi_init(void) return; } bootmethod_efi = true; +#if NPCI > 0 pci_mapreg_map_enable_decode = true; /* PR port-amd64/53286 */ +#endif } bool
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Dec 3 19:15:35 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Head is binutils 2.31
To generate a diff of this commit:
cvs rdiff -u -r1.1084 -r1.1085 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1084 src/share/mk/bsd.own.mk:1.1085
--- src/share/mk/bsd.own.mk:1.1084 Mon Nov 19 15:00:28 2018
+++ src/share/mk/bsd.own.mk Mon Dec 3 14:15:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1084 2018/11/19 20:00:28 aymeric Exp $
+# $NetBSD: bsd.own.mk,v 1.1085 2018/12/03 19:15:35 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -151,7 +151,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
HAVE_BINUTILS?= 227
-.if ${HAVE_BINUTILS} == 230
+.if ${HAVE_BINUTILS} == 231
EXTERNAL_BINUTILS_SUBDIR= binutils
.elif ${HAVE_BINUTILS} == 227
EXTERNAL_BINUTILS_SUBDIR= binutils.old
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Mon Dec 3 18:24:18 UTC 2018
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen for new Symbios devices
To generate a diff of this commit:
cvs rdiff -u -r1.1344 -r1.1345 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1343 -r1.1344 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1344 src/sys/dev/pci/pcidevs.h:1.1345
--- src/sys/dev/pci/pcidevs.h:1.1344 Thu Nov 29 23:53:15 2018
+++ src/sys/dev/pci/pcidevs.h Mon Dec 3 18:24:18 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1344 2018/11/29 23:53:15 jmcneill Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1345 2018/12/03 18:24:18 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1355 2018/11/29 23:52:49 jmcneill Exp
+ * NetBSD: pcidevs,v 1.1356 2018/12/03 18:23:02 bouyer Exp
*/
/*
@@ -5843,9 +5843,11 @@
#define PCI_PRODUCT_SYMBIOS_SAS3108_4 0x0095 /* SAS3108 */
#define PCI_PRODUCT_SYMBIOS_SAS3004 0x0096 /* SAS3004 */
#define PCI_PRODUCT_SYMBIOS_SAS3008 0x0097 /* SAS3008 */
-#define PCI_PRODUCT_SYMBIOS_SAS3516 0x00ab /* SAS3516 */
+#define PCI_PRODUCT_SYMBIOS_SAS3516 0x00aa /* SAS3516 */
+#define PCI_PRODUCT_SYMBIOS_SAS3516_1 0x00ab /* SAS3516 */
#define PCI_PRODUCT_SYMBIOS_SAS3416 0x00ac /* SAS3416 */
-#define PCI_PRODUCT_SYMBIOS_SAS3508 0x00ae /* SAS3508 */
+#define PCI_PRODUCT_SYMBIOS_SAS3508 0x00ad /* SAS3508 */
+#define PCI_PRODUCT_SYMBIOS_SAS3508_1 0x00ae /* SAS3508 */
#define PCI_PRODUCT_SYMBIOS_SAS3408 0x00af /* SAS3408 */
#define PCI_PRODUCT_SYMBIOS_SAS3504 0x00be /* SAS3504 */
#define PCI_PRODUCT_SYMBIOS_SAS3404 0x00bf /* SAS3404 */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1343 src/sys/dev/pci/pcidevs_data.h:1.1344
--- src/sys/dev/pci/pcidevs_data.h:1.1343 Thu Nov 29 23:53:15 2018
+++ src/sys/dev/pci/pcidevs_data.h Mon Dec 3 18:24:18 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1343 2018/11/29 23:53:15 jmcneill Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1344 2018/12/03 18:24:18 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1355 2018/11/29 23:52:49 jmcneill Exp
+ * NetBSD: pcidevs,v 1.1356 2018/12/03 18:23:02 bouyer Exp
*/
/*
@@ -10216,10 +10216,14 @@ static const uint16_t pci_products[] = {
27577, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS3516,
27393, 0,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS3516_1,
+ 27393, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS3416,
27401, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS3508,
27409, 0,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS3508_1,
+ 27409, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS3408,
27417, 0,
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS3504,
@@ -17147,9 +17151,9 @@ static const char pci_words[] = { "."
"53c1510\0" /* 1 refs @ 27369 */
"53c895A\0" /* 1 refs @ 27377 */
"53c875A\0" /* 1 refs @ 27385 */
- "SAS3516\0" /* 2 refs @ 27393 */
+ "SAS3516\0" /* 3 refs @ 27393 */
"SAS3416\0" /* 2 refs @ 27401 */
- "SAS3508\0" /* 2 refs @ 27409 */
+ "SAS3508\0" /* 3 refs @ 27409 */
"SAS3408\0" /* 2 refs @ 27417 */
"SAS3504\0" /* 2 refs @ 27425 */
"SAS3404\0" /* 2 refs @ 27433 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Mon Dec 3 18:23:02 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add 2 Symbios products, from OpenBSD To generate a diff of this commit: cvs rdiff -u -r1.1355 -r1.1356 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1355 src/sys/dev/pci/pcidevs:1.1356 --- src/sys/dev/pci/pcidevs:1.1355 Thu Nov 29 23:52:49 2018 +++ src/sys/dev/pci/pcidevs Mon Dec 3 18:23:02 2018 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1355 2018/11/29 23:52:49 jmcneill Exp $ +$NetBSD: pcidevs,v 1.1356 2018/12/03 18:23:02 bouyer Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5836,9 +5836,11 @@ product SYMBIOS SAS3108_3 0x0094 SAS310 product SYMBIOS SAS3108_4 0x0095 SAS3108 product SYMBIOS SAS3004 0x0096 SAS3004 product SYMBIOS SAS3008 0x0097 SAS3008 -product SYMBIOS SAS3516 0x00ab SAS3516 +product SYMBIOS SAS3516 0x00aa SAS3516 +product SYMBIOS SAS3516_1 0x00ab SAS3516 product SYMBIOS SAS3416 0x00ac SAS3416 -product SYMBIOS SAS3508 0x00ae SAS3508 +product SYMBIOS SAS3508 0x00ad SAS3508 +product SYMBIOS SAS3508_1 0x00ae SAS3508 product SYMBIOS SAS3408 0x00af SAS3408 product SYMBIOS SAS3504 0x00be SAS3504 product SYMBIOS SAS3404 0x00bf SAS3404
CVS commit: src/usr.bin/pkill
Module Name:src Committed By: sevan Date: Mon Dec 3 17:03:44 UTC 2018 Modified Files: src/usr.bin/pkill: pkill.1 Log Message: Note these tools use kvm(3) and not procfs as in Solaris. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/pkill/pkill.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/pkill/pkill.1 diff -u src/usr.bin/pkill/pkill.1:1.28 src/usr.bin/pkill/pkill.1:1.29 --- src/usr.bin/pkill/pkill.1:1.28 Sun Oct 22 17:45:46 2017 +++ src/usr.bin/pkill/pkill.1 Mon Dec 3 17:03:44 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkill.1,v 1.28 2017/10/22 17:45:46 abhinav Exp $ +.\" $NetBSD: pkill.1,v 1.29 2018/12/03 17:03:44 sevan Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 22, 2016 +.Dd December 3, 2018 .Dt PKILL 1 .Os .Sh NAME @@ -191,6 +191,11 @@ or .Nm prenice process will never consider itself or system processes (kernel threads) as a potential match. +.Sh IMPLEMENTATION NOTES +The Sun Solaris implemenation utilised procfs to obtain process information. +This implementation utilises +.Xr kvm 3 +instead. .Sh EXIT STATUS .Nm pgrep , .Nm pkill , @@ -212,6 +217,7 @@ An internal error occurred. .Xr kill 1 , .Xr ps 1 , .Xr kill 2 , +.Xr kvm 3 , .Xr sigaction 2 , .Xr re_format 7 , .Xr signal 7 ,
CVS commit: src/bin/sh
Module Name:src Committed By: martin Date: Mon Dec 3 10:53:29 UTC 2018 Modified Files: src/bin/sh: trap.h Log Message: Make pendingsigs forward declaration match the definition. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/bin/sh/trap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/trap.h diff -u src/bin/sh/trap.h:1.24 src/bin/sh/trap.h:1.25 --- src/bin/sh/trap.h:1.24 Mon Dec 3 06:43:19 2018 +++ src/bin/sh/trap.h Mon Dec 3 10:53:29 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.h,v 1.24 2018/12/03 06:43:19 kre Exp $ */ +/* $NetBSD: trap.h,v 1.25 2018/12/03 10:53:29 martin Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -34,7 +34,7 @@ * @(#)trap.h 8.3 (Berkeley) 6/5/95 */ -extern volatile int pendingsigs; +extern volatile sig_atomic_t pendingsigs; extern int traps_invalid;
