Re: CVS commit: src/sys/arch/x86
Maxime Villard wrote: > Module Name: src > Committed By: maxv > Date: Wed Nov 27 06:24:33 UTC 2019 > > Modified Files: > src/sys/arch/x86/include: cpu.h fpu.h > src/sys/arch/x86/x86: cpu.c fpu.c > > Log Message: > Add a small API for in-kernel FPU operations. > > fpu_kern_enter(); > /* do FPU stuff */ > fpu_kern_leave(); Is it now possible to use AES-NI instructions for cgd disk encryption? -- Alex
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Wed Nov 27 08:53:32 UTC 2019 Modified Files: src/sys/dev/mii: ipgphy.c Log Message: Print dmesg correctly. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/mii/ipgphy.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/amd64/include
Module Name:src Committed By: rin Date: Wed Nov 27 08:56:00 UTC 2019 Modified Files: src/sys/arch/amd64/include: ptrace.h Log Message: Fix copy-paste in comment. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/include/ptrace.h diff -u src/sys/arch/amd64/include/ptrace.h:1.16 src/sys/arch/amd64/include/ptrace.h:1.17 --- src/sys/arch/amd64/include/ptrace.h:1.16 Wed Jun 26 12:30:12 2019 +++ src/sys/arch/amd64/include/ptrace.h Wed Nov 27 08:56:00 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.h,v 1.16 2019/06/26 12:30:12 mgorny Exp $ */ +/* $NetBSD: ptrace.h,v 1.17 2019/11/27 08:56:00 rin Exp $ */ /* * Copyright (c) 1993 Christopher G. Demetriou @@ -34,7 +34,7 @@ #ifdef __x86_64__ /* - * i386-dependent ptrace definitions + * amd64-dependent ptrace definitions */ #define PT_STEP (PT_FIRSTMACH + 0) #define PT_GETREGS (PT_FIRSTMACH + 1)
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: rin Date: Wed Nov 27 08:56:00 UTC 2019 Modified Files: src/sys/arch/amd64/include: ptrace.h Log Message: Fix copy-paste in comment. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/include/ptrace.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/amd64/amd64
Module Name:src
Committed By: rin
Date: Wed Nov 27 09:02:00 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: process_machdep.c
Log Message:
Use bool for "write" in ptrace_machdep_dorequest() for clarity.
No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/amd64/process_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/amd64/amd64/process_machdep.c
diff -u src/sys/arch/amd64/amd64/process_machdep.c:1.44 src/sys/arch/amd64/amd64/process_machdep.c:1.45
--- src/sys/arch/amd64/amd64/process_machdep.c:1.44 Tue Aug 6 01:34:29 2019
+++ src/sys/arch/amd64/amd64/process_machdep.c Wed Nov 27 09:01:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.44 2019/08/06 01:34:29 kamil Exp $ */
+/* $NetBSD: process_machdep.c,v 1.45 2019/11/27 09:01:59 rin Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.44 2019/08/06 01:34:29 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.45 2019/11/27 09:01:59 rin Exp $");
#include "opt_xen.h"
#include
@@ -315,15 +315,15 @@ ptrace_machdep_dorequest(
struct iovec iov;
struct vmspace *vm;
int error;
- int write = 0;
+ bool write = false;
switch (req) {
case PT_SETXSTATE:
- write = 1;
+ write = true;
/* FALLTHROUGH */
case PT_GETXSTATE:
- /* write = 0 done above. */
+ /* write = false done above. */
if (!process_machdep_validxstate(lt->l_proc))
return EINVAL;
if (__predict_false(l->l_proc->p_flag & PK_32)) {
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: rin Date: Wed Nov 27 09:02:00 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: process_machdep.c Log Message: Use bool for "write" in ptrace_machdep_dorequest() for clarity. No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/amd64/process_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/amd64
Module Name:src
Committed By: rin
Date: Wed Nov 27 09:08:14 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: process_machdep.c
src/sys/arch/amd64/include: ptrace.h
Log Message:
Rename process_machdep_validxstate() to process_machdep_validfpu(), as
this function will be used to check validity of XMM registers also.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amd64/amd64/process_machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/include/ptrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/process_machdep.c
diff -u src/sys/arch/amd64/amd64/process_machdep.c:1.45 src/sys/arch/amd64/amd64/process_machdep.c:1.46
--- src/sys/arch/amd64/amd64/process_machdep.c:1.45 Wed Nov 27 09:01:59 2019
+++ src/sys/arch/amd64/amd64/process_machdep.c Wed Nov 27 09:08:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.45 2019/11/27 09:01:59 rin Exp $ */
+/* $NetBSD: process_machdep.c,v 1.46 2019/11/27 09:08:14 rin Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.45 2019/11/27 09:01:59 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.46 2019/11/27 09:08:14 rin Exp $");
#include "opt_xen.h"
#include
@@ -324,7 +324,7 @@ ptrace_machdep_dorequest(
/* FALLTHROUGH */
case PT_GETXSTATE:
/* write = false done above. */
- if (!process_machdep_validxstate(lt->l_proc))
+ if (!process_machdep_validfpu(lt->l_proc))
return EINVAL;
if (__predict_false(l->l_proc->p_flag & PK_32)) {
struct netbsd32_iovec user_iov;
@@ -404,7 +404,7 @@ process_machdep_doxstate(struct lwp *cur
}
int
-process_machdep_validxstate(struct proc *p)
+process_machdep_validfpu(struct proc *p)
{
if (p->p_flag & PK_SYSTEM)
Index: src/sys/arch/amd64/include/ptrace.h
diff -u src/sys/arch/amd64/include/ptrace.h:1.17 src/sys/arch/amd64/include/ptrace.h:1.18
--- src/sys/arch/amd64/include/ptrace.h:1.17 Wed Nov 27 08:56:00 2019
+++ src/sys/arch/amd64/include/ptrace.h Wed Nov 27 09:08:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.17 2019/11/27 08:56:00 rin Exp $ */
+/* $NetBSD: ptrace.h,v 1.18 2019/11/27 09:08:14 rin Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -88,7 +88,7 @@
case PT_SETXSTATE:
int process_machdep_doxstate(struct lwp *, struct lwp *, struct uio *);
-int process_machdep_validxstate(struct proc *);
+int process_machdep_validfpu(struct proc *);
#endif /* _KERNEL */
CVS commit: src/sys/arch/amd64
Module Name:src Committed By: rin Date: Wed Nov 27 09:08:14 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: process_machdep.c src/sys/arch/amd64/include: ptrace.h Log Message: Rename process_machdep_validxstate() to process_machdep_validfpu(), as this function will be used to check validity of XMM registers also. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amd64/amd64/process_machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/include/ptrace.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/amd64
Module Name:src
Committed By: rin
Date: Wed Nov 27 09:16:59 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c process_machdep.c
src/sys/arch/amd64/include: netbsd32_machdep.h ptrace.h
Log Message:
Add support for PT_[GS]ETXMMREGS requests for COMPAT_NETBSD32 on amd64.
For this purpose, PT_[GS]ETXMMREGS are added to amd64/ptrace.h. These
are intended for internal usage for COMPAT_NETBSD32, and therefore not
exposed to userland.
Thanks to kamil, mgorny, and pgoyette for their kind review!
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amd64/amd64/process_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amd64/include/netbsd32_machdep.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/include/ptrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.131 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.132
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.131 Wed Nov 20 19:37:51 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Wed Nov 27 09:16:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.131 2019/11/20 19:37:51 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.132 2019/11/27 09:16:58 rin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.131 2019/11/20 19:37:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.132 2019/11/27 09:16:58 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -86,6 +86,9 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac
const char machine32[] = "i386";
const char machine_arch32[] = "i386";
+static int netbsd32_process_doxmmregs(struct lwp *, struct lwp *, void *, bool);
+static int netbsd32_process_xmmregio(struct lwp *, struct lwp *, struct uio *);
+
#ifdef USER_LDT
static int x86_64_get_ldt32(struct lwp *, void *, register_t *);
static int x86_64_set_ldt32(struct lwp *, void *, register_t *);
@@ -344,8 +347,8 @@ netbsd32_ptrace_translate_request(int re
case PT32_SETREGS: return PT_SETREGS;
case PT32_GETFPREGS: return PT_GETFPREGS;
case PT32_SETFPREGS: return PT_SETFPREGS;
- case PT32_GETXMMREGS: return -1;
- case PT32_SETXMMREGS: return -1;
+ case PT32_GETXMMREGS: return PT_GETXMMREGS;
+ case PT32_SETXMMREGS: return PT_SETXMMREGS;
case PT32_GETDBREGS: return PT_GETDBREGS;
case PT32_SETDBREGS: return PT_SETDBREGS;
case PT32_SETSTEP: return PT_SETSTEP;
@@ -500,6 +503,77 @@ netbsd32_process_write_dbregs(struct lwp
return 0;
}
+static int
+netbsd32_process_doxmmregs(struct lwp *curl, struct lwp *l, void *addr,
+bool write)
+ /* curl: tracer */
+ /* l: traced */
+{
+ struct uio uio;
+ struct iovec iov;
+ struct vmspace *vm;
+ int error;
+
+ if ((curl->l_proc->p_flag & PK_32) == 0 ||
+ (l->l_proc->p_flag & PK_32) == 0)
+ return EINVAL;
+
+ if (!process_machdep_validfpu(l->l_proc))
+ return EINVAL;
+
+ error = proc_vmspace_getref(curl->l_proc, );
+ if (error)
+ return error;
+
+ iov.iov_base = addr;
+ iov.iov_len = sizeof(struct xmmregs32);
+ uio.uio_iov =
+ uio.uio_iovcnt = 1;
+ uio.uio_offset = 0;
+ uio.uio_resid = sizeof(struct xmmregs32);
+ uio.uio_rw = write ? UIO_WRITE : UIO_READ;
+ uio.uio_vmspace = vm;
+
+ error = netbsd32_process_xmmregio(curl, l, );
+ uvmspace_free(vm);
+ return error;
+}
+
+static int
+netbsd32_process_xmmregio(struct lwp *curl, struct lwp *l, struct uio *uio)
+ /* curl: tracer */
+ /* l: traced */
+{
+ struct xmmregs32 regs;
+ int error;
+ char *kv;
+ size_t kl;
+
+ kl = sizeof(regs);
+ kv = (char *)
+
+ if (uio->uio_offset < 0 || uio->uio_offset > (off_t)kl)
+ return EINVAL;
+
+ kv += uio->uio_offset;
+ kl -= uio->uio_offset;
+
+ if (kl > uio->uio_resid)
+ kl = uio->uio_resid;
+
+ process_read_fpregs_xmm(l, );
+ error = uiomove(kv, kl, uio);
+ if (error == 0 && uio->uio_rw == UIO_WRITE) {
+ if (l->l_proc->p_stat != SSTOP)
+ error = EBUSY;
+ else
+ process_write_fpregs_xmm(l, );
+ }
+
+ uio->uio_offset = 0;
+ return error;
+}
+
int
netbsd32_sysarch(struct lwp *l, const struct netbsd32_sysarch_args *uap, register_t *retval)
{
@@ -959,6 +1033,8 @@ netbsd32_machdep_md_init(void)
MODULE_HOOK_SET(netbsd32_machine32_hook, "mach32", netbsd32_machine32);
MODULE_HOOK_SET(netbsd32_reg_validate_hook,
"mcontext32from64_validate", cpu_mcontext32from64_validate);
+ MODULE_HOOK_SET(netbsd32_process_doxmmregs_hook, "xmm32",
+ netbsd32_process_doxmmregs);
}
void
@@ -967,4 +1043,5 @@ netbsd32_machdep_md_fini(void)
MODULE_HOOK_UNSET(netbsd32_machine32_hook);
MODULE_HOOK_UNSET(netbsd32_reg_validate_hook);
+ MODULE_HOOK_UNSET(netbsd32_process_doxmmregs_hook);
}
Index:
CVS commit: src/sys/arch/amd64
Module Name:src Committed By: rin Date: Wed Nov 27 09:16:59 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: netbsd32_machdep.c process_machdep.c src/sys/arch/amd64/include: netbsd32_machdep.h ptrace.h Log Message: Add support for PT_[GS]ETXMMREGS requests for COMPAT_NETBSD32 on amd64. For this purpose, PT_[GS]ETXMMREGS are added to amd64/ptrace.h. These are intended for internal usage for COMPAT_NETBSD32, and therefore not exposed to userland. Thanks to kamil, mgorny, and pgoyette for their kind review! XXX pullup to netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amd64/amd64/process_machdep.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amd64/include/netbsd32_machdep.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/include/ptrace.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/mii
Module Name:src
Committed By: msaitoh
Date: Wed Nov 27 08:53:32 UTC 2019
Modified Files:
src/sys/dev/mii: ipgphy.c
Log Message:
Print dmesg correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/mii/ipgphy.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/mii/ipgphy.c
diff -u src/sys/dev/mii/ipgphy.c:1.6 src/sys/dev/mii/ipgphy.c:1.7
--- src/sys/dev/mii/ipgphy.c:1.6 Thu Nov 21 09:48:57 2019
+++ src/sys/dev/mii/ipgphy.c Wed Nov 27 08:53:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipgphy.c,v 1.6 2019/11/21 09:48:57 msaitoh Exp $ */
+/* $NetBSD: ipgphy.c,v 1.7 2019/11/27 08:53:32 msaitoh Exp $ */
/* $OpenBSD: ipgphy.c,v 1.19 2015/07/19 06:28:12 yuo Exp $ */
/*-
@@ -33,7 +33,7 @@
* Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.6 2019/11/21 09:48:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.7 2019/11/27 08:53:32 msaitoh Exp $");
#include
#include
@@ -119,6 +119,7 @@ ipgphy_attach(device_t parent, device_t
if (sc->mii_capabilities & BMSR_EXTSTAT)
PHY_READ(sc, MII_EXTSR, >mii_extcapabilities);
+ aprint_normal_dev(self, "");
mii_phy_add_media(sc);
aprint_normal("\n");
}
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 27 11:08:24 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_bge.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #487):
sys/dev/pci/if_bge.c: revision 1.340
sys/dev/pci/if_bge.c: revision 1.341
sys/dev/pci/if_bge.c: revision 1.342
sys/dev/pci/if_bge.c: revision 1.336
- Avoid undefined behavior in bge_setmulti(). found by kUBSan.
- Avoid undefined behavior when setting the MAC address in bge_init().
found by kUBSan.
Fix a bug that SK-9D41 can't detect fiber media. Check the subsystem ID
correctly. This bug was added in if_bge.c rev. 1.161.
- Use *_FLUSH() more. The main purpose is to wait following delay() correctly.
- Add missing DELAY(80) after writing BGE_MI_MODE register.
Modify PHY initialization code. This change fix a bug that SK-9D21 doesn't
detect MII PHY.
- Add error check to bge_miibus_writereg().
- Change return value of bge_miibus_readreg() when a read error occurred.
It also add error message using with aprint_debug_dev(). This error occurs
on some devices while detecting MII devices.
- Move the location of BGE_MI_MODE register's initialization to next to
bge_chipinit().
- Set BGE_MAC_MODE before calling ifmedia_init() and/or mii_attach().
- Add retry code for mii_attach() failed. Same as FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.335.2.1 src/sys/dev/pci/if_bge.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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.335 src/sys/dev/pci/if_bge.c:1.335.2.1
--- src/sys/dev/pci/if_bge.c:1.335 Tue Jul 9 08:46:58 2019
+++ src/sys/dev/pci/if_bge.c Wed Nov 27 11:08:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.335 2019/07/09 08:46:58 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335 2019/07/09 08:46:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $");
#include
#include
@@ -1027,10 +1027,10 @@ bge_eeprom_getbyte(struct bge_softc *sc,
* Enable use of auto EEPROM access so we can avoid
* having to use the bitbang method.
*/
- BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
+ BGE_SETBIT_FLUSH(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
/* Reset the EEPROM, load the clock period. */
- CSR_WRITE_4(sc, BGE_EE_ADDR,
+ CSR_WRITE_4_FLUSH(sc, BGE_EE_ADDR,
BGE_EEADDR_RESET | BGE_EEHALFCLK(BGE_HALFCLK_384SCL));
DELAY(20);
@@ -1113,9 +1113,11 @@ bge_miibus_readreg(device_t dev, int phy
if (i == BGE_TIMEOUT) {
aprint_error_dev(sc->bge_dev, "PHY read timed out\n");
rv = ETIMEDOUT;
- } else if ((data & BGE_MICOMM_READFAIL) != 0)
- rv = -1;
- else
+ } else if ((data & BGE_MICOMM_READFAIL) != 0) {
+ /* XXX This error occurs on some devices while attaching. */
+ aprint_debug_dev(sc->bge_dev, "PHY read I/O error\n");
+ rv = EIO;
+ } else
*val = data & BGE_MICOMM_DATA;
if (autopoll & BGE_MIMODE_AUTOPOLL) {
@@ -1133,7 +1135,8 @@ static int
bge_miibus_writereg(device_t dev, int phy, int reg, uint16_t val)
{
struct bge_softc *sc = device_private(dev);
- uint32_t autopoll;
+ uint32_t data, autopoll;
+ int rv = 0;
int i;
if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906 &&
@@ -1156,13 +1159,22 @@ bge_miibus_writereg(device_t dev, int ph
for (i = 0; i < BGE_TIMEOUT; i++) {
delay(10);
- if (!(CSR_READ_4(sc, BGE_MI_COMM) & BGE_MICOMM_BUSY)) {
+ data = CSR_READ_4(sc, BGE_MI_COMM);
+ if (!(data & BGE_MICOMM_BUSY)) {
delay(5);
- CSR_READ_4(sc, BGE_MI_COMM);
+ data = CSR_READ_4(sc, BGE_MI_COMM);
break;
}
}
+ if (i == BGE_TIMEOUT) {
+ aprint_error_dev(sc->bge_dev, "PHY write timed out\n");
+ rv = ETIMEDOUT;
+ } else if ((data & BGE_MICOMM_READFAIL) != 0) {
+ aprint_error_dev(sc->bge_dev, "PHY write I/O error\n");
+ rv = EIO;
+ }
+
if (autopoll & BGE_MIMODE_AUTOPOLL) {
BGE_STS_SETBIT(sc, BGE_STS_AUTOPOLL);
BGE_SETBIT_FLUSH(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL);
@@ -1176,7 +1188,7 @@ bge_miibus_writereg(device_t dev, int ph
return ETIMEDOUT;
}
- return 0;
+ return rv;
}
static void
@@ -1827,7 +1839,7 @@ bge_setmulti(struct bge_softc *sc)
/* Just want the 7 least-significant bits. */
h &= 0x7f;
- hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F);
+ hashes[(h & 0x60) >> 5] |= 1U << (h & 0x1F);
ETHER_NEXT_MULTI(step, enm);
}
ETHER_UNLOCK(ec);
@@ -2286,7 +2298,7 @@ bge_chipinit(struct bge_softc *sc)
#endif
/* Set the timer prescaler (always 66MHz) */
- CSR_WRITE_4(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ);
+ CSR_WRITE_4_FLUSH(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ);
if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906) {
DELAY(40); /* XXX */
@@
CVS commit: [netbsd-9] src/sys/arch/amd64/amd64
Module Name:src
Committed By: martin
Date: Wed Nov 27 11:11:17 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-9]: netbsd32_machdep.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #488):
sys/arch/amd64/amd64/netbsd32_machdep.c: revision 1.126
Don't depend on #ifdef USER_LDT in cpu_mcontext32_validate(), but rather on
whether the proc uses a user-set LDT. Same as check_sigcontext32().
To generate a diff of this commit:
cvs rdiff -u -r1.125.2.1 -r1.125.2.2 \
src/sys/arch/amd64/amd64/netbsd32_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/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.125.2.1 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.125.2.2
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.125.2.1 Thu Nov 21 14:02:33 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Wed Nov 27 11:11:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.125.2.1 2019/11/21 14:02:33 martin Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.125.2.2 2019/11/27 11:11:17 martin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.125.2.1 2019/11/21 14:02:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.125.2.2 2019/11/27 11:11:17 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -905,12 +905,6 @@ startlwp32(void *arg)
userret(l);
}
-/*
- * For various reasons, the amd64 port can't do what the i386 port does,
- * and relies on catching invalid user contexts on exit from the kernel.
- * These functions perform the needed checks.
- */
-
int
check_sigcontext32(struct lwp *l, const struct netbsd32_sigcontext *scp)
{
@@ -925,21 +919,22 @@ check_sigcontext32(struct lwp *l, const
return EINVAL;
if (__predict_false(pmap->pm_ldt != NULL)) {
- /* Only when the LDT is user-set (with USER_LDT) */
+ /* Allow unfamiliar segment register values (USER_LDT). */
if (!USERMODE(scp->sc_cs))
return EINVAL;
} else {
if (!VALID_USER_CSEL32(scp->sc_cs))
return EINVAL;
if (scp->sc_fs != 0 && !VALID_USER_DSEL32(scp->sc_fs) &&
- !(VALID_USER_FSEL32(scp->sc_fs) && pcb->pcb_fs != 0))
+ !(VALID_USER_FSEL32(scp->sc_fs) && pcb->pcb_fs != 0))
return EINVAL;
if (scp->sc_gs != 0 && !VALID_USER_DSEL32(scp->sc_gs) &&
- !(VALID_USER_GSEL32(scp->sc_gs) && pcb->pcb_gs != 0))
+ !(VALID_USER_GSEL32(scp->sc_gs) && pcb->pcb_gs != 0))
return EINVAL;
if (scp->sc_es != 0 && !VALID_USER_DSEL32(scp->sc_es))
return EINVAL;
- if (!VALID_USER_DSEL32(scp->sc_ds) || !VALID_USER_DSEL32(scp->sc_ss))
+ if (!VALID_USER_DSEL32(scp->sc_ds) ||
+ !VALID_USER_DSEL32(scp->sc_ss))
return EINVAL;
}
@@ -952,36 +947,37 @@ check_sigcontext32(struct lwp *l, const
int
cpu_mcontext32_validate(struct lwp *l, const mcontext32_t *mcp)
{
+ struct pmap *pmap = l->l_proc->p_vmspace->vm_map.pmap;
const __greg32_t *gr;
struct trapframe *tf;
+ struct pcb *pcb;
gr = mcp->__gregs;
tf = l->l_md.md_regs;
+ pcb = lwp_getpcb(l);
if (((gr[_REG32_EFL] ^ tf->tf_rflags) & PSL_USERSTATIC) != 0)
return EINVAL;
-#ifdef USER_LDT
- /* Userland is allowed to have unfamiliar segment register values */
- if (!USERMODE(gr[_REG32_CS]))
- return EINVAL;
-#else
- struct pcb *pcb = lwp_getpcb(l);
-
- if (!VALID_USER_CSEL32(gr[_REG32_CS]))
- return EINVAL;
- if (gr[_REG32_FS] != 0 && !VALID_USER_DSEL32(gr[_REG32_FS]) &&
- !(VALID_USER_FSEL32(gr[_REG32_FS]) && pcb->pcb_fs != 0))
- return EINVAL;
- if (gr[_REG32_GS] != 0 && !VALID_USER_DSEL32(gr[_REG32_GS]) &&
- !(VALID_USER_GSEL32(gr[_REG32_GS]) && pcb->pcb_gs != 0))
- return EINVAL;
- if (gr[_REG32_ES] != 0 && !VALID_USER_DSEL32(gr[_REG32_ES]))
- return EINVAL;
- if (!VALID_USER_DSEL32(gr[_REG32_DS]) ||
- !VALID_USER_DSEL32(gr[_REG32_SS]))
- return EINVAL;
-#endif
+ if (__predict_false(pmap->pm_ldt != NULL)) {
+ /* Allow unfamiliar segment register values (USER_LDT). */
+ if (!USERMODE(gr[_REG32_CS]))
+ return EINVAL;
+ } else {
+ if (!VALID_USER_CSEL32(gr[_REG32_CS]))
+ return EINVAL;
+ if (gr[_REG32_FS] != 0 && !VALID_USER_DSEL32(gr[_REG32_FS]) &&
+ !(VALID_USER_FSEL32(gr[_REG32_FS]) && pcb->pcb_fs != 0))
+ return EINVAL;
+ if (gr[_REG32_GS] != 0 && !VALID_USER_DSEL32(gr[_REG32_GS]) &&
+ !(VALID_USER_GSEL32(gr[_REG32_GS]) && pcb->pcb_gs != 0))
+ return EINVAL;
+ if (gr[_REG32_ES] != 0 && !VALID_USER_DSEL32(gr[_REG32_ES]))
+ return EINVAL;
+ if (!VALID_USER_DSEL32(gr[_REG32_DS]) ||
+ !VALID_USER_DSEL32(gr[_REG32_SS]))
+ return EINVAL;
+ }
if (gr[_REG32_EIP] >= VM_MAXUSER_ADDRESS32)
return EINVAL;
CVS commit: [netbsd-9] src/sys/arch/amd64/amd64
Module Name:src Committed By: martin Date: Wed Nov 27 11:11:17 UTC 2019 Modified Files: src/sys/arch/amd64/amd64 [netbsd-9]: netbsd32_machdep.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #488): sys/arch/amd64/amd64/netbsd32_machdep.c: revision 1.126 Don't depend on #ifdef USER_LDT in cpu_mcontext32_validate(), but rather on whether the proc uses a user-set LDT. Same as check_sigcontext32(). To generate a diff of this commit: cvs rdiff -u -r1.125.2.1 -r1.125.2.2 \ src/sys/arch/amd64/amd64/netbsd32_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Wed Nov 27 11:19:46 UTC 2019
Modified Files:
src/sys/dev/mii [netbsd-9]: ipgphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #490):
sys/dev/mii/ipgphy.c: revision 1.7
Print dmesg correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/sys/dev/mii/ipgphy.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/mii/ipgphy.c
diff -u src/sys/dev/mii/ipgphy.c:1.6.2.2 src/sys/dev/mii/ipgphy.c:1.6.2.3
--- src/sys/dev/mii/ipgphy.c:1.6.2.2 Mon Nov 25 16:44:31 2019
+++ src/sys/dev/mii/ipgphy.c Wed Nov 27 11:19:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipgphy.c,v 1.6.2.2 2019/11/25 16:44:31 martin Exp $ */
+/* $NetBSD: ipgphy.c,v 1.6.2.3 2019/11/27 11:19:46 martin Exp $ */
/* $OpenBSD: ipgphy.c,v 1.19 2015/07/19 06:28:12 yuo Exp $ */
/*-
@@ -33,7 +33,7 @@
* Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.6.2.2 2019/11/25 16:44:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.6.2.3 2019/11/27 11:19:46 martin Exp $");
#include
#include
@@ -118,7 +118,8 @@ ipgphy_attach(device_t parent, device_t
//sc->mii_capabilities &= ~BMSR_ANEG;
if (sc->mii_capabilities & BMSR_EXTSTAT)
PHY_READ(sc, MII_EXTSR, >mii_extcapabilities);
-
+
+ aprint_normal_dev(self, "");
mii_phy_add_media(sc);
aprint_normal("\n");
}
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Wed Nov 27 11:19:46 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: ipgphy.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #490): sys/dev/mii/ipgphy.c: revision 1.7 Print dmesg correctly. To generate a diff of this commit: cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/sys/dev/mii/ipgphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 11:22:13 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #487, #488, and #490 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.121 src/doc/CHANGES-9.0:1.1.2.122 --- src/doc/CHANGES-9.0:1.1.2.121 Tue Nov 26 18:31:55 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 11:22:13 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.121 2019/11/26 18:31:55 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.122 2019/11/27 11:22:13 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6467,3 +6467,27 @@ sys/dev/pci/if_mcx.c1.7 mcx(4): fix IFF_ALLMULTI handling. [jmcneill, ticket #486] +sys/dev/pci/if_bge.c1.336,1.340-1.342 + + - Avoid undefined behavior in bge_setmulti(). + - Avoid undefined behavior when setting the MAC address in + bge_init(). + - Fix a bug that SK-9D41 can't detect fiber media. + - Use *_FLUSH() more. The main purpose is to wait following + delay() correctly. + - Add missing DELAY(80) after writing BGE_MI_MODE register. + - Modify PHY initialization code to fix a bug that SK-9D21 + doesn't detect MII PHY. + [msaitoh, ticket #487] + +sys/arch/amd64/amd64/netbsd32_machdep.c 1.126 + + Don't depend on #ifdef USER_LDT in cpu_mcontext32_validate(), but + rather on whether the proc uses a user-set LDT. + [maxv, ticket #488] + +sys/dev/mii/ipgphy.c1.7 + + Print dmesg correctly. + [msaitoh, ticket #490] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 11:22:13 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #487, #488, and #490 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Nov 27 13:46:46 UTC 2019 Modified Files: src/distrib/utils/embedded/conf [netbsd-9]: armv7.conf src/distrib/utils/embedded/files [netbsd-9]: armv7_boot.cmd armv7_boot_nonefi.cmd src/etc/etc.evbarm [netbsd-9]: Makefile.inc src/sys/arch/arm/fdt [netbsd-9]: smsh_fdt.c src/sys/arch/arm/ti [netbsd-9]: am3_prcm.c files.ti if_cpsw.c ti_com.c ti_omapintc.c ti_omaptimer.c ti_prcm.c ti_prcm.h src/sys/arch/evbarm/conf [netbsd-9]: GENERIC N900 README.evbarm files.generic src/sys/dev/fdt [netbsd-9]: cpufreq_dt.c fdt_clock.c fdt_phy.c fdtvar.h files.fdt syscon.c src/sys/dev/i2c [netbsd-9]: at24cxx.c files.i2c tps65217pmic.c Added Files: src/sys/arch/arm/dts [netbsd-9]: omap3-beagle-xm.dts omap3-beagle.dts omap3-n900.dts src/sys/arch/arm/ti [netbsd-9]: am3_platform.c if_cpswreg.h omap2_gpmcreg.h omap2_nand.c omap3_cm.c omap3_dss.c omap3_dssreg.h omap3_platform.c omap3_prm.c ti_cpufreq.c ti_div_clock.c ti_dpll_clock.c ti_edma.c ti_edma.h ti_ehci.c ti_fb.c ti_gpio.c ti_gpmc.c ti_iic.c ti_iicreg.h ti_lcdc.c ti_lcdc.h ti_lcdcreg.h ti_motg.c ti_mux_clock.c ti_otg.c ti_otgreg.h ti_rng.c ti_rngreg.h ti_sdhc.c ti_sdhcreg.h ti_sysc.c ti_tptc.c ti_usb.c ti_usbtll.c src/sys/dev/fdt [netbsd-9]: pinctrl_single.c usbnopphy.c src/sys/dev/i2c [netbsd-9]: tda19988.c twl4030.c Removed Files: src/sys/arch/arm/ti [netbsd-9]: ti_platform.c ti_platform.h src/sys/arch/evbarm/conf [netbsd-9]: BEAGLEBOARD BEAGLEBOARDXM BEAGLEBOARDXM_INSTALL BEAGLEBOARD_INSTALL BEAGLEBONE BEAGLEBONE_INSTALL DEVKIT8000 IGEPV2 OVERO OVERO_INSTALL TI files.ti std.igepv2 std.ti src/sys/dev/i2c [netbsd-9]: tps65950.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #491): sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL: file removal sys/arch/arm/ti/ti_dpll_clock.c: revision 1.2 sys/arch/arm/ti/ti_sysc.c: revision 1.1 sys/arch/arm/ti/ti_rng.c: revision 1.1 sys/arch/arm/ti/ti_rng.c: revision 1.2 sys/dev/i2c/tps65950.c: file removal sys/arch/evbarm/conf/std.ti: file removal sys/dev/i2c/files.i2c: revision 1.101 sys/dev/i2c/files.i2c: revision 1.102 sys/dev/i2c/at24cxx.c: revision 1.32 sys/dev/i2c/files.i2c: revision 1.103 sys/dev/i2c/twl4030.c: revision 1.1 sys/dev/i2c/files.i2c: revision 1.104 sys/dev/i2c/twl4030.c: revision 1.2 sys/dev/i2c/twl4030.c: revision 1.3 sys/arch/arm/ti/ti_com.c: revision 1.6 sys/arch/arm/ti/ti_com.c: revision 1.7 sys/arch/arm/ti/ti_com.c: revision 1.8 sys/dev/fdt/cpufreq_dt.c: revision 1.11 sys/arch/arm/ti/ti_iic.c: revision 1.1 sys/dev/fdt/cpufreq_dt.c: revision 1.12 sys/arch/arm/ti/ti_usb.c: revision 1.1 sys/arch/arm/ti/ti_iic.c: revision 1.2 sys/dev/fdt/cpufreq_dt.c: revision 1.13 sys/arch/arm/ti/ti_iic.c: revision 1.3 sys/arch/arm/ti/ti_iic.c: revision 1.4 sys/arch/evbarm/conf/files.ti: file removal sys/arch/evbarm/conf/BEAGLEBOARDXM: file removal sys/arch/arm/dts/omap3-n900.dts: revision 1.1 sys/arch/arm/ti/ti_edma.h: revision 1.1 sys/arch/evbarm/conf/OVERO_INSTALL: file removal sys/arch/arm/ti/ti_usbtll.c: revision 1.1 sys/arch/arm/ti/files.ti: revision 1.5 etc/etc.evbarm/Makefile.inc: revision 1.108 sys/arch/arm/ti/files.ti: revision 1.6 sys/dev/i2c/tps65217pmic.c: revision 1.13 etc/etc.evbarm/Makefile.inc: revision 1.109 sys/arch/arm/ti/files.ti: revision 1.7 sys/dev/i2c/tps65217pmic.c: revision 1.14 sys/arch/arm/ti/files.ti: revision 1.8 sys/arch/arm/ti/files.ti: revision 1.9 sys/dev/fdt/usbnopphy.c: revision 1.1 sys/arch/evbarm/conf/GENERIC: revision 1.55 sys/arch/evbarm/conf/GENERIC: revision 1.56 sys/arch/evbarm/conf/GENERIC: revision 1.57 sys/arch/evbarm/conf/GENERIC: revision 1.58 sys/arch/evbarm/conf/GENERIC: revision 1.59 sys/arch/evbarm/conf/BEAGLEBONE: file removal sys/arch/arm/ti/omap2_gpmcreg.h: revision 1.1 sys/arch/arm/ti/ti_otgreg.h: revision 1.1 sys/arch/arm/ti/ti_tptc.c: revision 1.1 sys/arch/evbarm/conf/IGEPV2: file removal sys/arch/arm/ti/am3_prcm.c: revision 1.10 sys/dev/i2c/tda19988.c: revision 1.1 sys/arch/evbarm/conf/OVERO: file removal sys/dev/i2c/tda19988.c: revision 1.2 sys/dev/i2c/tda19988.c: revision 1.3 sys/arch/arm/ti/omap3_dss.c: revision 1.1 sys/arch/evbarm/conf/BEAGLEBONE_INSTALL: file removal sys/arch/arm/ti/ti_omapintc.c: revision 1.2
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Nov 27 14:34:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.0_RC1 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-9.0 cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.1 -r1.599.2.2 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 16:14:53 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix editor mishap, note chanes to distrib/notes/common/Makefile.inc To generate a diff of this commit: cvs rdiff -u -r1.1.2.125 -r1.1.2.126 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.125 src/doc/CHANGES-9.0:1.1.2.126 --- src/doc/CHANGES-9.0:1.1.2.125 Wed Nov 27 14:34:31 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 16:14:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.125 2019/11/27 14:34:31 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.126 2019/11/27 16:14:52 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6615,7 +6615,7 @@ sys/dev/pci/esm.c1.64 add missing break. [msaitoh, ticket #493] -istrib/notes/common/main (edited manually) +distrib/notes/common/main (edited manually) Note sysinst changes. @@ -6623,3 +6623,9 @@ external/gpl2/groff/tmac/mdoc.local (ed sys/sys/param.h (edited manually) Welcome to 9.0_RC1 ! + +distrib/notes/common/Makefile.inc 1.47 + + Fix generation of non-HTML ToC. + (9.0_RC1 tag moved) +
CVS commit: [netbsd-9] src/sys/dev
Module Name:src
Committed By: martin
Date: Wed Nov 27 14:03:14 UTC 2019
Modified Files:
src/sys/dev/ieee1394 [netbsd-9]: fwohci.c
src/sys/dev/pci [netbsd-9]: eso.c sv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #492):
sys/dev/pci/sv.c: revision 1.57
sys/dev/pci/eso.c: revision 1.72
sys/dev/ieee1394/fwohci.c: revision 1.144
Fix operand priority of bit op vs ternary operator.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/dev/ieee1394/fwohci.c
cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/dev/pci/sv.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/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.142 src/sys/dev/ieee1394/fwohci.c:1.142.2.1
--- src/sys/dev/ieee1394/fwohci.c:1.142 Tue May 28 08:59:34 2019
+++ src/sys/dev/ieee1394/fwohci.c Wed Nov 27 14:03:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.142 2019/05/28 08:59:34 msaitoh Exp $ */
+/* $NetBSD: fwohci.c,v 1.142.2.1 2019/11/27 14:03:14 martin Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.142 2019/05/28 08:59:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.142.2.1 2019/11/27 14:03:14 martin Exp $");
#include
#include
@@ -1746,8 +1746,8 @@ fwohci_db_init(struct fwohci_softc *sc,
dbch->ndb, BUS_DMA_WAITOK);
#else /* Ooops, debugging now... */
dbch->ndb, BUS_DMA_WAITOK |
- (dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ?
- BUS_DMA_COHERENT : 0);
+ ((dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ?
+ BUS_DMA_COHERENT : 0));
#endif
if (dbch->am == NULL) {
aprint_error_dev(fc->dev, "fwdma_malloc_multiseg failed\n");
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.71 src/sys/dev/pci/eso.c:1.71.2.1
--- src/sys/dev/pci/eso.c:1.71 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/eso.c Wed Nov 27 14:03:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: eso.c,v 1.71.2.1 2019/11/27 14:03:14 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.71.2.1 2019/11/27 14:03:14 martin Exp $");
#include "mpu.h"
@@ -1489,7 +1489,7 @@ eso_allocmem(struct eso_softc *sc, size_
error = bus_dmamap_load(ed->ed_dmat, ed->ed_map, ed->ed_kva,
ed->ed_size, NULL, BUS_DMA_WAITOK |
- (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE);
+ ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE));
if (error)
goto destroy;
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.56 src/sys/dev/pci/sv.c:1.56.2.1
--- src/sys/dev/pci/sv.c:1.56 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/sv.c Wed Nov 27 14:03:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: sv.c,v 1.56.2.1 2019/11/27 14:03:14 martin Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.56.2.1 2019/11/27 14:03:14 martin Exp $");
#include
#include
@@ -530,7 +530,7 @@ sv_allocmem(struct sv_softc *sc, size_t
goto unmap;
error = bus_dmamap_load(sc->sc_dmatag, p->map, p->addr, p->size, NULL,
- BUS_DMA_WAITOK | (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE);
+ BUS_DMA_WAITOK | ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE));
if (error)
goto destroy;
DPRINTF(("sv_allocmem: pa=%lx va=%lx pba=%lx\n",
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Wed Nov 27 14:03:14 UTC 2019 Modified Files: src/sys/dev/ieee1394 [netbsd-9]: fwohci.c src/sys/dev/pci [netbsd-9]: eso.c sv.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #492): sys/dev/pci/sv.c: revision 1.57 sys/dev/pci/eso.c: revision 1.72 sys/dev/ieee1394/fwohci.c: revision 1.144 Fix operand priority of bit op vs ternary operator. To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/dev/ieee1394/fwohci.c cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/dev/pci/eso.c cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/dev/pci/sv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: msaitoh
Date: Wed Nov 27 13:36:55 UTC 2019
Modified Files:
src/distrib/notes [netbsd-9]: Makefile.inc
src/distrib/notes/common [netbsd-9]: macros main netboot postinstall
sysinst
src/distrib/notes/sparc [netbsd-9]: prep
src/distrib/notes/sparc64 [netbsd-9]: prep
Removed Files:
src/distrib/notes/common [netbsd-9]: list-portmasters.pl
Log Message:
Pull up following revision(s) (requested by martin in ticket #489):
distrib/notes/Makefile.inc: revision 1.46
distrib/notes/common/postinstall: revision 1.86
distrib/notes/sparc64/prep: revision 1.16
distrib/notes/common/netboot: revision 1.38
distrib/notes/common/main: revision 1.555
distrib/notes/common/main: revision 1.556
distrib/notes/common/main: revision 1.557
distrib/notes/common/macros: revision 1.44
distrib/notes/common/sysinst: revision 1.110
distrib/notes/sparc/prep: revision 1.28
distrib/notes/sparc/prep: revision 1.29
distrib/notes/common/list-portmasters.pl: file removal
Remove list-portmasters.pl script.
We dropped that list from "main" some time ago.
Quote long .Ss2 title to avoid troff's limitation.
Troff is limited to 9 macro parameters and this title is 10 words, so
we lose the last word here when we pass arguments around. We have
more titles like that but for now I wanted to commit only one just to
flag the problem.
More cleanup:
- simplify TOC handling and remove arg limit (from uwe)
- use Lk with explicit anchor text in some places
- do not allow official release builds when we can not derive the
proper date from the buildid
Add "Oxford comma"
Improve heading a bit. While here, use quotes to group some of the
words to avoid the 9-arg limitation of .Ss
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.2 -r1.43.18.3 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.6 -r0 src/distrib/notes/common/list-portmasters.pl
cvs rdiff -u -r1.43 -r1.43.6.1 src/distrib/notes/common/macros
cvs rdiff -u -r1.551.2.2 -r1.551.2.3 src/distrib/notes/common/main
cvs rdiff -u -r1.36.18.1 -r1.36.18.2 src/distrib/notes/common/netboot
cvs rdiff -u -r1.83.2.2 -r1.83.2.3 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.107.6.2 -r1.107.6.3 src/distrib/notes/common/sysinst
cvs rdiff -u -r1.27 -r1.27.18.1 src/distrib/notes/sparc/prep
cvs rdiff -u -r1.15 -r1.15.50.1 src/distrib/notes/sparc64/prep
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.43.18.2 src/distrib/notes/Makefile.inc:1.43.18.3
--- src/distrib/notes/Makefile.inc:1.43.18.2 Mon Nov 25 05:50:15 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 13:36:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.43.18.2 2019/11/25 05:50:15 msaitoh Exp $
+# $NetBSD: Makefile.inc,v 1.43.18.3 2019/11/27 13:36:55 msaitoh Exp $
#
# Ross Harvey
@@ -51,8 +51,12 @@ PRESET+= -rnextminor=${nextmin}
.if defined(BUILDID) && "${BUILDID:M20*Z}" != ""
curdate!= env LANG="C" date -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
.else
+.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
+.error "No release date could be derived from BUILDID"
+.else
curdate!= env LANG="C" date "+%b %d, %Y"
.endif
+.endif
PRESET+= -dcur_date="${curdate}"
POST_PLAIN= -P-b -P-u -P-o
@@ -103,8 +107,7 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself.
#
-TOCPROC= 2>&1 >/dev/null |\
- ${TOOL_SED} -n '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
+TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
@@ -121,8 +124,6 @@ ${TARG}.ASCII.toc: ${SRCS}
${TARG}.HTML.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
- mv -f $@.tmp $@
${TARG}.more.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.43 src/distrib/notes/common/macros:1.43.6.1
--- src/distrib/notes/common/macros:1.43 Wed Jan 24 09:04:41 2018
+++ src/distrib/notes/common/macros Wed Nov 27 13:36:55 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.43 2018/01/24 09:04:41 skrll Exp $
+.\" $NetBSD: macros,v 1.43.6.1 2019/11/27 13:36:55 msaitoh Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -312,13 +312,13 @@
.if dTOC \{
.rn Ss Ss-toc
.de Ss
-.Ss-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 0 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss-toc \\$@
+.tm .Ti 0 \\n% "\\$*"
..
.rn Ss2 Ss2-toc
.de Ss2
-.Ss2-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 1 \\n% \\$1
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 16:14:53 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix editor mishap, note chanes to distrib/notes/common/Makefile.inc To generate a diff of this commit: cvs rdiff -u -r1.1.2.125 -r1.1.2.126 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 27 14:04:38 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: esm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #493):
sys/dev/pci/esm.c: revision 1.64
add missing break.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/dev/pci/esm.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/esm.c
diff -u src/sys/dev/pci/esm.c:1.63 src/sys/dev/pci/esm.c:1.63.2.1
--- src/sys/dev/pci/esm.c:1.63 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/esm.c Wed Nov 27 14:04:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.63 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: esm.c,v 1.63.2.1 2019/11/27 14:04:38 martin Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.63 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.63.2.1 2019/11/27 14:04:38 martin Exp $");
#include
#include
@@ -1482,6 +1482,7 @@ esm_match(device_t dev, cfdata_t match,
case PCI_PRODUCT_ESSTECH_MAESTRO2E:
return 1;
}
+ break;
case PCI_VENDOR_ESSTECH2:
switch (PCI_PRODUCT(pa->pa_id)) {
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Nov 27 14:04:38 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: esm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #493): sys/dev/pci/esm.c: revision 1.64 add missing break. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/dev/pci/esm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: martin
Date: Wed Nov 27 15:58:12 UTC 2019
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
When creating the TOC file, strip all incoming double quotes, but output
quotes around the third arg of the generated Ti macro invocation.
This fixes the TOC in non-html output. Pointed out by kre.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.46 src/distrib/notes/Makefile.inc:1.47
--- src/distrib/notes/Makefile.inc:1.46 Wed Nov 27 09:29:25 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 15:58:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.46 2019/11/27 09:29:25 martin Exp $
+# $NetBSD: Makefile.inc,v 1.47 2019/11/27 15:58:12 martin Exp $
#
# Ross Harvey
@@ -107,7 +107,9 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself.
#
-TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
+TOCPROC= 2>&1 >/dev/null |\
+ ${TOOL_SED} -n -e 's/"//g' \
+ -e '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
CVS commit: src/distrib/notes
Module Name:src Committed By: martin Date: Wed Nov 27 15:58:12 UTC 2019 Modified Files: src/distrib/notes: Makefile.inc Log Message: When creating the TOC file, strip all incoming double quotes, but output quotes around the third arg of the generated Ti macro invocation. This fixes the TOC in non-html output. Pointed out by kre. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: martin
Date: Wed Nov 27 16:07:30 UTC 2019
Modified Files:
src/distrib/notes [netbsd-9]: Makefile.inc
Log Message:
Pull up the following revision:
distrib/notes/Makefile.inc 1.47
When creating the TOC file, strip all incoming double quotes, but output
quotes around the third arg of the generated Ti macro invocation.
This fixes the TOC in non-html output. Pointed out by kre.
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.3 -r1.43.18.4 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.43.18.3 src/distrib/notes/Makefile.inc:1.43.18.4
--- src/distrib/notes/Makefile.inc:1.43.18.3 Wed Nov 27 13:36:55 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 16:07:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.43.18.3 2019/11/27 13:36:55 msaitoh Exp $
+# $NetBSD: Makefile.inc,v 1.43.18.4 2019/11/27 16:07:30 martin Exp $
#
# Ross Harvey
@@ -107,7 +107,9 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself.
#
-TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
+TOCPROC= 2>&1 >/dev/null |\
+ ${TOOL_SED} -n -e 's/"//g' \
+ -e '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: martin Date: Wed Nov 27 16:07:30 UTC 2019 Modified Files: src/distrib/notes [netbsd-9]: Makefile.inc Log Message: Pull up the following revision: distrib/notes/Makefile.inc 1.47 When creating the TOC file, strip all incoming double quotes, but output quotes around the third arg of the generated Ti macro invocation. This fixes the TOC in non-html output. Pointed out by kre. To generate a diff of this commit: cvs rdiff -u -r1.43.18.3 -r1.43.18.4 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Wed Nov 27 13:40:18 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #489. To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Wed Nov 27 13:40:18 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #489. To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.122 src/doc/CHANGES-9.0:1.1.2.123 --- src/doc/CHANGES-9.0:1.1.2.122 Wed Nov 27 11:22:13 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 13:40:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.122 2019/11/27 11:22:13 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.123 2019/11/27 13:40:18 msaitoh Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6491,3 +6491,22 @@ sys/dev/mii/ipgphy.c1.7 Print dmesg correctly. [msaitoh, ticket #490] +distrib/notes/Makefile.inc 1.46 +distrib/notes/common/list-portmasters.pl delete +distrib/notes/common/macros 1.44 +distrib/notes/common/main 1.555-1.557 via patch +distrib/notes/common/netboot 1.38 +distrib/notes/common/postinstall 1.86 +distrib/notes/common/sysinst 1.110 +distrib/notes/sparc/prep 1.28-1.29 +distrib/notes/sparc64/prep 1.16 + + - Remove list-portmasters.pl script. + - Quote long .Ss2 title to avoid troff's limitation. + - Simplify TOC handling and remove arg limit (from uwe). + - Use Lk with explicit anchor text in some places. + - Do not allow official release builds when we can not derive the + proper date from the buildid. + - Add "Oxford comma". + - Improve heading a bit. + [martin, ticket #489]
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Wed Nov 27 14:28:40 UTC 2019 Modified Files: src/distrib/notes/common [netbsd-9]: main Log Message: Special hint for new sysinst and possible installation fallout. To generate a diff of this commit: cvs rdiff -u -r1.551.2.3 -r1.551.2.4 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 14:06:12 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #491 - #493 To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.123 src/doc/CHANGES-9.0:1.1.2.124 --- src/doc/CHANGES-9.0:1.1.2.123 Wed Nov 27 13:40:18 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 14:06:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.123 2019/11/27 13:40:18 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.124 2019/11/27 14:06:12 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6510,3 +6510,108 @@ distrib/notes/sparc64/prep 1.16 - Add "Oxford comma". - Improve heading a bit. [martin, ticket #489] + +distrib/utils/embedded/conf/armv7.conf 1.36,1.37,1.39 +distrib/utils/embedded/files/armv7_boot.cmd 1.15 +distrib/utils/embedded/files/armv7_boot_nonefi.cmd 1.2 +etc/etc.evbarm/Makefile.inc 1.108-1.114 +sys/arch/arm/dts/omap3-beagle-xm.dts 1.1 +sys/arch/arm/dts/omap3-beagle.dts 1.1 +sys/arch/arm/dts/omap3-n900.dts 1.1 +sys/arch/arm/fdt/smsh_fdt.c 1.2 +sys/arch/arm/ti/am3_platform.c 1.1 +sys/arch/arm/ti/am3_prcm.c 1.2-1.10 +sys/arch/arm/ti/files.ti 1.5-1.20 +sys/arch/arm/ti/if_cpsw.c 1.7,1.8 +sys/arch/arm/ti/if_cpswreg.h 1.1 +sys/arch/arm/ti/omap2_gpmcreg.h 1.1 +sys/arch/arm/ti/omap2_nand.c 1.1,1.2 +sys/arch/arm/ti/omap3_cm.c 1.1-1.4 +sys/arch/arm/ti/omap3_dss.c 1.1 +sys/arch/arm/ti/omap3_dssreg.h 1.1 +sys/arch/arm/ti/omap3_platform.c 1.1,1.2 +sys/arch/arm/ti/omap3_prm.c 1.1 +sys/arch/arm/ti/ti_com.c 1.6-1.8 +sys/arch/arm/ti/ti_cpufreq.c 1.1 +sys/arch/arm/ti/ti_cpufreq.c 1.2 +sys/arch/arm/ti/ti_div_clock.c 1.1 +sys/arch/arm/ti/ti_dpll_clock.c 1.1,1.2 +sys/arch/arm/ti/ti_edma.c 1.1 +sys/arch/arm/ti/ti_edma.h 1.1 +sys/arch/arm/ti/ti_ehci.c 1.1 +sys/arch/arm/ti/ti_fb.c1.1 +sys/arch/arm/ti/ti_gpio.c 1.1-1.3 +sys/arch/arm/ti/ti_gpmc.c 1.1 +sys/arch/arm/ti/ti_iic.c 1.1-1.4 +sys/arch/arm/ti/ti_iicreg.h 1.1-1.3 +sys/arch/arm/ti/ti_lcdc.c 1.1 +sys/arch/arm/ti/ti_lcdc.c 1.2,1.3 +sys/arch/arm/ti/ti_lcdc.h 1.1 +sys/arch/arm/ti/ti_lcdcreg.h 1.1 +sys/arch/arm/ti/ti_motg.c 1.1 +sys/arch/arm/ti/ti_mux_clock.c 1.1 +sys/arch/arm/ti/ti_omapintc.c 1.2 +sys/arch/arm/ti/ti_omaptimer.c 1.2-1.4 +sys/arch/arm/ti/ti_otg.c 1.1 +sys/arch/arm/ti/ti_otgreg.h 1.1 +sys/arch/arm/ti/ti_platform.c delete +sys/arch/arm/ti/ti_platform.h delete +sys/arch/arm/ti/ti_prcm.c 1.2,1.3 +sys/arch/arm/ti/ti_prcm.h 1.2-1.4 +sys/arch/arm/ti/ti_rng.c 1.1,1.2 +sys/arch/arm/ti/ti_rngreg.h 1.1 +sys/arch/arm/ti/ti_sdhc.c 1.1-1.3 +sys/arch/arm/ti/ti_sdhcreg.h 1.1,1.2 +sys/arch/arm/ti/ti_sysc.c 1.1 +sys/arch/arm/ti/ti_tptc.c 1.1 +sys/arch/arm/ti/ti_usb.c 1.1 +sys/arch/arm/ti/ti_usbtll.c 1.1 +sys/arch/evbarm/conf/BEAGLEBOARD delete +sys/arch/evbarm/conf/BEAGLEBOARDXM delete +sys/arch/evbarm/conf/BEAGLEBOARDXM_INSTALL delete +sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL delete +sys/arch/evbarm/conf/BEAGLEBONE delete +sys/arch/evbarm/conf/BEAGLEBONE_INSTALL delete +sys/arch/evbarm/conf/DEVKIT8000 delete +sys/arch/evbarm/conf/GENERIC 1.55-1.67 +sys/arch/evbarm/conf/IGEPV2 delete +sys/arch/evbarm/conf/N900 1.32,1.33 +sys/arch/evbarm/conf/OVERO delete +sys/arch/evbarm/conf/OVERO_INSTALL delete +sys/arch/evbarm/conf/README.evbarm 1.22-1.27 +sys/arch/evbarm/conf/TIdelete +sys/arch/evbarm/conf/files.generic 1.9 +sys/arch/evbarm/conf/files.ti delete +sys/arch/evbarm/conf/std.igepv2 delete +sys/arch/evbarm/conf/std.ti delete +sys/dev/fdt/cpufreq_dt.c 1.11-1.13 +sys/dev/fdt/fdt_clock.c1.9 +sys/dev/fdt/fdt_phy.c1.6 +sys/dev/fdt/fdtvar.h1.55,1.56 +sys/dev/fdt/files.fdt1.46 +sys/dev/fdt/files.fdt1.47 +sys/dev/fdt/pinctrl_single.c 1.1 +sys/dev/fdt/syscon.c1.4 +sys/dev/fdt/usbnopphy.c1.1 +sys/dev/i2c/at24cxx.c1.32 +sys/dev/i2c/files.i2c1.101-1.104 +sys/dev/i2c/tda19988.c1.1-1.3 +sys/dev/i2c/tps65217pmic.c 1.13,1.14 +sys/dev/i2c/tps65950.cdelete +sys/dev/i2c/twl4030.c1.1-1.3 + + arm: switch am335x and omap3 to FDT support. + [jmcneill, ticket #491] + +sys/dev/ieee1394/fwohci.c 1.144 +sys/dev/pci/eso.c1.72 +sys/dev/pci/sv.c1.57 + + Fix operand priority of bit op vs ternary operator. + [msaitoh, ticket #492] + +sys/dev/pci/esm.c1.64 + + add missing break. + [msaitoh, ticket #493] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 14:06:12 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #491 - #493 To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Wed Nov 27 14:28:40 UTC 2019 Modified Files: src/distrib/notes/common [netbsd-9]: main Log Message: Special hint for new sysinst and possible installation fallout. To generate a diff of this commit: cvs rdiff -u -r1.551.2.3 -r1.551.2.4 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.551.2.3 src/distrib/notes/common/main:1.551.2.4 --- src/distrib/notes/common/main:1.551.2.3 Wed Nov 27 13:36:55 2019 +++ src/distrib/notes/common/main Wed Nov 27 14:28:40 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.551.2.3 2019/11/27 13:36:55 msaitoh Exp $ +.\" $NetBSD: main,v 1.551.2.4 2019/11/27 14:28:40 martin Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -559,6 +559,19 @@ The complete list of changes can be foun .Lk \*[RELEASE_URL]/CHANGES.prev CHANGES.prev .\} \" !\n[RELEASE_BRANCH] . +.Ss2 Installation and Partitioning Changes +The sysinst installation program has been reworked for this release. +.Pp +It now supports arbitrary big disks and offers GPT partitions as alternative +to MBR/fdisk partitions on a lot architectures. +.Pp +Unfortunately it has not been tested on all hardware supported by +.Nx . +If you have problems partitioning the target disk or installing the system, +please report bugs with as much details as possible. +See the Administrivia section below on how to report bugs or contact +other users and ask for support. +. .Ss "Features to be removed in a later release" The following features are to be removed from .Nx
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: msaitoh Date: Wed Nov 27 13:36:55 UTC 2019 Modified Files: src/distrib/notes [netbsd-9]: Makefile.inc src/distrib/notes/common [netbsd-9]: macros main netboot postinstall sysinst src/distrib/notes/sparc [netbsd-9]: prep src/distrib/notes/sparc64 [netbsd-9]: prep Removed Files: src/distrib/notes/common [netbsd-9]: list-portmasters.pl Log Message: Pull up following revision(s) (requested by martin in ticket #489): distrib/notes/Makefile.inc: revision 1.46 distrib/notes/common/postinstall: revision 1.86 distrib/notes/sparc64/prep: revision 1.16 distrib/notes/common/netboot: revision 1.38 distrib/notes/common/main: revision 1.555 distrib/notes/common/main: revision 1.556 distrib/notes/common/main: revision 1.557 distrib/notes/common/macros: revision 1.44 distrib/notes/common/sysinst: revision 1.110 distrib/notes/sparc/prep: revision 1.28 distrib/notes/sparc/prep: revision 1.29 distrib/notes/common/list-portmasters.pl: file removal Remove list-portmasters.pl script. We dropped that list from "main" some time ago. Quote long .Ss2 title to avoid troff's limitation. Troff is limited to 9 macro parameters and this title is 10 words, so we lose the last word here when we pass arguments around. We have more titles like that but for now I wanted to commit only one just to flag the problem. More cleanup: - simplify TOC handling and remove arg limit (from uwe) - use Lk with explicit anchor text in some places - do not allow official release builds when we can not derive the proper date from the buildid Add "Oxford comma" Improve heading a bit. While here, use quotes to group some of the words to avoid the 9-arg limitation of .Ss To generate a diff of this commit: cvs rdiff -u -r1.43.18.2 -r1.43.18.3 src/distrib/notes/Makefile.inc cvs rdiff -u -r1.6 -r0 src/distrib/notes/common/list-portmasters.pl cvs rdiff -u -r1.43 -r1.43.6.1 src/distrib/notes/common/macros cvs rdiff -u -r1.551.2.2 -r1.551.2.3 src/distrib/notes/common/main cvs rdiff -u -r1.36.18.1 -r1.36.18.2 src/distrib/notes/common/netboot cvs rdiff -u -r1.83.2.2 -r1.83.2.3 src/distrib/notes/common/postinstall cvs rdiff -u -r1.107.6.2 -r1.107.6.3 src/distrib/notes/common/sysinst cvs rdiff -u -r1.27 -r1.27.18.1 src/distrib/notes/sparc/prep cvs rdiff -u -r1.15 -r1.15.50.1 src/distrib/notes/sparc64/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Nov 27 14:34:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.0_RC1 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-9.0 cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.1 -r1.599.2.2 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.124 src/doc/CHANGES-9.0:1.1.2.125 --- src/doc/CHANGES-9.0:1.1.2.124 Wed Nov 27 14:06:12 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 14:34:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.124 2019/11/27 14:06:12 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.125 2019/11/27 14:34:31 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6615,3 +6615,11 @@ sys/dev/pci/esm.c1.64 add missing break. [msaitoh, ticket #493] +istrib/notes/common/main (edited manually) + + Note sysinst changes. + +external/gpl2/groff/tmac/mdoc.local (edited manually) +sys/sys/param.h (edited manually) + + Welcome to 9.0_RC1 ! Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.5.6.1 src/external/gpl2/groff/tmac/mdoc.local:1.5.6.2 --- src/external/gpl2/groff/tmac/mdoc.local:1.5.6.1 Tue Jul 30 16:52:10 2019 +++ src/external/gpl2/groff/tmac/mdoc.local Wed Nov 27 14:34:31 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.5.6.1 2019/07/30 16:52:10 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.5.6.2 2019/11/27 14:34:31 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~9.0_BETA +.ds doc-operating-system NetBSD\~9.0_RC1 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~9.0_BETA +.ds doc-default-operating-system NetBSD\~9.0_RC1 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.599.2.1 src/sys/sys/param.h:1.599.2.2 --- src/sys/sys/param.h:1.599.2.1 Tue Jul 30 16:52:10 2019 +++ src/sys/sys/param.h Wed Nov 27 14:34:31 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.599.2.1 2019/07/30 16:52:10 martin Exp $ */ +/* $NetBSD: param.h,v 1.599.2.2 2019/11/27 14:34:31 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 9 /* NetBSD 9.0_BETA */ +#define __NetBSD_Version__ 9 /* NetBSD 9.0_RC1 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Nov 27 19:04:45 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new terminfo To generate a diff of this commit: cvs rdiff -u -r1.1671 -r1.1672 src/doc/3RDPARTY cvs rdiff -u -r1.2617 -r1.2618 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: uwe
Date: Wed Nov 27 19:07:32 UTC 2019
Modified Files:
src/distrib/notes: Makefile.inc
src/distrib/notes/common: macros
Log Message:
Make .Te and .To also emit .Ti with quoted arguments.
I missed them b/c I tested on sparc notes and sparc/install is stuck
in the 90s and doesn't include common/sysinst. Now that all emitted
.Ti have properly quoted arguments we can revert TOCPROC to simple
grep.
While here convert .Te and .To to also use $* so we we can also drop
quoting from their calls in common/sysinst now. Don't actually drop
those quotes yet though, as we probably can further simplify the call
sites by emitting the headings automatically instead of duplicating
them.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.44 -r1.45 src/distrib/notes/common/macros
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.47 src/distrib/notes/Makefile.inc:1.48
--- src/distrib/notes/Makefile.inc:1.47 Wed Nov 27 15:58:12 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 19:07:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.47 2019/11/27 15:58:12 martin Exp $
+# $NetBSD: Makefile.inc,v 1.48 2019/11/27 19:07:31 uwe Exp $
#
# Ross Harvey
@@ -107,9 +107,7 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself.
#
-TOCPROC= 2>&1 >/dev/null |\
- ${TOOL_SED} -n -e 's/"//g' \
- -e '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
+TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti'
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.44 src/distrib/notes/common/macros:1.45
--- src/distrib/notes/common/macros:1.44 Wed Nov 27 09:29:25 2019
+++ src/distrib/notes/common/macros Wed Nov 27 19:07:31 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.44 2019/11/27 09:29:25 martin Exp $
+.\" $NetBSD: macros,v 1.45 2019/11/27 19:07:31 uwe Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -322,13 +322,17 @@
..
.\}
.de Te
-.ie rHTML \\$2
-.el \\$2
-.if dTOC \.tm .Ti \\$1 \\n% \\$2
+.nr Te-toc-level \\$1
+.shift
+.ie rHTML \\$*
+.el \\$*
+.if dTOC .tm .Ti \\n[Te-toc-level] \\n% "\\$*"
..
.de To
-.if rHTML
-.if dTOC \.tm .Ti \\$1 \\n% \\$2
+.nr To-toc-level \\$1
+.shift
+.if rHTML
+.if dTOC .tm .Ti \\n[To-toc-level] \\n% "\\$*"
..
.de Ti
.ie rHTML \{.ta (\n(.lu+\w''u)R
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Wed Nov 27 20:31:13 UTC 2019
Modified Files:
src/sys/kern: kern_runq.c
Log Message:
Don't try to IPI other CPUs early on. Fixes a crash on sparc64. Thanks
to martin@ for diagnosing.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/kern_runq.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_runq.c
diff -u src/sys/kern/kern_runq.c:1.49 src/sys/kern/kern_runq.c:1.50
--- src/sys/kern/kern_runq.c:1.49 Sat Nov 23 22:35:08 2019
+++ src/sys/kern/kern_runq.c Wed Nov 27 20:31:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_runq.c,v 1.49 2019/11/23 22:35:08 ad Exp $ */
+/* $NetBSD: kern_runq.c,v 1.50 2019/11/27 20:31:13 ad Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.49 2019/11/23 22:35:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.50 2019/11/27 20:31:13 ad Exp $");
#include "opt_dtrace.h"
@@ -368,7 +368,7 @@ sched_resched_cpu(struct cpu_info *ci, p
* If the priority level we're evaluating wouldn't cause a new LWP
* to be run on the CPU, then we have nothing to do.
*/
- if (pri <= spc->spc_curpriority) {
+ if (pri <= spc->spc_curpriority || !mp_online) {
if (__predict_true(unlock)) {
spc_unlock(ci);
}
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Wed Nov 27 20:31:13 UTC 2019 Modified Files: src/sys/kern: kern_runq.c Log Message: Don't try to IPI other CPUs early on. Fixes a crash on sparc64. Thanks to martin@ for diagnosing. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/kern/kern_runq.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/usbdevs
Module Name:src Committed By: christos Date: Wed Nov 27 17:56:09 UTC 2019 Modified Files: src/usr.sbin/usbdevs: usbdevs.c Log Message: Use strtoi instead of atoi() to catch bad input (Alexander Kuleshov) To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/usbdevs/usbdevs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: uwe Date: Wed Nov 27 18:34:56 UTC 2019 Modified Files: src/distrib/notes/sparc: prep Log Message: Undo the .Ss2 quoting hack, the macros can now handle it. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/notes/sparc/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/sparc/prep diff -u src/distrib/notes/sparc/prep:1.29 src/distrib/notes/sparc/prep:1.30 --- src/distrib/notes/sparc/prep:1.29 Wed Nov 27 09:29:25 2019 +++ src/distrib/notes/sparc/prep Wed Nov 27 18:34:56 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: prep,v 1.29 2019/11/27 09:29:25 martin Exp $ +.\" $NetBSD: prep,v 1.30 2019/11/27 18:34:56 uwe Exp $ . .Ss2 Configuring your PROM . @@ -212,7 +212,7 @@ kernel) to ensure that your disks remain .Nx device unit numbers even if you add disks to your system at a later time. . -.Ss2 "Determining how to access your SCSI disk from the PROM" +.Ss2 Determining how to access your SCSI disk from the PROM . sunmon and OpenBoot PROM 1 use an archaic .Li sd( Ns Ar c,u,p Ns Ic \&)
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: uwe Date: Wed Nov 27 18:34:56 UTC 2019 Modified Files: src/distrib/notes/sparc: prep Log Message: Undo the .Ss2 quoting hack, the macros can now handle it. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/notes/sparc/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/usbdevs
Module Name:src
Committed By: christos
Date: Wed Nov 27 17:56:09 UTC 2019
Modified Files:
src/usr.sbin/usbdevs: usbdevs.c
Log Message:
Use strtoi instead of atoi() to catch bad input (Alexander Kuleshov)
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/usbdevs/usbdevs.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/usbdevs/usbdevs.c
diff -u src/usr.sbin/usbdevs/usbdevs.c:1.39 src/usr.sbin/usbdevs/usbdevs.c:1.40
--- src/usr.sbin/usbdevs/usbdevs.c:1.39 Tue Nov 12 02:41:50 2019
+++ src/usr.sbin/usbdevs/usbdevs.c Wed Nov 27 12:56:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.c,v 1.39 2019/11/12 07:41:50 mrg Exp $ */
+/* $NetBSD: usbdevs.c,v 1.40 2019/11/27 17:56:08 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: usbdevs.c,v 1.39 2019/11/12 07:41:50 mrg Exp $");
+__RCSID("$NetBSD: usbdevs.c,v 1.40 2019/11/27 17:56:08 christos Exp $");
#endif
#include
@@ -48,6 +48,7 @@ __RCSID("$NetBSD: usbdevs.c,v 1.39 2019/
#include
#include
#include
+#include
#include
@@ -367,7 +368,7 @@ getusbcount_device(int fd, const char *d
int
main(int argc, char **argv)
{
- int ch, i, f;
+ int ch, i, f, error;
char buf[50];
char *dev = NULL;
int addr = -1;
@@ -376,7 +377,13 @@ main(int argc, char **argv)
while ((ch = getopt(argc, argv, "a:df:v?")) != -1) {
switch(ch) {
case 'a':
- addr = atoi(optarg);
+ addr = strtoi(optarg, NULL, 10, 0, USB_MAX_DEVICES - 1,
+ );
+ if (error) {
+errc(EXIT_FAILURE, error,
+"Bad value for device address: `%s'",
+optarg);
+ }
break;
case 'd':
showdevs++;
@@ -429,5 +436,5 @@ main(int argc, char **argv)
else
err(1, "%s", dev);
}
- exit(EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: joerg
Date: Wed Nov 27 21:07:32 UTC 2019
Modified Files:
src/sys/arch/powerpc/oea: ofw_autoconf.c
Log Message:
Add a hack for qemu/macppc. OF_finddevice calls will crash depending on
the boot loader and kernel being used. This patch allows using
-prom-env qemu_boot_hack=y to disable the lookup.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/oea/ofw_autoconf.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/oea/ofw_autoconf.c
diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.23 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.24
--- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.23 Wed Nov 21 17:54:42 2018
+++ src/sys/arch/powerpc/oea/ofw_autoconf.c Wed Nov 27 21:07:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_autoconf.c,v 1.23 2018/11/21 17:54:42 scole Exp $ */
+/* $NetBSD: ofw_autoconf.c,v 1.24 2019/11/27 21:07:32 joerg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.23 2018/11/21 17:54:42 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.24 2019/11/27 21:07:32 joerg Exp $");
#ifdef ofppc
#include "gtpci.h"
@@ -137,10 +137,17 @@ canonicalize_bootpath(void)
* /pci/mac-io/ata-3@2000/disk@0:0/netbsd.new (OF-3.x)
*/
strcpy(cbootpath, bootpath);
- while ((node = OF_finddevice(cbootpath)) == -1) {
- if ((p = strrchr(cbootpath, '/')) == NULL)
- break;
- *p = '\0';
+
+ if ((node = OF_finddevice("/options")) == -1 ||
+ OF_getprop(node, "qemu_boot_hack", type, sizeof(type) - 1) == -1 ||
+ type[0] != 'y') {
+ while ((node = OF_finddevice(cbootpath)) == -1) {
+ if ((p = strrchr(cbootpath, '/')) == NULL)
+break;
+ *p = '\0';
+ }
+ } else {
+ node = -1;
}
printf("bootpath: %s\n", bootpath);
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: joerg Date: Wed Nov 27 21:07:32 UTC 2019 Modified Files: src/sys/arch/powerpc/oea: ofw_autoconf.c Log Message: Add a hack for qemu/macppc. OF_finddevice calls will crash depending on the boot loader and kernel being used. This patch allows using -prom-env qemu_boot_hack=y to disable the lookup. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/oea/ofw_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: uwe Date: Wed Nov 27 20:58:25 UTC 2019 Modified Files: src/distrib/notes/sparc: contents Log Message: It's KRUPS not GENERIC-KRUPS. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/notes/sparc/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: uwe Date: Wed Nov 27 20:58:25 UTC 2019 Modified Files: src/distrib/notes/sparc: contents Log Message: It's KRUPS not GENERIC-KRUPS. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/notes/sparc/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/sparc/contents diff -u src/distrib/notes/sparc/contents:1.25 src/distrib/notes/sparc/contents:1.26 --- src/distrib/notes/sparc/contents:1.25 Sun Nov 24 11:15:36 2019 +++ src/distrib/notes/sparc/contents Wed Nov 27 20:58:25 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: contents,v 1.25 2019/11/24 11:15:36 martin Exp $ +.\" $NetBSD: contents,v 1.26 2019/11/27 20:58:25 uwe Exp $ .\" .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -240,7 +240,7 @@ kernel, which supports only UltraSPARC s This set contains a .Nx*M \*V -.Li GENERIC-KRUPS +.Li KRUPS kernel, which supports the JavaStation-NC, named .Pa /netbsd . .It Sy kern-MRCOFFEE
CVS commit: src/distrib/notes/common
Module Name:src Committed By: uwe Date: Wed Nov 27 21:37:28 UTC 2019 Modified Files: src/distrib/notes/common: macros Log Message: Add missing backslash at the start of conditional input. That avoids an empty line in the input (which didn't look empty, but for troff it really was) that causes a break. I don't remember enough linear algebra to understand what happened, but that also fixes off by one in some page numbers in the TOC. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/distrib/notes/common/macros Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/share/terminfo
Module Name:src Committed By: christos Date: Wed Nov 27 18:48:58 UTC 2019 Update of /cvsroot/src/share/terminfo In directory ivanova.netbsd.org:/tmp/cvs-serv6791 Log Message: Import terminfo-20190609.src Status: Vendor Tag: NCURSES Release Tags: terminfo-20190609 C src/share/terminfo/terminfo 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNCURSES:yesterday -jNCURSES src/share/terminfo
CVS import: src/share/terminfo
Module Name:src Committed By: christos Date: Wed Nov 27 18:48:58 UTC 2019 Update of /cvsroot/src/share/terminfo In directory ivanova.netbsd.org:/tmp/cvs-serv6791 Log Message: Import terminfo-20190609.src Status: Vendor Tag: NCURSES Release Tags: terminfo-20190609 C src/share/terminfo/terminfo 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNCURSES:yesterday -jNCURSES src/share/terminfo
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: uwe
Date: Wed Nov 27 21:37:28 UTC 2019
Modified Files:
src/distrib/notes/common: macros
Log Message:
Add missing backslash at the start of conditional input.
That avoids an empty line in the input (which didn't look empty, but
for troff it really was) that causes a break.
I don't remember enough linear algebra to understand what happened,
but that also fixes off by one in some page numbers in the TOC.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/notes/common/macros
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.45 src/distrib/notes/common/macros:1.46
--- src/distrib/notes/common/macros:1.45 Wed Nov 27 19:07:31 2019
+++ src/distrib/notes/common/macros Wed Nov 27 21:37:27 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.45 2019/11/27 19:07:31 uwe Exp $
+.\" $NetBSD: macros,v 1.46 2019/11/27 21:37:27 uwe Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -309,7 +309,7 @@
.\" XXX To should be unnecessary if we handle parseable/callable.
.\" .Tc import the TOC
.\" .Ti depth page "item" (internal) output an entry
-.if dTOC \{
+.if dTOC \{\
.rn Ss Ss-toc
.de Ss
.Ss-toc \\$@
CVS commit: src/share/terminfo
Module Name:src
Committed By: christos
Date: Wed Nov 27 19:00:25 UTC 2019
Added Files:
src/share/terminfo: import
Log Message:
simple import script
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/share/terminfo/import
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/share/terminfo/import
diff -u /dev/null src/share/terminfo/import:1.1
--- /dev/null Wed Nov 27 14:00:25 2019
+++ src/share/terminfo/import Wed Nov 27 14:00:25 2019
@@ -0,0 +1,27 @@
+#!/bin/sh
+# $NetBSD: import,v 1.1 2019/11/27 19:00:25 christos Exp $
+#
+# Simple shell script to import the newest version of terminfo
+# Download it from ftp://ftp.invisible-island.net/ncurses/current
+
+input=$1
+case "${input}" in
+terminfo-[0-9]*.src)
+ ;;
+*)
+ echo "$0: Invalid input file name" 1>&2
+ exit 1
+ ;;
+esac
+
+tag=${input%%.src}
+vendor=NCURSES
+
+TMP=$(mktemp -d /tmp/import-terminfo)
+trap rm -fr "${TMP}" 0 1 2 15
+
+cp "$1" "${TMP}/terminfo"
+cd "${TMP}"
+cleantags terminfo
+cvs -d cvs.netbsd.org:/cvsroot import \
+ -m "Import $1" src/share/terminfo "${vendor}" "${tag}"
CVS commit: src/distrib/notes
Module Name:src Committed By: uwe Date: Wed Nov 27 19:07:32 UTC 2019 Modified Files: src/distrib/notes: Makefile.inc src/distrib/notes/common: macros Log Message: Make .Te and .To also emit .Ti with quoted arguments. I missed them b/c I tested on sparc notes and sparc/install is stuck in the 90s and doesn't include common/sysinst. Now that all emitted .Ti have properly quoted arguments we can revert TOCPROC to simple grep. While here convert .Te and .To to also use $* so we we can also drop quoting from their calls in common/sysinst now. Don't actually drop those quotes yet though, as we probably can further simplify the call sites by emitting the headings automatically instead of duplicating them. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/distrib/notes/Makefile.inc cvs rdiff -u -r1.44 -r1.45 src/distrib/notes/common/macros Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/terminfo
Module Name:src Committed By: christos Date: Wed Nov 27 19:00:25 UTC 2019 Added Files: src/share/terminfo: import Log Message: simple import script To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/terminfo/import Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Nov 27 19:04:45 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new terminfo To generate a diff of this commit: cvs rdiff -u -r1.1671 -r1.1672 src/doc/3RDPARTY cvs rdiff -u -r1.2617 -r1.2618 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1671 src/doc/3RDPARTY:1.1672 --- src/doc/3RDPARTY:1.1671 Wed Nov 27 00:50:26 2019 +++ src/doc/3RDPARTY Wed Nov 27 14:04:45 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1671 2019/11/27 05:50:26 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1672 2019/11/27 19:04:45 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -2177,3 +2177,18 @@ Responsible: License: BSD-like (2 and 3-clause) Location: sys/external/bsd/ena-com Notes: + +Package: terminfo +Version: 20190609 + +Current Vers: 20190609 +Maintainer: Thomas Dickey (ncurses) +Archive Site: ftp://ftp.invisible-island.net/ncurses/current +Home Page: https://invisible-island.net/ncurses/ +Date: 2019-11-27 +Mailing List: bug-ncur...@gnu.org +Responsible: +License: none +Location: sys/external/bsd/ena-com +Notes: +Use the import script in /usr/src/share/terminfo Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2617 src/doc/CHANGES:1.2618 --- src/doc/CHANGES:1.2617 Wed Nov 27 00:50:26 2019 +++ src/doc/CHANGES Wed Nov 27 14:04:45 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2617 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2618 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -74,3 +74,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: QuickAssist Adapter 8960/8970. [hikaru 20191120] bind: Import version 9.14.8. [christos 20191127] + terminfo: Import 20190609 [christos 20191127]
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Wed Nov 27 19:21:37 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c src/sys/dev/pci: mfii.c Log Message: localify To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/pci/if_vmx.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/mfii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: maxv
Date: Wed Nov 27 19:21:37 UTC 2019
Modified Files:
src/sys/arch/x86/pci: if_vmx.c
src/sys/dev/pci: mfii.c
Log Message:
localify
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/pci/if_vmx.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/mfii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/if_vmx.c
diff -u src/sys/arch/x86/pci/if_vmx.c:1.51 src/sys/arch/x86/pci/if_vmx.c:1.52
--- src/sys/arch/x86/pci/if_vmx.c:1.51 Thu Oct 10 08:55:08 2019
+++ src/sys/arch/x86/pci/if_vmx.c Wed Nov 27 19:21:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.51 2019/10/10 08:55:08 knakahara Exp $ */
+/* $NetBSD: if_vmx.c,v 1.52 2019/11/27 19:21:36 maxv Exp $ */
/* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.51 2019/10/10 08:55:08 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.52 2019/11/27 19:21:36 maxv Exp $");
#include
#include
@@ -340,118 +340,117 @@ typedef enum {
#define vtophys(va) 0 /* XXX ok? */
-int vmxnet3_match(device_t, cfdata_t, void *);
-void vmxnet3_attach(device_t, device_t, void *);
-int vmxnet3_detach(device_t, int);
-
-int vmxnet3_alloc_pci_resources(struct vmxnet3_softc *);
-void vmxnet3_free_pci_resources(struct vmxnet3_softc *);
-int vmxnet3_check_version(struct vmxnet3_softc *);
-void vmxnet3_check_multiqueue(struct vmxnet3_softc *);
-
-int vmxnet3_alloc_msix_interrupts(struct vmxnet3_softc *);
-int vmxnet3_alloc_msi_interrupts(struct vmxnet3_softc *);
-int vmxnet3_alloc_legacy_interrupts(struct vmxnet3_softc *);
-int vmxnet3_alloc_interrupts(struct vmxnet3_softc *);
-void vmxnet3_free_interrupts(struct vmxnet3_softc *);
-
-int vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *);
-int vmxnet3_setup_msi_interrupt(struct vmxnet3_softc *);
-int vmxnet3_setup_legacy_interrupt(struct vmxnet3_softc *);
-void vmxnet3_set_interrupt_idx(struct vmxnet3_softc *);
-int vmxnet3_setup_interrupts(struct vmxnet3_softc *);
-int vmxnet3_setup_sysctl(struct vmxnet3_softc *);
-
-int vmxnet3_setup_stats(struct vmxnet3_softc *);
-void vmxnet3_teardown_stats(struct vmxnet3_softc *);
-
-int vmxnet3_init_rxq(struct vmxnet3_softc *, int);
-int vmxnet3_init_txq(struct vmxnet3_softc *, int);
-int vmxnet3_alloc_rxtx_queues(struct vmxnet3_softc *);
-void vmxnet3_destroy_rxq(struct vmxnet3_rxqueue *);
-void vmxnet3_destroy_txq(struct vmxnet3_txqueue *);
-void vmxnet3_free_rxtx_queues(struct vmxnet3_softc *);
-
-int vmxnet3_alloc_shared_data(struct vmxnet3_softc *);
-void vmxnet3_free_shared_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_txq_data(struct vmxnet3_softc *);
-void vmxnet3_free_txq_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_rxq_data(struct vmxnet3_softc *);
-void vmxnet3_free_rxq_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_queue_data(struct vmxnet3_softc *);
-void vmxnet3_free_queue_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_mcast_table(struct vmxnet3_softc *);
-void vmxnet3_free_mcast_table(struct vmxnet3_softc *);
-void vmxnet3_init_shared_data(struct vmxnet3_softc *);
-void vmxnet3_reinit_rss_shared_data(struct vmxnet3_softc *);
-void vmxnet3_reinit_shared_data(struct vmxnet3_softc *);
-int vmxnet3_alloc_data(struct vmxnet3_softc *);
-void vmxnet3_free_data(struct vmxnet3_softc *);
-int vmxnet3_setup_interface(struct vmxnet3_softc *);
-
-void vmxnet3_evintr(struct vmxnet3_softc *);
-bool vmxnet3_txq_eof(struct vmxnet3_txqueue *, u_int);
-int vmxnet3_newbuf(struct vmxnet3_softc *, struct vmxnet3_rxqueue *,
+static int vmxnet3_match(device_t, cfdata_t, void *);
+static void vmxnet3_attach(device_t, device_t, void *);
+static int vmxnet3_detach(device_t, int);
+
+static int vmxnet3_alloc_pci_resources(struct vmxnet3_softc *);
+static void vmxnet3_free_pci_resources(struct vmxnet3_softc *);
+static int vmxnet3_check_version(struct vmxnet3_softc *);
+static void vmxnet3_check_multiqueue(struct vmxnet3_softc *);
+
+static int vmxnet3_alloc_msix_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_alloc_msi_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_alloc_legacy_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_alloc_interrupts(struct vmxnet3_softc *);
+static void vmxnet3_free_interrupts(struct vmxnet3_softc *);
+
+static int vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_setup_msi_interrupt(struct vmxnet3_softc *);
+static int vmxnet3_setup_legacy_interrupt(struct vmxnet3_softc *);
+static void vmxnet3_set_interrupt_idx(struct vmxnet3_softc *);
+static int vmxnet3_setup_interrupts(struct vmxnet3_softc *);
+static int vmxnet3_setup_sysctl(struct vmxnet3_softc *);
+
+static int vmxnet3_setup_stats(struct vmxnet3_softc *);
+static void vmxnet3_teardown_stats(struct vmxnet3_softc *);
+
+static int vmxnet3_init_rxq(struct
CVS commit: src/sys/arch/arm/ti
Module Name:src
Committed By: jmcneill
Date: Wed Nov 27 23:03:24 UTC 2019
Modified Files:
src/sys/arch/arm/ti: ti_sdhc.c
Log Message:
Fix inverted ti,needs-special-hs-handling property logic and enable EDMA support
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_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/arch/arm/ti/ti_sdhc.c
diff -u src/sys/arch/arm/ti/ti_sdhc.c:1.3 src/sys/arch/arm/ti/ti_sdhc.c:1.4
--- src/sys/arch/arm/ti/ti_sdhc.c:1.3 Tue Oct 29 22:19:13 2019
+++ src/sys/arch/arm/ti/ti_sdhc.c Wed Nov 27 23:03:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_sdhc.c,v 1.3 2019/10/29 22:19:13 jmcneill Exp $ */
+/* $NetBSD: ti_sdhc.c,v 1.4 2019/11/27 23:03:24 jmcneill Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ti_sdhc.c,v 1.3 2019/10/29 22:19:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_sdhc.c,v 1.4 2019/11/27 23:03:24 jmcneill Exp $");
#include
#include
@@ -180,7 +180,6 @@ ti_sdhc_attach(device_t parent, device_t
sc->sc_addr = addr;
sc->sc_bst = faa->faa_bst;
-#if notyet
/* XXX use fdtbus_dma API */
int len;
const u_int *dmas = fdtbus_get_prop(phandle, "dmas", );
@@ -198,10 +197,6 @@ ti_sdhc_attach(device_t parent, device_t
sc->sc_edma_chan[EDMA_CHAN_RX] = -1;
break;
}
-#else
- sc->sc_edma_chan[EDMA_CHAN_TX] = -1;
- sc->sc_edma_chan[EDMA_CHAN_RX] = -1;
-#endif
if (bus_space_map(sc->sc_bst, addr, size, 0, >sc_bsh) != 0) {
aprint_error(": couldn't map registers\n");
@@ -219,7 +214,7 @@ ti_sdhc_attach(device_t parent, device_t
sc->sc.sc_flags |= SDHC_FLAG_8BIT_MODE;
if (of_hasprop(phandle, "ti,needs-special-reset"))
sc->sc.sc_flags |= SDHC_FLAG_WAIT_RESET;
- if (of_hasprop(phandle, "ti,needs-special-hs-handling"))
+ if (!of_hasprop(phandle, "ti,needs-special-hs-handling"))
sc->sc.sc_flags |= SDHC_FLAG_NO_HS_BIT;
if (of_hasprop(phandle, "ti,dual-volt"))
sc->sc.sc_caps = SDHC_VOLTAGE_SUPP_3_0V;
CVS commit: src/sys/arch/arm/ti
Module Name:src
Committed By: jmcneill
Date: Wed Nov 27 23:02:54 UTC 2019
Modified Files:
src/sys/arch/arm/ti: am3_prcm.c
Log Message:
Fix mmc and timer indexes.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/ti/am3_prcm.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/arm/ti/am3_prcm.c
diff -u src/sys/arch/arm/ti/am3_prcm.c:1.10 src/sys/arch/arm/ti/am3_prcm.c:1.11
--- src/sys/arch/arm/ti/am3_prcm.c:1.10 Mon Nov 4 09:37:51 2019
+++ src/sys/arch/arm/ti/am3_prcm.c Wed Nov 27 23:02:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: am3_prcm.c,v 1.10 2019/11/04 09:37:51 jmcneill Exp $ */
+/* $NetBSD: am3_prcm.c,v 1.11 2019/11/27 23:02:54 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.10 2019/11/04 09:37:51 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.11 2019/11/27 23:02:54 jmcneill Exp $");
#include
#include
@@ -161,7 +161,7 @@ static struct ti_prcm_clk am3_prcm_clks[
AM3_PRCM_HWMOD_PER("gpio3", 0xb0, "PERIPH_CLK"),
AM3_PRCM_HWMOD_PER("gpio4", 0xb4, "PERIPH_CLK"),
- AM3_PRCM_HWMOD_WKUP("timer0", 0x10, "FIXED_32K"),
+ AM3_PRCM_HWMOD_WKUP("timer1", 0x10, "FIXED_32K"),
AM3_PRCM_HWMOD_PER("timer2", 0x80, "FIXED_24MHZ"),
AM3_PRCM_HWMOD_PER("timer3", 0x84, "FIXED_24MHZ"),
AM3_PRCM_HWMOD_PER("timer4", 0x88, "FIXED_24MHZ"),
@@ -169,9 +169,9 @@ static struct ti_prcm_clk am3_prcm_clks[
AM3_PRCM_HWMOD_PER("timer6", 0xf0, "FIXED_24MHZ"),
AM3_PRCM_HWMOD_PER("timer7", 0x7c, "FIXED_24MHZ"),
- AM3_PRCM_HWMOD_PER("mmc0", 0x3c, "MMC_CLK"),
- AM3_PRCM_HWMOD_PER("mmc1", 0xf4, "MMC_CLK"),
- AM3_PRCM_HWMOD_PER("mmc2", 0xf8, "MMC_CLK"),
+ AM3_PRCM_HWMOD_PER("mmc1", 0x3c, "MMC_CLK"),
+ AM3_PRCM_HWMOD_PER("mmc2", 0xf4, "MMC_CLK"),
+ AM3_PRCM_HWMOD_PER("mmc3", 0xf8, "MMC_CLK"),
AM3_PRCM_HWMOD_PER("tpcc", 0xbc, "PERIPH_CLK"),
AM3_PRCM_HWMOD_PER("tptc0", 0x24, "PERIPH_CLK"),
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Wed Nov 27 23:02:54 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c Log Message: Fix mmc and timer indexes. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/ti/am3_prcm.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/arm/ti
Module Name:src Committed By: jmcneill Date: Wed Nov 27 23:03:24 UTC 2019 Modified Files: src/sys/arch/arm/ti: ti_sdhc.c Log Message: Fix inverted ti,needs-special-hs-handling property logic and enable EDMA support To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_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/arch/arm/broadcom
Module Name:src
Committed By: thorpej
Date: Thu Nov 28 01:08:06 UTC 2019
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_intr.c
Log Message:
There are some devices on the bcm283x that share IRQs (notably, the i2c
controllers), but the generic ARM PIC code doesn't support this. Add a
workaround inspired by the GICv3 driver (thanks Jared for pointint it out).
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/broadcom/bcm2835_intr.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/arm/broadcom/bcm2835_intr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.c:1.24 src/sys/arch/arm/broadcom/bcm2835_intr.c:1.25
--- src/sys/arch/arm/broadcom/bcm2835_intr.c:1.24 Wed Sep 25 16:57:10 2019
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c Thu Nov 28 01:08:06 2019
@@ -1,7 +1,7 @@
-/* $NetBSD: bcm2835_intr.c,v 1.24 2019/09/25 16:57:10 skrll Exp $ */
+/* $NetBSD: bcm2835_intr.c,v 1.25 2019/11/28 01:08:06 thorpej Exp $ */
/*-
- * Copyright (c) 2012, 2015 The NetBSD Foundation, Inc.
+ * Copyright (c) 2012, 2015, 2019 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.24 2019/09/25 16:57:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.25 2019/11/28 01:08:06 thorpej Exp $");
#define _INTR_PRIVATE
@@ -87,6 +87,8 @@ static void *bcm2835_icu_fdt_establish(d
static void bcm2835_icu_fdt_disestablish(device_t, void *);
static bool bcm2835_icu_fdt_intrstr(device_t, u_int *, char *, size_t);
+static int bcm2835_icu_intr(void *);
+
static int bcm2836mp_icu_fdt_decode_irq(u_int *);
static void *bcm2836mp_icu_fdt_establish(device_t, u_int *, int, int,
int (*)(void *), void *);
@@ -162,11 +164,35 @@ struct bcm2836mp_interrupt {
static TAILQ_HEAD(, bcm2836mp_interrupt) bcm2836mp_interrupts =
TAILQ_HEAD_INITIALIZER(bcm2836mp_interrupts);
+struct bcm2835icu_irqhandler;
+struct bcm2835icu_irq;
+struct bcm2835icu_softc;
+
+struct bcm2835icu_irqhandler {
+ struct bcm2835icu_irq *ih_irq;
+ int (*ih_fn)(void *);
+ void *ih_arg;
+ TAILQ_ENTRY(bcm2835icu_irqhandler) ih_next;
+};
+
+struct bcm2835icu_irq {
+ struct bcm2835icu_softc *intr_sc;
+ void *intr_ih;
+ void *intr_arg;
+ int intr_refcnt;
+ int intr_ipl;
+ int intr_irq;
+ int intr_mpsafe;
+ TAILQ_HEAD(, bcm2835icu_irqhandler) intr_handlers;
+};
+
struct bcm2835icu_softc {
device_t sc_dev;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
+ struct bcm2835icu_irq *sc_irq[BCM2835_NIRQ];
+
int sc_phandle;
};
@@ -437,6 +463,9 @@ static void *
bcm2835_icu_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
int (*func)(void *), void *arg)
{
+ struct bcm2835icu_softc * const sc = device_private(dev);
+ struct bcm2835icu_irq *firq;
+ struct bcm2835icu_irqhandler *firqh;
int iflags = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
int irq;
@@ -444,13 +473,89 @@ bcm2835_icu_fdt_establish(device_t dev,
if (irq == -1)
return NULL;
- return intr_establish(irq, ipl, IST_LEVEL | iflags, func, arg);
+ firq = sc->sc_irq[irq];
+ if (firq == NULL) {
+ firq = kmem_alloc(sizeof(*firq), KM_SLEEP);
+ firq->intr_sc = sc;
+ firq->intr_refcnt = 0;
+ firq->intr_arg = arg;
+ firq->intr_ipl = ipl;
+ firq->intr_mpsafe = iflags;
+ firq->intr_irq = irq;
+ TAILQ_INIT(>intr_handlers);
+ if (arg == NULL) {
+ firq->intr_ih = intr_establish(irq, ipl,
+ IST_LEVEL | iflags, func, NULL);
+ } else {
+ firq->intr_ih = intr_establish(irq, ipl,
+ IST_LEVEL | iflags, bcm2835_icu_intr, firq);
+ }
+ if (firq->intr_ih == NULL) {
+ kmem_free(firq, sizeof(*firq));
+ return NULL;
+ }
+ sc->sc_irq[irq] = firq;
+ } else {
+ if (firq->intr_arg == NULL || arg == NULL) {
+ device_printf(dev,
+ "cannot share irq with NULL-arg handler\n");
+ return NULL;
+ }
+ if (firq->intr_ipl != ipl) {
+ device_printf(dev,
+ "cannot share irq with different ipl\n");
+ return NULL;
+ }
+ if (firq->intr_mpsafe != iflags) {
+ device_printf(dev,
+ "cannot share irq between mpsafe/non-mpsafe\n");
+ return NULL;
+ }
+ }
+
+ firqh = kmem_alloc(sizeof(*firqh), KM_SLEEP);
+ firqh->ih_irq = firq;
+ firqh->ih_fn = func;
+ firqh->ih_arg = arg;
+ TAILQ_INSERT_TAIL(>intr_handlers, firqh, ih_next);
+
+ return firqh;
}
static void
bcm2835_icu_fdt_disestablish(device_t dev, void *ih)
{
- intr_disestablish(ih);
+ struct bcm2835icu_softc * const sc = device_private(dev);
+ struct bcm2835icu_irqhandler *firqh = ih;
+ struct bcm2835icu_irq *firq = firqh->ih_irq;
+
+ KASSERT(firq->intr_refcnt > 0);
+
+ /* XXX */
+ if (firq->intr_refcnt > 1)
+ panic("%s: cannot disestablish shared irq", __func__);
+
+ intr_disestablish(firq->intr_ih);
+
+ TAILQ_REMOVE(>intr_handlers, firqh, ih_next);
+
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: thorpej Date: Thu Nov 28 01:08:06 UTC 2019 Modified Files: src/sys/arch/arm/broadcom: bcm2835_intr.c Log Message: There are some devices on the bcm283x that share IRQs (notably, the i2c controllers), but the generic ARM PIC code doesn't support this. Add a workaround inspired by the GICv3 driver (thanks Jared for pointint it out). To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/broadcom/bcm2835_intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: uwe Date: Wed Nov 27 23:53:01 UTC 2019 Modified Files: src/distrib/notes/common: macros Log Message: Don't open-code .tm calls to emit TOC entries. Hide it in an .mktoc macro so that we can switch the way we generate TOC more easily. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/distrib/notes/common/macros Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: uwe
Date: Wed Nov 27 23:53:01 UTC 2019
Modified Files:
src/distrib/notes/common: macros
Log Message:
Don't open-code .tm calls to emit TOC entries.
Hide it in an .mktoc macro so that we can switch the way we generate
TOC more easily.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/notes/common/macros
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.46 src/distrib/notes/common/macros:1.47
--- src/distrib/notes/common/macros:1.46 Wed Nov 27 21:37:27 2019
+++ src/distrib/notes/common/macros Wed Nov 27 23:53:01 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.46 2019/11/27 21:37:27 uwe Exp $
+.\" $NetBSD: macros,v 1.47 2019/11/27 23:53:01 uwe Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -310,15 +310,20 @@
.\" .Tc import the TOC
.\" .Ti depth page "item" (internal) output an entry
.if dTOC \{\
+.de mktoc
+.nr mktoc-level \\$1
+.shift
+.tm .Ti \\n[toc-level] \\n% "\\$*"
+..
.rn Ss Ss-toc
.de Ss
.Ss-toc \\$@
-.tm .Ti 0 \\n% "\\$*"
+.mktoc 0 \\$@
..
.rn Ss2 Ss2-toc
.de Ss2
.Ss2-toc \\$@
-.tm .Ti 1 \\n% "\\$*"
+.mktoc 1 \\$@
..
.\}
.de Te
@@ -326,13 +331,13 @@
.shift
.ie rHTML \\$*
.el \\$*
-.if dTOC .tm .Ti \\n[Te-toc-level] \\n% "\\$*"
+.if dTOC .mktoc \\n[Te-toc-level] \\$@
..
.de To
.nr To-toc-level \\$1
.shift
.if rHTML
-.if dTOC .tm .Ti \\n[To-toc-level] \\n% "\\$*"
+.if dTOC .mktoc \\n[To-toc-level] \\$@
..
.de Ti
.ie rHTML \{.ta (\n(.lu+\w''u)R
CVS commit: src/distrib/notes
Module Name:src Committed By: uwe Date: Thu Nov 28 00:06:39 UTC 2019 Modified Files: src/distrib/notes: Makefile.inc src/distrib/notes/common: macros Log Message: Use .open/.write instead of .tm to emit TOC. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/distrib/notes/Makefile.inc cvs rdiff -u -r1.48 -r1.49 src/distrib/notes/common/macros Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: uwe
Date: Thu Nov 28 00:06:39 UTC 2019
Modified Files:
src/distrib/notes: Makefile.inc
src/distrib/notes/common: macros
Log Message:
Use .open/.write instead of .tm to emit TOC.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.48 -r1.49 src/distrib/notes/common/macros
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.50 src/distrib/notes/Makefile.inc:1.51
--- src/distrib/notes/Makefile.inc:1.50 Wed Nov 27 23:19:13 2019
+++ src/distrib/notes/Makefile.inc Thu Nov 28 00:06:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.50 2019/11/27 23:19:13 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.51 2019/11/28 00:06:39 uwe Exp $
#
# Ross Harvey
@@ -107,32 +107,26 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# They are generated twice to take into account the
# space taken by the TOC itself.
-# TOC is emitted with .tm on groff's stderr, divert those lines to stdout.
-# NB: /dev/stderr is nawk's internal designation, not /dev/stderr file.
-# TODO: use .open/.write instead.
-TOCPROC = 2>&1 >/dev/null | \
- ${TOOL_AWK} '{ if ($$1 == ".Ti") print; else print > "/dev/stderr"; }'
-
${TARG}.PostScript.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.ASCII.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.HTML.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.more.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.48 src/distrib/notes/common/macros:1.49
--- src/distrib/notes/common/macros:1.48 Wed Nov 27 23:57:41 2019
+++ src/distrib/notes/common/macros Thu Nov 28 00:06:39 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.48 2019/11/27 23:57:41 uwe Exp $
+.\" $NetBSD: macros,v 1.49 2019/11/28 00:06:39 uwe Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -311,10 +311,12 @@
.\" .Ti depth page "item" (internal) output an entry
.ds toc-file INSTALL.\*[format].toc
.if dTOC \{\
+.tm ...writing \*[toc-file].tmp
+.open toc-tmp \*[toc-file].tmp
.de mktoc
.nr mktoc-level \\$1
.shift
-.tm .Ti \\n[toc-level] \\n% "\\$*"
+.write toc-tmp .Ti \\n[toc-level] \\n% "\\$*"
..
.rn Ss Ss-toc
.de Ss
CVS commit: src/distrib/notes
Module Name:src
Committed By: uwe
Date: Wed Nov 27 22:41:42 UTC 2019
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
Don't lose groff's stderr when creating TOC.
Divert only the .Ti lines to the TOC file. Keep the rest, it may
contain useful messages (like the empty line bug in macros that was
messing up page numbers).
TODO: Since we already depend on groff extensions, we should just use
.open/.write to emit the TOC directly. But commit this for now in
case I run out of round tuits.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.48 src/distrib/notes/Makefile.inc:1.49
--- src/distrib/notes/Makefile.inc:1.48 Wed Nov 27 19:07:31 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 22:41:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.48 2019/11/27 19:07:31 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.49 2019/11/27 22:41:41 uwe Exp $
#
# Ross Harvey
@@ -105,9 +105,12 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# Rules to build the table of contents (.toc) files.
# They are generated twice to take into account the
# space taken by the TOC itself.
-#
-TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti'
+# TOC is emitted with .tm on groff's stderr, divert those lines to stdout.
+# NB: /dev/stderr is nawk's internal designation, not /dev/stderr file.
+# TODO: use .open/.write instead.
+TOCPROC = 2>&1 >/dev/null | \
+ ${TOOL_AWK} '{ if ($$1 == ".Ti") print; else print > "/dev/stderr"; }'
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
CVS commit: src/distrib/notes
Module Name:src Committed By: uwe Date: Wed Nov 27 22:41:42 UTC 2019 Modified Files: src/distrib/notes: Makefile.inc Log Message: Don't lose groff's stderr when creating TOC. Divert only the .Ti lines to the TOC file. Keep the rest, it may contain useful messages (like the empty line bug in macros that was messing up page numbers). TODO: Since we already depend on groff extensions, we should just use .open/.write to emit the TOC directly. But commit this for now in case I run out of round tuits. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: uwe
Date: Wed Nov 27 23:19:13 UTC 2019
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
Do not pass common/macros on the command line as input.
common/main already sources them, so there's no point to process the
file again *after* the document has been formatted. Put it to SRCS so
that we still depend on it.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.49 src/distrib/notes/Makefile.inc:1.50
--- src/distrib/notes/Makefile.inc:1.49 Wed Nov 27 22:41:41 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 23:19:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.49 2019/11/27 22:41:41 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.50 2019/11/27 23:19:13 uwe Exp $
#
# Ross Harvey
@@ -13,12 +13,13 @@ MKTOCS?=yes
M?= ${.CURDIR:T}
COMMON= ${.CURDIR}/../common
-MAIN= ${COMMON}/main ${COMMON}/macros ${EXTRA}
+MAIN= ${COMMON}/main ${EXTRA}
TARG= INSTALL
TARGS= ${TARG}.ps ${TARG}.txt ${TARG}.html ${TARG}.more
TOCS= ${TARG}.PostScript.toc ${TARG}.ASCII.toc ${TARG}.HTML.toc \
${TARG}.more.toc
-SRCS= ${MAIN} whatis ${COMMON}/contents hardware xfer prep \
+SRCS= ${MAIN} ${COMMON}/macros \
+ whatis ${COMMON}/contents hardware xfer prep \
${.CURDIR}/install ${COMMON}/postinstall upgrade \
${COMMON}/legal.common ${COMMON}/netboot \
${COMMON}/sysinst \
CVS commit: src/distrib/notes
Module Name:src Committed By: uwe Date: Wed Nov 27 23:19:13 UTC 2019 Modified Files: src/distrib/notes: Makefile.inc Log Message: Do not pass common/macros on the command line as input. common/main already sources them, so there's no point to process the file again *after* the document has been formatted. Put it to SRCS so that we still depend on it. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc
Module Name:src Committed By: christos Date: Thu Nov 28 00:18:36 UTC 2019 Modified Files: src/external/mpl/bind/dist/lib/isc/include/isc: types.h Log Message: match ifdefs with stats.c atomic selection To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mpl/bind/dist/lib/isc/include/isc/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/bind/dist/lib/isc/include/isc
Module Name:src
Committed By: christos
Date: Thu Nov 28 00:18:36 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: types.h
Log Message:
match ifdefs with stats.c atomic selection
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/include/isc/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/dist/lib/isc/include/isc/types.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.5 src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.6
--- src/external/mpl/bind/dist/lib/isc/include/isc/types.h:1.5 Wed Nov 27 00:48:42 2019
+++ src/external/mpl/bind/dist/lib/isc/include/isc/types.h Wed Nov 27 19:18:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.5 2019/11/27 05:48:42 christos Exp $ */
+/* $NetBSD: types.h,v 1.6 2019/11/28 00:18:36 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -78,7 +78,7 @@ typedef struct isc_socket isc_socket_t;
typedef struct isc_socketevent isc_socketevent_t; /*%< Socket Event */
typedef struct isc_socketmgr isc_socketmgr_t; /*%< Socket Manager */
typedef struct isc_stats isc_stats_t; /*%< Statistics */
-#if defined(_WIN32) && !defined(_WIN64)
+#if defined(_WIN32) && !defined(_WIN64) || !defined(_LP64)
typedef int_fast32_t isc_statscounter_t; /*%< Statistics Counter */
#else
typedef int_fast64_t isc_statscounter_t;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: isaki Date: Thu Nov 28 05:07:27 UTC 2019 Modified Files: src/sys/dev/ic: ac97.c am7990.c Log Message: Use NULL for pointer. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/ac97.c cvs rdiff -u -r1.79 -r1.80 src/sys/dev/ic/am7990.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/ac97.c diff -u src/sys/dev/ic/ac97.c:1.98 src/sys/dev/ic/ac97.c:1.99 --- src/sys/dev/ic/ac97.c:1.98 Wed May 8 13:40:18 2019 +++ src/sys/dev/ic/ac97.c Thu Nov 28 05:07:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ac97.c,v 1.98 2019/05/08 13:40:18 isaki Exp $ */ +/* $NetBSD: ac97.c,v 1.99 2019/11/28 05:07:27 isaki Exp $ */ /* $OpenBSD: ac97.c,v 1.8 2000/07/19 09:01:35 csapuntz Exp $ */ /* @@ -63,7 +63,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.98 2019/05/08 13:40:18 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.99 2019/11/28 05:07:27 isaki Exp $"); #include #include @@ -1691,7 +1691,7 @@ ac97_query_devinfo(struct ac97_codec_if else if (si->class) name = si->class; else - name = 0; + name = NULL; if (name) strcpy(dip->label.name, name); Index: src/sys/dev/ic/am7990.c diff -u src/sys/dev/ic/am7990.c:1.79 src/sys/dev/ic/am7990.c:1.80 --- src/sys/dev/ic/am7990.c:1.79 Tue Jun 26 06:48:00 2018 +++ src/sys/dev/ic/am7990.c Thu Nov 28 05:07:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: am7990.c,v 1.79 2018/06/26 06:48:00 msaitoh Exp $ */ +/* $NetBSD: am7990.c,v 1.80 2019/11/28 05:07:27 isaki Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.79 2018/06/26 06:48:00 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.80 2019/11/28 05:07:27 isaki Exp $"); #include #include @@ -483,7 +483,7 @@ am7990_start(struct ifnet *ifp) } IFQ_DEQUEUE(>if_snd, m); - if (m == 0) + if (m == NULL) break; /*
CVS commit: src/sys/dev/ic
Module Name:src Committed By: isaki Date: Thu Nov 28 05:07:27 UTC 2019 Modified Files: src/sys/dev/ic: ac97.c am7990.c Log Message: Use NULL for pointer. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/ac97.c cvs rdiff -u -r1.79 -r1.80 src/sys/dev/ic/am7990.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: uwe Date: Wed Nov 27 23:57:41 UTC 2019 Modified Files: src/distrib/notes/common: macros Log Message: Don't repeat the TOC file name, define a string. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/distrib/notes/common/macros Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: uwe
Date: Wed Nov 27 23:57:41 UTC 2019
Modified Files:
src/distrib/notes/common: macros
Log Message:
Don't repeat the TOC file name, define a string.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/notes/common/macros
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.47 src/distrib/notes/common/macros:1.48
--- src/distrib/notes/common/macros:1.47 Wed Nov 27 23:53:01 2019
+++ src/distrib/notes/common/macros Wed Nov 27 23:57:41 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.47 2019/11/27 23:53:01 uwe Exp $
+.\" $NetBSD: macros,v 1.48 2019/11/27 23:57:41 uwe Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -309,6 +309,7 @@
.\" XXX To should be unnecessary if we handle parseable/callable.
.\" .Tc import the TOC
.\" .Ti depth page "item" (internal) output an entry
+.ds toc-file INSTALL.\*[format].toc
.if dTOC \{\
.de mktoc
.nr mktoc-level \\$1
@@ -348,10 +349,10 @@
.de Tc
.Bd -literal
.ta (\n(.lu)R
-\.tm ...reading INSTALL.\*[format].toc
+.tm ...reading \*[toc-file]
. Pp
-.\" Use so-real here because otherwise we lose on objdirs
-\.so-real INSTALL.\*[format].toc
+.\" Use so-real here because toc-file is in objdir not .CURDIR
+.so-real \*[toc-file]
.Ed
..
.
Re: CVS commit: src/sys
On 2019/11/27 19:19, SAITOH Masanobu wrote: > Module Name: src > Committed By: msaitoh > Date: Wed Nov 27 10:19:21 UTC 2019 > > Modified Files: > src/sys/arch/arm/amlogic: gxlphy.c > src/sys/dev/mii: acphy.c amhphy.c atphy.c bmtphy.c brgphy.c ciphy.c > dmphy.c etphy.c exphy.c gentbi.c glxtphy.c gphyter.c icsphy.c > igphy.c ihphy.c ikphy.c inphy.c iophy.c ipgphy.c jmphy.c lxtphy.c > makphy.c micphy.c mii_physubr.c mvphy.c nsphy.c nsphyter.c pnaphy.c > qsphy.c rdcphy.c rgephy.c rlphy.c smscphy.c sqphy.c tlphy.c tqphy.c > ukphy.c urlphy.c > > Log Message: > - Simplify sc->mii_anegticks setting. Same as FreeBSD. > >Don't set the default value not in the attach function. Instead, set the s/not in the/in the/ > default value (MII_ANEGTICKS) first in the beginning of the > mii_phy_add_media(). The function already has the code to change the value > to > MII_ANEGTICKS_GIGE if it's gigabit capable. > > - Remove extra pmf_device_register() call. It's done in mii_phy_add_media(). > > > To generate a diff of this commit: > cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/gxlphy.c > cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/acphy.c > cvs rdiff -u -r1.24 -r1.25 src/sys/dev/mii/amhphy.c src/sys/dev/mii/pnaphy.c > cvs rdiff -u -r1.25 -r1.26 src/sys/dev/mii/atphy.c > cvs rdiff -u -r1.35 -r1.36 src/sys/dev/mii/bmtphy.c src/sys/dev/mii/gphyter.c > cvs rdiff -u -r1.85 -r1.86 src/sys/dev/mii/brgphy.c > cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/ciphy.c src/sys/dev/mii/rlphy.c > cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/dmphy.c src/sys/dev/mii/nsphyter.c > \ > src/sys/dev/mii/tqphy.c > cvs rdiff -u -r1.6 -r1.7 src/sys/dev/mii/etphy.c > cvs rdiff -u -r1.56 -r1.57 src/sys/dev/mii/exphy.c > cvs rdiff -u -r1.29 -r1.30 src/sys/dev/mii/gentbi.c > cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/glxtphy.c > cvs rdiff -u -r1.54 -r1.55 src/sys/dev/mii/icsphy.c src/sys/dev/mii/sqphy.c > cvs rdiff -u -r1.31 -r1.32 src/sys/dev/mii/igphy.c > cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mii/ihphy.c > cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mii/ikphy.c > cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/inphy.c > cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mii/iophy.c > cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/ipgphy.c > cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/jmphy.c > cvs rdiff -u -r1.53 -r1.54 src/sys/dev/mii/lxtphy.c src/sys/dev/mii/qsphy.c > cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mii/makphy.c > cvs rdiff -u -r1.9 -r1.10 src/sys/dev/mii/micphy.c > cvs rdiff -u -r1.88 -r1.89 src/sys/dev/mii/mii_physubr.c > cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mii/mvphy.c > cvs rdiff -u -r1.64 -r1.65 src/sys/dev/mii/nsphy.c > cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/rdcphy.c > cvs rdiff -u -r1.57 -r1.58 src/sys/dev/mii/rgephy.c > cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/smscphy.c > cvs rdiff -u -r1.66 -r1.67 src/sys/dev/mii/tlphy.c > cvs rdiff -u -r1.51 -r1.52 src/sys/dev/mii/ukphy.c > cvs rdiff -u -r1.34 -r1.35 src/sys/dev/mii/urlphy.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > -- --- SAITOH Masanobu (msai...@execsw.org msai...@netbsd.org)
CVS commit: src/distrib/notes
Module Name:src
Committed By: martin
Date: Wed Nov 27 09:29:26 UTC 2019
Modified Files:
src/distrib/notes: Makefile.inc
src/distrib/notes/common: macros main netboot postinstall sysinst
src/distrib/notes/sparc: prep
src/distrib/notes/sparc64: prep
Log Message:
More cleanup:
- simplify TOC handling and remove arg limit (from uwe)
- use Lk with explicit anchor text in some places
- do not allow official release builds when we can not derive the
proper date from the buildid
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.43 -r1.44 src/distrib/notes/common/macros
cvs rdiff -u -r1.556 -r1.557 src/distrib/notes/common/main
cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/common/netboot
cvs rdiff -u -r1.85 -r1.86 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.109 -r1.110 src/distrib/notes/common/sysinst
cvs rdiff -u -r1.28 -r1.29 src/distrib/notes/sparc/prep
cvs rdiff -u -r1.15 -r1.16 src/distrib/notes/sparc64/prep
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.45 src/distrib/notes/Makefile.inc:1.46
--- src/distrib/notes/Makefile.inc:1.45 Sun Nov 24 11:15:31 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 09:29:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.45 2019/11/24 11:15:31 martin Exp $
+# $NetBSD: Makefile.inc,v 1.46 2019/11/27 09:29:25 martin Exp $
#
# Ross Harvey
@@ -51,8 +51,12 @@ PRESET+= -rnextminor=${nextmin}
.if defined(BUILDID) && "${BUILDID:M20*Z}" != ""
curdate!= env LANG="C" date -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
.else
+.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
+.error "No release date could be derived from BUILDID"
+.else
curdate!= env LANG="C" date "+%b %d, %Y"
.endif
+.endif
PRESET+= -dcur_date="${curdate}"
POST_PLAIN= -P-b -P-u -P-o
@@ -103,8 +107,7 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself.
#
-TOCPROC= 2>&1 >/dev/null |\
- ${TOOL_SED} -n '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
+TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
@@ -121,8 +124,6 @@ ${TARG}.ASCII.toc: ${SRCS}
${TARG}.HTML.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
- mv -f $@.tmp $@
${TARG}.more.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.43 src/distrib/notes/common/macros:1.44
--- src/distrib/notes/common/macros:1.43 Wed Jan 24 09:04:41 2018
+++ src/distrib/notes/common/macros Wed Nov 27 09:29:25 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.43 2018/01/24 09:04:41 skrll Exp $
+.\" $NetBSD: macros,v 1.44 2019/11/27 09:29:25 martin Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -312,13 +312,13 @@
.if dTOC \{
.rn Ss Ss-toc
.de Ss
-.Ss-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 0 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss-toc \\$@
+.tm .Ti 0 \\n% "\\$*"
..
.rn Ss2 Ss2-toc
.de Ss2
-.Ss2-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 1 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss2-toc \\$@
+.tm .Ti 1 \\n% "\\$*"
..
.\}
.de Te
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.556 src/distrib/notes/common/main:1.557
--- src/distrib/notes/common/main:1.556 Mon Nov 25 15:40:18 2019
+++ src/distrib/notes/common/main Wed Nov 27 09:29:25 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.556 2019/11/25 15:40:18 pgoyette Exp $
+.\" $NetBSD: main,v 1.557 2019/11/27 09:29:25 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -145,8 +145,7 @@ on an FTP site near you, usually located
directory.
Check the list of
.Nx
-mirrors at
-.Lk https://www.NetBSD.org/mirrors
+.Lk https://www.NetBSD.org/mirrors mirrors
for details.
.Pp
Option 2: bootable CD-ROM images from
@@ -275,12 +274,10 @@ replacing
.Pa /dev/rsd0d
with the appropriate device for your system:
.Dl # Ic "dd if=NetBSD-\*V-\*M-install.img of=/dev/rsd0d bs=32k"
-On Windows, you will need to use a program such as Win32 Disk Imager,
-which can be found at
-.Lk http://sourceforge.net/projects/win32diskimager/
+On Windows, you will need to use a program such as
+.Lk http://sourceforge.net/projects/win32diskimager/ "Win32 Disk Imager" ,
or
-Rawrite32 which can be found at
-.Lk https://www.NetBSD.org/~martin/rawrite32 .
+.Lk https://www.NetBSD.org/~martin/rawrite32 Rawrite32 .
.if \n[amd64]:\n[i386] \{\
If you have problems writing a raw image to a floppy,
the
CVS commit: src/distrib/notes
Module Name:src Committed By: martin Date: Wed Nov 27 09:29:26 UTC 2019 Modified Files: src/distrib/notes: Makefile.inc src/distrib/notes/common: macros main netboot postinstall sysinst src/distrib/notes/sparc: prep src/distrib/notes/sparc64: prep Log Message: More cleanup: - simplify TOC handling and remove arg limit (from uwe) - use Lk with explicit anchor text in some places - do not allow official release builds when we can not derive the proper date from the buildid To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/distrib/notes/Makefile.inc cvs rdiff -u -r1.43 -r1.44 src/distrib/notes/common/macros cvs rdiff -u -r1.556 -r1.557 src/distrib/notes/common/main cvs rdiff -u -r1.37 -r1.38 src/distrib/notes/common/netboot cvs rdiff -u -r1.85 -r1.86 src/distrib/notes/common/postinstall cvs rdiff -u -r1.109 -r1.110 src/distrib/notes/common/sysinst cvs rdiff -u -r1.28 -r1.29 src/distrib/notes/sparc/prep cvs rdiff -u -r1.15 -r1.16 src/distrib/notes/sparc64/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: msaitoh
Date: Wed Nov 27 10:19:21 UTC 2019
Modified Files:
src/sys/arch/arm/amlogic: gxlphy.c
src/sys/dev/mii: acphy.c amhphy.c atphy.c bmtphy.c brgphy.c ciphy.c
dmphy.c etphy.c exphy.c gentbi.c glxtphy.c gphyter.c icsphy.c
igphy.c ihphy.c ikphy.c inphy.c iophy.c ipgphy.c jmphy.c lxtphy.c
makphy.c micphy.c mii_physubr.c mvphy.c nsphy.c nsphyter.c pnaphy.c
qsphy.c rdcphy.c rgephy.c rlphy.c smscphy.c sqphy.c tlphy.c tqphy.c
ukphy.c urlphy.c
Log Message:
- Simplify sc->mii_anegticks setting. Same as FreeBSD.
Don't set the default value not in the attach function. Instead, set the
default value (MII_ANEGTICKS) first in the beginning of the
mii_phy_add_media(). The function already has the code to change the value to
MII_ANEGTICKS_GIGE if it's gigabit capable.
- Remove extra pmf_device_register() call. It's done in mii_phy_add_media().
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/gxlphy.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/acphy.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/mii/amhphy.c src/sys/dev/mii/pnaphy.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/mii/bmtphy.c src/sys/dev/mii/gphyter.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/ciphy.c src/sys/dev/mii/rlphy.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/dmphy.c src/sys/dev/mii/nsphyter.c \
src/sys/dev/mii/tqphy.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/mii/etphy.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/mii/exphy.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/mii/gentbi.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/glxtphy.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/mii/icsphy.c src/sys/dev/mii/sqphy.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/mii/igphy.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mii/ikphy.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/inphy.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mii/iophy.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/ipgphy.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/jmphy.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/mii/lxtphy.c src/sys/dev/mii/qsphy.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/mii/micphy.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mii/mvphy.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/mii/nsphy.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/rdcphy.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/smscphy.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/mii/tlphy.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/mii/ukphy.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/mii/urlphy.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/arm/amlogic/gxlphy.c
diff -u src/sys/arch/arm/amlogic/gxlphy.c:1.1 src/sys/arch/arm/amlogic/gxlphy.c:1.2
--- src/sys/arch/arm/amlogic/gxlphy.c:1.1 Sun Apr 21 11:02:32 2019
+++ src/sys/arch/arm/amlogic/gxlphy.c Wed Nov 27 10:19:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gxlphy.c,v 1.1 2019/04/21 11:02:32 jmcneill Exp $ */
+/* $NetBSD: gxlphy.c,v 1.2 2019/11/27 10:19:21 msaitoh Exp $ */
/*
* Copyright (c) 2019 Jared McNeill
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gxlphy.c,v 1.1 2019/04/21 11:02:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxlphy.c,v 1.2 2019/11/27 10:19:21 msaitoh Exp $");
#include
#include
@@ -168,7 +168,6 @@ gxlphyattach(device_t parent, device_t s
sc->mii_funcs = _funcs;
sc->mii_pdata = mii;
sc->mii_flags = ma->mii_flags;
- sc->mii_anegticks = MII_ANEGTICKS;
PHY_RESET(sc);
@@ -180,13 +179,8 @@ gxlphyattach(device_t parent, device_t s
sc->mii_capabilities &= ma->mii_capmask;
if (sc->mii_capabilities & BMSR_EXTSTAT)
PHY_READ(sc, MII_EXTSR, >mii_extcapabilities);
- aprint_normal_dev(self, "");
- if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0 &&
- (sc->mii_extcapabilities & EXTSR_MEDIAMASK) == 0)
- aprint_error("no media present");
- else
- mii_phy_add_media(sc);
- aprint_normal("\n");
+
+ mii_phy_add_media(sc);
}
static int
Index: src/sys/dev/mii/acphy.c
diff -u src/sys/dev/mii/acphy.c:1.28 src/sys/dev/mii/acphy.c:1.29
--- src/sys/dev/mii/acphy.c:1.28 Mon Mar 25 09:20:46 2019
+++ src/sys/dev/mii/acphy.c Wed Nov 27 10:19:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acphy.c,v 1.28 2019/03/25 09:20:46 msaitoh Exp $ */
+/* $NetBSD: acphy.c,v 1.29 2019/11/27 10:19:20 msaitoh Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.28 2019/03/25 09:20:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.29 2019/11/27 10:19:20 msaitoh Exp $");
#include
#include
@@ -110,7 +110,6 @@ acphyattach(device_t parent,
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Wed Nov 27 10:19:21 UTC 2019 Modified Files: src/sys/arch/arm/amlogic: gxlphy.c src/sys/dev/mii: acphy.c amhphy.c atphy.c bmtphy.c brgphy.c ciphy.c dmphy.c etphy.c exphy.c gentbi.c glxtphy.c gphyter.c icsphy.c igphy.c ihphy.c ikphy.c inphy.c iophy.c ipgphy.c jmphy.c lxtphy.c makphy.c micphy.c mii_physubr.c mvphy.c nsphy.c nsphyter.c pnaphy.c qsphy.c rdcphy.c rgephy.c rlphy.c smscphy.c sqphy.c tlphy.c tqphy.c ukphy.c urlphy.c Log Message: - Simplify sc->mii_anegticks setting. Same as FreeBSD. Don't set the default value not in the attach function. Instead, set the default value (MII_ANEGTICKS) first in the beginning of the mii_phy_add_media(). The function already has the code to change the value to MII_ANEGTICKS_GIGE if it's gigabit capable. - Remove extra pmf_device_register() call. It's done in mii_phy_add_media(). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/gxlphy.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/acphy.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/mii/amhphy.c src/sys/dev/mii/pnaphy.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/mii/atphy.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/mii/bmtphy.c src/sys/dev/mii/gphyter.c cvs rdiff -u -r1.85 -r1.86 src/sys/dev/mii/brgphy.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/mii/ciphy.c src/sys/dev/mii/rlphy.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/dmphy.c src/sys/dev/mii/nsphyter.c \ src/sys/dev/mii/tqphy.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/mii/etphy.c cvs rdiff -u -r1.56 -r1.57 src/sys/dev/mii/exphy.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/mii/gentbi.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/glxtphy.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/mii/icsphy.c src/sys/dev/mii/sqphy.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/mii/igphy.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mii/ihphy.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mii/ikphy.c cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/inphy.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mii/iophy.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/mii/ipgphy.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/jmphy.c cvs rdiff -u -r1.53 -r1.54 src/sys/dev/mii/lxtphy.c src/sys/dev/mii/qsphy.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mii/makphy.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/mii/micphy.c cvs rdiff -u -r1.88 -r1.89 src/sys/dev/mii/mii_physubr.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mii/mvphy.c cvs rdiff -u -r1.64 -r1.65 src/sys/dev/mii/nsphy.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/rdcphy.c cvs rdiff -u -r1.57 -r1.58 src/sys/dev/mii/rgephy.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/smscphy.c cvs rdiff -u -r1.66 -r1.67 src/sys/dev/mii/tlphy.c cvs rdiff -u -r1.51 -r1.52 src/sys/dev/mii/ukphy.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/mii/urlphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
