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_ev_lenerrs, CSR_READ(sc, WMREG_LENERRS));
WM_EVCNT_ADD(>sc_ev_scvpc, CSR_READ(sc, WMREG_SCVPC));
WM_EVCNT_ADD(>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_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_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/distrib/utils/embedded/files
Module Name:src
Committed By: mrg
Date: Mon Jan 29 05:46:55 UTC 2024
Modified Files:
src/distrib/utils/embedded/files: creds_msdos
Log Message:
properly quote arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/files/creds_msdos
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/files/creds_msdos
diff -u src/distrib/utils/embedded/files/creds_msdos:1.5 src/distrib/utils/embedded/files/creds_msdos:1.6
--- src/distrib/utils/embedded/files/creds_msdos:1.5 Sat Dec 11 19:24:18 2021
+++ src/distrib/utils/embedded/files/creds_msdos Mon Jan 29 05:46:55 2024
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: creds_msdos,v 1.5 2021/12/11 19:24:18 mrg Exp $
+# $NetBSD: creds_msdos,v 1.6 2024/01/29 05:46:55 mrg Exp $
#
# Copyright (c) 2019 Matthew R. Green
# All rights reserved.
@@ -153,7 +153,7 @@ creds_msdos_start()
if [ -f "${creds_file}" ]; then
while read type user args; do
# strip cr
- local clean_args=$(echo "$args" | tr -d '\015')
+ local clean_args="$(echo "$args" | tr -d '\015')"
case "$type" in
\#*|'')
continue
CVS commit: src/distrib/utils/embedded/files
Module Name:src Committed By: mrg Date: Mon Jan 29 05:46:55 UTC 2024 Modified Files: src/distrib/utils/embedded/files: creds_msdos Log Message: properly quote arguments. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/files/creds_msdos Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src
Committed By: rin
Date: Mon Jan 29 05:42:41 UTC 2024
Modified Files:
src/share/misc: style
Log Message:
style: One more typo, NFC
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/share/misc/style
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/style
diff -u src/share/misc/style:1.76 src/share/misc/style:1.77
--- src/share/misc/style:1.76 Wed Jan 24 04:00:43 2024
+++ src/share/misc/style Mon Jan 29 05:42:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: style,v 1.76 2024/01/24 04:00:43 rin Exp $ */
+/* $NetBSD: style,v 1.77 2024/01/29 05:42:41 rin Exp $ */
/*
* The revision control tag appears first, with a blank line after it.
@@ -30,7 +30,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: style,v 1.76 2024/01/24 04:00:43 rin Exp $");
+__RCSID("$NetBSD: style,v 1.77 2024/01/29 05:42:41 rin Exp $");
/*
* VERY important single-line comments look like this.
@@ -64,7 +64,7 @@ __RCSID("$NetBSD: style,v 1.76 2024/01/2
* Avoid relying on transitive inclusions.
*
* Avoid header files dependencies just for struct and union types that
- * are used in pointer types, which don't require type defintions.
+ * are used in pointer types, which don't require type definitions.
* Instead, use forward declarations of the struct or union tag.
*/
#include
CVS commit: src/share/misc
Module Name:src Committed By: rin Date: Mon Jan 29 05:42:41 UTC 2024 Modified Files: src/share/misc: style Log Message: style: One more typo, NFC To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/share/misc/style 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_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_ev_lenerrs, CSR_READ(sc, WMREG_LENERRS));
WM_EVCNT_ADD(>sc_ev_scvpc, CSR_READ(sc, WMREG_SCVPC));
WM_EVCNT_ADD(>sc_ev_hrmpc, CSR_READ(sc, WMREG_HRMPC));
+ for (i = 0; i < sc->sc_nqueues; i++) {
+ struct wm_rxqueue *rxq = >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_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 /* Receive Queue Drop
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: riastradh
Date: Mon Jan 29 01:05:55 UTC 2024
Modified Files:
src/sys/dev/pci: agp_i810.c
Log Message:
agp_i810(4): Use ipi(9) for chipset flush on all CPUs, not xcall(9).
i915 now calls into this with a spin lock held, so we have to use
ipi(9), which spin-waits for the other CPUs to complete, rather than
xcall(9), which may sleep-wait.
Fortunately, this is just to execute WBINVD on x86 (and if this code
ever runs on other architectures, which it probably doesn't, it'll be
a similar barrier instruction), so spinning to wait for that on all
CPUs isn't too costly.
PR kern/57878
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/pci/agp_i810.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/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.125 src/sys/dev/pci/agp_i810.c:1.126
--- src/sys/dev/pci/agp_i810.c:1.125 Sun Jul 17 10:10:45 2022
+++ src/sys/dev/pci/agp_i810.c Mon Jan 29 01:05:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.125 2022/07/17 10:10:45 riastradh Exp $ */
+/* $NetBSD: agp_i810.c,v 1.126 2024/01/29 01:05:55 riastradh Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.125 2022/07/17 10:10:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.126 2024/01/29 01:05:55 riastradh Exp $");
#include
#include
@@ -180,7 +180,7 @@ agp_i810_post_gtt_entry(struct agp_i810_
}
static void
-agp_flush_cache_xc(void *a __unused, void *b __unused)
+agp_flush_cache_ipi(void *cookie __unused)
{
agp_flush_cache();
@@ -204,11 +204,19 @@ agp_i810_chipset_flush(struct agp_i810_s
* XXX Come to think of it, do these chipsets appear in
* any multi-CPU systems?
*/
- if (cold)
+ if (cold) {
agp_flush_cache();
- else
- xc_wait(xc_broadcast(0, _flush_cache_xc,
-NULL, NULL));
+ } else {
+ /*
+ * Caller may hold a spin lock, so use ipi(9)
+ * rather than xcall(9) here.
+ */
+ ipi_msg_t msg = { .func = agp_flush_cache_ipi };
+ kpreempt_disable();
+ ipi_broadcast(, /*skip_self*/false);
+ ipi_wait();
+ kpreempt_enable();
+ }
WRITE4(AGP_I830_HIC, READ4(AGP_I830_HIC) | __BIT(31));
while (ISSET(READ4(AGP_I830_HIC), __BIT(31))) {
if (timo-- == 0)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: riastradh Date: Mon Jan 29 01:05:55 UTC 2024 Modified Files: src/sys/dev/pci: agp_i810.c Log Message: agp_i810(4): Use ipi(9) for chipset flush on all CPUs, not xcall(9). i915 now calls into this with a spin lock held, so we have to use ipi(9), which spin-waits for the other CPUs to complete, rather than xcall(9), which may sleep-wait. Fortunately, this is just to execute WBINVD on x86 (and if this code ever runs on other architectures, which it probably doesn't, it'll be a similar barrier instruction), so spinning to wait for that on all CPUs isn't too costly. PR kern/57878 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/dev/pci/agp_i810.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: riastradh Date: Mon Jan 29 00:57:38 UTC 2024 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: postinstall(8): Don't say /etc/openssl/certs.conf already exists. It's confusing when all the other `postinstall fix' actions are silent in the event they don't have anything to do. PR install/57885 To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/postinstall/postinstall.in 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/postinstall/postinstall.in diff -u src/usr.sbin/postinstall/postinstall.in:1.57 src/usr.sbin/postinstall/postinstall.in:1.58 --- src/usr.sbin/postinstall/postinstall.in:1.57 Wed Oct 18 13:10:34 2023 +++ src/usr.sbin/postinstall/postinstall.in Mon Jan 29 00:57:38 2024 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall.in,v 1.57 2023/10/18 13:10:34 riastradh Exp $ +# $NetBSD: postinstall.in,v 1.58 2024/01/29 00:57:38 riastradh Exp $ # # Copyright (c) 2002-2022 The NetBSD Foundation, Inc. # All rights reserved. @@ -1685,7 +1685,6 @@ do_opensslcertsconf() fix) # If /etc/openssl/certs.conf is already there, nothing # to do. if [ -r "$certsconf" ]; then - msg "/etc/openssl/certs.conf already exists" return 0 fi
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: riastradh Date: Mon Jan 29 00:57:38 UTC 2024 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: postinstall(8): Don't say /etc/openssl/certs.conf already exists. It's confusing when all the other `postinstall fix' actions are silent in the event they don't have anything to do. PR install/57885 To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/mtree
Module Name:src
Committed By: riastradh
Date: Sun Jan 28 19:08:06 UTC 2024
Modified Files:
src/tests/usr.bin/mtree: t_sets.sh
Log Message:
tests/usr.bin/mtree: Fixed the set lists, no more xfail.
PR misc/57877
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/mtree/t_sets.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/mtree/t_sets.sh
diff -u src/tests/usr.bin/mtree/t_sets.sh:1.2 src/tests/usr.bin/mtree/t_sets.sh:1.3
--- src/tests/usr.bin/mtree/t_sets.sh:1.2 Fri Jan 26 00:32:46 2024
+++ src/tests/usr.bin/mtree/t_sets.sh Sun Jan 28 19:08:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_sets.sh,v 1.2 2024/01/26 00:32:46 riastradh Exp $
+# $NetBSD: t_sets.sh,v 1.3 2024/01/28 19:08:06 riastradh Exp $
#
# Copyright (c) 2024 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -29,10 +29,6 @@ check_mtree()
{
local set=$1
- if [ "$set" = base ]; then
- atf_expect_fail "PR misc/57877"
- fi
-
cd /
atf_check -o empty -s eq:0 \
mtree -e
CVS commit: src/tests/usr.bin/mtree
Module Name:src Committed By: riastradh Date: Sun Jan 28 19:08:06 UTC 2024 Modified Files: src/tests/usr.bin/mtree: t_sets.sh Log Message: tests/usr.bin/mtree: Fixed the set lists, no more xfail. PR misc/57877 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/mtree/t_sets.sh 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/dev
Module Name:src
Committed By: thorpej
Date: Sun Jan 28 17:31:40 UTC 2024
Modified Files:
src/sys/arch/hp300/dev: intio.c intiovar.h
Log Message:
Rather than having different "builtin" tables (3xx, 362, 382, 4xx),
just have a single "builtin" table with a mask indicating which of
those groups of machines have a particular built-in device.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hp300/dev/intio.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/dev/intiovar.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/dev/intio.c
diff -u src/sys/arch/hp300/dev/intio.c:1.31 src/sys/arch/hp300/dev/intio.c:1.32
--- src/sys/arch/hp300/dev/intio.c:1.31 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/hp300/dev/intio.c Sun Jan 28 17:31:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intio.c,v 1.31 2021/08/07 16:18:53 thorpej Exp $ */
+/* $NetBSD: intio.c,v 1.32 2024/01/28 17:31:40 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.31 2021/08/07 16:18:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.32 2024/01/28 17:31:40 thorpej Exp $");
#include
#include
@@ -60,47 +60,53 @@ CFATTACH_DECL_NEW(intio, sizeof(struct i
#if defined(HP320) || defined(HP330) || defined(HP340) || defined(HP345) || \
defined(HP350) || defined(HP360) || defined(HP370) || defined(HP375) || \
defined(HP380) || defined(HP385)
-static const struct intio_builtins intio_3xx_builtins[] = {
- { "rtc", RTC_BASE, -1},
- { "hil", HIL_BASE, 1},
- { "hpib", HPIB_BASE, 3},
- { "dma", DMA_BASE, 1},
- { "fb", FB_BASE, -1},
-};
-#define nintio_3xx_builtins __arraycount(intio_3xx_builtins)
+#define HAVE_INTIO_FB
#endif
-#if defined(HP362)
-static const struct intio_builtins intio_362_builtins[] = {
- { "rtc", RTC_BASE, -1},
- { "hil", HIL_BASE, 1},
- { "hpib", HPIB_BASE, 3},
- { "dma", DMA_BASE, 1},
-};
-#define nintio_362_builtins __arraycount(intio_362_builtins)
+#if defined(HP382) || defined(HP400) || defined(HP425) || defined(HP433)
+#define HAVE_INTIO_FRODO
#endif
-#if defined(HP382)
-static const struct intio_builtins intio_382_builtins[] = {
- { "rtc", RTC_BASE, -1},
- { "frodo", FRODO_BASE, 5},
- { "hil", HIL_BASE, 1},
- { "hpib", HPIB_BASE, 3},
- { "dma", DMA_BASE, 1},
-};
-#define nintio_382_builtins __arraycount(intio_382_builtins)
+#define INTIO_3xx_BUILTINS \
+ (__BIT(HP_320) | __BIT(HP_330) | __BIT(HP_340) || \
+ __BIT(HP_345) | __BIT(HP_345) | __BIT(HP_350) || \
+ __BIT(HP_360) | __BIT(HP_370) | __BIT(HP_375) || \
+ __BIT(HP_380) | __BIT(HP_385))
+
+#define INTIO_362_BUILTINS __BIT(HP_362)
+#define INTIO_382_BUILTINS __BIT(HP_382)
+
+#define INTIO_4xx_BUILTINS \
+ (__BIT(HP_400) | __BIT(HP_425) | __BIT(HP_433))
+
+#define INTIO_ALL_BUILTINS \
+ (INTIO_3xx_BUILTINS | INTIO_362_BUILTINS | \
+ INTIO_382_BUILTINS | INTIO_4xx_BUILTINS)
+
+static const struct intio_builtins intio_builtins[] = {
+ { "rtc", RTC_BASE, -1,
+ INTIO_ALL_BUILTINS },
+
+#ifdef HAVE_INTIO_FRODO
+ { "frodo", FRODO_BASE, 5,
+ INTIO_382_BUILTINS | INTIO_4xx_BUILTINS },
#endif
-#if defined(HP400) || defined(HP425) || defined(HP433)
-static const struct intio_builtins intio_4xx_builtins[] = {
- { "rtc", RTC_BASE, -1},
- { "frodo", FRODO_BASE, 5},
- { "hil", HIL_BASE, 1},
- { "hpib", HPIB_BASE, 3},
- { "dma", DMA_BASE, 1},
-};
-#define nintio_4xx_builtins __arraycount(intio_4xx_builtins)
+ { "hil", HIL_BASE, 1,
+ INTIO_ALL_BUILTINS },
+
+ { "hpib", HPIB_BASE, 3,
+ INTIO_ALL_BUILTINS },
+
+ { "dma", DMA_BASE, 1,
+ INTIO_ALL_BUILTINS },
+
+#ifdef HAVE_INTIO_FB
+ { "fb", FB_BASE, -1,
+ INTIO_3xx_BUILTINS },
#endif
+};
+#define nintio_builtins __arraycount(intio_builtins)
static int intio_matched = 0;
extern void *internalhpib;
@@ -122,76 +128,43 @@ intioattach(device_t parent, device_t se
{
struct intio_softc *sc = device_private(self);
struct intio_attach_args ia;
- const struct intio_builtins *ib;
bus_space_tag_t bst = >sc_tag;
- int ndevs;
+ const uint32_t spumask = 1U << machineid;
int i;
sc->sc_dev = self;
aprint_normal("\n");
+ KASSERT(spumask != 0);
+
memset(bst, 0, sizeof(struct bus_space_tag));
bst->bustype = HP300_BUS_SPACE_INTIO;
- switch (machineid) {
-#if defined(HP320) || defined(HP330) || defined(HP340) || defined(HP345) || \
-defined(HP350) || defined(HP360) || defined(HP370) || defined(HP375) || \
-defined(HP380) || defined(HP385)
- case HP_320:
- case HP_330:
- case HP_340:
- case HP_345:
- case HP_350:
- case HP_360:
- case HP_370:
- case HP_375:
- case HP_380:
- case HP_385:
- ib = intio_3xx_builtins;
- ndevs = nintio_3xx_builtins;
- break;
-#endif
-#if defined(HP362)
- case HP_362:
- ib = intio_362_builtins;
- ndevs = nintio_362_builtins;
- break;
-#endif
-#if defined(HP382)
- case HP_382:
- ib =
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: thorpej Date: Sun Jan 28 17:31:40 UTC 2024 Modified Files: src/sys/arch/hp300/dev: intio.c intiovar.h Log Message: Rather than having different "builtin" tables (3xx, 362, 382, 4xx), just have a single "builtin" table with a mask indicating which of those groups of machines have a particular built-in device. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hp300/dev/intio.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/dev/intiovar.h 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/aml
Module Name:src Committed By: andvar Date: Sun Jan 28 10:09:54 UTC 2024 Modified Files: src/usr.sbin/acpitools/aml: aml_common.h Log Message: s/errer/error/ in log message. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_common.h 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/aml
Module Name:src
Committed By: andvar
Date: Sun Jan 28 10:09:54 UTC 2024
Modified Files:
src/usr.sbin/acpitools/aml: aml_common.h
Log Message:
s/errer/error/ in log message.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_common.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/acpitools/aml/aml_common.h
diff -u src/usr.sbin/acpitools/aml/aml_common.h:1.2 src/usr.sbin/acpitools/aml/aml_common.h:1.3
--- src/usr.sbin/acpitools/aml/aml_common.h:1.2 Thu Jun 30 20:09:42 2011
+++ src/usr.sbin/acpitools/aml/aml_common.h Sun Jan 28 10:09:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: aml_common.h,v 1.2 2011/06/30 20:09:42 wiz Exp $ */
+/* $NetBSD: aml_common.h,v 1.3 2024/01/28 10:09:54 andvar Exp $ */
/*-
* Copyright (c) 2000 Mitsuru IWASAKI
@@ -37,7 +37,7 @@
*/
#ifdef _KERNEL
#define AML_SYSABORT() do { \
- printf("aml: fatal errer at %s:%d\n", __FILE__, __LINE__); \
+ printf("aml: fatal error at %s:%d\n", __FILE__, __LINE__); \
panic("panic in AML interpreter!");\
} while(0)
#define AML_SYSASSERT(x) do { \
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Sun Jan 28 10:06:19 UTC 2024 Modified Files: src/sys/sys: userret.h Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/sys/userret.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/sys/userret.h diff -u src/sys/sys/userret.h:1.34 src/sys/sys/userret.h:1.35 --- src/sys/sys/userret.h:1.34 Sat Sep 23 18:48:05 2023 +++ src/sys/sys/userret.h Sun Jan 28 10:06:19 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: userret.h,v 1.34 2023/09/23 18:48:05 ad Exp $ */ +/* $NetBSD: userret.h,v 1.35 2024/01/28 10:06:19 skrll Exp $ */ /*- * Copyright (c) 1998, 2000, 2003, 2006, 2008, 2019, 2020, 2023 @@ -41,7 +41,7 @@ * Define the MI code needed before returning to user mode, for trap and * syscall. * - * We handle "exceptional" events: pending signals, stop/exit actions, etc. + * We handle "exceptional" events: pending signals, stop/exit actions, etc. * Note that the event must be flagged BEFORE any AST is posted as we are * reading unlocked. */
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Sun Jan 28 10:06:19 UTC 2024 Modified Files: src/sys/sys: userret.h Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/sys/userret.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa
Module Name:src
Committed By: macallan
Date: Sun Jan 28 09:03:22 UTC 2024
Modified Files:
src/sys/arch/hppa/dev: dino.c elroy.c
src/sys/arch/hppa/hppa: mainbus.c
src/sys/arch/hppa/include: bus_defs.h bus_funcs.h
Log Message:
add missing bus_space_*_stream() methods instead of quietly aliasing them
to their potentially byte-swapping regular counterparts
ok skrll@
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/dev/elroy.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/hppa/mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/bus_defs.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/bus_funcs.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/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.16 src/sys/arch/hppa/dev/dino.c:1.17
--- src/sys/arch/hppa/dev/dino.c:1.16 Thu Sep 29 06:39:58 2022
+++ src/sys/arch/hppa/dev/dino.c Sun Jan 28 09:03:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.16 2022/09/29 06:39:58 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.17 2024/01/28 09:03:22 macallan Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.16 2022/09/29 06:39:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.17 2024/01/28 09:03:22 macallan Exp $");
/* #include "cardbus.h" */
@@ -177,10 +177,16 @@ uint8_t dino_r1(void *, bus_space_handle
uint16_t dino_r2(void *, bus_space_handle_t, bus_size_t);
uint32_t dino_r4(void *, bus_space_handle_t, bus_size_t);
uint64_t dino_r8(void *, bus_space_handle_t, bus_size_t);
+uint16_t dino_rs2(void *, bus_space_handle_t, bus_size_t);
+uint32_t dino_rs4(void *, bus_space_handle_t, bus_size_t);
+uint64_t dino_rs8(void *, bus_space_handle_t, bus_size_t);
void dino_w1(void *, bus_space_handle_t, bus_size_t, uint8_t);
void dino_w2(void *, bus_space_handle_t, bus_size_t, uint16_t);
void dino_w4(void *, bus_space_handle_t, bus_size_t, uint32_t);
void dino_w8(void *, bus_space_handle_t, bus_size_t, uint64_t);
+void dino_ws2(void *, bus_space_handle_t, bus_size_t, uint16_t);
+void dino_ws4(void *, bus_space_handle_t, bus_size_t, uint32_t);
+void dino_ws8(void *, bus_space_handle_t, bus_size_t, uint64_t);
void dino_rm_1(void *, bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
void dino_rm_2(void *, bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
void dino_rm_4(void *, bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
@@ -413,7 +419,7 @@ dino_intr_map(const struct pci_attach_ar
if (line == 0xff)
return 1;
- *ihp = line;
+ *ihp = line ;
return 0;
}
@@ -695,6 +701,59 @@ dino_r8(void *v, bus_space_handle_t h, b
return le64toh(data);
}
+uint16_t
+dino_rs2(void *v, bus_space_handle_t h, bus_size_t o)
+{
+ volatile uint16_t *p;
+
+ h += o;
+ if (h & HPPA_IOSPACE)
+ p = (volatile uint16_t *)h;
+ else {
+ struct dino_softc *sc = v;
+ volatile struct dino_regs *r = sc->sc_regs;
+
+ r->pci_addr = h;
+ p = (volatile uint16_t *)>pci_io_data;
+ if (h & 2)
+ p++;
+ }
+ return *p;
+}
+
+uint32_t
+dino_rs4(void *v, bus_space_handle_t h, bus_size_t o)
+{
+ uint32_t data;
+
+ h += o;
+ if (h & HPPA_IOSPACE)
+ data = *(volatile uint32_t *)h;
+ else {
+ struct dino_softc *sc = v;
+ volatile struct dino_regs *r = sc->sc_regs;
+
+ r->pci_addr = h;
+ data = r->pci_io_data;
+ }
+
+ return data;
+}
+
+uint64_t
+dino_rs8(void *v, bus_space_handle_t h, bus_size_t o)
+{
+ uint64_t data;
+
+ h += o;
+ if (h & HPPA_IOSPACE)
+ data = *(volatile uint64_t *)h;
+ else
+ panic("dino_r8: not implemented");
+
+ return data;
+}
+
void
dino_w1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t vv)
{
@@ -757,6 +816,51 @@ dino_w8(void *v, bus_space_handle_t h, b
panic("dino_w8: not implemented");
}
+void
+dino_ws2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t vv)
+{
+ volatile uint16_t *p;
+
+ h += o;
+ if (h & HPPA_IOSPACE)
+ p = (volatile uint16_t *)h;
+ else {
+ struct dino_softc *sc = v;
+ volatile struct dino_regs *r = sc->sc_regs;
+
+ r->pci_addr = h;
+ p = (volatile uint16_t *)>pci_io_data;
+ if (h & 2)
+ p++;
+ }
+
+ *p = vv;
+}
+
+void
+dino_ws4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t vv)
+{
+ h += o;
+ if (h & HPPA_IOSPACE)
+ *(volatile uint32_t *)h = vv;
+ else {
+ struct dino_softc *sc = v;
+ volatile struct dino_regs *r = sc->sc_regs;
+
+ r->pci_addr = h;
+ r->pci_io_data = vv;
+ }
+}
+
+void
+dino_ws8(void *v, bus_space_handle_t h, bus_size_t o, uint64_t vv)
+{
+ h += o;
+ if (h & HPPA_IOSPACE)
+ *(volatile uint64_t *)h = vv;
+ else
+ panic("dino_w8: not implemented");
+}
void
dino_rm_1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t *a, bus_size_t c)
@@ -1454,7 +1558,9 @@ const struct hppa_bus_space_tag dino_iom
NULL, dino_unmap, dino_subregion,
CVS commit: src/sys/arch/hppa
Module Name:src Committed By: macallan Date: Sun Jan 28 09:03:22 UTC 2024 Modified Files: src/sys/arch/hppa/dev: dino.c elroy.c src/sys/arch/hppa/hppa: mainbus.c src/sys/arch/hppa/include: bus_defs.h bus_funcs.h Log Message: add missing bus_space_*_stream() methods instead of quietly aliasing them to their potentially byte-swapping regular counterparts ok skrll@ To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/dev/dino.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/dev/elroy.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/hppa/mainbus.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/bus_defs.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/bus_funcs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jan 28 08:54:28 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: check-expect.lua msg_019.c queries.c
queries_schar.c queries_uchar.c
Log Message:
tests/lint: enforce diagnostics to be listed in chronologic order
While here, fix the tests on uchar platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/xlint/lint1/check-expect.lua
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/msg_019.c
cvs rdiff -u -r1.22 -r1.23 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/queries_schar.c \
src/tests/usr.bin/xlint/lint1/queries_uchar.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/check-expect.lua
diff -u src/tests/usr.bin/xlint/lint1/check-expect.lua:1.11 src/tests/usr.bin/xlint/lint1/check-expect.lua:1.12
--- src/tests/usr.bin/xlint/lint1/check-expect.lua:1.11 Sun Jan 28 08:26:07 2024
+++ src/tests/usr.bin/xlint/lint1/check-expect.lua Sun Jan 28 08:54:27 2024
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.11 2024/01/28 08:26:07 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.12 2024/01/28 08:54:27 rillig Exp $
--[[
@@ -236,9 +236,11 @@ local function check_test(c_fname, updat
local found = false
for i, c_comment in ipairs(c_comments) do
- if c_comment ~= "" and matches(expected_message, c_comment) then
-c_comments[i] = ""
-found = true
+ if c_comment ~= "" then
+if matches(expected_message, c_comment) then
+ c_comments[i] = ""
+ found = true
+end
break
end
end
Index: src/tests/usr.bin/xlint/lint1/msg_019.c
diff -u src/tests/usr.bin/xlint/lint1/msg_019.c:1.8 src/tests/usr.bin/xlint/lint1/msg_019.c:1.9
--- src/tests/usr.bin/xlint/lint1/msg_019.c:1.8 Sun Jul 9 11:18:55 2023
+++ src/tests/usr.bin/xlint/lint1/msg_019.c Sun Jan 28 08:54:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_019.c,v 1.8 2023/07/09 11:18:55 rillig Exp $ */
+/* $NetBSD: msg_019.c,v 1.9 2024/01/28 08:54:27 rillig Exp $ */
# 3 "msg_019.c"
// Test for message: void type for '%s' [19]
@@ -12,8 +12,8 @@ void global_variable;
/* expect+1: warning: static variable 'unit_variable' unused [226] */
static void unit_variable;
-/* expect+3: warning: parameter 'parameter' unused in function 'function' [231] */
-/* expect+2: error: void parameter 'parameter' cannot have name [61] */
+/* expect+3: error: void parameter 'parameter' cannot have name [61] */
+/* expect+2: warning: parameter 'parameter' unused in function 'function' [231] */
void
function(void parameter)
{
Index: src/tests/usr.bin/xlint/lint1/queries.c
diff -u src/tests/usr.bin/xlint/lint1/queries.c:1.22 src/tests/usr.bin/xlint/lint1/queries.c:1.23
--- src/tests/usr.bin/xlint/lint1/queries.c:1.22 Sat Jan 20 10:02:31 2024
+++ src/tests/usr.bin/xlint/lint1/queries.c Sun Jan 28 08:54:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: queries.c,v 1.22 2024/01/20 10:02:31 rillig Exp $ */
+/* $NetBSD: queries.c,v 1.23 2024/01/28 08:54:27 rillig Exp $ */
# 3 "queries.c"
/*
@@ -464,23 +464,7 @@ char Q17_char[] = { ' ', '\0', ' ' };
/* expect+1: invisible character U+0009 in string literal [Q17] */
char Q17_string[] = " \0 ";
-/*
- * Variables with automatic storage duration often have so small scope that
- * adding the 'const' qualifier hurts readability more than it helps.
- */
-int
-/* expect+1: const automatic variable 'const_arg' [Q18] */
-Q18(const int const_arg, int arg)
-{
- /* expect+1: const automatic variable 'Q18_scalar' [Q18] */
- const char Q18_scalar = '1';
- const char Q18_array[] = { '1', '2', '3' };
- const char Q18_string[] = "123";
- const char *Q18_string_pointer = "123";
-
- return const_arg + arg
- + Q18_scalar + Q18_array[0] + Q18_string[0] + Q18_string_pointer[0];
-}
+/* For Q18, see queries_schar.c and queries_uchar.c. */
/*
* Since queries do not affect the exit status, force a warning to make this
Index: src/tests/usr.bin/xlint/lint1/queries_schar.c
diff -u src/tests/usr.bin/xlint/lint1/queries_schar.c:1.1 src/tests/usr.bin/xlint/lint1/queries_schar.c:1.2
--- src/tests/usr.bin/xlint/lint1/queries_schar.c:1.1 Mon Jul 3 15:29:42 2023
+++ src/tests/usr.bin/xlint/lint1/queries_schar.c Sun Jan 28 08:54:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: queries_schar.c,v 1.1 2023/07/03 15:29:42 rillig Exp $ */
+/* $NetBSD: queries_schar.c,v 1.2 2024/01/28 08:54:27 rillig Exp $ */
# 3 "queries_schar.c"
/*
@@ -11,7 +11,7 @@
*/
/* lint1-only-if: schar */
-/* lint1-extra-flags: -q 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 -X 351 */
+/* lint1-extra-flags: -q 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18 -X 351 */
int
Q14(char c)
@@ -24,6 +24,24 @@ Q14(char c)
}
/*
+ * Variables with automatic storage duration often have so small scope that
+ * adding the 'const'
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jan 28 08:54:28 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: check-expect.lua msg_019.c queries.c queries_schar.c queries_uchar.c Log Message: tests/lint: enforce diagnostics to be listed in chronologic order While here, fix the tests on uchar platforms. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/xlint/lint1/check-expect.lua cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/msg_019.c cvs rdiff -u -r1.22 -r1.23 src/tests/usr.bin/xlint/lint1/queries.c cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/queries_schar.c \ src/tests/usr.bin/xlint/lint1/queries_uchar.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jan 28 08:26:07 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: check-expect.lua platform_ilp32_c90.c
platform_ilp32_c99.c platform_ilp32_trad.c
Log Message:
tests/lint: sort diagnostics in ilp32 tests chronologically
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/xlint/lint1/check-expect.lua
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c \
src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c \
src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/check-expect.lua
diff -u src/tests/usr.bin/xlint/lint1/check-expect.lua:1.10 src/tests/usr.bin/xlint/lint1/check-expect.lua:1.11
--- src/tests/usr.bin/xlint/lint1/check-expect.lua:1.10 Sun Jan 28 08:17:27 2024
+++ src/tests/usr.bin/xlint/lint1/check-expect.lua Sun Jan 28 08:26:07 2024
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.10 2024/01/28 08:17:27 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.11 2024/01/28 08:26:07 rillig Exp $
--[[
@@ -212,7 +212,6 @@ local function insert_missing(missing)
local indent = (lines[lineno] or ""):match("^([ \t]*)")
local offset = 1 + (seen[lineno] or 0)
local line = ("%s/* expect+%d: %s */"):format(indent, offset, message)
- print(("insert %s:%d %s"):format(fname, lineno, line))
table.insert(lines, lineno, line)
seen[lineno] = (seen[lineno] or 0) + 1
end
Index: src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c
diff -u src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c:1.2 src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c:1.3
--- src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c:1.2 Sat Jan 27 20:03:14 2024
+++ src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c Sun Jan 28 08:26:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_ilp32_c90.c,v 1.2 2024/01/27 20:03:14 rillig Exp $ */
+/* $NetBSD: platform_ilp32_c90.c,v 1.3 2024/01/28 08:26:07 rillig Exp $ */
# 3 "platform_ilp32_c90.c"
/*
@@ -27,27 +27,27 @@ void *lex_integer[] = {
4294967296,
/* expect+1: warning: integer constant out of range [252] */
0x0001,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
9223372036854775807,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x7fff,
/* expect+1: warning: integer constant out of range [252] */
9223372036854775808,
/* expect+1: warning: integer constant out of range [252] */
0x8000,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551615,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551616,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
0x0001,
/* expect+1: ... integer 'unsigned int' ... */
@@ -66,8 +66,8 @@ void *lex_integer[] = {
4294967296U,
/* expect+1: warning: integer constant out of range [252] */
0x0001U,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
9223372036854775807U,
/* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'unsigned long' ... */
@@ -76,17 +76,17 @@ void *lex_integer[] = {
9223372036854775808U,
/* expect+1: warning: integer constant out of range [252] */
0x8000U,
- /* expect+2: ... integer 'unsigned long' ... */
- /* expect+1: warning: integer constant out of range [252] */
+ /* expect+2: warning: integer constant out of range [252] */
+ /* expect+1: ... integer 'unsigned long' ... */
18446744073709551615U,
- /* expect+2: ... integer
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jan 28 08:26:07 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: check-expect.lua platform_ilp32_c90.c platform_ilp32_c99.c platform_ilp32_trad.c Log Message: tests/lint: sort diagnostics in ilp32 tests chronologically To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/xlint/lint1/check-expect.lua cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/platform_ilp32_c90.c \ src/tests/usr.bin/xlint/lint1/platform_ilp32_c99.c \ src/tests/usr.bin/xlint/lint1/platform_ilp32_trad.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Jan 28 08:17:27 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: accept.sh c11.c c23.c check-expect.lua
d_c99_init.c decl.c decl_arg.c decl_direct_abstract.c msg_083.c
msg_090.c msg_092.c msg_095.c msg_128.c msg_132.c msg_138.c
msg_165.c msg_182.c msg_188.c msg_249.c msg_277.c msg_324.c
msg_343.c op_colon.c platform_lp64_c90.c platform_lp64_c99.c
platform_lp64_trad.c
Log Message:
tests/lint: sort multiple diagnostics per line chronologically
For now, the chronologic order is not enforced but has to be established
manually, for example by removing all 'expect' comment lines and
regenerating them with 'accept.sh -u'.
While here, clean up a few instances that came up when regenerating the
'expect' comments, such as wrong indentation or needless deviation from
the 'expect+1' form.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/usr.bin/xlint/lint1/accept.sh \
src/tests/usr.bin/xlint/lint1/msg_249.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/c11.c
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/c23.c \
src/tests/usr.bin/xlint/lint1/msg_083.c \
src/tests/usr.bin/xlint/lint1/msg_090.c \
src/tests/usr.bin/xlint/lint1/msg_095.c \
src/tests/usr.bin/xlint/lint1/msg_128.c \
src/tests/usr.bin/xlint/lint1/op_colon.c
cvs rdiff -u -r1.9 -r1.10 src/tests/usr.bin/xlint/lint1/check-expect.lua \
src/tests/usr.bin/xlint/lint1/msg_324.c
cvs rdiff -u -r1.46 -r1.47 src/tests/usr.bin/xlint/lint1/d_c99_init.c
cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/xlint/lint1/decl_arg.c
cvs rdiff -u -r1.11 -r1.12 \
src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_092.c \
src/tests/usr.bin/xlint/lint1/msg_138.c \
src/tests/usr.bin/xlint/lint1/msg_165.c \
src/tests/usr.bin/xlint/lint1/msg_182.c \
src/tests/usr.bin/xlint/lint1/msg_188.c
cvs rdiff -u -r1.32 -r1.33 src/tests/usr.bin/xlint/lint1/msg_132.c
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/msg_277.c
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/xlint/lint1/msg_343.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/platform_lp64_c90.c \
src/tests/usr.bin/xlint/lint1/platform_lp64_c99.c \
src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/accept.sh
diff -u src/tests/usr.bin/xlint/lint1/accept.sh:1.14 src/tests/usr.bin/xlint/lint1/accept.sh:1.15
--- src/tests/usr.bin/xlint/lint1/accept.sh:1.14 Sat Jul 8 10:01:17 2023
+++ src/tests/usr.bin/xlint/lint1/accept.sh Sun Jan 28 08:17:27 2024
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: accept.sh,v 1.14 2023/07/08 10:01:17 rillig Exp $
+# $NetBSD: accept.sh,v 1.15 2024/01/28 08:17:27 rillig Exp $
#
# Copyright (c) 2021 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# usage: accept.sh ...
+# usage: accept.sh [-u] ...
#
# Run one or more lint tests, saving their output in the corresponding
# .exp files, for incorporating the messages into the .c files as
Index: src/tests/usr.bin/xlint/lint1/msg_249.c
diff -u src/tests/usr.bin/xlint/lint1/msg_249.c:1.14 src/tests/usr.bin/xlint/lint1/msg_249.c:1.15
--- src/tests/usr.bin/xlint/lint1/msg_249.c:1.14 Tue Mar 28 14:44:35 2023
+++ src/tests/usr.bin/xlint/lint1/msg_249.c Sun Jan 28 08:17:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_249.c,v 1.14 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: msg_249.c,v 1.15 2024/01/28 08:17:27 rillig Exp $ */
# 3 "msg_249.c"
// Test for message: syntax error '%s' [249]
@@ -30,8 +30,8 @@ int recover_from_rbrace;
void
function(void)
{
- /* expect+2: warning: statement not reached [193] */
if (0)
+ /* expect+1: warning: statement not reached [193] */
;
/* expect+1: error: syntax error ')' [249] */
);
@@ -71,9 +71,9 @@ int gcc_statement_expression_1 = ({
unused_label:
1;
1;
+ /* expect+2: error: syntax error 'labels are only valid inside a function' [249] */
+ /* expect+1: error: non-constant initializer [177] */
});
-/* expect-1: error: non-constant initializer [177] */
-/* expect-2: error: syntax error 'labels are only valid inside a function' [249] */
/* Even another function definition does not help. */
void
@@ -85,6 +85,6 @@ int gcc_statement_expression_2 = ({
unused_label:
1;
1;
+ /* expect+2: error: syntax error 'labels are only valid inside a function' [249] */
+ /* expect+1: error: non-constant initializer [177] */
});
-/* expect-1: error: non-constant initializer [177] */
-/* expect-2: error: syntax error 'labels are only valid inside a function' [249] */
Index: src/tests/usr.bin/xlint/lint1/c11.c
diff -u
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Jan 28 08:17:27 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: accept.sh c11.c c23.c check-expect.lua d_c99_init.c decl.c decl_arg.c decl_direct_abstract.c msg_083.c msg_090.c msg_092.c msg_095.c msg_128.c msg_132.c msg_138.c msg_165.c msg_182.c msg_188.c msg_249.c msg_277.c msg_324.c msg_343.c op_colon.c platform_lp64_c90.c platform_lp64_c99.c platform_lp64_trad.c Log Message: tests/lint: sort multiple diagnostics per line chronologically For now, the chronologic order is not enforced but has to be established manually, for example by removing all 'expect' comment lines and regenerating them with 'accept.sh -u'. While here, clean up a few instances that came up when regenerating the 'expect' comments, such as wrong indentation or needless deviation from the 'expect+1' form. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tests/usr.bin/xlint/lint1/accept.sh \ src/tests/usr.bin/xlint/lint1/msg_249.c cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/c11.c cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/c23.c \ src/tests/usr.bin/xlint/lint1/msg_083.c \ src/tests/usr.bin/xlint/lint1/msg_090.c \ src/tests/usr.bin/xlint/lint1/msg_095.c \ src/tests/usr.bin/xlint/lint1/msg_128.c \ src/tests/usr.bin/xlint/lint1/op_colon.c cvs rdiff -u -r1.9 -r1.10 src/tests/usr.bin/xlint/lint1/check-expect.lua \ src/tests/usr.bin/xlint/lint1/msg_324.c cvs rdiff -u -r1.46 -r1.47 src/tests/usr.bin/xlint/lint1/d_c99_init.c cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/xlint/lint1/decl_arg.c cvs rdiff -u -r1.11 -r1.12 \ src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_092.c \ src/tests/usr.bin/xlint/lint1/msg_138.c \ src/tests/usr.bin/xlint/lint1/msg_165.c \ src/tests/usr.bin/xlint/lint1/msg_182.c \ src/tests/usr.bin/xlint/lint1/msg_188.c cvs rdiff -u -r1.32 -r1.33 src/tests/usr.bin/xlint/lint1/msg_132.c cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/msg_277.c cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/xlint/lint1/msg_343.c cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/platform_lp64_c90.c \ src/tests/usr.bin/xlint/lint1/platform_lp64_c99.c \ src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
