CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: ryo
Date: Fri May 6 05:14:38 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: vectors.S
Log Message:
md_astpending is uint32_t
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/aarch64/aarch64/vectors.S
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/aarch64/aarch64/vectors.S
diff -u src/sys/arch/aarch64/aarch64/vectors.S:1.24 src/sys/arch/aarch64/aarch64/vectors.S:1.25
--- src/sys/arch/aarch64/aarch64/vectors.S:1.24 Sat Sep 18 12:25:06 2021
+++ src/sys/arch/aarch64/aarch64/vectors.S Fri May 6 05:14:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vectors.S,v 1.24 2021/09/18 12:25:06 jmcneill Exp $ */
+/* $NetBSD: vectors.S,v 1.25 2022/05/06 05:14:38 ryo Exp $ */
#include
#include
@@ -11,7 +11,7 @@
#include "opt_dtrace.h"
#include "opt_gic.h"
-RCSID("$NetBSD: vectors.S,v 1.24 2021/09/18 12:25:06 jmcneill Exp $")
+RCSID("$NetBSD: vectors.S,v 1.25 2022/05/06 05:14:38 ryo Exp $")
ARMV8_DEFINE_OPTIONS
@@ -282,7 +282,7 @@ ENTRY_NP(el0_trap_exit)
cbz w8, 9f
/* curlwp->l_md.md_astpending = 0; */
- str xzr, [x9, #L_MD_ASTPENDING]
+ str wzr, [x9, #L_MD_ASTPENDING]
/* trap_doast(tf); */
ENABLE_INTERRUPT
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: ryo Date: Fri May 6 05:14:38 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: vectors.S Log Message: md_astpending is uint32_t To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/aarch64/aarch64/vectors.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gmon
Module Name:src Committed By: rin Date: Fri May 6 04:49:13 UTC 2022 Modified Files: src/lib/libc/gmon: gmon.c Log Message: PR lib/56395 PR toolchain/56771 Fix profiling on CPUs that do not support unaligned memory access; Allocate objects (referenced from struct gmonparam) with proper alignments. For monstartup(), objects are allocated on heap. Break is not guaranteed to be aligned at all, unlike stack pointer. For _m_gmon_alloc(), objects are allocated on anonymous memory. p->tos is not aligned properly in general. This fixes quasi-random crashes for *_profile tests, at least on SH-4 and PowerPC 403 [1]. Also, no regression is observed for others as far as I can see. This change does not cause any ABI breakage, as long as application uses proper pointers; use p->tos instead of evil pointer arithmetic like (struct tostruct *)((char *)p->froms + p->fromssize) [2]. [1] Timeout should be increased for some tests. "pic" variants still fail as expected. Dynamically-linked binaries also crash in rtld for SH-4, but this seems different problem... [2] This example did not work even before, since the order of froms[] and tos[] is reversed depending on which of monstartup() or _m_gmon_alloc() is used for allocation. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/lib/libc/gmon/gmon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gmon
Module Name:src
Committed By: rin
Date: Fri May 6 04:49:13 UTC 2022
Modified Files:
src/lib/libc/gmon: gmon.c
Log Message:
PR lib/56395
PR toolchain/56771
Fix profiling on CPUs that do not support unaligned memory access;
Allocate objects (referenced from struct gmonparam) with proper
alignments.
For monstartup(), objects are allocated on heap. Break is not
guaranteed to be aligned at all, unlike stack pointer.
For _m_gmon_alloc(), objects are allocated on anonymous memory.
p->tos is not aligned properly in general.
This fixes quasi-random crashes for *_profile tests, at least on
SH-4 and PowerPC 403 [1]. Also, no regression is observed for
others as far as I can see.
This change does not cause any ABI breakage, as long as application
uses proper pointers; use p->tos instead of evil pointer arithmetic
like (struct tostruct *)((char *)p->froms + p->fromssize) [2].
[1] Timeout should be increased for some tests. "pic" variants
still fail as expected. Dynamically-linked binaries also crash in
rtld for SH-4, but this seems different problem...
[2] This example did not work even before, since the order of
froms[] and tos[] is reversed depending on which of monstartup() or
_m_gmon_alloc() is used for allocation.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/lib/libc/gmon/gmon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gmon/gmon.c
diff -u src/lib/libc/gmon/gmon.c:1.36 src/lib/libc/gmon/gmon.c:1.37
--- src/lib/libc/gmon/gmon.c:1.36 Sat Jul 3 14:08:55 2021
+++ src/lib/libc/gmon/gmon.c Fri May 6 04:49:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gmon.c,v 1.36 2021/07/03 14:08:55 christos Exp $ */
+/* $NetBSD: gmon.c,v 1.37 2022/05/06 04:49:13 rin Exp $ */
/*
* Copyright (c) 2003, 2004 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
#if 0
static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: gmon.c,v 1.36 2021/07/03 14:08:55 christos Exp $");
+__RCSID("$NetBSD: gmon.c,v 1.37 2022/05/06 04:49:13 rin Exp $");
#endif
#endif
@@ -141,21 +141,25 @@ monstartup(u_long lowpc, u_long highpc)
p->tolimit = MAXARCS;
p->tossize = p->tolimit * sizeof(struct tostruct);
- cp = sbrk((intptr_t)(p->kcountsize + p->fromssize + p->tossize));
- if (cp == (char *)-1) {
+ cp = sbrk((intptr_t)0);
+
+#define GMON_ALLOC(buf, ptr, size) \
+do {\
+ (buf) = (void *)roundup((uintptr_t)(buf), __alignof(*(ptr))); \
+ (ptr) = (void *)(buf); \
+ (buf) += (size); \
+} while (0)
+
+ GMON_ALLOC(cp, p->kcount, p->kcountsize);
+ GMON_ALLOC(cp, p->froms, p->fromssize);
+ GMON_ALLOC(cp, p->tos, p->tossize);
+
+ if (brk(cp)) {
warnx("%s: out of memory", __func__);
return;
}
-#ifdef notdef
- (void)memset(cp, 0, p->kcountsize + p->fromssize + p->tossize);
-#endif
- p->tos = (struct tostruct *)(void *)cp;
- cp += (size_t)p->tossize;
- p->kcount = (u_short *)(void *)cp;
- cp += (size_t)p->kcountsize;
- p->froms = (u_short *)(void *)cp;
+ __minbrk = cp;
- __minbrk = sbrk((intptr_t)0);
p->tos[0].link = 0;
o = p->highpc - p->lowpc;
@@ -226,17 +230,22 @@ _m_gmon_alloc(void)
} else {
mutex_unlock(&_gmonlock);
cp = mmap(NULL,
- (size_t)(sizeof (struct gmonparam) +
- _gmonparam.fromssize + _gmonparam.tossize),
+ (size_t)(__alignof(*p) + sizeof(*p) +
+ __alignof(*_gmonparam.froms) + _gmonparam.fromssize +
+ __alignof(*_gmonparam.tos) + _gmonparam.tossize),
PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, (off_t)0);
- p = (void *)cp;
+
+ GMON_ALLOC(cp, p, sizeof(*p));
*p = _gmonparam;
p->state = GMON_PROF_ON;
p->kcount = NULL;
- cp += sizeof (struct gmonparam);
- memset(cp, 0, (size_t)(p->fromssize + p->tossize));
- p->froms = (u_short *)(void *)cp;
- p->tos = (struct tostruct *)(void *)(cp + p->fromssize);
+
+ GMON_ALLOC(cp, p->froms, p->fromssize);
+ memset(p->froms, 0, p->fromssize);
+
+ GMON_ALLOC(cp, p->tos, p->tossize);
+ memset(p->tos, 0, p->tossize);
+
mutex_lock(&_gmonlock);
p->kcount = (u_short *)(void *)_gmoninuse;
_gmoninuse = p;
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Thu May 5 22:02:17 UTC 2022 Modified Files: src/lib/libcurses: background.c Log Message: Don't force the refresh, it doesn't really need it. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libcurses/background.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Thu May 5 22:02:17 UTC 2022
Modified Files:
src/lib/libcurses: background.c
Log Message:
Don't force the refresh, it doesn't really need it.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libcurses/background.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/background.c
diff -u src/lib/libcurses/background.c:1.31 src/lib/libcurses/background.c:1.32
--- src/lib/libcurses/background.c:1.31 Tue May 3 07:25:34 2022
+++ src/lib/libcurses/background.c Thu May 5 22:02:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: background.c,v 1.31 2022/05/03 07:25:34 blymn Exp $ */
+/* $NetBSD: background.c,v 1.32 2022/05/05 22:02:17 blymn Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: background.c,v 1.31 2022/05/03 07:25:34 blymn Exp $");
+__RCSID("$NetBSD: background.c,v 1.32 2022/05/05 22:02:17 blymn Exp $");
#endif/* not lint */
#include
@@ -245,7 +245,7 @@ wbkgrndset(WINDOW *win, const cchar_t *w
}
}
}
- __touchwin(win, 1);
+ __touchwin(win, 0);
}
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Thu May 5 15:26:11 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm: Match the default ctwm theme. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.5 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.6 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.5 Mon Oct 26 16:24:09 2020 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Thu May 5 15:26:11 2022 @@ -1,5 +1,3 @@ -Xcursor.theme: whiteglass - xlogin*login.translations: #override BS CtrlR: abort-display()NLBS F1: set-session-argument(failsafe) finish-field()NLBS @@ -18,84 +16,63 @@ xlogin*namePrompt: \040\040\040\040\040\ xlogin*fail: Login incorrect or forbidden by policy XHASHif WIDTH > 800 -xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1 -xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*greetFace: Sans-24 -xlogin*face: Sans-14 -xlogin*promptFace: Sans-14:bold -xlogin*failFace: Sans-14:bold +xlogin*greetFont: -*-spleen-*-*-*-*-32-*-*-*-*-*-*-* +xlogin*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*promptFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*failFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*greetFace: Liberation Sans:pixelsize=32:hintstyle=hintslight +xlogin*face: Liberation Mono:pixelsize=16:hintstyle=hintslight +xlogin*promptFace: Liberation Mono:pixelsize=16:hintstyle=hintslight +xlogin*failFace: Liberation Mono:pixelsize=16:hintstyle=hintslight XHASHelse -xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 -xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 -xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 -xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 -xlogin*greetFace: Sans-18 -xlogin*face: Sans-12 -xlogin*promptFace: Sans-12:bold -xlogin*failFace: Sans-14:bold +xlogin*greetFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*promptFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*failFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*greetFace: Liberation Sans:pixelsize=16:hintstyle=hintslight +xlogin*face: Libreation Mono:pixelsize=16:hintstyle=hintslight +xlogin*face: Libreation Mono:pixelsize=16:hintstyle=hintslight +xlogin*promptFace: Libreation Mono:pixelsize=16:hintstyle=hintslight +xlogin*failFace: Libreation Mono:pixelsize=16:hintstyle=hintslight XHASHendif -XHASHifdef COLOR -xlogin*borderWidth: 1 -xlogin*frameWidth: 5 +xlogin*borderWidth: 2 +xlogin*frameWidth: 2 xlogin*innerFramesWidth: 2 -xlogin*shdColor: grey30 -xlogin*hiColor: grey90 -xlogin*background: grey -xlogin*inpColor: grey -!xlogin*foreground: darkgreen -xlogin*greetColor: Blue3 -xlogin*failColor: red -*Foreground: black -*Background: #f0 +xlogin*sepWidth: 0 + +XHASHifdef COLOR +xlogin*shdColor: steelblue +xlogin*hiColor: steelblue +xlogin*background: white +xlogin*inpColor: lavender +xlogin*greetColor: black +xlogin*failColor: darkred XHASHelse -xlogin*borderWidth: 3 -xlogin*frameWidth: 0 -xlogin*innerFramesWidth: 1 xlogin*shdColor: black xlogin*hiColor: black +xlogin*background: white +xlogin*inpColor: white +xlogin*greetColor: black +xlogin*failColor: black XHASHendif -#ifdef XPM -XHASHif PLANES >= 8 -XHASHif 1 -! XDM has no support for images with alpha channel, so we precomputed a -! NetBSD logo with fixed background and use it here. If you change this -! file to use another background colour, you need to create a new logo -! xpm file. This can be done with netpbm from pkgsrc: -! -! pngtopnm -mix -background grey NetBSD-flag.png | pnmtoxpm > NetBSD-flag.xpm -! -! (all files in BITMAPDIR) -! -xlogin*logoFileName: BITMAPDIR/**//NetBSD-flag1.xpm -xlogin*useShape: false -XHASHelse -! -! This is the stock method, using a coloured xpm file and a b mask xpm. -! Antialiased borders look ugly this way, but it works with arbitrary -! background colours. -! + +*Foreground: black +*Background: white + xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP xlogin*useShape: true -XHASHendif -XHASHelse -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP -xlogin*useShape: true -XHASHendif -xlogin*logoPadding: 10 -#endif /* XPM */ +xlogin*logoPadding: 12 XConsole.text.geometry: 480x130 XConsole.verbose: true XConsole*iconic: true -XConsole*font: fixed +XConsole*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* Chooser*geometry: 700x500+300+200
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Thu May 5 15:26:11 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm: Match the default ctwm theme. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu May 5 09:14:17 UTC 2022
Modified Files:
src/sys/dev/pci: mfii.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/mfii.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/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.9 src/sys/dev/pci/mfii.c:1.10
--- src/sys/dev/pci/mfii.c:1.9 Sat Aug 7 16:19:14 2021
+++ src/sys/dev/pci/mfii.c Thu May 5 09:14:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.9 2021/08/07 16:19:14 thorpej Exp $ */
+/* $NetBSD: mfii.c,v 1.10 2022/05/05 09:14:17 msaitoh 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.9 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.10 2022/05/05 09:14:17 msaitoh Exp $");
#include "bio.h"
@@ -198,8 +198,8 @@ struct mfii_task_mgmt {
/* We currently don't know the full details of the following struct */
struct mfii_foreign_scan_cfg {
-char data[24];
-} __packed;
+ char data[24];
+} __packed;
struct mfii_foreign_scan_info {
uint32_t count; /* Number of foreign configs found */
@@ -373,7 +373,7 @@ struct mfii_softc {
uint32_t mfii_debug = 0
/* | MFII_D_CMD */
/* | MFII_D_INTR */
- | MFII_D_MISC
+ | MFII_D_MISC
/* | MFII_D_DMA */
/* | MFII_D_IOCTL */
/* | MFII_D_RW */
@@ -1008,7 +1008,7 @@ mfii_childdetached(device_t self, device
sc->sc_child = NULL;
}
-static bool
+static bool
mfii_suspend(device_t dev, const pmf_qual_t *q)
{
/* XXX to be implemented */
@@ -1017,11 +1017,11 @@ mfii_suspend(device_t dev, const pmf_qua
static bool
mfii_resume(device_t dev, const pmf_qual_t *q)
-{
+{
/* XXX to be implemented */
return false;
}
-
+
static bool
mfii_shutdown(device_t dev, int how)
{
@@ -1058,7 +1058,7 @@ mfii_shutdown(device_t dev, int how)
NULL, 0, MFII_DATA_NONE, true)) {
aprint_error_dev(dev, "shutdown: "
"firmware shutdown failed\n");
- rv = false;
+ rv = false;
goto fail;
}
} else {
@@ -1268,13 +1268,13 @@ mfii_aen(struct work *wk, void *arg)
case MR_EVT_PD_INSERTED_EXT:
if (med->med_arg_type != MR_EVT_ARGS_PD_ADDRESS)
break;
-
+
mfii_aen_pd_insert(sc, >args.pd_address);
break;
- case MR_EVT_PD_REMOVED_EXT:
+ case MR_EVT_PD_REMOVED_EXT:
if (med->med_arg_type != MR_EVT_ARGS_PD_ADDRESS)
break;
-
+
mfii_aen_pd_remove(sc, >args.pd_address);
break;
@@ -1348,7 +1348,7 @@ mfii_aen_ld_update(struct mfii_softc *sc
for (i = 0; i < MFI_MAX_LD; i++) {
old = sc->sc_target_lds[i];
nld = newlds[i];
-
+
if (old == -1 && nld != -1) {
printf("%s: logical drive %d added (target %d)\n",
DEVNAME(sc), i, nld);
@@ -1932,9 +1932,9 @@ mfii_initialise_firmware(struct mfii_sof
iiq->reply_descriptor_post_queue_address_hi =
htole32(MFII_DMA_DVA(sc->sc_reply_postq) >> 32);
- iiq->system_request_frame_base_address_lo =
+ iiq->system_request_frame_base_address_lo =
htole32(MFII_DMA_DVA(sc->sc_requests));
- iiq->system_request_frame_base_address_hi =
+ iiq->system_request_frame_base_address_hi =
htole32(MFII_DMA_DVA(sc->sc_requests) >> 32);
iiq->timestamp = htole64(time_uptime);
@@ -2016,7 +2016,7 @@ mfii_postq(struct mfii_softc *sc)
for (;;) {
rdp = [sc->sc_reply_postq_index];
- DNPRINTF(MFII_D_INTR, "%s: mfii_postq index %d flags 0x%x data 0x%x\n",
+ DNPRINTF(MFII_D_INTR, "%s: mfii_postq index %d flags 0x%x data 0x%x\n",
DEVNAME(sc), sc->sc_reply_postq_index, rdp->reply_flags,
rdp->data == 0x);
if ((rdp->reply_flags & MPII_REPLY_DESCR_TYPE_MASK) ==
@@ -2056,7 +2056,7 @@ mfii_postq(struct mfii_softc *sc)
static void
mfii_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req,
-void *arg)
+void *arg)
{
struct scsipi_periph*periph;
struct scsipi_xfer *xs;
@@ -2066,7 +2066,7 @@ mfii_scsipi_request(struct scsipi_channe
int timeout;
int target;
- switch(req) {
+ switch (req) {
case ADAPTER_REQ_GROW_RESOURCES:
/* Not supported. */
return;
@@ -2910,7 +2910,7 @@ mfii_ioctl_vol(struct mfii_softc *sc, st
strlcpy(bv->bv_dev, sc->sc_ld_details[i].mld_cfg.mlc_prop.mlp_name,
sizeof(bv->bv_dev));
- switch(sc->sc_ld_list.mll_list[i].mll_state) {
+ switch (sc->sc_ld_list.mll_list[i].mll_state) {
case MFI_LD_OFFLINE:
bv->bv_status = BIOC_SVOFFLINE;
break;
@@ -3135,7 +3135,7 @@ mfii_ioctl_alarm(struct mfii_softc *sc,
int8_t ret;
mfii_direction_t dir = MFII_DATA_NONE;
- switch(ba->ba_opcode) {
+ switch (ba->ba_opcode) {
case BIOC_SADISABLE:
opc = MR_DCMD_SPEAKER_DISABLE;
break;
@@ -3714,7 +3714,7 @@ mfii_bbu(struct mfii_softc *sc, envsys_d
}
status = le32toh(bbu.fw_status) & mask;
-
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu May 5 09:14:17 UTC 2022 Modified Files: src/sys/dev/pci: mfii.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/mfii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Thu May 5 08:07:03 UTC 2022 Modified Files: src/share/man/man4: mfi.4 Log Message: Add some supported devices. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/mfi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Thu May 5 08:07:03 UTC 2022 Modified Files: src/share/man/man4: mfi.4 Log Message: Add some supported devices. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/mfi.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/mfi.4 diff -u src/share/man/man4/mfi.4:1.12 src/share/man/man4/mfi.4:1.13 --- src/share/man/man4/mfi.4:1.12 Mon Jul 3 21:30:58 2017 +++ src/share/man/man4/mfi.4 Thu May 5 08:07:03 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: mfi.4,v 1.12 2017/07/03 21:30:58 wiz Exp $ +.\" $NetBSD: mfi.4,v 1.13 2022/05/05 08:07:03 msaitoh Exp $ .\" $OpenBSD: mfi.4,v 1.7 2006/09/01 09:58:09 jmc Exp $ .\" .\" Written by Marco Peereboom @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 22, 2012 +.Dd May 5, 2022 .Dt MFI 4 .Os .Sh NAME @@ -43,7 +43,10 @@ including: Dell PERC 5/e, PERC 5/i, PERC 6/e, -PERC 6/i +PERC 6/i, +PERC H310, +PERC H700, +PERC H800 .It Intel RAID Controller SRCSAS18E, SRCSAS144E @@ -56,9 +59,11 @@ MegaRAID SAS 8344ELP, MegaRAID SAS 8408E, MegaRAID SAS 8480E, MegaRAID SAS 8708ELP, -MegaRAID SAS ELP, MegaRAID SAS 8880EM2, -MegaRAID SAS 9260-8i +MegaRAID SAS ELP, +MegaRAID SAS 9260-8i, +MegaRAID SAS 9261-8i, +MegaRAID SAS 9265-8i .It IBM ServeRAID M1015, ServeRAID M5014
CVS commit: src/sbin/restore
Module Name:src
Committed By: mrg
Date: Thu May 5 07:45:43 UTC 2022
Modified Files:
src/sbin/restore: tape.c
Log Message:
include the filename in the panic message for missing data.
instead of merely seeing:
getfile: lost data
now this is seen:
getfile: lost data: ./usr/libdata/debug/usr/libexec/cc1.debug
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sbin/restore/tape.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/restore/tape.c
diff -u src/sbin/restore/tape.c:1.71 src/sbin/restore/tape.c:1.72
--- src/sbin/restore/tape.c:1.71 Sat Jun 19 13:56:35 2021
+++ src/sbin/restore/tape.c Thu May 5 07:45:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tape.c,v 1.71 2021/06/19 13:56:35 christos Exp $ */
+/* $NetBSD: tape.c,v 1.72 2022/05/05 07:45:43 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)tape.c 8.9 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: tape.c,v 1.71 2021/06/19 13:56:35 christos Exp $");
+__RCSID("$NetBSD: tape.c,v 1.72 2022/05/05 07:45:43 mrg Exp $");
#endif
#endif /* not lint */
@@ -1122,7 +1122,7 @@ loop:
curfile.name, blksread);
}
if (curblk > 0)
- panic("getfile: lost data\n");
+ panic("getfile: lost data: %s\n", curfile.name);
/* Skip over Linux extended attributes. */
if (spcl.c_type == TS_INODE && (spcl.c_flags & DR_EXTATTRIBUTES)) {
for (i = 0; i < spcl.c_count; i++)
CVS commit: src/sbin/restore
Module Name:src Committed By: mrg Date: Thu May 5 07:45:43 UTC 2022 Modified Files: src/sbin/restore: tape.c Log Message: include the filename in the panic message for missing data. instead of merely seeing: getfile: lost data now this is seen: getfile: lost data: ./usr/libdata/debug/usr/libexec/cc1.debug To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sbin/restore/tape.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Thu May 5 07:18:03 UTC 2022
Modified Files:
src/sys/dev/ic: mfi.c mfireg.h
src/sys/dev/pci: mfi_pci.c
Log Message:
Add some code for the SKINNY variant to make Dell PERC H310 work.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/mfi_pci.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/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.68 src/sys/dev/ic/mfi.c:1.69
--- src/sys/dev/ic/mfi.c:1.68 Sat Apr 16 18:15:21 2022
+++ src/sys/dev/ic/mfi.c Thu May 5 07:18:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.68 2022/04/16 18:15:21 andvar Exp $ */
+/* $NetBSD: mfi.c,v 1.69 2022/05/05 07:18:02 msaitoh Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.68 2022/04/16 18:15:21 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.69 2022/05/05 07:18:02 msaitoh Exp $");
#include "bio.h"
@@ -582,7 +582,7 @@ mfi_transition_firmware(struct mfi_softc
case MFI_STATE_OPERATIONAL:
if (sc->sc_ioptype == MFI_IOP_SKINNY ||
sc->sc_ioptype == MFI_IOP_TBOLT)
-mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_READY);
+mfi_write(sc, MFI_SKINNY_IDB, MFI_RESET_FLAGS);
else
mfi_write(sc, MFI_IDB, MFI_INIT_READY);
max_wait = 10;
@@ -1059,6 +1059,8 @@ mfi_attach(struct mfi_softc *sc, enum mf
sc->sc_max_sgl = max_sgl;
sc->sc_sgl_size = sizeof(struct mfi_sg32);
}
+ if (sc->sc_ioptype == MFI_IOP_SKINNY)
+ sc->sc_sgl_size = sizeof(struct mfi_sg_ieee);
DNPRINTF(MFI_D_MISC, "%s: max commands: %u, max sgl: %u\n",
DEVNAME(sc), sc->sc_max_cmds, sc->sc_max_sgl);
@@ -1779,7 +1781,8 @@ mfi_create_sgl(struct mfi_ccb *ccb, int
sgl = ccb->ccb_sgl;
sgd = ccb->ccb_dmamap->dm_segs;
for (i = 0; i < ccb->ccb_dmamap->dm_nsegs; i++) {
- if (sc->sc_ioptype == MFI_IOP_TBOLT &&
+ if (((sc->sc_ioptype == MFI_IOP_SKINNY) ||
+ (sc->sc_ioptype == MFI_IOP_TBOLT)) &&
(hdr->mfh_cmd == MFI_CMD_PD_SCSI_IO ||
hdr->mfh_cmd == MFI_CMD_LD_READ ||
hdr->mfh_cmd == MFI_CMD_LD_WRITE)) {
Index: src/sys/dev/ic/mfireg.h
diff -u src/sys/dev/ic/mfireg.h:1.14 src/sys/dev/ic/mfireg.h:1.15
--- src/sys/dev/ic/mfireg.h:1.14 Wed Mar 23 11:08:27 2022
+++ src/sys/dev/ic/mfireg.h Thu May 5 07:18:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfireg.h,v 1.14 2022/03/23 11:08:27 andvar Exp $ */
+/* $NetBSD: mfireg.h,v 1.15 2022/05/05 07:18:02 msaitoh Exp $ */
/* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom
@@ -125,11 +125,12 @@
#define MFI_STATE_TB_FAULT 0x4000
/* command reset register */
-#define MFI_INIT_ABORT 0x
+#define MFI_INIT_ABORT 0x0001
#define MFI_INIT_READY 0x0002
#define MFI_INIT_MFIMODE 0x0004
#define MFI_INIT_CLEAR_HANDSHAKE 0x0008
-#define MFI_RESET_FLAGS MFI_INIT_READY|MFI_INIT_MFIMODE
+#define MFI_RESET_FLAGS MFI_INIT_READY | MFI_INIT_MFIMODE | \
+ MFI_INIT_ABORT
#define MFI_INIT_HOTPLUG 0x0010
/* ADP reset flags */
Index: src/sys/dev/pci/mfi_pci.c
diff -u src/sys/dev/pci/mfi_pci.c:1.20 src/sys/dev/pci/mfi_pci.c:1.21
--- src/sys/dev/pci/mfi_pci.c:1.20 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/mfi_pci.c Thu May 5 07:18:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.21 2022/05/05 07:18:03 msaitoh Exp $ */
/* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom
@@ -17,7 +17,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.21 2022/05/05 07:18:03 msaitoh Exp $");
#include
#include
@@ -99,6 +99,7 @@ static const struct mfi_pci_subtype mfi_
static const struct mfi_pci_subtype mfi_skinny_subtypes[] = {
{ PCI_VENDOR_IBM, 0x03b1, "IBM ServeRAID M1015 SAS/SATA" },
+ { PCI_VENDOR_DELL, 0x1f78, "Dell PERC H310" },
{ 0x0, 0, "" }
};
CVS commit: src/sys/dev
Module Name:src Committed By: msaitoh Date: Thu May 5 07:18:03 UTC 2022 Modified Files: src/sys/dev/ic: mfi.c mfireg.h src/sys/dev/pci: mfi_pci.c Log Message: Add some code for the SKINNY variant to make Dell PERC H310 work. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/mfi.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/mfireg.h cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/mfi_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
