CVS commit: src/share/misc
Module Name:src Committed By: fcambus Date: Mon Feb 17 17:16:51 UTC 2020 Modified Files: src/share/misc: acronyms Log Message: Add RIF (reduction in force). To generate a diff of this commit: cvs rdiff -u -r1.296 -r1.297 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src
Committed By: fcambus
Date: Mon Feb 17 17:16:51 UTC 2020
Modified Files:
src/share/misc: acronyms
Log Message:
Add RIF (reduction in force).
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/share/misc/acronyms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.296 src/share/misc/acronyms:1.297
--- src/share/misc/acronyms:1.296 Thu Jan 30 23:47:45 2020
+++ src/share/misc/acronyms Mon Feb 17 17:16:51 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.296 2020/01/30 23:47:45 sevan Exp $
+$NetBSD: acronyms,v 1.297 2020/02/17 17:16:51 fcambus Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -472,6 +472,7 @@ RCD residual current device
RFC request for comments
RFD request for discussion
RFE request for enhancements
+RIF reduction in force
RIP rest in peace
RL real life
RLC rod length check
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Mon Feb 17 15:51:25 UTC 2020
Modified Files:
src/sys/net: if_media.h
Log Message:
- Remove 50GBASE-LR10.
- Add the following medias:
- 25GBASE-ACC
- 100GBASE-ACC
- 100GBASE-AOC
- 100GBASE-FR
- 100GBASE-LR
- 200GBASE-ER4
- 400GBASE-ER8
- 400GBASE-FR4
- 400GBASE-LR4
- 400GBASE-SR4.2
- 400GBASE-SR8
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/net/if_media.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/net/if_media.h
diff -u src/sys/net/if_media.h:1.69 src/sys/net/if_media.h:1.70
--- src/sys/net/if_media.h:1.69 Sat Feb 1 20:56:16 2020
+++ src/sys/net/if_media.h Mon Feb 17 15:51:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.h,v 1.69 2020/02/01 20:56:16 thorpej Exp $ */
+/* $NetBSD: if_media.h,v 1.70 2020/02/17 15:51:25 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -262,6 +262,7 @@
#define IFM_25G_AOC _IFM_EX(43) /* 25G active optical cable */
#define IFM_25G_AUI _IFM_EX(44) /* 25G-AUI-C2C (chip to chip) */
#define IFM_25G_CR _IFM_EX(45) /* 25GBASE-CR (twinax) */
+#define IFM_25G_ACC _IFM_EX(46) /* 25GBASE-ACC */
#define IFM_25G_CR_S _IFM_EX(47) /* 25GBASE-CR-S (CR short) */
#define IFM_25G_ER _IFM_EX(48) /* 25GBASE-ER */
#define IFM_25G_KR _IFM_EX(49) /* 25GBASE-KR */
@@ -286,8 +287,8 @@
#define IFM_50G_KR _IFM_EX(68) /* 50GBASE-KR */
#define IFM_50G_KR2 _IFM_EX(69) /* 50GBASE-KR2 */
#define IFM_50G_LAUI2 _IFM_EX(70) /* 50GLAUI-2 */
-#define IFM_50G_LR _IFM_EX(71) /* 50GBASE-LR (2Km) */
-#define IFM_50G_LR10 _IFM_EX(72) /* 50GBASE-LR10 (10Km) */
+#define IFM_50G_LR _IFM_EX(71) /* 50GBASE-LR */
+ /* _IFM_EX(72) Not defined yet */
#define IFM_50G_SR _IFM_EX(73) /* 50GBASE-SR */
#define IFM_50G_SR2 _IFM_EX(74) /* 50GBASE-SR2 */
#define IFM_56G_R4 _IFM_EX(75) /* 56GBASE-R4 */
@@ -317,6 +318,17 @@
#define IFM_400G_KR4 _IFM_EX(99) /* 400GBASE-KR4 */
#define IFM_400G_LR8 _IFM_EX(100) /* 400GBASE-LR8 */
#define IFM_400G_SR16 _IFM_EX(101) /* 400GBASE-SR16 */
+#define IFM_100G_ACC _IFM_EX(102) /* 100GBASE-ACC */
+#define IFM_100G_AOC _IFM_EX(103) /* 100GBASE-AOC */
+#define IFM_100G_FR _IFM_EX(104) /* 100GBASE-FR */
+#define IFM_100G_LR _IFM_EX(105) /* 100GBASE-LR */
+#define IFM_200G_ER4 _IFM_EX(106) /* 200GBASE-ER4 */
+#define IFM_400G_ER8 _IFM_EX(107) /* 400GBASE-ER8 */
+#define IFM_400G_FR4 _IFM_EX(108) /* 400GBASE-FR4 */
+#define IFM_400G_LR4 _IFM_EX(109) /* 400GBASE-LR4 */
+#define IFM_400G_SR4_2 _IFM_EX(110) /* 400GBASE-SR4.2 */
+#define IFM_400G_SR8 _IFM_EX(111) /* 400GBASE-SR8 */
+
/* IFM_OMASK bits */
#define IFM_ETH_MASTER 0x0100 /* master mode (1000baseT) */
#define IFM_ETH_RXPAUSE 0x0200 /* receive PAUSE frames */
@@ -522,6 +534,7 @@ struct ifmedia_description {
{ IFM_ETHER | IFM_10G_SFI | IFM_FDX, "10GBASE-SFI" }, \
{ IFM_ETHER | IFM_10G_ZR | IFM_FDX, "10GBASE-ZR" }, \
{ IFM_ETHER | IFM_20G_KR2 | IFM_FDX, "20GBASE-KR2" }, \
+ { IFM_ETHER | IFM_25G_ACC | IFM_FDX, "25GBASE-ACC" }, \
{ IFM_ETHER | IFM_25G_AOC | IFM_FDX, "25GBASE-AOC" }, \
{ IFM_ETHER | IFM_25G_AUI | IFM_FDX, "25G-AUI" }, \
{ IFM_ETHER | IFM_25G_CR | IFM_FDX, "25GBASE-CR" }, \
@@ -550,18 +563,21 @@ struct ifmedia_description {
{ IFM_ETHER | IFM_50G_KR2 | IFM_FDX, "50GBASE-KR2" }, \
{ IFM_ETHER | IFM_50G_LAUI2 | IFM_FDX, "50GLAUI-2" }, \
{ IFM_ETHER | IFM_50G_LR | IFM_FDX, "50GBASE-LR" }, \
- { IFM_ETHER | IFM_50G_LR10 | IFM_FDX, "50GBASE-LR10" }, \
{ IFM_ETHER | IFM_50G_SR | IFM_FDX, "50GBASE-SR" }, \
{ IFM_ETHER | IFM_50G_SR2 | IFM_FDX, "50GBASE-SR2" }, \
{ IFM_ETHER | IFM_56G_R4 | IFM_FDX, "56GBASE-R4" }, \
+ { IFM_ETHER | IFM_100G_ACC | IFM_FDX, "100GBASE-ACC" }, \
+ { IFM_ETHER | IFM_100G_AOC | IFM_FDX, "100GBASE-AOC" }, \
{ IFM_ETHER | IFM_100G_CR2 | IFM_FDX, "100GBASE-CR2" }, \
{ IFM_ETHER | IFM_100G_CR4 | IFM_FDX, "100GBASE-CR4" }, \
{ IFM_ETHER | IFM_100G_CR10 | IFM_FDX, "100GBASE-CR10" }, \
{ IFM_ETHER | IFM_100G_DR | IFM_FDX, "100GBASE-DR" }, \
{ IFM_ETHER | IFM_100G_ER4 | IFM_FDX, "100GBASE-ER4" }, \
+ { IFM_ETHER | IFM_100G_FR | IFM_FDX, "100GBASE-FR" }, \
{ IFM_ETHER | IFM_100G_KP4 | IFM_FDX, "100GBASE-KP4" }, \
{ IFM_ETHER | IFM_100G_KR2 | IFM_FDX, "100GBASE-KR2" }, \
{ IFM_ETHER | IFM_100G_KR4 | IFM_FDX, "100GBASE-KR4" }, \
+ { IFM_ETHER | IFM_100G_LR | IFM_FDX, "100GBASE-LR" }, \
{ IFM_ETHER | IFM_100G_LR4 | IFM_FDX, "100GBASE-LR4" }, \
{ IFM_ETHER | IFM_100G_SR2 | IFM_FDX, "100GBASE-SR2" }, \
{ IFM_ETHER | IFM_100G_SR4 | IFM_FDX, "100GBASE-SR4" }, \
@@ -569,6 +585,7 @@ struct ifmedia_description {
{ IFM_ETHER | IFM_200G_CR2 | IFM_FDX, "200GBASE-CR2" }, \
{ IFM_ETHER | IFM_200G_CR4 | IFM_FDX, "200GBASE-CR4" }, \
{ IFM_ETHER | IFM_200G_DR4 | IFM_FDX, "200GBASE-DR4" }, \
+ { IFM_ETHER | IFM_200G_ER4 | IFM_FDX, "200GBASE-ER4" }, \
{ IFM_ETHER | IFM_200G_FR4 | IFM_FDX, "200GBASE-FR4" }, \
{
CVS commit: src/sys/net
Module Name:src Committed By: msaitoh Date: Mon Feb 17 15:51:25 UTC 2020 Modified Files: src/sys/net: if_media.h Log Message: - Remove 50GBASE-LR10. - Add the following medias: - 25GBASE-ACC - 100GBASE-ACC - 100GBASE-AOC - 100GBASE-FR - 100GBASE-LR - 200GBASE-ER4 - 400GBASE-ER8 - 400GBASE-FR4 - 400GBASE-LR4 - 400GBASE-SR4.2 - 400GBASE-SR8 To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/net/if_media.h 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: ad Date: Mon Feb 17 21:44:43 UTC 2020 Modified Files: src/sys/kern: kern_softint.c Log Message: softint_dispatch(): Temporarily call kernel_lock_plug_leak() since there is incontinent code somewhere. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/kern/kern_softint.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_softint.c diff -u src/sys/kern/kern_softint.c:1.60 src/sys/kern/kern_softint.c:1.61 --- src/sys/kern/kern_softint.c:1.60 Sat Feb 15 18:12:15 2020 +++ src/sys/kern/kern_softint.c Mon Feb 17 21:44:42 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_softint.c,v 1.60 2020/02/15 18:12:15 ad Exp $ */ +/* $NetBSD: kern_softint.c,v 1.61 2020/02/17 21:44:42 ad Exp $ */ /*- * Copyright (c) 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc. @@ -170,12 +170,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.60 2020/02/15 18:12:15 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.61 2020/02/17 21:44:42 ad Exp $"); #include #include #include #include +#include #include #include #include @@ -889,6 +890,9 @@ softint_dispatch(lwp_t *pinned, int s) l->l_pflag &= ~LP_TIMEINTR; } + /* XXX temporary */ + kernel_lock_plug_leak(); + /* * If we blocked while handling the interrupt, the pinned LWP is * gone so switch to the idle LWP. It will select a new LWP to
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Mon Feb 17 21:44:43 UTC 2020 Modified Files: src/sys/kern: kern_softint.c Log Message: softint_dispatch(): Temporarily call kernel_lock_plug_leak() since there is incontinent code somewhere. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/kern/kern_softint.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/powerpc/powerpc
On Wed, Feb 05, 2020 at 12:46:57PM +0900, Rin Okuyama wrote:
> Hi,
>
> On 2019/12/06 5:55, Andrew Doran wrote:
> > Module Name:src
> > Committed By: ad
> > Date: Thu Dec 5 20:55:24 UTC 2019
> >
> > Modified Files:
> > src/sys/arch/powerpc/powerpc: powerpc_machdep.c
> >
> > Log Message:
> > Need to call userret() from cpu_ast().
> >
> >
> > To generate a diff of this commit:
> > cvs rdiff -u -r1.74 -r1.75 src/sys/arch/powerpc/powerpc/powerpc_machdep.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/powerpc/powerpc/powerpc_machdep.c
> > diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.74
> > src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.75
> > --- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.74 Sat Nov 23
> > 19:40:36 2019
> > +++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Thu Dec 5 20:55:24 2019
> > @@ -1,4 +1,4 @@
> > -/* $NetBSD: powerpc_machdep.c,v 1.74 2019/11/23 19:40:36 ad Exp $ */
> > +/* $NetBSD: powerpc_machdep.c,v 1.75 2019/12/05 20:55:24 ad Exp $ */
> > /*
> >* Copyright (C) 1995, 1996 Wolfgang Solfrank.
> > @@ -32,7 +32,7 @@
> >*/
> > #include
> > -__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.74 2019/11/23 19:40:36
> > ad Exp $");
> > +__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.75 2019/12/05 20:55:24
> > ad Exp $");
> > #include "opt_altivec.h"
> > #include "opt_ddb.h"
> > @@ -373,6 +373,8 @@ void
> > cpu_ast(struct lwp *l, struct cpu_info *ci)
> > {
> > l->l_md.md_astpending = 0; /* we are about to do it */
> > + __insn_barrier();
> > + userret(l, l->l_md.md_utf);
> > if (l->l_pflag & LP_OWEUPC) {
> > l->l_pflag &= ~LP_OWEUPC;
> > @@ -400,7 +402,7 @@ cpu_need_resched(struct cpu_info *ci, st
> > cpu_send_ipi(cpu_index(ci), IPI_AST);
> > #endif
> > } else {
> > - l->l_md.md_astpending = 1; /* force call to ast()
> > */
> > + l->l_md.md_astpending = 1; /* force call to cpu_ast() */
> > }
> > }
> >
>
> This commit makes userret() called twice with AST; cpu_ast() is
> invoked from
>
> booke/trap.c,
> https://nxr.netbsd.org/xref/src/sys/arch/powerpc/booke/trap.c#815
>
> ibm4xx/trap.c, and
> https://nxr.netbsd.org/xref/src/sys/arch/powerpc/ibm4xx/trap.c#276
>
> powerpc/trap.c.
> https://nxr.netbsd.org/xref/src/sys/arch/powerpc/powerpc/trap.c#348
>
> For all cases, userret() is called afterward. (Precisely speaking,
> for ibm4xx, mi_userret(9) is used instead. This should probably be
> replaced by userret().)
>
> Also, other ports test (l->l_pflag & LP_OWEUPC) before mi_userret(9).
I corrected the cpu_ast() case. Yes it's curious why ibm4xx calls
mi_userret() directly; that seems wrong (I have not changed it though). I
think it definitely makes more sense to deal with OWEUPC before userret().
Andrew
> Thanks,
> rin
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: ad Date: Mon Feb 17 21:49:27 UTC 2020 Modified Files: src/sys/arch/powerpc/powerpc: powerpc_machdep.c Log Message: cpu_ast(): no need to call userret(), as the caller does it for us. From rin@. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/arch/powerpc/powerpc/powerpc_machdep.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/powerpc/powerpc
Module Name:src
Committed By: ad
Date: Mon Feb 17 21:49:27 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc: powerpc_machdep.c
Log Message:
cpu_ast(): no need to call userret(), as the caller does it for us. From rin@.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/powerpc/powerpc/powerpc_machdep.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/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.75 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.76
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.75 Thu Dec 5 20:55:24 2019
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Mon Feb 17 21:49:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.75 2019/12/05 20:55:24 ad Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.76 2020/02/17 21:49:27 ad Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.75 2019/12/05 20:55:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.76 2020/02/17 21:49:27 ad Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -373,9 +373,6 @@ void
cpu_ast(struct lwp *l, struct cpu_info *ci)
{
l->l_md.md_astpending = 0; /* we are about to do it */
- __insn_barrier();
- userret(l, l->l_md.md_utf);
-
if (l->l_pflag & LP_OWEUPC) {
l->l_pflag &= ~LP_OWEUPC;
ADDUPROF(l);
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: sevan Date: Mon Feb 17 21:47:33 UTC 2020 Modified Files: src/usr.bin/calendar/calendars: calendar.music Log Message: Add Andrew Weatherall https://www.bbc.co.uk/news/entertainment-arts-51535685 http://www.rottersgolfclub.com/ To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/calendar/calendars/calendar.music Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.music diff -u src/usr.bin/calendar/calendars/calendar.music:1.20 src/usr.bin/calendar/calendars/calendar.music:1.21 --- src/usr.bin/calendar/calendars/calendar.music:1.20 Sat Nov 30 12:04:13 2019 +++ src/usr.bin/calendar/calendars/calendar.music Mon Feb 17 21:47:33 2020 @@ -29,6 +29,7 @@ well-known for his many motion picture and television scores 02/09 Carole King (Carole Klein) is born in Brooklyn, 1941 02/12 The Beatles play Carnegie Hall in New York City, 1964 +02/17 Andrew James Weatherall dies in London, England, 2020 02/17 Jazz great Thelonius Monk dies in Englewood, New Jersey, 1982 02/18 Yoko Ono Lennon is born in Tokyo, 1933 02/19 Paul McCartney's "Give Ireland Back to the Irish" is banned in @@ -59,6 +60,7 @@ 04/02 Marvin Gaye is born in Washington, D.C., 1939 04/04 Muddy Waters (McKinley Morganfield) is born in Rolling Fork, Mississippi, 1915 +04/06 Andrew James Weatherall is born Windsor, Berkshire, England, 1963 04/09 Paul Robeson born, 1898 04/10 Paul McCartney announces he's quitting the Beatles, 1970 04/14 Ritchie Blackmore (Deep Purple, Rainbow) is born, 1945
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: sevan Date: Mon Feb 17 21:47:33 UTC 2020 Modified Files: src/usr.bin/calendar/calendars: calendar.music Log Message: Add Andrew Weatherall https://www.bbc.co.uk/news/entertainment-arts-51535685 http://www.rottersgolfclub.com/ To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/calendar/calendars/calendar.music Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/kern
Hi,
On Thu, Feb 06, 2020 at 06:33:55PM +0100, J. Hannken-Illjes wrote:
> > On 12. Jan 2020, at 18:49, Andrew Doran wrote:
> >
> > Module Name:src
> > Committed By: ad
> > Date: Sun Jan 12 17:49:17 UTC 2020
> >
> > Modified Files:
> > src/sys/kern: vfs_vnode.c
> >
> > Log Message:
> > vput(): don't drop the vnode lock, carry the hold over into vrelel() which
> > might need it anyway.
> >
> >
> > To generate a diff of this commit:
> > cvs rdiff -u -r1.106 -r1.107 src/sys/kern/vfs_vnode.c
> >
> > Please note that diffs are not public domain; they are subject to the
> > copyright notices on the relevant files.
> >
>
> vput(vnode_t *vp)
> {
> + int lktype;
>
> - VOP_UNLOCK(vp);
> - vrele(vp);
> + if ((vp->v_vflag & VV_LOCKSWORK) == 0) {
> + lktype = LK_EXCLUSIVE;
> + } else {
> + lktype = VOP_ISLOCKED(vp);
> + KASSERT(lktype != LK_NONE);
> + }
> + mutex_enter(vp->v_interlock);
> + vrelel(vp, 0, lktype);
> }
>
> This is quite wrong, from the manual:
>
> VOP_ISLOCKED(vp)
> Test if the vnode vp is locked. Possible return values are
> LK_EXCLUSIVE, LK_SHARED or 0 for lock held exclusively by the
> calling thread, shared lock held by anyone or unlocked,
> respectively.
>
> This function must never be used to make locking decisions at
> run time: it is provided only for diagnostic purposes.
>
> I suppose you cannot determine if the current thread holds
> a shared lock.
The intention of that last sentence was to dissuade people from doing error
prone, complicated stuff with locks. To my mind that idea of the locking
primitives is to take something difficult (concurrency) and package it up in
a way that's much easier to think about and work with - and yes it's still
complicated.
There are limited cases when I think it makes sense to infer lock ownership,
for example when known for sure that a RW lock is held but the type of hold
needs to be known - like this case. The failure case there is the lock
being unheld, which would be caught by LOCKDEBUG in this case. Consider
that a rw_exit() with the lock unheld by the caller will produce what you
might charitably call "undefined behaviour" in a non-LOCKDEBUG kernel.
Andrew
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src
Committed By: sevan
Date: Mon Feb 17 22:52:18 UTC 2020
Modified Files:
src/sys/arch/hpcmips/hpcmips: hpcapm_machdep.c
Log Message:
spelling
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.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/hpcmips/hpcmips/hpcapm_machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.5 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.6
--- src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c:1.5 Wed Mar 16 13:23:41 2011
+++ src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c Mon Feb 17 22:52:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm_machdep.c,v 1.5 2011/03/16 13:23:41 tsutsui Exp $ */
+/* $NetBSD: hpcapm_machdep.c,v 1.6 2020/02/17 22:52:18 sevan Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpcapm_machdep.c,v 1.5 2011/03/16 13:23:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm_machdep.c,v 1.6 2020/02/17 22:52:18 sevan Exp $");
#include
#include
@@ -67,8 +67,8 @@ machine_standby(void)
vrip_splpiu();
/*
- * STANDBY instruction puts the CPU into power saveing
- * state until some interrupt occuer.
+ * STANDBY instruction puts the CPU into power saving
+ * state until some interrupt occurs.
* It sleeps until you push the power button.
*/
__asm(".set noreorder");
@@ -99,8 +99,8 @@ machine_sleep(void)
vrip_splpiu();
/*
- * SUSPEND instruction puts the CPU into power saveing
- * state until some interrupt occuer.
+ * SUSPEND instruction puts the CPU into power saving
+ * state until some interrupt occurs.
* It sleeps until you push the power button.
*/
__asm(".set noreorder");
CVS commit: src/sys/arch/hpcmips/hpcmips
Module Name:src Committed By: sevan Date: Mon Feb 17 22:52:18 UTC 2020 Modified Files: src/sys/arch/hpcmips/hpcmips: hpcapm_machdep.c Log Message: spelling To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 18 04:08:12 UTC 2020 Modified Files: src/sys/dev/pci: pcireg.h Log Message: Add comment. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/dev/pci/pcireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcireg.h diff -u src/sys/dev/pci/pcireg.h:1.150 src/sys/dev/pci/pcireg.h:1.151 --- src/sys/dev/pci/pcireg.h:1.150 Sat Jan 25 08:13:39 2020 +++ src/sys/dev/pci/pcireg.h Tue Feb 18 04:08:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pcireg.h,v 1.150 2020/01/25 08:13:39 msaitoh Exp $ */ +/* $NetBSD: pcireg.h,v 1.151 2020/02/18 04:08:12 msaitoh Exp $ */ /* * Copyright (c) 1995, 1996, 1999, 2000 @@ -603,7 +603,7 @@ typedef u_int8_t pci_revision_t; #define PCI_PMCSR_PME_EN 0x0100 #define PCI_PMCSR_DATASEL_MASK 0x1e00 #define PCI_PMCSR_DATASCL_MASK 0x6000 -#define PCI_PMCSR_PME_STS 0x8000 +#define PCI_PMCSR_PME_STS 0x8000 /* PME Status (R/W1C) */ #define PCI_PMCSR_B2B3_SUPPORT 0x0040 #define PCI_PMCSR_BPCC_EN 0x0080 #define PCI_PMCSR_DATA 0xff00
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 18 04:09:32 UTC 2020 Modified Files: src/sys/dev/pci: ichsmb.c if_an_pci.c Log Message: Whitespace fix. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ichsmb.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/if_an_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 18 04:09:32 UTC 2020
Modified Files:
src/sys/dev/pci: ichsmb.c if_an_pci.c
Log Message:
Whitespace fix. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/if_an_pci.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.65 src/sys/dev/pci/ichsmb.c:1.66
--- src/sys/dev/pci/ichsmb.c:1.65 Tue Dec 24 06:27:17 2019
+++ src/sys/dev/pci/ichsmb.c Tue Feb 18 04:09:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.65 2019/12/24 06:27:17 thorpej Exp $ */
+/* $NetBSD: ichsmb.c,v 1.66 2020/02/18 04:09:31 msaitoh Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.65 2019/12/24 06:27:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.66 2020/02/18 04:09:31 msaitoh Exp $");
#include
#include
@@ -308,7 +308,7 @@ ichsmb_i2c_exec(void *cookie, i2c_op_t o
LPCIB_SMB_HS_INTR | LPCIB_SMB_HS_DEVERR |
LPCIB_SMB_HS_BUSERR | LPCIB_SMB_HS_FAILED);
bus_space_barrier(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, 1,
- BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/* Wait for bus to be idle */
for (retries = 100; retries > 0; retries--) {
Index: src/sys/dev/pci/if_an_pci.c
diff -u src/sys/dev/pci/if_an_pci.c:1.36 src/sys/dev/pci/if_an_pci.c:1.37
--- src/sys/dev/pci/if_an_pci.c:1.36 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/if_an_pci.c Tue Feb 18 04:09:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.37 2020/02/18 04:09:31 msaitoh Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.37 2020/02/18 04:09:31 msaitoh Exp $");
#include
#include
@@ -116,7 +116,7 @@ an_pci_match(device_t parent, cfdata_t m
static void
an_pci_attach(device_t parent, device_t self, void *aux)
{
-struct pci_attach_args *pa = (struct pci_attach_args *)aux;
+ struct pci_attach_args *pa = (struct pci_attach_args *)aux;
struct an_pci_softc *psc = device_private(self);
struct an_softc *sc = >sc_an;
char const *intrstr;
@@ -131,21 +131,21 @@ an_pci_attach(device_t parent, device_t
pci_aprint_devinfo(pa, "802.11 controller");
-/* Map I/O registers */
-if (pci_mapreg_map(pa, AN_PCI_IOBA, PCI_MAPREG_TYPE_IO, 0,
+ /* Map I/O registers */
+ if (pci_mapreg_map(pa, AN_PCI_IOBA, PCI_MAPREG_TYPE_IO, 0,
>sc_iot, >sc_ioh, NULL, ) != 0) {
-aprint_error_dev(self, "unable to map registers\n");
-return;
-}
-
-/* Enable the device. */
-csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
- csr | PCI_COMMAND_MASTER_ENABLE);
+ aprint_error_dev(self, "unable to map registers\n");
+ return;
+ }
+
+ /* Enable the device. */
+ csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+ pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
+ csr | PCI_COMMAND_MASTER_ENABLE);
/* Map and establish the interrupt. */
if (pci_intr_map(pa, )) {
- aprint_error_dev(self, "unable to map interrupt\n");
+ aprint_error_dev(self, "unable to map interrupt\n");
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 18 04:07:14 UTC 2020
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
It's useless to not to set PCI_PMCSR_PME_STS bit when writing because
the bit is W1C. Instead, always write PCI_PMCSR_PME_STS bit to clear in
case it's already set.
To generate a diff of this commit:
cvs rdiff -u -r1.667 -r1.668 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.667 src/sys/dev/pci/if_wm.c:1.668
--- src/sys/dev/pci/if_wm.c:1.667 Tue Feb 18 03:48:22 2020
+++ src/sys/dev/pci/if_wm.c Tue Feb 18 04:07:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.667 2020/02/18 03:48:22 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.668 2020/02/18 04:07:14 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.667 2020/02/18 03:48:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.668 2020/02/18 04:07:14 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -15355,12 +15355,13 @@ wm_enable_wakeup(struct wm_softc *sc)
pme:
/* Request PME */
pmode = pci_conf_read(sc->sc_pc, sc->sc_pcitag, pmreg + PCI_PMCSR);
+ pmode |= PCI_PMCSR_PME_STS; /* in case it's already set (W1C) */
if ((rv == 0) && (sc->sc_flags & WM_F_WOL) != 0) {
/* For WOL */
- pmode |= PCI_PMCSR_PME_STS | PCI_PMCSR_PME_EN;
+ pmode |= PCI_PMCSR_PME_EN;
} else {
/* Disable WOL */
- pmode &= ~(PCI_PMCSR_PME_STS | PCI_PMCSR_PME_EN);
+ pmode &= ~PCI_PMCSR_PME_EN;
}
pci_conf_write(sc->sc_pc, sc->sc_pcitag, pmreg + PCI_PMCSR, pmode);
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 18 04:07:14 UTC 2020 Modified Files: src/sys/dev/pci: if_wm.c Log Message: It's useless to not to set PCI_PMCSR_PME_STS bit when writing because the bit is W1C. Instead, always write PCI_PMCSR_PME_STS bit to clear in case it's already set. To generate a diff of this commit: cvs rdiff -u -r1.667 -r1.668 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 18 04:08:12 UTC 2020 Modified Files: src/sys/dev/pci: pcireg.h Log Message: Add comment. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/dev/pci/pcireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 18 03:48:23 UTC 2020
Modified Files:
src/sys/dev/pci: if_re_pci.c if_wm.c
Log Message:
Whitespace fix. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_re_pci.c
cvs rdiff -u -r1.666 -r1.667 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_re_pci.c
diff -u src/sys/dev/pci/if_re_pci.c:1.51 src/sys/dev/pci/if_re_pci.c:1.52
--- src/sys/dev/pci/if_re_pci.c:1.51 Thu Jan 30 00:36:29 2020
+++ src/sys/dev/pci/if_re_pci.c Tue Feb 18 03:48:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_pci.c,v 1.51 2020/01/30 00:36:29 jmcneill Exp $ */
+/* $NetBSD: if_re_pci.c,v 1.52 2020/02/18 03:48:22 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.51 2020/01/30 00:36:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.52 2020/02/18 03:48:22 msaitoh Exp $");
#include
@@ -130,7 +130,7 @@ re_pci_lookup(const struct pci_attach_ar
{
int i;
- for(i = 0; i < __arraycount(re_devs); i++) {
+ for (i = 0; i < __arraycount(re_devs); i++) {
if (PCI_VENDOR(pa->pa_id) != re_devs[i].rtk_vid)
continue;
if (PCI_PRODUCT(pa->pa_id) == re_devs[i].rtk_did)
@@ -210,7 +210,7 @@ re_pci_attach(device_t parent, device_t
case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
memh_valid =
(pci_mapreg_map(pa, RTK_PCI_LOMEM,
- memtype, 0, , , NULL, ) == 0) ||
+ memtype, 0, , , NULL, ) == 0) ||
(pci_mapreg_map(pa, RTK_PCI_LOMEM + 4,
PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT,
0, , , NULL, ) == 0);
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.666 src/sys/dev/pci/if_wm.c:1.667
--- src/sys/dev/pci/if_wm.c:1.666 Fri Jan 31 12:09:13 2020
+++ src/sys/dev/pci/if_wm.c Tue Feb 18 03:48:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.666 2020/01/31 12:09:13 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.667 2020/02/18 03:48:22 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.666 2020/01/31 12:09:13 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.667 2020/02/18 03:48:22 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -8666,7 +8666,7 @@ wm_txeof(struct wm_txqueue *txq, u_int l
log(LOG_WARNING, "%s: late collision\n",
device_xname(sc->sc_dev));
else if (status & WTX_ST_EC) {
-if_statadd(ifp, if_collisions,
+if_statadd(ifp, if_collisions,
TX_COLLISION_THRESHOLD + 1);
log(LOG_WARNING, "%s: excessive collisions\n",
device_xname(sc->sc_dev));
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 18 03:48:23 UTC 2020 Modified Files: src/sys/dev/pci: if_re_pci.c if_wm.c Log Message: Whitespace fix. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_re_pci.c cvs rdiff -u -r1.666 -r1.667 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Tue Feb 18 00:40:50 UTC 2020 Modified Files: src/sys/kern: uipc_socket.c Log Message: PR/54435: Valery Ushakov: Clear urgent status after reading urgent data, so that poll(2) works. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/sys/kern/uipc_socket.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/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.285 src/sys/kern/uipc_socket.c:1.286 --- src/sys/kern/uipc_socket.c:1.285 Mon Oct 14 12:27:03 2019 +++ src/sys/kern/uipc_socket.c Mon Feb 17 19:40:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.285 2019/10/14 16:27:03 maxv Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.286 2020/02/18 00:40:50 christos Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.285 2019/10/14 16:27:03 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.286 2020/02/18 00:40:50 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1180,6 +1180,9 @@ soreceive(struct socket *so, struct mbuf MIN(uio->uio_resid, m->m_len), uio); m = m_free(m); } while (uio->uio_resid > 0 && error == 0 && m); + /* We consumed the oob data, no more oobmark. */ + so->so_oobmark = 0; + so->so_state &= ~SS_RCVATMARK; bad: if (m != NULL) m_freem(m);
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Tue Feb 18 00:40:50 UTC 2020 Modified Files: src/sys/kern: uipc_socket.c Log Message: PR/54435: Valery Ushakov: Clear urgent status after reading urgent data, so that poll(2) works. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 18 04:12:40 UTC 2020
Modified Files:
src/sys/dev/pci: hifn7751.c
Log Message:
No functional change:
- u_int*_t -> uint*_t
- whitespace fixes.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/hifn7751.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/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.63 src/sys/dev/pci/hifn7751.c:1.64
--- src/sys/dev/pci/hifn7751.c:1.63 Thu Dec 27 14:03:54 2018
+++ src/sys/dev/pci/hifn7751.c Tue Feb 18 04:12:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.63 2018/12/27 14:03:54 maxv Exp $ */
+/* $NetBSD: hifn7751.c,v 1.64 2020/02/18 04:12:40 msaitoh Exp $ */
/* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
/* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.63 2018/12/27 14:03:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.64 2020/02/18 04:12:40 msaitoh Exp $");
#include
#include
@@ -131,17 +131,17 @@ static int hifn_dramsize(struct hifn_sof
static int hifn_ramtype(struct hifn_softc *);
static void hifn_sessions(struct hifn_softc *);
static int hifn_intr(void *);
-static u_int hifn_write_command(struct hifn_command *, u_int8_t *);
-static u_int32_t hifn_next_signature(u_int32_t a, u_int cnt);
-static int hifn_newsession(void*, u_int32_t *, struct cryptoini *);
-static int hifn_freesession(void*, u_int64_t);
+static u_int hifn_write_command(struct hifn_command *, uint8_t *);
+static uint32_t hifn_next_signature(uint32_t a, u_int cnt);
+static int hifn_newsession(void*, uint32_t *, struct cryptoini *);
+static int hifn_freesession(void*, uint64_t);
static int hifn_process(void*, struct cryptop *, int);
static void hifn_callback(struct hifn_softc *, struct hifn_command *,
- u_int8_t *);
+ uint8_t *);
static int hifn_crypto(struct hifn_softc *, struct hifn_command *,
struct cryptop*, int);
-static int hifn_readramaddr(struct hifn_softc *, int, u_int8_t *);
-static int hifn_writeramaddr(struct hifn_softc *, int, u_int8_t *);
+static int hifn_readramaddr(struct hifn_softc *, int, uint8_t *);
+static int hifn_writeramaddr(struct hifn_softc *, int, uint8_t *);
static int hifn_dmamap_aligned(bus_dmamap_t);
static int hifn_dmamap_load_src(struct hifn_softc *,
struct hifn_command *);
@@ -154,15 +154,15 @@ static void hifn_tick(void *);
static void hifn_abort(struct hifn_softc *);
static void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *,
int *);
-static void hifn_write_4(struct hifn_softc *, int, bus_size_t, u_int32_t);
-static u_int32_t hifn_read_4(struct hifn_softc *, int, bus_size_t);
+static void hifn_write_4(struct hifn_softc *, int, bus_size_t, uint32_t);
+static uint32_t hifn_read_4(struct hifn_softc *, int, bus_size_t);
#ifdef HAVE_CRYPTO_LZS
static int hifn_compression(struct hifn_softc *, struct cryptop *,
struct hifn_command *);
static struct mbuf *hifn_mkmbuf_chain(int, struct mbuf *);
static int hifn_compress_enter(struct hifn_softc *, struct hifn_command *);
static void hifn_callback_comp(struct hifn_softc *, struct hifn_command *,
- u_int8_t *);
+ uint8_t *);
#endif /* HAVE_CRYPTO_LZS */
struct hifn_stats hifnstats;
@@ -255,8 +255,8 @@ hifn_attach(device_t parent, device_t se
#else
bus_size_t iosize0, iosize1;
#endif
- u_int32_t cmd;
- u_int16_t ena;
+ uint32_t cmd;
+ uint16_t ena;
bus_dma_segment_t seg;
bus_dmamap_t dmamap;
int rseg;
@@ -305,7 +305,7 @@ hifn_attach(device_t parent, device_t se
, 1, , BUS_DMA_NOWAIT)) {
aprint_error_dev(sc->sc_dv, "can't alloc DMA buffer\n");
goto fail_io1;
-}
+ }
if (bus_dmamem_map(sc->sc_dmat, , rseg, sizeof(*sc->sc_dma), ,
BUS_DMA_NOWAIT)) {
aprint_error_dev(sc->sc_dv, "can't map DMA buffers (%lu bytes)\n",
@@ -512,7 +512,7 @@ hifn_modcmd(modcmd_t cmd, void *data)
{
int error = 0;
- switch(cmd) {
+ switch (cmd) {
case MODULE_CMD_INIT:
#ifdef _MODULE
error = config_init_component(cfdriver_ioconf_hifn,
@@ -546,7 +546,7 @@ hifn_rng_get(size_t bytes, void *priv)
static int
hifn_init_pubrng(struct hifn_softc *sc)
{
- u_int32_t r;
+ uint32_t r;
int i;
if ((sc->sc_flags & HIFN_IS_7811) == 0) {
@@ -683,7 +683,6 @@ hifn_rng_locked(void *vsc)
add_true_randomness(num[0]);
add_true_randomness(num[1]);
#endif
-
}
} else {
int nwords = 0;
@@ -717,9 +716,8 @@ hifn_rng_locked(void *vsc)
* read must require at least one PCI cycle, and
* RNG_Clk is at least PCI_Clk, this is safe.
*/
- for(i = 0 ; i < nwords * 8; i++)
- {
- volatile u_int32_t regtmp;
+ for (i = 0 ; i < nwords * 8; i++) {
+ volatile uint32_t regtmp;
regtmp = READ_REG_1(sc, HIFN_1_RNG_DATA);
num[i / 8] = regtmp;
}
@@ -782,7 +780,7 @@
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 18 04:12:40 UTC 2020 Modified Files: src/sys/dev/pci: hifn7751.c Log Message: No functional change: - u_int*_t -> uint*_t - whitespace fixes. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/hifn7751.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/ipsec
Module Name:src Committed By: ozaki-r Date: Mon Feb 17 08:46:10 UTC 2020 Modified Files: src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh Log Message: tests: add missing ifconfig -w This change mitigates PR kern/54897. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/net/ipsec/t_ipsec_gif.sh \ src/tests/net/ipsec/t_ipsec_l2tp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Mon Feb 17 08:16:44 UTC 2020 Modified Files: src/sys/dev/usb: usbdi.c Log Message: When aborting a pipe, set pipe->up_running = 0. This prevents any concurrent usb_transfer_complete from restarting the pipe with usbd_start_next. To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/sys/dev/usb/usbdi.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/usb
Module Name:src
Committed By: riastradh
Date: Mon Feb 17 08:16:44 UTC 2020
Modified Files:
src/sys/dev/usb: usbdi.c
Log Message:
When aborting a pipe, set pipe->up_running = 0.
This prevents any concurrent usb_transfer_complete from restarting
the pipe with usbd_start_next.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/dev/usb/usbdi.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/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.193 src/sys/dev/usb/usbdi.c:1.194
--- src/sys/dev/usb/usbdi.c:1.193 Sun Feb 16 09:40:35 2020
+++ src/sys/dev/usb/usbdi.c Mon Feb 17 08:16:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.193 2020/02/16 09:40:35 maxv Exp $ */
+/* $NetBSD: usbdi.c,v 1.194 2020/02/17 08:16:44 riastradh Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.193 2020/02/16 09:40:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.194 2020/02/17 08:16:44 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -876,6 +876,7 @@ usbd_ar_pipe(struct usbd_pipe *pipe)
usbd_dump_queue(pipe);
#endif
pipe->up_repeat = 0;
+ pipe->up_running = 0;
pipe->up_aborting = 1;
while ((xfer = SIMPLEQ_FIRST(>up_queue)) != NULL) {
USBHIST_LOG(usbdebug, "pipe = %#jx xfer = %#jx "
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Mon Feb 17 09:09:50 UTC 2020
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/amiga/amiga: genassym.cf
src/sys/arch/atari/atari: genassym.cf
src/sys/arch/cesfic/cesfic: genassym.cf
src/sys/arch/hp300/hp300: genassym.cf
src/sys/arch/i386/i386: genassym.cf
src/sys/arch/luna68k/luna68k: genassym.cf
src/sys/arch/mac68k/mac68k: genassym.cf
src/sys/arch/mvme68k/mvme68k: genassym.cf
src/sys/arch/news68k/news68k: genassym.cf
src/sys/arch/next68k/next68k: genassym.cf
src/sys/arch/sparc/sparc: genassym.cf
src/sys/arch/sparc64/sparc64: genassym.cf
src/sys/arch/sun2/sun2: genassym.cf
src/sys/arch/sun3/sun3: genassym.cf
src/sys/arch/sun3/sun3x: genassym.cf
src/sys/arch/x68k/x68k: genassym.cf
Log Message:
G/C LS{SLEEP,RUN,ONPROC}
LWP status manipulation was moved out of assembly long ago.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/amiga/genassym.cf
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/atari/atari/genassym.cf
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/cesfic/cesfic/genassym.cf
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/hp300/hp300/genassym.cf
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mac68k/mac68k/genassym.cf
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/mvme68k/mvme68k/genassym.cf
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/news68k/news68k/genassym.cf
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/next68k/next68k/genassym.cf
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/sparc/genassym.cf
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sparc64/sparc64/genassym.cf
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sun2/sun2/genassym.cf
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun3/sun3/genassym.cf
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sun3/sun3x/genassym.cf
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x68k/x68k/genassym.cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/tests/net/ipsec
Module Name:src
Committed By: ozaki-r
Date: Mon Feb 17 08:46:10 UTC 2020
Modified Files:
src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh
Log Message:
tests: add missing ifconfig -w
This change mitigates PR kern/54897.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.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/ipsec/t_ipsec_gif.sh
diff -u src/tests/net/ipsec/t_ipsec_gif.sh:1.8 src/tests/net/ipsec/t_ipsec_gif.sh:1.9
--- src/tests/net/ipsec/t_ipsec_gif.sh:1.8 Mon Aug 19 03:22:05 2019
+++ src/tests/net/ipsec/t_ipsec_gif.sh Mon Feb 17 08:46:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_gif.sh,v 1.8 2019/08/19 03:22:05 ozaki-r Exp $
+# $NetBSD: t_ipsec_gif.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -59,6 +59,15 @@ make_gif_pktstr()
echo "$src > $dst: $proto_cap.+$inner_str"
}
+wait_for_all_dad_completions()
+{
+
+ for sock in $SOCK_LOCAL $SOCK_TUN_LOCAL $SOCK_TUN_REMOTE $SOCK_REMOTE; do
+ export RUMP_SERVER=$sock
+ atf_check -s exit:0 rump.ifconfig -w 10
+ done
+}
+
test_ipsec4_gif()
{
local mode=$1
@@ -121,8 +130,9 @@ test_ipsec4_gif()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote/24
- # Run ifconfig -w 10 just once for optimization
- atf_check -s exit:0 rump.ifconfig -w 10
+
+ wait_for_all_dad_completions
+
atf_check -s exit:0 -o ignore \
rump.route -n add -net $subnet_local $ip_gw_remote
@@ -273,8 +283,9 @@ test_ipsec6_gif()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_remote
- # Run ifconfig -w 10 just once for optimization
- atf_check -s exit:0 rump.ifconfig -w 10
+
+ wait_for_all_dad_completions
+
atf_check -s exit:0 -o ignore \
rump.route -n add -inet6 -net $subnet_local/64 $ip_gw_remote
Index: src/tests/net/ipsec/t_ipsec_l2tp.sh
diff -u src/tests/net/ipsec/t_ipsec_l2tp.sh:1.8 src/tests/net/ipsec/t_ipsec_l2tp.sh:1.9
--- src/tests/net/ipsec/t_ipsec_l2tp.sh:1.8 Mon Aug 19 03:22:05 2019
+++ src/tests/net/ipsec/t_ipsec_l2tp.sh Mon Feb 17 08:46:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_l2tp.sh,v 1.8 2019/08/19 03:22:05 ozaki-r Exp $
+# $NetBSD: t_ipsec_l2tp.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -62,6 +62,15 @@ make_l2tp_pktstr()
echo "$src > $dst: $proto_cap.+$proto_str"
}
+wait_for_all_dad_completions()
+{
+
+ for sock in $SOCK_LOCAL $SOCK_TUN_LOCAL $SOCK_TUN_REMOTE $SOCK_REMOTE; do
+ export RUMP_SERVER=$sock
+ atf_check -s exit:0 rump.ifconfig -w 10
+ done
+}
+
test_ipsec4_l2tp()
{
local mode=$1
@@ -121,8 +130,8 @@ test_ipsec4_l2tp()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote/24
- # Run ifconfig -w 10 just once for optimization
- atf_check -s exit:0 rump.ifconfig -w 10
+
+ wait_for_all_dad_completions
extract_new_packets $BUS_TUNNEL > $outfile
@@ -263,8 +272,8 @@ test_ipsec6_l2tp()
export RUMP_SERVER=$SOCK_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_remote
- # Run ifconfig -w 10 just once for optimization
- atf_check -s exit:0 rump.ifconfig -w 10
+
+ wait_for_all_dad_completions
extract_new_packets $BUS_TUNNEL > $outfile
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Mon Feb 17 09:09:50 UTC 2020
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/amiga/amiga: genassym.cf
src/sys/arch/atari/atari: genassym.cf
src/sys/arch/cesfic/cesfic: genassym.cf
src/sys/arch/hp300/hp300: genassym.cf
src/sys/arch/i386/i386: genassym.cf
src/sys/arch/luna68k/luna68k: genassym.cf
src/sys/arch/mac68k/mac68k: genassym.cf
src/sys/arch/mvme68k/mvme68k: genassym.cf
src/sys/arch/news68k/news68k: genassym.cf
src/sys/arch/next68k/next68k: genassym.cf
src/sys/arch/sparc/sparc: genassym.cf
src/sys/arch/sparc64/sparc64: genassym.cf
src/sys/arch/sun2/sun2: genassym.cf
src/sys/arch/sun3/sun3: genassym.cf
src/sys/arch/sun3/sun3x: genassym.cf
src/sys/arch/x68k/x68k: genassym.cf
Log Message:
G/C LS{SLEEP,RUN,ONPROC}
LWP status manipulation was moved out of assembly long ago.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/amiga/genassym.cf
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/atari/atari/genassym.cf
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/cesfic/cesfic/genassym.cf
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/hp300/hp300/genassym.cf
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/luna68k/luna68k/genassym.cf
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mac68k/mac68k/genassym.cf
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/mvme68k/mvme68k/genassym.cf
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/news68k/news68k/genassym.cf
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/next68k/next68k/genassym.cf
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/sparc/genassym.cf
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sparc64/sparc64/genassym.cf
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sun2/sun2/genassym.cf
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun3/sun3/genassym.cf
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sun3/sun3x/genassym.cf
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x68k/x68k/genassym.cf
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/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.81 src/sys/arch/amd64/amd64/genassym.cf:1.82
--- src/sys/arch/amd64/amd64/genassym.cf:1.81 Wed Jan 8 17:38:41 2020
+++ src/sys/arch/amd64/amd64/genassym.cf Mon Feb 17 09:09:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.81 2020/01/08 17:38:41 ad Exp $
+# $NetBSD: genassym.cf,v 1.82 2020/02/17 09:09:48 skrll Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -124,9 +124,6 @@ endif
include
-define LSRUN LSRUN
-define LSONPROC LSONPROC
-
define UPAGES UPAGES
define USPACE USPACE
Index: src/sys/arch/amiga/amiga/genassym.cf
diff -u src/sys/arch/amiga/amiga/genassym.cf:1.31 src/sys/arch/amiga/amiga/genassym.cf:1.32
--- src/sys/arch/amiga/amiga/genassym.cf:1.31 Wed Dec 19 13:57:45 2018
+++ src/sys/arch/amiga/amiga/genassym.cf Mon Feb 17 09:09:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.31 2018/12/19 13:57:45 maxv Exp $
+# $NetBSD: genassym.cf,v 1.32 2020/02/17 09:09:48 skrll Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -96,12 +96,6 @@ define P_FLAG offsetof(struct proc, p_
define P_RASLIST offsetof(struct proc, p_raslist)
define P_VMSPACE offsetof(struct proc, p_vmspace)
-# lwp fields and values
-
-define LSSLEEP LSSLEEP
-define LSRUN LSRUN
-define LSONPROC LSONPROC
-
# interrupt/fault metering
define CI_NINTR offsetof(struct cpu_info, ci_data.cpu_nintr)
Index: src/sys/arch/atari/atari/genassym.cf
diff -u src/sys/arch/atari/atari/genassym.cf:1.33 src/sys/arch/atari/atari/genassym.cf:1.34
--- src/sys/arch/atari/atari/genassym.cf:1.33 Wed Dec 19 13:57:46 2018
+++ src/sys/arch/atari/atari/genassym.cf Mon Feb 17 09:09:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.33 2018/12/19 13:57:46 maxv Exp $
+# $NetBSD: genassym.cf,v 1.34 2020/02/17 09:09:48 skrll Exp $
#-
# Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -79,12 +79,6 @@ define P_FLAG offsetof(struct proc, p_
define P_RASLIST offsetof(struct proc, p_raslist)
define P_VMSPACE offsetof(struct proc, p_vmspace)
-# lwp fields and values
-
-define LSSLEEP LSSLEEP
-define LSRUN LSRUN
-define LSONPROC LSONPROC
-
# interrupt/fault metering
define CI_NINTR offsetof(struct cpu_info, ci_data.cpu_nintr)
Index: src/sys/arch/cesfic/cesfic/genassym.cf
diff -u src/sys/arch/cesfic/cesfic/genassym.cf:1.15 src/sys/arch/cesfic/cesfic/genassym.cf:1.16
--- src/sys/arch/cesfic/cesfic/genassym.cf:1.15 Fri Jan 14 02:06:24 2011
+++ src/sys/arch/cesfic/cesfic/genassym.cf Mon Feb 17 09:09:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.15 2011/01/14 02:06:24 rmind Exp $
+# $NetBSD: genassym.cf,v 1.16 2020/02/17 09:09:48 skrll Exp $
#
# Copyright (c)
