CVS commit: src/sys/dev/wsfb
Module Name:src
Committed By: riastradh
Date: Mon Aug 1 23:30:10 UTC 2022
Modified Files:
src/sys/dev/wsfb: genfb.c
Log Message:
genfb: Handle uninitialized softc in genfb_enable/disable_polling.
This can happen due to janky MD kludgerosity like x86
x86_genfb_ddb_trap_callback, which should really be cleaned up, but
at least this might help with the recursive traps we've been seeing
in syzbot.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.89 src/sys/dev/wsfb/genfb.c:1.90
--- src/sys/dev/wsfb/genfb.c:1.89 Sun Jul 17 13:10:54 2022
+++ src/sys/dev/wsfb/genfb.c Mon Aug 1 23:30:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.89 2022/07/17 13:10:54 riastradh Exp $ */
+/* $NetBSD: genfb.c,v 1.90 2022/08/01 23:30:10 riastradh Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.89 2022/07/17 13:10:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.90 2022/08/01 23:30:10 riastradh Exp $");
#include
#include
@@ -985,6 +985,9 @@ genfb_enable_polling(device_t dev)
struct genfb_softc *sc = device_private(dev);
struct genfb_private *scp = sc->sc_private;
+ if (scp == NULL)
+ return;
+
if (scp->sc_console_screen.scr_vd) {
SCREEN_ENABLE_DRAWING(>sc_console_screen);
vcons_hard_switch(>sc_console_screen);
@@ -1000,6 +1003,9 @@ genfb_disable_polling(device_t dev)
struct genfb_softc *sc = device_private(dev);
struct genfb_private *scp = sc->sc_private;
+ if (scp == NULL)
+ return;
+
if (scp->sc_console_screen.scr_vd) {
if (scp->sc_ops.genfb_disable_polling)
(*scp->sc_ops.genfb_disable_polling)(sc);
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: riastradh Date: Mon Aug 1 23:30:10 UTC 2022 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: genfb: Handle uninitialized softc in genfb_enable/disable_polling. This can happen due to janky MD kludgerosity like x86 x86_genfb_ddb_trap_callback, which should really be cleaned up, but at least this might help with the recursive traps we've been seeing in syzbot. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-savage/dist/src
Module Name:xsrc
Committed By: macallan
Date: Mon Aug 1 22:23:35 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.c
Log Message:
more xf86SetModeDefaultName( after xf86CVTMode()
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.3 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.4
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c:1.3 Mon Dec 31 22:17:21 2018
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c Mon Aug 1 22:23:35 2022
@@ -948,6 +948,7 @@ SavageAddPanelMode(ScrnInfoPtr pScrn)
Mode = xf86CVTMode(psav->PanelX, psav->PanelY, 60.00, TRUE, FALSE);
Mode->type = M_T_DRIVER | M_T_PREFERRED;
+xf86SetModeDefaultName(Mode);
pScrn->monitor->Modes = SavageModesAdd(pScrn->monitor->Modes, Mode);
if ((pScrn->monitor->nHsync == 0) &&
@@ -1042,6 +1043,7 @@ static void SavageGetPanelInfo(ScrnInfoP
DisplayModePtr native = xf86CVTMode(panelX, panelY, 60.0, 0, 0);
if (!native)
break;
+ xf86SetModeDefaultName(native);
if (!pScrn->monitor->nHsync) {
pScrn->monitor->nHsync = 1;
CVS commit: xsrc/external/mit/xf86-video-savage/dist/src
Module Name:xsrc Committed By: macallan Date: Mon Aug 1 22:23:35 UTC 2022 Modified Files: xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.c Log Message: more xf86SetModeDefaultName( after xf86CVTMode() To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src
Module Name:xsrc Committed By: macallan Date: Mon Aug 1 22:21:58 UTC 2022 Modified Files: xsrc/external/mit/xf86-video-openchrome/dist/src: via_fp.c Log Message: more xf86SetModeDefaultName( after xf86CVTMode() To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_fp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-openchrome/dist/src
Module Name:xsrc
Committed By: macallan
Date: Mon Aug 1 22:21:58 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_fp.c
Log Message:
more xf86SetModeDefaultName( after xf86CVTMode()
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_fp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_fp.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_fp.c:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_fp.c:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_fp.c:1.1.1.1 Tue Aug 29 04:37:06 2017
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_fp.c Mon Aug 1 22:21:58 2022
@@ -1359,6 +1359,7 @@ via_lvds_get_modes(xf86OutputPtr output)
} else {
pDisplay_Mode = xf86CVTMode(pPanel->NativeWidth, pPanel->NativeHeight,
60.0f, FALSE, FALSE);
+xf86SetModeDefaultName(pDisplay_Mode);
}
if (pDisplay_Mode) {
CVS commit: xsrc/external/mit/xf86-video-nouveau/dist/src
Module Name:xsrc
Committed By: macallan
Date: Mon Aug 1 22:19:41 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: nv_driver.c
Log Message:
more xf86SetModeDefaultName( after xf86CVTMode()
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.4 xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.5
--- xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c:1.4 Tue Apr 27 01:22:55 2021
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c Mon Aug 1 22:19:41 2022
@@ -1227,10 +1227,13 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
nouveau_setup_capabilities(pScrn);
if (!pScrn->modes) {
- pScrn->modes = xf86ModesAdd(pScrn->modes,
- xf86CVTMode(pScrn->display->virtualX,
+ DisplayModePtr m;
+
+ m = xf86CVTMode(pScrn->display->virtualX,
pScrn->display->virtualY,
-60, 0, 0));
+60, 0, 0);
+ xf86SetModeDefaultName(m);
+ pScrn->modes = xf86ModesAdd(pScrn->modes, m);
}
/* Set the current mode to the first in the list */
CVS commit: xsrc/external/mit/xf86-video-nouveau/dist/src
Module Name:xsrc Committed By: macallan Date: Mon Aug 1 22:19:41 UTC 2022 Modified Files: xsrc/external/mit/xf86-video-nouveau/dist/src: nv_driver.c Log Message: more xf86SetModeDefaultName( after xf86CVTMode() To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/dist/src
Module Name:xsrc Committed By: macallan Date: Mon Aug 1 22:17:27 UTC 2022 Modified Files: xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi_output.c Log Message: more xf86SetModeDefaultName( after xf86CVTMode() To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/dist/src
Module Name:xsrc
Committed By: macallan
Date: Mon Aug 1 22:17:27 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi_output.c
Log Message:
more xf86SetModeDefaultName( after xf86CVTMode()
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c:1.1.1.2 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c:1.2
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c:1.1.1.2 Sat Jul 23 08:12:10 2011
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c Mon Aug 1 22:17:27 2022
@@ -142,10 +142,13 @@ DisplayModePtr
SMI_OutputGetModes_native(xf86OutputPtr output)
{
SMIPtr pSmi = SMIPTR(output->scrn);
+DisplayModePtr m;
ENTER();
#ifdef HAVE_XMODES
-LEAVE(xf86CVTMode(pSmi->lcdWidth, pSmi->lcdHeight, 60.0f, FALSE, FALSE));
+m = xf86CVTMode(pSmi->lcdWidth, pSmi->lcdHeight, 60.0f, FALSE, FALSE);
+xf86SetModeDefaultName(m);
+LEAVE(m);
#else
LEAVE(NULL);
#endif
Re: CVS commit: src/tests/lib/libc/sys
Date:Mon, 1 Aug 2022 18:55:15 +0300 From:Valery Ushakov Message-ID: | The test uses __clone(), not clone() and a followup fix made __clone() | visible under plain _NETBSD_SOURCE again - which is the right thing, | IMO. So this change is not necessary (the test only uses __clone()). Yes, I saw, but the test really should be using clone() - that"s the thing which needs to work (for those odd apps which use it). kre
Re: CVS commit: src/tests/lib/libc/sys
On Mon, Aug 01, 2022 at 15:48:40 +, Robert Elz wrote: > Module Name: src > Committed By: kre > Date: Mon Aug 1 15:48:40 UTC 2022 > > Modified Files: > src/tests/lib/libc/sys: Makefile > > Log Message: > Provide _GNU_SOURCE for t_clone now that is required to make clone() > visible. The test uses __clone(), not clone() and a followup fix made __clone() visible under plain _NETBSD_SOURCE again - which is the right thing, IMO. So this change is not necessary (the test only uses __clone()). -uwe
Re: CVS commit: src/sys/dev/ic
Oops, never mind, I hadn't yet seen the follow-up revert. > On Aug 1, 2022, at 8:29 AM, Jason Thorpe wrote: > > > >> On Aug 1, 2022, at 12:34 AM, Michael van Elst wrote: >> >> Module Name: src >> Committed By: mlelstv >> Date: Mon Aug 1 07:34:28 UTC 2022 >> >> Modified Files: >> src/sys/dev/ic: ahcisata_core.c bcmgenet.c nslm7x.c nvmereg.h nvmevar.h >> rtl8169.c tulip.c tulipreg.h >> >> Log Message: >> Also fix shift values for SCT constants. > > ??? > > diff -u src/sys/dev/ic/tulip.c:1.205 src/sys/dev/ic/tulip.c:1.206 > --- src/sys/dev/ic/tulip.c:1.205Sat Jun 25 02:46:15 2022 > +++ src/sys/dev/ic/tulip.c Mon Aug 1 07:34:28 2022 > @@ -1,4 +1,4 @@ > -/* $NetBSD: tulip.c,v 1.205 2022/06/25 02:46:15 tsutsui Exp $ */ > +/* $NetBSD: tulip.c,v 1.206 2022/08/01 07:34:28 mlelstv Exp $ */ > > /*- > * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. > @@ -36,7 +36,7 @@ > */ > > #include > -__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.205 2022/06/25 02:46:15 tsutsui Exp > $"); > +__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.206 2022/08/01 07:34:28 mlelstv Exp > $"); > > > #include > @@ -4394,7 +4394,7 @@ > */ > >/* XXX This should be auto-sense. */ > - ifmedia_set(>mii_media, IFM_ETHER | IFM_10_T); > + ifmedia_set(>mii_media, IFM_ETHER | IFM_10_5); > >tlp_print_media(sc); > } > > >> >> >> To generate a diff of this commit: >> cvs rdiff -u -r1.105 -r1.106 src/sys/dev/ic/ahcisata_core.c >> cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/bcmgenet.c >> cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/nslm7x.c >> cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/nvmereg.h >> cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/nvmevar.h >> cvs rdiff -u -r1.172 -r1.173 src/sys/dev/ic/rtl8169.c >> cvs rdiff -u -r1.205 -r1.206 src/sys/dev/ic/tulip.c >> cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/tulipreg.h >> >> Please note that diffs are not public domain; they are subject to the >> copyright notices on the relevant files. >> > > -- thorpej -- thorpej
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kre
Date: Mon Aug 1 15:48:40 UTC 2022
Modified Files:
src/tests/lib/libc/sys: Makefile
Log Message:
Provide _GNU_SOURCE for t_clone now that is required to make clone()
visible.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/tests/lib/libc/sys/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.71 src/tests/lib/libc/sys/Makefile:1.72
--- src/tests/lib/libc/sys/Makefile:1.71 Wed Apr 6 10:02:55 2022
+++ src/tests/lib/libc/sys/Makefile Mon Aug 1 15:48:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2022/04/06 10:02:55 gson Exp $
+# $NetBSD: Makefile,v 1.72 2022/08/01 15:48:39 kre Exp $
MKMAN= no
@@ -120,6 +120,7 @@ CPPFLAGS.t_futex_robust.c += -I${.CURDIR
CPPFLAGS.t_timerfd.c += -I${.CURDIR}/../gen
+CPPFLAGE.t_clone.c += -D_NETBSD_SOURCE -D_GNU_SOURCE
CPPFLAGS.t_lwp_create.c += -D_KERNTYPES
CPPFLAGS.t_ptrace_sigchld.c += -D__TEST_FENV
CPPFLAGS.t_ptrace_wait.c += -D_KERNTYPES -D__TEST_FENV
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kre Date: Mon Aug 1 15:48:40 UTC 2022 Modified Files: src/tests/lib/libc/sys: Makefile Log Message: Provide _GNU_SOURCE for t_clone now that is required to make clone() visible. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/tests/lib/libc/sys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/ic
> On Aug 1, 2022, at 12:34 AM, Michael van Elst wrote: > > Module Name: src > Committed By: mlelstv > Date: Mon Aug 1 07:34:28 UTC 2022 > > Modified Files: > src/sys/dev/ic: ahcisata_core.c bcmgenet.c nslm7x.c nvmereg.h nvmevar.h >rtl8169.c tulip.c tulipreg.h > > Log Message: > Also fix shift values for SCT constants. ??? diff -u src/sys/dev/ic/tulip.c:1.205 src/sys/dev/ic/tulip.c:1.206 --- src/sys/dev/ic/tulip.c:1.205Sat Jun 25 02:46:15 2022 +++ src/sys/dev/ic/tulip.c Mon Aug 1 07:34:28 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: tulip.c,v 1.205 2022/06/25 02:46:15 tsutsui Exp $ */ +/* $NetBSD: tulip.c,v 1.206 2022/08/01 07:34:28 mlelstv Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.205 2022/06/25 02:46:15 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.206 2022/08/01 07:34:28 mlelstv Exp $"); #include @@ -4394,7 +4394,7 @@ */ /* XXX This should be auto-sense. */ - ifmedia_set(>mii_media, IFM_ETHER | IFM_10_T); + ifmedia_set(>mii_media, IFM_ETHER | IFM_10_5); tlp_print_media(sc); } > > > To generate a diff of this commit: > cvs rdiff -u -r1.105 -r1.106 src/sys/dev/ic/ahcisata_core.c > cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/bcmgenet.c > cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/nslm7x.c > cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/nvmereg.h > cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/nvmevar.h > cvs rdiff -u -r1.172 -r1.173 src/sys/dev/ic/rtl8169.c > cvs rdiff -u -r1.205 -r1.206 src/sys/dev/ic/tulip.c > cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/tulipreg.h > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > -- thorpej
CVS commit: src/include
Module Name:src Committed By: wiz Date: Mon Aug 1 15:16:05 UTC 2022 Modified Files: src/include: sched.h Log Message: sched.h: keep __clone() visible under _NETBSD_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/include/sched.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/sched.h diff -u src/include/sched.h:1.14 src/include/sched.h:1.15 --- src/include/sched.h:1.14 Mon Aug 1 14:34:01 2022 +++ src/include/sched.h Mon Aug 1 15:16:05 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sched.h,v 1.14 2022/08/01 14:34:01 wiz Exp $ */ +/* $NetBSD: sched.h,v 1.15 2022/08/01 15:16:05 wiz Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -73,13 +73,17 @@ int sched_setaffinity_np(pid_t, size_t, /* * Historical functions, not defined in standard - * Linux man page documents these functions as only available when + * Linux man page documents clone() as only available when * _GNU_SOURCE is defined */ pid_t clone(int (*)(void *), void *, int, void *); +#endif /* _GNU_SOURCE */ + +#if defined(_NETBSD_SOURCE) + pid_t __clone(int (*)(void *), void *, int, void *); -#endif /* _GNU_SOURCE */ +#endif /* _NETBSD_SOURCE */ __END_DECLS
CVS commit: src/include
Module Name:src Committed By: wiz Date: Mon Aug 1 15:16:05 UTC 2022 Modified Files: src/include: sched.h Log Message: sched.h: keep __clone() visible under _NETBSD_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/include/sched.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mlelstv
Date: Mon Aug 1 14:44:15 UTC 2022
Modified Files:
src/sys/dev/ic: nslm7x.c
Log Message:
Prevent multiple unregistrations.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/nslm7x.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/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.76 src/sys/dev/ic/nslm7x.c:1.77
--- src/sys/dev/ic/nslm7x.c:1.76 Mon Aug 1 14:43:15 2022
+++ src/sys/dev/ic/nslm7x.c Mon Aug 1 14:44:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $ */
+/* $NetBSD: nslm7x.c,v 1.77 2022/08/01 14:44:15 mlelstv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.77 2022/08/01 14:44:15 mlelstv Exp $");
#include
#include
@@ -2247,6 +2247,7 @@ lm_attach(struct lm_softc *lmsc)
if ((rv = sysmon_envsys_sensor_attach(lmsc->sc_sme,
>sensors[i])) != 0) {
sysmon_envsys_destroy(lmsc->sc_sme);
+ lmsc->sc_sme = NULL;
aprint_error_dev(lmsc->sc_dev,
"sysmon_envsys_sensor_attach() returned %d\n", rv);
return;
@@ -2270,6 +2271,7 @@ lm_attach(struct lm_softc *lmsc)
aprint_error_dev(lmsc->sc_dev,
"unable to register with sysmon\n");
sysmon_envsys_destroy(lmsc->sc_sme);
+ lmsc->sc_sme = NULL;
}
if (!pmf_device_register(lmsc->sc_dev, NULL, NULL))
aprint_error_dev(lmsc->sc_dev,
@@ -2285,7 +2287,9 @@ lm_detach(struct lm_softc *lmsc)
{
callout_halt(>sc_callout, NULL);
callout_destroy(>sc_callout);
- sysmon_envsys_unregister(lmsc->sc_sme);
+
+ if (lmsc->sc_sme != NULL)
+ sysmon_envsys_unregister(lmsc->sc_sme);
pmf_device_deregister(lmsc->sc_dev);
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mlelstv Date: Mon Aug 1 14:44:15 UTC 2022 Modified Files: src/sys/dev/ic: nslm7x.c Log Message: Prevent multiple unregistrations. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/nslm7x.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/ic
Module Name:src
Committed By: mlelstv
Date: Mon Aug 1 14:43:15 UTC 2022
Modified Files:
src/sys/dev/ic: nslm7x.c
Log Message:
revert accidental commit.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ic/nslm7x.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/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.75 src/sys/dev/ic/nslm7x.c:1.76
--- src/sys/dev/ic/nslm7x.c:1.75 Mon Aug 1 07:34:28 2022
+++ src/sys/dev/ic/nslm7x.c Mon Aug 1 14:43:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.75 2022/08/01 07:34:28 mlelstv Exp $ */
+/* $NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.75 2022/08/01 07:34:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.76 2022/08/01 14:43:15 mlelstv Exp $");
#include
#include
@@ -2247,7 +2247,6 @@ lm_attach(struct lm_softc *lmsc)
if ((rv = sysmon_envsys_sensor_attach(lmsc->sc_sme,
>sensors[i])) != 0) {
sysmon_envsys_destroy(lmsc->sc_sme);
- lmsc->sc_sme = NULL;
aprint_error_dev(lmsc->sc_dev,
"sysmon_envsys_sensor_attach() returned %d\n", rv);
return;
@@ -2271,7 +2270,6 @@ lm_attach(struct lm_softc *lmsc)
aprint_error_dev(lmsc->sc_dev,
"unable to register with sysmon\n");
sysmon_envsys_destroy(lmsc->sc_sme);
- lmsc->sc_sme = NULL;
}
if (!pmf_device_register(lmsc->sc_dev, NULL, NULL))
aprint_error_dev(lmsc->sc_dev,
@@ -2287,9 +2285,7 @@ lm_detach(struct lm_softc *lmsc)
{
callout_halt(>sc_callout, NULL);
callout_destroy(>sc_callout);
-
- if (lmsc->sc_sme != NULL)
- sysmon_envsys_unregister(lmsc->sc_sme);
+ sysmon_envsys_unregister(lmsc->sc_sme);
pmf_device_deregister(lmsc->sc_dev);
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mlelstv Date: Mon Aug 1 14:43:15 UTC 2022 Modified Files: src/sys/dev/ic: nslm7x.c Log Message: revert accidental commit. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ic/nslm7x.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: wiz Date: Mon Aug 1 14:34:02 UTC 2022 Modified Files: src/include: sched.h Log Message: sched.h: format comment to follow KNF requested by thorpej@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/include/sched.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/sched.h diff -u src/include/sched.h:1.13 src/include/sched.h:1.14 --- src/include/sched.h:1.13 Mon Aug 1 14:19:40 2022 +++ src/include/sched.h Mon Aug 1 14:34:01 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sched.h,v 1.13 2022/08/01 14:19:40 wiz Exp $ */ +/* $NetBSD: sched.h,v 1.14 2022/08/01 14:34:01 wiz Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -71,9 +71,11 @@ int sched_setaffinity_np(pid_t, size_t, #if defined(_GNU_SOURCE) -/* Historical functions, not defined in standard */ -/* Linux man page documents these functions as only available when - * _GNU_SOURCE is defined */ +/* + * Historical functions, not defined in standard + * Linux man page documents these functions as only available when + * _GNU_SOURCE is defined + */ pid_t clone(int (*)(void *), void *, int, void *); pid_t __clone(int (*)(void *), void *, int, void *);
CVS commit: src/include
Module Name:src Committed By: wiz Date: Mon Aug 1 14:34:02 UTC 2022 Modified Files: src/include: sched.h Log Message: sched.h: format comment to follow KNF requested by thorpej@ To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/include/sched.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Aug 1 14:22:32 UTC 2022 Modified Files: src/lib/libc/sys: clone.2 Log Message: clone(2): document that _GNU_SOURCE must be defined for the prototypes To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/sys/clone.2 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/sys/clone.2 diff -u src/lib/libc/sys/clone.2:1.14 src/lib/libc/sys/clone.2:1.15 --- src/lib/libc/sys/clone.2:1.14 Tue May 12 11:39:08 2020 +++ src/lib/libc/sys/clone.2 Mon Aug 1 14:22:32 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: clone.2,v 1.14 2020/05/12 11:39:08 kamil Exp $ +.\" $NetBSD: clone.2,v 1.15 2022/08/01 14:22:32 wiz Exp $ .\" .\" Copyright (c) 2001 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 May 12, 2020 +.Dd August 1, 2022 .Dt CLONE 2 .Os .Sh NAME @@ -37,6 +37,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS +.Fd #define _GNU_SOURCE .In sched.h .Ft pid_t .Fn clone "int (*func)(void *arg)" "void *stack" "int flags" "void *arg"
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Mon Aug 1 14:22:32 UTC 2022 Modified Files: src/lib/libc/sys: clone.2 Log Message: clone(2): document that _GNU_SOURCE must be defined for the prototypes To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/sys/clone.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: wiz Date: Mon Aug 1 14:19:40 UTC 2022 Modified Files: src/include: sched.h Log Message: sched.h: Linux documents clone and __clone as only available when_GNU_SOURCE is defined - follow suit. Ok martin@ To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/include/sched.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: wiz Date: Mon Aug 1 14:19:40 UTC 2022 Modified Files: src/include: sched.h Log Message: sched.h: Linux documents clone and __clone as only available when_GNU_SOURCE is defined - follow suit. Ok martin@ To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/include/sched.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/sched.h diff -u src/include/sched.h:1.12 src/include/sched.h:1.13 --- src/include/sched.h:1.12 Sun Jan 11 03:04:12 2009 +++ src/include/sched.h Mon Aug 1 14:19:40 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sched.h,v 1.12 2009/01/11 03:04:12 christos Exp $ */ +/* $NetBSD: sched.h,v 1.13 2022/08/01 14:19:40 wiz Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -59,20 +59,26 @@ __END_DECLS #define sched_yield __libc_thr_yield #endif /* __LIBPTHREAD_SOURCE__ */ -#if defined(_NETBSD_SOURCE) - __BEGIN_DECLS +#if defined(_NETBSD_SOURCE) + /* Process affinity functions (not portable) */ int sched_getaffinity_np(pid_t, size_t, cpuset_t *); int sched_setaffinity_np(pid_t, size_t, cpuset_t *); +#endif /* _NETBSD_SOURCE */ + +#if defined(_GNU_SOURCE) + /* Historical functions, not defined in standard */ +/* Linux man page documents these functions as only available when + * _GNU_SOURCE is defined */ pid_t clone(int (*)(void *), void *, int, void *); pid_t __clone(int (*)(void *), void *, int, void *); -__END_DECLS +#endif /* _GNU_SOURCE */ -#endif /* _NETBSD_SOURCE */ +__END_DECLS #endif /* _SCHED_H_ */
CVS commit: src/sys/dev/ic
Module Name:src Committed By: kre Date: Mon Aug 1 10:30:29 UTC 2022 Modified Files: src/sys/dev/ic: tulip.c Log Message: Revert this to 1.205, undoing changes apparently mistakenly committed in 1.206, and the total disaster that the attempt to revert those in 1.207 created. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/dev/ic/tulip.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/ic
Module Name:src
Committed By: kre
Date: Mon Aug 1 10:30:29 UTC 2022
Modified Files:
src/sys/dev/ic: tulip.c
Log Message:
Revert this to 1.205, undoing changes apparently mistakenly
committed in 1.206, and the total disaster that the attempt to
revert those in 1.207 created.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/dev/ic/tulip.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/tulip.c
diff -u src/sys/dev/ic/tulip.c:1.207 src/sys/dev/ic/tulip.c:1.208
--- src/sys/dev/ic/tulip.c:1.207 Mon Aug 1 07:37:18 2022
+++ src/sys/dev/ic/tulip.c Mon Aug 1 10:30:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.207 2022/08/01 07:37:18 mlelstv Exp $ */
+/* $NetBSD: tulip.c,v 1.208 2022/08/01 10:30:28 kre Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,9 +36,8 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.207 2022/08/01 07:37:18 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.208 2022/08/01 10:30:28 kre Exp $");
-#include "bpfilter.h"
#include
#include
@@ -53,16 +52,12 @@ __KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.
#include
-#include
-
#include
#include
#include
#include
-#if NBPFILTER > 0
#include
-#endif
#include
#include
@@ -74,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.
#include
#include
-const char * const tlp_chip_names[] = TULIP_CHIP_NAMES;
+static const char * const tlp_chip_names[] = TULIP_CHIP_NAMES;
static const struct tulip_txthresh_tab tlp_10_txthresh_tab[] =
TLP_TXTHRESH_TAB_10;
@@ -82,9 +77,6 @@ static const struct tulip_txthresh_tab t
static const struct tulip_txthresh_tab tlp_10_100_txthresh_tab[] =
TLP_TXTHRESH_TAB_10_100;
-static const struct tulip_txthresh_tab tlp_winb_txthresh_tab[] =
-TLP_TXTHRESH_TAB_WINB;
-
static const struct tulip_txthresh_tab tlp_dm9102_txthresh_tab[] =
TLP_TXTHRESH_TAB_DM9102;
@@ -112,21 +104,21 @@ static void tlp_rxintr(struct tulip_soft
static void tlp_txintr(struct tulip_softc *);
static void tlp_mii_tick(void *);
-static void tlp_mii_statchg(device_t);
-static void tlp_winb_mii_statchg(device_t);
-static void tlp_dm9102_mii_statchg(device_t);
+static void tlp_mii_statchg(struct ifnet *);
+static void tlp_winb_mii_statchg(struct ifnet *);
+static void tlp_dm9102_mii_statchg(struct ifnet *);
static void tlp_mii_getmedia(struct tulip_softc *, struct ifmediareq *);
static int tlp_mii_setmedia(struct tulip_softc *);
-static int tlp_bitbang_mii_readreg(device_t, int, int);
-static void tlp_bitbang_mii_writereg(device_t, int, int, int);
+static int tlp_bitbang_mii_readreg(device_t, int, int, uint16_t *);
+static int tlp_bitbang_mii_writereg(device_t, int, int, uint16_t);
-static int tlp_pnic_mii_readreg(device_t, int, int);
-static void tlp_pnic_mii_writereg(device_t, int, int, int);
+static int tlp_pnic_mii_readreg(device_t, int, int, uint16_t *);
+static int tlp_pnic_mii_writereg(device_t, int, int, uint16_t);
-static int tlp_al981_mii_readreg(device_t, int, int);
-static void tlp_al981_mii_writereg(device_t, int, int, int);
+static int tlp_al981_mii_readreg(device_t, int, int, uint16_t *);
+static int tlp_al981_mii_writereg(device_t, int, int, uint16_t);
static void tlp_2114x_preinit(struct tulip_softc *);
static void tlp_2114x_mii_preinit(struct tulip_softc *);
@@ -276,7 +268,7 @@ tlp_attach(struct tulip_softc *sc, const
*/
switch (sc->sc_chip) {
case TULIP_CHIP_X3201_3:
- sc->sc_setup_fsls = TDCTL_Tx_FS|TDCTL_Tx_LS;
+ sc->sc_setup_fsls = TDCTL_Tx_FS | TDCTL_Tx_LS;
break;
default:
@@ -399,16 +391,16 @@ tlp_attach(struct tulip_softc *sc, const
if ((error = bus_dmamem_alloc(sc->sc_dmat,
sizeof(struct tulip_control_data), PAGE_SIZE, 0, >sc_cdseg,
1, >sc_cdnseg, 0)) != 0) {
- aprint_error_dev(self, "unable to allocate control data, error = %d\n",
- error);
+ aprint_error_dev(self,
+ "unable to allocate control data, error = %d\n", error);
goto fail_0;
}
if ((error = bus_dmamem_map(sc->sc_dmat, >sc_cdseg, sc->sc_cdnseg,
sizeof(struct tulip_control_data), (void **)>sc_control_data,
BUS_DMA_COHERENT)) != 0) {
- aprint_error_dev(self, "unable to map control data, error = %d\n",
- error);
+ aprint_error_dev(self,
+ "unable to map control data, error = %d\n", error);
goto fail_1;
}
@@ -416,15 +408,17 @@ tlp_attach(struct tulip_softc *sc, const
sizeof(struct tulip_control_data), 1,
sizeof(struct tulip_control_data), 0, 0, >sc_cddmamap)) != 0) {
sc->sc_cddmamap = NULL;
- aprint_error_dev(self, "unable to create control data DMA map, "
- "error = %d\n", error);
+ aprint_error_dev(self,
+ "unable to create control data DMA map, error = %d\n",
+ error);
goto fail_2;
}
if ((error = bus_dmamap_load(sc->sc_dmat, sc->sc_cddmamap,
sc->sc_control_data,
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 1 09:38:58 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1753 To generate a diff of this commit: cvs rdiff -u -r1.1.2.139 -r1.1.2.140 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.139 src/doc/CHANGES-8.3:1.1.2.140 --- src/doc/CHANGES-8.3:1.1.2.139 Fri Jul 15 17:20:56 2022 +++ src/doc/CHANGES-8.3 Mon Aug 1 09:38:58 2022 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.139 2022/07/15 17:20:56 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.140 2022/08/01 09:38:58 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2714,3 +2714,8 @@ xsrc-9/external/mit/xorg-server/dist/xkb Out-Of-Bounds Access [mrg, ticket #1752] +sys/dev/usb/uslsa.c1.32 + + uslsa(4): PR 56946: fix baud rate setting on big endian machines + [rin, ticket #1753] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 1 09:38:58 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1753 To generate a diff of this commit: cvs rdiff -u -r1.1.2.139 -r1.1.2.140 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Mon Aug 1 09:38:02 UTC 2022
Modified Files:
src/sys/dev/usb [netbsd-8]: uslsa.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1753):
sys/dev/usb/uslsa.c: revision 1.32
PR kern/56946
Baud rate must be in little endian for SLSA_R_SET_BAUDRATE request.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/usb/uslsa.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/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.23 src/sys/dev/usb/uslsa.c:1.23.8.1
--- src/sys/dev/usb/uslsa.c:1.23 Fri Dec 16 14:56:34 2016
+++ src/sys/dev/usb/uslsa.c Mon Aug 1 09:38:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.23 2016/12/16 14:56:34 maya Exp $ */
+/* $NetBSD: uslsa.c,v 1.23.8.1 2022/08/01 09:38:02 martin Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.23 2016/12/16 14:56:34 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.23.8.1 2022/08/01 09:38:02 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -411,7 +411,7 @@ uslsa_param(void *vsc, int portno, struc
USETW(req.wIndex, sc->sc_ifnum);
USETW(req.wLength, 4);
- baud = t->c_ospeed;
+ baud = htole32(t->c_ospeed);
status = usbd_do_request(sc->sc_udev, , );
if (status != USBD_NORMAL_COMPLETION) {
/* fallback method for devices that don't know SET_BAUDRATE */
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Aug 1 09:38:02 UTC 2022 Modified Files: src/sys/dev/usb [netbsd-8]: uslsa.c Log Message: Pull up following revision(s) (requested by rin in ticket #1753): sys/dev/usb/uslsa.c: revision 1.32 PR kern/56946 Baud rate must be in little endian for SLSA_R_SET_BAUDRATE request. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/usb/uslsa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 1 09:37:01 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1483 To generate a diff of this commit: cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.115 src/doc/CHANGES-9.3:1.1.2.116 --- src/doc/CHANGES-9.3:1.1.2.115 Wed Jul 27 14:43:31 2022 +++ src/doc/CHANGES-9.3 Mon Aug 1 09:37:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.115 2022/07/27 14:43:31 martin Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.116 2022/08/01 09:37:01 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1913,3 +1913,9 @@ sys/arch/x86/pci/amdsmn.c 1.13 - Fix typos and whitespace. [msaitoh, ticket #1482] +sys/dev/usb/uslsa.c1.32 + + uslsa(4): PR 56946: fix baud rate setting on big endian machines + [rin, ticket #1483] + +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 1 09:37:01 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1483 To generate a diff of this commit: cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Aug 1 09:36:06 UTC 2022 Modified Files: src/sys/dev/usb [netbsd-9]: uslsa.c Log Message: Pull up following revision(s) (requested by rin in ticket #1483): sys/dev/usb/uslsa.c: revision 1.32 PR kern/56946 Baud rate must be in little endian for SLSA_R_SET_BAUDRATE request. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/dev/usb/uslsa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Mon Aug 1 09:36:06 UTC 2022
Modified Files:
src/sys/dev/usb [netbsd-9]: uslsa.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1483):
sys/dev/usb/uslsa.c: revision 1.32
PR kern/56946
Baud rate must be in little endian for SLSA_R_SET_BAUDRATE request.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.2.1 src/sys/dev/usb/uslsa.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/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.28 src/sys/dev/usb/uslsa.c:1.28.2.1
--- src/sys/dev/usb/uslsa.c:1.28 Thu May 9 02:43:35 2019
+++ src/sys/dev/usb/uslsa.c Mon Aug 1 09:36:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.28 2019/05/09 02:43:35 mrg Exp $ */
+/* $NetBSD: uslsa.c,v 1.28.2.1 2022/08/01 09:36:06 martin Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.28 2019/05/09 02:43:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.28.2.1 2022/08/01 09:36:06 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -388,7 +388,7 @@ uslsa_param(void *vsc, int portno, struc
USETW(req.wIndex, sc->sc_ifnum);
USETW(req.wLength, 4);
- baud = t->c_ospeed;
+ baud = htole32(t->c_ospeed);
status = usbd_do_request(sc->sc_udev, , );
if (status != USBD_NORMAL_COMPLETION) {
/* fallback method for devices that don't know SET_BAUDRATE */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mlelstv
Date: Mon Aug 1 08:09:30 UTC 2022
Modified Files:
src/sys/dev/ic: nvmevar.h
Log Message:
Now really restore 1.24.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/nvmevar.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/nvmevar.h
diff -u src/sys/dev/ic/nvmevar.h:1.26 src/sys/dev/ic/nvmevar.h:1.27
--- src/sys/dev/ic/nvmevar.h:1.26 Mon Aug 1 07:37:18 2022
+++ src/sys/dev/ic/nvmevar.h Mon Aug 1 08:09:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmevar.h,v 1.26 2022/08/01 07:37:18 mlelstv Exp $ */
+/* $NetBSD: nvmevar.h,v 1.27 2022/08/01 08:09:30 mlelstv Exp $ */
/* $OpenBSD: nvmevar.h,v 1.8 2016/04/14 11:18:32 dlg Exp $ */
/*
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
struct nvme_dmamem {
bus_dmamap_t ndm_map;
@@ -78,6 +79,8 @@ struct nvme_queue {
kmutex_t q_cq_mtx;
struct nvme_dmamem *q_sq_dmamem;
struct nvme_dmamem *q_cq_dmamem;
+ struct nvme_dmamem *q_nvmmu_dmamem; /* for apple m1 nvme */
+
bus_size_t q_sqtdbl; /* submission queue tail doorbell */
bus_size_t q_cqhdbl; /* completion queue head doorbell */
uint16_t q_id;
@@ -102,9 +105,32 @@ struct nvme_namespace {
#define NVME_NS_F_OPEN __BIT(0)
};
+struct nvme_ops {
+ void (*op_enable)(struct nvme_softc *);
+
+ int (*op_q_alloc)(struct nvme_softc *,
+ struct nvme_queue *);
+ void (*op_q_free)(struct nvme_softc *,
+ struct nvme_queue *);
+
+ uint32_t (*op_sq_enter)(struct nvme_softc *,
+ struct nvme_queue *, struct nvme_ccb *);
+ void (*op_sq_leave)(struct nvme_softc *,
+ struct nvme_queue *, struct nvme_ccb *);
+ uint32_t (*op_sq_enter_locked)(struct nvme_softc *,
+ struct nvme_queue *, struct nvme_ccb *);
+ void (*op_sq_leave_locked)(struct nvme_softc *,
+ struct nvme_queue *, struct nvme_ccb *);
+
+ void (*op_cq_done)(struct nvme_softc *,
+ struct nvme_queue *, struct nvme_ccb *);
+};
+
struct nvme_softc {
device_t sc_dev;
+ const struct nvme_ops *sc_ops;
+
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
bus_size_t sc_ios;
@@ -118,9 +144,10 @@ struct nvme_softc {
void **sc_softih; /* softintr handlers */
u_int sc_rdy_to; /* RDY timeout */
- size_t sc_mps; /* memory page size */
+ size_t sc_mps; /* memory page size */
size_t sc_mdts; /* max data trasfer size */
u_int sc_max_sgl; /* max S/G segments */
+ u_int sc_dstrd;
struct nvm_identify_controller
sc_identify;
@@ -139,6 +166,9 @@ struct nvme_softc {
uint32_t sc_quirks;
#define NVME_QUIRK_DELAY_B4_CHK_RDY __BIT(0)
+#define NVME_QUIRK_NOMSI __BIT(1)
+
+ char sc_modelname[81];
};
#define lemtoh16(p) le16toh(*((uint16_t *)(p)))
@@ -152,21 +182,35 @@ struct nvme_attach_args {
uint16_t naa_nsid;
uint32_t naa_qentries; /* total number of queue slots */
uint32_t naa_maxphys; /* maximum device transfer size */
+ const char *naa_typename; /* identifier */
};
int nvme_attach(struct nvme_softc *);
int nvme_detach(struct nvme_softc *, int flags);
int nvme_rescan(device_t, const char *, const int *);
void nvme_childdet(device_t, device_t);
+int nvme_suspend(struct nvme_softc *);
+int nvme_resume(struct nvme_softc *);
int nvme_intr(void *);
void nvme_softintr_intx(void *);
int nvme_intr_msi(void *);
void nvme_softintr_msi(void *);
static __inline struct nvme_queue *
-nvme_get_q(struct nvme_softc *sc)
+nvme_get_q(struct nvme_softc *sc, struct buf *bp, bool waitok)
{
- return sc->sc_q[cpu_index(curcpu()) % sc->sc_nq];
+ struct cpu_info *ci = (bp && bp->b_ci) ? bp->b_ci : curcpu();
+
+ /*
+ * Find a queue with available ccbs, preferring the originating CPU's queue.
+ */
+
+ for (u_int qoff = 0; qoff < sc->sc_nq; qoff++) {
+ struct nvme_queue *q = sc->sc_q[(cpu_index(ci) + qoff) % sc->sc_nq];
+ if (!SIMPLEQ_EMPTY(>q_ccb_list) || waitok)
+ return q;
+ }
+ return NULL;
}
/*
@@ -180,9 +224,26 @@ nvme_ns_get(struct nvme_softc *sc, uint1
return >sc_namespaces[nsid - 1];
}
+#define nvme_read4(_s, _r) \
+ bus_space_read_4((_s)->sc_iot, (_s)->sc_ioh, (_r))
+#define nvme_write4(_s, _r, _v) \
+ bus_space_write_4((_s)->sc_iot, (_s)->sc_ioh, (_r), (_v))
+uint64_t
+ nvme_read8(struct nvme_softc *, bus_size_t);
+void nvme_write8(struct nvme_softc *, bus_size_t, uint64_t);
+
+#define nvme_barrier(_s, _r, _l, _f) \
+ bus_space_barrier((_s)->sc_iot, (_s)->sc_ioh, (_r), (_l), (_f))
+
+struct nvme_dmamem *
+ nvme_dmamem_alloc(struct nvme_softc *, size_t);
+void nvme_dmamem_free(struct nvme_softc *, struct nvme_dmamem *);
+void nvme_dmamem_sync(struct nvme_softc *, struct nvme_dmamem *, int);
+
int nvme_ns_identify(struct nvme_softc *, uint16_t);
void nvme_ns_free(struct nvme_softc *, uint16_t);
int nvme_ns_dobio(struct nvme_softc *, uint16_t, void *,
struct buf *, void *, size_t, int, daddr_t, int, nvme_nnc_done);
int
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mlelstv Date: Mon Aug 1 08:09:30 UTC 2022 Modified Files: src/sys/dev/ic: nvmevar.h Log Message: Now really restore 1.24. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/nvmevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mlelstv
Date: Mon Aug 1 07:37:18 UTC 2022
Modified Files:
src/sys/dev/ic: ahcisata_core.c bcmgenet.c nvmevar.h rtl8169.c tulip.c
tulipreg.h
Log Message:
Revert last accidental commits.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/bcmgenet.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/nvmevar.h
cvs rdiff -u -r1.173 -r1.174 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.206 -r1.207 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/tulipreg.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/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.106 src/sys/dev/ic/ahcisata_core.c:1.107
--- src/sys/dev/ic/ahcisata_core.c:1.106 Mon Aug 1 07:34:28 2022
+++ src/sys/dev/ic/ahcisata_core.c Mon Aug 1 07:37:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.106 2022/08/01 07:34:28 mlelstv Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.107 2022/08/01 07:37:18 mlelstv Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.106 2022/08/01 07:34:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.107 2022/08/01 07:37:18 mlelstv Exp $");
#include
#include
@@ -828,8 +828,8 @@ ahci_exec_fis(struct ata_channel *chp, i
*/
return ERROR;
}
- aprint_debug("%s port %d: error 0x%x sending FIS, t %d\n",
- AHCINAME(sc), chp->ch_channel, is, timeout);
+ aprint_debug("%s port %d: error 0x%x sending FIS\n",
+ AHCINAME(sc), chp->ch_channel, is);
return ERR_DF;
}
ata_delay(chp, 10, "ahcifis", flags);
@@ -1635,27 +1635,9 @@ ahci_channel_stop(struct ahci_softc *sc,
/* XXX controller reset ? */
return;
}
+
if (sc->sc_channel_stop)
sc->sc_channel_stop(sc, chp);
- if ((AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & AHCI_P_CMD_FRE) == 0)
- return;
-
- AHCI_WRITE(sc, AHCI_P_CMD(chp->ch_channel),
- AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & ~AHCI_P_CMD_FRE);
- /* wait 1s for FIS receive to stop */
- for (i = 0; i <100; i++) {
- if ((AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & AHCI_P_CMD_FR)
- == 0)
- break;
- if (flags & AT_WAIT)
- tsleep(, PRIBIO, "ahcistop", mstohz(10));
- else
- delay(1);
- }
- if (AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & AHCI_P_CMD_FR) {
- printf("%s: channel FIS receive wouldn't stop\n", AHCINAME(sc));
- /* XXX controller reset ? */
- }
}
static void
Index: src/sys/dev/ic/bcmgenet.c
diff -u src/sys/dev/ic/bcmgenet.c:1.12 src/sys/dev/ic/bcmgenet.c:1.13
--- src/sys/dev/ic/bcmgenet.c:1.12 Mon Aug 1 07:34:28 2022
+++ src/sys/dev/ic/bcmgenet.c Mon Aug 1 07:37:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenet.c,v 1.12 2022/08/01 07:34:28 mlelstv Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.13 2022/08/01 07:37:18 mlelstv Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill
@@ -34,7 +34,7 @@
#include "opt_ddb.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.12 2022/08/01 07:34:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.13 2022/08/01 07:37:18 mlelstv Exp $");
#include
#include
@@ -730,8 +730,7 @@ genet_rxintr(struct genet_softc *sc, int
bus_dmamap_sync(sc->sc_rx.buf_tag, sc->sc_rx.buf_map[index].map,
0, sc->sc_rx.buf_map[index].map->dm_mapsize,
BUS_DMASYNC_POSTREAD);
- } else
- device_printf(sc->sc_dev, "RXINTR empty %d\n",index);
+ }
bus_dmamap_unload(sc->sc_rx.buf_tag, sc->sc_rx.buf_map[index].map);
sc->sc_rx.buf_map[index].mbuf = NULL;
@@ -785,19 +784,18 @@ genet_txintr(struct genet_softc *sc, int
bus_dmamap_sync(sc->sc_tx.buf_tag, bmap->map,
0, bmap->map->dm_mapsize,
BUS_DMASYNC_POSTWRITE);
- } else
-device_printf(sc->sc_dev, "TXINTR empty %d\n",i);
+ }
bus_dmamap_unload(sc->sc_tx.buf_tag, bmap->map);
m_freem(bmap->mbuf);
bmap->mbuf = NULL;
++pkts;
}
+ ifp->if_flags &= ~IFF_OACTIVE;
i = TX_NEXT(i);
sc->sc_tx.cidx = (sc->sc_tx.cidx + 1) & 0x;
}
- ifp->if_flags &= ~IFF_OACTIVE;
if_statadd(ifp, if_opackets, pkts);
if (pkts != 0)
Index: src/sys/dev/ic/nvmevar.h
diff -u src/sys/dev/ic/nvmevar.h:1.25 src/sys/dev/ic/nvmevar.h:1.26
--- src/sys/dev/ic/nvmevar.h:1.25 Mon Aug 1 07:34:28 2022
+++ src/sys/dev/ic/nvmevar.h Mon Aug 1 07:37:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmevar.h,v 1.25 2022/08/01 07:34:28 mlelstv Exp $ */
+/* $NetBSD: nvmevar.h,v 1.26 2022/08/01 07:37:18 mlelstv Exp $ */
/* $OpenBSD: nvmevar.h,v 1.8 2016/04/14 11:18:32 dlg Exp $ */
/*
@@ -78,8 +78,6 @@ struct nvme_queue {
kmutex_t q_cq_mtx;
struct nvme_dmamem *q_sq_dmamem;
struct nvme_dmamem *q_cq_dmamem;
- struct nvme_dmamem *q_nvmmu_dmamem; /* for apple m1 nvme */
-
bus_size_t q_sqtdbl; /* submission queue tail doorbell */
bus_size_t q_cqhdbl; /*
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mlelstv Date: Mon Aug 1 07:37:18 UTC 2022 Modified Files: src/sys/dev/ic: ahcisata_core.c bcmgenet.c nvmevar.h rtl8169.c tulip.c tulipreg.h Log Message: Revert last accidental commits. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/bcmgenet.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/nvmevar.h cvs rdiff -u -r1.173 -r1.174 src/sys/dev/ic/rtl8169.c cvs rdiff -u -r1.206 -r1.207 src/sys/dev/ic/tulip.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/tulipreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mlelstv
Date: Mon Aug 1 07:34:28 UTC 2022
Modified Files:
src/sys/dev/ic: ahcisata_core.c bcmgenet.c nslm7x.c nvmereg.h nvmevar.h
rtl8169.c tulip.c tulipreg.h
Log Message:
Also fix shift values for SCT constants.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/bcmgenet.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/nvmereg.h
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/nvmevar.h
cvs rdiff -u -r1.172 -r1.173 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.205 -r1.206 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/tulipreg.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/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.105 src/sys/dev/ic/ahcisata_core.c:1.106
--- src/sys/dev/ic/ahcisata_core.c:1.105 Fri Nov 19 23:46:55 2021
+++ src/sys/dev/ic/ahcisata_core.c Mon Aug 1 07:34:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.105 2021/11/19 23:46:55 rin Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.106 2022/08/01 07:34:28 mlelstv Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.105 2021/11/19 23:46:55 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.106 2022/08/01 07:34:28 mlelstv Exp $");
#include
#include
@@ -828,8 +828,8 @@ ahci_exec_fis(struct ata_channel *chp, i
*/
return ERROR;
}
- aprint_debug("%s port %d: error 0x%x sending FIS\n",
- AHCINAME(sc), chp->ch_channel, is);
+ aprint_debug("%s port %d: error 0x%x sending FIS, t %d\n",
+ AHCINAME(sc), chp->ch_channel, is, timeout);
return ERR_DF;
}
ata_delay(chp, 10, "ahcifis", flags);
@@ -1635,9 +1635,27 @@ ahci_channel_stop(struct ahci_softc *sc,
/* XXX controller reset ? */
return;
}
-
if (sc->sc_channel_stop)
sc->sc_channel_stop(sc, chp);
+ if ((AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & AHCI_P_CMD_FRE) == 0)
+ return;
+
+ AHCI_WRITE(sc, AHCI_P_CMD(chp->ch_channel),
+ AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & ~AHCI_P_CMD_FRE);
+ /* wait 1s for FIS receive to stop */
+ for (i = 0; i <100; i++) {
+ if ((AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & AHCI_P_CMD_FR)
+ == 0)
+ break;
+ if (flags & AT_WAIT)
+ tsleep(, PRIBIO, "ahcistop", mstohz(10));
+ else
+ delay(1);
+ }
+ if (AHCI_READ(sc, AHCI_P_CMD(chp->ch_channel)) & AHCI_P_CMD_FR) {
+ printf("%s: channel FIS receive wouldn't stop\n", AHCINAME(sc));
+ /* XXX controller reset ? */
+ }
}
static void
Index: src/sys/dev/ic/bcmgenet.c
diff -u src/sys/dev/ic/bcmgenet.c:1.11 src/sys/dev/ic/bcmgenet.c:1.12
--- src/sys/dev/ic/bcmgenet.c:1.11 Fri Dec 31 14:25:22 2021
+++ src/sys/dev/ic/bcmgenet.c Mon Aug 1 07:34:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgenet.c,v 1.11 2021/12/31 14:25:22 riastradh Exp $ */
+/* $NetBSD: bcmgenet.c,v 1.12 2022/08/01 07:34:28 mlelstv Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill
@@ -34,7 +34,7 @@
#include "opt_ddb.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.11 2021/12/31 14:25:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgenet.c,v 1.12 2022/08/01 07:34:28 mlelstv Exp $");
#include
#include
@@ -730,7 +730,8 @@ genet_rxintr(struct genet_softc *sc, int
bus_dmamap_sync(sc->sc_rx.buf_tag, sc->sc_rx.buf_map[index].map,
0, sc->sc_rx.buf_map[index].map->dm_mapsize,
BUS_DMASYNC_POSTREAD);
- }
+ } else
+ device_printf(sc->sc_dev, "RXINTR empty %d\n",index);
bus_dmamap_unload(sc->sc_rx.buf_tag, sc->sc_rx.buf_map[index].map);
sc->sc_rx.buf_map[index].mbuf = NULL;
@@ -784,18 +785,19 @@ genet_txintr(struct genet_softc *sc, int
bus_dmamap_sync(sc->sc_tx.buf_tag, bmap->map,
0, bmap->map->dm_mapsize,
BUS_DMASYNC_POSTWRITE);
- }
+ } else
+device_printf(sc->sc_dev, "TXINTR empty %d\n",i);
bus_dmamap_unload(sc->sc_tx.buf_tag, bmap->map);
m_freem(bmap->mbuf);
bmap->mbuf = NULL;
++pkts;
}
- ifp->if_flags &= ~IFF_OACTIVE;
i = TX_NEXT(i);
sc->sc_tx.cidx = (sc->sc_tx.cidx + 1) & 0x;
}
+ ifp->if_flags &= ~IFF_OACTIVE;
if_statadd(ifp, if_opackets, pkts);
if (pkts != 0)
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.74 src/sys/dev/ic/nslm7x.c:1.75
--- src/sys/dev/ic/nslm7x.c:1.74 Mon Sep 7 00:32:28 2020
+++ src/sys/dev/ic/nslm7x.c Mon Aug 1 07:34:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.74 2020/09/07 00:32:28 mrg Exp $ */
+/* $NetBSD: nslm7x.c,v 1.75 2022/08/01 07:34:28 mlelstv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.74 2020/09/07 00:32:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.75 2022/08/01 07:34:28
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mlelstv Date: Mon Aug 1 07:34:28 UTC 2022 Modified Files: src/sys/dev/ic: ahcisata_core.c bcmgenet.c nslm7x.c nvmereg.h nvmevar.h rtl8169.c tulip.c tulipreg.h Log Message: Also fix shift values for SCT constants. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/bcmgenet.c cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/nslm7x.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/nvmereg.h cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/nvmevar.h cvs rdiff -u -r1.172 -r1.173 src/sys/dev/ic/rtl8169.c cvs rdiff -u -r1.205 -r1.206 src/sys/dev/ic/tulip.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/tulipreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc Committed By: macallan Date: Mon Aug 1 06:56:43 UTC 2022 Modified Files: xsrc/external/mit/xf86-video-ati/dist/src: radeon_modes.c Log Message: sprinkle xf86SetModeDefaultName() since apparently xf86CVTMode() no longer sets a mode's .name now this works again on macppc To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc
Committed By: macallan
Date: Mon Aug 1 06:56:43 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: radeon_modes.c
Log Message:
sprinkle xf86SetModeDefaultName() since apparently xf86CVTMode() no longer
sets a mode's .name
now this works again on macppc
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.4 xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.5
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.4 Fri Jul 15 04:13:15 2022
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c Mon Aug 1 06:56:42 2022
@@ -91,6 +91,7 @@ RADEONTVModes(xf86OutputPtr output)
/* just a place holder */
new = xf86CVTMode(800, 600, 60.00, FALSE, FALSE);
+xf86SetModeDefaultName(new);
new->type = M_T_DRIVER | M_T_PREFERRED;
return new;
@@ -109,6 +110,7 @@ RADEONATOMTVModes(xf86OutputPtr output)
for (i = 0; i < 5; i++) {
new = xf86CVTMode(widths[i], heights[i], 60.0, FALSE, FALSE);
+ xf86SetModeDefaultName(new);
new->type = M_T_DRIVER;
@@ -180,6 +182,7 @@ static DisplayModePtr RADEONFPNativeMode
if (new) {
new->type = M_T_DRIVER | M_T_PREFERRED;
+ xf86SetModeDefaultName(new);
new->next = NULL;
new->prev = NULL;
@@ -295,6 +298,7 @@ static void RADEONAddScreenModes(xf86Out
}
new = xf86CVTMode(width, height, 60.0, FALSE, FALSE);
+ xf86SetModeDefaultName(new);
new->type |= M_T_USERDEF;
@@ -463,6 +467,7 @@ radeon_add_common_modes(xf86OutputPtr ou
}
new = xf86CVTMode(widths[i], heights[i], 60.0, FALSE, FALSE);
+ xf86SetModeDefaultName(new);
new->type = M_T_DRIVER;
