CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: skrll Date: Wed Nov 2 08:05:17 UTC 2022 Modified Files: src/sys/uvm/pmap: pmap.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/uvm/pmap/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: skrll Date: Wed Nov 2 08:05:17 UTC 2022 Modified Files: src/sys/uvm/pmap: pmap.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/uvm/pmap/pmap.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/uvm/pmap/pmap.c diff -u src/sys/uvm/pmap/pmap.c:1.72 src/sys/uvm/pmap/pmap.c:1.73 --- src/sys/uvm/pmap/pmap.c:1.72 Fri Oct 28 07:16:34 2022 +++ src/sys/uvm/pmap/pmap.c Wed Nov 2 08:05:17 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.72 2022/10/28 07:16:34 skrll Exp $ */ +/* $NetBSD: pmap.c,v 1.73 2022/11/02 08:05:17 skrll Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.72 2022/10/28 07:16:34 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.73 2022/11/02 08:05:17 skrll Exp $"); /* * Manages physical address maps. @@ -880,7 +880,7 @@ pmap_page_remove(struct vm_page_md *mdpg } #ifdef PMAP_VIRTUAL_CACHE_ALIASES - pmap_page_clear_attributes(mdpg, VM_PAGEMD_EXECPAGE|VM_PAGEMD_UNCACHED); + pmap_page_clear_attributes(mdpg, VM_PAGEMD_EXECPAGE | VM_PAGEMD_UNCACHED); #else pmap_page_clear_attributes(mdpg, VM_PAGEMD_EXECPAGE); #endif @@ -1166,13 +1166,13 @@ pmap_page_protect(struct vm_page *pg, vm PMAP_COUNT(page_protect); switch (prot) { - case VM_PROT_READ|VM_PROT_WRITE: + case VM_PROT_READ | VM_PROT_WRITE: case VM_PROT_ALL: break; /* copy_on_write */ case VM_PROT_READ: - case VM_PROT_READ|VM_PROT_EXECUTE: + case VM_PROT_READ | VM_PROT_EXECUTE: pv = &mdpg->mdpg_first; kpreempt_disable(); VM_PAGEMD_PVLIST_READLOCK(mdpg); @@ -1415,7 +1415,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd if (mdpg) { /* Set page referenced/modified status based on flags */ if (flags & VM_PROT_WRITE) { - pmap_page_set_attributes(mdpg, VM_PAGEMD_MODIFIED|VM_PAGEMD_REFERENCED); + pmap_page_set_attributes(mdpg, VM_PAGEMD_MODIFIED | VM_PAGEMD_REFERENCED); } else if (flags & VM_PROT_ALL) { pmap_page_set_attributes(mdpg, VM_PAGEMD_REFERENCED); } @@ -1941,7 +1941,7 @@ pmap_set_modified(paddr_t pa) { struct vm_page * const pg = PHYS_TO_VM_PAGE(pa); struct vm_page_md * const mdpg = VM_PAGE_TO_MD(pg); - pmap_page_set_attributes(mdpg, VM_PAGEMD_MODIFIED|VM_PAGEMD_REFERENCED); + pmap_page_set_attributes(mdpg, VM_PAGEMD_MODIFIED | VM_PAGEMD_REFERENCED); } / pv_entry management /
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Wed Nov 2 08:37:32 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: db_interface.c Log Message: Restore a '\n' I accidentally removed in 1.16 To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/aarch64/aarch64/db_interface.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/aarch64/aarch64
Module Name:src Committed By: skrll Date: Wed Nov 2 08:37:32 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: db_interface.c Log Message: Restore a '\n' I accidentally removed in 1.16 To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/aarch64/aarch64/db_interface.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/aarch64/aarch64/db_interface.c diff -u src/sys/arch/aarch64/aarch64/db_interface.c:1.21 src/sys/arch/aarch64/aarch64/db_interface.c:1.22 --- src/sys/arch/aarch64/aarch64/db_interface.c:1.21 Sun Oct 23 07:14:12 2022 +++ src/sys/arch/aarch64/aarch64/db_interface.c Wed Nov 2 08:37:32 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.21 2022/10/23 07:14:12 skrll Exp $ */ +/* $NetBSD: db_interface.c,v 1.22 2022/11/02 08:37:32 skrll Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.21 2022/10/23 07:14:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.22 2022/11/02 08:37:32 skrll Exp $"); #include #include @@ -566,7 +566,7 @@ dump_ln_table(bool countmode, pd_entry_t if (pg == NULL) { pr("%sL%d: pa=%lx pg=NULL\n", spc, level, pa); } else { - pr("%sL%d: pa=%lx pg=%p", spc, level, pa, pg); + pr("%sL%d: pa=%lx pg=%p\n", spc, level, pa, pg); } for (i = n = 0; i < Ln_ENTRIES; i++) {
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: ozaki-r Date: Wed Nov 2 09:01:42 UTC 2022 Modified Files: src/sys/rump/librump/rumpkern: lwproc.c Log Message: rump: don't touch p_nlwps without holding p_lock There was a race condition on p_nlwps. Heavy thread switching could cause a kernel panic like: panic: kernel diagnostic assertion "LIST_EMPTY(&p->p_lwps)" failed: file "(hidden)/src/lib/librump/../../sys/rump/librump/rumpkern/lwproc.c", line 177 To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/rump/librump/rumpkern/lwproc.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/rump/librump/rumpkern/lwproc.c diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.51 src/sys/rump/librump/rumpkern/lwproc.c:1.52 --- src/sys/rump/librump/rumpkern/lwproc.c:1.51 Sat May 30 19:16:53 2020 +++ src/sys/rump/librump/rumpkern/lwproc.c Wed Nov 2 09:01:42 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: lwproc.c,v 1.51 2020/05/30 19:16:53 ad Exp $ */ +/* $NetBSD: lwproc.c,v 1.52 2022/11/02 09:01:42 ozaki-r Exp $ */ /* * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ #define RUMP__CURLWP_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.51 2020/05/30 19:16:53 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.52 2022/11/02 09:01:42 ozaki-r Exp $"); #include #include @@ -348,6 +348,14 @@ lwproc_makelwp(struct proc *p, bool dosw { struct lwp *l = kmem_zalloc(sizeof(*l), KM_SLEEP); + l->l_refcnt = 1; + l->l_proc = p; + l->l_stat = LSIDL; + l->l_mutex = &unruntime_lock; + + proc_alloc_lwpid(p, l); + + mutex_enter(p->p_lock); /* * Account the new lwp to the owner of the process. * For some reason, NetBSD doesn't count the first lwp @@ -357,14 +365,6 @@ lwproc_makelwp(struct proc *p, bool dosw chglwpcnt(kauth_cred_getuid(p->p_cred), 1); } - l->l_refcnt = 1; - l->l_proc = p; - l->l_stat = LSIDL; - l->l_mutex = &unruntime_lock; - - proc_alloc_lwpid(p, l); - - mutex_enter(p->p_lock); KASSERT((p->p_sflag & PS_RUMP_LWPEXIT) == 0); LIST_INSERT_HEAD(&p->p_lwps, l, l_sibling);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: ozaki-r Date: Wed Nov 2 09:01:42 UTC 2022 Modified Files: src/sys/rump/librump/rumpkern: lwproc.c Log Message: rump: don't touch p_nlwps without holding p_lock There was a race condition on p_nlwps. Heavy thread switching could cause a kernel panic like: panic: kernel diagnostic assertion "LIST_EMPTY(&p->p_lwps)" failed: file "(hidden)/src/lib/librump/../../sys/rump/librump/rumpkern/lwproc.c", line 177 To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/rump/librump/rumpkern/lwproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net
Module Name:src Committed By: ozaki-r Date: Wed Nov 2 09:35:12 UTC 2022 Modified Files: src/tests/net: net_common.sh Log Message: tests: enable start_nc_server to have extra options for nc To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/tests/net/net_common.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/net/net_common.sh diff -u src/tests/net/net_common.sh:1.43 src/tests/net/net_common.sh:1.44 --- src/tests/net/net_common.sh:1.43 Thu Nov 25 14:17:22 2021 +++ src/tests/net/net_common.sh Wed Nov 2 09:35:12 2022 @@ -1,4 +1,4 @@ -# $NetBSD: net_common.sh,v 1.43 2021/11/25 14:17:22 hannken Exp $ +# $NetBSD: net_common.sh,v 1.44 2022/11/02 09:35:12 ozaki-r Exp $ # # Copyright (c) 2016 Internet Initiative Japan Inc. # All rights reserved. @@ -139,6 +139,7 @@ start_nc_server() local port=$2 local outfile=$3 local proto=${4:-ipv4} + local extra_opts="$5" local backup=$RUMP_SERVER local opts= @@ -149,6 +150,7 @@ start_nc_server() else opts="-l -6" fi + opts="$opts $extra_opts" env LD_PRELOAD=/usr/lib/librumphijack.so nc $opts $port > $outfile & echo $! > $NC_PID
CVS commit: src/tests/net
Module Name:src Committed By: ozaki-r Date: Wed Nov 2 09:35:12 UTC 2022 Modified Files: src/tests/net: net_common.sh Log Message: tests: enable start_nc_server to have extra options for nc To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/tests/net/net_common.sh 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: ozaki-r Date: Wed Nov 2 09:37:56 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/net: Makefile Added Files: src/tests/net/tcp: Makefile t_tcp_nc.sh Log Message: tests: add tests for TCP with nc To generate a diff of this commit: cvs rdiff -u -r1.1224 -r1.1225 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.193 -r1.194 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.39 -r1.40 src/tests/net/Makefile cvs rdiff -u -r0 -r1.1 src/tests/net/tcp/Makefile \ src/tests/net/tcp/t_tcp_nc.sh 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: ozaki-r Date: Wed Nov 2 09:37:56 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/net: Makefile Added Files: src/tests/net/tcp: Makefile t_tcp_nc.sh Log Message: tests: add tests for TCP with nc To generate a diff of this commit: cvs rdiff -u -r1.1224 -r1.1225 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.193 -r1.194 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.39 -r1.40 src/tests/net/Makefile cvs rdiff -u -r0 -r1.1 src/tests/net/tcp/Makefile \ src/tests/net/tcp/t_tcp_nc.sh 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1224 src/distrib/sets/lists/tests/mi:1.1225 --- src/distrib/sets/lists/tests/mi:1.1224 Tue Oct 11 09:55:21 2022 +++ src/distrib/sets/lists/tests/mi Wed Nov 2 09:37:56 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1224 2022/10/11 09:55:21 knakahara Exp $ +# $NetBSD: mi,v 1.1225 2022/11/02 09:37:56 ozaki-r Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4283,6 +4283,10 @@ ./usr/tests/net/sys/t_listentests-obsolete obsolete ./usr/tests/net/sys/t_rfc6056tests-net-tests compattestfile,atf ./usr/tests/net/sys/t_socketpair tests-obsolete obsolete +./usr/tests/net/tcp tests-net-tests compattestfile,atf +./usr/tests/net/tcp/Atffiletests-net-tests compattestfile,atf +./usr/tests/net/tcp/Kyuafiletests-net-tests compattestfile,atf,kyua +./usr/tests/net/tcp/t_tcp_nctests-net-tests compattestfile,atf ./usr/tests/net/wireguardtests-obsolete obsolete ./usr/tests/net/wireguard/Atffile tests-obsolete obsolete ./usr/tests/net/wireguard/Kyuafile tests-obsolete obsolete Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.193 src/etc/mtree/NetBSD.dist.tests:1.194 --- src/etc/mtree/NetBSD.dist.tests:1.193 Thu Jul 21 09:52:48 2022 +++ src/etc/mtree/NetBSD.dist.tests Wed Nov 2 09:37:56 2022 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.193 2022/07/21 09:52:48 kre Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.194 2022/11/02 09:37:56 ozaki-r Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -382,6 +382,7 @@ ./usr/tests/net/npf ./usr/tests/net/route ./usr/tests/net/sys +./usr/tests/net/tcp ./usr/tests/rump ./usr/tests/rump/modautoload ./usr/tests/rump/rumpkern Index: src/tests/net/Makefile diff -u src/tests/net/Makefile:1.39 src/tests/net/Makefile:1.40 --- src/tests/net/Makefile:1.39 Wed Jul 14 03:22:33 2021 +++ src/tests/net/Makefile Wed Nov 2 09:37:56 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2021/07/14 03:22:33 ozaki-r Exp $ +# $NetBSD: Makefile,v 1.40 2022/11/02 09:37:56 ozaki-r Exp $ .include @@ -9,7 +9,7 @@ TESTS_SUBDIRS= fdpass in_cksum net sys TESTS_SUBDIRS+= altq arp bpf bpfilter can carp icmp if if_bridge if_gif TESTS_SUBDIRS+= if_ipsec if_l2tp if_lagg if_loop if_pppoe if_tap TESTS_SUBDIRS+= if_tun if_vether if_vlan if_wg ipsec mcast mpls -TESTS_SUBDIRS+= ndp npf route +TESTS_SUBDIRS+= ndp npf route tcp .if (${MKSLJIT} != "no") TESTS_SUBDIRS+= bpfjit .endif Added files: Index: src/tests/net/tcp/Makefile diff -u /dev/null src/tests/net/tcp/Makefile:1.1 --- /dev/null Wed Nov 2 09:37:56 2022 +++ src/tests/net/tcp/Makefile Wed Nov 2 09:37:56 2022 @@ -0,0 +1,13 @@ +# $NetBSD: Makefile,v 1.1 2022/11/02 09:37:56 ozaki-r Exp $ +# + +.include + +TESTSDIR= ${TESTSBASE}/net/tcp + +.for name in tcp_nc +TESTS_SH+= t_${name} +TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh +.endfor + +.include Index: src/tests/net/tcp/t_tcp_nc.sh diff -u /dev/null src/tests/net/tcp/t_tcp_nc.sh:1.1 --- /dev/null Wed Nov 2 09:37:56 2022 +++ src/tests/net/tcp/t_tcp_nc.sh Wed Nov 2 09:37:56 2022 @@ -0,0 +1,161 @@ +# $NetBSD: t_tcp_nc.sh,v 1.1 2022/11/02 09:37:56 ozaki-r Exp $ +# +# Copyright (c) 2022 Internet Initiative Japan Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +#notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +#notice, this list of conditions and the following disclaimer in the +#documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUE
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: jmcneill Date: Wed Nov 2 10:38:04 UTC 2022 Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: Select DMA mode after programming the ADMA base address register(s). The Arasan SDHCI 8.9a found in the Xilinx Zynq-7000 SoC requires this sequence to avoid sporadic transfer errors. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/dev/sdmmc/sdhc.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/sdmmc
Module Name:src Committed By: jmcneill Date: Wed Nov 2 10:38:04 UTC 2022 Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: Select DMA mode after programming the ADMA base address register(s). The Arasan SDHCI 8.9a found in the Xilinx Zynq-7000 SoC requires this sequence to avoid sporadic transfer errors. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c diff -u src/sys/dev/sdmmc/sdhc.c:1.116 src/sys/dev/sdmmc/sdhc.c:1.117 --- src/sys/dev/sdmmc/sdhc.c:1.116 Fri Oct 14 07:54:49 2022 +++ src/sys/dev/sdmmc/sdhc.c Wed Nov 2 10:38:04 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.116 2022/10/14 07:54:49 jmcneill Exp $ */ +/* $NetBSD: sdhc.c,v 1.117 2022/11/02 10:38:04 jmcneill Exp $ */ /* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */ /* @@ -23,7 +23,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.116 2022/10/14 07:54:49 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.117 2022/11/02 10:38:04 jmcneill Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -1835,21 +1835,21 @@ sdhc_start_command(struct sdhc_host *hp, } bus_dmamap_sync(sc->sc_dmat, hp->adma_map, 0, PAGE_SIZE, BUS_DMASYNC_PREWRITE); - if (ISSET(hp->sc->sc_flags, SDHC_FLAG_USDHC)) { - HCLR4(hp, SDHC_HOST_CTL, SDHC_USDHC_DMA_SELECT); - HSET4(hp, SDHC_HOST_CTL, SDHC_USDHC_DMA_SELECT_ADMA2); - } else { - HCLR1(hp, SDHC_HOST_CTL, SDHC_DMA_SELECT); - HSET1(hp, SDHC_HOST_CTL, SDHC_DMA_SELECT_ADMA2); - } const bus_addr_t desc_addr = hp->adma_map->dm_segs[0].ds_addr; - HWRITE4(hp, SDHC_ADMA_SYSTEM_ADDR, desc_addr & 0x); if (ISSET(hp->flags, SHF_USE_ADMA2_64)) { HWRITE4(hp, SDHC_ADMA_SYSTEM_ADDR + 4, (uint64_t)desc_addr >> 32); } + + if (ISSET(hp->sc->sc_flags, SDHC_FLAG_USDHC)) { + HCLR4(hp, SDHC_HOST_CTL, SDHC_USDHC_DMA_SELECT); + HSET4(hp, SDHC_HOST_CTL, SDHC_USDHC_DMA_SELECT_ADMA2); + } else { + HCLR1(hp, SDHC_HOST_CTL, SDHC_DMA_SELECT); + HSET1(hp, SDHC_HOST_CTL, SDHC_DMA_SELECT_ADMA2); + } } else if (ISSET(mode, SDHC_DMA_ENABLE) && !ISSET(sc->sc_flags, SDHC_FLAG_EXTERNAL_DMA)) { if (ISSET(hp->sc->sc_flags, SDHC_FLAG_USDHC)) {
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Wed Nov 2 11:04:02 UTC 2022 Modified Files: src/sys/dev/fdt: arasan_sdhc_fdt.c Log Message: Re-enable ADMA2 support for arasan,sdhci-8.9a To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/fdt/arasan_sdhc_fdt.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/arasan_sdhc_fdt.c diff -u src/sys/dev/fdt/arasan_sdhc_fdt.c:1.12 src/sys/dev/fdt/arasan_sdhc_fdt.c:1.13 --- src/sys/dev/fdt/arasan_sdhc_fdt.c:1.12 Tue Nov 1 00:57:39 2022 +++ src/sys/dev/fdt/arasan_sdhc_fdt.c Wed Nov 2 11:04:02 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: arasan_sdhc_fdt.c,v 1.12 2022/11/01 00:57:39 jmcneill Exp $ */ +/* $NetBSD: arasan_sdhc_fdt.c,v 1.13 2022/11/02 11:04:02 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.12 2022/11/01 00:57:39 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.13 2022/11/02 11:04:02 jmcneill Exp $"); #include #include @@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_ #define RK3399_CORECFG_CLOCKMULTIPLIER __BITS(7,0) enum arasan_sdhc_type { - AS_TYPE_RK3399 = 1, - AS_TYPE_SDHCI_8_9A, + AS_TYPE_GENERIC, + AS_TYPE_RK3399, }; struct arasan_sdhc_softc { @@ -78,7 +78,7 @@ static const struct device_compatible_en .value = AS_TYPE_RK3399 }, { .compat = "arasan,sdhci-8.9a", - .value = AS_TYPE_SDHCI_8_9A }, + .value = AS_TYPE_GENERIC }, DEVICE_COMPAT_EOL }; @@ -296,13 +296,6 @@ arasan_sdhc_attach(device_t parent, devi SDHC_FLAG_32BIT_ACCESS | SDHC_FLAG_USE_DMA | SDHC_FLAG_STOP_WITH_TC; - if (sc->sc_type == AS_TYPE_SDHCI_8_9A) { - /* - * Workaround for sporadic transfer errors on the Arasan SDHCI - * found in the Xilinx Zynq-7000 SoC. - */ - sc->sc_base.sc_flags |= SDHC_FLAG_BROKEN_ADMA; - } if (bus_width == 8) { sc->sc_base.sc_flags |= SDHC_FLAG_8BIT_MODE; }
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Wed Nov 2 11:04:02 UTC 2022 Modified Files: src/sys/dev/fdt: arasan_sdhc_fdt.c Log Message: Re-enable ADMA2 support for arasan,sdhci-8.9a To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/fdt/arasan_sdhc_fdt.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/ic
Module Name:src Committed By: andvar Date: Wed Nov 2 12:03:44 UTC 2022 Modified Files: src/sys/dev/ic: esiop.c siop.c Log Message: s/ourselve/ourselves/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ic/esiop.c cvs rdiff -u -r1.103 -r1.104 src/sys/dev/ic/siop.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/ic
Module Name:src Committed By: andvar Date: Wed Nov 2 12:03:44 UTC 2022 Modified Files: src/sys/dev/ic: esiop.c siop.c Log Message: s/ourselve/ourselves/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ic/esiop.c cvs rdiff -u -r1.103 -r1.104 src/sys/dev/ic/siop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/esiop.c diff -u src/sys/dev/ic/esiop.c:1.61 src/sys/dev/ic/esiop.c:1.62 --- src/sys/dev/ic/esiop.c:1.61 Mon May 23 19:21:30 2022 +++ src/sys/dev/ic/esiop.c Wed Nov 2 12:03:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: esiop.c,v 1.61 2022/05/23 19:21:30 andvar Exp $ */ +/* $NetBSD: esiop.c,v 1.62 2022/11/02 12:03:44 andvar Exp $ */ /* * Copyright (c) 2002 Manuel Bouyer. @@ -28,7 +28,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include -__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.61 2022/05/23 19:21:30 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.62 2022/11/02 12:03:44 andvar Exp $"); #include #include @@ -660,7 +660,7 @@ none: if ((sist & (SIST1_STO << 8)) && need_reset == 0) { /* * selection time out, assume there's no device here - * We also have to update the ring pointer ourselve + * We also have to update the ring pointer ourselves */ slot = bus_space_read_1(sc->sc_c.sc_rt, sc->sc_c.sc_rh, SIOP_SCRATCHE); @@ -733,7 +733,7 @@ none: goto scintr; } /* - * else we have to restart it ourselve, at the + * else we have to restart it ourselves, at the * interrupted instruction. */ bus_space_write_4(sc->sc_c.sc_rt, sc->sc_c.sc_rh, Index: src/sys/dev/ic/siop.c diff -u src/sys/dev/ic/siop.c:1.103 src/sys/dev/ic/siop.c:1.104 --- src/sys/dev/ic/siop.c:1.103 Wed Feb 23 21:54:41 2022 +++ src/sys/dev/ic/siop.c Wed Nov 2 12:03:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: siop.c,v 1.103 2022/02/23 21:54:41 andvar Exp $ */ +/* $NetBSD: siop.c,v 1.104 2022/11/02 12:03:44 andvar Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -28,7 +28,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include -__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.103 2022/02/23 21:54:41 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.104 2022/11/02 12:03:44 andvar Exp $"); #include #include @@ -561,7 +561,7 @@ siop_intr(void *v) goto scintr; } /* - * else we have to restart it ourselve, at the + * else we have to restart it ourselves, at the * interrupted instruction. */ bus_space_write_4(sc->sc_c.sc_rt, sc->sc_c.sc_rh,
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Wed Nov 2 12:49:10 UTC 2022 Modified Files: src/lib/libc/time: zic.c Log Message: Cleaner to use if/then/else rather than a ton of casts in the ternary operator. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Wed Nov 2 12:49:10 UTC 2022 Modified Files: src/lib/libc/time: zic.c Log Message: Cleaner to use if/then/else rather than a ton of casts in the ternary operator. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/zic.c diff -u src/lib/libc/time/zic.c:1.84 src/lib/libc/time/zic.c:1.85 --- src/lib/libc/time/zic.c:1.84 Sat Oct 29 09:55:50 2022 +++ src/lib/libc/time/zic.c Wed Nov 2 08:49:10 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: zic.c,v 1.84 2022/10/29 13:55:50 christos Exp $ */ +/* $NetBSD: zic.c,v 1.85 2022/11/02 12:49:10 christos Exp $ */ /* ** This file is in the public domain, so clarified as of ** 2006-07-17 by Arthur David Olson. @@ -11,7 +11,7 @@ #include #ifndef lint -__RCSID("$NetBSD: zic.c,v 1.84 2022/10/29 13:55:50 christos Exp $"); +__RCSID("$NetBSD: zic.c,v 1.85 2022/11/02 12:49:10 christos Exp $"); #endif /* !defined lint */ /* Use the system 'time' function, instead of any private replacement. @@ -1204,7 +1204,10 @@ get_rand_u64(void) s = getrandom(entropy_buffer, sizeof entropy_buffer, 0); while (s < 0 && errno == EINTR); -nwords = s < 0 ? (size_t)-1 : s / sizeof *entropy_buffer; +if (s < 0) + nwords = -1; +else + nwords = s / sizeof *entropy_buffer; } if (0 < nwords) return entropy_buffer[--nwords];
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: andvar Date: Wed Nov 2 18:18:44 UTC 2022 Modified Files: src/sys/dev/hyperv: hvtimesync.c Log Message: rename sneaky snyc in hvtimesnyc_sample_verbose variable to sync. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hyperv/hvtimesync.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/hyperv
Module Name:src Committed By: andvar Date: Wed Nov 2 18:18:44 UTC 2022 Modified Files: src/sys/dev/hyperv: hvtimesync.c Log Message: rename sneaky snyc in hvtimesnyc_sample_verbose variable to sync. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hyperv/hvtimesync.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/hyperv/hvtimesync.c diff -u src/sys/dev/hyperv/hvtimesync.c:1.2 src/sys/dev/hyperv/hvtimesync.c:1.3 --- src/sys/dev/hyperv/hvtimesync.c:1.2 Fri Mar 1 08:17:51 2019 +++ src/sys/dev/hyperv/hvtimesync.c Wed Nov 2 18:18:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: hvtimesync.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $ */ +/* $NetBSD: hvtimesync.c,v 1.3 2022/11/02 18:18:44 andvar Exp $ */ /*- * Copyright (c) 2014,2016-2017 Microsoft Corp. @@ -28,7 +28,7 @@ #include #ifdef __KERNEL_RCSID -__KERNEL_RCSID(0, "$NetBSD: hvtimesync.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hvtimesync.c,v 1.3 2022/11/02 18:18:44 andvar Exp $"); #endif #ifdef __FBSDID __FBSDID("$FreeBSD: head/sys/dev/hyperv/utilities/vmbus_timesync.c 322488 2017-08-14 06:00:50Z sephe $"); @@ -75,7 +75,7 @@ CFATTACH_DECL_NEW(hvtimesync, sizeof(str hvtimesync_match, hvtimesync_attach, hvtimesync_detach, NULL); static int hvtimesync_ignore_sync; -static int hvtimesnyc_sample_verbose; +static int hvtimesync_sample_verbose; static int hvtimesync_sample_thresh = -1; static int @@ -149,7 +149,7 @@ do_timesync(struct hvtimesync_softc *sc, if ((tsflags & VMBUS_ICMSG_TS_FLAG_SAMPLE) && hvtimesync_sample_thresh >= 0) { - if (hvtimesnyc_sample_verbose) { + if (hvtimesync_sample_verbose) { device_printf(vsc->sc_dev, "sample request, hv: %ju, vm: %ju\n", (uintmax_t)hv_ns, (uintmax_t)vm_ns); @@ -284,7 +284,7 @@ hvtimesync_sysctl_setup(device_t self) error = sysctl_createv(&vsc->sc_log, 0, &node, NULL, CTLFLAG_READWRITE, CTLTYPE_INT, "sample_verbose", NULL, - NULL, 0, &hvtimesnyc_sample_verbose, 0, + NULL, 0, &hvtimesync_sample_verbose, 0, CTL_CREATE, CTL_EOL); if (error) return error;
CVS commit: src
Module Name:src Committed By: andvar Date: Wed Nov 2 20:38:22 UTC 2022 Modified Files: src/lib/libresolv: dst_api.c src/libexec/httpd: CHANGES src/sys/arch/arc/conf: MIMORI src/sys/arch/m68k/fpsp: get_op.sa src/sys/arch/powerpc/include: ofw_machdep.h src/sys/dev/isa: madreg.h wbsio.c src/sys/dev/marvell: gtmpsc.c src/sys/dev/pci: if_aq.c src/sys/kern: vfs_syscalls.c Log Message: fix various typos in comments and messages. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libresolv/dst_api.c cvs rdiff -u -r1.53 -r1.54 src/libexec/httpd/CHANGES cvs rdiff -u -r1.75 -r1.76 src/sys/arch/arc/conf/MIMORI cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/fpsp/get_op.sa cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/ofw_machdep.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/madreg.h cvs rdiff -u -r1.28 -r1.29 src/sys/dev/isa/wbsio.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/marvell/gtmpsc.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_aq.c cvs rdiff -u -r1.555 -r1.556 src/sys/kern/vfs_syscalls.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: Wed Nov 2 20:38:22 UTC 2022 Modified Files: src/lib/libresolv: dst_api.c src/libexec/httpd: CHANGES src/sys/arch/arc/conf: MIMORI src/sys/arch/m68k/fpsp: get_op.sa src/sys/arch/powerpc/include: ofw_machdep.h src/sys/dev/isa: madreg.h wbsio.c src/sys/dev/marvell: gtmpsc.c src/sys/dev/pci: if_aq.c src/sys/kern: vfs_syscalls.c Log Message: fix various typos in comments and messages. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libresolv/dst_api.c cvs rdiff -u -r1.53 -r1.54 src/libexec/httpd/CHANGES cvs rdiff -u -r1.75 -r1.76 src/sys/arch/arc/conf/MIMORI cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/fpsp/get_op.sa cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/ofw_machdep.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/madreg.h cvs rdiff -u -r1.28 -r1.29 src/sys/dev/isa/wbsio.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/marvell/gtmpsc.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_aq.c cvs rdiff -u -r1.555 -r1.556 src/sys/kern/vfs_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libresolv/dst_api.c diff -u src/lib/libresolv/dst_api.c:1.9 src/lib/libresolv/dst_api.c:1.10 --- src/lib/libresolv/dst_api.c:1.9 Tue May 24 06:27:59 2022 +++ src/lib/libresolv/dst_api.c Wed Nov 2 20:38:21 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dst_api.c,v 1.9 2022/05/24 06:27:59 andvar Exp $ */ +/* $NetBSD: dst_api.c,v 1.10 2022/11/02 20:38:21 andvar Exp $ */ /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. @@ -21,7 +21,7 @@ * This is the only file that needs to be changed if the crypto system is * changed. Exported functions are: * void dst_init() Initialize the toolkit - * int dst_check_algorithm() Function to determines if alg is suppored. + * int dst_check_algorithm() Function to determines if alg is supported. * int dst_compare_keys() Function to compare two keys for equality. * int dst_sign_data() Incremental signing routine. * int dst_verify_data() Incremental verify routine. @@ -40,7 +40,7 @@ #if 0 static const char rcsid[] = "Header: /proj/cvs/prod/libbind/dst/dst_api.c,v 1.17 2007/09/24 17:18:25 each Exp "; #else -__RCSID("$NetBSD: dst_api.c,v 1.9 2022/05/24 06:27:59 andvar Exp $"); +__RCSID("$NetBSD: dst_api.c,v 1.10 2022/11/02 20:38:21 andvar Exp $"); #endif @@ -334,7 +334,7 @@ dst_read_key(const char *in_keyname, con DST_KEY *dg_key = NULL, *pubkey = NULL; if (!dst_check_algorithm(in_alg)) { /*%< make sure alg is available */ - EREPORT(("%s: Algorithm %d not suppored\n", __func__, in_alg)); + EREPORT(("%s: Algorithm %d not supported\n", __func__, in_alg)); return (NULL); } if ((type & (DST_PUBLIC | DST_PRIVATE)) == 0) @@ -376,7 +376,7 @@ dst_write_key(const DST_KEY *key, const if (key == NULL) return (0); if (!dst_check_algorithm(key->dk_alg)) { /*%< make sure alg is available */ - EREPORT(("%s: Algorithm %d not suppored\n", __func__, + EREPORT(("%s: Algorithm %d not supported\n", __func__, key->dk_alg)); return (UNSUPPORTED_KEYALG); } @@ -659,7 +659,7 @@ dst_dnskey_to_key(const char *in_name, c return (NULL); alg = (u_int8_t) rdata[DST_KEY_ALG]; if (!dst_check_algorithm(alg)) { /*%< make sure alg is available */ - EREPORT(("%s: Algorithm %d not suppored\n", __func__, + EREPORT(("%s: Algorithm %d not supported\n", __func__, alg)); return (NULL); } @@ -688,7 +688,7 @@ dst_dnskey_to_key(const char *in_name, c len - start) > 0) return (key_st); } else - EREPORT(("%s: unsuppored alg %d\n", __func__, + EREPORT(("%s: unsupported alg %d\n", __func__, alg)); SAFE_FREE(key_st); @@ -718,7 +718,7 @@ dst_key_to_dnskey(const DST_KEY *key, u_ return (-1); if (!dst_check_algorithm(key->dk_alg)) { /*%< make sure alg is available */ - EREPORT(("%s: Algorithm %d not suppored\n", __func__, + EREPORT(("%s: Algorithm %d not supported\n", __func__, key->dk_alg)); return (UNSUPPORTED_KEYALG); } @@ -775,7 +775,7 @@ dst_buffer_to_key(const char *key_name, u_char dns[2048]; if (!dst_check_algorithm(alg)) { /*%< make sure alg is available */ - EREPORT(("%s: Algorithm %d not suppored\n", __func__, alg)); + EREPORT(("%s: Algorithm %d not supported\n", __func__, alg)); return (NULL); } @@ -971,7 +971,7 @@ dst_generate_key(const char *name, const return (NULL); if (!dst_check_algorithm(alg)) { /*%< make sure alg is available */ - EREPORT(("%s: Algorithm %d not suppored\n", __func__, alg)); + EREPORT(("%s: Algorithm %d not supported\n", __func__, alg)); return (NULL); } Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.53 src/libexec/httpd/CHANGES:1.54 --- src/libexec/httpd/CHANGES:1.53 Tue Jan 4 06:08:14 2022 +++ src/libexec/httpd/CHANGES Wed Nov 2 20:38:21 2022