CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Wed Jul 17 13:37:26 UTC 2024
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
miidevs: regen.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.158 -r1.159 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.169 src/sys/dev/mii/miidevs.h:1.170
--- src/sys/dev/mii/miidevs.h:1.169 Tue Oct 17 14:08:13 2023
+++ src/sys/dev/mii/miidevs.h Wed Jul 17 13:37:26 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.169 2023/10/17 14:08:13 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.170 2024/07/17 13:37:26 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.171 2023/10/17 14:07:51 msaitoh Exp
+ * NetBSD: miidevs,v 1.172 2024/07/17 13:37:05 msaitoh Exp
*/
/*-
@@ -409,16 +409,24 @@
#define MII_MODEL_ATTANSIC_I82578 0x0004 /* Intel 82578 10/100/1000 media interface */
#define MII_STR_ATTANSIC_I82578 "Intel 82578 10/100/1000 media interface"
/* Acquired by MaxLinear */
-#define MII_MODEL_INTEL2_GPY211 0x /* MaxLinear GPY21[125] 2.5G media interface */
-#define MII_STR_INTEL2_GPY211 "MaxLinear GPY21[125] 2.5G media interface"
+#define MII_MODEL_INTEL2_GPY211 0x /* MaxLinear GPY21[125] 2.5G PHY */
+#define MII_STR_INTEL2_GPY211 "MaxLinear GPY21[125] 2.5G PHY"
#define MII_MODEL_INTEL2_I226_1 0x0001 /* I226 2.5G media interface (1) */
#define MII_STR_INTEL2_I226_1 "I226 2.5G media interface (1)"
#define MII_MODEL_INTEL2_I226_2 0x0005 /* I226 2.5G media interface (2) */
#define MII_STR_INTEL2_I226_2 "I226 2.5G media interface (2)"
#define MII_MODEL_INTEL2_I225 0x000c /* I225 2.5G media interface */
#define MII_STR_INTEL2_I225 "I225 2.5G media interface"
+#define MII_MODEL_INTEL2_GPY211_2 0x0020 /* MaxLinear GPY21[12] 2.5G PHY (2) */
+#define MII_STR_INTEL2_GPY211_2 "MaxLinear GPY21[12] 2.5G PHY (2)"
+#define MII_MODEL_INTEL2_GPY211_3 0x0021 /* MaxLinear GPY211 2.5G PHY (3) */
+#define MII_STR_INTEL2_GPY211_3 "MaxLinear GPY211 2.5G PHY (3)"
+#define MII_MODEL_INTEL2_GPY212 0x0022 /* MaxLinear GPY212 2.5G PHY */
+#define MII_STR_INTEL2_GPY212 "MaxLinear GPY212 2.5G PHY"
#define MII_MODEL_INTEL2_GPY115 0x0030 /* MaxLinear GPY115 Gigabit PHY */
#define MII_STR_INTEL2_GPY115 "MaxLinear GPY115 Gigabit PHY"
+#define MII_MODEL_INTEL2_GPY215 0x0032 /* MaxLinear GPY215 2.5G PHY */
+#define MII_STR_INTEL2_GPY215 "MaxLinear GPY215 2.5G PHY"
/* JMicron PHYs */
#define MII_MODEL_JMICRON_JMP211 0x0021 /* JMP211 10/100/1000 media interface */
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.158 src/sys/dev/mii/miidevs_data.h:1.159
--- src/sys/dev/mii/miidevs_data.h:1.158 Tue Oct 17 14:08:13 2023
+++ src/sys/dev/mii/miidevs_data.h Wed Jul 17 13:37:26 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.158 2023/10/17 14:08:13 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.159 2024/07/17 13:37:26 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.171 2023/10/17 14:07:51 msaitoh Exp
+ * NetBSD: miidevs,v 1.172 2024/07/17 13:37:05 msaitoh Exp
*/
/*-
@@ -357,227 +357,235 @@ static const uint32_t mii_products[] = {
MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_I82578,
305, 1634, 625, 565, 571, 0,
MII_OUI_INTEL2, MII_MODEL_INTEL2_GPY211,
- 419, 1640, 1651, 565, 571, 0,
+ 419, 1640, 1651, 497, 0,
MII_OUI_INTEL2, MII_MODEL_INTEL2_I226_1,
1656, 1651, 565, 571, 1661, 0,
MII_OUI_INTEL2, MII_MODEL_INTEL2_I226_2,
1656, 1651, 565, 571, 1665, 0,
MII_OUI_INTEL2, MII_MODEL_INTEL2_I225,
1669, 1651, 565, 571, 0,
+ MII_OUI_INTEL2, MII_MODEL_INTEL2_GPY211_2,
+ 419, 1674, 1651, 497, 1665, 0,
+ MII_OUI_INTEL2, MII_MODEL_INTEL2_GPY211_3,
+ 419, 1684, 1651, 497, 1691, 0,
+ MII_OUI_INTEL2, MII_MODEL_INTEL2_GPY212,
+ 419, 1695, 1651, 497, 0,
MII_OUI_INTEL2, MII_MODEL_INTEL2_GPY115,
- 419, 1674, 1550, 497, 0,
+ 419, 1702, 1550, 497, 0,
+ MII_OUI_INTEL2, MII_MODEL_INTEL2_GPY215,
+ 419, 1709, 1651, 497, 0,
MII_OUI_JMICRON, MII_MODEL_JMICRON_JMP211,
- 1681, 625, 565, 571, 0,
+ 1716, 625, 565, 571, 0,
MII_OUI_JMICRON, MII_MODEL_JMICRON_JMP202,
- 1688, 558, 565, 571, 0,
+ 1723, 558, 565, 571, 0,
MII_OUI_xxLEVEL1, MII_MODEL_xxLEVEL1_LXT970,
- 1695, 558, 565, 571, 0,
+ 1730, 558, 565, 571, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000_OLD,
- 1702, 804, 565, 571, 0,
+ 1737, 804, 565, 571, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT974,
- 1710, 558, 748, 497, 0,
+ 1745, 558, 748, 497, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT975,
- 1717, 558, 748, 49
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Wed Jul 17 13:37:26 UTC 2024 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: miidevs: regen. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.158 -r1.159 src/sys/dev/mii/miidevs_data.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/mii
Module Name:src Committed By: msaitoh Date: Wed Jul 17 13:37:05 UTC 2024 Modified Files: src/sys/dev/mii: miidevs Log Message: miidevs: Add some MaxLinear GPY211 variants, GPY 212 and GPY215. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.171 src/sys/dev/mii/miidevs:1.172 --- src/sys/dev/mii/miidevs:1.171 Tue Oct 17 14:07:51 2023 +++ src/sys/dev/mii/miidevs Wed Jul 17 13:37:05 2024 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.171 2023/10/17 14:07:51 msaitoh Exp $ +$NetBSD: miidevs,v 1.172 2024/07/17 13:37:05 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -280,11 +280,15 @@ model xxMARVELL I210 0x I210 10/100 model xxMARVELL I82563 0x000a i82563 10/100/1000 media interface model ATTANSIC I82578 0x0004 Intel 82578 10/100/1000 media interface /* Acquired by MaxLinear */ -model INTEL2 GPY211 0x MaxLinear GPY21[125] 2.5G media interface +model INTEL2 GPY211 0x MaxLinear GPY21[125] 2.5G PHY model INTEL2 I226_1 0x0001 I226 2.5G media interface (1) model INTEL2 I226_2 0x0005 I226 2.5G media interface (2) model INTEL2 I225 0x000c I225 2.5G media interface +model INTEL2 GPY211_2 0x0020 MaxLinear GPY21[12] 2.5G PHY (2) +model INTEL2 GPY211_3 0x0021 MaxLinear GPY211 2.5G PHY (3) +model INTEL2 GPY212 0x0022 MaxLinear GPY212 2.5G PHY model INTEL2 GPY115 0x0030 MaxLinear GPY115 Gigabit PHY +model INTEL2 GPY215 0x0032 MaxLinear GPY215 2.5G PHY /* JMicron PHYs */ model JMICRON JMP211 0x0021 JMP211 10/100/1000 media interface
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Wed Jul 17 13:37:05 UTC 2024 Modified Files: src/sys/dev/mii: miidevs Log Message: miidevs: Add some MaxLinear GPY211 variants, GPY 212 and GPY215. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Jul 11 04:47:10 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1486 -r1.1487 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1485 -r1.1486 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Jul 11 03:58:07 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Realtek RTL8126. To generate a diff of this commit: cvs rdiff -u -r1.1507 -r1.1508 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1507 src/sys/dev/pci/pcidevs:1.1508 --- src/sys/dev/pci/pcidevs:1.1507 Sun Jun 23 17:22:51 2024 +++ src/sys/dev/pci/pcidevs Thu Jul 11 03:58:07 2024 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1507 2024/06/23 17:22:51 jakllsch Exp $ +$NetBSD: pcidevs,v 1.1508 2024/07/11 03:58:07 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -9266,6 +9266,7 @@ product REALTEK RT8029 0x8029 8029 Ethe product REALTEK RT8139D 0x8039 8139D 10/100 Ethernet product REALTEK RT8100 0x8100 8100 10/100 Ethernet product REALTEK RT8125 0x8125 8125 10/100/1G/2.5G Ethernet +product REALTEK RT8126 0x8126 8126 10/100/1G/2.5G/5G Ethernet product REALTEK RT8129 0x8129 8129 10/100 Ethernet product REALTEK RT8101E 0x8136 8100E/8101E/8102E 10/100 Ethernet product REALTEK RT8138 0x8138 8138 10/100 Ethernet
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Jul 11 03:58:07 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Realtek RTL8126. To generate a diff of this commit: cvs rdiff -u -r1.1507 -r1.1508 src/sys/dev/pci/pcidevs 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/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jul 10 03:26:30 UTC 2024 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixv.c Log Message: ixgbe: Remove ifdef NET_MPSAFE. Make ixgbe MP-scalable by default. Same as wm(4). To generate a diff of this commit: cvs rdiff -u -r1.353 -r1.354 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.197 -r1.198 src/sys/dev/pci/ixgbe/ixv.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/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Jul 10 03:26:30 UTC 2024
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
ixgbe: Remove ifdef NET_MPSAFE. Make ixgbe MP-scalable by default.
Same as wm(4).
To generate a diff of this commit:
cvs rdiff -u -r1.353 -r1.354 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.197 -r1.198 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.353 src/sys/dev/pci/ixgbe/ixgbe.c:1.354
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.353 Wed Jul 10 03:23:02 2024
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Jul 10 03:26:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.353 2024/07/10 03:23:02 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.354 2024/07/10 03:26:30 msaitoh Exp $ */
/**
@@ -64,12 +64,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.353 2024/07/10 03:23:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.354 2024/07/10 03:26:30 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_net_mpsafe.h"
#endif
#include "ixgbe.h"
@@ -411,17 +410,6 @@ static int (*ixgbe_start_locked)(struct
static int (*ixgbe_ring_empty)(struct ifnet *, pcq_t *);
#endif
-#ifdef NET_MPSAFE
-#define IXGBE_CALLOUT_FLAGS CALLOUT_MPSAFE
-#define IXGBE_SOFTINT_FLAGS SOFTINT_MPSAFE
-#define IXGBE_WORKQUEUE_FLAGS WQ_PERCPU | WQ_MPSAFE
-#define IXGBE_TASKLET_WQ_FLAGS WQ_MPSAFE
-#else
-#define IXGBE_CALLOUT_FLAGS 0
-#define IXGBE_SOFTINT_FLAGS 0
-#define IXGBE_WORKQUEUE_FLAGS WQ_PERCPU
-#define IXGBE_TASKLET_WQ_FLAGS 0
-#endif
#define IXGBE_WORKQUEUE_PRI PRI_SOFTNET
/* Interval between reports of errors */
@@ -844,11 +832,10 @@ ixgbe_attach(device_t parent, device_t d
IXGBE_CORE_LOCK_INIT(sc, device_xname(dev));
/* Set up the timer callout and workqueue */
- callout_init(&sc->timer, IXGBE_CALLOUT_FLAGS);
+ callout_init(&sc->timer, CALLOUT_MPSAFE);
snprintf(wqname, sizeof(wqname), "%s-timer", device_xname(dev));
error = workqueue_create(&sc->timer_wq, wqname,
- ixgbe_handle_timer, sc, IXGBE_WORKQUEUE_PRI, IPL_NET,
- IXGBE_TASKLET_WQ_FLAGS);
+ ixgbe_handle_timer, sc, IXGBE_WORKQUEUE_PRI, IPL_NET, WQ_MPSAFE);
if (error) {
aprint_error_dev(dev,
"could not create timer workqueue (%d)\n", error);
@@ -1178,8 +1165,7 @@ ixgbe_attach(device_t parent, device_t d
mutex_init(&(sc)->admin_mtx, MUTEX_DEFAULT, IPL_NET);
snprintf(wqname, sizeof(wqname), "%s-admin", device_xname(dev));
error = workqueue_create(&sc->admin_wq, wqname,
- ixgbe_handle_admin, sc, IXGBE_WORKQUEUE_PRI, IPL_NET,
- IXGBE_TASKLET_WQ_FLAGS);
+ ixgbe_handle_admin, sc, IXGBE_WORKQUEUE_PRI, IPL_NET, WQ_MPSAFE);
if (error) {
aprint_error_dev(dev,
"could not create admin workqueue (%d)\n", error);
@@ -1296,13 +1282,12 @@ ixgbe_attach(device_t parent, device_t d
sc->recovery_mode = 0;
/* Set up the timer callout */
- callout_init(&sc->recovery_mode_timer,
- IXGBE_CALLOUT_FLAGS);
+ callout_init(&sc->recovery_mode_timer, CALLOUT_MPSAFE);
snprintf(wqname, sizeof(wqname), "%s-recovery",
device_xname(dev));
error = workqueue_create(&sc->recovery_mode_timer_wq,
wqname, ixgbe_handle_recovery_mode_timer, sc,
- IXGBE_WORKQUEUE_PRI, IPL_NET, IXGBE_TASKLET_WQ_FLAGS);
+ IXGBE_WORKQUEUE_PRI, IPL_NET, WQ_MPSAFE);
if (error) {
aprint_error_dev(dev, "could not create "
"recovery_mode_timer workqueue (%d)\n", error);
@@ -6835,22 +6820,22 @@ alloc_retry:
*/
if (!(sc->feat_en & IXGBE_FEATURE_LEGACY_TX)) {
txr->txr_si =
- softint_establish(SOFTINT_NET | IXGBE_SOFTINT_FLAGS,
+ softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
ixgbe_deferred_mq_start, txr);
snprintf(wqname, sizeof(wqname), "%sdeferTx",
device_xname(dev));
defertx_error = workqueue_create(&sc->txr_wq, wqname,
ixgbe_deferred_mq_start_work, sc, IXGBE_WORKQUEUE_PRI,
- IPL_NET, IXGBE_WORKQUEUE_FLAGS);
+ IPL_NET, WQ_PERCPU | WQ_MPSAFE);
sc->txr_wq_enqueued = percpu_alloc(sizeof(u_int));
}
- que->que_si = softint_establish(SOFTINT_NET | IXGBE_SOFTINT_FLAGS,
+ que->que_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
ixgbe_handle_que, que);
snprintf(wqname, sizeof(wqname), "%sTxRx", device_xname(dev));
error = workqueue_create(&sc->que_wq, wqname,
ixgbe_handle_que_work, sc, IXGBE_WORKQUEUE_PRI, IPL_NET,
- IXGBE_WORKQUEUE_FLAGS);
+ WQ_PERCPU | WQ_MPSAFE);
if ((!(sc->feat_en & IXGBE_FEATURE_LEGACY_TX)
&& ((txr->txr_si == NULL) || defertx_error != 0))
@@ -6985,7 +6970,7 @@ ixgbe_allocate_msix(struct ixgbe_softc *
if (!(sc->feat_en & IXGBE_FEATURE_LEGACY_TX)) {
txr->txr_si = softint_establish(
-SOFTINT_NET | IXGBE_SOFTINT_FLAGS,
+
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Jul 10 03:23:02 UTC 2024
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
ixgbe: ixgbe is always MP-safe, so remove IXGBE_MPSAFE macro.
Before this change, IXGBE_MPSAFE is not defined if NET_MPSAFE is not set.
In this case, the PCI_INTR_MPSAFE flag is not set by pci_intr_setattr()
and interrupt_distribute() fails on arm. Always enable IXGBE_MPSAFE
funciton by removing the macro.
To generate a diff of this commit:
cvs rdiff -u -r1.352 -r1.353 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.196 -r1.197 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.352 src/sys/dev/pci/ixgbe/ixgbe.c:1.353
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.352 Sat Jun 29 12:11:12 2024
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Jul 10 03:23:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.352 2024/06/29 12:11:12 riastradh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.353 2024/07/10 03:23:02 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.352 2024/06/29 12:11:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.353 2024/07/10 03:23:02 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -412,7 +412,6 @@ static int (*ixgbe_ring_empty)(struct if
#endif
#ifdef NET_MPSAFE
-#define IXGBE_MPSAFE 1
#define IXGBE_CALLOUT_FLAGS CALLOUT_MPSAFE
#define IXGBE_SOFTINT_FLAGS SOFTINT_MPSAFE
#define IXGBE_WORKQUEUE_FLAGS WQ_PERCPU | WQ_MPSAFE
@@ -1385,9 +1384,7 @@ ixgbe_setup_interface(device_t dev, stru
ifp->if_stop = ixgbe_ifstop;
ifp->if_softc = sc;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-#ifdef IXGBE_MPSAFE
ifp->if_extflags = IFEF_MPSAFE;
-#endif
ifp->if_ioctl = ixgbe_ioctl;
#if __FreeBSD_version >= 1100045
/* TSO parameters */
@@ -6929,10 +6926,9 @@ ixgbe_allocate_msix(struct ixgbe_softc *
device_xname(dev), i);
intrstr = pci_intr_string(pc, sc->osdep.intrs[i], intrbuf,
sizeof(intrbuf));
-#ifdef IXGBE_MPSAFE
pci_intr_setattr(pc, &sc->osdep.intrs[i], PCI_INTR_MPSAFE,
true);
-#endif
+
/* Set the handler function */
que->res = sc->osdep.ihs[i] = pci_intr_establish_xname(pc,
sc->osdep.intrs[i], IPL_NET, ixgbe_msix_que, que,
@@ -7034,10 +7030,8 @@ ixgbe_allocate_msix(struct ixgbe_softc *
sc->vector = vector;
intrstr = pci_intr_string(pc, sc->osdep.intrs[vector], intrbuf,
sizeof(intrbuf));
-#ifdef IXGBE_MPSAFE
- pci_intr_setattr(pc, &sc->osdep.intrs[vector], PCI_INTR_MPSAFE,
- true);
-#endif
+ pci_intr_setattr(pc, &sc->osdep.intrs[vector], PCI_INTR_MPSAFE, true);
+
/* Set the link handler function */
sc->osdep.ihs[vector] = pci_intr_establish_xname(pc,
sc->osdep.intrs[vector], IPL_NET, ixgbe_msix_admin, sc,
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.196 src/sys/dev/pci/ixgbe/ixv.c:1.197
--- src/sys/dev/pci/ixgbe/ixv.c:1.196 Wed Nov 15 03:50:22 2023
+++ src/sys/dev/pci/ixgbe/ixv.c Wed Jul 10 03:23:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.196 2023/11/15 03:50:22 msaitoh Exp $ */
+/* $NetBSD: ixv.c,v 1.197 2024/07/10 03:23:02 msaitoh Exp $ */
/**
@@ -35,7 +35,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.196 2023/11/15 03:50:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.197 2024/07/10 03:23:02 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -229,7 +229,6 @@ static int ixv_enable_legacy_tx = 0;
TUNABLE_INT("hw.ixv.enable_legacy_tx", &ixv_enable_legacy_tx);
#ifdef NET_MPSAFE
-#define IXGBE_MPSAFE 1
#define IXGBE_CALLOUT_FLAGS CALLOUT_MPSAFE
#define IXGBE_SOFTINT_FLAGS SOFTINT_MPSAFE
#define IXGBE_WORKQUEUE_FLAGS WQ_PERCPU | WQ_MPSAFE
@@ -1657,9 +1656,7 @@ ixv_setup_interface(device_t dev, struct
ifp->if_stop = ixv_ifstop;
ifp->if_softc = sc;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-#ifdef IXGBE_MPSAFE
ifp->if_extflags = IFEF_MPSAFE;
-#endif
ifp->if_ioctl = ixv_ioctl;
if (sc->feat_en & IXGBE_FEATURE_LEGACY_TX) {
#if 0
@@ -3407,10 +3404,9 @@ ixv_allocate_msix(struct ixgbe_softc *sc
device_xname(dev), i);
intrstr = pci_intr_string(pc, sc->osdep.intrs[i], intrbuf,
sizeof(intrbuf));
-#ifdef IXGBE_MPSAFE
pci_intr_setattr(pc, &sc->osdep.intrs[i], PCI_INTR_MPSAFE,
true);
-#endif
+
/* Set the handler function */
que->res = sc->osdep.ihs[i] = pci_intr_establish_xname(pc,
sc->osdep.intrs[i], IPL_NET, ixv_msix_que, que,
@@ -3476,10 +3472,8 @@ ixv_allocate_msix(struct ixgbe_softc *sc
sc->vector = vector;
intrstr = pci_intr_string(pc, sc->osdep.int
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Jul 10 03:23:02 UTC 2024 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixv.c Log Message: ixgbe: ixgbe is always MP-safe, so remove IXGBE_MPSAFE macro. Before this change, IXGBE_MPSAFE is not defined if NET_MPSAFE is not set. In this case, the PCI_INTR_MPSAFE flag is not set by pci_intr_setattr() and interrupt_distribute() fails on arm. Always enable IXGBE_MPSAFE funciton by removing the macro. To generate a diff of this commit: cvs rdiff -u -r1.352 -r1.353 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.196 -r1.197 src/sys/dev/pci/ixgbe/ixv.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: msaitoh
Date: Sun Jul 7 23:29:04 UTC 2024
Modified Files:
src/sys/dev/pci: if_mcx.c
Log Message:
mcx(4): Match on ConnectX-6 virtual functions, too. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/if_mcx.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_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.28 src/sys/dev/pci/if_mcx.c:1.29
--- src/sys/dev/pci/if_mcx.c:1.28 Fri Jul 5 04:31:51 2024
+++ src/sys/dev/pci/if_mcx.c Sun Jul 7 23:29:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcx.c,v 1.28 2024/07/05 04:31:51 rin Exp $ */
+/* $NetBSD: if_mcx.c,v 1.29 2024/07/07 23:29:04 msaitoh Exp $ */
/* $OpenBSD: if_mcx.c,v 1.101 2021/06/02 19:16:11 patrick Exp $ */
/*
@@ -23,7 +23,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.28 2024/07/05 04:31:51 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.29 2024/07/07 23:29:04 msaitoh Exp $");
#include
#include
@@ -2678,6 +2678,7 @@ static const struct {
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT28800 },
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT28800VF },
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT28908 },
+ { PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT28908VF },
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2892 },
{ PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2894 },
};
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun Jul 7 23:29:04 UTC 2024 Modified Files: src/sys/dev/pci: if_mcx.c Log Message: mcx(4): Match on ConnectX-6 virtual functions, too. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/if_mcx.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: msaitoh Date: Fri Jun 14 03:15:04 UTC 2024 Modified Files: src/sys/dev/pci: pcireg.h Log Message: PCI_CLASS_MASK: Use unsigned to avoid undefined behavior. Found by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/sys/dev/pci/pcireg.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/pcireg.h diff -u src/sys/dev/pci/pcireg.h:1.170 src/sys/dev/pci/pcireg.h:1.171 --- src/sys/dev/pci/pcireg.h:1.170 Fri Apr 19 21:24:00 2024 +++ src/sys/dev/pci/pcireg.h Fri Jun 14 03:15:04 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pcireg.h,v 1.170 2024/04/19 21:24:00 andvar Exp $ */ +/* $NetBSD: pcireg.h,v 1.171 2024/06/14 03:15:04 msaitoh Exp $ */ /* * Copyright (c) 1995, 1996, 1999, 2000 @@ -135,7 +135,7 @@ typedef u_int8_t pci_interface_t; typedef u_int8_t pci_revision_t; #define PCI_CLASS_SHIFT 24 -#define PCI_CLASS_MASK 0xff +#define PCI_CLASS_MASK 0xffU #define PCI_CLASS(cr) \ (((cr) >> PCI_CLASS_SHIFT) & PCI_CLASS_MASK)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Jun 14 03:15:04 UTC 2024 Modified Files: src/sys/dev/pci: pcireg.h Log Message: PCI_CLASS_MASK: Use unsigned to avoid undefined behavior. Found by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 src/sys/dev/pci/pcireg.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/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu May 30 08:55:02 UTC 2024
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
Move RECOVERY_MODE feature test code for readability. No functional change.
ixgbe.c rev. 1.169 inserted RECOVERY_MODE feature test in between
MSI-X allocation and legacy allocation. To improve code readability,
move it to earlier location.
To generate a diff of this commit:
cvs rdiff -u -r1.350 -r1.351 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.350 src/sys/dev/pci/ixgbe/ixgbe.c:1.351
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.350 Mon May 13 03:15:33 2024
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu May 30 08:55:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.350 2024/05/13 03:15:33 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.351 2024/05/30 08:55:02 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.350 2024/05/13 03:15:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.351 2024/05/30 08:55:02 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1136,6 +1136,21 @@ ixgbe_attach(device_t parent, device_t d
error = ixgbe_read_pba_string(hw, buf, IXGBE_PBANUM_LENGTH);
aprint_normal_dev(dev, "PBA number %s\n", error ? "unknown" : buf);
+ /* Recovery mode */
+ switch (sc->hw.mac.type) {
+ case ixgbe_mac_X550:
+ case ixgbe_mac_X550EM_x:
+ case ixgbe_mac_X550EM_a:
+ /* >= 2.00 */
+ if (hw->eeprom.nvm_image_ver_high >= 2) {
+ sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE;
+ sc->feat_en |= IXGBE_FEATURE_RECOVERY_MODE;
+ }
+ break;
+ default:
+ break;
+ }
+
if (sc->feat_en & IXGBE_FEATURE_MSIX) {
error = ixgbe_allocate_msix(sc, pa);
if (error) {
@@ -1155,21 +1170,6 @@ ixgbe_attach(device_t parent, device_t d
}
}
- /* Recovery mode */
- switch (sc->hw.mac.type) {
- case ixgbe_mac_X550:
- case ixgbe_mac_X550EM_x:
- case ixgbe_mac_X550EM_a:
- /* >= 2.00 */
- if (hw->eeprom.nvm_image_ver_high >= 2) {
- sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE;
- sc->feat_en |= IXGBE_FEATURE_RECOVERY_MODE;
- }
- break;
- default:
- break;
- }
-
if ((sc->feat_en & IXGBE_FEATURE_MSIX) == 0)
error = ixgbe_allocate_legacy(sc, pa);
if (error)
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu May 30 08:55:02 UTC 2024 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Move RECOVERY_MODE feature test code for readability. No functional change. ixgbe.c rev. 1.169 inserted RECOVERY_MODE feature test in between MSI-X allocation and legacy allocation. To improve code readability, move it to earlier location. To generate a diff of this commit: cvs rdiff -u -r1.350 -r1.351 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include/rpcsvc
Module Name:src Committed By: msaitoh Date: Thu May 30 03:33:32 UTC 2024 Modified Files: src/include/rpcsvc: yp_prot.h Log Message: Fix previous comment fix. It seems that the work "yppush" was not duplicated. It was two sentences without period. To make it clear, add a colon and a newline. Found by rillig@. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/include/rpcsvc/yp_prot.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include/rpcsvc
Module Name:src
Committed By: msaitoh
Date: Thu May 30 03:33:32 UTC 2024
Modified Files:
src/include/rpcsvc: yp_prot.h
Log Message:
Fix previous comment fix.
It seems that the work "yppush" was not duplicated.
It was two sentences without period. To make it clear,
add a colon and a newline. Found by rillig@.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/include/rpcsvc/yp_prot.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/rpcsvc/yp_prot.h
diff -u src/include/rpcsvc/yp_prot.h:1.21 src/include/rpcsvc/yp_prot.h:1.22
--- src/include/rpcsvc/yp_prot.h:1.21 Sun May 12 23:57:11 2024
+++ src/include/rpcsvc/yp_prot.h Thu May 30 03:33:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_prot.h,v 1.21 2024/05/12 23:57:11 msaitoh Exp $ */
+/* $NetBSD: yp_prot.h,v 1.22 2024/05/30 03:33:31 msaitoh Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt
@@ -264,8 +264,9 @@ struct ypbind_setdom {
* YPPUSH PROTOCOL:
*
* Sun says:
- * "Protocol between clients (ypxfr, only) and yppush
- * speaks a protocol in the transient range, which
+ * "Protocol between clients (ypxfr, only) and yppush:
+ *
+ * yppush speaks a protocol in the transient range, which
* is supplied to ypxfr as a command-line parameter when it
* is activated by ypserv."
*
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Mon May 13 03:15:33 UTC 2024 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Modify comment. The number of queues is not limited to 8. The number of queue is calculated from both the number of CPUs and the number of MSI-X vectors. To generate a diff of this commit: cvs rdiff -u -r1.349 -r1.350 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.349 src/sys/dev/pci/ixgbe/ixgbe.c:1.350 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.349 Wed Jan 24 05:18:59 2024 +++ src/sys/dev/pci/ixgbe/ixgbe.c Mon May 13 03:15:33 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.349 2024/01/24 05:18:59 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.350 2024/05/13 03:15:33 msaitoh Exp $ */ /** @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.349 2024/01/24 05:18:59 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.350 2024/05/13 03:15:33 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -358,8 +358,8 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix /* * Number of Queues, can be set to 0, * it then autoconfigures based on the - * number of cpus with a max of 8. This - * can be overridden manually here. + * number of cpus and number of MSI-X vectors. + * This can be overridden manually here. */ static int ixgbe_num_queues = 0; SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, &ixgbe_num_queues, 0,
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Mon May 13 03:15:33 UTC 2024 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: Modify comment. The number of queues is not limited to 8. The number of queue is calculated from both the number of CPUs and the number of MSI-X vectors. To generate a diff of this commit: cvs rdiff -u -r1.349 -r1.350 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/telnet
Module Name:src
Committed By: msaitoh
Date: Mon May 13 00:32:39 UTC 2024
Modified Files:
src/usr.bin/telnet: ring.c
Log Message:
s/of of/of/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/telnet/ring.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/telnet/ring.c
diff -u src/usr.bin/telnet/ring.c:1.16 src/usr.bin/telnet/ring.c:1.17
--- src/usr.bin/telnet/ring.c:1.16 Mon Aug 7 23:31:11 2023
+++ src/usr.bin/telnet/ring.c Mon May 13 00:32:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ring.c,v 1.16 2023/08/07 23:31:11 mrg Exp $ */
+/* $NetBSD: ring.c,v 1.17 2024/05/13 00:32:39 msaitoh Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: ring.c,v 1.16 2023/08/07 23:31:11 mrg Exp $");
+__RCSID("$NetBSD: ring.c,v 1.17 2024/05/13 00:32:39 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -267,7 +267,7 @@ ring_full_consecutive(Ring *ring)
}
/*
- * Move data into the "supply" portion of of the ring buffer.
+ * Move data into the "supply" portion of the ring buffer.
*/
void
ring_supply_data(Ring *ring, unsigned char *buffer, int count)
CVS commit: src/usr.bin/telnet
Module Name:src Committed By: msaitoh Date: Mon May 13 00:32:39 UTC 2024 Modified Files: src/usr.bin/telnet: ring.c Log Message: s/of of/of/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/telnet/ring.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon May 13 00:32:09 UTC 2024 Modified Files: src/sys/kern: kern_module.c Log Message: s/signficant/significant/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/kern/kern_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_module.c diff -u src/sys/kern/kern_module.c:1.161 src/sys/kern/kern_module.c:1.162 --- src/sys/kern/kern_module.c:1.161 Tue Jan 31 13:21:37 2023 +++ src/sys/kern/kern_module.c Mon May 13 00:32:09 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_module.c,v 1.161 2023/01/31 13:21:37 riastradh Exp $ */ +/* $NetBSD: kern_module.c,v 1.162 2024/05/13 00:32:09 msaitoh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.161 2023/01/31 13:21:37 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.162 2024/05/13 00:32:09 msaitoh Exp $"); #define _MODULE_INTERNAL @@ -641,7 +641,7 @@ module_init_class(modclass_t modclass) * * Return true if the two supplied kernel versions are said to * have the same binary interface for kernel code. The entire - * version is signficant for the development tree (-current), + * version is significant for the development tree (-current), * major and minor versions are significant for official * releases of the system. */
CVS commit: src/sys/kern
Module Name:src Committed By: msaitoh Date: Mon May 13 00:32:09 UTC 2024 Modified Files: src/sys/kern: kern_module.c Log Message: s/signficant/significant/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/kern/kern_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: msaitoh
Date: Mon May 13 00:25:23 UTC 2024
Modified Files:
src/sys/arch/arm/gemini: gemini_gmacreg.h
src/usr.bin/mail: mime_decode.c
Log Message:
emtpy -> empty in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_gmacreg.h
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/mail/mime_decode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/gemini/gemini_gmacreg.h
diff -u src/sys/arch/arm/gemini/gemini_gmacreg.h:1.3 src/sys/arch/arm/gemini/gemini_gmacreg.h:1.4
--- src/sys/arch/arm/gemini/gemini_gmacreg.h:1.3 Tue Dec 23 02:15:10 2008
+++ src/sys/arch/arm/gemini/gemini_gmacreg.h Mon May 13 00:25:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmacreg.h,v 1.3 2008/12/23 02:15:10 matt Exp $ */
+/* $NetBSD: gemini_gmacreg.h,v 1.4 2024/05/13 00:25:23 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -125,10 +125,10 @@
#define INT1_TOE_IQ2_FULL __BIT(30) /* TOE Intr Queue2 Full */
#define INT1_TOE_IQ1_FULL __BIT(29) /* TOE Intr Queue1 Full */
#define INT1_TOE_IQ0_FULL __BIT(28) /* TOE Intr Queue0 Full */
-#define INT1_TOE_IQ3_NONEMPTY __BIT(27) /* TOE Intr Queue3 !Emtpy */
-#define INT1_TOE_IQ2_NONEMPTY __BIT(26) /* TOE Intr Queue2 !Emtpy */
-#define INT1_TOE_IQ1_NONEMPTY __BIT(25) /* TOE Intr Queue1 !Emtpy */
-#define INT1_TOE_IQ0_NONEMPTY __BIT(24) /* TOE Intr Queue0 !Emtpy */
+#define INT1_TOE_IQ3_NONEMPTY __BIT(27) /* TOE Intr Queue3 !Empty */
+#define INT1_TOE_IQ2_NONEMPTY __BIT(26) /* TOE Intr Queue2 !Empty */
+#define INT1_TOE_IQ1_NONEMPTY __BIT(25) /* TOE Intr Queue1 !Empty */
+#define INT1_TOE_IQ0_NONEMPTY __BIT(24) /* TOE Intr Queue0 !Empty */
#define INT1_HWTQ13_EOF __BIT(23) /* GMAC1 HW TX Queue3 EOF */
#define INT1_HWTQ12_EOF __BIT(22) /* GMAC1 HW TX Queue2 EOF */
#define INT1_HWTQ11_EOF __BIT(21) /* GMAC1 HW TX Queue1 EOF */
Index: src/usr.bin/mail/mime_decode.c
diff -u src/usr.bin/mail/mime_decode.c:1.17 src/usr.bin/mail/mime_decode.c:1.18
--- src/usr.bin/mail/mime_decode.c:1.17 Mon Jun 21 19:49:31 2010
+++ src/usr.bin/mail/mime_decode.c Mon May 13 00:25:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mime_decode.c,v 1.17 2010/06/21 19:49:31 christos Exp $ */
+/* $NetBSD: mime_decode.c,v 1.18 2024/05/13 00:25:23 msaitoh Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#ifndef __lint__
-__RCSID("$NetBSD: mime_decode.c,v 1.17 2010/06/21 19:49:31 christos Exp $");
+__RCSID("$NetBSD: mime_decode.c,v 1.18 2024/05/13 00:25:23 msaitoh Exp $");
#endif /* not __lint__ */
#include
@@ -111,7 +111,7 @@ __unused
static void
show_mime_info(FILE *fp, struct mime_info *mip, struct mime_info *end_mip)
{
- for (/* EMTPY */; mip != end_mip; mip = mip->mi_flink)
+ for (/* EMPTY */; mip != end_mip; mip = mip->mi_flink)
show_one_mime_info(fp, mip);
(void)fprintf(fp, "++ =\n");
CVS commit: src
Module Name:src Committed By: msaitoh Date: Mon May 13 00:25:23 UTC 2024 Modified Files: src/sys/arch/arm/gemini: gemini_gmacreg.h src/usr.bin/mail: mime_decode.c Log Message: emtpy -> empty in comment. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_gmacreg.h cvs rdiff -u -r1.17 -r1.18 src/usr.bin/mail/mime_decode.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: msaitoh
Date: Mon May 13 00:24:19 UTC 2024
Modified Files:
src/sys/fs/adosfs: advnops.c
src/sys/fs/msdosfs: msdosfs_fat.c
src/sys/nfs: nfs_bootdhcp.c
src/sys/ufs/ext2fs: ext2fs_alloc.c
src/sys/ufs/ffs: ffs_alloc.c ffs_wapbl.c
Log Message:
s/contigous/contiguous/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/fs/adosfs/advnops.c
cvs rdiff -u -r1.36 -r1.37 src/sys/fs/msdosfs/msdosfs_fat.c
cvs rdiff -u -r1.57 -r1.58 src/sys/nfs/nfs_bootdhcp.c
cvs rdiff -u -r1.56 -r1.57 src/sys/ufs/ext2fs/ext2fs_alloc.c
cvs rdiff -u -r1.172 -r1.173 src/sys/ufs/ffs/ffs_alloc.c
cvs rdiff -u -r1.48 -r1.49 src/sys/ufs/ffs/ffs_wapbl.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/fs/adosfs/advnops.c
diff -u src/sys/fs/adosfs/advnops.c:1.59 src/sys/fs/adosfs/advnops.c:1.60
--- src/sys/fs/adosfs/advnops.c:1.59 Mon Apr 4 19:33:45 2022
+++ src/sys/fs/adosfs/advnops.c Mon May 13 00:24:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.59 2022/04/04 19:33:45 andvar Exp $ */
+/* $NetBSD: advnops.c,v 1.60 2024/05/13 00:24:18 msaitoh Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.59 2022/04/04 19:33:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.60 2024/05/13 00:24:18 msaitoh Exp $");
#include
#include
@@ -273,7 +273,7 @@ adosfs_read(void *v)
/*
* read ahead could possibly be worth something
* but not much as ados makes little attempt to
- * make things contigous
+ * make things contiguous
*/
error = bread(sp->a_vp, lbn, amp->bsize, 0, &bp);
if (error) {
Index: src/sys/fs/msdosfs/msdosfs_fat.c
diff -u src/sys/fs/msdosfs/msdosfs_fat.c:1.36 src/sys/fs/msdosfs/msdosfs_fat.c:1.37
--- src/sys/fs/msdosfs/msdosfs_fat.c:1.36 Sat Oct 23 16:58:17 2021
+++ src/sys/fs/msdosfs/msdosfs_fat.c Mon May 13 00:24:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_fat.c,v 1.36 2021/10/23 16:58:17 thorpej Exp $ */
+/* $NetBSD: msdosfs_fat.c,v 1.37 2024/05/13 00:24:19 msaitoh Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -52,7 +52,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.36 2021/10/23 16:58:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.37 2024/05/13 00:24:19 msaitoh Exp $");
/*
* kernel include files.
@@ -765,7 +765,7 @@ chainlength(struct msdosfsmount *pmp, u_
}
/*
- * Allocate contigous free clusters.
+ * Allocate contiguous free clusters.
*
* pmp - mount point.
* start - start of cluster chain.
Index: src/sys/nfs/nfs_bootdhcp.c
diff -u src/sys/nfs/nfs_bootdhcp.c:1.57 src/sys/nfs/nfs_bootdhcp.c:1.58
--- src/sys/nfs/nfs_bootdhcp.c:1.57 Sat Dec 24 15:37:50 2022
+++ src/sys/nfs/nfs_bootdhcp.c Mon May 13 00:24:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bootdhcp.c,v 1.57 2022/12/24 15:37:50 andvar Exp $ */
+/* $NetBSD: nfs_bootdhcp.c,v 1.58 2024/05/13 00:24:19 msaitoh Exp $ */
/*-
* Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.57 2022/12/24 15:37:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.58 2024/05/13 00:24:19 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs_boot.h"
@@ -309,7 +309,7 @@ bootpset(struct mbuf *m, void *context,
{
struct bootp *bootp;
- /* we know it's contigous (in 1 mbuf cluster) */
+ /* we know it's contiguous (in 1 mbuf cluster) */
bootp = mtod(m, struct bootp*);
bootp->bp_secs = htons(waited);
Index: src/sys/ufs/ext2fs/ext2fs_alloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_alloc.c:1.56 src/sys/ufs/ext2fs/ext2fs_alloc.c:1.57
--- src/sys/ufs/ext2fs/ext2fs_alloc.c:1.56 Sat Aug 26 22:08:22 2023
+++ src/sys/ufs/ext2fs/ext2fs_alloc.c Mon May 13 00:24:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_alloc.c,v 1.56 2023/08/26 22:08:22 christos Exp $ */
+/* $NetBSD: ext2fs_alloc.c,v 1.57 2024/05/13 00:24:19 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.56 2023/08/26 22:08:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_alloc.c,v 1.57 2024/05/13 00:24:19 msaitoh Exp $");
#include
#include
@@ -240,7 +240,7 @@ ext2fs_dirpref(struct m_ext2fs *fs)
* If no blocks have been allocated in the first section, the policy is to
* request a block in the same cylinder group as the inode that describes
* the file. Otherwise, the policy is to try to allocate the blocks
- * contigously. The two fields of the ext2 inode extension (see
+ * contiguously. The two fields of the ext2 inode extension (see
* ufs/ufs/inode.h) help this.
*/
daddr_t
Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.172 src/sys/ufs/ffs/ffs_alloc.c:1.173
--- src/sys/ufs/ff
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon May 13 00:24:19 UTC 2024 Modified Files: src/sys/fs/adosfs: advnops.c src/sys/fs/msdosfs: msdosfs_fat.c src/sys/nfs: nfs_bootdhcp.c src/sys/ufs/ext2fs: ext2fs_alloc.c src/sys/ufs/ffs: ffs_alloc.c ffs_wapbl.c Log Message: s/contigous/contiguous/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/fs/adosfs/advnops.c cvs rdiff -u -r1.36 -r1.37 src/sys/fs/msdosfs/msdosfs_fat.c cvs rdiff -u -r1.57 -r1.58 src/sys/nfs/nfs_bootdhcp.c cvs rdiff -u -r1.56 -r1.57 src/sys/ufs/ext2fs/ext2fs_alloc.c cvs rdiff -u -r1.172 -r1.173 src/sys/ufs/ffs/ffs_alloc.c cvs rdiff -u -r1.48 -r1.49 src/sys/ufs/ffs/ffs_wapbl.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: msaitoh
Date: Mon May 13 00:12:33 UTC 2024
Modified Files:
src/sys/arch/sparc64/sparc64: trap.c
src/sys/netipsec: ipsec.c
Log Message:
s/priviliged/privileged/
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/sparc64/sparc64/trap.c
cvs rdiff -u -r1.178 -r1.179 src/sys/netipsec/ipsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.197 src/sys/arch/sparc64/sparc64/trap.c:1.198
--- src/sys/arch/sparc64/sparc64/trap.c:1.197 Mon Jan 15 08:13:45 2024
+++ src/sys/arch/sparc64/sparc64/trap.c Mon May 13 00:12:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.197 2024/01/15 08:13:45 andvar Exp $ */
+/* $NetBSD: trap.c,v 1.198 2024/05/13 00:12:33 msaitoh Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.197 2024/01/15 08:13:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.198 2024/05/13 00:12:33 msaitoh Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -520,7 +520,7 @@ trap(struct trapframe64 *tf, unsigned in
#endif
/*
* The kernel needs to use FPU registers for block
- * load/store. If we trap in priviliged code, save
+ * load/store. If we trap in privileged code, save
* the FPU state if there is any and enable the FPU.
*
* We rely on the kernel code properly enabling the FPU
@@ -1386,7 +1386,7 @@ data_access_error(struct trapframe64 *tf
}
/*
- * If this was a priviliged error but not a probe, we
+ * If this was a privileged error but not a probe, we
* cannot recover, so panic.
*/
if (afsr & ASFR_PRIV) {
Index: src/sys/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.178 src/sys/netipsec/ipsec.c:1.179
--- src/sys/netipsec/ipsec.c:1.178 Fri Jan 27 09:33:43 2023
+++ src/sys/netipsec/ipsec.c Mon May 13 00:12:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.178 2023/01/27 09:33:43 ozaki-r Exp $ */
+/* $NetBSD: ipsec.c,v 1.179 2024/05/13 00:12:33 msaitoh Exp $ */
/* $FreeBSD: ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.178 2023/01/27 09:33:43 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.179 2024/05/13 00:12:33 msaitoh Exp $");
/*
* IPsec controller part.
@@ -489,7 +489,7 @@ ipsec_getpolicybysock(struct mbuf *m, u_
switch (currsp->policy) {
case IPSEC_POLICY_BYPASS:
IPSECLOG(LOG_ERR, "Illegal policy for "
-"non-priviliged defined %d\n",
+"non-privileged defined %d\n",
currsp->policy);
*error = EINVAL;
return NULL;
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon May 13 00:12:33 UTC 2024 Modified Files: src/sys/arch/sparc64/sparc64: trap.c src/sys/netipsec: ipsec.c Log Message: s/priviliged/privileged/ To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/sys/arch/sparc64/sparc64/trap.c cvs rdiff -u -r1.178 -r1.179 src/sys/netipsec/ipsec.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: msaitoh Date: Mon May 13 00:11:22 UTC 2024 Modified Files: src/sys/arch/sgimips/stand/sgivol: sgivol.c src/sys/nfs: nfs_vfsops.c Log Message: ficticious -> fictitious in comment. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/stand/sgivol/sgivol.c cvs rdiff -u -r1.245 -r1.246 src/sys/nfs/nfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sgimips/stand/sgivol/sgivol.c diff -u src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.21 src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.22 --- src/sys/arch/sgimips/stand/sgivol/sgivol.c:1.21 Fri Mar 28 15:00:53 2014 +++ src/sys/arch/sgimips/stand/sgivol/sgivol.c Mon May 13 00:11:22 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sgivol.c,v 1.21 2014/03/28 15:00:53 christos Exp $ */ +/* $NetBSD: sgivol.c,v 1.22 2024/05/13 00:11:22 msaitoh Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ #if HAVE_NBTOOL_CONFIG_H #include "../../../../../sys/sys/bootblock.h" -/* Ficticious geometry for cross tool usage against a file image */ +/* Fictitious geometry for cross tool usage against a file image */ #define SGIVOL_NBTOOL_NSECS 32 #define SGIVOL_NBTOOL_NTRACKS 64 #else Index: src/sys/nfs/nfs_vfsops.c diff -u src/sys/nfs/nfs_vfsops.c:1.245 src/sys/nfs/nfs_vfsops.c:1.246 --- src/sys/nfs/nfs_vfsops.c:1.245 Tue Mar 21 15:47:46 2023 +++ src/sys/nfs/nfs_vfsops.c Mon May 13 00:11:22 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_vfsops.c,v 1.245 2023/03/21 15:47:46 christos Exp $ */ +/* $NetBSD: nfs_vfsops.c,v 1.246 2024/05/13 00:11:22 msaitoh Exp $ */ /* * Copyright (c) 1989, 1993, 1995 @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.245 2023/03/21 15:47:46 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.246 2024/05/13 00:11:22 msaitoh Exp $"); #if defined(_KERNEL_OPT) #include "opt_nfs.h" @@ -81,7 +81,7 @@ extern struct nfsstats nfsstats; extern int nfs_ticks; /* - * keep a count of the nfs mounts to generate ficticious drive names + * keep a count of the nfs mounts to generate fictitious drive names * for the per drive stats. */ unsigned int nfs_mount_count = 0;
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon May 13 00:11:22 UTC 2024 Modified Files: src/sys/arch/sgimips/stand/sgivol: sgivol.c src/sys/nfs: nfs_vfsops.c Log Message: ficticious -> fictitious in comment. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/stand/sgivol/sgivol.c cvs rdiff -u -r1.245 -r1.246 src/sys/nfs/nfs_vfsops.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/m68k/060sp
Module Name:src Committed By: msaitoh Date: Mon May 13 00:10:07 UTC 2024 Modified Files: src/sys/arch/m68k/060sp: inetbsd.S src/sys/arch/m68k/060sp/dist: iskeletn.s Log Message: s/Instrcution/Instruction/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/060sp/inetbsd.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/060sp/dist/iskeletn.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/m68k/060sp/inetbsd.S diff -u src/sys/arch/m68k/060sp/inetbsd.S:1.4 src/sys/arch/m68k/060sp/inetbsd.S:1.5 --- src/sys/arch/m68k/060sp/inetbsd.S:1.4 Thu Nov 30 21:00:51 2000 +++ src/sys/arch/m68k/060sp/inetbsd.S Mon May 13 00:10:06 2024 @@ -1,6 +1,6 @@ /* # -# $NetBSD: inetbsd.S,v 1.4 2000/11/30 21:00:51 scw Exp $ +# $NetBSD: inetbsd.S,v 1.5 2024/05/13 00:10:06 msaitoh Exp $ # # # MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP @@ -83,7 +83,7 @@ ASENTRY_NOPROFILE(_060_isp_done) # This is an alternate exit point for the Unimplemented Integer # Instruction exception handler. If the instruction was a "chk2" # and the operand was out of bounds, then _isp_unimp() creates -# a CHK exception stack frame from the Unimplemented Integer Instrcution +# a CHK exception stack frame from the Unimplemented Integer Instruction # stack frame and branches to this routine. # */ Index: src/sys/arch/m68k/060sp/dist/iskeletn.s diff -u src/sys/arch/m68k/060sp/dist/iskeletn.s:1.1 src/sys/arch/m68k/060sp/dist/iskeletn.s:1.2 --- src/sys/arch/m68k/060sp/dist/iskeletn.s:1.1 Fri Apr 14 20:24:39 2000 +++ src/sys/arch/m68k/060sp/dist/iskeletn.s Mon May 13 00:10:06 2024 @@ -1,5 +1,5 @@ # -# $NetBSD: iskeletn.s,v 1.1 2000/04/14 20:24:39 is Exp $ +# $NetBSD: iskeletn.s,v 1.2 2024/05/13 00:10:06 msaitoh Exp $ # # @@ -81,7 +81,7 @@ _060_isp_done: # This is an alternate exit point for the Unimplemented Integer # Instruction exception handler. If the instruction was a "chk2" # and the operand was out of bounds, then _isp_unimp() creates -# a CHK exception stack frame from the Unimplemented Integer Instrcution +# a CHK exception stack frame from the Unimplemented Integer Instruction # stack frame and branches to this routine. # global _060_real_chk
CVS commit: src/sys/arch/m68k/060sp
Module Name:src Committed By: msaitoh Date: Mon May 13 00:10:07 UTC 2024 Modified Files: src/sys/arch/m68k/060sp: inetbsd.S src/sys/arch/m68k/060sp/dist: iskeletn.s Log Message: s/Instrcution/Instruction/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/060sp/inetbsd.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/060sp/dist/iskeletn.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp300/include
Module Name:src Committed By: msaitoh Date: Mon May 13 00:08:49 UTC 2024 Modified Files: src/sys/arch/hp300/include: hp300spu.h Log Message: s/combindations/combinations/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/include/hp300spu.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/arch/hp300/include/hp300spu.h diff -u src/sys/arch/hp300/include/hp300spu.h:1.16 src/sys/arch/hp300/include/hp300spu.h:1.17 --- src/sys/arch/hp300/include/hp300spu.h:1.16 Thu Jan 18 14:39:06 2024 +++ src/sys/arch/hp300/include/hp300spu.h Mon May 13 00:08:49 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hp300spu.h,v 1.16 2024/01/18 14:39:06 thorpej Exp $ */ +/* $NetBSD: hp300spu.h,v 1.17 2024/05/13 00:08:49 msaitoh Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ extern int mmuid; /* MMU id */ /* * This section associates hp300 model configurations with certain - * combindations of CPU, MMU, and cache. + * combinations of CPU, MMU, and cache. */ /*
CVS commit: src/sys/arch/hp300/include
Module Name:src Committed By: msaitoh Date: Mon May 13 00:08:49 UTC 2024 Modified Files: src/sys/arch/hp300/include: hp300spu.h Log Message: s/combindations/combinations/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/include/hp300spu.h 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: msaitoh
Date: Mon May 13 00:08:06 UTC 2024
Modified Files:
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/zaurus/zaurus: machdep.c
src/sys/dev/microcode/atmel: atmel_intersil_fw.h atmel_rfmd2958_fw.h
atmel_rfmd_fw.h
Log Message:
s/slighly/slightly/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/zaurus/zaurus/machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/atmel/atmel_intersil_fw.h \
src/sys/dev/microcode/atmel/atmel_rfmd_fw.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/atmel/atmel_rfmd2958_fw.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/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.42 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.43
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.42 Tue Feb 20 23:36:02 2024
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Mon May 13 00:08:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.42 2024/02/20 23:36:02 andvar Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.43 2024/05/13 00:08:06 msaitoh Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -789,7 +789,7 @@ initarm(void *arg)
* Until then we will use a handler that just panics but tells us
* why.
* Initialisation of the vectors will just panic on a data abort.
- * This just fills in a slighly better one.
+ * This just fills in a slightly better one.
*/
#ifdef VERBOSE_INIT_ARM
printf("vectors ");
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.32 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.33
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.32 Tue Feb 20 23:36:01 2024
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Mon May 13 00:08:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.32 2024/02/20 23:36:01 andvar Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.33 2024/05/13 00:08:06 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.32 2024/02/20 23:36:01 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.33 2024/05/13 00:08:06 msaitoh Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -686,7 +686,7 @@ initarm(void *arg)
* Until then we will use a handler that just panics but tells us
* why.
* Initialisation of the vectors will just panic on a data abort.
- * This just fills in a slighly better one.
+ * This just fills in a slightly better one.
*/
#ifdef VERBOSE_INIT_ARM
printf("vectors ");
Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.54 src/sys/arch/zaurus/zaurus/machdep.c:1.55
--- src/sys/arch/zaurus/zaurus/machdep.c:1.54 Tue Mar 5 14:15:36 2024
+++ src/sys/arch/zaurus/zaurus/machdep.c Mon May 13 00:08:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.54 2024/03/05 14:15:36 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.55 2024/05/13 00:08:06 msaitoh Exp $ */
/* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */
/*
@@ -107,7 +107,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2024/03/05 14:15:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2024/05/13 00:08:06 msaitoh Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -1090,7 +1090,7 @@ initarm(void *arg)
* Until then we will use a handler that just panics but tells us
* why.
* Initialisation of the vectors will just panic on a data abort.
- * This just fills in a slighly better one.
+ * This just fills in a slightly better one.
*/
#ifdef VERBOSE_INIT_ARM
printf("vectors ");
Index: src/sys/dev/microcode/atmel/atmel_intersil_fw.h
diff -u src/sys/dev/microcode/atmel/atmel_intersil_fw.h:1.3 src/sys/dev/microcode/atmel/atmel_intersil_fw.h:1.4
--- src/sys/dev/microcode/atmel/atmel_intersil_fw.h:1.3 Wed Sep 10 19:23:44 2008
+++ src/sys/dev/microcode/atmel/atmel_intersil_fw.h Mon May 13 00:08:06 2024
@@ -1,5 +1,5 @@
/*
- * The following firmware has been taken (and reformatted slighly) from the
+ * The following firmware has been taken (and reformatted slightly) from the
* Atmel (atmelwlandriver) driver source.
*
* Target: AT76C503 with Intersil 3861 radio
Index: src/sys/dev/microcode/atmel/atmel_rfmd_fw.h
diff -u src/sys/dev/microcode/atmel/atmel_rfmd_fw.h:1.3 src/sys/dev/microcode/atmel/atmel_rfmd_fw.h:1.4
--- src/sys/dev/microcode/atmel/atmel_rfmd_fw.h:1.3 Wed Sep 10 19:23:44 2008
+++ src/sys/dev/microcode/atmel/atmel_rfmd_fw.h Mon May 13 00:08:
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon May 13 00:08:06 UTC 2024 Modified Files: src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c src/sys/arch/zaurus/zaurus: machdep.c src/sys/dev/microcode/atmel: atmel_intersil_fw.h atmel_rfmd2958_fw.h atmel_rfmd_fw.h Log Message: s/slighly/slightly/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/zaurus/zaurus/machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/atmel/atmel_intersil_fw.h \ src/sys/dev/microcode/atmel/atmel_rfmd_fw.h cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/atmel/atmel_rfmd2958_fw.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Mon May 13 00:06:05 UTC 2024 Modified Files: src/share/man/man4: options.4 Log Message: s/withe/with/ To generate a diff of this commit: cvs rdiff -u -r1.529 -r1.530 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.529 src/share/man/man4/options.4:1.530 --- src/share/man/man4/options.4:1.529 Sat May 11 06:50:23 2024 +++ src/share/man/man4/options.4 Mon May 13 00:06:04 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.529 2024/05/11 06:50:23 andvar Exp $ +.\" $NetBSD: options.4,v 1.530 2024/05/13 00:06:04 msaitoh Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd September 3, 2023 +.Dd May 12, 2024 .Dt OPTIONS 4 .Os .Sh NAME @@ -1294,7 +1294,7 @@ for more information. .It Cd options SELFRELOC Make the kernel able to self relocate at bootstrap, so that it can run whatever its load address is. -This is intented to be used withe the +This is intented to be used with the .Ic reloc bootstrap command documented in .Xr x86/boot 8 ,
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Mon May 13 00:06:05 UTC 2024 Modified Files: src/share/man/man4: options.4 Log Message: s/withe/with/ To generate a diff of this commit: cvs rdiff -u -r1.529 -r1.530 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: msaitoh
Date: Mon May 13 00:01:54 UTC 2024
Modified Files:
src/lib/libc/sys: mmap.2
src/lib/libc/time: zdump.c
src/share/man/man5: elf.5
src/sys/arch/sparc/dev: vme_machdep.c
src/sys/dev/eisa: eisa.c
src/sys/dev/mca: mca_subr.c
src/sys/dev/tc: tc.c
src/sys/kern: vfs_wapbl.c
src/sys/sys: wapbl_replay.h
src/sys/ufs/ffs: fs.h
Log Message:
s/of of/of/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/lib/libc/sys/mmap.2
cvs rdiff -u -r1.62 -r1.63 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.15 -r1.16 src/share/man/man5/elf.5
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/eisa/eisa.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/mca/mca_subr.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/tc.c
cvs rdiff -u -r1.112 -r1.113 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/wapbl_replay.h
cvs rdiff -u -r1.71 -r1.72 src/sys/ufs/ffs/fs.h
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/mmap.2
diff -u src/lib/libc/sys/mmap.2:1.56 src/lib/libc/sys/mmap.2:1.57
--- src/lib/libc/sys/mmap.2:1.56 Wed Mar 1 15:11:28 2023
+++ src/lib/libc/sys/mmap.2 Mon May 13 00:01:52 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mmap.2,v 1.56 2023/03/01 15:11:28 uwe Exp $
+.\" $NetBSD: mmap.2,v 1.57 2024/05/13 00:01:52 msaitoh Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -178,7 +178,7 @@ Synonymous with
.Dv MAP_ANON .
.It Dv MAP_FILE
Mapped from a regular file or character-special device memory.
-Read accesses beyond the end of of the file or device but less
+Read accesses beyond the end of the file or device but less
than the current page size will be zero-filled.
Write accesses beyond the end of the file or device but less
than the current page size will not affect the file or device.
Index: src/lib/libc/time/zdump.c
diff -u src/lib/libc/time/zdump.c:1.62 src/lib/libc/time/zdump.c:1.63
--- src/lib/libc/time/zdump.c:1.62 Sat Sep 16 18:40:26 2023
+++ src/lib/libc/time/zdump.c Mon May 13 00:01:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zdump.c,v 1.62 2023/09/16 18:40:26 christos Exp $ */
+/* $NetBSD: zdump.c,v 1.63 2024/05/13 00:01:53 msaitoh Exp $ */
/* Dump time zone data in a textual format. */
/*
@@ -8,7 +8,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: zdump.c,v 1.62 2023/09/16 18:40:26 christos Exp $");
+__RCSID("$NetBSD: zdump.c,v 1.63 2024/05/13 00:01:53 msaitoh Exp $");
#endif /* !defined lint */
#ifndef NETBSD_INSPIRED
@@ -153,7 +153,7 @@ sumsize(size_t a, size_t b)
size_overflow();
}
-/* Return the size of of the string STR, including its trailing NUL.
+/* Return the size of the string STR, including its trailing NUL.
Report an error and exit if this would exceed INDEX_MAX which means
pointer subtraction wouldn't work. */
static ptrdiff_t
Index: src/share/man/man5/elf.5
diff -u src/share/man/man5/elf.5:1.15 src/share/man/man5/elf.5:1.16
--- src/share/man/man5/elf.5:1.15 Mon Mar 22 18:58:32 2010
+++ src/share/man/man5/elf.5 Mon May 13 00:01:53 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: elf.5,v 1.15 2010/03/22 18:58:32 joerg Exp $
+.\" $NetBSD: elf.5,v 1.16 2024/05/13 00:01:53 msaitoh Exp $
.\"
.\" Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -269,7 +269,7 @@ Section index of the associated string t
Section index of the symbol table to which the hash table applies.
.Pp
.It Dv SHT_DYNAMIC
-Section index of of the string table by which entries in this section are used.
+Section index of the string table by which entries in this section are used.
.El
.It Fa sh_info
Contains extra information. The interpretation depends on the type as
Index: src/sys/arch/sparc/dev/vme_machdep.c
diff -u src/sys/arch/sparc/dev/vme_machdep.c:1.77 src/sys/arch/sparc/dev/vme_machdep.c:1.78
--- src/sys/arch/sparc/dev/vme_machdep.c:1.77 Fri Dec 1 05:22:01 2023
+++ src/sys/arch/sparc/dev/vme_machdep.c Mon May 13 00:01:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.77 2023/12/01 05:22:01 thorpej Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.78 2024/05/13 00:01:53 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.77 2023/12/01 05:22:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.78 2024/05/13 00:01:53 msaitoh Exp $");
#include
#include
@@ -196,7 +196,7 @@ vmem_t *vme_dvmamap;
* The VME hardware on the sun4m IOMMU maps the first 8MB of 32-bit
* VME space to the last 8MB of DVMA space and the first 1MB of
* 24-bit VME space to the first 1MB of the last 8MB of DVMA space
- * (thus 24-bit VME space overlaps the first 1MB of of 32-bit space).
+ * (thus 24-bit VME space overlaps the
CVS commit: src
Module Name:src Committed By: msaitoh Date: Mon May 13 00:01:54 UTC 2024 Modified Files: src/lib/libc/sys: mmap.2 src/lib/libc/time: zdump.c src/share/man/man5: elf.5 src/sys/arch/sparc/dev: vme_machdep.c src/sys/dev/eisa: eisa.c src/sys/dev/mca: mca_subr.c src/sys/dev/tc: tc.c src/sys/kern: vfs_wapbl.c src/sys/sys: wapbl_replay.h src/sys/ufs/ffs: fs.h Log Message: s/of of/of/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/lib/libc/sys/mmap.2 cvs rdiff -u -r1.62 -r1.63 src/lib/libc/time/zdump.c cvs rdiff -u -r1.15 -r1.16 src/share/man/man5/elf.5 cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc/dev/vme_machdep.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/eisa/eisa.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/mca/mca_subr.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/tc.c cvs rdiff -u -r1.112 -r1.113 src/sys/kern/vfs_wapbl.c cvs rdiff -u -r1.1 -r1.2 src/sys/sys/wapbl_replay.h cvs rdiff -u -r1.71 -r1.72 src/sys/ufs/ffs/fs.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/inet
Module Name:src
Committed By: msaitoh
Date: Sun May 12 23:58:18 UTC 2024
Modified Files:
src/lib/libc/inet: inet_net_pton.c
Log Message:
s/Firey/Fiery/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/inet/inet_net_pton.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/inet/inet_net_pton.c
diff -u src/lib/libc/inet/inet_net_pton.c:1.6 src/lib/libc/inet/inet_net_pton.c:1.7
--- src/lib/libc/inet/inet_net_pton.c:1.6 Mon Feb 5 21:46:05 2024
+++ src/lib/libc/inet/inet_net_pton.c Sun May 12 23:58:18 2024
@@ -20,7 +20,7 @@
#if 0
static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.1 2002/08/02 02:17:21 marka Exp ";
#else
-__RCSID("$NetBSD: inet_net_pton.c,v 1.6 2024/02/05 21:46:05 andvar Exp $");
+__RCSID("$NetBSD: inet_net_pton.c,v 1.7 2024/05/12 23:58:18 msaitoh Exp $");
#endif
#endif
@@ -150,7 +150,7 @@ inet_net_pton_ipv4(const char *src, u_ch
goto enoent;
}
- /* Firey death and destruction unless we prefetched EOS. */
+ /* Fiery death and destruction unless we prefetched EOS. */
if (ch != '\0')
goto enoent;
CVS commit: src/lib/libc/inet
Module Name:src Committed By: msaitoh Date: Sun May 12 23:58:18 UTC 2024 Modified Files: src/lib/libc/inet: inet_net_pton.c Log Message: s/Firey/Fiery/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/inet/inet_net_pton.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include/rpcsvc
Module Name:src
Committed By: msaitoh
Date: Sun May 12 23:57:12 UTC 2024
Modified Files:
src/include/rpcsvc: yp_prot.h
Log Message:
Remove duplicated yppush.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/include/rpcsvc/yp_prot.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/rpcsvc/yp_prot.h
diff -u src/include/rpcsvc/yp_prot.h:1.20 src/include/rpcsvc/yp_prot.h:1.21
--- src/include/rpcsvc/yp_prot.h:1.20 Thu Apr 2 15:30:25 2020
+++ src/include/rpcsvc/yp_prot.h Sun May 12 23:57:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_prot.h,v 1.20 2020/04/02 15:30:25 msaitoh Exp $ */
+/* $NetBSD: yp_prot.h,v 1.21 2024/05/12 23:57:11 msaitoh Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt
@@ -265,7 +265,7 @@ struct ypbind_setdom {
*
* Sun says:
* "Protocol between clients (ypxfr, only) and yppush
- * yppush speaks a protocol in the transient range, which
+ * speaks a protocol in the transient range, which
* is supplied to ypxfr as a command-line parameter when it
* is activated by ypserv."
*
CVS commit: src/include/rpcsvc
Module Name:src Committed By: msaitoh Date: Sun May 12 23:57:12 UTC 2024 Modified Files: src/include/rpcsvc: yp_prot.h Log Message: Remove duplicated yppush. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/include/rpcsvc/yp_prot.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: msaitoh
Date: Sun May 12 23:55:58 UTC 2024
Modified Files:
src/doc: HACKS
src/lib/libc/sys: ptrace.2
src/sbin/dump_lfs: lfs_inode.c
src/sys/netinet: dccp_tfrc.c
Log Message:
s/unitialized/uninitialized/
To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/doc/HACKS
cvs rdiff -u -r1.85 -r1.86 src/lib/libc/sys/ptrace.2
cvs rdiff -u -r1.28 -r1.29 src/sbin/dump_lfs/lfs_inode.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/dccp_tfrc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.243 src/doc/HACKS:1.244
--- src/doc/HACKS:1.243 Sun May 5 23:08:53 2024
+++ src/doc/HACKS Sun May 12 23:55:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.243 2024/05/05 23:08:53 riastradh Exp $
+# $NetBSD: HACKS,v 1.244 2024/05/12 23:55:57 msaitoh Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -597,7 +597,7 @@ port vax
file src/games/gomoku/Makefile : 1.12
descr
pickmove.c crashes with -O2, warns about ovi.o_intersect being
- unitialized with -O1, works with -O0
+ uninitialized with -O1, works with -O0
kcah
hack gdtoa/misc.c miscompile
Index: src/lib/libc/sys/ptrace.2
diff -u src/lib/libc/sys/ptrace.2:1.85 src/lib/libc/sys/ptrace.2:1.86
--- src/lib/libc/sys/ptrace.2:1.85 Thu May 14 13:40:49 2020
+++ src/lib/libc/sys/ptrace.2 Sun May 12 23:55:57 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: ptrace.2,v 1.85 2020/05/14 13:40:49 wiz Exp $
+.\" $NetBSD: ptrace.2,v 1.86 2024/05/12 23:55:57 msaitoh Exp $
.\"
.\" This file is in the public domain.
.Dd May 14, 2020
@@ -907,7 +907,7 @@ Other components (fields) will be ignore
The
.Fa xs_xstate_bv
field specifies whether component state should be set to provided
-values (when 1) or reset to unitialized (when 0).
+values (when 1) or reset to uninitialized (when 0).
The request will fail if
.Fa xs_xstate_bv
is not a subset of
Index: src/sbin/dump_lfs/lfs_inode.c
diff -u src/sbin/dump_lfs/lfs_inode.c:1.28 src/sbin/dump_lfs/lfs_inode.c:1.29
--- src/sbin/dump_lfs/lfs_inode.c:1.28 Thu Oct 15 06:25:12 2015
+++ src/sbin/dump_lfs/lfs_inode.c Sun May 12 23:55:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.c,v 1.28 2015/10/15 06:25:12 dholland Exp $ */
+/* $NetBSD: lfs_inode.c,v 1.29 2024/05/12 23:55:57 msaitoh Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: lfs_inode.c,v 1.28 2015/10/15 06:25:12 dholland Exp $");
+__RCSID("$NetBSD: lfs_inode.c,v 1.29 2024/05/12 23:55:57 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -230,7 +230,7 @@ lfs_bmap(struct lfs *fs, union lfs_dinod
int off=0;
char bp[MAXBSIZE];
- up = UNASSIGNED; /* XXXGCC -Wunitialized [sh3] */
+ up = UNASSIGNED; /* XXXGCC -Wuninitialized [sh3] */
if(lbn > 0 && lbn > lfs_lblkno(fs, lfs_dino_getsize(fs, idinode))) {
return UNASSIGNED;
Index: src/sys/netinet/dccp_tfrc.c
diff -u src/sys/netinet/dccp_tfrc.c:1.11 src/sys/netinet/dccp_tfrc.c:1.12
--- src/sys/netinet/dccp_tfrc.c:1.11 Mon Aug 14 03:03:48 2023
+++ src/sys/netinet/dccp_tfrc.c Sun May 12 23:55:58 2024
@@ -1,5 +1,5 @@
/* $KAME: dccp_tfrc.c,v 1.16 2006/03/01 17:34:08 nishida Exp $ */
-/* $NetBSD: dccp_tfrc.c,v 1.11 2023/08/14 03:03:48 mrg Exp $ */
+/* $NetBSD: dccp_tfrc.c,v 1.12 2024/05/12 23:55:58 msaitoh Exp $ */
/*
* Copyright (c) 2003 Nils-Erik Mattsson
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.11 2023/08/14 03:03:48 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.12 2024/05/12 23:55:58 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dccp.h"
@@ -669,7 +669,7 @@ tfrc_send_packet(void *ccb, long datasiz
#ifdef TFRCDEBUG
if (cb->t_last_win_count.tv_sec == -1)
- panic("TFRC - t_last_win_count unitialized (tfrc_send_packet)\n");
+ panic("TFRC - t_last_win_count uninitialized (tfrc_send_packet)\n");
#endif
t_temp = t_now;
timersub(&t_temp, &(cb->t_last_win_count), &t_temp);
CVS commit: src
Module Name:src Committed By: msaitoh Date: Sun May 12 23:55:58 UTC 2024 Modified Files: src/doc: HACKS src/lib/libc/sys: ptrace.2 src/sbin/dump_lfs: lfs_inode.c src/sys/netinet: dccp_tfrc.c Log Message: s/unitialized/uninitialized/ To generate a diff of this commit: cvs rdiff -u -r1.243 -r1.244 src/doc/HACKS cvs rdiff -u -r1.85 -r1.86 src/lib/libc/sys/ptrace.2 cvs rdiff -u -r1.28 -r1.29 src/sbin/dump_lfs/lfs_inode.c cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/dccp_tfrc.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: msaitoh Date: Sun May 12 23:53:45 UTC 2024 Modified Files: src/doc: CHANGES.prev Log Message: s/occuring/occurring/ To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 src/doc/CHANGES.prev 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.prev diff -u src/doc/CHANGES.prev:1.182 src/doc/CHANGES.prev:1.183 --- src/doc/CHANGES.prev:1.182 Wed Feb 7 04:02:36 2024 +++ src/doc/CHANGES.prev Sun May 12 23:53:45 2024 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.182 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.183 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -2847,7 +2847,7 @@ Changes from NetBSD 1.2 to NetBSD 1.3: images. [cgd 19961003] hp300: fix a few of outstanding bugs: - Fix vector table corruption caused by clock - interrupt occuring during critical section of + interrupt occurring during critical section of code. - Fix ITE/HIL bug which prevented booting directly into DDB on non-serial console machines.
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Sun May 12 23:53:45 UTC 2024 Modified Files: src/doc: CHANGES.prev Log Message: s/occuring/occurring/ To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/rpc
Module Name:src
Committed By: msaitoh
Date: Sun May 12 23:52:58 UTC 2024
Modified Files:
src/common/lib/libc/rpc: xdr.c
Log Message:
s/descriminated/discriminated/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/rpc/xdr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/rpc/xdr.c
diff -u src/common/lib/libc/rpc/xdr.c:1.3 src/common/lib/libc/rpc/xdr.c:1.4
--- src/common/lib/libc/rpc/xdr.c:1.3 Sun Jun 16 16:01:44 2019
+++ src/common/lib/libc/rpc/xdr.c Sun May 12 23:52:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: xdr.c,v 1.3 2019/06/16 16:01:44 christos Exp $ */
+/* $NetBSD: xdr.c,v 1.4 2024/05/12 23:52:57 msaitoh Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
static char *sccsid = "@(#)xdr.c 1.35 87/08/12";
static char *sccsid = "@(#)xdr.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: xdr.c,v 1.3 2019/06/16 16:01:44 christos Exp $");
+__RCSID("$NetBSD: xdr.c,v 1.4 2024/05/12 23:52:57 msaitoh Exp $");
#endif
#endif
@@ -674,7 +674,7 @@ xdr_netobj(XDR *xdrs, struct netobj *np)
}
/*
- * XDR a descriminated union
+ * XDR a discriminated union
* Support routine for discriminated unions.
* You create an array of xdrdiscrim structures, terminated with
* an entry with a null procedure pointer. The routine gets
CVS commit: src/common/lib/libc/rpc
Module Name:src Committed By: msaitoh Date: Sun May 12 23:52:58 UTC 2024 Modified Files: src/common/lib/libc/rpc: xdr.c Log Message: s/descriminated/discriminated/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/rpc/xdr.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/x86/include
Module Name:src Committed By: msaitoh Date: Sun May 12 23:41:10 UTC 2024 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: s/RPMQUERY/RMPQUERY/ To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.211 src/sys/arch/x86/include/specialreg.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/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.210 src/sys/arch/x86/include/specialreg.h:1.211 --- src/sys/arch/x86/include/specialreg.h:1.210 Fri Mar 8 20:29:17 2024 +++ src/sys/arch/x86/include/specialreg.h Sun May 12 23:41:10 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.210 2024/03/08 20:29:17 rillig Exp $ */ +/* $NetBSD: specialreg.h,v 1.211 2024/05/12 23:41:10 msaitoh Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -1021,7 +1021,7 @@ #define CPUID_AMD_ENCMEM_SEVES __BIT(3) /* SEV Encrypted State */ #define CPUID_AMD_ENCMEM_SEV_SNP __BIT(4) /* Secure Nested Paging */ #define CPUID_AMD_ENCMEM_VMPL __BIT(5) /* Virtual Machine Privilege Lvl */ -#define CPUID_AMD_ENCMEM_RPMQUERY __BIT(6) /* RMPQUERY instruction */ +#define CPUID_AMD_ENCMEM_RMPQUERY __BIT(6) /* RMPQUERY instruction */ #define CPUID_AMD_ENCMEM_VMPLSSS __BIT(7) /* VMPL Secure Shadow Stack */ #define CPUID_AMD_ENCMEM_SECTSC __BIT(8) /* Secure TSC */ #define CPUID_AMD_ENCMEM_TSCAUX_V __BIT(9) /* TSC AUX Virtualization */
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Sun May 12 23:41:10 UTC 2024 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: s/RPMQUERY/RMPQUERY/ To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.211 src/sys/arch/x86/include/specialreg.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: msaitoh Date: Sun May 12 23:30:37 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1484 -r1.1485 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1483 -r1.1484 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun May 12 23:30:07 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel Rapotr Lake graphics. To generate a diff of this commit: cvs rdiff -u -r1.1505 -r1.1506 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1505 src/sys/dev/pci/pcidevs:1.1506 --- src/sys/dev/pci/pcidevs:1.1505 Sun May 12 23:29:14 2024 +++ src/sys/dev/pci/pcidevs Sun May 12 23:30:07 2024 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1505 2024/05/12 23:29:14 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1506 2024/05/12 23:30:07 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -7476,6 +7476,9 @@ product INTEL RPL_IGD_6 0xa7a0 Raptor L product INTEL RPL_IGD_7 0xa7a1 Raptor Lake Graphics (96 or 80EU) product INTEL RPL_IGD_8 0xa7a8 Raptor Lake Graphics (64 or 48EU) product INTEL RPL_IGD_9 0xa7a9 Raptor Lake Graphics (64 or 48EU) +product INTEL RPL_IGD_10 0xa7aa Raptor Lake Graphics (96 or 80EU) +product INTEL RPL_IGD_11 0xa7ac Raptor Lake Graphics (96 or 80EU) +product INTEL RPL_IGD_12 0xa7ad Raptor Lake Graphics (64EU) product INTEL 21152 0xb152 S21152BB PCI-PCI Bridge product INTEL 21154 0xb154 S21152BA,S21154AE/BE PCI-PCI Bridge product INTEL 21555 0xb555 21555 Non-Transparent PCI-PCI Bridge
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun May 12 23:30:07 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel Rapotr Lake graphics. To generate a diff of this commit: cvs rdiff -u -r1.1505 -r1.1506 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun May 12 23:29:14 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Phison PS5021 and PS5026. To generate a diff of this commit: cvs rdiff -u -r1.1504 -r1.1505 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1504 src/sys/dev/pci/pcidevs:1.1505 --- src/sys/dev/pci/pcidevs:1.1504 Sat Apr 6 09:10:11 2024 +++ src/sys/dev/pci/pcidevs Sun May 12 23:29:14 2024 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1504 2024/04/06 09:10:11 andvar Exp $ +$NetBSD: pcidevs,v 1.1505 2024/05/12 23:29:14 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -7856,8 +7856,10 @@ product PHILIPS SAA7135HL 0x7135 SAA7135 product PHILIPS SAA7146AH 0x7146 SAA7146AH PCI Multimedia Bridge /* Phison products */ -product PHISON PS5000 0x5000 PS5000 -product PHISON PS5016 0x5016 PS5016 +product PHISON PS5000 0x5000 PS5000 +product PHISON PS5016 0x5016 PS5016 +product PHISON PS5021 0x5021 PS5021 +product PHISON PS5026 0x5026 PS5026 /* NCR/Symbios Logic products */ product SYMBIOS 810 0x0001 53c810
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun May 12 23:29:14 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Phison PS5021 and PS5026. To generate a diff of this commit: cvs rdiff -u -r1.1504 -r1.1505 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/acpitools/acpidump
Module Name:src
Committed By: msaitoh
Date: Sun May 12 23:00:21 UTC 2024
Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c
Log Message:
s/iast/iasl/ from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/acpitools/acpidump/acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.55 src/usr.sbin/acpitools/acpidump/acpi.c:1.56
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.55 Tue May 24 20:50:21 2022
+++ src/usr.sbin/acpitools/acpidump/acpi.c Sun May 12 23:00:21 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.55 2022/05/24 20:50:21 andvar Exp $ */
+/* $NetBSD: acpi.c,v 1.56 2024/05/12 23:00:21 msaitoh Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: acpi.c,v 1.55 2022/05/24 20:50:21 andvar Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.56 2024/05/12 23:00:21 msaitoh Exp $");
#include
#include
@@ -4719,7 +4719,7 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt,
goto out;
}
if (status != 0) {
- fprintf(stderr, "iast exit status = %d\n", status);
+ fprintf(stderr, "iasl exit status = %d\n", status);
}
/* Dump iasl's output to stdout */
CVS commit: src/usr.sbin/acpitools/acpidump
Module Name:src Committed By: msaitoh Date: Sun May 12 23:00:21 UTC 2024 Modified Files: src/usr.sbin/acpitools/acpidump: acpi.c Log Message: s/iast/iasl/ from FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/acpitools/acpidump/acpi.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/vmt
Module Name:src
Committed By: msaitoh
Date: Wed Mar 20 23:34:24 UTC 2024
Modified Files:
src/sys/dev/vmt: vmt_subr.c
Log Message:
Process all queued messages without delay immediately. From OpenBSD.
Apply the remaining part of OpenBSD sys/dev/vmt.c rev. 1.22.
> The VM host might send multiple messages at once but vmt(4) only
> processed one of time per second. Change the code to process all
> queued messages without delay immediately. This fixes two things: a)
> the vmt time sensor is available on boot when ntpd -s is loaded and b)
> the random seeding on resume (OS_Resume message) is executed almost
> immediately and not delayed by about 20 seconds.
Apply OpenBSD sys/dev/pv/vmt.c rev. 1.4.
> Merge two return branches in vmt_tclo_tick(). No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/vmt/vmt_subr.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/vmt/vmt_subr.c
diff -u src/sys/dev/vmt/vmt_subr.c:1.7 src/sys/dev/vmt/vmt_subr.c:1.8
--- src/sys/dev/vmt/vmt_subr.c:1.7 Wed Mar 20 23:33:22 2024
+++ src/sys/dev/vmt/vmt_subr.c Wed Mar 20 23:34:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt_subr.c,v 1.7 2024/03/20 23:33:22 msaitoh Exp $ */
+/* $NetBSD: vmt_subr.c,v 1.8 2024/03/20 23:34:24 msaitoh Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -774,7 +774,11 @@ vmt_tclo_tick(void *xarg)
struct vmt_softc *sc = xarg;
u_int32_t rlen;
u_int16_t ack;
+ int delay;
+ /* By default, poll every second for new messages */
+ delay = 1;
+
/* reopen tclo channel if it's currently closed */
if (sc->sc_tclo_rpc.channel == 0 &&
sc->sc_tclo_rpc.cookie1 == 0 &&
@@ -782,8 +786,8 @@ vmt_tclo_tick(void *xarg)
if (vm_rpc_open(&sc->sc_tclo_rpc, VM_RPC_OPEN_TCLO) != 0) {
device_printf(sc->sc_dev,
"unable to reopen TCLO channel\n");
- callout_schedule(&sc->sc_tclo_tick, hz * 15);
- return;
+ delay = 15;
+ goto out;
}
if (vm_rpc_send_str(&sc->sc_tclo_rpc,
@@ -829,6 +833,9 @@ vmt_tclo_tick(void *xarg)
}
sc->sc_tclo_ping = 0;
+ /* The VM host can queue multiple messages; continue without delay */
+ delay = 0;
+
#ifdef VMT_DEBUG
printf("vmware: received message '%s'\n", sc->sc_rpc_buf);
#endif
@@ -842,10 +849,13 @@ vmt_tclo_tick(void *xarg)
}
}
+ if (sc->sc_rpc_error == 1) {
+ /* On error, give time to recover and wait a second */
+ delay = 1;
+ }
+
out:
- /* On error, give time to recover and wait a second */
- callout_schedule(&sc->sc_tclo_tick,
- (sc->sc_tclo_ping || sc->sc_rpc_error) ? hz : 1);
+ callout_schedule(&sc->sc_tclo_tick, hz * delay);
}
static void
CVS commit: src/sys/dev/vmt
Module Name:src Committed By: msaitoh Date: Wed Mar 20 23:34:24 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: Process all queued messages without delay immediately. From OpenBSD. Apply the remaining part of OpenBSD sys/dev/vmt.c rev. 1.22. > The VM host might send multiple messages at once but vmt(4) only > processed one of time per second. Change the code to process all > queued messages without delay immediately. This fixes two things: a) > the vmt time sensor is available on boot when ntpd -s is loaded and b) > the random seeding on resume (OS_Resume message) is executed almost > immediately and not delayed by about 20 seconds. Apply OpenBSD sys/dev/pv/vmt.c rev. 1.4. > Merge two return branches in vmt_tclo_tick(). No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/vmt/vmt_subr.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/vmt
Module Name:src Committed By: msaitoh Date: Wed Mar 20 23:33:23 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: On error, give time to recover and wait a second. Part of OpenBSD sys/dev/vmt.c rev. 1.22. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/vmt/vmt_subr.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/vmt/vmt_subr.c diff -u src/sys/dev/vmt/vmt_subr.c:1.6 src/sys/dev/vmt/vmt_subr.c:1.7 --- src/sys/dev/vmt/vmt_subr.c:1.6 Wed Mar 20 23:33:02 2024 +++ src/sys/dev/vmt/vmt_subr.c Wed Mar 20 23:33:22 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: vmt_subr.c,v 1.6 2024/03/20 23:33:02 msaitoh Exp $ */ +/* $NetBSD: vmt_subr.c,v 1.7 2024/03/20 23:33:22 msaitoh Exp $ */ /* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */ /* @@ -843,7 +843,9 @@ vmt_tclo_tick(void *xarg) } out: - callout_schedule(&sc->sc_tclo_tick, sc->sc_tclo_ping ? hz : 1); + /* On error, give time to recover and wait a second */ + callout_schedule(&sc->sc_tclo_tick, + (sc->sc_tclo_ping || sc->sc_rpc_error) ? hz : 1); } static void
CVS commit: src/sys/dev/vmt
Module Name:src Committed By: msaitoh Date: Wed Mar 20 23:33:23 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: On error, give time to recover and wait a second. Part of OpenBSD sys/dev/vmt.c rev. 1.22. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/vmt/vmt_subr.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/vmt
Module Name:src
Committed By: msaitoh
Date: Wed Mar 20 23:33:02 UTC 2024
Modified Files:
src/sys/dev/vmt: vmt_subr.c
Log Message:
Use a table like OpenBSD vmt.c rev. 1.27. No functional change.
Add new vmt_tclo_rpc[] table and use it. In this change, all of
vmt_tclo_xxx()'s functionality are not changed from previous.
Now we can understand what's the difference between OpenBSD's
sys/dev/pv/vmt.c and NetBSD's sys/dev/vmt/vmt_subr.c.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/vmt/vmt_subr.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/vmt/vmt_subr.c
diff -u src/sys/dev/vmt/vmt_subr.c:1.5 src/sys/dev/vmt/vmt_subr.c:1.6
--- src/sys/dev/vmt/vmt_subr.c:1.5 Wed Mar 20 23:32:17 2024
+++ src/sys/dev/vmt/vmt_subr.c Wed Mar 20 23:33:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt_subr.c,v 1.5 2024/03/20 23:32:17 msaitoh Exp $ */
+/* $NetBSD: vmt_subr.c,v 1.6 2024/03/20 23:33:02 msaitoh Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -79,10 +79,59 @@ static void vmt_update_guest_uptime(stru
static void vmt_sync_guest_clock(struct vmt_softc *);
static void vmt_tick(void *);
-static void vmt_tclo_tick(void *);
static void vmt_clock_sync_tick(void *);
static void vmt_pswitch_event(void *);
+static void vmt_tclo_tick(void *);
+static int vmt_tclo_process(struct vmt_softc *, const char *);
+static void vmt_tclo_reset(struct vmt_softc *);
+static void vmt_tclo_ping(struct vmt_softc *);
+static void vmt_tclo_halt(struct vmt_softc *);
+static void vmt_tclo_reboot(struct vmt_softc *);
+static void vmt_tclo_poweron(struct vmt_softc *);
+static void vmt_tclo_suspend(struct vmt_softc *);
+static void vmt_tclo_resume(struct vmt_softc *);
+static void vmt_tclo_capreg(struct vmt_softc *);
+static void vmt_tclo_broadcastip(struct vmt_softc *);
+
+struct vmt_tclo_rpc {
+ const char *name;
+ void (*cb)(struct vmt_softc *);
+} vmt_tclo_rpc[] = {
+ /* Keep sorted by name (case-sensitive) */
+ { "Capabilities_Register", vmt_tclo_capreg },
+ { "OS_Halt", vmt_tclo_halt },
+ { "OS_PowerOn", vmt_tclo_poweron },
+ { "OS_Reboot", vmt_tclo_reboot },
+ { "OS_Resume", vmt_tclo_resume },
+ { "OS_Suspend", vmt_tclo_suspend },
+ { "Set_Option broadcastIP 1", vmt_tclo_broadcastip },
+ { "ping", vmt_tclo_ping },
+ { "reset", vmt_tclo_reset },
+ { NULL },
+#if 0
+ /* Various unsupported commands */
+ { "Set_Option autohide 0" },
+ { "Set_Option copypaste 1" },
+ { "Set_Option enableDnD 1" },
+ { "Set_Option enableMessageBusTunnel 0" },
+ { "Set_Option linkRootHgfsShare 0" },
+ { "Set_Option mapRootHgfsShare 0" },
+ { "Set_Option synctime 1" },
+ { "Set_Option synctime.period 0" },
+ { "Set_Option time.synchronize.tools.enable 1" },
+ { "Set_Option time.synchronize.tools.percentCorrection 0" },
+ { "Set_Option time.synchronize.tools.slewCorrection 1" },
+ { "Set_Option time.synchronize.tools.startup 1" },
+ { "Set_Option toolScripts.afterPowerOn 1" },
+ { "Set_Option toolScripts.afterResume 1" },
+ { "Set_Option toolScripts.beforePowerOff 1" },
+ { "Set_Option toolScripts.beforeSuspend 1" },
+ { "Time_Synchronize 0" },
+ { "Vix_1_Relayed_Command \"38cdcae40e075d66\"" },
+#endif
+};
+
extern char hostname[MAXHOSTNAMELEN];
static void
@@ -524,6 +573,202 @@ vmt_pswitch_event(void *xarg)
}
static void
+vmt_tclo_reset(struct vmt_softc *sc)
+{
+
+ if (sc->sc_rpc_error != 0) {
+ device_printf(sc->sc_dev, "resetting rpc\n");
+ vm_rpc_close(&sc->sc_tclo_rpc);
+
+ /* reopen and send the reset reply next time around */
+ return;
+ }
+
+ if (vm_rpc_send_str(&sc->sc_tclo_rpc, VM_RPC_RESET_REPLY) != 0) {
+ device_printf(sc->sc_dev, "failed to send reset reply\n");
+ sc->sc_rpc_error = 1;
+ }
+
+}
+
+static void
+vmt_tclo_ping(struct vmt_softc *sc)
+{
+
+ vmt_update_guest_info(sc);
+ if (vm_rpc_send_str(&sc->sc_tclo_rpc, VM_RPC_REPLY_OK) != 0) {
+ device_printf(sc->sc_dev, "error sending ping response\n");
+ sc->sc_rpc_error = 1;
+ }
+}
+
+static void
+vmt_tclo_halt(struct vmt_softc *sc)
+{
+
+ vmt_do_shutdown(sc);
+}
+
+static void
+vmt_tclo_reboot(struct vmt_softc *sc)
+{
+
+ vmt_do_reboot(sc);
+}
+
+static void
+vmt_tclo_poweron(struct vmt_softc *sc)
+{
+
+ vmt_tclo_state_change_success(sc, 1, VM_STATE_CHANGE_POWERON);
+ if (vm_rpc_send_str(&sc->sc_tclo_rpc, VM_RPC_REPLY_OK) != 0) {
+ device_printf(sc->sc_dev, "error sending poweron response\n");
+ sc->sc_rpc_error = 1;
+ }
+}
+
+static void
+vmt_tclo_suspend(struct vmt_softc *sc)
+{
+
+ log(LOG_KERN | LOG_NOTICE,
+ "VMware guest entering suspended state\n");
+
+ vmt_tclo_state_change_success(sc, 1, VM_STATE_CHANGE_SUSPEND);
+ if (vm_rpc_send_str(&sc->sc_tclo_rpc, VM_RPC_REPLY_OK) != 0) {
+ device_printf(sc->sc_dev, "error sending suspend response\n");
+ sc->sc_rpc_error = 1;
+ }
+}
+
+static void
+vmt_tclo_resume(struct vmt_softc *sc)
+{
+
+ vmt_do_resume(sc); /* XXX msaitoh extra
CVS commit: src/sys/dev/vmt
Module Name:src Committed By: msaitoh Date: Wed Mar 20 23:33:02 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: Use a table like OpenBSD vmt.c rev. 1.27. No functional change. Add new vmt_tclo_rpc[] table and use it. In this change, all of vmt_tclo_xxx()'s functionality are not changed from previous. Now we can understand what's the difference between OpenBSD's sys/dev/pv/vmt.c and NetBSD's sys/dev/vmt/vmt_subr.c. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/vmt/vmt_subr.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/vmt
Module Name:src Committed By: msaitoh Date: Wed Mar 20 23:32:18 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: Move a prototype definition. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/vmt/vmt_subr.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/vmt
Module Name:src Committed By: msaitoh Date: Wed Mar 20 23:32:18 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: Move a prototype definition. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/vmt/vmt_subr.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/vmt/vmt_subr.c diff -u src/sys/dev/vmt/vmt_subr.c:1.4 src/sys/dev/vmt/vmt_subr.c:1.5 --- src/sys/dev/vmt/vmt_subr.c:1.4 Wed Mar 20 23:31:54 2024 +++ src/sys/dev/vmt/vmt_subr.c Wed Mar 20 23:32:17 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: vmt_subr.c,v 1.4 2024/03/20 23:31:54 msaitoh Exp $ */ +/* $NetBSD: vmt_subr.c,v 1.5 2024/03/20 23:32:17 msaitoh Exp $ */ /* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */ /* @@ -72,6 +72,7 @@ static int vm_rpci_response_successful(s static void vmt_tclo_state_change_success(struct vmt_softc *, int, char); static void vmt_do_reboot(struct vmt_softc *); static void vmt_do_shutdown(struct vmt_softc *); +static bool vmt_shutdown(device_t, int); static void vmt_update_guest_info(struct vmt_softc *); static void vmt_update_guest_uptime(struct vmt_softc *); @@ -80,7 +81,6 @@ static void vmt_sync_guest_clock(struct static void vmt_tick(void *); static void vmt_tclo_tick(void *); static void vmt_clock_sync_tick(void *); -static bool vmt_shutdown(device_t, int); static void vmt_pswitch_event(void *); extern char hostname[MAXHOSTNAMELEN];
CVS commit: src/sys/dev/vmt
Module Name:src Committed By: msaitoh Date: Wed Mar 20 23:31:54 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: KNF. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/vmt/vmt_subr.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/vmt
Module Name:src
Committed By: msaitoh
Date: Wed Mar 20 23:31:54 UTC 2024
Modified Files:
src/sys/dev/vmt: vmt_subr.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/vmt/vmt_subr.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/vmt/vmt_subr.c
diff -u src/sys/dev/vmt/vmt_subr.c:1.3 src/sys/dev/vmt/vmt_subr.c:1.4
--- src/sys/dev/vmt/vmt_subr.c:1.3 Sat Mar 27 21:23:14 2021
+++ src/sys/dev/vmt/vmt_subr.c Wed Mar 20 23:31:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt_subr.c,v 1.3 2021/03/27 21:23:14 ryo Exp $ */
+/* $NetBSD: vmt_subr.c,v 1.4 2024/03/20 23:31:54 msaitoh Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -175,14 +175,17 @@ vmt_common_attach(struct vmt_softc *sc)
sc->sc_rpc_buf = kmem_alloc(VMT_RPC_BUFLEN, KM_SLEEP);
if (vm_rpc_open(&sc->sc_tclo_rpc, VM_RPC_OPEN_TCLO) != 0) {
- aprint_error_dev(self, "failed to open backdoor RPC channel (TCLO protocol)\n");
+ aprint_error_dev(self, "failed to open backdoor RPC channel "
+ "(TCLO protocol)\n");
goto free;
}
sc->sc_tclo_rpc_open = true;
/* don't know if this is important at all yet */
- if (vm_rpc_send_rpci_tx(sc, "tools.capability.hgfs_server toolbox 1") != 0) {
- aprint_error_dev(self, "failed to set HGFS server capability\n");
+ if (vm_rpc_send_rpci_tx(sc,
+ "tools.capability.hgfs_server toolbox 1") != 0) {
+ aprint_error_dev(self,
+ "failed to set HGFS server capability\n");
goto free;
}
@@ -313,7 +316,7 @@ vmt_sysctl_setup_clock_sync(device_t sel
rv = sysctl_createv(&sc->sc_log, 0, &node, &period_node,
CTLFLAG_READWRITE, CTLTYPE_INT, "period",
SYSCTL_DESCR("Period, in seconds, at which to update the "
- "guest's clock"),
+ "guest's clock"),
vmt_sysctl_update_clock_sync_period, 0, (void *)sc, 0,
CTL_CREATE, CTL_EOL);
return rv;
@@ -380,20 +383,23 @@ vmt_update_guest_info(struct vmt_softc *
}
/*
- * we're supposed to pass the full network address information back here,
- * but that involves xdr (sunrpc) data encoding, which seems a bit unreasonable.
+ * we're supposed to pass the full network address information back
+ * here, but that involves xdr (sunrpc) data encoding, which seems
+ * a bit unreasonable.
*/
if (sc->sc_set_guest_os == 0) {
if (vm_rpc_send_rpci_tx(sc, "SetGuestInfo %d %s %s %s",
- VM_GUEST_INFO_OS_NAME_FULL, ostype, osrelease, machine_arch) != 0) {
- device_printf(sc->sc_dev, "unable to set full guest OS\n");
+ VM_GUEST_INFO_OS_NAME_FULL,
+ ostype, osrelease, machine_arch) != 0) {
+ device_printf(sc->sc_dev,
+ "unable to set full guest OS\n");
sc->sc_rpc_error = 1;
}
/*
- * host doesn't like it if we send an OS name it doesn't recognise,
- * so use "other" for i386 and "other-64" for amd64
+ * Host doesn't like it if we send an OS name it doesn't
+ * recognise, so use "other" for i386 and "other-64" for amd64.
*/
if (vm_rpc_send_rpci_tx(sc, "SetGuestInfo %d %s",
VM_GUEST_INFO_OS_NAME, VM_OS_NAME) != 0) {
@@ -442,7 +448,8 @@ vmt_tclo_state_change_success(struct vmt
{
if (vm_rpc_send_rpci_tx(sc, "tools.os.statechange.status %d %d",
success, state) != 0) {
- device_printf(sc->sc_dev, "unable to send state change result\n");
+ device_printf(sc->sc_dev,
+ "unable to send state change result\n");
sc->sc_rpc_error = 1;
}
}
@@ -493,8 +500,10 @@ vmt_shutdown(device_t self, int flags)
{
struct vmt_softc *sc = device_private(self);
- if (vm_rpc_send_rpci_tx(sc, "tools.capability.hgfs_server toolbox 0") != 0) {
- device_printf(sc->sc_dev, "failed to disable hgfs server capability\n");
+ if (vm_rpc_send_rpci_tx(sc,
+ "tools.capability.hgfs_server toolbox 0") != 0) {
+ device_printf(sc->sc_dev,
+ "failed to disable hgfs server capability\n");
}
if (vm_rpc_send(&sc->sc_tclo_rpc, NULL, 0) != 0) {
@@ -526,13 +535,16 @@ vmt_tclo_tick(void *xarg)
sc->sc_tclo_rpc.cookie1 == 0 &&
sc->sc_tclo_rpc.cookie2 == 0) {
if (vm_rpc_open(&sc->sc_tclo_rpc, VM_RPC_OPEN_TCLO) != 0) {
- device_printf(sc->sc_dev, "unable to reopen TCLO channel\n");
+ device_printf(sc->sc_dev,
+ "unable to reopen TCLO channel\n");
callout_schedule(&sc->sc_tclo_tick, hz * 15);
return;
}
- if (vm_rpc_send_str(&sc->sc_tclo_rpc, VM_RPC_RESET_REPLY) != 0) {
- device_printf(sc->sc_dev, "failed to send reset reply\n");
+ if (vm_rpc_send_str(&sc->sc_tclo_rpc,
+ VM_RPC_RESET_REPLY) != 0) {
+ device_printf(sc->sc_dev,
+ "failed to send reset reply\n");
sc->sc_rpc_error = 1;
goto out;
} else {
@@ -542,14 +554,16 @@ vmt_tclo_tick(void *xarg)
if (sc->sc_tclo_ping) {
if (vm_rpc_send(&sc->sc_tclo_rpc, NULL, 0) != 0) {
- device_printf(sc->sc_dev, "failed to send TCLO outgoing ping\n");
+ device_printf(sc->s
CVS commit: src/sys/dev/pci/igc
Module Name:src
Committed By: msaitoh
Date: Wed Feb 21 12:39:39 UTC 2024
Modified Files:
src/sys/dev/pci/igc: if_igc.c igc_defines.h
Log Message:
igc(4): Print EtrackID.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/igc/if_igc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/igc/igc_defines.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/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.12 src/sys/dev/pci/igc/if_igc.c:1.13
--- src/sys/dev/pci/igc/if_igc.c:1.12 Wed Feb 21 12:34:06 2024
+++ src/sys/dev/pci/igc/if_igc.c Wed Feb 21 12:39:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $ */
+/* $NetBSD: if_igc.c,v 1.13 2024/02/21 12:39:39 msaitoh Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.13 2024/02/21 12:39:39 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_igc.h"
@@ -3850,7 +3850,7 @@ igc_print_devinfo(struct igc_softc *sc)
struct igc_hw *hw = &sc->hw;
struct igc_phy_info *phy = &hw->phy;
u_int oui, model, rev;
- uint16_t id1, id2, nvm_ver, phy_ver;
+ uint16_t id1, id2, nvm_ver, phy_ver, etk_lo, etk_hi;
char descr[MII_MAX_DESCR_LEN];
/* Print PHY Info */
@@ -3873,10 +3873,15 @@ igc_print_devinfo(struct igc_softc *sc)
phy->ops.read_reg(hw, 0x1e, &phy_ver);
aprint_normal(", PHY FW version 0x%04hx\n", phy_ver);
- /* Get NVM version */
+ /* NVM version */
hw->nvm.ops.read(hw, NVM_VERSION, 1, &nvm_ver);
- aprint_normal_dev(dev, "ROM image version %x.%02x\n",
+ /* EtrackID */
+ hw->nvm.ops.read(hw, NVM_ETKID_LO, 1, &etk_lo);
+ hw->nvm.ops.read(hw, NVM_ETKID_HI, 1, &etk_hi);
+
+ aprint_normal_dev(dev,
+ "NVM image version %x.%02x, EtrackID %04hx%04hx\n",
(nvm_ver & NVM_VERSION_MAJOR) >> NVM_VERSION_MAJOR_SHIFT,
- (nvm_ver & NVM_VERSION_MINOR));
+ nvm_ver & NVM_VERSION_MINOR, etk_hi, etk_lo);
}
Index: src/sys/dev/pci/igc/igc_defines.h
diff -u src/sys/dev/pci/igc/igc_defines.h:1.2 src/sys/dev/pci/igc/igc_defines.h:1.3
--- src/sys/dev/pci/igc/igc_defines.h:1.2 Wed Oct 4 07:35:27 2023
+++ src/sys/dev/pci/igc/igc_defines.h Wed Feb 21 12:39:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: igc_defines.h,v 1.2 2023/10/04 07:35:27 rin Exp $ */
+/* $NetBSD: igc_defines.h,v 1.3 2024/02/21 12:39:39 msaitoh Exp $ */
/* $OpenBSD: igc_defines.h,v 1.1 2021/10/31 14:52:57 patrick Exp $ */
/*-
@@ -982,6 +982,8 @@
#define NVM_CFG0x0012
#define NVM_ALT_MAC_ADDR_PTR 0x0037
#define NVM_CHECKSUM_REG 0x003F
+#define NVM_ETKID_LO 0x0042
+#define NVM_ETKID_HI 0x0043
#define IGC_NVM_CFG_DONE_PORT_0 0x04 /* MNG config cycle done */
#define IGC_NVM_CFG_DONE_PORT_1 0x08 /* ...for second port */
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: msaitoh Date: Wed Feb 21 12:39:39 UTC 2024 Modified Files: src/sys/dev/pci/igc: if_igc.c igc_defines.h Log Message: igc(4): Print EtrackID. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/igc/if_igc.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/igc/igc_defines.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/igc
Module Name:src
Committed By: msaitoh
Date: Wed Feb 21 12:34:06 UTC 2024
Modified Files:
src/sys/dev/pci/igc: if_igc.c
Log Message:
igc(4): Modify dmesg output of PHY and NVM info.
- Print PHY info first and then print NVM info.
- Remove debug output.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/igc/if_igc.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/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.11 src/sys/dev/pci/igc/if_igc.c:1.12
--- src/sys/dev/pci/igc/if_igc.c:1.11 Thu Feb 8 09:59:35 2024
+++ src/sys/dev/pci/igc/if_igc.c Wed Feb 21 12:34:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.11 2024/02/08 09:59:35 msaitoh Exp $ */
+/* $NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.11 2024/02/08 09:59:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.12 2024/02/21 12:34:06 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_igc.h"
@@ -3862,23 +3862,21 @@ igc_print_devinfo(struct igc_softc *sc)
rev = MII_REV(id2);
mii_get_descr(descr, sizeof(descr), oui, model);
if (descr[0])
- aprint_normal_dev(dev, "PHY: %s, rev. %d\n",
+ aprint_normal_dev(dev, "PHY: %s, rev. %d",
descr, rev);
else
aprint_normal_dev(dev,
- "PHY OUI 0x%06x, model 0x%04x, rev. %d\n",
+ "PHY OUI 0x%06x, model 0x%04x, rev. %d",
oui, model, rev);
+ /* PHY FW version */
+ phy->ops.read_reg(hw, 0x1e, &phy_ver);
+ aprint_normal(", PHY FW version 0x%04hx\n", phy_ver);
+
/* Get NVM version */
hw->nvm.ops.read(hw, NVM_VERSION, 1, &nvm_ver);
- /* Get PHY FW version */
- phy->ops.read_reg(hw, 0x1e, &phy_ver);
-
- aprint_normal_dev(dev, "ROM image version %x.%02x",
+ aprint_normal_dev(dev, "ROM image version %x.%02x\n",
(nvm_ver & NVM_VERSION_MAJOR) >> NVM_VERSION_MAJOR_SHIFT,
(nvm_ver & NVM_VERSION_MINOR));
- aprint_debug("(0x%04hx)", nvm_ver);
-
- aprint_normal(", PHY FW version 0x%04hx\n", phy_ver);
}
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: msaitoh Date: Wed Feb 21 12:34:06 UTC 2024 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc(4): Modify dmesg output of PHY and NVM info. - Print PHY info first and then print NVM info. - Remove debug output. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/igc/if_igc.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: msaitoh Date: Wed Feb 21 12:23:52 UTC 2024 Modified Files: src/sys/dev/pci: if_wm.c Log Message: wm(4): Fix upper 16bit of Image Unique ID(EtrackID). Don't override uid1 variable while reading option ROM version to print Image Unique ID correctly. To generate a diff of this commit: cvs rdiff -u -r1.797 -r1.798 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: msaitoh
Date: Wed Feb 21 12:23:52 UTC 2024
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm(4): Fix upper 16bit of Image Unique ID(EtrackID).
Don't override uid1 variable while reading option ROM version
to print Image Unique ID correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.797 -r1.798 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.797 src/sys/dev/pci/if_wm.c:1.798
--- src/sys/dev/pci/if_wm.c:1.797 Mon Jan 29 06:24:51 2024
+++ src/sys/dev/pci/if_wm.c Wed Feb 21 12:23:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.798 2024/02/21 12:23:52 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.798 2024/02/21 12:23:52 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -15364,16 +15364,17 @@ printver:
/* Option ROM Version */
if ((off != 0x) && (off != 0x)) {
int rv;
+ uint16_t oid0, oid1;
off += NVM_COMBO_VER_OFF;
- rv = wm_nvm_read(sc, off + 1, 1, &uid1);
- rv |= wm_nvm_read(sc, off, 1, &uid0);
- if ((rv == 0) && (uid0 != 0) && (uid0 != 0x)
- && (uid1 != 0) && (uid1 != 0x)) {
+ rv = wm_nvm_read(sc, off + 1, 1, &oid1);
+ rv |= wm_nvm_read(sc, off, 1, &oid0);
+ if ((rv == 0) && (oid0 != 0) && (oid0 != 0x)
+ && (oid1 != 0) && (oid1 != 0x)) {
/* 16bits */
-major = uid0 >> 8;
-build = (uid0 << 8) | (uid1 >> 8);
-patch = uid1 & 0x00ff;
+major = oid0 >> 8;
+build = (oid0 << 8) | (oid1 >> 8);
+patch = oid1 & 0x00ff;
aprint_verbose(", option ROM Version %d.%d.%d",
major, build, patch);
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Mon Feb 19 14:54:04 UTC 2024
Modified Files:
src/sys/dev/ic: ciss.c
Log Message:
ciss(4): Fix panic when the number of logical drive is zero.
Currently, this drives requires at least one logical drive.
If there is no any logical volume, don't attach the driver.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/ic/ciss.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/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.55 src/sys/dev/ic/ciss.c:1.56
--- src/sys/dev/ic/ciss.c:1.55 Thu Aug 17 14:19:50 2023
+++ src/sys/dev/ic/ciss.c Mon Feb 19 14:54:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.55 2023/08/17 14:19:50 andvar Exp $ */
+/* $NetBSD: ciss.c,v 1.56 2024/02/19 14:54:04 msaitoh Exp $ */
/* $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.55 2023/08/17 14:19:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.56 2024/02/19 14:54:04 msaitoh Exp $");
#include "bio.h"
@@ -427,6 +427,14 @@ ciss_attach(struct ciss_softc *sc)
mutex_exit(&sc->sc_mutex_scratch);
+ if (sc->maxunits == 0) {
+ bus_dmamem_free(sc->sc_dmat, sc->cmdseg, 1);
+ bus_dmamap_destroy(sc->sc_dmat, sc->cmdmap);
+ aprint_error_dev(sc->sc_dev,
+ "No any LD. This driver can't attach.\n");
+ return -1;
+ }
+
callout_init(&sc->sc_hb, 0);
callout_setfunc(&sc->sc_hb, ciss_heartbeat, sc);
callout_schedule(&sc->sc_hb, hz * 3);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Mon Feb 19 14:54:04 UTC 2024 Modified Files: src/sys/dev/ic: ciss.c Log Message: ciss(4): Fix panic when the number of logical drive is zero. Currently, this drives requires at least one logical drive. If there is no any logical volume, don't attach the driver. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/ic/ciss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Tue Feb 13 14:56:52 UTC 2024
Modified Files:
src/sys/dev/ic: mfireg.h
src/sys/dev/pci: mfii.c
Log Message:
mfii(4): Apply two changes from OpenBSD to fix an unknown firmware state.
My own MegaRAID 946N-8i 2G", firmware 50.5.0-2594 failed to attach.
mfii0: unknown firmware state 1879048192
1879048192 equals to 0x7000(== MFI_STATE_FW_INIT_2).
Apply following two OpenBSD commits to resolve this problem.
sys/dev/pci/mfii.c OpenBSD rev. 1.86
sys/dev/ic/mfireg.h OpenBSD rev. 1.52
Make mfii(4) recover from firmware FAULT state on startup.
In case firmware initially comes up in FAULT state, reset the device and
give it one more chance to attach successfully. The Linux megaraid_sas
driver applies the same workaround in this case. There seems to be a bug
in some firmware versions which can trigger this behaviour; see mainline
Linux commit 6431f5d7c6025f8b007af06ea090de308f7e6881
Problem observed by me with mfii(4) attached via KVM PCI-passthrough:
mfii0 at pci0 dev 2 function 0 "Symbios Logic MegaRAID SAS2208" rev 0x05: msi
mfii0: firmware fault
With this workaround in place, attachment succeeds and the device works:
mfii0 at pci0 dev 2 function 0 "Symbios Logic MegaRAID SAS2208" rev 0x05: msi
mfii0: firmware fault; attempting full device reset, this can take some time
mfii0: "RAID Ctrl SAS 6G 1GB (D3116C)", firmware 23.29.0-0019, 1024MB cache
Tested for regressions on bare metal by Hrvoje with two different adapters:
mfii0 at pci1 dev 0 function 0 "Symbios Logic MegaRAID SAS3508" rev 0x01: msi
mfii0: "PERC H740P Mini ", firmware 51.16.0-4076, 8192MB cache
mfii0 at pci4 dev 0 function 0 "Symbios Logic MegaRAID SAS2208" rev 0x05: msi
mfii0: "ServeRAID M5110", firmware 23.34.0-0023, 512MB cache
ok jmatthew@
sys/dev/pci/mfii.c OpenBSD rev. 1.87
Give mfii(4) firmware more time to transition out of UNDEFINED state.
Prevents occasional failure to recover from firmware FAULT state where
the driver gave up too early: mfii0: firmware stuck in state 0
ok deraadt@
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/mfireg.h
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/mfii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mfireg.h
diff -u src/sys/dev/ic/mfireg.h:1.24 src/sys/dev/ic/mfireg.h:1.25
--- src/sys/dev/ic/mfireg.h:1.24 Sat Jul 16 06:52:40 2022
+++ src/sys/dev/ic/mfireg.h Tue Feb 13 14:56:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mfireg.h,v 1.24 2022/07/16 06:52:40 msaitoh Exp $ */
+/* $NetBSD: mfireg.h,v 1.25 2024/02/13 14:56:52 msaitoh Exp $ */
/* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom
@@ -110,6 +110,7 @@
#define MFI_STATE_WAIT_HANDSHAKE 0x6000
#define MFI_STATE_FW_INIT_2 0x7000
#define MFI_STATE_DEVICE_SCAN 0x8000
+#define MFI_STATE_BOOT_MESSAGE_PENDING 0x9000
#define MFI_STATE_FLUSH_CACHE 0xa000
#define MFI_STATE_READY 0xb000
#define MFI_STATE_OPERATIONAL 0xc000
@@ -135,6 +136,7 @@
#define MFI_INIT_READY 0x0002
#define MFI_INIT_MFIMODE 0x0004
#define MFI_INIT_CLEAR_HANDSHAKE 0x0008
+#define MFI_INIT_HOTPLUG 0x0010
#define MFI_RESET_FLAGS MFI_INIT_READY | MFI_INIT_MFIMODE | \
MFI_INIT_ABORT
#define MFI_INIT_HOTPLUG 0x0010
Index: src/sys/dev/pci/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.31 src/sys/dev/pci/mfii.c:1.32
--- src/sys/dev/pci/mfii.c:1.31 Thu Oct 5 21:41:00 2023
+++ src/sys/dev/pci/mfii.c Tue Feb 13 14:56:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.31 2023/10/05 21:41:00 christos Exp $ */
+/* $NetBSD: mfii.c,v 1.32 2024/02/13 14:56:52 msaitoh Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.31 2023/10/05 21:41:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.32 2024/02/13 14:56:52 msaitoh Exp $");
#include "bio.h"
@@ -440,6 +440,7 @@ static void mfii_put_ccb(struct mfii_so
static int mfii_init_ccb(struct mfii_softc *);
static void mfii_scrub_ccb(struct mfii_ccb *);
+static int mfii_reset_hard(struct mfii_softc *);
static int mfii_transition_firmware(struct mfii_softc *);
static int mfii_initialise_firmware(struct mfii_softc *);
static int mfii_get_info(struct mfii_softc *);
@@ -1489,11 +1490,58 @@ mfii_aen_unregister(struct mfii_softc *s
/* XXX */
}
+int
+mfii_reset_hard(struct mfii_softc *sc)
+{
+ uint16_t i;
+
+ mfii_write(sc, MFI_OSTS, 0);
+
+ /* enable diagnostic register */
+ mfii_write(sc, MPII_WRITESEQ, MPII_WRITESEQ_FLUSH);
+ mfii_write(sc, MPII_WRITESEQ, MPII_WRITESEQ_1);
+ mfii_write(sc, MPII_WRITESEQ, MPII_WRITESEQ_2);
+ mfii_write(sc, MPII_WRITESEQ, MPII_WRITESEQ_3);
+ mfii_write(sc, MPII_WRITESEQ, MPII_WRITESEQ_4);
+ mfii_wr
CVS commit: src/sys/dev
Module Name:src Committed By: msaitoh Date: Tue Feb 13 14:56:52 UTC 2024 Modified Files: src/sys/dev/ic: mfireg.h src/sys/dev/pci: mfii.c Log Message: mfii(4): Apply two changes from OpenBSD to fix an unknown firmware state. My own MegaRAID 946N-8i 2G", firmware 50.5.0-2594 failed to attach. mfii0: unknown firmware state 1879048192 1879048192 equals to 0x7000(== MFI_STATE_FW_INIT_2). Apply following two OpenBSD commits to resolve this problem. sys/dev/pci/mfii.c OpenBSD rev. 1.86 sys/dev/ic/mfireg.h OpenBSD rev. 1.52 Make mfii(4) recover from firmware FAULT state on startup. In case firmware initially comes up in FAULT state, reset the device and give it one more chance to attach successfully. The Linux megaraid_sas driver applies the same workaround in this case. There seems to be a bug in some firmware versions which can trigger this behaviour; see mainline Linux commit 6431f5d7c6025f8b007af06ea090de308f7e6881 Problem observed by me with mfii(4) attached via KVM PCI-passthrough: mfii0 at pci0 dev 2 function 0 "Symbios Logic MegaRAID SAS2208" rev 0x05: msi mfii0: firmware fault With this workaround in place, attachment succeeds and the device works: mfii0 at pci0 dev 2 function 0 "Symbios Logic MegaRAID SAS2208" rev 0x05: msi mfii0: firmware fault; attempting full device reset, this can take some time mfii0: "RAID Ctrl SAS 6G 1GB (D3116C)", firmware 23.29.0-0019, 1024MB cache Tested for regressions on bare metal by Hrvoje with two different adapters: mfii0 at pci1 dev 0 function 0 "Symbios Logic MegaRAID SAS3508" rev 0x01: msi mfii0: "PERC H740P Mini ", firmware 51.16.0-4076, 8192MB cache mfii0 at pci4 dev 0 function 0 "Symbios Logic MegaRAID SAS2208" rev 0x05: msi mfii0: "ServeRAID M5110", firmware 23.34.0-0023, 512MB cache ok jmatthew@ sys/dev/pci/mfii.c OpenBSD rev. 1.87 Give mfii(4) firmware more time to transition out of UNDEFINED state. Prevents occasional failure to recover from firmware FAULT state where the driver gave up too early: mfii0: firmware stuck in state 0 ok deraadt@ To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/mfireg.h cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/mfii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/igc
Module Name:src Committed By: msaitoh Date: Thu Feb 8 09:59:35 UTC 2024 Modified Files: src/sys/dev/pci/igc: if_igc.c Log Message: igc: Add missing igc_check_for_link() call. It's required to set the collision distance, configure flow control from the negotiated result and set the LTR thresholds. With this change, ifconfig igcN show the flow control status correctly. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/igc/if_igc.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/igc
Module Name:src
Committed By: msaitoh
Date: Thu Feb 8 09:59:35 UTC 2024
Modified Files:
src/sys/dev/pci/igc: if_igc.c
Log Message:
igc: Add missing igc_check_for_link() call.
It's required to set the collision distance, configure flow control
from the negotiated result and set the LTR thresholds.
With this change, ifconfig igcN show the flow control status correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/igc/if_igc.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/igc/if_igc.c
diff -u src/sys/dev/pci/igc/if_igc.c:1.10 src/sys/dev/pci/igc/if_igc.c:1.11
--- src/sys/dev/pci/igc/if_igc.c:1.10 Thu Jan 25 05:48:56 2024
+++ src/sys/dev/pci/igc/if_igc.c Thu Feb 8 09:59:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.10 2024/01/25 05:48:56 msaitoh Exp $ */
+/* $NetBSD: if_igc.c,v 1.11 2024/02/08 09:59:35 msaitoh Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.10 2024/01/25 05:48:56 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.11 2024/02/08 09:59:35 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_igc.h"
@@ -2548,6 +2548,9 @@ igc_update_link_status(struct igc_softc
struct ifnet *ifp = &sc->sc_ec.ec_if;
struct igc_hw *hw = &sc->hw;
+ if (hw->mac.get_link_status == true)
+ igc_check_for_link(hw);
+
if (IGC_READ_REG(&sc->hw, IGC_STATUS) & IGC_STATUS_LU) {
if (sc->link_active == 0) {
igc_get_speed_and_duplex(hw, &sc->link_speed,
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:25:58 UTC 2024 Modified Files: src/share/man/man4: gcscaudio.4 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/gcscaudio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/gcscaudio.4 diff -u src/share/man/man4/gcscaudio.4:1.4 src/share/man/man4/gcscaudio.4:1.5 --- src/share/man/man4/gcscaudio.4:1.4 Wed Feb 7 04:20:26 2024 +++ src/share/man/man4/gcscaudio.4 Wed Feb 7 04:25:58 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: gcscaudio.4,v 1.4 2024/02/07 04:20:26 msaitoh Exp $ +.\" $NetBSD: gcscaudio.4,v 1.5 2024/02/07 04:25:58 msaitoh Exp $ .\" .\" Copyright (c) 2009 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 February 27, 2024 +.Dd February 7, 2024 .Dt GCSCAUDIO 4 .Os .Sh NAME
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:25:58 UTC 2024 Modified Files: src/share/man/man4: gcscaudio.4 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/gcscaudio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:20:29 UTC 2024 Modified Files: src/common/lib/libc/arch/aarch64/string: bcopy.S src/common/lib/libc/arch/sh3/string: memcpy.S src/share/man/man4: aq.4 gcscaudio.4 src/sys/arch/aarch64/aarch64: aarch32_syscall.c bus_space.c bus_space_asm_generic.S bus_space_notimpl.S cpu.c cpufunc.c db_disasm.c db_interface.c db_trace.c disasm.c disasm.h fault.c kobj_machdep.c linux_syscall.c locore.S netbsd32_machdep.c netbsd32_syscall.c pmap.c pmapboot.c procfs_machdep.c start.S src/sys/arch/aarch64/include: cpufunc.h machdep.h src/sys/arch/arm/amlogic: meson_pwm.c meson_thermal.c meson_usbctrl.c mesong12_aoclkc.c mesong12_aoclkc.h mesong12_clkc.h mesong12_usb2phy.c mesong12_usb3pciephy.c src/sys/arch/arm/imx: if_enet.c if_enetreg.h if_enetvar.h imx51_axi.c imx51_intr.h imx51_tzic.c imxpciereg.h imxsnvs.c imxsnvsreg.h src/sys/arch/arm/nxp: imx6_ccmreg.h imx6_iomuxreg.h imx6_ocotp.c imx6_ocotpreg.h imx6_ocotpvar.h imx6_srcreg.h imx6_usbreg.h imx6var.h imx_ahcisatareg.h imx_snvs.c src/sys/arch/arm/rockchip: rk3588_cru.c rk3588_cru.h rk3588_iomux.c rk3588_platform.h rk_eqos.c src/sys/arch/dreamcast/dev/g2: aica.c aicavar.h src/sys/arch/dreamcast/dev/microcode: aica_arm.c aica_arm_locore.S src/sys/arch/riscv/riscv: bus_space_notimpl.S src/sys/arch/sh3/sh3: cpu_in_cksum.S src/sys/compat/linux/arch/aarch64: linux_machdep.c src/sys/compat/linux32/arch/aarch64: linux32_machdep.c linux32_sigcode.S src/sys/dev/fdt: pwmregulator.c vmt_fdt.c src/sys/dev/pci: gcscaudio.c gcscaudioreg.h if_aq.c src/sys/net: toeplitz.c src/usr.sbin/cpuctl/arch: aarch64.c src/usr.sbin/tprof: tprof_top.c Log Message: Remove ryo@'s mail addresses. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/aarch64/string/bcopy.S cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sh3/string/memcpy.S cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/aq.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/gcscaudio.4 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/aarch32_syscall.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/aarch64/aarch64/bus_space.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/bus_space_asm_generic.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/aarch64/bus_space_notimpl.S \ src/sys/arch/aarch64/aarch64/disasm.h \ src/sys/arch/aarch64/aarch64/netbsd32_syscall.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/aarch64/aarch64/cpu.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/cpufunc.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/aarch64/db_disasm.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/aarch64/aarch64/db_interface.c \ src/sys/arch/aarch64/aarch64/db_trace.c \ src/sys/arch/aarch64/aarch64/netbsd32_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/disasm.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/aarch64/aarch64/fault.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/aarch64/aarch64/kobj_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/linux_syscall.c cvs rdiff -u -r1.92 -r1.93 src/sys/arch/aarch64/aarch64/locore.S cvs rdiff -u -r1.149 -r1.150 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/aarch64/pmapboot.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/aarch64/procfs_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/aarch64/start.S cvs rdiff -u -r1.26 -r1.27 src/sys/arch/aarch64/include/cpufunc.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/include/machdep.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/meson_pwm.c \ src/sys/arch/arm/amlogic/meson_usbctrl.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/meson_thermal.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/mesong12_aoclkc.c \ src/sys/arch/arm/amlogic/mesong12_usb2phy.c \ src/sys/arch/arm/amlogic/mesong12_usb3pciephy.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/mesong12_aoclkc.h \ src/sys/arch/arm/amlogic/mesong12_clkc.h cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/if_enetreg.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/if_enetvar.h \ src/sys/arch/arm/imx/imx51_tzic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/imx/imx51_axi.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx51_intr.h \ src/sys/arch/arm/imx/imxpciereg.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imxsnvs.c \ src/sys/arch/arm/imx/imxsnvsreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_ccmreg.h \ src/sys/arch/arm/nxp/imx6_ocotp.c src/sys/arch/arm/nxp/imx_snvs.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_iomuxreg.h \ src/sys/arch/arm/nxp/imx6_ocotpreg.h src/sys/arch/arm/nxp/imx6_ocotpvar.h \ src/sys/arch/arm/nxp
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:20:29 UTC 2024 Modified Files: src/common/lib/libc/arch/aarch64/string: bcopy.S src/common/lib/libc/arch/sh3/string: memcpy.S src/share/man/man4: aq.4 gcscaudio.4 src/sys/arch/aarch64/aarch64: aarch32_syscall.c bus_space.c bus_space_asm_generic.S bus_space_notimpl.S cpu.c cpufunc.c db_disasm.c db_interface.c db_trace.c disasm.c disasm.h fault.c kobj_machdep.c linux_syscall.c locore.S netbsd32_machdep.c netbsd32_syscall.c pmap.c pmapboot.c procfs_machdep.c start.S src/sys/arch/aarch64/include: cpufunc.h machdep.h src/sys/arch/arm/amlogic: meson_pwm.c meson_thermal.c meson_usbctrl.c mesong12_aoclkc.c mesong12_aoclkc.h mesong12_clkc.h mesong12_usb2phy.c mesong12_usb3pciephy.c src/sys/arch/arm/imx: if_enet.c if_enetreg.h if_enetvar.h imx51_axi.c imx51_intr.h imx51_tzic.c imxpciereg.h imxsnvs.c imxsnvsreg.h src/sys/arch/arm/nxp: imx6_ccmreg.h imx6_iomuxreg.h imx6_ocotp.c imx6_ocotpreg.h imx6_ocotpvar.h imx6_srcreg.h imx6_usbreg.h imx6var.h imx_ahcisatareg.h imx_snvs.c src/sys/arch/arm/rockchip: rk3588_cru.c rk3588_cru.h rk3588_iomux.c rk3588_platform.h rk_eqos.c src/sys/arch/dreamcast/dev/g2: aica.c aicavar.h src/sys/arch/dreamcast/dev/microcode: aica_arm.c aica_arm_locore.S src/sys/arch/riscv/riscv: bus_space_notimpl.S src/sys/arch/sh3/sh3: cpu_in_cksum.S src/sys/compat/linux/arch/aarch64: linux_machdep.c src/sys/compat/linux32/arch/aarch64: linux32_machdep.c linux32_sigcode.S src/sys/dev/fdt: pwmregulator.c vmt_fdt.c src/sys/dev/pci: gcscaudio.c gcscaudioreg.h if_aq.c src/sys/net: toeplitz.c src/usr.sbin/cpuctl/arch: aarch64.c src/usr.sbin/tprof: tprof_top.c Log Message: Remove ryo@'s mail addresses. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/aarch64/string/bcopy.S cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sh3/string/memcpy.S cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/aq.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/gcscaudio.4 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/aarch32_syscall.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/aarch64/aarch64/bus_space.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/bus_space_asm_generic.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/aarch64/bus_space_notimpl.S \ src/sys/arch/aarch64/aarch64/disasm.h \ src/sys/arch/aarch64/aarch64/netbsd32_syscall.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/aarch64/aarch64/cpu.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/cpufunc.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/aarch64/db_disasm.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/aarch64/aarch64/db_interface.c \ src/sys/arch/aarch64/aarch64/db_trace.c \ src/sys/arch/aarch64/aarch64/netbsd32_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/disasm.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/aarch64/aarch64/fault.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/aarch64/aarch64/kobj_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/linux_syscall.c cvs rdiff -u -r1.92 -r1.93 src/sys/arch/aarch64/aarch64/locore.S cvs rdiff -u -r1.149 -r1.150 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/aarch64/pmapboot.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/aarch64/procfs_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/aarch64/start.S cvs rdiff -u -r1.26 -r1.27 src/sys/arch/aarch64/include/cpufunc.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/include/machdep.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/meson_pwm.c \ src/sys/arch/arm/amlogic/meson_usbctrl.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/meson_thermal.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/mesong12_aoclkc.c \ src/sys/arch/arm/amlogic/mesong12_usb2phy.c \ src/sys/arch/arm/amlogic/mesong12_usb3pciephy.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/mesong12_aoclkc.h \ src/sys/arch/arm/amlogic/mesong12_clkc.h cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/if_enetreg.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/if_enetvar.h \ src/sys/arch/arm/imx/imx51_tzic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/imx/imx51_axi.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx51_intr.h \ src/sys/arch/arm/imx/imxpciereg.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imxsnvs.c \ src/sys/arch/arm/imx/imxsnvsreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_ccmreg.h \ src/sys/arch/arm/nxp/imx6_ocotp.c src/sys/arch/arm/nxp/imx_snvs.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_iomuxreg.h \ src/sys/arch/arm/nxp/imx6_ocotpreg.h src/sys/arch/arm/nxp/imx6_ocotpvar.h \ src/sys/arch/arm/nxp
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:02:36 UTC 2024 Modified Files: src/doc: CHANGES.prev src/sys/arch/sparc/stand/bootxx: promlib.c src/sys/dev/pcmcia: pcmciareg.h Log Message: Fix typo of "following" in comment. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/doc/CHANGES.prev cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/stand/bootxx/promlib.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pcmcia/pcmciareg.h 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.prev diff -u src/doc/CHANGES.prev:1.181 src/doc/CHANGES.prev:1.182 --- src/doc/CHANGES.prev:1.181 Sat Feb 3 21:25:02 2024 +++ src/doc/CHANGES.prev Wed Feb 7 04:02:36 2024 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.181 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.182 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -11753,7 +11753,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0: rtsold(8): Removed in favour of dhcpcd. [roy 20140911] dhcpcd(8): Import dhcpcd-6.4.5. [roy 20140918] arm: Add support for i.MX6 SoC. [ryo 20140925] - gpt(8): Completed overhaul, including adding follwing subcommands: + gpt(8): Completed overhaul, including adding following subcommands: resize, set, unset, backup, restore, and resizedisk. [jnemeth 20140926] dhcpcd(8): Import dhcpcd-6.4.7. [roy 20140927] Index: src/sys/arch/sparc/stand/bootxx/promlib.c diff -u src/sys/arch/sparc/stand/bootxx/promlib.c:1.11 src/sys/arch/sparc/stand/bootxx/promlib.c:1.12 --- src/sys/arch/sparc/stand/bootxx/promlib.c:1.11 Sun Jul 17 20:54:47 2011 +++ src/sys/arch/sparc/stand/bootxx/promlib.c Wed Feb 7 04:02:36 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: promlib.c,v 1.11 2011/07/17 20:54:47 joerg Exp $ */ +/* $NetBSD: promlib.c,v 1.12 2024/02/07 04:02:36 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ * Specially crafted scaled-down version of promlib for the first-stage * boot program. * - * bootxx needs the follwoing PROM functions: + * bootxx needs the following PROM functions: * prom_version() * prom_getbootpath() * prom_putchar() Index: src/sys/dev/pcmcia/pcmciareg.h diff -u src/sys/dev/pcmcia/pcmciareg.h:1.11 src/sys/dev/pcmcia/pcmciareg.h:1.12 --- src/sys/dev/pcmcia/pcmciareg.h:1.11 Sun Sep 1 00:36:52 2019 +++ src/sys/dev/pcmcia/pcmciareg.h Wed Feb 7 04:02:36 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pcmciareg.h,v 1.11 2019/09/01 00:36:52 mlelstv Exp $ */ +/* $NetBSD: pcmciareg.h,v 1.12 2024/02/07 04:02:36 msaitoh Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -61,7 +61,7 @@ /* * the 2.1 docs have 0x02-0x07 as reserved, but the linux drivers list the - * follwing tuple code values. I have at least one card (3com 3c562 + * following tuple code values. I have at least one card (3com 3c562 * lan+modem) which has a code 0x06 tuple, so I'm going to assume that these * are for real */
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:02:36 UTC 2024 Modified Files: src/doc: CHANGES.prev src/sys/arch/sparc/stand/bootxx: promlib.c src/sys/dev/pcmcia: pcmciareg.h Log Message: Fix typo of "following" in comment. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/doc/CHANGES.prev cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/stand/bootxx/promlib.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pcmcia/pcmciareg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:00:11 UTC 2024 Modified Files: src/sys/arch/ia64/include: pmap.h src/usr.sbin/makefs: README Log Message: s/strucutre/structure/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/pmap.h cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/README 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/ia64/include/pmap.h diff -u src/sys/arch/ia64/include/pmap.h:1.9 src/sys/arch/ia64/include/pmap.h:1.10 --- src/sys/arch/ia64/include/pmap.h:1.9 Fri Oct 6 11:45:37 2023 +++ src/sys/arch/ia64/include/pmap.h Wed Feb 7 04:00:11 2024 @@ -163,7 +163,7 @@ void pmap_procwr(struct proc *, vaddr_t, * Note that we if we access the kernel pmap in interrupt context, it * is only to update statistics. Since stats are updated using atomic * operations, locking the kernel pmap is not necessary. Therefore, - * it is not necessary to block interrupts when locking pmap strucutres. + * it is not necessary to block interrupts when locking pmap structures. */ /* XXX #define PMAP_LOCK(pmap) mutex_enter(&(pmap)->pm_slock) Index: src/usr.sbin/makefs/README diff -u src/usr.sbin/makefs/README:1.8 src/usr.sbin/makefs/README:1.9 --- src/usr.sbin/makefs/README:1.8 Wed Oct 26 21:56:19 2022 +++ src/usr.sbin/makefs/README Wed Feb 7 04:00:10 2024 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.8 2022/10/26 21:56:19 andvar Exp $ +$NetBSD: README,v 1.9 2024/02/07 04:00:10 msaitoh Exp $ makefs - build a file system image from a directory tree @@ -102,7 +102,7 @@ Each fs-specific module should have the prepare_options and cleanup_options are optional and can be NULL. NOTE: All file system specific options are referenced via the fs_specific -pointer from the fsinfo_t strucutre. It is up to the filesystem to allocate +pointer from the fsinfo_t structure. It is up to the filesystem to allocate and free any data needed for this via the prepare and cleanup callbacks. Each fs-specific module will need to add its routines to the dispatch array
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:00:11 UTC 2024 Modified Files: src/sys/arch/ia64/include: pmap.h src/usr.sbin/makefs: README Log Message: s/strucutre/structure/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/pmap.h cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jan 29 06:24:51 UTC 2024
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm(4): Fix compile error without WM_EVENT_COUNTERS.
To generate a diff of this commit:
cvs rdiff -u -r1.796 -r1.797 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.796 src/sys/dev/pci/if_wm.c:1.797
--- src/sys/dev/pci/if_wm.c:1.796 Mon Jan 29 06:05:11 2024
+++ src/sys/dev/pci/if_wm.c Mon Jan 29 06:24:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.796 2024/01/29 06:05:11 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.796 2024/01/29 06:05:11 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.797 2024/01/29 06:24:51 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -6640,7 +6640,6 @@ wm_update_stats(struct wm_softc *sc)
uint64_t crcerrs, algnerrc, symerrc, mpc, colc, sec, rlec, rxerrc,
cexterr;
uint64_t total_qdrop = 0;
- int i;
crcerrs = CSR_READ(sc, WMREG_CRCERRS);
symerrc = CSR_READ(sc, WMREG_SYMERRC);
@@ -6789,7 +6788,8 @@ wm_update_stats(struct wm_softc *sc)
WM_EVCNT_ADD(&sc->sc_ev_lenerrs, CSR_READ(sc, WMREG_LENERRS));
WM_EVCNT_ADD(&sc->sc_ev_scvpc, CSR_READ(sc, WMREG_SCVPC));
WM_EVCNT_ADD(&sc->sc_ev_hrmpc, CSR_READ(sc, WMREG_HRMPC));
- for (i = 0; i < sc->sc_nqueues; i++) {
+#ifdef WM_EVENT_COUNTERS
+ for (int i = 0; i < sc->sc_nqueues; i++) {
struct wm_rxqueue *rxq = &sc->sc_queue[i].wmq_rxq;
uint32_t rqdpc;
@@ -6803,6 +6803,7 @@ wm_update_stats(struct wm_softc *sc)
WM_Q_EVCNT_ADD(rxq, qdrop, rqdpc);
total_qdrop += rqdpc;
}
+#endif
}
if ((sc->sc_type >= WM_T_I350) && !WM_IS_ICHPCH(sc)) {
WM_EVCNT_ADD(&sc->sc_ev_tlpic, CSR_READ(sc, WMREG_TLPIC));
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Jan 29 06:24:51 UTC 2024 Modified Files: src/sys/dev/pci: if_wm.c Log Message: wm(4): Fix compile error without WM_EVENT_COUNTERS. To generate a diff of this commit: cvs rdiff -u -r1.796 -r1.797 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: msaitoh
Date: Mon Jan 29 06:05:11 UTC 2024
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
wm(4): Drop frames if the RX descriptor ring has no room on multiqueue system.
Drop frames if the RX descriptor ring has no room. This is enabled only on
multiqueue system to avoid bad influence to other queues. The drop count
can be seen by the RQDPC counter (wmN rxqXXdrop evcnt).
To generate a diff of this commit:
cvs rdiff -u -r1.795 -r1.796 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.795 src/sys/dev/pci/if_wm.c:1.796
--- src/sys/dev/pci/if_wm.c:1.795 Mon Jan 29 05:02:06 2024
+++ src/sys/dev/pci/if_wm.c Mon Jan 29 06:05:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.795 2024/01/29 05:02:06 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.796 2024/01/29 06:05:11 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.795 2024/01/29 05:02:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.796 2024/01/29 06:05:11 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -8458,6 +8458,8 @@ wm_init_rx_regs(struct wm_softc *sc, str
rxq->rxq_descsize * rxq->rxq_ndesc);
if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
+ uint32_t srrctl;
+
if (MCLBYTES & ((1 << SRRCTL_BSIZEPKT_SHIFT) - 1))
panic("%s: MCLBYTES %d unsupported for 82575 "
"or higher\n", __func__, MCLBYTES);
@@ -8466,9 +8468,17 @@ wm_init_rx_regs(struct wm_softc *sc, str
* Currently, support SRRCTL_DESCTYPE_ADV_ONEBUF
* only.
*/
- CSR_WRITE(sc, WMREG_SRRCTL(qid),
- SRRCTL_DESCTYPE_ADV_ONEBUF
- | (MCLBYTES >> SRRCTL_BSIZEPKT_SHIFT));
+ srrctl = SRRCTL_DESCTYPE_ADV_ONEBUF
+ | (MCLBYTES >> SRRCTL_BSIZEPKT_SHIFT);
+ /*
+ * Drop frames if the RX descriptor ring has no room.
+ * This is enabled only on multiqueue system to avoid
+ * bad influence to other queues.
+ */
+ if (sc->sc_nqueues > 1)
+srrctl |= SRRCTL_DROP_EN;
+ CSR_WRITE(sc, WMREG_SRRCTL(qid), srrctl);
+
CSR_WRITE(sc, WMREG_RXDCTL(qid), RXDCTL_QUEUE_ENABLE
| RXDCTL_PTHRESH(16) | RXDCTL_HTHRESH(8)
| RXDCTL_WTHRESH(1));
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Jan 29 06:05:11 UTC 2024 Modified Files: src/sys/dev/pci: if_wm.c Log Message: wm(4): Drop frames if the RX descriptor ring has no room on multiqueue system. Drop frames if the RX descriptor ring has no room. This is enabled only on multiqueue system to avoid bad influence to other queues. The drop count can be seen by the RQDPC counter (wmN rxqXXdrop evcnt). To generate a diff of this commit: cvs rdiff -u -r1.795 -r1.796 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: msaitoh Date: Mon Jan 29 05:02:06 UTC 2024 Modified Files: src/sys/dev/pci: if_wm.c if_wmreg.h Log Message: wm(4): Add RQDPC(Receive Queue Drop Packet Count) to iqdrops. The iqdrops counter should include not only MPC(Missed Packet Count) but also RQDPC(Receive Queue Drop Packet Count). Same as ixgbe(4) and igc(4). Note that the RQDPC is not currently counted because SRRCTL_DROP_EN is not set. To generate a diff of this commit: cvs rdiff -u -r1.794 -r1.795 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.130 -r1.131 src/sys/dev/pci/if_wmreg.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: msaitoh
Date: Mon Jan 29 05:02:06 UTC 2024
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h
Log Message:
wm(4): Add RQDPC(Receive Queue Drop Packet Count) to iqdrops.
The iqdrops counter should include not only MPC(Missed Packet Count)
but also RQDPC(Receive Queue Drop Packet Count). Same as ixgbe(4) and igc(4).
Note that the RQDPC is not currently counted because SRRCTL_DROP_EN
is not set.
To generate a diff of this commit:
cvs rdiff -u -r1.794 -r1.795 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/pci/if_wmreg.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.794 src/sys/dev/pci/if_wm.c:1.795
--- src/sys/dev/pci/if_wm.c:1.794 Fri Jan 26 03:23:36 2024
+++ src/sys/dev/pci/if_wm.c Mon Jan 29 05:02:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.794 2024/01/26 03:23:36 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.795 2024/01/29 05:02:06 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.794 2024/01/26 03:23:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.795 2024/01/29 05:02:06 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -460,9 +460,9 @@ struct wm_rxqueue {
/* RX event counters */
WM_Q_EVCNT_DEFINE(rxq, intr); /* Interrupts */
WM_Q_EVCNT_DEFINE(rxq, defer); /* Rx deferred processing */
-
WM_Q_EVCNT_DEFINE(rxq, ipsum); /* IP checksums checked */
WM_Q_EVCNT_DEFINE(rxq, tusum); /* TCP/UDP cksums checked */
+ WM_Q_EVCNT_DEFINE(rxq, qdrop); /* Rx queue drop packet */
#endif
};
@@ -6639,6 +6639,8 @@ wm_update_stats(struct wm_softc *sc)
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
uint64_t crcerrs, algnerrc, symerrc, mpc, colc, sec, rlec, rxerrc,
cexterr;
+ uint64_t total_qdrop = 0;
+ int i;
crcerrs = CSR_READ(sc, WMREG_CRCERRS);
symerrc = CSR_READ(sc, WMREG_SYMERRC);
@@ -6787,6 +6789,20 @@ wm_update_stats(struct wm_softc *sc)
WM_EVCNT_ADD(&sc->sc_ev_lenerrs, CSR_READ(sc, WMREG_LENERRS));
WM_EVCNT_ADD(&sc->sc_ev_scvpc, CSR_READ(sc, WMREG_SCVPC));
WM_EVCNT_ADD(&sc->sc_ev_hrmpc, CSR_READ(sc, WMREG_HRMPC));
+ for (i = 0; i < sc->sc_nqueues; i++) {
+ struct wm_rxqueue *rxq = &sc->sc_queue[i].wmq_rxq;
+ uint32_t rqdpc;
+
+ rqdpc = CSR_READ(sc, WMREG_RQDPC(i));
+ /*
+ * On I210 and newer device, the RQDPC register is not
+ * cleard on read.
+ */
+ if ((rqdpc != 0) && (sc->sc_type >= WM_T_I210))
+CSR_WRITE(sc, WMREG_RQDPC(i), 0);
+ WM_Q_EVCNT_ADD(rxq, qdrop, rqdpc);
+ total_qdrop += rqdpc;
+ }
}
if ((sc->sc_type >= WM_T_I350) && !WM_IS_ICHPCH(sc)) {
WM_EVCNT_ADD(&sc->sc_ev_tlpic, CSR_READ(sc, WMREG_TLPIC));
@@ -6815,7 +6831,7 @@ wm_update_stats(struct wm_softc *sc)
* If you want to know the nubmer of WMREG_RMBC, you should use such as
* own EVCNT instead of if_iqdrops.
*/
- if_statadd_ref(nsr, if_iqdrops, mpc);
+ if_statadd_ref(nsr, if_iqdrops, mpc + total_qdrop);
IF_STAT_PUTREF(ifp);
}
@@ -6833,6 +6849,8 @@ wm_clear_evcnt(struct wm_softc *sc)
WM_Q_EVCNT_STORE(rxq, defer, 0);
WM_Q_EVCNT_STORE(rxq, ipsum, 0);
WM_Q_EVCNT_STORE(rxq, tusum, 0);
+ if ((sc->sc_type >= WM_T_82575) && !WM_IS_ICHPCH(sc))
+ WM_Q_EVCNT_STORE(rxq, qdrop, 0);
}
/* TX queues */
@@ -8195,9 +8213,10 @@ wm_alloc_txrx_queues(struct wm_softc *sc
WM_Q_INTR_EVCNT_ATTACH(rxq, intr, rxq, i, xname);
WM_Q_INTR_EVCNT_ATTACH(rxq, defer, rxq, i, xname);
-
WM_Q_MISC_EVCNT_ATTACH(rxq, ipsum, rxq, i, xname);
WM_Q_MISC_EVCNT_ATTACH(rxq, tusum, rxq, i, xname);
+ if ((sc->sc_type >= WM_T_82575) && !WM_IS_ICHPCH(sc))
+ WM_Q_MISC_EVCNT_ATTACH(rxq, qdrop, rxq, i, xname);
#endif /* WM_EVENT_COUNTERS */
rx_done++;
@@ -8248,6 +8267,8 @@ wm_free_txrx_queues(struct wm_softc *sc)
WM_Q_EVCNT_DETACH(rxq, defer, rxq, i);
WM_Q_EVCNT_DETACH(rxq, ipsum, rxq, i);
WM_Q_EVCNT_DETACH(rxq, tusum, rxq, i);
+ if ((sc->sc_type >= WM_T_82575) && !WM_IS_ICHPCH(sc))
+ WM_Q_EVCNT_DETACH(rxq, qdrop, rxq, i);
#endif /* WM_EVENT_COUNTERS */
wm_free_rx_buffer(sc, rxq);
Index: src/sys/dev/pci/if_wmreg.h
diff -u src/sys/dev/pci/if_wmreg.h:1.130 src/sys/dev/pci/if_wmreg.h:1.131
--- src/sys/dev/pci/if_wmreg.h:1.130 Thu May 11 07:19:02 2023
+++ src/sys/dev/pci/if_wmreg.h Mon Jan 29 05:02:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmreg.h,v 1.130 2023/05/11 07:19:02 msaitoh Exp $ */
+/* $NetBSD: if_wmreg.h,v 1.131 2024/01/29 05:02:06 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -857,6 +857,9 @@ struct livengood_tcpip_ctxdesc {
#define RXDCTL_QUEUE_ENABLE 0x0200 /* Enable specific Tx Queue */
#define RXDCTL_SWFLSH0x0400 /* Rx Desc. write-back flushing */
+#define WMREG_RQDPC(x) (((x) < 4) ? (0x2830 + (0x100 * (x))) : \
+ (0xc030 + (0x40 * (x /*
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Jan 26 03:23:36 UTC 2024 Modified Files: src/sys/dev/pci: if_wm.c Log Message: wm(4): Print RX packet buffer size. To generate a diff of this commit: cvs rdiff -u -r1.793 -r1.794 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.793 src/sys/dev/pci/if_wm.c:1.794 --- src/sys/dev/pci/if_wm.c:1.793 Thu Jan 18 03:16:44 2024 +++ src/sys/dev/pci/if_wm.c Fri Jan 26 03:23:36 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.793 2024/01/18 03:16:44 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.794 2024/01/26 03:23:36 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.793 2024/01/18 03:16:44 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.794 2024/01/26 03:23:36 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_if_wm.h" @@ -2722,6 +2722,10 @@ alloc_retry: /* Reset the chip to a known state. */ wm_reset(sc); + /* sc->sc_pba is set in wm_reset(). */ + aprint_verbose_dev(sc->sc_dev, "RX packet buffer size: %uKB\n", + sc->sc_pba); + /* * Check for I21[01] PLL workaround. *
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Jan 26 03:23:36 UTC 2024 Modified Files: src/sys/dev/pci: if_wm.c Log Message: wm(4): Print RX packet buffer size. To generate a diff of this commit: cvs rdiff -u -r1.793 -r1.794 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.
