CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jun 22 06:24:46 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: msg_380.c msg_381.c Log Message: tests/lint: skip tests for converting large floating point to integer These tests differ between the platforms supported by lint. The differences may be caused by hardware differences, the default rounding mode, bugs in the emulator running the tests, bugs in the platform-specific string-to-float or float-to-string conversions and probably some more. For now, accept that lint will behave differently on those platforms. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_380.c \ src/tests/usr.bin/xlint/lint1/msg_381.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/msg_380.c diff -u src/tests/usr.bin/xlint/lint1/msg_380.c:1.1 src/tests/usr.bin/xlint/lint1/msg_380.c:1.2 --- src/tests/usr.bin/xlint/lint1/msg_380.c:1.1 Sun Jun 9 10:27:39 2024 +++ src/tests/usr.bin/xlint/lint1/msg_380.c Sat Jun 22 06:24:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: msg_380.c,v 1.1 2024/06/09 10:27:39 rillig Exp $ */ +/* $NetBSD: msg_380.c,v 1.2 2024/06/22 06:24:46 rillig Exp $ */ # 3 "msg_380.c" // Test for message: lossy conversion of %Lg to '%s', arg #%d [380] @@ -50,11 +50,22 @@ conversions(void) take_u64(0.0); /* expect+1: warning: lossy conversion of 3.141 to 'unsigned long long', arg #1 [380] */ take_u64(3.141); - take_u64(18446744073709550591.0); - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] */ - take_u64(18446744073709550592.0); - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] */ - take_u64(18446744073709551615.0); - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] */ - take_u64(18446744073709551616.0); + + // Warning on: alpha + // No warning on: aarch64 aarch64-compat32 arm i386 mips powerpc riscv64 sh3 sparc x86_64 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709550591.0); + + // Warning on: aarch64 alpha arm i386 mips riscv64 sparc x86_64 + // No warning on: aarch64-compat32 powerpc sh3 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709550592.0); + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709551615.0); + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long', arg #1 [380] + //take_u64(18446744073709551616.0); } Index: src/tests/usr.bin/xlint/lint1/msg_381.c diff -u src/tests/usr.bin/xlint/lint1/msg_381.c:1.1 src/tests/usr.bin/xlint/lint1/msg_381.c:1.2 --- src/tests/usr.bin/xlint/lint1/msg_381.c:1.1 Sun Jun 9 10:27:39 2024 +++ src/tests/usr.bin/xlint/lint1/msg_381.c Sat Jun 22 06:24:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: msg_381.c,v 1.1 2024/06/09 10:27:39 rillig Exp $ */ +/* $NetBSD: msg_381.c,v 1.2 2024/06/22 06:24:46 rillig Exp $ */ # 3 "msg_381.c" // Test for message: lossy conversion of %Lg to '%s' [381] @@ -50,11 +50,22 @@ conversions(void) u64 = 0.0; /* expect+1: warning: lossy conversion of 3.141 to 'unsigned long long' [381] */ u64 = 3.141; - u64 = 18446744073709550591.0; - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] */ - u64 = 18446744073709550592.0; - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] */ - u64 = 18446744073709551615.0; - /* expect+1: warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] */ - u64 = 18446744073709551616.0; + + // Warning on: alpha + // No warning on: aarch64 aarch64-compat32 arm i386 mips powerpc riscv64 sh3 sparc x86_64 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709550591.0; + + // Warning on: aarch64 alpha arm i386 mips riscv64 sparc x86_64 + // No warning on: aarch64-compat32 powerpc sh3 + // Unknown: coldfire hppa ia64 m68000 m68k mips64 mipsn64 or1k powerpc64 riscv32 sparc64 vax + // + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709550592.0; + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709551615.0; + // warning: lossy conversion of 1.84467e+19 to 'unsigned long long' [381] + //u64 = 18446744073709551616.0; }
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jun 22 06:24:46 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: msg_380.c msg_381.c Log Message: tests/lint: skip tests for converting large floating point to integer These tests differ between the platforms supported by lint. The differences may be caused by hardware differences, the default rounding mode, bugs in the emulator running the tests, bugs in the platform-specific string-to-float or float-to-string conversions and probably some more. For now, accept that lint will behave differently on those platforms. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_380.c \ src/tests/usr.bin/xlint/lint1/msg_381.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86
Module Name:xsrc
Committed By: mrg
Date: Fri Jun 21 21:34:48 UTC 2024
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
alpha_video.c
Log Message:
fix build on alpha.
some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.21
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20 Fri Jul 15 04:10:41 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Fri Jun 21 21:34:48 2024
@@ -952,6 +952,9 @@ inl(unsigned PORT_SIZE port)
#endif
#ifdef __alpha__
+
+#include
+
static inline int
xf86ReadMmio8(void *Base, unsigned long Offset)
{
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6 Sat Aug 5 06:03:26 2017
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c Fri Jun 21 21:34:48 2024
@@ -212,26 +212,3 @@ xf86DisableIO()
}
#endif /* USE_ALPHA_PIO */
-
-extern int readDense8(void *Base, register unsigned long Offset);
-extern int readDense16(void *Base, register unsigned long Offset);
-extern int readDense32(void *Base, register unsigned long Offset);
-extern void
- writeDense8(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense16(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense32(int Value, void *Base, register unsigned long Offset);
-
-void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
-= writeDense8;
-void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
-= writeDense16;
-void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
-= writeDense32;
-int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
-= readDense8;
-int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
-= readDense16;
-int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
-= readDense32;
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86
Module Name:xsrc Committed By: mrg Date: Fri Jun 21 21:34:48 UTC 2024 Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd: alpha_video.c Log Message: fix build on alpha. some clean up upstream didn't get tested on alpha it seems, with both missing CARD8 etc identifiers as well as dead/duplicate code. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.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/x86
Module Name:src
Committed By: riastradh
Date: Fri Jun 21 17:24:08 UTC 2024
Modified Files:
src/sys/arch/x86/x86: fpu.c
Log Message:
x86/fpu.c: Nix trailing whitespace.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/x86/x86/fpu.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/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.88 src/sys/arch/x86/x86/fpu.c:1.89
--- src/sys/arch/x86/x86/fpu.c:1.88 Fri May 17 00:37:14 2024
+++ src/sys/arch/x86/x86/fpu.c Fri Jun 21 17:24:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.88 2024/05/17 00:37:14 manu Exp $ */
+/* $NetBSD: fpu.c,v 1.89 2024/06/21 17:24:08 riastradh Exp $ */
/*
* Copyright (c) 2008, 2019 The NetBSD Foundation, Inc. All
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.88 2024/05/17 00:37:14 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.89 2024/06/21 17:24:08 riastradh Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -624,7 +624,7 @@ fpudna(struct trapframe *frame)
if (USERMODE(frame->tf_cs)) {
clts();
return;
- }
+ }
#endif
panic("fpudna from %s, ip %p, trapframe %p",
USERMODE(frame->tf_cs) ? "userland" : "kernel",
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: riastradh Date: Fri Jun 21 17:24:08 UTC 2024 Modified Files: src/sys/arch/x86/x86: fpu.c Log Message: x86/fpu.c: Nix trailing whitespace. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/x86/x86/fpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/lib/libsa
Module Name:src
Committed By: martin
Date: Fri Jun 21 11:05:16 UTC 2024
Modified Files:
src/sys/lib/libsa [netbsd-10]: netif.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #716):
sys/lib/libsa/netif.c: revision 1.27
netif_open: Fail with ENXIO instead of panic if no netif available
Avoid undesirable freeze for efiboot/x86 when interfaces are really
unavailable, or fail to be configured by buggy UEFI firmware.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.30.1 src/sys/lib/libsa/netif.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/lib/libsa/netif.c
diff -u src/sys/lib/libsa/netif.c:1.26 src/sys/lib/libsa/netif.c:1.26.30.1
--- src/sys/lib/libsa/netif.c:1.26 Sun Mar 31 20:08:45 2019
+++ src/sys/lib/libsa/netif.c Fri Jun 21 11:05:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netif.c,v 1.26 2019/03/31 20:08:45 christos Exp $ */
+/* $NetBSD: netif.c,v 1.26.30.1 2024/06/21 11:05:16 martin Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -292,8 +292,10 @@ fnd:
(void)memset(s, 0, sizeof(*s));
netif_init();
nif = netif_select(machdep_hint);
- if (!nif)
- panic("netboot: no interfaces left untried");
+ if (!nif) {
+ errno = ENXIO;
+ return -1;
+ }
if (netif_probe(nif, machdep_hint)) {
printf("%s: couldn't probe %s%d\n", __func__,
nif->nif_driver->netif_bname, nif->nif_unit);
CVS commit: [netbsd-10] src/sys/lib/libsa
Module Name:src Committed By: martin Date: Fri Jun 21 11:05:16 UTC 2024 Modified Files: src/sys/lib/libsa [netbsd-10]: netif.c Log Message: Pull up following revision(s) (requested by rin in ticket #716): sys/lib/libsa/netif.c: revision 1.27 netif_open: Fail with ENXIO instead of panic if no netif available Avoid undesirable freeze for efiboot/x86 when interfaces are really unavailable, or fail to be configured by buggy UEFI firmware. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.30.1 src/sys/lib/libsa/netif.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/fdt
Module Name:src
Committed By: martin
Date: Fri Jun 21 11:03:41 UTC 2024
Modified Files:
src/sys/dev/fdt [netbsd-10]: fdt_powerdomain.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #715):
sys/dev/fdt/fdt_powerdomain.c: revision 1.2
fdt_powerdomain: Fix bug by which pd index >= 1 couldn't be enabled
Length in bytes was mistakenly used as number of uint32_t variables.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/dev/fdt/fdt_powerdomain.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/fdt/fdt_powerdomain.c
diff -u src/sys/dev/fdt/fdt_powerdomain.c:1.1 src/sys/dev/fdt/fdt_powerdomain.c:1.1.4.1
--- src/sys/dev/fdt/fdt_powerdomain.c:1.1 Fri Mar 4 08:19:06 2022
+++ src/sys/dev/fdt/fdt_powerdomain.c Fri Jun 21 11:03:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_powerdomain.c,v 1.1 2022/03/04 08:19:06 skrll Exp $ */
+/* $NetBSD: fdt_powerdomain.c,v 1.1.4.1 2024/06/21 11:03:41 martin Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_powerdomain.c,v 1.1 2022/03/04 08:19:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_powerdomain.c,v 1.1.4.1 2024/06/21 11:03:41 martin Exp $");
#include
@@ -103,7 +103,7 @@ fdtbus_powerdomain_enable_internal(int p
if (pds == NULL)
return EINVAL;
- for (const uint32_t *pd = pds; pd < pds + len; index--) {
+ for (const uint32_t *pd = pds; pd < pds + len / sizeof(*pd); index--) {
uint32_t pd_node =
fdtbus_get_phandle_from_native(be32toh(pd[0]));
struct fdtbus_powerdomain_controller *pdc =
CVS commit: [netbsd-10] src/sys/dev/fdt
Module Name:src Committed By: martin Date: Fri Jun 21 11:03:41 UTC 2024 Modified Files: src/sys/dev/fdt [netbsd-10]: fdt_powerdomain.c Log Message: Pull up following revision(s) (requested by rin in ticket #715): sys/dev/fdt/fdt_powerdomain.c: revision 1.2 fdt_powerdomain: Fix bug by which pd index >= 1 couldn't be enabled Length in bytes was mistakenly used as number of uint32_t variables. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/dev/fdt/fdt_powerdomain.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/clk
Module Name:src Committed By: martin Date: Fri Jun 21 10:59:13 UTC 2024 Modified Files: src/sys/dev/clk [netbsd-10]: clk.c Log Message: Pull up following revision(s) (requested by rin in ticket #714): sys/dev/clk/clk.c: revision 1.8 clk(4): clk_set_rate: Add KASSERT to check `clk != NULL` To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/dev/clk/clk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/clk
Module Name:src
Committed By: martin
Date: Fri Jun 21 10:59:13 UTC 2024
Modified Files:
src/sys/dev/clk [netbsd-10]: clk.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #714):
sys/dev/clk/clk.c: revision 1.8
clk(4): clk_set_rate: Add KASSERT to check `clk != NULL`
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/dev/clk/clk.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/clk/clk.c
diff -u src/sys/dev/clk/clk.c:1.7 src/sys/dev/clk/clk.c:1.7.28.1
--- src/sys/dev/clk/clk.c:1.7 Tue Jul 23 17:44:03 2019
+++ src/sys/dev/clk/clk.c Fri Jun 21 10:59:13 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: clk.c,v 1.7 2019/07/23 17:44:03 jmcneill Exp $ */
+/* $NetBSD: clk.c,v 1.7.28.1 2024/06/21 10:59:13 martin Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: clk.c,v 1.7 2019/07/23 17:44:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clk.c,v 1.7.28.1 2024/06/21 10:59:13 martin Exp $");
#include
#include
@@ -229,6 +229,8 @@ clk_get_rate(struct clk *clk)
int
clk_set_rate(struct clk *clk, u_int rate)
{
+ KASSERT(clk != NULL);
+
if (clk->flags & CLK_SET_RATE_PARENT)
return clk_set_rate(clk_get_parent(clk), rate);
CVS commit: [netbsd-10] src/sys/dev/pci/igc
Module Name:src
Committed By: martin
Date: Fri Jun 21 10:54:50 UTC 2024
Modified Files:
src/sys/dev/pci/igc [netbsd-10]: if_igc.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #713):
sys/dev/pci/igc/if_igc.c: revision 1.14
sys/dev/pci/igc/if_igc.c: revision 1.7
sys/dev/pci/igc/if_igc.c: revision 1.8
sys/dev/pci/igc/if_igc.c: revision 1.9
Fix build of the MODULAR kernel, which explicitly excludes vlans.
igc(4): Notify which of 64- or 32-bit DMA is used
Remove unnecssary #include
igc: Add missing '\n' to a DPRINTF message
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.4 -r1.3.2.5 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.3.2.4 src/sys/dev/pci/igc/if_igc.c:1.3.2.5
--- src/sys/dev/pci/igc/if_igc.c:1.3.2.4 Fri Feb 23 18:41:02 2024
+++ src/sys/dev/pci/igc/if_igc.c Fri Jun 21 10:54:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_igc.c,v 1.3.2.4 2024/02/23 18:41:02 martin Exp $ */
+/* $NetBSD: if_igc.c,v 1.3.2.5 2024/06/21 10:54:50 martin Exp $ */
/* $OpenBSD: if_igc.c,v 1.13 2023/04/28 10:18:57 bluhm Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -30,10 +30,9 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.3.2.4 2024/02/23 18:41:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_igc.c,v 1.3.2.5 2024/06/21 10:54:50 martin Exp $");
#ifdef _KERNEL_OPT
-#include "opt_net_mpsafe.h"
#include "opt_if_igc.h"
#if 0 /* notyet */
#include "vlan.h"
@@ -354,7 +353,6 @@ igc_attach(device_t parent, device_t sel
const struct igc_product *igcp = igc_lookup(pa);
KASSERT(igcp != NULL);
- pci_aprint_devinfo_fancy(pa, "Ethernet controller", igcp->igcp_name, 1);
sc->sc_dev = self;
callout_init(&sc->sc_tick_ch, CALLOUT_MPSAFE);
@@ -363,17 +361,23 @@ igc_attach(device_t parent, device_t sel
sc->osdep.os_sc = sc;
sc->osdep.os_pa = *pa;
-#ifdef __aarch64__
+#ifndef __aarch64__
/*
* XXX PR port-arm/57643
* 64-bit DMA does not work at least for LX2K with 32/64GB memory.
* smmu(4) support may be required.
*/
- sc->osdep.os_dmat = pa->pa_dmat;
-#else
- sc->osdep.os_dmat = pci_dma64_available(pa) ?
- pa->pa_dmat64 : pa->pa_dmat;
+ if (pci_dma64_available(pa)) {
+ aprint_verbose(", 64-bit DMA");
+ sc->osdep.os_dmat = pa->pa_dmat64;
+ } else
#endif
+ {
+ aprint_verbose(", 32-bit DMA");
+ sc->osdep.os_dmat = pa->pa_dmat;
+ }
+
+ pci_aprint_devinfo_fancy(pa, "Ethernet controller", igcp->igcp_name, 1);
/* Determine hardware and mac info */
igc_identify_hardware(sc);
@@ -2119,7 +2123,9 @@ igc_rxeof(struct rx_ring *rxr, u_int lim
const bool eop = staterr & IGC_RXD_STAT_EOP;
const uint16_t len = le16toh(rxdesc->wb.upper.length);
+#if NVLAN > 0
const uint16_t vtag = le16toh(rxdesc->wb.upper.vlan);
+#endif
const uint32_t ptype = le32toh(rxdesc->wb.lower.lo_dword.data) &
IGC_PKTTYPE_MASK;
@@ -2800,7 +2806,7 @@ igc_intr(void *arg)
/* Definitely not our interrupt. */
if (reg_icr == 0x0) {
- DPRINTF(MISC, "not for me");
+ DPRINTF(MISC, "not for me\n");
return 0;
}
CVS commit: [netbsd-10] src/sys/dev/pci/igc
Module Name:src Committed By: martin Date: Fri Jun 21 10:54:50 UTC 2024 Modified Files: src/sys/dev/pci/igc [netbsd-10]: if_igc.c Log Message: Pull up following revision(s) (requested by rin in ticket #713): sys/dev/pci/igc/if_igc.c: revision 1.14 sys/dev/pci/igc/if_igc.c: revision 1.7 sys/dev/pci/igc/if_igc.c: revision 1.8 sys/dev/pci/igc/if_igc.c: revision 1.9 Fix build of the MODULAR kernel, which explicitly excludes vlans. igc(4): Notify which of 64- or 32-bit DMA is used Remove unnecssary #include igc: Add missing '\n' to a DPRINTF message To generate a diff of this commit: cvs rdiff -u -r1.3.2.4 -r1.3.2.5 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: [netbsd-10] src/distrib/sets/lists/man
Module Name:src Committed By: martin Date: Fri Jun 21 10:39:38 UTC 2024 Modified Files: src/distrib/sets/lists/man [netbsd-10]: mi Log Message: Fix copy&pasto in manual fixup for ticket #700 (fix html man page location) To generate a diff of this commit: cvs rdiff -u -r1.1757.2.10 -r1.1757.2.11 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1757.2.10 src/distrib/sets/lists/man/mi:1.1757.2.11 --- src/distrib/sets/lists/man/mi:1.1757.2.10 Thu Jun 20 17:46:55 2024 +++ src/distrib/sets/lists/man/mi Fri Jun 21 10:39:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1757.2.10 2024/06/20 17:46:55 martin Exp $ +# $NetBSD: mi,v 1.1757.2.11 2024/06/21 10:39:38 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5487,7 +5487,7 @@ ./usr/share/man/html4/x86/tco.html man-sys-htmlman html ./usr/share/man/html4/x86/tprof_amdpmi.html man-obsolete obsolete ./usr/share/man/html4/x86/tprof_pmi.html man-obsolete obsolete -./usr/share/man/man4/x86/viac7temp.html man-sys-htmlman html +./usr/share/man/html4/x86/viac7temp.html man-sys-htmlman html ./usr/share/man/html4/x86/vmt.html man-obsolete obsolete ./usr/share/man/html4/x86/vmx.html man-obsolete obsolete ./usr/share/man/html4/xbd.html man-sys-htmlman html
CVS commit: [netbsd-10] src/distrib/sets/lists/man
Module Name:src Committed By: martin Date: Fri Jun 21 10:39:38 UTC 2024 Modified Files: src/distrib/sets/lists/man [netbsd-10]: mi Log Message: Fix copy&pasto in manual fixup for ticket #700 (fix html man page location) To generate a diff of this commit: cvs rdiff -u -r1.1757.2.10 -r1.1757.2.11 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
