CVS commit: src/sys/modules/amdgpu
Module Name:src
Committed By: tnn
Date: Sat Jul 30 03:29:52 UTC 2022
Modified Files:
src/sys/modules/amdgpu: Makefile
Log Message:
COPTS -> CWARNFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.4 src/sys/modules/amdgpu/Makefile:1.5
--- src/sys/modules/amdgpu/Makefile:1.4 Sat Jul 30 03:26:45 2022
+++ src/sys/modules/amdgpu/Makefile Sat Jul 30 03:29:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/07/30 03:26:45 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/07/30 03:29:52 tnn Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -57,8 +57,8 @@ CWARNFLAGS.amdgpu_process_pptables_v1_0.
CWARNFLAGS.amdgpu_rn_clk_mgr.c+= -Wno-type-limits
CWARNFLAGS.amdgpu_vega10_reg_init.c+= -Wno-cast-qual
CWARNFLAGS.amdgpu_vega20_reg_init.c+= -Wno-cast-qual
-COPTS.amdgpu_uvd.c+= -Wno-format
-COPTS.amdgpu_vcn.c+= -Wno-format
+CWARNFLAGS.amdgpu_uvd.c+= -Wno-format
+CWARNFLAGS.amdgpu_vcn.c+= -Wno-format
COPTS.amdgpu_dcn10_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn20_resource.c+= ${COPTS.amdgpu_float}
COPTS.amdgpu_dcn21_resource.c+= ${COPTS.amdgpu_float}
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:29:52 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: COPTS -> CWARNFLAGS To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:26:45 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: amdgpu: add some more CWARNFLAGS to appease clang XXX backport this change to files.amdgpu To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/amdgpu/Makefile diff -u src/sys/modules/amdgpu/Makefile:1.3 src/sys/modules/amdgpu/Makefile:1.4 --- src/sys/modules/amdgpu/Makefile:1.3 Sat Jul 30 03:12:00 2022 +++ src/sys/modules/amdgpu/Makefile Sat Jul 30 03:26:45 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/07/30 03:12:00 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2022/07/30 03:26:45 tnn Exp $ .include "../Makefile.inc" .include "../drmkms/Makefile.inc" @@ -46,14 +46,19 @@ CWARNFLAGS+= -Wno-override-init # sed -ne 's,^makeoptions amdgpu "\([^"]*\.c\)"+="\(.*\)",\1+= \2,gp'
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:26:45 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: amdgpu: add some more CWARNFLAGS to appease clang XXX backport this change to files.amdgpu To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/amdgpu
Module Name:src
Committed By: tnn
Date: Sat Jul 30 03:12:00 UTC 2022
Modified Files:
src/sys/modules/amdgpu: Makefile
Log Message:
amdgpu: don't set -mhard-float for clang
clang complains that the option has no effect and it generates hard
float instructions without the option. soft-float not really supported
on x86_64 with clang from what I can tell.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.2 src/sys/modules/amdgpu/Makefile:1.3
--- src/sys/modules/amdgpu/Makefile:1.2 Sun Jul 24 20:05:00 2022
+++ src/sys/modules/amdgpu/Makefile Sat Jul 30 03:12:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/07/24 20:05:00 riastradh Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/30 03:12:00 tnn Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -10,7 +10,7 @@ MKLDSCRIPT=yes
WARNS= 3
.if ${MACHINE_ARCH} == "x86_64"
-COPTS.amdgpu_float+= -mhard-float -msse -msse2
+COPTS.amdgpu_float+= ${${ACTIVE_CC} == "gcc" :? -mhard-float :} -msse -msse2
.elif !empty(MACHINE_ARCH:Maarch64*)
COPTS.amdgpu_float+= -march=armv8-a
.endif
CVS commit: src/sys/modules/amdgpu
Module Name:src Committed By: tnn Date: Sat Jul 30 03:12:00 UTC 2022 Modified Files: src/sys/modules/amdgpu: Makefile Log Message: amdgpu: don't set -mhard-float for clang clang complains that the option has no effect and it generates hard float instructions without the option. soft-float not really supported on x86_64 with clang from what I can tell. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/amdgpu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/installimage
Module Name:src Committed By: pgoyette Date: Sat Jul 30 00:55:38 UTC 2022 Modified Files: src/distrib/amd64/installimage: installimage.mk Log Message: The new drm modules made the image file grow again! Bump the size limit a bit. XXX Other $ARCH might also need this. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/installimage.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Sat Jul 30 00:55:38 UTC 2022
Modified Files:
src/distrib/amd64/installimage: installimage.mk
Log Message:
The new drm modules made the image file grow again! Bump the size
limit a bit.
XXX Other $ARCH might also need this.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/installimage.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/installimage/installimage.mk
diff -u src/distrib/amd64/installimage/installimage.mk:1.2 src/distrib/amd64/installimage/installimage.mk:1.3
--- src/distrib/amd64/installimage/installimage.mk:1.2 Sun May 22 19:32:41 2022
+++ src/distrib/amd64/installimage/installimage.mk Sat Jul 30 00:55:38 2022
@@ -1,12 +1,12 @@
-# $NetBSD: installimage.mk,v 1.2 2022/05/22 19:32:41 jmcneill Exp $
+# $NetBSD: installimage.mk,v 1.3 2022/07/30 00:55:38 pgoyette Exp $
# common code between distrib/amd64/installimage/Makefile and
# distrib/amd64/installimage-bios/Makefile.
.if ${USE_XZ_SETS:Uno} != "no"
-INSTIMAGEMB?= 2250 # for all installation binaries
+INSTIMAGEMB?= 2500 # for all installation binaries
.else
-INSTIMAGEMB?= 3500 # for all installation binaries
+INSTIMAGEMB?= 4000 # for all installation binaries
.endif
PRIMARY_BOOT= bootxx_ffsv1
CVS commit: src/sys/external/bsd
Module Name:src Committed By: riastradh Date: Fri Jul 29 23:50:44 UTC 2022 Modified Files: src/sys/external/bsd/common/include/linux: printk.h src/sys/external/bsd/drm2/include/linux: device.h Log Message: drm: Reduce verbosity of drm kernel messages. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/common/include/linux/printk.h cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/include/linux/device.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd
Module Name:src
Committed By: riastradh
Date: Fri Jul 29 23:50:44 UTC 2022
Modified Files:
src/sys/external/bsd/common/include/linux: printk.h
src/sys/external/bsd/drm2/include/linux: device.h
Log Message:
drm: Reduce verbosity of drm kernel messages.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/common/include/linux/printk.h
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/include/linux/device.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/external/bsd/common/include/linux/printk.h
diff -u src/sys/external/bsd/common/include/linux/printk.h:1.12 src/sys/external/bsd/common/include/linux/printk.h:1.13
--- src/sys/external/bsd/common/include/linux/printk.h:1.12 Sun Dec 19 12:02:38 2021
+++ src/sys/external/bsd/common/include/linux/printk.h Fri Jul 29 23:50:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: printk.h,v 1.12 2021/12/19 12:02:38 riastradh Exp $ */
+/* $NetBSD: printk.h,v 1.13 2022/07/29 23:50:44 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -48,14 +48,14 @@
#define pr_warn_once printf /* XXX */
#define pr_notice printf /* XXX */
#define pr_debug printf /* XXX */
-#define KERN_EMERG "kern emerg: "
-#define KERN_ALERT "kern alert: "
-#define KERN_CRIT "kern crit: "
-#define KERN_ERR "kern error: "
-#define KERN_WARNING "kern warning: "
-#define KERN_NOTICE "kern notice: "
-#define KERN_INFO "kern info: "
-#define KERN_DEBUG "kern debug: "
+#define KERN_EMERG "emerg: "
+#define KERN_ALERT "alert: "
+#define KERN_CRIT "crit: "
+#define KERN_ERR "error: "
+#define KERN_WARNING "warning: "
+#define KERN_NOTICE "notice: "
+#define KERN_INFO ""
+#define KERN_DEBUG "debug: "
#define KERN_CONT ""
#define printk_ratelimit() 0 /* XXX */
Index: src/sys/external/bsd/drm2/include/linux/device.h
diff -u src/sys/external/bsd/drm2/include/linux/device.h:1.16 src/sys/external/bsd/drm2/include/linux/device.h:1.17
--- src/sys/external/bsd/drm2/include/linux/device.h:1.16 Sun Jul 17 14:11:18 2022
+++ src/sys/external/bsd/drm2/include/linux/device.h Fri Jul 29 23:50:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.16 2022/07/17 14:11:18 riastradh Exp $ */
+/* $NetBSD: device.h,v 1.17 2022/07/29 23:50:44 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -72,9 +72,9 @@
#define dev_info(DEV, FMT, ...) do { \
if (DEV) \
- aprint_normal_dev((DEV), "info: " FMT, ##__VA_ARGS__); \
+ aprint_normal_dev((DEV), FMT, ##__VA_ARGS__); \
else \
- aprint_normal("info: " FMT, ##__VA_ARGS__); \
+ aprint_normal(FMT, ##__VA_ARGS__); \
} while (0)
#define dev_dbg(DEV, FMT, ...) do { \
CVS commit: src/sys/dev/pci/cxgb
Module Name:src
Committed By: andvar
Date: Fri Jul 29 20:55:41 UTC 2022
Modified Files:
src/sys/dev/pci/cxgb: cxgb_common.h
Log Message:
s/collissions/collisions/
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_common.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/cxgb/cxgb_common.h
diff -u src/sys/dev/pci/cxgb/cxgb_common.h:1.3 src/sys/dev/pci/cxgb/cxgb_common.h:1.4
--- src/sys/dev/pci/cxgb/cxgb_common.h:1.3 Thu Apr 19 21:50:09 2018
+++ src/sys/dev/pci/cxgb/cxgb_common.h Fri Jul 29 20:55:41 2022
@@ -189,7 +189,7 @@ struct mac_stats {
u64 tx_deferred; /* frames with deferred transmissions */
u64 tx_late_collisions; /* # of late collisions */
u64 tx_total_collisions; /* # of total collisions */
-u64 tx_excess_collisions; /* frame errors from excessive collissions */
+u64 tx_excess_collisions; /* frame errors from excessive collisions */
u64 tx_underrun; /* # of Tx FIFO underruns */
u64 tx_len_errs; /* # of Tx length errors */
u64 tx_mac_internal_errs; /* # of internal MAC errors on Tx */
CVS commit: src/sys/dev/pci/cxgb
Module Name:src Committed By: andvar Date: Fri Jul 29 20:55:41 UTC 2022 Modified Files: src/sys/dev/pci/cxgb: cxgb_common.h Log Message: s/collissions/collisions/ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_common.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/pci
Module Name:src Committed By: skrll Date: Fri Jul 29 15:30:42 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Improve a couple of comments To generate a diff of this commit: cvs rdiff -u -r1.748 -r1.749 src/sys/dev/pci/if_wm.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/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.748 src/sys/dev/pci/if_wm.c:1.749 --- src/sys/dev/pci/if_wm.c:1.748 Fri Jul 29 15:29:07 2022 +++ src/sys/dev/pci/if_wm.c Fri Jul 29 15:30:42 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.748 2022/07/29 15:29:07 skrll Exp $ */ +/* $NetBSD: if_wm.c,v 1.749 2022/07/29 15:30:42 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.748 2022/07/29 15:29:07 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.749 2022/07/29 15:30:42 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -3510,7 +3510,7 @@ wm_detach(device_t self, int flags __unu } pci_intr_release(sc->sc_pc, sc->sc_intrs, sc->sc_nintrs); - /* wm_stop() ensure workqueue is stopped. */ + /* wm_stop() ensured that the workqueue is stopped. */ workqueue_destroy(sc->sc_queue_wq); for (i = 0; i < sc->sc_nqueues; i++) @@ -7072,7 +7072,7 @@ wm_stop(struct ifnet *ifp, int disable) WM_CORE_UNLOCK(sc); /* - * After wm_set_stopping_flags(), it is guaranteed + * After wm_set_stopping_flags(), it is guaranteed that * wm_handle_queue_work() does not call workqueue_enqueue(). * However, workqueue_wait() cannot call in wm_stop_locked() * because it can sleep...
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Jul 29 15:30:42 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Improve a couple of comments To generate a diff of this commit: cvs rdiff -u -r1.748 -r1.749 src/sys/dev/pci/if_wm.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/pci
Module Name:src
Committed By: skrll
Date: Fri Jul 29 15:29:07 UTC 2022
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.747 -r1.748 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.747 src/sys/dev/pci/if_wm.c:1.748
--- src/sys/dev/pci/if_wm.c:1.747 Thu Jul 28 09:22:25 2022
+++ src/sys/dev/pci/if_wm.c Fri Jul 29 15:29:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.747 2022/07/28 09:22:25 skrll Exp $ */
+/* $NetBSD: if_wm.c,v 1.748 2022/07/29 15:29:07 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.747 2022/07/28 09:22:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.748 2022/07/29 15:29:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -664,7 +664,7 @@ struct wm_softc {
struct evcnt sc_ev_o2bspc; /* OS2BMC pkts transmitted by host */
struct evcnt sc_ev_b2ospc; /* BMC2OS pkts sent by BMC */
struct evcnt sc_ev_o2bgptc; /* OS2BMC pkts received by BMC */
-
+
#endif /* WM_EVENT_COUNTERS */
struct sysctllog *sc_sysctllog;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Jul 29 15:29:07 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.747 -r1.748 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: skrll
Date: Fri Jul 29 15:25:51 UTC 2022
Modified Files:
src/sys/net: if_mpls.c
Log Message:
No need to wrap the call to if_detach with splnet / splx as if_detach
raises spl as required.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/net/if_mpls.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/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.37 src/sys/net/if_mpls.c:1.38
--- src/sys/net/if_mpls.c:1.37 Wed Jun 16 00:21:19 2021
+++ src/sys/net/if_mpls.c Fri Jul 29 15:25:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.37 2021/06/16 00:21:19 riastradh Exp $ */
+/* $NetBSD: if_mpls.c,v 1.38 2022/07/29 15:25:51 skrll Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.37 2021/06/16 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.38 2022/07/29 15:25:51 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -164,13 +164,9 @@ mpls_clone_create(struct if_clone *ifc,
static int
mpls_clone_destroy(struct ifnet *ifp)
{
- int s;
bpf_detach(ifp);
-
- s = splnet();
if_detach(ifp);
- splx(s);
free(ifp->if_softc, M_DEVBUF);
atomic_dec_uint(_count);
CVS commit: src/sys/net
Module Name:src Committed By: skrll Date: Fri Jul 29 15:25:51 UTC 2022 Modified Files: src/sys/net: if_mpls.c Log Message: No need to wrap the call to if_detach with splnet / splx as if_detach raises spl as required. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/net/if_mpls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: skrll Date: Fri Jul 29 15:24:28 UTC 2022 Modified Files: src/sys/net: if.c Log Message: Fix a typo in a comment. To generate a diff of this commit: cvs rdiff -u -r1.510 -r1.511 src/sys/net/if.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: skrll
Date: Fri Jul 29 15:24:28 UTC 2022
Modified Files:
src/sys/net: if.c
Log Message:
Fix a typo in a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.510 -r1.511 src/sys/net/if.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/net/if.c
diff -u src/sys/net/if.c:1.510 src/sys/net/if.c:1.511
--- src/sys/net/if.c:1.510 Fri Jul 29 15:19:30 2022
+++ src/sys/net/if.c Fri Jul 29 15:24:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.510 2022/07/29 15:19:30 skrll Exp $ */
+/* $NetBSD: if.c,v 1.511 2022/07/29 15:24:28 skrll Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.510 2022/07/29 15:19:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.511 2022/07/29 15:24:28 skrll Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3084,7 +3084,7 @@ void
if_export_if_data(ifnet_t * const ifp, struct if_data *ifi, bool zero_stats)
{
- /* Collet the volatile stats first; this zeros *ifi. */
+ /* Collect the volatile stats first; this zeros *ifi. */
if_stats_to_if_data(ifp, ifi, zero_stats);
ifi->ifi_type = ifp->if_type;
CVS commit: src/sys/net
Module Name:src Committed By: skrll Date: Fri Jul 29 15:19:30 UTC 2022 Modified Files: src/sys/net: if.c Log Message: KNF a comment To generate a diff of this commit: cvs rdiff -u -r1.509 -r1.510 src/sys/net/if.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/net/if.c diff -u src/sys/net/if.c:1.509 src/sys/net/if.c:1.510 --- src/sys/net/if.c:1.509 Mon Jul 11 07:40:58 2022 +++ src/sys/net/if.c Fri Jul 29 15:19:30 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.509 2022/07/11 07:40:58 skrll Exp $ */ +/* $NetBSD: if.c,v 1.510 2022/07/29 15:19:30 skrll Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.509 2022/07/11 07:40:58 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.510 2022/07/29 15:19:30 skrll Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -2428,7 +2428,8 @@ if_link_state_change_work(struct work *w * Pop a link state change from the queue and process it. * If there is nothing to process then if_detach() has been called. * We keep if_link_scheduled = true so the queue can safely drain - * without more work being queued. */ + * without more work being queued. + */ IF_LINK_STATE_CHANGE_LOCK(ifp); LQ_POP(ifp->if_link_queue, state); IF_LINK_STATE_CHANGE_UNLOCK(ifp);
CVS commit: src/sys/net
Module Name:src Committed By: skrll Date: Fri Jul 29 15:19:30 UTC 2022 Modified Files: src/sys/net: if.c Log Message: KNF a comment To generate a diff of this commit: cvs rdiff -u -r1.509 -r1.510 src/sys/net/if.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/usb
Module Name:src
Committed By: rin
Date: Fri Jul 29 13:07:15 UTC 2022
Modified Files:
src/sys/dev/usb: uslsa.c
Log Message:
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.31 -r1.32 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.31 src/sys/dev/usb/uslsa.c:1.32
--- src/sys/dev/usb/uslsa.c:1.31 Sat Aug 7 16:19:17 2021
+++ src/sys/dev/usb/uslsa.c Fri Jul 29 13:07:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.31 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: uslsa.c,v 1.32 2022/07/29 13:07:14 rin Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.31 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.32 2022/07/29 13:07:14 rin 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/usb
Module Name:src Committed By: rin Date: Fri Jul 29 13:07:15 UTC 2022 Modified Files: src/sys/dev/usb: uslsa.c Log Message: 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.31 -r1.32 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: src/doc
Module Name:src Committed By: wiz Date: Fri Jul 29 12:49:17 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: update for new openssl releases, mention openssl 3.0.5 To generate a diff of this commit: cvs rdiff -u -r1.1865 -r1.1866 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1865 src/doc/3RDPARTY:1.1866 --- src/doc/3RDPARTY:1.1865 Fri Jul 22 21:11:47 2022 +++ src/doc/3RDPARTY Fri Jul 29 12:49:16 2022 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1865 2022/07/22 21:11:47 mrg Exp $ +# $NetBSD: 3RDPARTY,v 1.1866 2022/07/29 12:49:16 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1115,7 +1115,7 @@ markus is very cooperative about it): Package: OpenSSL Version: 1.0.2o/1.1.1n -Current Vers: 1.0.2zd/1.1.1o +Current Vers: 1.0.2zd/1.1.1q/3.0.5 Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Jul 29 12:49:17 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: update for new openssl releases, mention openssl 3.0.5 To generate a diff of this commit: cvs rdiff -u -r1.1865 -r1.1866 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu
Module Name:src Committed By: riastradh Date: Fri Jul 29 12:43:15 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_ttm.c Log Message: amdgpu: Make amdgpu_ttm_io_mem_pfn return pfn, not paddr. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.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/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c:1.11 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c:1.12 --- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c:1.11 Wed Jul 20 01:11:54 2022 +++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c Fri Jul 29 12:43:15 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: amdgpu_ttm.c,v 1.11 2022/07/20 01:11:54 riastradh Exp $ */ +/* $NetBSD: amdgpu_ttm.c,v 1.12 2022/07/29 12:43:15 riastradh Exp $ */ /* * Copyright 2009 Jerome Glisse. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: amdgpu_ttm.c,v 1.11 2022/07/20 01:11:54 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amdgpu_ttm.c,v 1.12 2022/07/29 12:43:15 riastradh Exp $"); #include #include @@ -777,7 +777,7 @@ static unsigned long amdgpu_ttm_io_mem_p */ const paddr_t cookie = bus_space_mmap(bo->bdev->memt, bo->mem.bus.base, (mm->start + page_offset) << PAGE_SHIFT, /*vm_prot*/0, /*flags*/0); - return pmap_phys_address(cookie); + return pmap_phys_address(cookie) >> PAGE_SHIFT; #else return (bo->mem.bus.base >> PAGE_SHIFT) + mm->start + (offset >> PAGE_SHIFT);
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu
Module Name:src Committed By: riastradh Date: Fri Jul 29 12:43:15 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_ttm.c Log Message: amdgpu: Make amdgpu_ttm_io_mem_pfn return pfn, not paddr. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_ttm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: riastradh Date: Fri Jul 29 10:08:01 UTC 2022 Modified Files: src/sys/arch/amd64/conf: INSTALL src/sys/arch/i386/conf: INSTALL Log Message: x86: Disable new DRM_LEGACY option in INSTALL kernel. The INSTALL kernel appears to be intended to have no drm in it at all, but DRM_LEGACY brings it in just for modules. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/amd64/conf/INSTALL cvs rdiff -u -r1.335 -r1.336 src/sys/arch/i386/conf/INSTALL 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/amd64/conf/INSTALL diff -u src/sys/arch/amd64/conf/INSTALL:1.95 src/sys/arch/amd64/conf/INSTALL:1.96 --- src/sys/arch/amd64/conf/INSTALL:1.95 Thu Apr 18 17:13:00 2019 +++ src/sys/arch/amd64/conf/INSTALL Fri Jul 29 10:08:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.95 2019/04/18 17:13:00 maya Exp $ +# $NetBSD: INSTALL,v 1.96 2022/07/29 10:08:01 riastradh Exp $ # # INSTALL - Installation kernel. # @@ -8,7 +8,7 @@ include "arch/amd64/conf/GENERIC" options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200 -#ident "INSTALL-$Revision: 1.95 $" +#ident "INSTALL-$Revision: 1.96 $" no options MEMORY_DISK_DYNAMIC no options FONT_BOLD16x32 @@ -22,3 +22,4 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # no i915drmkms* at pci? no radeon* at pci? no nouveau* at pci? +no options DRM_LEGACY Index: src/sys/arch/i386/conf/INSTALL diff -u src/sys/arch/i386/conf/INSTALL:1.335 src/sys/arch/i386/conf/INSTALL:1.336 --- src/sys/arch/i386/conf/INSTALL:1.335 Tue Dec 11 16:52:49 2018 +++ src/sys/arch/i386/conf/INSTALL Fri Jul 29 10:08:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.335 2018/12/11 16:52:49 maya Exp $ +# $NetBSD: INSTALL,v 1.336 2022/07/29 10:08:01 riastradh Exp $ # # INSTALL - Installation kernel. # @@ -7,7 +7,7 @@ include "arch/i386/conf/MONOLITHIC" -#ident "INSTALL-$Revision: 1.335 $" +#ident "INSTALL-$Revision: 1.336 $" no options MEMORY_DISK_DYNAMIC options MEMORY_DISK_IS_ROOT # force root on memory disk @@ -19,6 +19,7 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # no i915drmkms* at pci? no radeon* at pci? no nouveau* at pci? +no options DRM_LEGACY # pre-PCI graphics drivers, not enabled in GENERIC vga0 at isa?
CVS commit: src/sys/arch
Module Name:src Committed By: riastradh Date: Fri Jul 29 10:08:01 UTC 2022 Modified Files: src/sys/arch/amd64/conf: INSTALL src/sys/arch/i386/conf: INSTALL Log Message: x86: Disable new DRM_LEGACY option in INSTALL kernel. The INSTALL kernel appears to be intended to have no drm in it at all, but DRM_LEGACY brings it in just for modules. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/amd64/conf/INSTALL cvs rdiff -u -r1.335 -r1.336 src/sys/arch/i386/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: skrll
Date: Fri Jul 29 07:58:18 UTC 2022
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Sprinkle const
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/net/if_bridge.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/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.188 src/sys/net/if_bridge.c:1.189
--- src/sys/net/if_bridge.c:1.188 Fri Jul 29 07:46:19 2022
+++ src/sys/net/if_bridge.c Fri Jul 29 07:58:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.188 2022/07/29 07:46:19 skrll Exp $ */
+/* $NetBSD: if_bridge.c,v 1.189 2022/07/29 07:58:18 skrll Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.188 2022/07/29 07:46:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.189 2022/07/29 07:58:18 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -526,7 +526,7 @@ bridge_ioctl(struct ifnet *ifp, u_long c
} args;
struct ifdrv *ifd = (struct ifdrv *) data;
const struct bridge_control *bc = NULL; /* XXXGCC */
- int s, error = 0;
+ int error = 0;
/* Authorize command before calling splsoftnet(). */
switch (cmd) {
@@ -554,7 +554,7 @@ bridge_ioctl(struct ifnet *ifp, u_long c
break;
}
- s = splsoftnet();
+ const int s = splsoftnet();
switch (cmd) {
case SIOCGDRVSPEC:
@@ -1731,11 +1731,11 @@ bridge_output(struct ifnet *ifp, struct
m_set_rcvif(mc, dst_if);
mc->m_flags &= ~M_PROMISC;
-s = splsoftnet();
+const int _s = splsoftnet();
KERNEL_LOCK_UNLESS_IFP_MPSAFE(dst_if);
ether_input(dst_if, mc);
KERNEL_UNLOCK_UNLESS_IFP_MPSAFE(dst_if);
-splx(s);
+splx(_s);
}
next:
CVS commit: src/sys/net
Module Name:src Committed By: skrll Date: Fri Jul 29 07:58:18 UTC 2022 Modified Files: src/sys/net: if_bridge.c Log Message: Sprinkle const To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: skrll Date: Fri Jul 29 07:46:19 UTC 2022 Modified Files: src/sys/net: if_bridge.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: knakahara Date: Fri Jul 29 07:35:16 UTC 2022 Modified Files: src/sys/netinet: in_pcb.c src/sys/netinet6: in6_pcb.c Log Message: Remove obsoleted comments. These comments are added with IFNET_LOCK by in_pcb.c:r1.180 and in6_pcb.c:r1.162. And then, IFNET_LOCK codes are removed in in_pcb.c:r1.183 and in6_pcb.c:r1.166, however the comments have remained. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/netinet/in_pcb.c cvs rdiff -u -r1.168 -r1.169 src/sys/netinet6/in6_pcb.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/netinet/in_pcb.c diff -u src/sys/netinet/in_pcb.c:1.188 src/sys/netinet/in_pcb.c:1.189 --- src/sys/netinet/in_pcb.c:1.188 Fri Jun 10 09:51:10 2022 +++ src/sys/netinet/in_pcb.c Fri Jul 29 07:35:16 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: in_pcb.c,v 1.188 2022/06/10 09:51:10 knakahara Exp $ */ +/* $NetBSD: in_pcb.c,v 1.189 2022/07/29 07:35:16 knakahara Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -93,7 +93,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.188 2022/06/10 09:51:10 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.189 2022/07/29 07:35:16 knakahara Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -785,7 +785,6 @@ in_pcbpurgeif0(struct inpcbtable *table, need_unlock = true; } - /* IFNET_LOCK must be taken after solock */ in_purgeifmcast(inp->inp_moptions, ifp); if (need_unlock) Index: src/sys/netinet6/in6_pcb.c diff -u src/sys/netinet6/in6_pcb.c:1.168 src/sys/netinet6/in6_pcb.c:1.169 --- src/sys/netinet6/in6_pcb.c:1.168 Thu Jun 9 07:01:27 2022 +++ src/sys/netinet6/in6_pcb.c Fri Jul 29 07:35:16 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: in6_pcb.c,v 1.168 2022/06/09 07:01:27 knakahara Exp $ */ +/* $NetBSD: in6_pcb.c,v 1.169 2022/07/29 07:35:16 knakahara Exp $ */ /* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.168 2022/06/09 07:01:27 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.169 2022/07/29 07:35:16 knakahara Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -884,7 +884,6 @@ in6_pcbpurgeif0(struct inpcbtable *table } } - /* IFNET_LOCK must be taken after solock */ in_purgeifmcast(in6p->in6p_v4moptions, ifp); if (need_unlock)
CVS commit: src/sys
Module Name:src Committed By: knakahara Date: Fri Jul 29 07:35:16 UTC 2022 Modified Files: src/sys/netinet: in_pcb.c src/sys/netinet6: in6_pcb.c Log Message: Remove obsoleted comments. These comments are added with IFNET_LOCK by in_pcb.c:r1.180 and in6_pcb.c:r1.162. And then, IFNET_LOCK codes are removed in in_pcb.c:r1.183 and in6_pcb.c:r1.166, however the comments have remained. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/netinet/in_pcb.c cvs rdiff -u -r1.168 -r1.169 src/sys/netinet6/in6_pcb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
