CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Fri Dec 29 07:36:47 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.h
Log Message:
ixgbe: Use #ifdef LRO more to reduce the size of struct rx_ring.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.114 src/sys/dev/pci/ixgbe/ix_txrx.c:1.115
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.114 Thu Dec 28 10:13:51 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Fri Dec 29 07:36:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.114 2023/12/28 10:13:51 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.115 2023/12/29 07:36:47 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.114 2023/12/28 10:13:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.115 2023/12/29 07:36:47 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1577,7 +1577,9 @@ ixgbe_setup_receive_ring(struct rx_ring
/* Setup our descriptor indices */
rxr->next_to_check = 0;
rxr->next_to_refresh = sc->num_rx_desc - 1; /* Fully allocated */
+#ifdef LRO
rxr->lro_enabled = FALSE;
+#endif
rxr->discard_multidesc = false;
IXGBE_EVC_STORE(>rx_copies, 0);
#if 0 /* NetBSD */
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.95 src/sys/dev/pci/ixgbe/ixgbe.h:1.96
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.95 Fri Dec 29 07:34:20 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.h Fri Dec 29 07:36:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.95 2023/12/29 07:34:20 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.96 2023/12/29 07:36:47 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -413,8 +413,8 @@ struct rx_ring {
struct ixgbe_dma_alloc rxdma;
#ifdef LRO
struct lro_ctrl lro;
-#endif /* LRO */
bool lro_enabled;
+#endif /* LRO */
bool hw_rsc;
bool vtag_strip;
bool discard_multidesc;
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Fri Dec 29 07:36:47 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.h Log Message: ixgbe: Use #ifdef LRO more to reduce the size of struct rx_ring. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/ixgbe/ixgbe.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: Fri Dec 29 07:34:20 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.h
Log Message:
ixgbe: Remove unused to reduce the size of struct rx_ring.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.94 src/sys/dev/pci/ixgbe/ixgbe.h:1.95
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.94 Thu Dec 28 10:02:14 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.h Fri Dec 29 07:34:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.94 2023/12/28 10:02:14 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.95 2023/12/29 07:34:20 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -438,9 +438,6 @@ struct rx_ring {
struct evcnt rx_discarded;
struct evcnt no_mbuf;
u64 rsc_num;
-
- /* Flow Director */
- u64 flm;
};
struct ixgbe_vf {
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Fri Dec 29 07:34:20 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.h Log Message: ixgbe: Remove unused to reduce the size of struct rx_ring. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/dev/pci/ixgbe/ixgbe.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/luna68k
Module Name:src Committed By: tsutsui Date: Fri Dec 29 02:30:36 UTC 2023 Modified Files: src/sys/arch/luna68k/include: pmap.h src/sys/arch/luna68k/luna68k: genassym.cf locore.s Log Message: Use proper macro for the 030/040 TT registers to map LUNA's I/O spaces. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/include/pmap.h cvs rdiff -u -r1.25 -r1.26 src/sys/arch/luna68k/luna68k/genassym.cf cvs rdiff -u -r1.71 -r1.72 src/sys/arch/luna68k/luna68k/locore.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/luna68k/include/pmap.h diff -u src/sys/arch/luna68k/include/pmap.h:1.10 src/sys/arch/luna68k/include/pmap.h:1.11 --- src/sys/arch/luna68k/include/pmap.h:1.10 Sun Nov 3 19:56:29 2002 +++ src/sys/arch/luna68k/include/pmap.h Fri Dec 29 02:30:35 2023 @@ -1,3 +1,38 @@ -/* $NetBSD: pmap.h,v 1.10 2002/11/03 19:56:29 chs Exp $ */ +/* $NetBSD: pmap.h,v 1.11 2023/12/29 02:30:35 tsutsui Exp $ */ + +#ifndef _LUNA68K_PMAP_H_ #include +#include + +/* + * Transparent translation register values for IO space 0x4000-0x + * + * map via TT0: 0x4000-0x7fff + * map via TT1: 0x8000-0x + * + * On 030 both use Function Codes 4-7 (to get SUPERD and SUPERP). + * XXX: they can probably just use SUPERD. + */ + +#define LUNA68K_TT30_IO0 (0x4000 |\ + __SHIFTIN(0x3f,TT30_LAM) | \ + TT30_E | TT30_CI | TT30_RWM | \ +__SHIFTIN(4,TT30_FCBASE) | \ +__SHIFTIN(3,TT30_FCMASK)) +#define LUNA68K_TT30_IO1 (0x8000 |\ + __SHIFTIN(0x7f,TT30_LAM) | \ + TT30_E | TT30_CI | TT30_RWM | \ +__SHIFTIN(4,TT30_FCBASE) | \ +__SHIFTIN(3,TT30_FCMASK)) + +#define LUNA68K_TT40_IO0 (0x4000 |\ + __SHIFTIN(0x3f,TTR40_LAM) | \ + TTR40_E | TTR40_SUPER | \ + PTE40_CM_NC_SER) +#define LUNA68K_TT40_IO1 (0x8000 |\ + __SHIFTIN(0x7f,TTR40_LAM) | \ + TTR40_E | TTR40_SUPER | \ + PTE40_CM_NC_SER) + +#endif /* _LUNA68K_PMAP_H_ */ Index: src/sys/arch/luna68k/luna68k/genassym.cf diff -u src/sys/arch/luna68k/luna68k/genassym.cf:1.25 src/sys/arch/luna68k/luna68k/genassym.cf:1.26 --- src/sys/arch/luna68k/luna68k/genassym.cf:1.25 Wed Dec 27 17:35:35 2023 +++ src/sys/arch/luna68k/luna68k/genassym.cf Fri Dec 29 02:30:36 2023 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.25 2023/12/27 17:35:35 thorpej Exp $ +# $NetBSD: genassym.cf,v 1.26 2023/12/29 02:30:36 tsutsui Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -91,6 +91,12 @@ export MMU51_CRP_BITS export MMU51_TCR_BITS export MMU40_TCR_BITS +# Transparent translation register values (from pmap.h) +export LUNA68K_TT30_IO0 +export LUNA68K_TT30_IO1 +export LUNA68K_TT40_IO0 +export LUNA68K_TT40_IO1 + # lwp & proc fields and values define L_PCB offsetof(struct lwp, l_addr) define L_PROC offsetof(struct lwp, l_proc) Index: src/sys/arch/luna68k/luna68k/locore.s diff -u src/sys/arch/luna68k/luna68k/locore.s:1.71 src/sys/arch/luna68k/luna68k/locore.s:1.72 --- src/sys/arch/luna68k/luna68k/locore.s:1.71 Wed Dec 27 03:03:41 2023 +++ src/sys/arch/luna68k/luna68k/locore.s Fri Dec 29 02:30:36 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.71 2023/12/27 03:03:41 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.72 2023/12/29 02:30:36 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -898,16 +898,16 @@ GLOBAL(protocrp) GLOBAL(prototc) .long MMU51_TCR_BITS | %tc -- see pmap.h -GLOBAL(protott0) | tt0 0x4000.-0x7fff. - .long 0x403f8543 | -GLOBAL(protott1) | tt1 0x8000.-0x. - .long 0x807f8543 | +GLOBAL(protott0) + .long LUNA68K_TT30_IO0 | prototype transparent translation register 0 +GLOBAL(protott1) + .long LUNA68K_TT30_IO1 | prototype transparent translation register 1 GLOBAL(proto040tc) .long MMU40_TCR_BITS | %tc -- see pmap.h -GLOBAL(proto040tt0) | tt0 0x4000.-0x7fff. - .long 0x403fa040 | kernel only, cache inhibit, serialized -GLOBAL(proto040tt1) | tt1 0x8000.-0x. - .long 0x807fa040 | kernel only, cache inhibit, serialized +GLOBAL(proto040tt0) + .long LUNA68K_TT40_IO0 | prototype transparent translation register 0 +GLOBAL(proto040tt1) + .long LUNA68K_TT40_IO1 | prototype transparent translation register 1 nullrp: .long 0x7fff0001 | do-nothing MMU root pointer
CVS commit: src/sys/arch/luna68k
Module Name:src Committed By: tsutsui Date: Fri Dec 29 02:30:36 UTC 2023 Modified Files: src/sys/arch/luna68k/include: pmap.h src/sys/arch/luna68k/luna68k: genassym.cf locore.s Log Message: Use proper macro for the 030/040 TT registers to map LUNA's I/O spaces. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/include/pmap.h cvs rdiff -u -r1.25 -r1.26 src/sys/arch/luna68k/luna68k/genassym.cf cvs rdiff -u -r1.71 -r1.72 src/sys/arch/luna68k/luna68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Fri Dec 29 00:55:46 UTC 2023
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.c
Log Message:
PR/57179: Christof Meerwald: Fix bugs in fetch_cache_{get,put}.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/fetch/dist/libfetch/common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/common.c
diff -u src/external/bsd/fetch/dist/libfetch/common.c:1.4 src/external/bsd/fetch/dist/libfetch/common.c:1.5
--- src/external/bsd/fetch/dist/libfetch/common.c:1.4 Tue Jan 24 03:02:57 2023
+++ src/external/bsd/fetch/dist/libfetch/common.c Thu Dec 28 19:55:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.4 2023/01/24 08:02:57 mlelstv Exp $ */
+/* $NetBSD: common.c,v 1.5 2023/12/29 00:55:46 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2010 Joerg Sonnenberger
@@ -368,7 +368,9 @@ fetch_cache_get(const struct url *url, i
{
conn_t *conn, *last_conn = NULL;
- for (conn = connection_cache; conn; conn = conn->next_cached) {
+ for (conn = connection_cache; conn; last_conn = conn,
+ conn = conn->next_cached)
+ {
if (conn->cache_url->port == url->port &&
strcmp(conn->cache_url->scheme, url->scheme) == 0 &&
strcmp(conn->cache_url->host, url->host) == 0 &&
@@ -395,7 +397,7 @@ fetch_cache_get(const struct url *url, i
void
fetch_cache_put(conn_t *conn, int (*closecb)(conn_t *))
{
- conn_t *iter, *last;
+ conn_t *iter, *last, *oiter;
int global_count, host_count;
if (conn->cache_url == NULL || cache_global_limit == 0) {
@@ -405,20 +407,25 @@ fetch_cache_put(conn_t *conn, int (*clos
global_count = host_count = 0;
last = NULL;
- for (iter = connection_cache; iter;
- last = iter, iter = iter->next_cached) {
+ for (iter = connection_cache; iter; ) {
++global_count;
if (strcmp(conn->cache_url->host, iter->cache_url->host) == 0)
++host_count;
if (global_count < cache_global_limit &&
host_count < cache_per_host_limit)
- continue;
- --global_count;
- if (last != NULL)
- last->next_cached = iter->next_cached;
- else
- connection_cache = iter->next_cached;
- (*iter->cache_close)(iter);
+ oiter = NULL;
+ else {
+ --global_count;
+ if (last != NULL)
+last->next_cached = iter->next_cached;
+ else
+connection_cache = iter->next_cached;
+ oiter = iter;
+ }
+ last = iter;
+ iter = iter->next_cached;
+ if (oiter)
+ (*oiter->cache_close)(oiter);
}
conn->cache_close = closecb;
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Fri Dec 29 00:55:46 UTC 2023
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.c
Log Message:
PR/57179: Christof Meerwald: Fix bugs in fetch_cache_{get,put}.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/fetch/dist/libfetch/common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Re: CVS commit: src/tests/bin/sh
Date:Thu, 28 Dec 2023 20:04:11 + From:"Andrius Varanavicius" Message-ID: <20231228200411.283ccf...@cvs.netbsd.org> | Modified Files: | src/tests/bin/sh: t_syntax.sh | Log Message: | s/synax/syntax/ in test description. Thanks for the correction, but, not that it matters, that was in the test code, not just a description. [I could claim that the typo was deliberate, as part of the test but that would be kind of absurd, sh does no spell checking to test.] kre
CVS commit: src/tests/bin/sh
Module Name:src Committed By: andvar Date: Thu Dec 28 20:04:11 UTC 2023 Modified Files: src/tests/bin/sh: t_syntax.sh Log Message: s/synax/syntax/ in test description. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/bin/sh/t_syntax.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/bin/sh
Module Name:src
Committed By: andvar
Date: Thu Dec 28 20:04:11 UTC 2023
Modified Files:
src/tests/bin/sh: t_syntax.sh
Log Message:
s/synax/syntax/ in test description.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/bin/sh/t_syntax.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/bin/sh/t_syntax.sh
diff -u src/tests/bin/sh/t_syntax.sh:1.12 src/tests/bin/sh/t_syntax.sh:1.13
--- src/tests/bin/sh/t_syntax.sh:1.12 Mon Nov 22 05:07:15 2021
+++ src/tests/bin/sh/t_syntax.sh Thu Dec 28 20:04:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_syntax.sh,v 1.12 2021/11/22 05:07:15 kre Exp $
+# $NetBSD: t_syntax.sh,v 1.13 2023/12/28 20:04:10 andvar Exp $
#
# Copyright (c) 2017 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -114,7 +114,7 @@ b_comments_body() {
'echo \## #\#'
cat <<-'DONE' |
- # test comments do not provoke synax errors !\
+ # test comments do not provoke syntax errors !\
echo foo # ( { " hello
while : # that's forever
do # the following command list
CVS commit: src
Module Name:src Committed By: andvar Date: Thu Dec 28 19:58:12 UTC 2023 Modified Files: src/sbin/scsictl: scsi_sense.c src/sys/dev/scsipi: scsipi_verbose.c src/usr.sbin/mmcformat: uscsi_sense.c Log Message: s/informtion/information/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sbin/scsictl/scsi_sense.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/scsipi/scsipi_verbose.c cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mmcformat/uscsi_sense.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: andvar
Date: Thu Dec 28 19:58:12 UTC 2023
Modified Files:
src/sbin/scsictl: scsi_sense.c
src/sys/dev/scsipi: scsipi_verbose.c
src/usr.sbin/mmcformat: uscsi_sense.c
Log Message:
s/informtion/information/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sbin/scsictl/scsi_sense.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/scsipi/scsipi_verbose.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mmcformat/uscsi_sense.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/scsictl/scsi_sense.c
diff -u src/sbin/scsictl/scsi_sense.c:1.10 src/sbin/scsictl/scsi_sense.c:1.11
--- src/sbin/scsictl/scsi_sense.c:1.10 Mon Jan 24 09:14:37 2022
+++ src/sbin/scsictl/scsi_sense.c Thu Dec 28 19:58:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_sense.c,v 1.10 2022/01/24 09:14:37 andvar Exp $ */
+/* $NetBSD: scsi_sense.c,v 1.11 2023/12/28 19:58:11 andvar Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: scsi_sense.c,v 1.10 2022/01/24 09:14:37 andvar Exp $");
+__RCSID("$NetBSD: scsi_sense.c,v 1.11 2023/12/28 19:58:11 andvar Exp $");
#endif
@@ -371,7 +371,7 @@ scsi_print_sense_data(const unsigned cha
}
/*
- * Now figure whether we should print any additional informtion.
+ * Now figure whether we should print any additional information.
*
* Where should we start from? If we had SKSV data,
* start from offset 18, else from offset 15.
Index: src/sys/dev/scsipi/scsipi_verbose.c
diff -u src/sys/dev/scsipi/scsipi_verbose.c:1.35 src/sys/dev/scsipi/scsipi_verbose.c:1.36
--- src/sys/dev/scsipi/scsipi_verbose.c:1.35 Sat Jun 5 22:21:15 2021
+++ src/sys/dev/scsipi/scsipi_verbose.c Thu Dec 28 19:58:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $ */
+/* $NetBSD: scsipi_verbose.c,v 1.36 2023/12/28 19:58:11 andvar Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.36 2023/12/28 19:58:11 andvar Exp $");
#include
#include
@@ -960,7 +960,7 @@ scsipi_print_sense_data_real(struct scsi
return;
/*
- * Now figure whether we should print any additional informtion.
+ * Now figure whether we should print any additional information.
*
* Where should we start from? If we had SKSV data,
* start from offset 18, else from offset 15.
Index: src/usr.sbin/mmcformat/uscsi_sense.c
diff -u src/usr.sbin/mmcformat/uscsi_sense.c:1.2 src/usr.sbin/mmcformat/uscsi_sense.c:1.3
--- src/usr.sbin/mmcformat/uscsi_sense.c:1.2 Mon Jan 24 09:14:38 2022
+++ src/usr.sbin/mmcformat/uscsi_sense.c Thu Dec 28 19:58:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uscsi_sense.c,v 1.2 2022/01/24 09:14:38 andvar Exp $ */
+/* $NetBSD: uscsi_sense.c,v 1.3 2023/12/28 19:58:11 andvar Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -704,7 +704,7 @@ uscsi_print_sense_data(uint8_t *s, int s
}
/*
- * Now figure whether we should print any additional informtion.
+ * Now figure whether we should print any additional information.
*
* Where should we start from? If we had SKSV data,
* start from offset 18, else from offset 15.
CVS commit: src/sys/dev/iscsi
Module Name:src Committed By: mlelstv Date: Thu Dec 28 15:58:24 UTC 2023 Modified Files: src/sys/dev/iscsi: iscsi_main.c Log Message: Use correct status value SCSI_BUSY (0x08) instead of XS_BUSY (7) when running out of sessions. The bug had no impact as scsipi was only comparing against SCSI_CHECK (0x02) and SCSI_QUEUE_FULL (0x28). To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/iscsi/iscsi_main.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/iscsi
Module Name:src
Committed By: mlelstv
Date: Thu Dec 28 15:58:24 UTC 2023
Modified Files:
src/sys/dev/iscsi: iscsi_main.c
Log Message:
Use correct status value SCSI_BUSY (0x08) instead of XS_BUSY (7) when running
out of sessions. The bug had no impact as scsipi was only comparing
against SCSI_CHECK (0x02) and SCSI_QUEUE_FULL (0x28).
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/iscsi/iscsi_main.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/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.41 src/sys/dev/iscsi/iscsi_main.c:1.42
--- src/sys/dev/iscsi/iscsi_main.c:1.41 Tue Sep 13 13:09:16 2022
+++ src/sys/dev/iscsi/iscsi_main.c Thu Dec 28 15:58:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_main.c,v 1.41 2022/09/13 13:09:16 mlelstv Exp $ */
+/* $NetBSD: iscsi_main.c,v 1.42 2023/12/28 15:58:24 mlelstv Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -490,7 +490,7 @@ iscsi_scsipi_request(struct scsipi_chann
DEB(9, ("ISCSI: refcount too high: %d, winsize %d\n",
sess->s_refcount, sess->s_send_window));
xs->error = XS_BUSY;
- xs->status = XS_BUSY;
+ xs->status = SCSI_BUSY;
scsipi_done(xs);
return;
}
CVS commit: src/sys/arch/m68k/m68k
Module Name:src
Committed By: thorpej
Date: Thu Dec 28 15:33:12 UTC 2023
Modified Files:
src/sys/arch/m68k/m68k: pmap_motorola.c
Log Message:
Missed 2 68060-specific cases in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/m68k/m68k/pmap_motorola.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/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.83 src/sys/arch/m68k/m68k/pmap_motorola.c:1.84
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.83 Thu Dec 28 01:33:05 2023
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Thu Dec 28 15:33:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.83 2023/12/28 01:33:05 thorpej Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.84 2023/12/28 15:33:12 thorpej Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.83 2023/12/28 01:33:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.84 2023/12/28 15:33:12 thorpej Exp $");
#include
#include
@@ -580,13 +580,15 @@ pmap_init(void)
paddr_t paddr;
while (kptp) {
- pmap_changebit(kptp->kpt_pa, PG_CI, ~PG_CCB);
+ pmap_changebit(kptp->kpt_pa, PG_CI,
+ (pt_entry_t)~PG_CCB);
kptp = kptp->kpt_next;
}
paddr = (paddr_t)Segtabzeropa;
while (paddr < (paddr_t)Segtabzeropa + M68K_STSIZE) {
- pmap_changebit(paddr, PG_CI, ~PG_CCB);
+ pmap_changebit(paddr, PG_CI,
+ (pt_entry_t)~PG_CCB);
paddr += PAGE_SIZE;
}
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: thorpej Date: Thu Dec 28 15:33:12 UTC 2023 Modified Files: src/sys/arch/m68k/m68k: pmap_motorola.c Log Message: Missed 2 68060-specific cases in previous. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/arch/m68k/m68k/pmap_motorola.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: hannken Date: Thu Dec 28 12:49:06 UTC 2023 Modified Files: src/sys/kern: kern_fileassoc.c Log Message: Initialize mutex fileassoc_global.lock. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_fileassoc.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: hannken Date: Thu Dec 28 12:49:06 UTC 2023 Modified Files: src/sys/kern: kern_fileassoc.c Log Message: Initialize mutex fileassoc_global.lock. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_fileassoc.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_fileassoc.c diff -u src/sys/kern/kern_fileassoc.c:1.37 src/sys/kern/kern_fileassoc.c:1.38 --- src/sys/kern/kern_fileassoc.c:1.37 Wed Aug 2 07:11:31 2023 +++ src/sys/kern/kern_fileassoc.c Thu Dec 28 12:49:06 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_fileassoc.c,v 1.37 2023/08/02 07:11:31 riastradh Exp $ */ +/* $NetBSD: kern_fileassoc.c,v 1.38 2023/12/28 12:49:06 hannken Exp $ */ /*- * Copyright (c) 2006 Elad Efrat @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_fileassoc.c,v 1.37 2023/08/02 07:11:31 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_fileassoc.c,v 1.38 2023/12/28 12:49:06 hannken Exp $"); #include "opt_fileassoc.h" @@ -219,6 +219,8 @@ fileassoc_init(void) } fileassoc_domain = specificdata_domain_create(); + mutex_init(_global.lock, MUTEX_DEFAULT, IPL_NONE); + return 0; }
CVS commit: src/sys/kern
Module Name:src Committed By: hannken Date: Thu Dec 28 12:48:09 UTC 2023 Modified Files: src/sys/kern: vfs_mount.c Log Message: Include "veriexec.h" and to run veriexec_unmountchk() on "NVERIEXEC > 0". To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/kern/vfs_mount.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/vfs_mount.c diff -u src/sys/kern/vfs_mount.c:1.102 src/sys/kern/vfs_mount.c:1.103 --- src/sys/kern/vfs_mount.c:1.102 Fri Feb 24 11:02:27 2023 +++ src/sys/kern/vfs_mount.c Thu Dec 28 12:48:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_mount.c,v 1.102 2023/02/24 11:02:27 riastradh Exp $ */ +/* $NetBSD: vfs_mount.c,v 1.103 2023/12/28 12:48:08 hannken Exp $ */ /*- * Copyright (c) 1997-2020 The NetBSD Foundation, Inc. @@ -67,7 +67,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.102 2023/02/24 11:02:27 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.103 2023/12/28 12:48:08 hannken Exp $"); + +#include "veriexec.h" #include #include @@ -85,6 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_mount.c, #include #include #include +#include #include #include #include
CVS commit: src/sys/kern
Module Name:src Committed By: hannken Date: Thu Dec 28 12:48:09 UTC 2023 Modified Files: src/sys/kern: vfs_mount.c Log Message: Include "veriexec.h" and to run veriexec_unmountchk() on "NVERIEXEC > 0". To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/kern/vfs_mount.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/makefs
Module Name:src
Committed By: tsutsui
Date: Thu Dec 28 12:13:56 UTC 2023
Modified Files:
src/usr.sbin/makefs: cd9660.c ffs.c makefs.c msdos.c udf.c walk.c
src/usr.sbin/makefs/cd9660: cd9660_debug.c cd9660_eltorito.c
cd9660_write.c
Log Message:
Use EXIT_SUCCESS and EXIT_FAILURE where appropriate per style guide.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/makefs/cd9660.c
cvs rdiff -u -r1.74 -r1.75 src/usr.sbin/makefs/ffs.c
cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/makefs/makefs.c
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/makefs/msdos.c
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/makefs/udf.c
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/makefs/walk.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makefs/cd9660/cd9660_debug.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/makefs/cd9660/cd9660_write.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/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.59 src/usr.sbin/makefs/cd9660.c:1.60
--- src/usr.sbin/makefs/cd9660.c:1.59 Tue Apr 18 23:05:51 2023
+++ src/usr.sbin/makefs/cd9660.c Thu Dec 28 12:13:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.59 2023/04/18 23:05:51 christos Exp $ */
+/* $NetBSD: cd9660.c,v 1.60 2023/12/28 12:13:55 tsutsui Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.59 2023/04/18 23:05:51 christos Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.60 2023/12/28 12:13:55 tsutsui Exp $");
#endif /* !__lint */
#include
@@ -1188,7 +1188,7 @@ cd9660_copy_filenames(iso9660_disk *disk
if (TAILQ_FIRST(>cn_children)->isoDirRecord == NULL) {
debug_print_tree(diskStructure, diskStructure->rootNode, 0);
- exit(1);
+ exit(EXIT_FAILURE);
}
TAILQ_FOREACH(cn, >cn_children, cn_next_child) {
Index: src/usr.sbin/makefs/ffs.c
diff -u src/usr.sbin/makefs/ffs.c:1.74 src/usr.sbin/makefs/ffs.c:1.75
--- src/usr.sbin/makefs/ffs.c:1.74 Sat Jan 7 19:41:30 2023
+++ src/usr.sbin/makefs/ffs.c Thu Dec 28 12:13:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.74 2023/01/07 19:41:30 chs Exp $ */
+/* $NetBSD: ffs.c,v 1.75 2023/12/28 12:13:55 tsutsui Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.74 2023/01/07 19:41:30 chs Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.75 2023/12/28 12:13:55 tsutsui Exp $");
#endif /* !__lint */
#include
@@ -276,7 +276,7 @@ ffs_makefs(const char *image, const char
/* create image */
TIMER_START(start);
if (ffs_create_image(image, fsopts) == -1)
- errx(1, "Image file `%s' not created.", image);
+ errx(EXIT_FAILURE, "Image file `%s' not created.", image);
TIMER_RESULTS(start, "ffs_create_image");
fsopts->curinode = UFS_ROOTINO;
@@ -288,7 +288,7 @@ ffs_makefs(const char *image, const char
printf("Populating `%s'\n", image);
TIMER_START(start);
if (! ffs_populate_dir(dir, root, fsopts))
- errx(1, "Image file `%s' not populated.", image);
+ errx(EXIT_FAILURE, "Image file `%s' not populated.", image);
TIMER_RESULTS(start, "ffs_populate_dir");
/* ensure no outstanding buffers remain */
@@ -306,7 +306,7 @@ ffs_makefs(const char *image, const char
/* write out superblock; image is now complete */
ffs_write_superblock(fsopts->superblock, fsopts);
if (close(fsopts->fd) == -1)
- err(1, "Closing `%s'", image);
+ err(EXIT_FAILURE, "Closing `%s'", image);
fsopts->fd = -1;
printf("Image `%s' complete\n", image);
}
@@ -423,7 +423,8 @@ ffs_validate(const char *dir, fsnode *ro
}
/* now check calculated sizes vs requested sizes */
if (fsopts->maxsize > 0 && fsopts->size > fsopts->maxsize) {
- errx(1, "`%s' size of %lld is larger than the maxsize of %lld.",
+ errx(EXIT_FAILURE,
+ "`%s' size of %lld is larger than the maxsize of %lld.",
dir, (long long)fsopts->size, (long long)fsopts->maxsize);
}
}
@@ -811,7 +812,7 @@ ffs_populate_dir(const char *dir, fsnode
if ((size_t)snprintf(path, sizeof(path), "%s/%s/%s", cur->root,
cur->path, cur->name) >= sizeof(path))
- errx(1, "Pathname too long.");
+ errx(EXIT_FAILURE, "Pathname too long.");
if (cur->child != NULL)
continue; /* child creates own inode */
@@ -852,7 +853,7 @@ ffs_populate_dir(const char *dir, fsnode
continue;
if ((size_t)snprintf(path, sizeof(path), "%s/%s", dir,
cur->name) >= sizeof(path))
- errx(1, "Pathname too long.");
+ errx(EXIT_FAILURE, "Pathname too long.");
if (! ffs_populate_dir(path, cur->child, fsopts))
return (0);
}
@@ -956,7 +957,7 @@ ffs_write_file(union dinode *din, uint32
errno = ffs_balloc(, offset, chunk, );
bad_ffs_write_file:
if (errno != 0)
- err(1,
+
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: tsutsui Date: Thu Dec 28 12:13:56 UTC 2023 Modified Files: src/usr.sbin/makefs: cd9660.c ffs.c makefs.c msdos.c udf.c walk.c src/usr.sbin/makefs/cd9660: cd9660_debug.c cd9660_eltorito.c cd9660_write.c Log Message: Use EXIT_SUCCESS and EXIT_FAILURE where appropriate per style guide. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/makefs/cd9660.c cvs rdiff -u -r1.74 -r1.75 src/usr.sbin/makefs/ffs.c cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/makefs/makefs.c cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/makefs/msdos.c cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/makefs/udf.c cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/makefs/walk.c cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makefs/cd9660/cd9660_debug.c cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/makefs/cd9660/cd9660_write.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: Thu Dec 28 10:13:51 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c
Log Message:
ixgbe: Use kmem_zalloc() instead of malloc(,M_ZERO).
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/pci/ixgbe/ix_txrx.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/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.113 src/sys/dev/pci/ixgbe/ix_txrx.c:1.114
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.113 Thu Dec 28 10:05:18 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Dec 28 10:13:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.113 2023/12/28 10:05:18 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.114 2023/12/28 10:13:51 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.113 2023/12/28 10:05:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.114 2023/12/28 10:13:51 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -626,8 +626,8 @@ ixgbe_allocate_transmit_buffers(struct t
goto fail;
}
- txr->tx_buffers = malloc(sizeof(struct ixgbe_tx_buf) *
- sc->num_tx_desc, M_DEVBUF, M_WAITOK | M_ZERO);
+ txr->tx_buffers = kmem_zalloc(sizeof(struct ixgbe_tx_buf) *
+ sc->num_tx_desc, KM_SLEEP);
/* Create the descriptor buffer dma maps */
txbuf = txr->tx_buffers;
@@ -758,7 +758,7 @@ ixgbe_free_transmit_structures(struct ix
ixgbe_dma_free(sc, >txdma);
IXGBE_TX_LOCK_DESTROY(txr);
}
- free(sc->tx_rings, M_DEVBUF);
+ kmem_free(sc->tx_rings, sizeof(struct tx_ring) * sc->num_queues);
} /* ixgbe_free_transmit_structures */
/
@@ -806,7 +806,8 @@ ixgbe_free_transmit_buffers(struct tx_ri
pcq_destroy(txr->txr_interq);
}
if (txr->tx_buffers != NULL) {
- free(txr->tx_buffers, M_DEVBUF);
+ kmem_free(txr->tx_buffers,
+ sizeof(struct ixgbe_tx_buf) * sc->num_tx_desc);
txr->tx_buffers = NULL;
}
if (txr->txtag != NULL) {
@@ -1427,7 +1428,7 @@ ixgbe_allocate_receive_buffers(struct rx
int bsize, error;
bsize = sizeof(struct ixgbe_rx_buf) * rxr->num_desc;
- rxr->rx_buffers = malloc(bsize, M_DEVBUF, M_WAITOK | M_ZERO);
+ rxr->rx_buffers = kmem_zalloc(bsize, KM_SLEEP);
error = ixgbe_dma_tag_create(
/* parent */ sc->osdep.dmat,
@@ -1673,7 +1674,7 @@ ixgbe_free_receive_structures(struct ixg
IXGBE_RX_LOCK_DESTROY(rxr);
}
- free(sc->rx_rings, M_DEVBUF);
+ kmem_free(sc->rx_rings, sizeof(struct rx_ring) * sc->num_queues);
} /* ixgbe_free_receive_structures */
@@ -1700,7 +1701,8 @@ ixgbe_free_receive_buffers(struct rx_rin
}
if (rxr->rx_buffers != NULL) {
- free(rxr->rx_buffers, M_DEVBUF);
+ kmem_free(rxr->rx_buffers,
+ sizeof(struct ixgbe_rx_buf) * rxr->num_desc);
rxr->rx_buffers = NULL;
}
}
@@ -2341,16 +2343,16 @@ ixgbe_allocate_queues(struct ixgbe_softc
int txconf = 0, rxconf = 0;
/* First, allocate the top level queue structs */
- sc->queues = (struct ix_queue *)malloc(sizeof(struct ix_queue) *
- sc->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
+ sc->queues = kmem_zalloc(sizeof(struct ix_queue) * sc->num_queues,
+ KM_SLEEP);
/* Second, allocate the TX ring struct memory */
- sc->tx_rings = malloc(sizeof(struct tx_ring) *
- sc->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
+ sc->tx_rings = kmem_zalloc(sizeof(struct tx_ring) * sc->num_queues,
+ KM_SLEEP);
/* Third, allocate the RX ring */
- sc->rx_rings = (struct rx_ring *)malloc(sizeof(struct rx_ring) *
- sc->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
+ sc->rx_rings = kmem_zalloc(sizeof(struct rx_ring) * sc->num_queues,
+ KM_SLEEP);
/* For the ring itself */
tsize = sc->num_tx_desc * sizeof(union ixgbe_adv_tx_desc);
@@ -2469,9 +2471,9 @@ err_rx_desc:
err_tx_desc:
for (txr = sc->tx_rings; txconf > 0; txr++, txconf--)
ixgbe_dma_free(sc, >txdma);
- free(sc->rx_rings, M_DEVBUF);
- free(sc->tx_rings, M_DEVBUF);
- free(sc->queues, M_DEVBUF);
+ kmem_free(sc->rx_rings, sizeof(struct rx_ring) * sc->num_queues);
+ kmem_free(sc->tx_rings, sizeof(struct tx_ring) * sc->num_queues);
+ kmem_free(sc->queues, sizeof(struct ix_queue) * sc->num_queues);
return (error);
} /* ixgbe_allocate_queues */
@@ -2493,5 +2495,5 @@ ixgbe_free_queues(struct ixgbe_softc *sc
que = >queues[i];
mutex_destroy(>dc_mtx);
}
- free(sc->queues, M_DEVBUF);
+ kmem_free(sc->queues, sizeof(struct ix_queue) * sc->num_queues);
} /* ixgbe_free_queues */
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Dec 28 10:13:51 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: ixgbe: Use kmem_zalloc() instead of malloc(,M_ZERO). To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/dev/pci/ixgbe/ix_txrx.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: Thu Dec 28 10:05:18 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c
Log Message:
ixgbe: Simplify. No functional change.
The descriptor ring size and the alignment are tested in the attach
function, so it's not required to use roundup2(size, DBA_ALIGN).
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/pci/ixgbe/ix_txrx.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/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.112 src/sys/dev/pci/ixgbe/ix_txrx.c:1.113
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.112 Thu Dec 28 10:02:14 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Dec 28 10:05:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.112 2023/12/28 10:02:14 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.113 2023/12/28 10:05:18 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.112 2023/12/28 10:02:14 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.113 2023/12/28 10:05:18 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1505,8 +1505,8 @@ ixgbe_setup_receive_ring(struct rx_ring
slot = netmap_reset(na, NR_RX, rxr->me, 0);
#endif /* DEV_NETMAP */
- rsize = roundup2(sc->num_rx_desc *
- sizeof(union ixgbe_adv_rx_desc), DBA_ALIGN);
+ rsize = sc->num_rx_desc * sizeof(union ixgbe_adv_rx_desc);
+ KASSERT((rsize % DBA_ALIGN) == 0);
bzero((void *)rxr->rx_base, rsize);
/* Cache the size */
rxr->mbuf_sz = sc->rx_mbuf_sz;
@@ -2353,8 +2353,8 @@ ixgbe_allocate_queues(struct ixgbe_softc
sc->num_queues, M_DEVBUF, M_WAITOK | M_ZERO);
/* For the ring itself */
- tsize = roundup2(sc->num_tx_desc * sizeof(union ixgbe_adv_tx_desc),
- DBA_ALIGN);
+ tsize = sc->num_tx_desc * sizeof(union ixgbe_adv_tx_desc);
+ KASSERT((tsize % DBA_ALIGN) == 0);
/*
* Now set up the TX queues, txconf is needed to handle the
@@ -2410,8 +2410,8 @@ ixgbe_allocate_queues(struct ixgbe_softc
/*
* Next the RX queues...
*/
- rsize = roundup2(sc->num_rx_desc * sizeof(union ixgbe_adv_rx_desc),
- DBA_ALIGN);
+ rsize = sc->num_rx_desc * sizeof(union ixgbe_adv_rx_desc);
+ KASSERT((rsize % DBA_ALIGN) == 0);
for (int i = 0; i < sc->num_queues; i++, rxconf++) {
rxr = >rx_rings[i];
/* Set up some basics */
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Dec 28 10:05:18 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: ixgbe: Simplify. No functional change. The descriptor ring size and the alignment are tested in the attach function, so it's not required to use roundup2(size, DBA_ALIGN). To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/dev/pci/ixgbe/ix_txrx.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: Thu Dec 28 10:02:14 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.h
Log Message:
ixgbe: Use #ifdef IXGBE_FDIR more
Don't include the Flow Director related members to reduce the size of
struct tx_ring. On amd64 and aarch64, the real size is not changed
because of the alignment.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pci/ixgbe/ixgbe.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.111 src/sys/dev/pci/ixgbe/ix_txrx.c:1.112
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.111 Wed Dec 13 08:25:54 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Dec 28 10:02:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.111 2023/12/13 08:25:54 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.112 2023/12/28 10:02:14 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.111 2023/12/13 08:25:54 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.112 2023/12/28 10:02:14 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -85,6 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v
*/
static bool ixgbe_rsc_enable = FALSE;
+#ifdef IXGBE_FDIR
/*
* For Flow Director: this is the
* number of TX packets we sample
@@ -95,6 +96,7 @@ static bool ixgbe_rsc_enable = FALSE;
* setting this to 0.
*/
static int atr_sample_rate = 20;
+#endif
#define IXGBE_M_ADJ(sc, rxr, mp) \
if (sc->max_frame_size <= (rxr->mbuf_sz - ETHER_ALIGN)) \
@@ -715,9 +717,11 @@ ixgbe_setup_transmit_ring(struct tx_ring
txbuf->eop = NULL;
}
+#ifdef IXGBE_FDIR
/* Set the rate at which we sample packets */
if (sc->feat_en & IXGBE_FEATURE_FDIR)
txr->atr_sample = atr_sample_rate;
+#endif
/* Set number of descriptors available */
txr->tx_avail = sc->num_tx_desc;
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.93 src/sys/dev/pci/ixgbe/ixgbe.h:1.94
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.93 Thu Oct 12 08:06:13 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.h Thu Dec 28 10:02:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.93 2023/10/12 08:06:13 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.94 2023/12/28 10:02:14 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -376,9 +376,11 @@ struct tx_ring {
void *txr_si;
bool txr_no_space; /* Like IFF_OACTIVE */
+#ifdef IXGBE_FDIR
/* Flow Director */
u16 atr_sample;
u16 atr_count;
+#endif
u64 bytes; /* Used for AIM */
u64 packets;
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Dec 28 10:02:14 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.h Log Message: ixgbe: Use #ifdef IXGBE_FDIR more Don't include the Flow Director related members to reduce the size of struct tx_ring. On amd64 and aarch64, the real size is not changed because of the alignment. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pci/ixgbe/ixgbe.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 Dec 28 09:46:13 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: pcidevs: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1480 -r1.1481 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1479 -r1.1480 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 Dec 28 09:43:58 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Update Intel Raptor Lake devices. To generate a diff of this commit: cvs rdiff -u -r1.1500 -r1.1501 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: Thu Dec 28 09:43:58 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Update Intel Raptor Lake devices. To generate a diff of this commit: cvs rdiff -u -r1.1500 -r1.1501 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.1500 src/sys/dev/pci/pcidevs:1.1501 --- src/sys/dev/pci/pcidevs:1.1500 Thu Dec 28 09:42:39 2023 +++ src/sys/dev/pci/pcidevs Thu Dec 28 09:43:57 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1500 2023/12/28 09:42:39 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1501 2023/12/28 09:43:57 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5963,7 +5963,7 @@ product INTEL ADL_U15_2_4_HOST 0x4609 Al product INTEL ADL_U9_2_4_HOST 0x460a Alder Lake (U9,2+4) Host product INTEL ADL_PCIE_RP_0 0x460d Alder Lake PCIe G5 Root Port 0 (x16) product INTEL ADL_XDCI 0x460e Alder Lake USB-C Device (xDCI) -product INTEL ADL_S_2_0_HOST 0x4610 Alder Lake (S,2+0) Host +product INTEL ADL_S_2_0_HOST 0x4610 Alder Lake Refresh (S,2+0) Host product INTEL ADL_N_8_HOST 0x4617 Alder Lake-N (0+8) Host product INTEL ADL_U15_1_4_HOST 0x4619 Alder Lake (U15,1+4) Host product INTEL ADL_U9_1_4_HOST 0x461a Alder Lake (U9,1+4) Host @@ -5985,7 +5985,9 @@ product INTEL ADL_HX_6_8_HOST 0x463b Ald product INTEL ADL_PCIE_RP_3 0x463d Alder Lake PCIe G4 Root Port 3 (x4) product INTEL ADL_TBTDMA_0 0x463e Alder Lake Thunderbolt DMA 0 product INTEL ADL_TBT_PCIE_1 0x463f Alder Lake Thunderbolt PCIe 1 +product INTEL RPL_S_6_8_HOST_2 0x4640 Raptor Lake (S,6+8) Host product INTEL ADL_H_6_8_HOST 0x4641 Alder Lake (H,6+8) Host +product INTEL RPL_HX_6_4_HOST_2 0x4647 Raptor Lake (HX,6+4) Host product INTEL ADL_S_6_4_HOST 0x4648 Alder Lake (S,6+4) Host product INTEL ADL_H_6_4_HOST 0x4649 Alder Lake (H,6+4) Host product INTEL ADL_PCIE_RP_2 0x464d Alder Lake PCIe G4 Root Port 2 (x4) @@ -7436,7 +7438,12 @@ product INTEL RPL_S_6_4_HOST 0xa705 Rapt product INTEL RPL_H_6_8_HOST 0xa706 Raptor Lake (H,6+8) Host product INTEL RPL_H_4_8_HOST 0xa707 Raptor Lake (H,4+8) Host product INTEL RPL_U_2_8_HOST 0xa708 Raptor Lake (U,2+8) Host +product INTEL RPL_PX_6_8_HOST 0xa709 Raptor Lake (PX,6+8) Host +product INTEL RPL_PX_4_8_HOST 0xa70a Raptor Lake (PX,4+8) Host product INTEL RPL_PCIE_RP_0 0xa70d Raptor Lake PCIe G5 Root Port 0 (x16) +product INTEL RPL_E_8_0_HOST 0xa711 Raptor Lake (E,8+0) Host +product INTEL RPL_E_6_0_HOST 0xa712 Raptor Lake (E,6+0) Host +product INTEL RPL_E_4_0_HOST 0xa713 Raptor Lake (E,4+0) Host product INTEL RPL_H_4_4_HOST 0xa716 Raptor Lake (H,4+4) Host product INTEL RPL_HX_6_4_HOST 0xa719 Raptor Lake (HX,6+4) Host product INTEL RPL_U_2_4_HOST 0xa71b Raptor Lake (U,2+4) Host @@ -7448,6 +7455,7 @@ product INTEL RPL_HX_8_12_HOST 0xa729 Ra product INTEL RPL_HX_6_8_HOST 0xa72a Raptor Lake (HX,6+8) Host product INTEL RPL_PCIE_RP_1 0xa72d Raptor Lake PCIe G5 Root Port 1 (x8) product INTEL RPL_TBTDMA_0 0xa73e Raptor Lake Thunderbolt DMA 0 +product INTEL RPL_S_8_12_HOST 0xa740 Raptor Lake Refresh (S,8+12) Host product INTEL RPL_PCIE_RP_2 0xa74d Raptor Lake PCIe G4 Root Port 2 (x4) product INTEL RPL_GNA 0xa74f Raptor Lake Gauss Newton Algorithm product INTEL RPL_TBTDMA_1 0xa76d Raptor Lake Thunderbolt DMA 1
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Dec 28 09:42:40 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel C26[26] eSPI. To generate a diff of this commit: cvs rdiff -u -r1.1499 -r1.1500 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.1499 src/sys/dev/pci/pcidevs:1.1500 --- src/sys/dev/pci/pcidevs:1.1499 Mon Nov 13 08:07:24 2023 +++ src/sys/dev/pci/pcidevs Thu Dec 28 09:42:39 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1499 2023/11/13 08:07:24 jnemeth Exp $ +$NetBSD: pcidevs,v 1.1500 2023/12/28 09:42:39 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -6508,6 +6508,8 @@ product INTEL I740 0x7800 i740 Graphics product INTEL 7HS_Z790_ESPI 0x7a04 Z790 eSPI product INTEL 7HS_H770_ESPI 0x7a05 H770 eSPI product INTEL 7HS_B760_ESPI 0x7a06 B760 eSPI +product INTEL 7HS_C266_ESPI 0x7a13 C266 eSPI +product INTEL 7HS_C262_ESPI 0x7a14 C262 eSPI product INTEL 7HS_P2SB 0x7a20 700 Series PCH P2SB product INTEL 7HS_PMC 0x7a21 700 Series PCH PMC product INTEL 7HS_SMB 0x7a23 700 Series PCH SMBus
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Dec 28 09:42:40 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel C26[26] eSPI. To generate a diff of this commit: cvs rdiff -u -r1.1499 -r1.1500 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
