CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Tue Jan 8 07:46:11 UTC 2019
Modified Files:
src/sys/arch/macppc/include: autoconf.h
src/sys/arch/ofppc/include: autoconf.h
src/sys/arch/powerpc/include: types.h
src/sys/arch/powerpc/powerpc: openfirm.c
src/sys/dev/ofw: openfirmio.c
Log Message:
workaround a problem with the pegasos firmware interface:
attempting to use /dev/openfirm on this machine hangs hard.
this isn't a new problem, and i've been meaning to try to
figure it out for years, but it's become a problem since
the xf86-video-radeon driver gained code to look for the
macppc model using this interface.
this is why xorg-server 1.18 and 1.20 hang recently on the
pegasosII.
this change is fairly ugly but i couldn't think of a less
ugly method to avoid /dev/openfirm working just on this
one platform. introduce new __OPENFIRMIO_OPEN_CHECK_BROKEN
macro and associated __openfirmio_open_check_broken(), and
use them in the new openfirmopen() to fail opens.
include proplib.h in macppc and ofppc autoconf.h since they
use it.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/include/autoconf.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ofppc/include/autoconf.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/powerpc/openfirm.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ofw/openfirmio.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/macppc/include/autoconf.h
diff -u src/sys/arch/macppc/include/autoconf.h:1.18 src/sys/arch/macppc/include/autoconf.h:1.19
--- src/sys/arch/macppc/include/autoconf.h:1.18 Fri Jul 1 21:02:15 2011
+++ src/sys/arch/macppc/include/autoconf.h Tue Jan 8 07:46:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.18 2011/07/01 21:02:15 dyoung Exp $ */
+/* $NetBSD: autoconf.h,v 1.19 2019/01/08 07:46:10 mrg Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -34,7 +34,9 @@
#ifndef _MACHINE_AUTOCONF_H_
#define _MACHINE_AUTOCONF_H_
-#include /* for bus_space_tag_t */
+#include
+
+#include
struct confargs {
const char *ca_name;
Index: src/sys/arch/ofppc/include/autoconf.h
diff -u src/sys/arch/ofppc/include/autoconf.h:1.15 src/sys/arch/ofppc/include/autoconf.h:1.16
--- src/sys/arch/ofppc/include/autoconf.h:1.15 Fri Jul 1 21:02:15 2011
+++ src/sys/arch/ofppc/include/autoconf.h Tue Jan 8 07:46:10 2019
@@ -1,10 +1,12 @@
-/* $NetBSD: autoconf.h,v 1.15 2011/07/01 21:02:15 dyoung Exp $ */
+/* $NetBSD: autoconf.h,v 1.16 2019/01/08 07:46:10 mrg Exp $ */
#ifndef _OFPPC_AUTOCONF_H_
#define _OFPPC_AUTOCONF_H_
#include
+#include
+
struct confargs {
const char *ca_name;
u_int ca_node;
Index: src/sys/arch/powerpc/include/types.h
diff -u src/sys/arch/powerpc/include/types.h:1.56 src/sys/arch/powerpc/include/types.h:1.57
--- src/sys/arch/powerpc/include/types.h:1.56 Fri Jan 27 17:22:39 2017
+++ src/sys/arch/powerpc/include/types.h Tue Jan 8 07:46:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.56 2017/01/27 17:22:39 christos Exp $ */
+/* $NetBSD: types.h,v 1.57 2019/01/08 07:46:11 mrg Exp $ */
/*-
* Copyright (C) 1995 Wolfgang Solfrank.
@@ -87,6 +87,8 @@ typedef __uint32_t tlb_asid_t; /* for b
#define __HAVE___LWP_GETTCB_FAST
#define __HAVE___LWP_SETTCB
#define __HAVE_TLS_VARIANT_I
+#define __OPENFIRMIO_OPEN_CHECK_BROKEN
+int __openfirmio_open_check_broken(void);
#if defined(_KERNEL) || defined(_KMEMUSER)
#define PCU_FPU 0 /* FPU */
Index: src/sys/arch/powerpc/powerpc/openfirm.c
diff -u src/sys/arch/powerpc/powerpc/openfirm.c:1.26 src/sys/arch/powerpc/powerpc/openfirm.c:1.27
--- src/sys/arch/powerpc/powerpc/openfirm.c:1.26 Mon Sep 3 16:29:26 2018
+++ src/sys/arch/powerpc/powerpc/openfirm.c Tue Jan 8 07:46:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.c,v 1.26 2018/09/03 16:29:26 riastradh Exp $ */
+/* $NetBSD: openfirm.c,v 1.27 2019/01/08 07:46:11 mrg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.26 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.27 2019/01/08 07:46:11 mrg Exp $");
#include
#include
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: openfirm.c,v
#include
#include
+#include
#include
@@ -757,3 +758,11 @@ ofbcopy(const void *src, void *dst, size
while (len-- > 0)
*dp++ = *sp++;
}
+
+#ifdef __OPENFIRMIO_OPEN_CHECK_BROKEN
+int
+__openfirmio_open_check_broken(void)
+{
+ return strncmp(model_name, "Pegasos", 7) == 0 ? ENXIO : 0;
+}
+#endif
Index: src/sys/dev/ofw/openfirmio.c
diff -u src/sys/dev/ofw/openfirmio.c:1.13 src/sys/dev/ofw/openfirmio.c:1.14
--- src/sys/dev/ofw/openfirmio.c:1.13 Fri Jul 25 08:10:37 2014
+++ src/sys/dev/ofw/openfirmio.c Tue Jan 8 07:46:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD:
CVS commit: src/lib/libnvmm
Module Name:src
Committed By: maxv
Date: Tue Jan 8 07:34:22 UTC 2019
Modified Files:
src/lib/libnvmm: libnvmm_x86.c
Log Message:
Handle REPN. FreeBSD has a "repn movs", which is a bit unusual, but doesn't
seem illegal as far as I can tell from the AMD SDM.
With that, I can boot FreeBSD on Qemu+NVMM.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libnvmm/libnvmm_x86.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnvmm/libnvmm_x86.c
diff -u src/lib/libnvmm/libnvmm_x86.c:1.13 src/lib/libnvmm/libnvmm_x86.c:1.14
--- src/lib/libnvmm/libnvmm_x86.c:1.13 Mon Jan 7 18:13:34 2019
+++ src/lib/libnvmm/libnvmm_x86.c Tue Jan 8 07:34:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libnvmm_x86.c,v 1.13 2019/01/07 18:13:34 maxv Exp $ */
+/* $NetBSD: libnvmm_x86.c,v 1.14 2019/01/08 07:34:22 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -2902,11 +2902,6 @@ nvmm_assist_mem(struct nvmm_machine *mac
return -1;
}
- if (__predict_false(instr.legpref.repn)) {
- errno = ENODEV;
- return -1;
- }
-
if (instr.opcode->movs) {
ret = assist_mem_double(mach, , );
} else {
@@ -2917,10 +2912,14 @@ nvmm_assist_mem(struct nvmm_machine *mac
return -1;
}
- if (instr.legpref.rep) {
+ if (instr.legpref.rep || instr.legpref.repn) {
cnt = rep_dec_apply(, instr.address_size);
if (cnt == 0) {
state.gprs[NVMM_X64_GPR_RIP] += instr.len;
+ } else if (__predict_false(instr.legpref.repn)) {
+ if (state.gprs[NVMM_X64_GPR_RFLAGS] & PSL_Z) {
+state.gprs[NVMM_X64_GPR_RIP] += instr.len;
+ }
}
} else {
state.gprs[NVMM_X64_GPR_RIP] += instr.len;
CVS commit: src/sys/dev/nvmm
Module Name:src
Committed By: maxv
Date: Tue Jan 8 07:29:46 UTC 2019
Modified Files:
src/sys/dev/nvmm: nvmm_ioctl.h
Log Message:
_IOWR -> _IOW
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/nvmm/nvmm_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/nvmm_ioctl.h
diff -u src/sys/dev/nvmm/nvmm_ioctl.h:1.2 src/sys/dev/nvmm/nvmm_ioctl.h:1.3
--- src/sys/dev/nvmm/nvmm_ioctl.h:1.2 Sat Dec 15 13:39:43 2018
+++ src/sys/dev/nvmm/nvmm_ioctl.h Tue Jan 8 07:29:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_ioctl.h,v 1.2 2018/12/15 13:39:43 maxv Exp $ */
+/* $NetBSD: nvmm_ioctl.h,v 1.3 2019/01/08 07:29:46 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -126,7 +126,7 @@ struct nvmm_ioc_gpa_unmap {
#define NVMM_IOC_VCPU_DESTROY _IOW ('N', 5, struct nvmm_ioc_vcpu_destroy)
#define NVMM_IOC_VCPU_SETSTATE _IOW ('N', 6, struct nvmm_ioc_vcpu_setstate)
#define NVMM_IOC_VCPU_GETSTATE _IOW ('N', 7, struct nvmm_ioc_vcpu_getstate)
-#define NVMM_IOC_VCPU_INJECT _IOWR('N', 8, struct nvmm_ioc_vcpu_inject)
+#define NVMM_IOC_VCPU_INJECT _IOW ('N', 8, struct nvmm_ioc_vcpu_inject)
#define NVMM_IOC_VCPU_RUN _IOWR('N', 9, struct nvmm_ioc_vcpu_run)
#define NVMM_IOC_GPA_MAP _IOW ('N', 10, struct nvmm_ioc_gpa_map)
#define NVMM_IOC_GPA_UNMAP _IOW ('N', 11, struct nvmm_ioc_gpa_unmap)
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: mrg
Date: Tue Jan 8 07:18:18 UTC 2019
Modified Files:
src/sys/dev/raidframe: rf_driver.c rf_netbsdkintf.c rf_raid.h
Log Message:
remove the final tsleep/wakeup pair in raidframe.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/dev/raidframe/rf_driver.c
cvs rdiff -u -r1.356 -r1.357 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/raidframe/rf_raid.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_driver.c
diff -u src/sys/dev/raidframe/rf_driver.c:1.133 src/sys/dev/raidframe/rf_driver.c:1.134
--- src/sys/dev/raidframe/rf_driver.c:1.133 Sat Dec 10 23:03:27 2016
+++ src/sys/dev/raidframe/rf_driver.c Tue Jan 8 07:18:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.133 2016/12/10 23:03:27 maya Exp $ */
+/* $NetBSD: rf_driver.c,v 1.134 2019/01/08 07:18:18 mrg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.133 2016/12/10 23:03:27 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.134 2019/01/08 07:18:18 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_raid_diagnostic.h"
@@ -227,15 +227,14 @@ rf_Shutdown(RF_Raid_t *raidPtr)
while (raidPtr->nAccOutstanding) {
rf_wait_cond2(raidPtr->outstandingCond, raidPtr->rad_lock);
}
- rf_unlock_mutex2(raidPtr->rad_lock);
/* Wait for any parity re-writes to stop... */
while (raidPtr->parity_rewrite_in_progress) {
printf("raid%d: Waiting for parity re-write to exit...\n",
raidPtr->raidid);
- tsleep(>parity_rewrite_in_progress, PRIBIO,
- "rfprwshutdown", 0);
+ rf_wait_cond2(raidPtr->parity_rewrite_cv, raidPtr->rad_lock);
}
+ rf_unlock_mutex2(raidPtr->rad_lock);
/* Wait for any reconstruction to stop... */
rf_lock_mutex2(raidPtr->mutex);
@@ -918,6 +917,7 @@ rf_alloc_mutex_cond(RF_Raid_t *raidPtr)
rf_init_mutex2(raidPtr->mutex, IPL_VM);
rf_init_cond2(raidPtr->outstandingCond, "rfocond");
+ rf_init_cond2(raidPtr->parity_rewrite_cv, "rfprwshutdown");
rf_init_mutex2(raidPtr->rad_lock, IPL_VM);
rf_init_mutex2(raidPtr->access_suspend_mutex, IPL_VM);
@@ -938,6 +938,7 @@ rf_destroy_mutex_cond(RF_Raid_t *raidPtr
rf_destroy_mutex2(raidPtr->access_suspend_mutex);
rf_destroy_cond2(raidPtr->access_suspend_cv);
+ rf_destroy_cond2(raidPtr->parity_rewrite_cv);
rf_destroy_cond2(raidPtr->outstandingCond);
rf_destroy_mutex2(raidPtr->rad_lock);
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.356 src/sys/dev/raidframe/rf_netbsdkintf.c:1.357
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.356 Tue Jan 23 22:42:29 2018
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Tue Jan 8 07:18:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.356 2018/01/23 22:42:29 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.357 2019/01/08 07:18:18 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356 2018/01/23 22:42:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.357 2019/01/08 07:18:18 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2683,7 +2683,9 @@ rf_RewriteParityThread(RF_Raid_t *raidPt
/* Anyone waiting for us to stop? If so, inform them... */
if (raidPtr->waitShutdown) {
- wakeup(>parity_rewrite_in_progress);
+ rf_lock_mutex2(raidPtr->rad_lock);
+ cv_broadcast(>parity_rewrite_cv);
+ rf_unlock_mutex2(raidPtr->rad_lock);
}
/* That's all... */
Index: src/sys/dev/raidframe/rf_raid.h
diff -u src/sys/dev/raidframe/rf_raid.h:1.45 src/sys/dev/raidframe/rf_raid.h:1.46
--- src/sys/dev/raidframe/rf_raid.h:1.45 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/raidframe/rf_raid.h Tue Jan 8 07:18:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid.h,v 1.45 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: rf_raid.h,v 1.46 2019/01/08 07:18:18 mrg Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -214,6 +214,7 @@ struct RF_Raid_s {
int copyback_in_progress;
int adding_hot_spare;
+ rf_declare_cond2(parity_rewrite_cv);
rf_declare_cond2(adding_hot_spare_cv);
/*
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Jan 8 06:55:50 UTC 2019
Modified Files:
src/sys/dev/pci: if_bnx.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/if_bnx.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_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.65 src/sys/dev/pci/if_bnx.c:1.66
--- src/sys/dev/pci/if_bnx.c:1.65 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_bnx.c Tue Jan 8 06:55:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.65 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_bnx.c,v 1.66 2019/01/08 06:55:50 msaitoh Exp $ */
/* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.65 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.66 2019/01/08 06:55:50 msaitoh Exp $");
/*
* The following controllers are supported by this driver:
@@ -354,8 +354,7 @@ void bnx_release_resources(struct bnx_so
/* BNX Firmware Synchronization and Load*/
//
int bnx_fw_sync(struct bnx_softc *, uint32_t);
-void bnx_load_rv2p_fw(struct bnx_softc *, uint32_t *, uint32_t,
- uint32_t);
+void bnx_load_rv2p_fw(struct bnx_softc *, uint32_t *, uint32_t, uint32_t);
void bnx_load_cpu_fw(struct bnx_softc *, struct cpu_reg *,
struct fw_info *);
void bnx_init_cpus(struct bnx_softc *);
@@ -463,7 +462,7 @@ bnx_print_adapter_info(struct bnx_softc
BNXNUM(sc), 'A' + BNXREV(sc), BNXMETAL(sc),
(BNX_CHIP_BOND_ID(sc) == BNX_CHIP_BOND_ID_SERDES_BIT)
? "Serdes " : "", sc->bnx_chipid);
-
+
/* Bus info. */
if (sc->bnx_flags & BNX_PCIE_FLAG) {
aprint_normal_dev(sc->bnx_dev, "PCIe x%d ",
@@ -1110,8 +1109,8 @@ bnx_miibus_write_reg(device_t dev, int p
/* Make sure we are accessing the correct PHY address. */
if (phy != sc->bnx_phy_addr) {
- DBPRINT(sc, BNX_WARN, "Invalid PHY address %d for PHY write!\n",
- phy);
+ DBPRINT(sc, BNX_WARN,
+ "Invalid PHY address %d for PHY write!\n", phy);
return;
}
@@ -3262,9 +3261,8 @@ bnx_init_context(struct bnx_softc *sc)
uint32_t vcid_addr, offset;
/*
- * For the 5706/5708, context memory is local to
- * the controller, so initialize the controller
- * context memory.
+ * For the 5706/5708, context memory is local to the
+ * controller, so initialize the controller context memory.
*/
vcid_addr = GET_CID_ADDR(96);
@@ -3275,9 +3273,9 @@ bnx_init_context(struct bnx_softc *sc)
REG_WR(sc, BNX_CTX_VIRT_ADDR, 0);
REG_WR(sc, BNX_CTX_PAGE_TBL, vcid_addr);
- for(offset = 0; offset < BNX_PHY_CTX_SIZE; offset += 4) {
+ for (offset = 0; offset < BNX_PHY_CTX_SIZE;
+ offset += 4)
CTX_WR(sc, 0x00, offset, 0);
- }
REG_WR(sc, BNX_CTX_VIRT_ADDR, vcid_addr);
REG_WR(sc, BNX_CTX_PAGE_TBL, vcid_addr);
@@ -4450,10 +4448,10 @@ bnx_rx_intr(struct bnx_softc *sc)
}
#endif
- /* DRC - ToDo: If the received packet is small, say less
- * than 128 bytes, allocate a new mbuf here,
- * copy the data to that mbuf, and recycle
- * the mapped jumbo frame.
+ /* DRC - ToDo: If the received packet is small, say
+ * less than 128 bytes, allocate a new mbuf
+ * here, copy the data to that mbuf, and
+ * recycle the mapped jumbo frame.
*/
/* Unmap the mbuf from DMA space. */
@@ -4585,10 +4583,8 @@ bnx_rx_intr(struct bnx_softc *sc)
/* Check for an IP datagram. */
if (status & L2_FHDR_STATUS_IP_DATAGRAM) {
/* Check if the IP checksum is valid. */
-if ((l2fhdr->l2_fhdr_ip_xsum ^ 0x)
-== 0)
- m->m_pkthdr.csum_flags |=
- M_CSUM_IPv4;
+if ((l2fhdr->l2_fhdr_ip_xsum ^ 0x) == 0)
+ m->m_pkthdr.csum_flags |= M_CSUM_IPv4;
#ifdef BNX_DEBUG
else
DBPRINT(sc, BNX_WARN_SEND,
@@ -4872,8 +4868,7 @@ bnx_init(struct ifnet *ifp)
}
- DBPRINT(sc, BNX_INFO, "%s(): setting MRU = %d\n",
- __func__, ether_mtu);
+ DBPRINT(sc, BNX_INFO, "%s(): setting MRU = %d\n", __func__, ether_mtu);
/*
* Program the MRU and enable Jumbo frame
@@ -4989,9 +4984,9 @@ bnx_tx_encap(struct bnx_softc *sc, struc
}
bus_dmamap_sync(sc->bnx_dmatag, map, 0, map->dm_mapsize,
BUS_DMASYNC_PREWRITE);
-/* Make sure there's room in the chain */
+ /* Make sure there's room in the chain */
if (map->dm_nsegs > (sc->max_tx_bd - sc->used_tx_bd))
-goto nospace;
+ goto nospace;
/* prod points to an empty tx_bd at this point. */
prod_bseq = sc->tx_prod_bseq;
@@ -5147,9 +5142,9 @@ bnx_start(struct ifnet *ifp)
tx_chain_prod =
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Jan 8 06:29:36 UTC 2019
Modified Files:
src/sys/dev/pci: if_msk.c
Log Message:
KNF. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/if_msk.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_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.82 src/sys/dev/pci/if_msk.c:1.83
--- src/sys/dev/pci/if_msk.c:1.82 Thu Dec 27 08:13:50 2018
+++ src/sys/dev/pci/if_msk.c Tue Jan 8 06:29:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.82 2018/12/27 08:13:50 mrg Exp $ */
+/* $NetBSD: if_msk.c,v 1.83 2019/01/08 06:29:35 msaitoh Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.82 2018/12/27 08:13:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.83 2019/01/08 06:29:35 msaitoh Exp $");
#include
#include
@@ -105,9 +105,9 @@ void msk_reset(struct sk_if_softc *);
int mskcprint(void *, const char *);
int msk_intr(void *);
void msk_intr_yukon(struct sk_if_softc *);
-void msk_rxeof(struct sk_if_softc *, u_int16_t, u_int32_t);
+void msk_rxeof(struct sk_if_softc *, uint16_t, uint32_t);
void msk_txeof(struct sk_if_softc *);
-int msk_encap(struct sk_if_softc *, struct mbuf *, u_int32_t *);
+int msk_encap(struct sk_if_softc *, struct mbuf *, uint32_t *);
void msk_start(struct ifnet *);
int msk_ioctl(struct ifnet *, u_long, void *);
int msk_init(struct ifnet *);
@@ -202,38 +202,38 @@ static const struct msk_product {
{ 0,0 }
};
-static inline u_int32_t
-sk_win_read_4(struct sk_softc *sc, u_int32_t reg)
+static inline uint32_t
+sk_win_read_4(struct sk_softc *sc, uint32_t reg)
{
return CSR_READ_4(sc, reg);
}
-static inline u_int16_t
-sk_win_read_2(struct sk_softc *sc, u_int32_t reg)
+static inline uint16_t
+sk_win_read_2(struct sk_softc *sc, uint32_t reg)
{
return CSR_READ_2(sc, reg);
}
-static inline u_int8_t
-sk_win_read_1(struct sk_softc *sc, u_int32_t reg)
+static inline uint8_t
+sk_win_read_1(struct sk_softc *sc, uint32_t reg)
{
return CSR_READ_1(sc, reg);
}
static inline void
-sk_win_write_4(struct sk_softc *sc, u_int32_t reg, u_int32_t x)
+sk_win_write_4(struct sk_softc *sc, uint32_t reg, uint32_t x)
{
CSR_WRITE_4(sc, reg, x);
}
static inline void
-sk_win_write_2(struct sk_softc *sc, u_int32_t reg, u_int16_t x)
+sk_win_write_2(struct sk_softc *sc, uint32_t reg, uint16_t x)
{
CSR_WRITE_2(sc, reg, x);
}
static inline void
-sk_win_write_1(struct sk_softc *sc, u_int32_t reg, u_int8_t x)
+sk_win_write_1(struct sk_softc *sc, uint32_t reg, uint8_t x)
{
CSR_WRITE_1(sc, reg, x);
}
@@ -242,7 +242,7 @@ int
msk_miibus_readreg(device_t dev, int phy, int reg)
{
struct sk_if_softc *sc_if = device_private(dev);
- u_int16_t val;
+ uint16_t val;
int i;
SK_YU_WRITE_2(sc_if, YUKON_SMICR, YU_SMICR_PHYAD(phy) |
@@ -341,12 +341,12 @@ void
msk_setmulti(struct sk_if_softc *sc_if)
{
struct ifnet *ifp= _if->sk_ethercom.ec_if;
- u_int32_t hashes[2] = { 0, 0 };
+ uint32_t hashes[2] = { 0, 0 };
int h;
struct ethercom *ec = _if->sk_ethercom;
struct ether_multi *enm;
struct ether_multistep step;
- u_int16_t reg;
+ uint16_t reg;
/* First, zot all the existing filters. */
SK_YU_WRITE_2(sc_if, YUKON_MCAH1, 0);
@@ -551,7 +551,8 @@ msk_newbuf(struct sk_if_softc *sc_if, bu
sc_if->sk_cdata.sk_rx_cnt++;
DPRINTFN(10, ("%s: rx ADDR64: %#x\n",
- sc_if->sk_ethercom.ec_if.if_xname, (unsigned)MSK_ADDR_HI(addr)));
+ sc_if->sk_ethercom.ec_if.if_xname,
+ (unsigned)MSK_ADDR_HI(addr)));
}
c = _if->sk_cdata.sk_rx_chain[sc_if->sk_cdata.sk_rx_prod];
@@ -620,7 +621,8 @@ msk_alloc_jumbo_mem(struct sk_if_softc *
state = 4;
sc_if->sk_cdata.sk_jumbo_buf = (void *)kva;
- DPRINTFN(1,("msk_jumbo_buf = %p\n", (void *)sc_if->sk_cdata.sk_jumbo_buf));
+ DPRINTFN(1,("msk_jumbo_buf = %p\n",
+ (void *)sc_if->sk_cdata.sk_jumbo_buf));
LIST_INIT(_if->sk_jfree_listhead);
LIST_INIT(_if->sk_jinuse_listhead);
@@ -800,7 +802,7 @@ msk_ioctl(struct ifnet *ifp, u_long cmd,
void
msk_update_int_mod(struct sk_softc *sc, int verbose)
{
- u_int32_t imtimer_ticks;
+ uint32_t imtimer_ticks;
/*
* Configure interrupt moderation. The moderation timer
@@ -875,7 +877,7 @@ mskc_probe(device_t parent, cfdata_t mat
void
mskc_reset(struct sk_softc *sc)
{
- u_int32_t imtimer_ticks, reg1;
+ uint32_t imtimer_ticks, reg1;
int reg;
DPRINTFN(2, ("mskc_reset\n"));
@@ -1030,7 +1032,8 @@ mskc_reset(struct sk_softc *sc)
if (sc->sk_type == SK_YUKON_EC &&
sc->sk_rev == SK_YUKON_EC_REV_A1) {
/* WA for dev. #4.3 */
- sk_win_write_2(sc, SK_STAT_BMU_TX_THRESH, SK_STAT_BMU_TXTHIDX_MSK);
+ sk_win_write_2(sc, SK_STAT_BMU_TX_THRESH,
+ SK_STAT_BMU_TXTHIDX_MSK);
/* WA for dev. #4.18 */
sk_win_write_1(sc, SK_STAT_BMU_FIFOWM, 0x21);
CVS commit: src/doc
Module Name:src Committed By: kamil Date: Tue Jan 8 06:34:23 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Import compiler-rt r350590 LLVM sanitizers To generate a diff of this commit: cvs rdiff -u -r1.2487 -r1.2488 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/CHANGES diff -u src/doc/CHANGES:1.2487 src/doc/CHANGES:1.2488 --- src/doc/CHANGES:1.2487 Mon Jan 7 23:06:40 2019 +++ src/doc/CHANGES Tue Jan 8 06:34:23 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2487 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2488 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -292,3 +292,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: tmux(1): Imported 2.8. [christos 20190104] TrouSerS: Import trousers-0.3.14 [christos 20190107] tpm-tools: Import tpm-tools-1.3.9.1 [christos 20190107] + compiler-rt: Import compiler-rt r350590 LLVM sanitizers [kamil 20190108]
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Tue Jan 8 06:04:29 UTC 2019 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: remove reference to deleted -r option. fixes PR#53840 from J. Lewis Muir. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/libexec/httpd/bozohttpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.76 src/libexec/httpd/bozohttpd.8:1.77 --- src/libexec/httpd/bozohttpd.8:1.76 Wed Dec 19 12:40:32 2018 +++ src/libexec/httpd/bozohttpd.8 Tue Jan 8 06:04:29 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: bozohttpd.8,v 1.76 2018/12/19 12:40:32 mrg Exp $ +.\" $NetBSD: bozohttpd.8,v 1.77 2019/01/08 06:04:29 mrg Exp $ .\" .\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\" @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 18, 2018 +.Dd January 7, 2019 .Dt BOZOHTTPD 8 .Os .Sh NAME @@ -477,9 +477,7 @@ if a .Pa .bzdirect file is found (contents are irrelevant) .Nm -will allow direct access even with the -.Fl r -option. +will allow direct access. If a .Pa .bzredirect symbolic link is found,
CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core
Module Name:src
Committed By: mrg
Date: Tue Jan 8 05:57:34 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core:
nouveau_nvkm_core_option.c
Log Message:
revert this commit:
>date: 2018-08-27 07:19:47 -0700; author: riastradh; state: Exp; lines: +2
>-0; commitid: 9o7sY7hwNGx6zLPA;
>For now, unconditionally set nouveau verbosity to debug.
nouveau works mostly again now, and the debug output is very verbose.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.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/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c:1.3 Mon Aug 27 14:19:47 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/core/nouveau_nvkm_core_option.c Tue Jan 8 05:57:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_core_option.c,v 1.3 2018/08/27 14:19:47 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_core_option.c,v 1.4 2019/01/08 05:57:34 mrg Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_option.c,v 1.3 2018/08/27 14:19:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_core_option.c,v 1.4 2019/01/08 05:57:34 mrg Exp $");
#include
#include
@@ -101,8 +101,6 @@ nvkm_dbgopt(const char *optstr, const ch
{
int mode = 1, level = CONFIG_NOUVEAU_DEBUG_DEFAULT;
- return NV_DBG_DEBUG;
-
while (optstr) {
int len = strcspn(optstr, ",=");
switch (optstr[len]) {
CVS commit: src/sys/external/bsd/compiler_rt/dist/lib/lsan
Module Name:src
Committed By: kamil
Date: Tue Jan 8 05:44:58 UTC 2019
Added Files:
src/sys/external/bsd/compiler_rt/dist/lib/lsan: lsan.cc lsan.h
lsan_allocator.cc lsan_allocator.h lsan_common.cc lsan_common.h
lsan_common_linux.cc lsan_interceptors.cc lsan_thread.cc
lsan_thread.h
Log Message:
merge new version
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan.cc \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan.h \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_allocator.cc \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_allocator.h \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_common.cc \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_common.h \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_common_linux.cc \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_interceptors.cc \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_thread.cc \
src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan_thread.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan.cc
diff -u /dev/null src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan.cc:1.3
--- /dev/null Tue Jan 8 05:44:58 2019
+++ src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan.cc Tue Jan 8 05:44:58 2019
@@ -0,0 +1,118 @@
+//=-- lsan.cc -===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===--===//
+//
+// This file is a part of LeakSanitizer.
+// Standalone LSan RTL.
+//
+//===--===//
+
+#include "lsan.h"
+
+#include "sanitizer_common/sanitizer_flags.h"
+#include "sanitizer_common/sanitizer_flag_parser.h"
+#include "sanitizer_common/sanitizer_stacktrace.h"
+#include "lsan_allocator.h"
+#include "lsan_common.h"
+#include "lsan_thread.h"
+
+bool lsan_inited;
+bool lsan_init_is_running;
+
+namespace __lsan {
+
+/ Interface to the common LSan module. /
+bool WordIsPoisoned(uptr addr) {
+ return false;
+}
+
+} // namespace __lsan
+
+using namespace __lsan; // NOLINT
+
+static void InitializeFlags() {
+ // Set all the default values.
+ SetCommonFlagsDefaults();
+ {
+CommonFlags cf;
+cf.CopyFrom(*common_flags());
+cf.external_symbolizer_path = GetEnv("LSAN_SYMBOLIZER_PATH");
+cf.malloc_context_size = 30;
+cf.intercept_tls_get_addr = true;
+cf.detect_leaks = true;
+cf.exitcode = 23;
+OverrideCommonFlags(cf);
+ }
+
+ Flags *f = flags();
+ f->SetDefaults();
+
+ FlagParser parser;
+ RegisterLsanFlags(, f);
+ RegisterCommonFlags();
+
+ // Override from user-specified string.
+ const char *lsan_default_options = MaybeCallLsanDefaultOptions();
+ parser.ParseString(lsan_default_options);
+ parser.ParseString(GetEnv("LSAN_OPTIONS"));
+
+ SetVerbosity(common_flags()->verbosity);
+
+ if (Verbosity()) ReportUnrecognizedFlags();
+
+ if (common_flags()->help) parser.PrintFlagDescriptions();
+
+ __sanitizer_set_report_path(common_flags()->log_path);
+}
+
+static void OnStackUnwind(const SignalContext , const void *,
+ BufferedStackTrace *stack) {
+ GetStackTrace(stack, kStackTraceMax, sig.pc, sig.bp, sig.context,
+common_flags()->fast_unwind_on_fatal);
+}
+
+static void LsanOnDeadlySignal(int signo, void *siginfo, void *context) {
+ HandleDeadlySignal(siginfo, context, GetCurrentThread(), ,
+ nullptr);
+}
+
+extern "C" void __lsan_init() {
+ CHECK(!lsan_init_is_running);
+ if (lsan_inited)
+return;
+ lsan_init_is_running = true;
+ SanitizerToolName = "LeakSanitizer";
+ CacheBinaryName();
+ AvoidCVE_2016_2143();
+ InitializeFlags();
+ InitCommonLsan();
+ InitializeAllocator();
+ ReplaceSystemMalloc();
+ InitTlsSize();
+ InitializeInterceptors();
+ InitializeThreadRegistry();
+ InstallDeadlySignalHandlers(LsanOnDeadlySignal);
+ u32 tid = ThreadCreate(0, 0, true);
+ CHECK_EQ(tid, 0);
+ ThreadStart(tid, GetTid());
+ SetCurrentThread(tid);
+
+ if (common_flags()->detect_leaks && common_flags()->leak_check_at_exit)
+Atexit(DoLeakCheck);
+
+ InitializeCoverage(common_flags()->coverage, common_flags()->coverage_dir);
+
+ lsan_inited = true;
+ lsan_init_is_running = false;
+}
+
+extern "C" SANITIZER_INTERFACE_ATTRIBUTE
+void __sanitizer_print_stack_trace() {
+ GET_STACK_TRACE_FATAL;
+ stack.Print();
+}
Index: src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan.h
diff -u /dev/null src/sys/external/bsd/compiler_rt/dist/lib/lsan/lsan.h:1.3
--- /dev/null Tue Jan 8 05:44:58 2019
+++
CVS import: src/sys/external/bsd/compiler_rt/dist
Module Name:src Committed By: kamil Date: Tue Jan 8 05:40:59 UTC 2019 Update of /cvsroot/src/sys/external/bsd/compiler_rt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29706 Log Message: Import compiler-rt r350590. LLVM sanitizers on top of unmodified files from compiler-rt-259194. Status: Vendor Tag: LLVM Release Tags: compiler-rt-350590 U src/sys/external/bsd/compiler_rt/dist/CODE_OWNERS.TXT U src/sys/external/bsd/compiler_rt/dist/CREDITS.TXT U src/sys/external/bsd/compiler_rt/dist/LICENSE.TXT U src/sys/external/bsd/compiler_rt/dist/README.txt U src/sys/external/bsd/compiler_rt/dist/lib/builtins/README.txt U src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/absvti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/adddf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addtf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/addvti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashldi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashlti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ashrti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/assembly.h U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic_flag_clear.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic_flag_clear_explicit.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic_flag_test_and_set.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic_flag_test_and_set_explicit.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic_signal_fence.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/atomic_thread_fence.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clear_cache.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/clzti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/cmpdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/cmpti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/comparedf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/comparesf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/comparetf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzsi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ctzti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divdi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divmoddi4.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divmodsi4.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divsi3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divtc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divtf3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divti3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/divxc3.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/emutls.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/enable_execute_stack.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/eprintf.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/extenddftf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/extendhfsf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/extendsfdf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/extendsftf2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsdi2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/ffsti2.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixdfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixsfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixtfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixtfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixtfti.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsdfdi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsdfsi.c U src/sys/external/bsd/compiler_rt/dist/lib/builtins/fixunsdfti.c U
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Jan 8 04:18:50 UTC 2019
Modified Files:
src/sys/dev/pci: if_sk.c
Log Message:
Whitespace fix. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/pci/if_sk.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_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.91 src/sys/dev/pci/if_sk.c:1.92
--- src/sys/dev/pci/if_sk.c:1.91 Tue Jan 8 04:13:27 2019
+++ src/sys/dev/pci/if_sk.c Tue Jan 8 04:18:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.91 2019/01/08 04:13:27 msaitoh Exp $ */
+/* $NetBSD: if_sk.c,v 1.92 2019/01/08 04:18:50 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
* SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
* the SK-984x series adapters, both single port and dual port.
* References:
- * The XaQti XMAC II datasheet,
+ * The XaQti XMAC II datasheet,
* http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
* The SysKonnect GEnesis manual, http://www.syskonnect.com
*
@@ -115,7 +115,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.91 2019/01/08 04:13:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.92 2019/01/08 04:18:50 msaitoh Exp $");
#include
#include
@@ -494,7 +494,7 @@ sk_marv_miibus_readreg(device_t dev, int
return 0;
}
-SK_YU_WRITE_2(sc_if, YUKON_SMICR, YU_SMICR_PHYAD(phy) |
+ SK_YU_WRITE_2(sc_if, YUKON_SMICR, YU_SMICR_PHYAD(phy) |
YU_SMICR_REGAD(reg) | YU_SMICR_OP_READ);
for (i = 0; i < SK_TIMEOUT; i++) {
@@ -509,10 +509,10 @@ sk_marv_miibus_readreg(device_t dev, int
return 0;
}
- DPRINTFN(9, ("sk_marv_miibus_readreg: i=%d, timeout=%d\n", i,
+ DPRINTFN(9, ("sk_marv_miibus_readreg: i=%d, timeout=%d\n", i,
SK_TIMEOUT));
-val = SK_YU_READ_2(sc_if, YUKON_SMIDR);
+ val = SK_YU_READ_2(sc_if, YUKON_SMIDR);
DPRINTFN(9, ("sk_marv_miibus_readreg phy=%d, reg=%#x, val=%#x\n",
phy, reg, val));
@@ -632,7 +632,7 @@ allmulti:
goto allmulti;
}
DPRINTFN(2,("multicast address %s\n",
- ether_sprintf(enm->enm_addrlo)));
+ether_sprintf(enm->enm_addrlo)));
/*
* Program the first XM_RXFILT_MAX multicast groups
* into the perfect filter. For all others,
@@ -784,7 +784,7 @@ sk_newbuf(struct sk_if_softc *sc_if, int
} else {
/*
- * We're re-using a previously allocated mbuf;
+ * We're re-using a previously allocated mbuf;
* be sure to re-init pointers and lengths to
* default values.
*/
@@ -818,7 +818,7 @@ sk_alloc_jumbo_mem(struct sk_if_softc *s
char *ptr, *kva;
bus_dma_segment_t seg;
int i, rseg, state, error;
- struct sk_jpool_entry *entry;
+ struct sk_jpool_entry *entry;
state = error = 0;
@@ -915,7 +915,7 @@ out:
void *
sk_jalloc(struct sk_if_softc *sc_if)
{
- struct sk_jpool_entry *entry;
+ struct sk_jpool_entry *entry;
mutex_enter(_if->sk_jpool_mtx);
entry = LIST_FIRST(_if->sk_jfree_listhead);
@@ -1024,7 +1024,7 @@ sk_ioctl(struct ifnet *ifp, u_long comma
switch (command) {
case SIOCSIFFLAGS:
- DPRINTFN(2, ("sk_ioctl IFFLAGS\n"));
+ DPRINTFN(2, ("sk_ioctl IFFLAGS\n"));
if ((error = ifioctl_common(ifp, command, data)) != 0)
break;
switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) {
@@ -1047,7 +1047,7 @@ sk_ioctl(struct ifnet *ifp, u_long comma
break;
default:
- DPRINTFN(2, ("sk_ioctl ETHER\n"));
+ DPRINTFN(2, ("sk_ioctl ETHER\n"));
if ((error = ether_ioctl(ifp, command, data)) != ENETRESET)
break;
@@ -1072,7 +1072,7 @@ sk_update_int_mod(struct sk_softc *sc)
uint32_t imtimer_ticks;
/*
- * Configure interrupt moderation. The moderation timer
+ * Configure interrupt moderation. The moderation timer
* defers interrupts specified in the interrupt moderation
* timer mask based on the timeout specified in the interrupt
* moderation timer init register. Each bit in the timer
@@ -1092,10 +1092,10 @@ sk_update_int_mod(struct sk_softc *sc)
}
aprint_verbose_dev(sc->sk_dev, "interrupt moderation is %d us\n",
sc->sk_int_mod);
-sk_win_write_4(sc, SK_IMTIMERINIT, SK_IM_USECS(sc->sk_int_mod));
-sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF|SK_ISR_TX2_S_EOF|
+ sk_win_write_4(sc, SK_IMTIMERINIT, SK_IM_USECS(sc->sk_int_mod));
+ sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF|SK_ISR_TX2_S_EOF|
SK_ISR_RX1_EOF|SK_ISR_RX2_EOF);
-sk_win_write_1(sc, SK_IMTIMERCTL, SK_IMCTL_START);
+ sk_win_write_1(sc, SK_IMTIMERCTL, SK_IMCTL_START);
sc->sk_int_mod_pending = 0;
}
@@ -1255,7 +1255,7 @@ sk_attach(device_t parent, device_t self
* Set up RAM buffer addresses. The NIC will have a certain
* amount of SRAM on it, somewhere between 512K and 2MB. We
* need to divide this up a) between the transmitter and
- * receiver and b) between the
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Jan 8 04:13:27 UTC 2019
Modified Files:
src/sys/dev/pci: if_sk.c
Log Message:
u_int{8,16,32,64}_t -> uint{8,16,32,64}_t. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pci/if_sk.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_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.90 src/sys/dev/pci/if_sk.c:1.91
--- src/sys/dev/pci/if_sk.c:1.90 Thu Nov 15 10:56:29 2018
+++ src/sys/dev/pci/if_sk.c Tue Jan 8 04:13:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.90 2018/11/15 10:56:29 maxv Exp $ */
+/* $NetBSD: if_sk.c,v 1.91 2019/01/08 04:13:27 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.90 2018/11/15 10:56:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.91 2019/01/08 04:13:27 msaitoh Exp $");
#include
#include
@@ -164,7 +164,7 @@ void sk_intr_xmac(struct sk_if_softc *);
void sk_intr_yukon(struct sk_if_softc *);
void sk_rxeof(struct sk_if_softc *);
void sk_txeof(struct sk_if_softc *);
-int sk_encap(struct sk_if_softc *, struct mbuf *, u_int32_t *);
+int sk_encap(struct sk_if_softc *, struct mbuf *, uint32_t *);
void sk_start(struct ifnet *);
int sk_ioctl(struct ifnet *, u_long, void *);
int sk_init(struct ifnet *);
@@ -182,7 +182,7 @@ void *sk_jalloc(struct sk_if_softc *);
void sk_jfree(struct mbuf *, void *, size_t, void *);
int sk_init_rx_ring(struct sk_if_softc *);
int sk_init_tx_ring(struct sk_if_softc *);
-u_int8_t sk_vpd_readbyte(struct sk_softc *, int);
+uint8_t sk_vpd_readbyte(struct sk_softc *, int);
void sk_vpd_read_res(struct sk_softc *,
struct vpd_res *, int);
void sk_vpd_read(struct sk_softc *);
@@ -197,8 +197,8 @@ int sk_marv_miibus_readreg(device_t, int
void sk_marv_miibus_writereg(device_t, int, int, int);
void sk_marv_miibus_statchg(struct ifnet *);
-u_int32_t sk_xmac_hash(void *);
-u_int32_t sk_yukon_hash(void *);
+uint32_t sk_xmac_hash(void *);
+uint32_t sk_yukon_hash(void *);
void sk_setfilt(struct sk_if_softc *, void *, int);
void sk_setmulti(struct sk_if_softc *);
void sk_tick(void *);
@@ -243,8 +243,8 @@ static const struct sk_product {
#define SK_LINKSYS_EG1032_SUBID 0x00151737
-static inline u_int32_t
-sk_win_read_4(struct sk_softc *sc, u_int32_t reg)
+static inline uint32_t
+sk_win_read_4(struct sk_softc *sc, uint32_t reg)
{
#ifdef SK_USEIOSPACE
CSR_WRITE_4(sc, SK_RAP, SK_WIN(reg));
@@ -254,8 +254,8 @@ sk_win_read_4(struct sk_softc *sc, u_int
#endif
}
-static inline u_int16_t
-sk_win_read_2(struct sk_softc *sc, u_int32_t reg)
+static inline uint16_t
+sk_win_read_2(struct sk_softc *sc, uint32_t reg)
{
#ifdef SK_USEIOSPACE
CSR_WRITE_4(sc, SK_RAP, SK_WIN(reg));
@@ -265,8 +265,8 @@ sk_win_read_2(struct sk_softc *sc, u_int
#endif
}
-static inline u_int8_t
-sk_win_read_1(struct sk_softc *sc, u_int32_t reg)
+static inline uint8_t
+sk_win_read_1(struct sk_softc *sc, uint32_t reg)
{
#ifdef SK_USEIOSPACE
CSR_WRITE_4(sc, SK_RAP, SK_WIN(reg));
@@ -277,7 +277,7 @@ sk_win_read_1(struct sk_softc *sc, u_int
}
static inline void
-sk_win_write_4(struct sk_softc *sc, u_int32_t reg, u_int32_t x)
+sk_win_write_4(struct sk_softc *sc, uint32_t reg, uint32_t x)
{
#ifdef SK_USEIOSPACE
CSR_WRITE_4(sc, SK_RAP, SK_WIN(reg));
@@ -288,7 +288,7 @@ sk_win_write_4(struct sk_softc *sc, u_in
}
static inline void
-sk_win_write_2(struct sk_softc *sc, u_int32_t reg, u_int16_t x)
+sk_win_write_2(struct sk_softc *sc, uint32_t reg, uint16_t x)
{
#ifdef SK_USEIOSPACE
CSR_WRITE_4(sc, SK_RAP, SK_WIN(reg));
@@ -299,7 +299,7 @@ sk_win_write_2(struct sk_softc *sc, u_in
}
static inline void
-sk_win_write_1(struct sk_softc *sc, u_int32_t reg, u_int8_t x)
+sk_win_write_1(struct sk_softc *sc, uint32_t reg, uint8_t x)
{
#ifdef SK_USEIOSPACE
CSR_WRITE_4(sc, SK_RAP, SK_WIN(reg));
@@ -320,7 +320,7 @@ sk_win_write_1(struct sk_softc *sc, u_in
* the controller softc structure for later use. At the moment,
* we only use the ID string during sk_attach().
*/
-u_int8_t
+uint8_t
sk_vpd_readbyte(struct sk_softc *sc, int addr)
{
int i;
@@ -343,9 +343,9 @@ void
sk_vpd_read_res(struct sk_softc *sc, struct vpd_res *res, int addr)
{
int i;
- u_int8_t *ptr;
+ uint8_t *ptr;
- ptr = (u_int8_t *)res;
+ ptr = (uint8_t *)res;
for (i = 0; i < sizeof(struct vpd_res); i++)
ptr[i] = sk_vpd_readbyte(sc, i + addr);
}
@@ -483,7 +483,7 @@ int
sk_marv_miibus_readreg(device_t dev, int phy, int reg)
{
struct sk_if_softc *sc_if = device_private(dev);
- u_int16_t val;
+ uint16_t val;
int i;
if (phy != 0 ||
@@ -552,10 +552,10 @@ sk_marv_miibus_statchg(struct ifnet *ifp
YUKON_GPCR)));
}
-u_int32_t
+uint32_t
sk_xmac_hash(void *addr)
{
- u_int32_t crc;
+ uint32_t crc;
crc =
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Tue Jan 8 03:14:51 UTC 2019
Modified Files:
src/sys/dev/mii: brgphy.c igphy.c makphy.c mii_physubr.c mii_verbose.c
Log Message:
Whitespace fixes. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mii/igphy.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mii/mii_verbose.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/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.76 src/sys/dev/mii/brgphy.c:1.77
--- src/sys/dev/mii/brgphy.c:1.76 Wed Jul 2 22:35:10 2014
+++ src/sys/dev/mii/brgphy.c Tue Jan 8 03:14:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.76 2014/07/02 22:35:10 msaitoh Exp $ */
+/* $NetBSD: brgphy.c,v 1.77 2019/01/08 03:14:51 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.76 2014/07/02 22:35:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.77 2019/01/08 03:14:51 msaitoh Exp $");
#include
#include
@@ -901,7 +901,7 @@ brgphy_reset(struct mii_softc *sc)
PHY_WRITE(sc, BRGPHY_MII_DSP_ADDR_REG,
0x000a);
-if (bsc->sc_phyflags
+if (bsc->sc_phyflags
& BGEPHYF_ADJUST_TRIM) {
PHY_WRITE(sc, BRGPHY_MII_DSP_RW_PORT,
0x110b);
@@ -933,8 +933,8 @@ brgphy_reset(struct mii_softc *sc)
#if 0
/* Enable Link LED on Dell boxes */
if (bsc->sc_phyflags & BGEPHYF_NO_3LED) {
-PHY_WRITE(sc, BRGPHY_MII_PHY_EXTCTL,
-PHY_READ(sc, BRGPHY_MII_PHY_EXTCTL)
+PHY_WRITE(sc, BRGPHY_MII_PHY_EXTCTL,
+PHY_READ(sc, BRGPHY_MII_PHY_EXTCTL)
& ~BRGPHY_PHY_EXTCTL_3_LED);
}
#endif
@@ -945,48 +945,48 @@ brgphy_reset(struct mii_softc *sc)
&& sc->mii_mpd_model == MII_MODEL_BROADCOM2_BCM5708S) {
/* Store autoneg capabilities/results in digital block (Page 0) */
PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR, BRGPHY_5708S_DIG3_PG2);
- PHY_WRITE(sc, BRGPHY_5708S_PG2_DIGCTL_3_0,
-BRGPHY_5708S_PG2_DIGCTL_3_0_USE_IEEE);
+ PHY_WRITE(sc, BRGPHY_5708S_PG2_DIGCTL_3_0,
+ BRGPHY_5708S_PG2_DIGCTL_3_0_USE_IEEE);
PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR, BRGPHY_5708S_DIG_PG0);
/* Enable fiber mode and autodetection */
- PHY_WRITE(sc, BRGPHY_5708S_PG0_1000X_CTL1,
-PHY_READ(sc, BRGPHY_5708S_PG0_1000X_CTL1) |
-BRGPHY_5708S_PG0_1000X_CTL1_AUTODET_EN |
-BRGPHY_5708S_PG0_1000X_CTL1_FIBER_MODE);
+ PHY_WRITE(sc, BRGPHY_5708S_PG0_1000X_CTL1,
+ PHY_READ(sc, BRGPHY_5708S_PG0_1000X_CTL1) |
+ BRGPHY_5708S_PG0_1000X_CTL1_AUTODET_EN |
+ BRGPHY_5708S_PG0_1000X_CTL1_FIBER_MODE);
/* Enable parallel detection */
- PHY_WRITE(sc, BRGPHY_5708S_PG0_1000X_CTL2,
-PHY_READ(sc, BRGPHY_5708S_PG0_1000X_CTL2) |
-BRGPHY_5708S_PG0_1000X_CTL2_PAR_DET_EN);
+ PHY_WRITE(sc, BRGPHY_5708S_PG0_1000X_CTL2,
+ PHY_READ(sc, BRGPHY_5708S_PG0_1000X_CTL2) |
+ BRGPHY_5708S_PG0_1000X_CTL2_PAR_DET_EN);
/* Advertise 2.5G support through next page during autoneg */
if (bsc->sc_phyflags & BNX_PHY_2_5G_CAPABLE_FLAG)
-PHY_WRITE(sc, BRGPHY_5708S_ANEG_NXT_PG_XMIT1,
- PHY_READ(sc, BRGPHY_5708S_ANEG_NXT_PG_XMIT1) |
- BRGPHY_5708S_ANEG_NXT_PG_XMIT1_25G);
+PHY_WRITE(sc, BRGPHY_5708S_ANEG_NXT_PG_XMIT1,
+PHY_READ(sc, BRGPHY_5708S_ANEG_NXT_PG_XMIT1) |
+BRGPHY_5708S_ANEG_NXT_PG_XMIT1_25G);
/* Increase TX signal amplitude */
if ((_BNX_CHIP_ID(bsc->sc_chipid) == BNX_CHIP_ID_5708_A0) ||
(_BNX_CHIP_ID(bsc->sc_chipid) == BNX_CHIP_ID_5708_B0) ||
(_BNX_CHIP_ID(bsc->sc_chipid) == BNX_CHIP_ID_5708_B1)) {
-PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
- BRGPHY_5708S_TX_MISC_PG5);
-PHY_WRITE(sc, BRGPHY_5708S_PG5_TXACTL1,
- PHY_READ(sc, BRGPHY_5708S_PG5_TXACTL1) &
+PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
+BRGPHY_5708S_TX_MISC_PG5);
+PHY_WRITE(sc, BRGPHY_5708S_PG5_TXACTL1,
+PHY_READ(sc, BRGPHY_5708S_PG5_TXACTL1) &
~BRGPHY_5708S_PG5_TXACTL1_VCM);
-PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
- BRGPHY_5708S_DIG_PG0);
+PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
+BRGPHY_5708S_DIG_PG0);
}
/* Backplanes use special driver/pre-driver/pre-emphasis values. */
if ((bsc->sc_shared_hwcfg & BNX_SHARED_HW_CFG_PHY_BACKPLANE) &&
(bsc->sc_port_hwcfg & BNX_PORT_HW_CFG_CFG_TXCTL3_MASK)) {
- PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
- BRGPHY_5708S_TX_MISC_PG5);
- PHY_WRITE(sc, BRGPHY_5708S_PG5_TXACTL3,
- bsc->sc_port_hwcfg &
- BNX_PORT_HW_CFG_CFG_TXCTL3_MASK);
+ PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
+ BRGPHY_5708S_TX_MISC_PG5);
+ PHY_WRITE(sc, BRGPHY_5708S_PG5_TXACTL3,
+
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Tue Jan 8 03:03:50 UTC 2019
Modified Files:
src/sys/dev/mii: mii_bitbang.c miivar.h
Log Message:
s/u_int32_t/uint32_t/
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/mii/mii_bitbang.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/mii/miivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/mii_bitbang.c
diff -u src/sys/dev/mii/mii_bitbang.c:1.12 src/sys/dev/mii/mii_bitbang.c:1.13
--- src/sys/dev/mii/mii_bitbang.c:1.12 Sun May 4 17:06:09 2008
+++ src/sys/dev/mii/mii_bitbang.c Tue Jan 8 03:03:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_bitbang.c,v 1.12 2008/05/04 17:06:09 xtraeme Exp $ */
+/* $NetBSD: mii_bitbang.c,v 1.13 2019/01/08 03:03:50 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mii_bitbang.c,v 1.12 2008/05/04 17:06:09 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_bitbang.c,v 1.13 2019/01/08 03:03:50 msaitoh Exp $");
#include
#include
@@ -66,7 +66,7 @@ static void
mii_bitbang_sync(device_t sc, mii_bitbang_ops_t ops)
{
int i;
- u_int32_t v;
+ uint32_t v;
v = MDIRPHY | MDO;
@@ -87,7 +87,7 @@ mii_bitbang_sendbits(device_t sc, mii_bi
int nbits)
{
int i;
- u_int32_t v;
+ uint32_t v;
v = MDIRPHY;
WRITE(v);
Index: src/sys/dev/mii/miivar.h
diff -u src/sys/dev/mii/miivar.h:1.62 src/sys/dev/mii/miivar.h:1.63
--- src/sys/dev/mii/miivar.h:1.62 Wed May 28 09:49:55 2014
+++ src/sys/dev/mii/miivar.h Tue Jan 8 03:03:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: miivar.h,v 1.62 2014/05/28 09:49:55 msaitoh Exp $ */
+/* $NetBSD: miivar.h,v 1.63 2019/01/08 03:03:50 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -182,8 +182,8 @@ typedef struct mii_attach_args mii_attac
* Used to match a PHY.
*/
struct mii_phydesc {
- u_int32_t mpd_oui; /* the PHY's OUI */
- u_int32_t mpd_model; /* the PHY's model */
+ uint32_t mpd_oui; /* the PHY's OUI */
+ uint32_t mpd_model; /* the PHY's model */
const char *mpd_name; /* the PHY's name */
};
CVS commit: src/usr.sbin/veriexecgen
Module Name:src Committed By: gutteridge Date: Tue Jan 8 01:31:49 UTC 2019 Modified Files: src/usr.sbin/veriexecgen: veriexecgen.8 Log Message: veriexecgen(8): improve example for appending /etc to the signatures database. From Edgar Pettijohn in PR misc/53839. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/veriexecgen/veriexecgen.8 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/veriexecgen/veriexecgen.8 diff -u src/usr.sbin/veriexecgen/veriexecgen.8:1.19 src/usr.sbin/veriexecgen/veriexecgen.8:1.20 --- src/usr.sbin/veriexecgen/veriexecgen.8:1.19 Sun Sep 10 10:13:47 2017 +++ src/usr.sbin/veriexecgen/veriexecgen.8 Tue Jan 8 01:31:49 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: veriexecgen.8,v 1.19 2017/09/10 10:13:47 wiz Exp $ +.\" $NetBSD: veriexecgen.8,v 1.20 2019/01/08 01:31:49 gutteridge Exp $ .\" .\" Copyright (c) 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 9, 2017 +.Dd January 8, 2019 .Dt VERIEXECGEN 8 .Os .Sh NAME @@ -139,7 +139,7 @@ Fingerprint files in .Pa /etc , appending to the default fingerprint database: .Bd -literal -offset indent -# veriexecgen -A -d /etc +# veriexecgen -A -a -d /etc .Ed .Pp Fingerprint files in
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: gutteridge Date: Tue Jan 8 01:19:16 UTC 2019 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: npf.conf(5): add a minor clarification about table types that can't accept masks on IP addresses. Prompted by Rob Hunter in PR bin/51900. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/usr.sbin/npf/npfctl/npf.conf.5 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/npf/npfctl/npf.conf.5 diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.79 src/usr.sbin/npf/npfctl/npf.conf.5:1.80 --- src/usr.sbin/npf/npfctl/npf.conf.5:1.79 Fri Sep 21 10:59:11 2018 +++ src/usr.sbin/npf/npfctl/npf.conf.5 Tue Jan 8 01:19:16 2019 @@ -1,4 +1,4 @@ -.\"$NetBSD: npf.conf.5,v 1.79 2018/09/21 10:59:11 uwe Exp $ +.\"$NetBSD: npf.conf.5,v 1.80 2019/01/08 01:19:16 gutteridge Exp $ .\" .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 21, 2018 +.Dd January 8, 2019 .Dt NPF.CONF 5 .Os .Sh NAME @@ -102,7 +102,7 @@ Tables of type .Dq hash and .Dq cdb -can only contain IP addresses. +can only contain IP addresses, without masks. Only static data can be used with a storage type of .Dq cdb . .Pp
CVS commit: src/tests/usr.bin/c++
Module Name:src
Committed By: christos
Date: Tue Jan 8 00:22:11 UTC 2019
Modified Files:
src/tests/usr.bin/c++: t_pthread_once.sh
Log Message:
This now works too.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/t_pthread_once.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/c++/t_pthread_once.sh
diff -u src/tests/usr.bin/c++/t_pthread_once.sh:1.1 src/tests/usr.bin/c++/t_pthread_once.sh:1.2
--- src/tests/usr.bin/c++/t_pthread_once.sh:1.1 Fri Mar 23 20:26:51 2018
+++ src/tests/usr.bin/c++/t_pthread_once.sh Mon Jan 7 19:22:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_pthread_once.sh,v 1.1 2018/03/24 00:26:51 kamil Exp $
+# $NetBSD: t_pthread_once.sh,v 1.2 2019/01/08 00:22:11 christos Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -100,7 +100,6 @@ EOF
}
pthread_once_profile_body() {
- atf_expect_fail "profiling option doesn't work now"
cat > test.cpp << EOF
#include
#include
@@ -115,7 +114,6 @@ EOF
}
pthread_once_profile_32_body() {
- atf_expect_fail "profiling option doesn't work now"
# check whether this arch is 64bit
if ! c++ -dM -E - < /dev/null | fgrep -q _LP64; then
atf_skip "this is not a 64 bit architecture"
@@ -139,7 +137,6 @@ int main(void) {
EOF
atf_check -s exit:0 -o ignore -e ignore c++ -m32 -pg -o pthread_once test.cpp -pthread
atf_check -s exit:0 -o inline:"hello, world!\n" ./pthread_once
- atf_expect_fail "The combination of 32-bit and profiling should be fail"
}
pthread_once_pic_body() {
@@ -205,7 +202,6 @@ EOF
}
pthread_once_pic_profile_body() {
- atf_expect_fail "profiling option doesn't work now"
cat > test.cpp << EOF
#include
int callpic(void);
@@ -231,7 +227,6 @@ EOF
}
pthread_once_pic_profile_32_body() {
- atf_expect_fail "profiling option doesn't work now"
# check whether this arch is 64bit
if ! c++ -dM -E - < /dev/null | fgrep -q _LP64; then
atf_skip "this is not a 64 bit architecture"
CVS commit: src/tests/usr.bin/c++
Module Name:src
Committed By: christos
Date: Tue Jan 8 00:21:19 UTC 2019
Modified Files:
src/tests/usr.bin/c++: t_call_once.sh
Log Message:
this now works...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/t_call_once.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/c++/t_call_once.sh
diff -u src/tests/usr.bin/c++/t_call_once.sh:1.1 src/tests/usr.bin/c++/t_call_once.sh:1.2
--- src/tests/usr.bin/c++/t_call_once.sh:1.1 Fri Mar 23 20:26:51 2018
+++ src/tests/usr.bin/c++/t_call_once.sh Mon Jan 7 19:21:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_call_once.sh,v 1.1 2018/03/24 00:26:51 kamil Exp $
+# $NetBSD: t_call_once.sh,v 1.2 2019/01/08 00:21:19 christos Exp $
#
# Copyright (c) 2018 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -101,7 +101,6 @@ EOF
}
call_once_profile_body() {
- atf_expect_fail "profiling option doesn't work now"
cat > test.cpp << EOF
#include
#include
@@ -117,7 +116,6 @@ EOF
}
call_once_profile_32_body() {
- atf_expect_fail "profiling option doesn't work now"
# check whether this arch is 64bit
if ! c++ -dM -E - < /dev/null | fgrep -q _LP64; then
atf_skip "this is not a 64 bit architecture"
@@ -142,7 +140,6 @@ int main(void) {
EOF
atf_check -s exit:0 -o ignore -e ignore c++ -m32 -pg -o call_once test.cpp -pthread
atf_check -s exit:0 -o inline:"hello, world!\n" ./call_once
- atf_expect_fail "The combination of 32-bit and profiling should be fail"
}
call_once_pic_body() {
@@ -210,7 +207,6 @@ EOF
}
call_once_pic_profile_body() {
- atf_expect_fail "profiling option doesn't work now"
cat > test.cpp << EOF
#include
int callpic(void);
@@ -237,7 +233,6 @@ EOF
}
call_once_pic_profile_32_body() {
- atf_expect_fail "profiling option doesn't work now"
# check whether this arch is 64bit
if ! c++ -dM -E - < /dev/null | fgrep -q _LP64; then
atf_skip "this is not a 64 bit architecture"
CVS commit: src/sys/arch/mvme68k/stand/wrtvid
Module Name:src Committed By: rin Date: Tue Jan 8 00:00:53 UTC 2019 Modified Files: src/sys/arch/mvme68k/stand/wrtvid: wrtvid.c Log Message: Include unistd.h for write(2) and close(2). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvme68k/stand/wrtvid/wrtvid.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/mvme68k/stand/wrtvid/wrtvid.c diff -u src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.8 src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.9 --- src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.8 Mon Apr 28 20:23:29 2008 +++ src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c Tue Jan 8 00:00:53 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wrtvid.c,v 1.8 2008/04/28 20:23:29 martin Exp $ */ +/* $NetBSD: wrtvid.c,v 1.9 2019/01/08 00:00:53 rin Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -35,6 +35,7 @@ #include #include #include +#include /* mvme68k's boot block is 512 bytes long */ #define SIZEOF_VID 0x200
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Mon Jan 7 23:06:40 UTC 2019 Modified Files: src/doc: CHANGES Log Message: cgdroot To generate a diff of this commit: cvs rdiff -u -r1.2486 -r1.2487 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/CHANGES diff -u src/doc/CHANGES:1.2486 src/doc/CHANGES:1.2487 --- src/doc/CHANGES:1.2486 Mon Jan 7 15:44:47 2019 +++ src/doc/CHANGES Mon Jan 7 23:06:40 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2486 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2487 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -276,6 +276,8 @@ Changes from NetBSD 8.0 to NetBSD 9.0: arm: Support kernel crash dumps on 64 bit platforms. [mrg 20181227] kernel: Remove M_ALIGN, MH_ALIGN, M_COPY_PKTHDR and M_MOVE_PKTHDR. [maxv 20181228] + cgdroot: Support mounting boot partition from a wedge labelled cgd.conf. + [alnsn 20181229] kernel: Remove COMPAT_IBCS2. [maxv 20181229] tzdata: Updated to 2018h. [kre 20181230] evbmips: Enable support for "per-priority cyclical scan" buffer queue
CVS commit: src/sys/uvm
Module Name:src
Committed By: jdolecek
Date: Mon Jan 7 22:48:01 UTC 2019
Modified Files:
src/sys/uvm: uvm_meter.c uvm_page.h
Log Message:
add sysctl to easily set ubc_direct
PR kern/53124
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/uvm/uvm_meter.c
cvs rdiff -u -r1.83 -r1.84 src/sys/uvm/uvm_page.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/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.68 src/sys/uvm/uvm_meter.c:1.69
--- src/sys/uvm/uvm_meter.c:1.68 Mon Sep 3 16:29:37 2018
+++ src/sys/uvm/uvm_meter.c Mon Jan 7 22:48:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.68 2018/09/03 16:29:37 riastradh Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.69 2019/01/07 22:48:01 jdolecek Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.68 2018/09/03 16:29:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.69 2019/01/07 22:48:01 jdolecek Exp $");
#include
#include
@@ -295,6 +295,14 @@ SYSCTL_SETUP(sysctl_vm_setup, "sysctl vm
SYSCTL_DESCR("Guard size of other threads"),
NULL, 0, _thread_stack_guard_size, 0,
CTL_VM, VM_THREAD_GUARD_SIZE, CTL_EOL);
+#ifdef PMAP_DIRECT
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+ CTLTYPE_BOOL, "ubc_direct",
+ SYSCTL_DESCR("Use direct map for UBC I/O"),
+ NULL, 0, _direct, 0,
+ CTL_VM, CTL_CREATE, CTL_EOL);
+#endif
uvmpdpol_sysctlsetup();
}
Index: src/sys/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.83 src/sys/uvm/uvm_page.h:1.84
--- src/sys/uvm/uvm_page.h:1.83 Sat May 19 15:03:26 2018
+++ src/sys/uvm/uvm_page.h Mon Jan 7 22:48:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.h,v 1.83 2018/05/19 15:03:26 jdolecek Exp $ */
+/* $NetBSD: uvm_page.h,v 1.84 2019/01/07 22:48:01 jdolecek Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -337,6 +337,7 @@ struct vm_page *uvm_phys_to_vm_page(padd
paddr_t uvm_vm_page_to_phys(const struct vm_page *);
#if defined(PMAP_DIRECT)
+extern bool ubc_direct;
int uvm_direct_process(struct vm_page **, u_int, voff_t, vsize_t,
int (*)(void *, size_t, void *), void *);
#endif
CVS commit: src/sys/dev
Module Name:src Committed By: jdolecek Date: Mon Jan 7 22:35:55 UTC 2019 Modified Files: src/sys/dev: dksubr.c Log Message: fix the disklabel sanity check coversion for case when both disklabel and disk geometry are > DEV_BSIZE, such as fictitious cd(4) disklabel still part of PR kern/53833 To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/dev/dksubr.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/dksubr.c diff -u src/sys/dev/dksubr.c:1.105 src/sys/dev/dksubr.c:1.106 --- src/sys/dev/dksubr.c:1.105 Mon Jan 7 21:04:35 2019 +++ src/sys/dev/dksubr.c Mon Jan 7 22:35:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dksubr.c,v 1.105 2019/01/07 21:04:35 jdolecek Exp $ */ +/* $NetBSD: dksubr.c,v 1.106 2019/01/07 22:35:55 jdolecek Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.105 2019/01/07 21:04:35 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.106 2019/01/07 22:35:55 jdolecek Exp $"); #include #include @@ -936,7 +936,7 @@ dk_getdisklabel(struct dk_softc *dksc, d lpratio = dgratio = 1; if (lp->d_secsize > DEV_BSIZE) lpratio = lp->d_secsize / DEV_BSIZE; - else if (dg->dg_secsize > DEV_BSIZE) + if (dg->dg_secsize > DEV_BSIZE) dgratio = dg->dg_secsize / DEV_BSIZE; /* Sanity check */
CVS commit: src/lib/libnvmm
Module Name:src Committed By: wiz Date: Mon Jan 7 22:17:02 UTC 2019 Modified Files: src/lib/libnvmm: libnvmm.3 Log Message: Remove leading zero from date. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libnvmm/libnvmm.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libnvmm/libnvmm.3 diff -u src/lib/libnvmm/libnvmm.3:1.8 src/lib/libnvmm/libnvmm.3:1.9 --- src/lib/libnvmm/libnvmm.3:1.8 Mon Jan 7 16:30:25 2019 +++ src/lib/libnvmm/libnvmm.3 Mon Jan 7 22:17:02 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: libnvmm.3,v 1.8 2019/01/07 16:30:25 maxv Exp $ +.\" $NetBSD: libnvmm.3,v 1.9 2019/01/07 22:17:02 wiz Exp $ .\" .\" Copyright (c) 2018 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 07, 2019 +.Dd January 7, 2019 .Dt LIBNVMM 3 .Os .Sh NAME
CVS commit: src/sys/sys
Module Name:src
Committed By: jdolecek
Date: Mon Jan 7 22:05:50 UTC 2019
Modified Files:
src/sys/sys: param.h
Log Message:
fix whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.576 -r1.577 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/sys/sys/param.h
diff -u src/sys/sys/param.h:1.576 src/sys/sys/param.h:1.577
--- src/sys/sys/param.h:1.576 Mon Jan 7 22:00:33 2019
+++ src/sys/sys/param.h Mon Jan 7 22:05:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.576 2019/01/07 22:00:33 jdolecek Exp $ */
+/* $NetBSD: param.h,v 1.577 2019/01/07 22:05:50 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -181,7 +181,7 @@
#endif
#ifndef MAXPHYS
-#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
+#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
#endif
/* pages ("clicks") to disk blocks */
CVS commit: src/sys
Module Name:src Committed By: jdolecek Date: Mon Jan 7 22:00:33 UTC 2019 Modified Files: src/sys/arch/aarch64/include: param.h src/sys/arch/algor/include: param.h src/sys/arch/alpha/include: param.h src/sys/arch/amd64/include: param.h src/sys/arch/arc/include: param.h src/sys/arch/arm/include: param.h src/sys/arch/cobalt/include: param.h src/sys/arch/emips/include: param.h src/sys/arch/evbmips/include: param.h src/sys/arch/ews4800mips/include: param.h src/sys/arch/hpcmips/include: param.h src/sys/arch/hppa/include: param.h src/sys/arch/i386/include: param.h src/sys/arch/ia64/include: param.h src/sys/arch/m68k/include: param.h src/sys/arch/mipsco/include: param.h src/sys/arch/newsmips/include: param.h src/sys/arch/or1k/include: param.h src/sys/arch/playstation2/include: param.h src/sys/arch/pmax/include: param.h src/sys/arch/powerpc/include: param.h src/sys/arch/riscv/include: param.h src/sys/arch/sbmips/include: param.h src/sys/arch/sgimips/include: param.h src/sys/arch/sh3/include: param.h src/sys/arch/sparc/include: param.h src/sys/arch/sparc64/include: param.h src/sys/arch/vax/include: param.h src/sys/sys: param.h Log Message: move DEV_BSIZE, DEV_BSHIFT out of MD param.h, they are same on all ports also move BLKDEV_IOSIZE, MAXPHYS, but allow override since some ports have different value (powerpc uses NBPG for BLKDEV_IOSIZE, sun2/sun3 have lower MAXPHYS) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/aarch64/include/param.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/algor/include/param.h cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/include/param.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amd64/include/param.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arc/include/param.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/include/param.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cobalt/include/param.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/emips/include/param.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/include/param.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/include/param.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcmips/include/param.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/include/param.h cvs rdiff -u -r1.83 -r1.84 src/sys/arch/i386/include/param.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/param.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/m68k/include/param.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mipsco/include/param.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/newsmips/include/param.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/param.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/playstation2/include/param.h cvs rdiff -u -r1.45 -r1.46 src/sys/arch/pmax/include/param.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/include/param.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/param.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sbmips/include/param.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sgimips/include/param.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sh3/include/param.h cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sparc/include/param.h cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sparc64/include/param.h cvs rdiff -u -r1.61 -r1.62 src/sys/arch/vax/include/param.h cvs rdiff -u -r1.575 -r1.576 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/sys/arch/aarch64/include/param.h diff -u src/sys/arch/aarch64/include/param.h:1.9 src/sys/arch/aarch64/include/param.h:1.10 --- src/sys/arch/aarch64/include/param.h:1.9 Fri Jan 4 21:39:38 2019 +++ src/sys/arch/aarch64/include/param.h Mon Jan 7 22:00:30 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.9 2019/01/04 21:39:38 rin Exp $ */ +/* $NetBSD: param.h,v 1.10 2019/01/07 22:00:30 jdolecek Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -89,14 +89,6 @@ #define ALIGN32(p) \ (((uintptr_t)(p) + ALIGNBYTES32) & ~ALIGNBYTES32) -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1 << DEV_BSHIFT) -#define BLKDEV_IOSIZE 2048 - -#ifndef MAXPHYS -#define MAXPHYS 65536 /* max I/O transfer size */ -#endif - #define NKMEMPAGES_MIN_DEFAULT ((128UL * 1024 * 1024) >> PAGE_SHIFT) #define NKMEMPAGES_MAX_UNLIMITED 1 Index: src/sys/arch/algor/include/param.h diff -u src/sys/arch/algor/include/param.h:1.11 src/sys/arch/algor/include/param.h:1.12 --- src/sys/arch/algor/include/param.h:1.11 Fri Mar 18 16:35:03 2011 +++ src/sys/arch/algor/include/param.h Mon Jan 7 22:00:30 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.11 2011/03/18 16:35:03 tsutsui Exp $ */ +/* $NetBSD: param.h,v 1.12 2019/01/07 22:00:30 jdolecek Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -50,11 +50,6 @@ #include -#define DEV_BSIZE 512 -#define DEV_BSHIFT
CVS commit: src/sys/dev
Module Name:src
Committed By: jdolecek
Date: Mon Jan 7 21:04:35 UTC 2019
Modified Files:
src/sys/dev: dksubr.c
Log Message:
convert the sector counts for label sanity checks to use same unit (DEV_BSIZE),
so that the check is meaningful if disklabel sector size and disk geometry
sector size differ - for example 512 disklabel vs 2048 for sparc cd(4)
conversion assumes that the sector sizes are multiples of DEV_BSIZE (512)
fixes kern/53833 by Andreas Gustafsson
Note: the checks are executed #ifdef DIAGNOSTIC, that's why nothing
is printed by 8.0 kernel, or anything built from release branches
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.104 src/sys/dev/dksubr.c:1.105
--- src/sys/dev/dksubr.c:1.104 Sat Nov 24 18:09:13 2018
+++ src/sys/dev/dksubr.c Mon Jan 7 21:04:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.104 2018/11/24 18:09:13 bouyer Exp $ */
+/* $NetBSD: dksubr.c,v 1.105 2019/01/07 21:04:35 jdolecek Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.104 2018/11/24 18:09:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.105 2019/01/07 21:04:35 jdolecek Exp $");
#include
#include
@@ -915,7 +915,7 @@ dk_getdisklabel(struct dk_softc *dksc, d
struct cpu_disklabel *clp = dksc->sc_dkdev.dk_cpulabel;
struct disk_geom *dg = >sc_dkdev.dk_geom;
struct partition *pp;
- int i;
+ int i, lpratio, dgratio;
const char *errstring;
memset(clp, 0x0, sizeof(*clp));
@@ -932,25 +932,37 @@ dk_getdisklabel(struct dk_softc *dksc, d
if ((dksc->sc_flags & DKF_LABELSANITY) == 0)
return;
+ /* Convert sector counts to multiple of DEV_BSIZE for comparison */
+ lpratio = dgratio = 1;
+ if (lp->d_secsize > DEV_BSIZE)
+ lpratio = lp->d_secsize / DEV_BSIZE;
+ else if (dg->dg_secsize > DEV_BSIZE)
+ dgratio = dg->dg_secsize / DEV_BSIZE;
+
/* Sanity check */
- if (lp->d_secperunit > dg->dg_secperunit)
- printf("WARNING: %s: total sector size in disklabel (%ju) "
- "!= the size of %s (%ju)\n", dksc->sc_xname,
- (uintmax_t)lp->d_secperunit, dksc->sc_xname,
- (uintmax_t)dg->dg_secperunit);
+ if ((uint64_t)lp->d_secperunit * lpratio > dg->dg_secperunit * dgratio)
+ printf("WARNING: %s: "
+ "total unit size in disklabel (%" PRIu64 ") "
+ "!= the size of %s (%" PRIu64 ")\n", dksc->sc_xname,
+ (uint64_t)lp->d_secperunit * lpratio, dksc->sc_xname,
+ dg->dg_secperunit * dgratio);
else if (lp->d_secperunit < UINT32_MAX &&
- lp->d_secperunit < dg->dg_secperunit)
- printf("%s: %ju trailing sectors not covered by disklabel\n",
- dksc->sc_xname,
- (uintmax_t)dg->dg_secperunit - lp->d_secperunit);
+ (uint64_t)lp->d_secperunit * lpratio < dg->dg_secperunit * dgratio)
+ printf("%s: %" PRIu64 " trailing sectors not covered"
+ " by disklabel\n", dksc->sc_xname,
+ (dg->dg_secperunit * dgratio)
+ - (lp->d_secperunit * lpratio));
for (i=0; i < lp->d_npartitions; i++) {
+ uint64_t pend;
+
pp = >d_partitions[i];
- if (pp->p_offset + pp->p_size > dg->dg_secperunit)
+ pend = pp->p_offset + pp->p_size;
+ if (pend * lpratio > dg->dg_secperunit * dgratio)
printf("WARNING: %s: end of partition `%c' exceeds "
- "the size of %s (%ju)\n", dksc->sc_xname,
+ "the size of %s (%" PRIu64 ")\n", dksc->sc_xname,
'a' + i, dksc->sc_xname,
- (uintmax_t)dg->dg_secperunit);
+ dg->dg_secperunit * dgratio);
}
}
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Mon Jan 7 18:48:08 UTC 2019
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Add Bluetooth related terms: ACL, LMP, LELL, SCO
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.222 src/share/misc/acronyms.comp:1.223
--- src/share/misc/acronyms.comp:1.222 Sun Dec 30 21:58:11 2018
+++ src/share/misc/acronyms.comp Mon Jan 7 18:48:07 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.222 2018/12/30 21:58:11 sevan Exp $
+$NetBSD: acronyms.comp,v 1.223 2019/01/07 18:48:07 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -14,6 +14,7 @@ ACK Amsterdam compiler kit
ACK acknowledgement
ACL access control list
ACL active current loop
+ACL asynchronous connection less
ACP auxiliary control {process,program}
ACPI advanced configuration and power interface
ACS access control set
@@ -742,6 +743,7 @@ LDR light-dependent resistor
LDT local descriptor table
LE logical extent
LED light emitting diode
+LELL low energy link layer
LER label edge router
LF line feed
LF low frequency
@@ -769,6 +771,7 @@ LLMNR link-local multicast name resoluti
LLVM Low Level Virtual Machine
LM long mode
LMM link management mode
+LMP link management protocol
LNO loop nest optimization
LOC lines of code
LOM lights-out management
@@ -1261,6 +1264,7 @@ SCI system control interrupt
SCM software configuration management
SCM source code management
SCM storage-class memory
+SCO synchronous connection orientated
SCP secure copy
SCSI Small Computer System Interface
SCTP Stream Control Transmission Protocol
CVS commit: src/lib/libnvmm
Module Name:src
Committed By: maxv
Date: Mon Jan 7 18:13:34 UTC 2019
Modified Files:
src/lib/libnvmm: libnvmm_x86.c
Log Message:
Optimize the legpref node: omit BRN (we don't care and it's the same as
OVR_CS), inline the loops, sort the checks from most to least likely
prefix, and use a compact structure.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libnvmm/libnvmm_x86.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnvmm/libnvmm_x86.c
diff -u src/lib/libnvmm/libnvmm_x86.c:1.12 src/lib/libnvmm/libnvmm_x86.c:1.13
--- src/lib/libnvmm/libnvmm_x86.c:1.12 Mon Jan 7 16:30:25 2019
+++ src/lib/libnvmm/libnvmm_x86.c Mon Jan 7 18:13:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libnvmm_x86.c,v 1.12 2019/01/07 16:30:25 maxv Exp $ */
+/* $NetBSD: libnvmm_x86.c,v 1.13 2019/01/07 18:13:34 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -824,26 +824,25 @@ static void x86_emul_stos(struct nvmm_me
static void x86_emul_lods(struct nvmm_mem *, void (*)(struct nvmm_mem *), uint64_t *);
static void x86_emul_movs(struct nvmm_mem *, void (*)(struct nvmm_mem *), uint64_t *);
-enum x86_legpref {
- /* Group 1 */
- LEG_LOCK = 0,
- LEG_REPN, /* REPNE/REPNZ */
- LEG_REP, /* REP/REPE/REPZ */
- /* Group 2 */
- LEG_OVR_CS,
- LEG_OVR_SS,
- LEG_OVR_DS,
- LEG_OVR_ES,
- LEG_OVR_FS,
- LEG_OVR_GS,
- LEG_BRN_TAKEN,
- LEG_BRN_NTAKEN,
- /* Group 3 */
- LEG_OPR_OVR,
- /* Group 4 */
- LEG_ADR_OVR,
-
- NLEG
+/* Legacy prefixes. */
+#define LEG_LOCK 0xF0
+#define LEG_REPN 0xF2
+#define LEG_REP 0xF3
+#define LEG_OVR_CS 0x2E
+#define LEG_OVR_SS 0x36
+#define LEG_OVR_DS 0x3E
+#define LEG_OVR_ES 0x26
+#define LEG_OVR_FS 0x64
+#define LEG_OVR_GS 0x65
+#define LEG_OPR_OVR 0x66
+#define LEG_ADR_OVR 0x67
+
+struct x86_legpref {
+ bool opr_ovr:1;
+ bool adr_ovr:1;
+ bool rep:1;
+ bool repn:1;
+ int seg;
};
struct x86_rexpref {
@@ -940,7 +939,7 @@ struct x86_store {
struct x86_instr {
size_t len;
- bool legpref[NLEG];
+ struct x86_legpref legpref;
struct x86_rexpref rexpref;
size_t operand_size;
size_t address_size;
@@ -2133,13 +2132,13 @@ get_operand_size(struct x86_decode_fsm *
opsize = 8;
} else {
if (!fsm->is16bit) {
- if (instr->legpref[LEG_OPR_OVR]) {
+ if (instr->legpref.opr_ovr) {
opsize = 2;
} else {
opsize = 4;
}
} else { /* 16bit */
- if (instr->legpref[LEG_OPR_OVR]) {
+ if (instr->legpref.opr_ovr) {
opsize = 4;
} else {
opsize = 2;
@@ -2159,21 +2158,21 @@ static size_t
get_address_size(struct x86_decode_fsm *fsm, struct x86_instr *instr)
{
if (fsm->is64bit) {
- if (__predict_false(instr->legpref[LEG_ADR_OVR])) {
+ if (__predict_false(instr->legpref.adr_ovr)) {
return 4;
}
return 8;
}
if (fsm->is32bit) {
- if (__predict_false(instr->legpref[LEG_ADR_OVR])) {
+ if (__predict_false(instr->legpref.adr_ovr)) {
return 2;
}
return 4;
}
/* 16bit. */
- if (__predict_false(instr->legpref[LEG_ADR_OVR])) {
+ if (__predict_false(instr->legpref.adr_ovr)) {
return 4;
}
return 2;
@@ -2344,51 +2343,44 @@ node_rex_prefix(struct x86_decode_fsm *f
return 0;
}
-static const struct {
- uint8_t byte;
- int seg;
-} legpref_table[NLEG] = {
- /* Group 1 */
- [LEG_LOCK] = { 0xF0, -1 },
- [LEG_REPN] = { 0xF2, -1 },
- [LEG_REP] = { 0xF3, -1 },
- /* Group 2 */
- [LEG_OVR_CS] = { 0x2E, NVMM_X64_SEG_CS },
- [LEG_OVR_SS] = { 0x36, NVMM_X64_SEG_SS },
- [LEG_OVR_DS] = { 0x3E, NVMM_X64_SEG_DS },
- [LEG_OVR_ES] = { 0x26, NVMM_X64_SEG_ES },
- [LEG_OVR_FS] = { 0x64, NVMM_X64_SEG_FS },
- [LEG_OVR_GS] = { 0x65, NVMM_X64_SEG_GS },
- [LEG_BRN_TAKEN] = { 0x2E, -1 },
- [LEG_BRN_NTAKEN] = { 0x3E, -1 },
- /* Group 3 */
- [LEG_OPR_OVR] = { 0x66, -1 },
- /* Group 4 */
- [LEG_ADR_OVR] = { 0x67, -1 },
-};
-
static int
node_legacy_prefix(struct x86_decode_fsm *fsm, struct x86_instr *instr)
{
uint8_t byte;
- size_t i;
if (fsm_read(fsm, , sizeof(byte)) == -1) {
return -1;
}
- for (i = 0; i < NLEG; i++) {
- if (byte == legpref_table[i].byte)
- break;
- }
-
- if (i == NLEG) {
- fsm->fn = node_rex_prefix;
+ if (byte == LEG_OPR_OVR) {
+ instr->legpref.opr_ovr = 1;
+ } else if (byte == LEG_OVR_DS) {
+ instr->legpref.seg = NVMM_X64_SEG_DS;
+ } else if (byte == LEG_OVR_ES) {
+ instr->legpref.seg = NVMM_X64_SEG_ES;
+ } else if (byte == LEG_REP) {
+ instr->legpref.rep = 1;
+ } else if (byte == LEG_OVR_GS) {
+ instr->legpref.seg = NVMM_X64_SEG_GS;
+ } else if (byte == LEG_OVR_FS) {
+ instr->legpref.seg = NVMM_X64_SEG_FS;
+ } else if (byte == LEG_ADR_OVR) {
+ instr->legpref.adr_ovr = 1;
+ } else if (byte == LEG_OVR_CS) {
+ instr->legpref.seg = NVMM_X64_SEG_CS;
+ } else if (byte == LEG_OVR_SS) {
+ instr->legpref.seg = NVMM_X64_SEG_SS;
+ } else if (byte == LEG_REPN) {
+ instr->legpref.repn = 1;
+ } else if (byte == LEG_LOCK) {
+ /* ignore */
} else {
- instr->legpref[i] = true;
-
CVS commit: src/usr.sbin/sysinst/arch/macppc
Module Name:src
Committed By: scole
Date: Mon Jan 7 18:08:28 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/macppc: md.h msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Add GENERIC.MP and GENERIC_601 kernels to sysinst menu
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/macppc/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/macppc/msg.md.de \
src/usr.sbin/sysinst/arch/macppc/msg.md.en \
src/usr.sbin/sysinst/arch/macppc/msg.md.es \
src/usr.sbin/sysinst/arch/macppc/msg.md.fr \
src/usr.sbin/sysinst/arch/macppc/msg.md.pl
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/sysinst/arch/macppc/md.h
diff -u src/usr.sbin/sysinst/arch/macppc/md.h:1.2 src/usr.sbin/sysinst/arch/macppc/md.h:1.3
--- src/usr.sbin/sysinst/arch/macppc/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/macppc/md.h Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */
+/* $NetBSD: md.h,v 1.3 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -62,6 +62,8 @@
* or upgrade.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
+#define SET_KERNEL_2_NAME "kern-GENERIC.MP"
+#define SET_KERNEL_3_NAME "kern-GENERIC_601"
/*
* Machine-specific command to write a new label to a disk.
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.de
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.de:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.de:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.de:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.de Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.de,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -52,3 +52,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.en
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.en:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.en:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.en:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.en Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.en,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,3 +51,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.es
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.es:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.es:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.es:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.es Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.es,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,3 +51,8 @@ message dobootblks
message set_kernel_1
{Núcleo (GENERIC)}
+message set_kernel_2
+{Núcleo (GENERIC.MP)}
+
+message set_kernel_3
+{Núcleo (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.fr
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.fr:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.fr:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.fr:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.fr Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.fr,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,3 +51,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.pl
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.pl:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.pl:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.pl:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.pl Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.pl,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.5 2000/12/03 01:54:48 minoura Exp */
@@ -53,3 +53,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
CVS commit: src/lib/libnvmm
Module Name:src
Committed By: maxv
Date: Mon Jan 7 16:30:26 UTC 2019
Modified Files:
src/lib/libnvmm: libnvmm.3 libnvmm_x86.c nvmm.h
Log Message:
Optimize: on single memory operand instructions, take the GPA directly from
the exit structure provided by the kernel. This saves an MMU translation,
and sometimes complex address computation (eg SIB).
Drop the GVA field, it is not useful to virtualizers.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libnvmm/libnvmm.3
cvs rdiff -u -r1.11 -r1.12 src/lib/libnvmm/libnvmm_x86.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libnvmm/nvmm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnvmm/libnvmm.3
diff -u src/lib/libnvmm/libnvmm.3:1.7 src/lib/libnvmm/libnvmm.3:1.8
--- src/lib/libnvmm/libnvmm.3:1.7 Sun Jan 6 16:10:51 2019
+++ src/lib/libnvmm/libnvmm.3 Mon Jan 7 16:30:25 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnvmm.3,v 1.7 2019/01/06 16:10:51 maxv Exp $
+.\" $NetBSD: libnvmm.3,v 1.8 2019/01/07 16:30:25 maxv Exp $
.\"
.\" Copyright (c) 2018 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 06, 2019
+.Dd January 07, 2019
.Dt LIBNVMM 3
.Os
.Sh NAME
@@ -455,7 +455,6 @@ structure as argument.
This structure describes a Mem transaction:
.Bd -literal
struct nvmm_mem {
- gvaddr_t gva;
gpaddr_t gpa;
bool write;
size_t size;
@@ -480,8 +479,6 @@ to retrieve the desired value.
.El
.Pp
In either case,
-.Va gva
-will indicate the guest virtual address,
.Va gpa
will indicate the guest physical address,
.Va write
Index: src/lib/libnvmm/libnvmm_x86.c
diff -u src/lib/libnvmm/libnvmm_x86.c:1.11 src/lib/libnvmm/libnvmm_x86.c:1.12
--- src/lib/libnvmm/libnvmm_x86.c:1.11 Mon Jan 7 13:47:33 2019
+++ src/lib/libnvmm/libnvmm_x86.c Mon Jan 7 16:30:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libnvmm_x86.c,v 1.11 2019/01/07 13:47:33 maxv Exp $ */
+/* $NetBSD: libnvmm_x86.c,v 1.12 2019/01/07 16:30:25 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -576,7 +576,6 @@ read_guest_memory(struct nvmm_machine *m
if (is_mmio) {
mem.data = data;
- mem.gva = gva;
mem.gpa = gpa;
mem.write = false;
mem.size = size;
@@ -627,7 +626,6 @@ write_guest_memory(struct nvmm_machine *
if (is_mmio) {
mem.data = data;
- mem.gva = gva;
mem.gpa = gpa;
mem.write = true;
mem.size = size;
@@ -2687,30 +2685,6 @@ store_to_gva(struct nvmm_x64_state *stat
}
static int
-store_to_mem(struct nvmm_machine *mach, struct nvmm_x64_state *state,
-struct x86_instr *instr, struct x86_store *store, struct nvmm_mem *mem)
-{
- nvmm_prot_t prot;
- int ret;
-
- ret = store_to_gva(state, instr, store, >gva, mem->size);
- if (ret == -1)
- return -1;
-
- if ((mem->gva & PAGE_MASK) + mem->size > PAGE_SIZE) {
- /* Don't allow a cross-page MMIO. */
- errno = EINVAL;
- return -1;
- }
-
- ret = x86_gva_to_gpa(mach, state, mem->gva, >gpa, );
- if (ret == -1)
- return -1;
-
- return 0;
-}
-
-static int
fetch_segment(struct nvmm_machine *mach, struct nvmm_x64_state *state)
{
uint8_t inst_bytes[15], byte;
@@ -2820,110 +2794,66 @@ assist_mem_double(struct nvmm_machine *m
static int
assist_mem_single(struct nvmm_machine *mach, struct nvmm_x64_state *state,
-struct x86_instr *instr)
+struct x86_instr *instr, struct nvmm_exit *exit)
{
struct nvmm_mem mem;
uint8_t membuf[8];
uint64_t val;
- int ret;
memset(membuf, 0, sizeof(membuf));
+
+ mem.gpa = exit->u.mem.gpa;
+ mem.size = instr->operand_size;
mem.data = membuf;
+ /* Determine the direction. */
switch (instr->src.type) {
case STORE_REG:
if (instr->src.disp.type != DISP_NONE) {
/* Indirect access. */
mem.write = false;
- mem.size = instr->operand_size;
- ret = store_to_mem(mach, state, instr, >src,
- );
- if (ret == -1)
-return -1;
} else {
/* Direct access. */
mem.write = true;
- mem.size = instr->operand_size;
- val = state->gprs[instr->src.u.reg->num];
- val = __SHIFTOUT(val, instr->src.u.reg->mask);
- memcpy(mem.data, , mem.size);
}
break;
-
case STORE_IMM:
mem.write = true;
- mem.size = instr->src.u.imm.size;
- memcpy(mem.data, >src.u.imm.data, mem.size);
break;
-
case STORE_SIB:
mem.write = false;
- mem.size = instr->operand_size;
- ret = store_to_mem(mach, state, instr, >src, );
- if (ret == -1)
- return -1;
break;
-
case STORE_DMO:
mem.write = false;
- mem.size = instr->operand_size;
- ret = store_to_mem(mach, state, instr, >src, );
- if (ret == -1)
- return -1;
break;
-
default:
- return -1;
+ DISASSEMBLER_BUG();
}
- switch (instr->dst.type) {
- case STORE_REG:
- if (instr->dst.disp.type != DISP_NONE) {
- if (__predict_false(!mem.write)) {
+ if (mem.write) {
+ switch (instr->src.type) {
+
CVS commit: src/doc
Module Name:src Committed By: christos Date: Mon Jan 7 15:44:47 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new trousers/tpm-tools To generate a diff of this commit: cvs rdiff -u -r1.1588 -r1.1589 src/doc/3RDPARTY cvs rdiff -u -r1.2485 -r1.2486 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.1588 src/doc/3RDPARTY:1.1589 --- src/doc/3RDPARTY:1.1588 Sun Jan 6 17:30:02 2019 +++ src/doc/3RDPARTY Mon Jan 7 10:44:47 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1588 2019/01/06 22:30:02 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1589 2019/01/07 15:44:47 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1585,7 +1585,7 @@ Notes: Need to feed back local changes Package: TrouSerS -Version: 0.3.8 +Version: 0.3.14 Current Vers: 0.3.14 Maintainer: http://trousers.sourceforge.net Archive Site: http://trousers.sourceforge.net @@ -1598,7 +1598,7 @@ Notes: Need to feed back local changes Package: tpm-tools -Version: 1.3.7.1 +Version: 1.3.9.1 Current Vers: 1.3.9.1 Maintainer: http://trousers.sourceforge.net Archive Site: http://trousers.sourceforge.net Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2485 src/doc/CHANGES:1.2486 --- src/doc/CHANGES:1.2485 Sun Jan 6 13:56:52 2019 +++ src/doc/CHANGES Mon Jan 7 10:44:47 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2485 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2486 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -288,3 +288,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: wpa: Import wpa_supplicant and hostapd 2.7. [christos 20190104] acpi(4): Updated ACPICA to 20181213. [christos 20190104] tmux(1): Imported 2.8. [christos 20190104] + TrouSerS: Import trousers-0.3.14 [christos 20190107] + tpm-tools: Import tpm-tools-1.3.9.1 [christos 20190107]
CVS commit: src/crypto/external/cpl/tpm-tools/dist
Module Name:src Committed By: christos Date: Mon Jan 7 15:43:05 UTC 2019 Modified Files: src/crypto/external/cpl/tpm-tools/dist/lib: Makefile.am Makefile.in src/crypto/external/cpl/tpm-tools/dist/src/data_mgmt: Makefile.am Makefile.in src/crypto/external/cpl/tpm-tools/dist/src/tpm_mgmt: tpm_nvcommon.c tpm_nvread.c Removed Files: src/crypto/external/cpl/tpm-tools/dist: configure.in src/crypto/external/cpl/tpm-tools/dist/po: stamp-po Log Message: merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/cpl/tpm-tools/dist/configure.in cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.am \ src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.in cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/cpl/tpm-tools/dist/po/stamp-po cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/tpm-tools/dist/src/data_mgmt/Makefile.am \ src/crypto/external/cpl/tpm-tools/dist/src/data_mgmt/Makefile.in cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/cpl/tpm-tools/dist/src/tpm_mgmt/tpm_nvcommon.c \ src/crypto/external/cpl/tpm-tools/dist/src/tpm_mgmt/tpm_nvread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.am diff -u src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.am:1.2 src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.am:1.3 --- src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.am:1.2 Fri Jan 27 22:05:53 2012 +++ src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.am Mon Jan 7 10:43:04 2019 @@ -44,7 +44,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ # # TSPI interface library libtpm_tspi_la_SOURCES = tpm_tspi.c -libtpm_tspi_la_LIBADD = libtpm_utils.la +libtpm_tspi_la_LIBADD = libtpm_utils.la @INTLLIBS@ # # PKCS#11 interface library @@ -52,7 +52,7 @@ if P11_SUPPORT noinst_LTLIBRARIES += libtpm_pkcs11.la libtpm_pkcs11_la_SOURCES= tpm_pkcs11.c -libtpm_pkcs11_la_LIBADD = libtpm_utils.la +libtpm_pkcs11_la_LIBADD = libtpm_utils.la @INTLLIBS@ endif # @@ -80,4 +80,4 @@ endif # Unseal library - for addition to existing apps, counter part of seal cmd libtpm_unseal_la_SOURCES = tpm_unseal.c libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0 -libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la +libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto @INTLLIBS@ Index: src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.in diff -u src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.in:1.2 src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.in:1.3 --- src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.in:1.2 Fri Jan 27 22:05:53 2012 +++ src/crypto/external/cpl/tpm-tools/dist/lib/Makefile.in Mon Jan 7 10:43:04 2019 @@ -72,7 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/g $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -156,7 +156,6 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO = @ECHO@ @@ -189,7 +188,6 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ @@ -207,7 +205,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ @@ -225,7 +222,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -260,6 +256,7 @@ libexecdir = @libexecdir@ # Gettext support localedir = $(datadir)/locale localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -298,9 +295,9 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ # # TSPI interface library libtpm_tspi_la_SOURCES = tpm_tspi.c -libtpm_tspi_la_LIBADD = libtpm_utils.la +libtpm_tspi_la_LIBADD = libtpm_utils.la @INTLLIBS@ @P11_SUPPORT_TRUE@libtpm_pkcs11_la_SOURCES = tpm_pkcs11.c -@P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la +@P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la @INTLLIBS@ # # Installed Libraries @@ -327,7 +324,7 @@ libtpm_tspi_la_LIBADD = libtpm_utils.la # Unseal library - for addition to existing apps,
CVS commit: src/crypto/external/cpl/trousers
Module Name:src
Committed By: christos
Date: Mon Jan 7 15:43:17 UTC 2019
Modified Files:
src/crypto/external/cpl/trousers/dist/src/tspi: tsp_tcsi_param.c
src/crypto/external/cpl/trousers/lib/libtspi: Makefile
Log Message:
new config file
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/cpl/trousers/lib/libtspi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c
diff -u src/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c:1.2
--- src/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c:1.1.1.1 Mon Jan 7 09:57:24 2019
+++ src/crypto/external/cpl/trousers/dist/src/tspi/tsp_tcsi_param.c Mon Jan 7 10:43:17 2019
@@ -15,7 +15,8 @@
#ifndef __APPLE__
#include
-#else
+#endif
+#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 64
#endif
@@ -99,7 +100,7 @@ int
get_hostname_from_env(char **host_str, unsigned *len)
{
char *env_host, *tmp_str = NULL;
- unsigned env_len;
+ size_t env_len;
// Tries to retrieve from env var first.
env_host = getenv(HOSTNAME_ENV_VAR);
Index: src/crypto/external/cpl/trousers/lib/libtspi/Makefile
diff -u src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.2 src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.3
--- src/crypto/external/cpl/trousers/lib/libtspi/Makefile:1.2 Sat Feb 3 22:19:52 2018
+++ src/crypto/external/cpl/trousers/lib/libtspi/Makefile Mon Jan 7 10:43:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/02/04 03:19:52 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/01/07 15:43:17 christos Exp $
.include "../Makefile.inc"
CPPFLAGS+=-DAPPID=\"TSPI\" -DVAR_PREFIX=\"/var\" -DETC_PREFIX=\"/etc\"
@@ -108,6 +108,7 @@ tsp_random.c \
tsp_seal.c \
tsp_selftest.c \
tsp_sign.c \
+tsp_tcsi_param.c \
tsp_tick.c \
tspi_admin.c \
tspi_aik.c \
CVS import: src/crypto/external/cpl/tpm-tools/dist
Module Name:src Committed By: christos Date: Mon Jan 7 15:37:43 UTC 2019 Update of /cvsroot/src/crypto/external/cpl/tpm-tools/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20647 Log Message: tpm-tools (1.3.9.1) - Builds with openssl 1.1.0 - Align code properly so gcc-6 does not complain - update symbol file. - drop 02-cflags-errors-unused.patch, -Werror is gone. - update 03-fix-bool-error-parseStringWithValues.patch, different fix upstream, does not look right. tpm-tools (1.3.8.2) * Add patch 03 to fix FTBFS with gcc-5 * Merge patch 04 to fix FTBFS with clang Thanks to Alexander for the patch. * Bump Standards Version to 3.9.6 Status: Vendor Tag: TROUSERS Release Tags: TPM_TOOLS1_3_9_1 U src/crypto/external/cpl/tpm-tools/dist/install-sh U src/crypto/external/cpl/tpm-tools/dist/Makefile.am U src/crypto/external/cpl/tpm-tools/dist/README U src/crypto/external/cpl/tpm-tools/dist/ABOUT-NLS U src/crypto/external/cpl/tpm-tools/dist/ltmain.sh U src/crypto/external/cpl/tpm-tools/dist/aclocal.m4 U src/crypto/external/cpl/tpm-tools/dist/Makefile.in U src/crypto/external/cpl/tpm-tools/dist/config.rpath N src/crypto/external/cpl/tpm-tools/dist/.gitignore U src/crypto/external/cpl/tpm-tools/dist/depcomp U src/crypto/external/cpl/tpm-tools/dist/LICENSE N src/crypto/external/cpl/tpm-tools/dist/cleanup.sh C src/crypto/external/cpl/tpm-tools/dist/config.sub U src/crypto/external/cpl/tpm-tools/dist/config.h.in N src/crypto/external/cpl/tpm-tools/dist/bootstrap.sh U src/crypto/external/cpl/tpm-tools/dist/missing C src/crypto/external/cpl/tpm-tools/dist/config.guess N src/crypto/external/cpl/tpm-tools/dist/configure.ac U src/crypto/external/cpl/tpm-tools/dist/configure U src/crypto/external/cpl/tpm-tools/dist/include/tpm_seal.h U src/crypto/external/cpl/tpm-tools/dist/include/Makefile.am U src/crypto/external/cpl/tpm-tools/dist/include/tpm_pkcs11.h U src/crypto/external/cpl/tpm-tools/dist/include/Makefile.in U src/crypto/external/cpl/tpm-tools/dist/include/tpm_utils.h U src/crypto/external/cpl/tpm-tools/dist/include/tpm_unseal.h U src/crypto/external/cpl/tpm-tools/dist/include/tpm_tspi.h N src/crypto/external/cpl/tpm-tools/dist/dist/tpm-tools-nopkcs11.spec U src/crypto/external/cpl/tpm-tools/dist/dist/tpm-tools.spec.in U src/crypto/external/cpl/tpm-tools/dist/po/en@boldquot.header U src/crypto/external/cpl/tpm-tools/dist/po/en@quot.header U src/crypto/external/cpl/tpm-tools/dist/po/boldquot.sed U src/crypto/external/cpl/tpm-tools/dist/po/Rules-quot U src/crypto/external/cpl/tpm-tools/dist/po/LINGUAS U src/crypto/external/cpl/tpm-tools/dist/po/Makevars U src/crypto/external/cpl/tpm-tools/dist/po/Makefile.in.in U src/crypto/external/cpl/tpm-tools/dist/po/POTFILES.in U src/crypto/external/cpl/tpm-tools/dist/po/quot.sed U src/crypto/external/cpl/tpm-tools/dist/po/insert-header.sin N src/crypto/external/cpl/tpm-tools/dist/po/Makevars.template U src/crypto/external/cpl/tpm-tools/dist/po/tpm-tools.pot U src/crypto/external/cpl/tpm-tools/dist/po/remove-potcdate.sin N src/crypto/external/cpl/tpm-tools/dist/po_/POTFILES.in N src/crypto/external/cpl/tpm-tools/dist/po_/LINGUAS N src/crypto/external/cpl/tpm-tools/dist/po_/Makevars N src/crypto/external/cpl/tpm-tools/dist/po_/tpm-tools.pot N src/crypto/external/cpl/tpm-tools/dist/m4/inttypes-h.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/wint_t.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/xsize.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/progtest.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/ltversion.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/longdouble.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/longlong.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/glibc21.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/Makefile.am U src/crypto/external/cpl/tpm-tools/dist/m4/lib-link.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/codeset.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/Makefile.in U src/crypto/external/cpl/tpm-tools/dist/m4/iconv.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/printf-posix.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/po.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/lib-ld.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/uintmax_t.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/size_max.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/intdiv0.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/glibc2.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/visibility.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/ulonglong.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/signed.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/stdint_h.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/libtool.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/lock.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/wchar_t.m4 N src/crypto/external/cpl/tpm-tools/dist/m4/inttypes-pri.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/ltoptions.m4 U src/crypto/external/cpl/tpm-tools/dist/m4/nls.m4 N
CVS commit: src/crypto/external/cpl/trousers
Module Name:src
Committed By: christos
Date: Mon Jan 7 15:18:04 UTC 2019
Modified Files:
src/crypto/external/cpl/trousers/bin/tcsd: Makefile
src/crypto/external/cpl/trousers/dist/src/include: tcsd.h tcsps.h
trousers_types.h
src/crypto/external/cpl/trousers/dist/src/tcs/ps: ps_utils.c tcsps.c
src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp: rpc.c
src/crypto/external/cpl/trousers/dist/src/tcsd: platform.c svrside.c
tcsd_conf.c tcsd_threads.c
src/crypto/external/cpl/trousers/dist/src/tspi/ps: tspps.c
Removed Files:
src/crypto/external/cpl/trousers/dist: configure.in
src/crypto/external/cpl/trousers/dist/man/man5: tcsd.conf.5
src/crypto/external/cpl/trousers/dist/man/man8: tcsd.8
src/crypto/external/cpl/trousers/dist/tools: Makefile.am Makefile.in
ps_convert.c ps_inspect.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/cpl/trousers/bin/tcsd/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/cpl/trousers/dist/configure.in
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/cpl/trousers/dist/man/man5/tcsd.conf.5
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/cpl/trousers/dist/man/man8/tcsd.8
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/cpl/trousers/dist/src/include/tcsd.h \
src/crypto/external/cpl/trousers/dist/src/include/tcsps.h \
src/crypto/external/cpl/trousers/dist/src/include/trousers_types.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/cpl/trousers/dist/src/tcs/ps/ps_utils.c \
src/crypto/external/cpl/trousers/dist/src/tcs/ps/tcsps.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/cpl/trousers/dist/src/tcs/rpc/tcstp/rpc.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/cpl/trousers/dist/src/tcsd/platform.c \
src/crypto/external/cpl/trousers/dist/src/tcsd/svrside.c \
src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_conf.c \
src/crypto/external/cpl/trousers/dist/src/tcsd/tcsd_threads.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/cpl/trousers/dist/src/tspi/ps/tspps.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/cpl/trousers/dist/tools/Makefile.am \
src/crypto/external/cpl/trousers/dist/tools/Makefile.in \
src/crypto/external/cpl/trousers/dist/tools/ps_convert.c \
src/crypto/external/cpl/trousers/dist/tools/ps_inspect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/cpl/trousers/bin/tcsd/Makefile
diff -u src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.1 src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.2
--- src/crypto/external/cpl/trousers/bin/tcsd/Makefile:1.1 Fri Jan 27 21:15:26 2012
+++ src/crypto/external/cpl/trousers/bin/tcsd/Makefile Mon Jan 7 10:18:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/01/28 02:15:26 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/01/07 15:18:03 christos Exp $
.include "../Makefile.inc"
.PATH.c: ${DIST}/src/tcsd
@@ -19,10 +19,17 @@ LIBTCSOBJDIR!= cd ${.CURDIR}/../../lib/l
DPADD+=${LIBTDDL} ${LIBCRYPTO} ${LIBPTHREAD}
LDADD+=-L${LIBTCSOBJDIR} -ltcs -ltddl -lcrypto -lpthread
-.SUFFIXES: .5 .8
-.PATH.5: ${DIST}/man/man5
-.PATH.8: ${DIST}/man/man8
+.SUFFIXES: .in
+.PATH.in: ${DIST}/man/man5 ${DIST}/man/man8
MAN+=tcsd.conf.5 tcsd.8
+CLEANFILES+= tcsd.conf.5 tcsd.8
+
+__mansed: .USE
+ @${TOOL_SED} -e s/@PACKAGE_BUGREPORT@/gnats-b...@netbsd.org/g \
+ -e s/@TCSD_DEFAULT_PORT@/30003/g ${.ALLSRC} > ${.TARGET}
+
+tcsd.8: tcsd.8.in __mansed
+tcsd.conf.5: tcsd.conf.5.in __mansed
.include
Index: src/crypto/external/cpl/trousers/dist/src/include/tcsd.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.2 src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.3
--- src/crypto/external/cpl/trousers/dist/src/include/tcsd.h:1.2 Fri Jan 27 21:00:51 2012
+++ src/crypto/external/cpl/trousers/dist/src/include/tcsd.h Mon Jan 7 10:18:03 2019
@@ -46,6 +46,8 @@ struct tcsd_config
struct platform_class *host_platform_class; /* Host platform class of this TCS System */
struct platform_class *all_platform_classes; /* List of platform classes
of this TCS System */
+ int disable_ipv4;
+ int disable_ipv6;
};
#define TCSD_DEFAULT_CONFIG_FILE ETC_PREFIX "/tcsd.conf"
@@ -66,6 +68,8 @@ extern char *tcsd_config_file;
#define TCSD_DEFAULT_KERNEL_LOG_FILE "/sys/kernel/security/ima/binary_runtime_measurements"
#define TCSD_DEFAULT_FIRMWARE_PCRS 0x
#define TCSD_DEFAULT_KERNEL_PCRS 0x
+#define TCSD_DEFAULT_DISABLE_IPV4 0
+#define TCSD_DEFAULT_DISABLE_IPV6 0
/* This will change when a system with more than 32 PCR's exists */
#define TCSD_MAX_PCRS 32
@@ -102,6 +106,8 @@ struct tcg_platform_spec {
#define TCSD_OPTION_REMOTE_OPS 0x0400
#define TCSD_OPTION_EXCLUSIVE_TRANSPORT 0x0800
#define TCSD_OPTION_HOST_PLATFORM_CLASS 0x1000
CVS import: src/crypto/external/cpl/trousers/dist
Module Name:src Committed By: christos Date: Mon Jan 7 14:57:26 UTC 2019 Update of /cvsroot/src/crypto/external/cpl/trousers/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18347 Log Message: * TROUSERS_0_3_14 - Changes to support OpenSSL 1.1.0 - Removed some warnings for proper builds - Changes to allow building on OS X - Fixed memory leaks - Fixed failure to recognize connections from localhost over IPv6 - Fixed for an exploitable local denial of service in tcsd * TROUSERS_0_3_13 - Changed exported functions which had a name too common, to avoid collision - Assessed daemon security using manual techniques and coverit - Fixed major security bugs and memory leaks - Added debug support to run tcsd with a different user/group - Daemon now properly closes sockets before shutting down * TROUSERS_0_3_12 - Added new network code for RPC, which supports IPv6 - Users of client applications can configure the hostname of the tcsd server they want to connect through the TSS_TCSD_HOSTNAME env var (only works if application didn't set a hostname in the context) - Added disable_ipv4 and disable_ipv6 config options for server * TROUSERS_0_3_11 - Fix build process for distros - License was changed from GPL to BSD - Many bugfixes - updated man pages Status: Vendor Tag: TROUSERS Release Tags: TROUSERS0_3_14 U src/crypto/external/cpl/trousers/dist/README.selinux U src/crypto/external/cpl/trousers/dist/install-sh U src/crypto/external/cpl/trousers/dist/Makefile.am U src/crypto/external/cpl/trousers/dist/NEWS U src/crypto/external/cpl/trousers/dist/ltmain.sh U src/crypto/external/cpl/trousers/dist/README U src/crypto/external/cpl/trousers/dist/ChangeLog U src/crypto/external/cpl/trousers/dist/aclocal.m4 U src/crypto/external/cpl/trousers/dist/Makefile.in U src/crypto/external/cpl/trousers/dist/depcomp U src/crypto/external/cpl/trousers/dist/TODO N src/crypto/external/cpl/trousers/dist/.gitignore U src/crypto/external/cpl/trousers/dist/LICENSE U src/crypto/external/cpl/trousers/dist/AUTHORS U src/crypto/external/cpl/trousers/dist/missing C src/crypto/external/cpl/trousers/dist/config.sub N src/crypto/external/cpl/trousers/dist/bootstrap.sh U src/crypto/external/cpl/trousers/dist/NICETOHAVES C src/crypto/external/cpl/trousers/dist/config.guess N src/crypto/external/cpl/trousers/dist/configure.ac U src/crypto/external/cpl/trousers/dist/configure U src/crypto/external/cpl/trousers/dist/dist/Makefile.am U src/crypto/external/cpl/trousers/dist/dist/system.data.noauth U src/crypto/external/cpl/trousers/dist/dist/trousers.spec.in U src/crypto/external/cpl/trousers/dist/dist/Makefile.in U src/crypto/external/cpl/trousers/dist/dist/tcsd.conf.in U src/crypto/external/cpl/trousers/dist/dist/system.data.auth U src/crypto/external/cpl/trousers/dist/dist/fedora/fedora.initrd.tcsd U src/crypto/external/cpl/trousers/dist/dist/fedora/trousers.spec.in N src/crypto/external/cpl/trousers/dist/dist/fedora/trousers.te N src/crypto/external/cpl/trousers/dist/dist/fedora/trousers.fc N src/crypto/external/cpl/trousers/dist/.pc/.version U src/crypto/external/cpl/trousers/dist/doc/TSS_programming_SNAFUs.txt U src/crypto/external/cpl/trousers/dist/doc/LTC-TSS_LLD_08_r2.sxw U src/crypto/external/cpl/trousers/dist/doc/LTC-TSS_LLD_08_r2.pdf U src/crypto/external/cpl/trousers/dist/src/Makefile.am U src/crypto/external/cpl/trousers/dist/src/Makefile.in N src/crypto/external/cpl/trousers/dist/src/include/tsp_tcsi_param.h U src/crypto/external/cpl/trousers/dist/src/include/hosttable.h U src/crypto/external/cpl/trousers/dist/src/include/obj_migdata.h U src/crypto/external/cpl/trousers/dist/src/include/obj_tpm.h U src/crypto/external/cpl/trousers/dist/src/include/authsess.h U src/crypto/external/cpl/trousers/dist/src/include/Makefile.am U src/crypto/external/cpl/trousers/dist/src/include/capabilities.h C src/crypto/external/cpl/trousers/dist/src/include/tcsps.h U src/crypto/external/cpl/trousers/dist/src/include/Makefile.in U src/crypto/external/cpl/trousers/dist/src/include/obj_nv.h U src/crypto/external/cpl/trousers/dist/src/include/tcs_utils.h U src/crypto/external/cpl/trousers/dist/src/include/tcsem.h U src/crypto/external/cpl/trousers/dist/src/include/tsplog.h C src/crypto/external/cpl/trousers/dist/src/include/tcsd.h U src/crypto/external/cpl/trousers/dist/src/include/rpc_tcstp_tsp.h U src/crypto/external/cpl/trousers/dist/src/include/tcs_context.h U src/crypto/external/cpl/trousers/dist/src/include/tcs_aik.h U src/crypto/external/cpl/trousers/dist/src/include/obj_encdata.h U src/crypto/external/cpl/trousers/dist/src/include/tcs_tsp.h U src/crypto/external/cpl/trousers/dist/src/include/obj_daaissuerkey.h U src/crypto/external/cpl/trousers/dist/src/include/rpc_tcstp.h U src/crypto/external/cpl/trousers/dist/src/include/threads.h U src/crypto/external/cpl/trousers/dist/src/include/imaem.h U src/crypto/external/cpl/trousers/dist/src/include/req_mgr.h N
CVS commit: src/sys/dev/nvmm/x86
Module Name:src
Committed By: maxv
Date: Mon Jan 7 14:08:02 UTC 2019
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c
Log Message:
Optimize: cache the guest state entirely in the VMCB-cache, flush it on a
state-by-state basis when needed.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/nvmm/x86/nvmm_x86_svm.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/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.11 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.12
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.11 Sun Jan 6 18:32:54 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Mon Jan 7 14:08:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.11 2019/01/06 18:32:54 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.12 2019/01/07 14:08:02 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.11 2019/01/06 18:32:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.12 2019/01/07 14:08:02 maxv Exp $");
#include
#include
@@ -314,7 +314,6 @@ struct vmcb_ctrl {
uint64_t intr;
#define VMCB_CTRL_INTR_SHADOW __BIT(0)
-#define VMCB_CTRL_GUEST_INTR_MASK __BIT(1)
uint64_t exitcode;
uint64_t exitinfo1;
@@ -538,6 +537,61 @@ struct svm_cpudata {
struct xsave_header gfpu __aligned(16);
};
+static void
+svm_vmcb_cache_default(struct vmcb *vmcb)
+{
+ vmcb->ctrl.vmcb_clean =
+ VMCB_CTRL_VMCB_CLEAN_I |
+ VMCB_CTRL_VMCB_CLEAN_IOPM |
+ VMCB_CTRL_VMCB_CLEAN_ASID |
+ VMCB_CTRL_VMCB_CLEAN_TPR |
+ VMCB_CTRL_VMCB_CLEAN_NP |
+ VMCB_CTRL_VMCB_CLEAN_CR |
+ VMCB_CTRL_VMCB_CLEAN_DR |
+ VMCB_CTRL_VMCB_CLEAN_DT |
+ VMCB_CTRL_VMCB_CLEAN_SEG |
+ VMCB_CTRL_VMCB_CLEAN_CR2 |
+ VMCB_CTRL_VMCB_CLEAN_LBR |
+ VMCB_CTRL_VMCB_CLEAN_AVIC;
+}
+
+static void
+svm_vmcb_cache_update(struct vmcb *vmcb, uint64_t flags)
+{
+ if (flags & NVMM_X64_STATE_SEGS) {
+ vmcb->ctrl.vmcb_clean &=
+ ~(VMCB_CTRL_VMCB_CLEAN_SEG | VMCB_CTRL_VMCB_CLEAN_DT);
+ }
+ if (flags & NVMM_X64_STATE_CRS) {
+ vmcb->ctrl.vmcb_clean &=
+ ~(VMCB_CTRL_VMCB_CLEAN_CR | VMCB_CTRL_VMCB_CLEAN_CR2);
+ }
+ if (flags & NVMM_X64_STATE_DRS) {
+ vmcb->ctrl.vmcb_clean &= ~VMCB_CTRL_VMCB_CLEAN_DR;
+ }
+ if (flags & NVMM_X64_STATE_MSRS) {
+ /* CR for EFER, NP for PAT. */
+ vmcb->ctrl.vmcb_clean &=
+ ~(VMCB_CTRL_VMCB_CLEAN_CR | VMCB_CTRL_VMCB_CLEAN_NP);
+ }
+ if (flags & NVMM_X64_STATE_MISC) {
+ /* SEG for CPL. */
+ vmcb->ctrl.vmcb_clean &= ~VMCB_CTRL_VMCB_CLEAN_SEG;
+ }
+}
+
+static inline void
+svm_vmcb_cache_flush(struct vmcb *vmcb, uint64_t flags)
+{
+ vmcb->ctrl.vmcb_clean &= ~flags;
+}
+
+static inline void
+svm_vmcb_cache_flush_all(struct vmcb *vmcb)
+{
+ vmcb->ctrl.vmcb_clean = 0;
+}
+
#define SVM_EVENT_TYPE_HW_INT 0
#define SVM_EVENT_TYPE_NMI 2
#define SVM_EVENT_TYPE_EXC 3
@@ -555,8 +609,11 @@ svm_event_waitexit_enable(struct nvmm_cp
} else {
vmcb->ctrl.intercept_misc1 |= VMCB_CTRL_INTERCEPT_VINTR;
vmcb->ctrl.v |= (VMCB_CTRL_V_IRQ | VMCB_CTRL_V_IGN_TPR);
+ svm_vmcb_cache_flush(vmcb, VMCB_CTRL_VMCB_CLEAN_TPR);
cpudata->int_window_exit = true;
}
+
+ svm_vmcb_cache_flush(vmcb, VMCB_CTRL_VMCB_CLEAN_I);
}
static void
@@ -571,8 +628,11 @@ svm_event_waitexit_disable(struct nvmm_c
} else {
vmcb->ctrl.intercept_misc1 &= ~VMCB_CTRL_INTERCEPT_VINTR;
vmcb->ctrl.v &= ~(VMCB_CTRL_V_IRQ | VMCB_CTRL_V_IGN_TPR);
+ svm_vmcb_cache_flush(vmcb, VMCB_CTRL_VMCB_CLEAN_TPR);
cpudata->int_window_exit = false;
}
+
+ svm_vmcb_cache_flush(vmcb, VMCB_CTRL_VMCB_CLEAN_I);
}
static inline int
@@ -1031,23 +1091,6 @@ error:
}
static void
-svm_vmcb_cache_default(struct vmcb *vmcb)
-{
- vmcb->ctrl.vmcb_clean =
- VMCB_CTRL_VMCB_CLEAN_I |
- VMCB_CTRL_VMCB_CLEAN_IOPM |
- VMCB_CTRL_VMCB_CLEAN_ASID |
- VMCB_CTRL_VMCB_CLEAN_LBR |
- VMCB_CTRL_VMCB_CLEAN_AVIC;
-}
-
-static void
-svm_vmcb_cache_flush(struct vmcb *vmcb)
-{
- vmcb->ctrl.vmcb_clean = 0;
-}
-
-static void
svm_vcpu_guest_fpu_enter(struct nvmm_cpu *vcpu)
{
struct svm_cpudata *cpudata = vcpu->cpudata;
@@ -1164,7 +1207,7 @@ svm_vcpu_run(struct nvmm_machine *mach,
if (vcpu->hcpu_last != hcpu) {
vmcb->ctrl.tsc_offset = cpudata->tsc_offset +
curcpu()->ci_data.cpu_cc_skew;
- svm_vmcb_cache_flush(vmcb);
+ svm_vmcb_cache_flush_all(vmcb);
}
svm_vcpu_guest_dbregs_enter(vcpu);
@@ -1821,6 +1864,8 @@ svm_vcpu_setstate(struct nvmm_cpu *vcpu,
fpustate->fx_mxcsr_mask &= x86_fpu_mxcsr_mask;
fpustate->fx_mxcsr &= fpustate->fx_mxcsr_mask;
}
+
+ svm_vmcb_cache_update(vmcb, flags);
}
static void
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Mon Jan 7 14:05:34 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1670 To generate a diff of this commit: cvs rdiff -u -r1.1.2.127 -r1.1.2.128 src/doc/CHANGES-7.0.3 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-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.127 src/doc/CHANGES-7.0.3:1.1.2.128 --- src/doc/CHANGES-7.0.3:1.1.2.127 Thu Jan 3 11:16:35 2019 +++ src/doc/CHANGES-7.0.3 Mon Jan 7 14:05:34 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.127 2019/01/03 11:16:35 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.128 2019/01/07 14:05:34 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5655,3 +5655,23 @@ sys/conf/copyright1.17 Welcome to 2019! [jnemeth, ticket #1669] +external/public-domain/tz/dist/Makefile up to 1.1.1.23 +external/public-domain/tz/dist/NEWS up to 1.1.1.26 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.16 +external/public-domain/tz/dist/africa up to 1.1.1.19 +external/public-domain/tz/dist/asia up to 1.1.1.22 +external/public-domain/tz/dist/australasia up to 1.1.1.17 +external/public-domain/tz/dist/leapseconds up to 1.1.1.12 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.8 +external/public-domain/tz/dist/northamerica up to 1.1.1.22 +external/public-domain/tz/dist/theory.html up to 1.1.1.7 +external/public-domain/tz/dist/version up to 1.1.1.13 +external/public-domain/tz/dist/ziguard.awk up to 1.1.1.4 +external/public-domain/tz/dist/zone.tab up to 1.1.1.16 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.18 +distrib/sets/lists/base/mi (patch) +doc/3RDPARTY (patch) + + Updated tzdata to 2018i. + [kre, ticket #1670] +
CVS commit: [netbsd-7-0] src
Module Name:src Committed By: martin Date: Mon Jan 7 14:04:55 UTC 2019 Modified Files: src/distrib/sets/lists/base [netbsd-7-0]: mi src/doc [netbsd-7-0]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-7-0]: Makefile NEWS TZDATA_VERSION africa asia australasia leapseconds leapseconds.awk northamerica theory.html version ziguard.awk zone.tab zone1970.tab Log Message: Pull up the following, requested by kre in ticket #1670: external/public-domain/tz/dist/Makefile up to 1.1.1.23 external/public-domain/tz/dist/NEWS up to 1.1.1.26 external/public-domain/tz/dist/TZDATA_VERSION up to 1.16 external/public-domain/tz/dist/africa up to 1.1.1.19 external/public-domain/tz/dist/asia up to 1.1.1.22 external/public-domain/tz/dist/australasia up to 1.1.1.17 external/public-domain/tz/dist/leapseconds up to 1.1.1.12 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.8 external/public-domain/tz/dist/northamerica up to 1.1.1.22 external/public-domain/tz/dist/theory.html up to 1.1.1.7 external/public-domain/tz/dist/version up to 1.1.1.13 external/public-domain/tz/dist/ziguard.awk up to 1.1.1.4 external/public-domain/tz/dist/zone.tab up to 1.1.1.16 external/public-domain/tz/dist/zone1970.tab up to 1.1.1.18 distrib/sets/lists/base/mi (patch) doc/3RDPARTY(patch) Import tzdata2018h from ftp://ftp.iana.org/tz/releases/tzdata2018h.tar.gz Summary of changes in tzdata2018h (2018-12-23 17:59:32 -0800): Qyzylorda (aka Kyzylorda) oblast in Kazakhstan moved from +06 to +05 on 2018-12-21. This is a zone split as Qostanay (aka Kostanay) did not switch, so create a zone Asia/Qostanay. Metlakatla, Alaska observes PST this winter only. Add predictions for Iran from 2038 through 2090. Changes to some old timestamps for Nauru (1979) Guam (1959-77), Hong Kong (1904, 1941, 1945, 1952) (others in Pacific during WWII) --- Merge tzdata2018h --- Update to tzdata2018h (new zone Asia/Qostanay) --- Import tzdata2018i from ftp://ftp.iana.org/tz/releases/tzdata2018i.tar.gz Summary of changes in tzdata2018i (2018-12-30 11:05:43 -0800): Due to a change in government, Sao Tome and Principe switches back from +01 to +00 on 2019-01-01 at 02:00. --- Merge tzdata2018i --- Update to tzdata2018i To generate a diff of this commit: cvs rdiff -u -r1.1087.2.7.2.4 -r1.1087.2.7.2.5 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1145.2.18.2.27 -r1.1145.2.18.2.28 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.1.4.4.2.6 -r1.1.1.1.4.4.2.7 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/leapseconds \ src/external/public-domain/tz/dist/zone.tab \ src/external/public-domain/tz/dist/zone1970.tab cvs rdiff -u -r1.1.1.1.4.4.2.7 -r1.1.1.1.4.4.2.8 \ src/external/public-domain/tz/dist/NEWS \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.6.2.7 -r1.6.2.8 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.1.4.3.2.6 -r1.1.1.1.4.3.2.7 \ src/external/public-domain/tz/dist/africa \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.1.4.3.2.3 -r1.1.1.1.4.3.2.4 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.1.8.4 -r1.1.1.1.8.5 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.3.2.7 -r1.1.1.3.2.8 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.1.8.3 -r1.1.1.1.8.4 \ src/external/public-domain/tz/dist/ziguard.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1087.2.7.2.4 src/distrib/sets/lists/base/mi:1.1087.2.7.2.5 --- src/distrib/sets/lists/base/mi:1.1087.2.7.2.4 Sun Nov 5 20:44:40 2017 +++ src/distrib/sets/lists/base/mi Mon Jan 7 14:04:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1087.2.7.2.4 2017/11/05 20:44:40 snj Exp $ +# $NetBSD: mi,v 1.1087.2.7.2.5 2019/01/07 14:04:55 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5467,6 +5467,7 @@ ./usr/share/zoneinfo/Asia/Pontianak base-sys-share share ./usr/share/zoneinfo/Asia/Pyongyang base-sys-share share ./usr/share/zoneinfo/Asia/Qatar base-sys-share share +./usr/share/zoneinfo/Asia/Qostanay base-sys-share share ./usr/share/zoneinfo/Asia/Qyzylorda base-sys-share share ./usr/share/zoneinfo/Asia/Rangoon base-sys-share share ./usr/share/zoneinfo/Asia/Riyadh base-sys-share share Index: src/doc/3RDPARTY diff -u
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Mon Jan 7 14:04:04 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1670 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-7.1.3 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-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.34 src/doc/CHANGES-7.1.3:1.1.2.35 --- src/doc/CHANGES-7.1.3:1.1.2.34 Thu Jan 3 11:15:32 2019 +++ src/doc/CHANGES-7.1.3 Mon Jan 7 14:04:04 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.34 2019/01/03 11:15:32 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.35 2019/01/07 14:04:04 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -347,3 +347,23 @@ sys/conf/copyright1.17 Welcome to 2019! [jnemeth, ticket #1669] +external/public-domain/tz/dist/Makefile up to 1.1.1.23 +external/public-domain/tz/dist/NEWS up to 1.1.1.26 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.16 +external/public-domain/tz/dist/africa up to 1.1.1.19 +external/public-domain/tz/dist/asia up to 1.1.1.22 +external/public-domain/tz/dist/australasia up to 1.1.1.17 +external/public-domain/tz/dist/leapseconds up to 1.1.1.12 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.8 +external/public-domain/tz/dist/northamerica up to 1.1.1.22 +external/public-domain/tz/dist/theory.html up to 1.1.1.7 +external/public-domain/tz/dist/version up to 1.1.1.13 +external/public-domain/tz/dist/ziguard.awk up to 1.1.1.4 +external/public-domain/tz/dist/zone.tab up to 1.1.1.16 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.18 +distrib/sets/lists/base/mi (patch) +doc/3RDPARTY (patch) + + Updated tzdata to 2018i. + [kre, ticket #1670] +
CVS commit: [netbsd-7-1] src
Module Name:src Committed By: martin Date: Mon Jan 7 14:03:22 UTC 2019 Modified Files: src/distrib/sets/lists/base [netbsd-7-1]: mi src/doc [netbsd-7-1]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-7-1]: Makefile NEWS TZDATA_VERSION africa asia australasia leapseconds leapseconds.awk northamerica theory.html version ziguard.awk zone.tab zone1970.tab Log Message: Pull up the following, requested by kre in ticket #1670: external/public-domain/tz/dist/Makefile up to 1.1.1.23 external/public-domain/tz/dist/NEWS up to 1.1.1.26 external/public-domain/tz/dist/TZDATA_VERSION up to 1.16 external/public-domain/tz/dist/africa up to 1.1.1.19 external/public-domain/tz/dist/asia up to 1.1.1.22 external/public-domain/tz/dist/australasia up to 1.1.1.17 external/public-domain/tz/dist/leapseconds up to 1.1.1.12 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.8 external/public-domain/tz/dist/northamerica up to 1.1.1.22 external/public-domain/tz/dist/theory.html up to 1.1.1.7 external/public-domain/tz/dist/version up to 1.1.1.13 external/public-domain/tz/dist/ziguard.awk up to 1.1.1.4 external/public-domain/tz/dist/zone.tab up to 1.1.1.16 external/public-domain/tz/dist/zone1970.tab up to 1.1.1.18 distrib/sets/lists/base/mi (patch) doc/3RDPARTY(patch) Import tzdata2018h from ftp://ftp.iana.org/tz/releases/tzdata2018h.tar.gz Summary of changes in tzdata2018h (2018-12-23 17:59:32 -0800): Qyzylorda (aka Kyzylorda) oblast in Kazakhstan moved from +06 to +05 on 2018-12-21. This is a zone split as Qostanay (aka Kostanay) did not switch, so create a zone Asia/Qostanay. Metlakatla, Alaska observes PST this winter only. Add predictions for Iran from 2038 through 2090. Changes to some old timestamps for Nauru (1979) Guam (1959-77), Hong Kong (1904, 1941, 1945, 1952) (others in Pacific during WWII) --- Merge tzdata2018h --- Update to tzdata2018h (new zone Asia/Qostanay) --- Import tzdata2018i from ftp://ftp.iana.org/tz/releases/tzdata2018i.tar.gz Summary of changes in tzdata2018i (2018-12-30 11:05:43 -0800): Due to a change in government, Sao Tome and Principe switches back from +01 to +00 on 2019-01-01 at 02:00. --- Merge tzdata2018i --- Update to tzdata2018i To generate a diff of this commit: cvs rdiff -u -r1.1087.2.10.2.1 -r1.1087.2.10.2.2 \ src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1145.2.37.2.10 -r1.1145.2.37.2.11 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.1.4.7.2.3 -r1.1.1.1.4.7.2.4 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/leapseconds \ src/external/public-domain/tz/dist/zone.tab \ src/external/public-domain/tz/dist/zone1970.tab cvs rdiff -u -r1.1.1.1.4.7.2.4 -r1.1.1.1.4.7.2.5 \ src/external/public-domain/tz/dist/NEWS \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.6.4.3.2.4 -r1.6.4.3.2.5 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.1.4.5.2.4 -r1.1.1.1.4.5.2.5 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.1.4.6.2.3 -r1.1.1.1.4.6.2.4 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.1.4.4.4.2 -r1.1.1.1.4.4.4.3 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.1.6.4 -r1.1.1.1.6.5 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.3.4.3.2.4 -r1.1.1.3.4.3.2.5 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.1.6.3 -r1.1.1.1.6.4 \ src/external/public-domain/tz/dist/ziguard.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1087.2.10.2.1 src/distrib/sets/lists/base/mi:1.1087.2.10.2.2 --- src/distrib/sets/lists/base/mi:1.1087.2.10.2.1 Sun Nov 5 20:43:37 2017 +++ src/distrib/sets/lists/base/mi Mon Jan 7 14:03:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1087.2.10.2.1 2017/11/05 20:43:37 snj Exp $ +# $NetBSD: mi,v 1.1087.2.10.2.2 2019/01/07 14:03:21 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5467,6 +5467,7 @@ ./usr/share/zoneinfo/Asia/Pontianak base-sys-share share ./usr/share/zoneinfo/Asia/Pyongyang base-sys-share share ./usr/share/zoneinfo/Asia/Qatar base-sys-share share +./usr/share/zoneinfo/Asia/Qostanay base-sys-share share ./usr/share/zoneinfo/Asia/Qyzylorda base-sys-share share ./usr/share/zoneinfo/Asia/Rangoon base-sys-share share ./usr/share/zoneinfo/Asia/Riyadh
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Jan 7 14:01:02 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1670 To generate a diff of this commit: cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/doc/CHANGES-7.3 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-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.30 src/doc/CHANGES-7.3:1.1.2.31 --- src/doc/CHANGES-7.3:1.1.2.30 Thu Jan 3 11:13:59 2019 +++ src/doc/CHANGES-7.3 Mon Jan 7 14:01:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.30 2019/01/03 11:13:59 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.31 2019/01/07 14:01:02 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -360,3 +360,23 @@ sys/conf/copyright1.17 Welcome to 2019! [jnemeth, ticket #1669] +external/public-domain/tz/dist/Makefile up to 1.1.1.23 +external/public-domain/tz/dist/NEWS up to 1.1.1.26 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.16 +external/public-domain/tz/dist/africa up to 1.1.1.19 +external/public-domain/tz/dist/asia up to 1.1.1.22 +external/public-domain/tz/dist/australasia up to 1.1.1.17 +external/public-domain/tz/dist/leapseconds up to 1.1.1.12 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.8 +external/public-domain/tz/dist/northamerica up to 1.1.1.22 +external/public-domain/tz/dist/theory.html up to 1.1.1.7 +external/public-domain/tz/dist/version up to 1.1.1.13 +external/public-domain/tz/dist/ziguard.awk up to 1.1.1.4 +external/public-domain/tz/dist/zone.tab up to 1.1.1.16 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.18 +distrib/sets/lists/base/mi (patch) +doc/3RDPARTY (patch) + + Updated tzdata to 2018i. + [kre, ticket #1670] +
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Mon Jan 7 14:00:31 UTC 2019 Modified Files: src/distrib/sets/lists/base [netbsd-7]: mi src/doc [netbsd-7]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-7]: Makefile NEWS TZDATA_VERSION africa asia australasia leapseconds leapseconds.awk northamerica theory.html version ziguard.awk zone.tab zone1970.tab Log Message: Pull up the following, requested by kre in ticket #1670: external/public-domain/tz/dist/Makefile up to 1.1.1.23 external/public-domain/tz/dist/NEWS up to 1.1.1.26 external/public-domain/tz/dist/TZDATA_VERSION up to 1.16 external/public-domain/tz/dist/africa up to 1.1.1.19 external/public-domain/tz/dist/asia up to 1.1.1.22 external/public-domain/tz/dist/australasia up to 1.1.1.17 external/public-domain/tz/dist/leapseconds up to 1.1.1.12 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.8 external/public-domain/tz/dist/northamerica up to 1.1.1.22 external/public-domain/tz/dist/theory.html up to 1.1.1.7 external/public-domain/tz/dist/version up to 1.1.1.13 external/public-domain/tz/dist/ziguard.awk up to 1.1.1.4 external/public-domain/tz/dist/zone.tab up to 1.1.1.16 external/public-domain/tz/dist/zone1970.tab up to 1.1.1.18 distrib/sets/lists/base/mi (patch) doc/3RDPARTY(patch) Import tzdata2018h from ftp://ftp.iana.org/tz/releases/tzdata2018h.tar.gz Summary of changes in tzdata2018h (2018-12-23 17:59:32 -0800): Qyzylorda (aka Kyzylorda) oblast in Kazakhstan moved from +06 to +05 on 2018-12-21. This is a zone split as Qostanay (aka Kostanay) did not switch, so create a zone Asia/Qostanay. Metlakatla, Alaska observes PST this winter only. Add predictions for Iran from 2038 through 2090. Changes to some old timestamps for Nauru (1979) Guam (1959-77), Hong Kong (1904, 1941, 1945, 1952) (others in Pacific during WWII) --- Merge tzdata2018h --- Update to tzdata2018h (new zone Asia/Qostanay) --- Import tzdata2018i from ftp://ftp.iana.org/tz/releases/tzdata2018i.tar.gz Summary of changes in tzdata2018i (2018-12-30 11:05:43 -0800): Due to a change in government, Sao Tome and Principe switches back from +01 to +00 on 2019-01-01 at 02:00. --- Merge tzdata2018i --- Update to tzdata2018i To generate a diff of this commit: cvs rdiff -u -r1.1087.2.14 -r1.1087.2.15 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1145.2.52 -r1.1145.2.53 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.1.4.11 -r1.1.1.1.4.12 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.1.4.12 -r1.1.1.1.4.13 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.6.4.8 -r1.6.4.9 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.1.4.10 -r1.1.1.1.4.11 \ src/external/public-domain/tz/dist/africa \ src/external/public-domain/tz/dist/australasia \ src/external/public-domain/tz/dist/leapseconds \ src/external/public-domain/tz/dist/zone.tab \ src/external/public-domain/tz/dist/zone1970.tab cvs rdiff -u -r1.1.1.1.4.6 -r1.1.1.1.4.7 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.1.4.5 -r1.1.1.1.4.6 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.3.4.8 -r1.1.1.3.4.9 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.1.4.4 -r1.1.1.1.4.5 \ src/external/public-domain/tz/dist/ziguard.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1087.2.14 src/distrib/sets/lists/base/mi:1.1087.2.15 --- src/distrib/sets/lists/base/mi:1.1087.2.14 Sun Jul 29 06:44:19 2018 +++ src/distrib/sets/lists/base/mi Mon Jan 7 14:00:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1087.2.14 2018/07/29 06:44:19 martin Exp $ +# $NetBSD: mi,v 1.1087.2.15 2019/01/07 14:00:31 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5489,6 +5489,7 @@ ./usr/share/zoneinfo/Asia/Pontianak base-sys-share share ./usr/share/zoneinfo/Asia/Pyongyang base-sys-share share ./usr/share/zoneinfo/Asia/Qatar base-sys-share share +./usr/share/zoneinfo/Asia/Qostanay base-sys-share share ./usr/share/zoneinfo/Asia/Qyzylorda base-sys-share share ./usr/share/zoneinfo/Asia/Rangoon base-sys-share share ./usr/share/zoneinfo/Asia/Riyadh base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1145.2.52 src/doc/3RDPARTY:1.1145.2.53 ---
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jan 7 13:50:37 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #1156 and #1157 To generate a diff of this commit: cvs rdiff -u -r1.1.2.86 -r1.1.2.87 src/doc/CHANGES-8.1 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-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.86 src/doc/CHANGES-8.1:1.1.2.87 --- src/doc/CHANGES-8.1:1.1.2.86 Fri Jan 4 14:56:25 2019 +++ src/doc/CHANGES-8.1 Mon Jan 7 13:50:37 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.86 2019/01/04 14:56:25 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.87 2019/01/07 13:50:37 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2181,3 +2181,33 @@ sys/dev/usb/xhci.c1.100 Fix polled device access. [mrg, ticket #1155] +sys/arch/evbmips/conf/ADM5120 1.27 +sys/arch/evbmips/conf/ADM5120-NB 1.25 +sys/arch/evbmips/conf/ADM5120-USB 1.27 +sys/arch/evbmips/conf/ALCHEMY 1.65 +sys/arch/evbmips/conf/AP30 1.38 +sys/arch/evbmips/conf/CI20 1.27 +sys/arch/evbmips/conf/CPMBR1400 1.30 +sys/arch/evbmips/conf/DB120 1.21 +sys/arch/evbmips/conf/ERLITE 1.21 +sys/arch/evbmips/conf/GDIUM 1.35 +sys/arch/evbmips/conf/LINKITSMART7688 1.10 +sys/arch/evbmips/conf/LOONGSON 1.41 +sys/arch/evbmips/conf/MALTA 1.94 +sys/arch/evbmips/conf/MERAKI 1.32 +sys/arch/evbmips/conf/RB153 1.22 +sys/arch/evbmips/conf/RB433UAH 1.18 +sys/arch/evbmips/conf/SBMIPS 1.8 +sys/arch/evbmips/conf/WGT624V3 1.29 +sys/arch/evbmips/conf/XLSATX 1.28 +sys/arch/evbmips/conf/ZYXELKX 1.15 + + Enable the per-priority cyclical scan buffer queue strategy on evbmips + kernels. + [sevan, ticket #1156] + +sys/dev/pci/mpii.c1.19 + + Fix LUN handling (byte order issue). + [kardel, ticket #1157] +
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 7 13:49:39 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: mpii.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #1157):
sys/dev/pci/mpii.c: revision 1.19
fix LUN handling (byte order issue)
now ch0 on a NEOSeries FlexStor II is detected again on LUN 1
this is a regression introduced in 1.15 update and 1.8.10.3 pullup
Tested with NEOSeries FlexStor II:
mpii0 at pci1 dev 0 function 0: vendor 1000 product 00ab (rev. 0x01)
mpii0: interrupting at irq 11
mpii0: HBA 9400-8i8e, firmware 3.0.4.0, MPI 2.6
mpii0: physical disk inserted in slot 9
mpii0: physical disk inserted in slot 13
mpii0: physical disk inserted in slot 16
st0 at scsibus0 target 9 lun 0: tape removable
st0: drive empty
st0: tagged queueing
st1 at scsibus0 target 13 lun 0: tape removable
st1: drive empty
ch0 at scsibus0 target 13 lun 1: changer removable
ch0: 23 slots, 2 drives, 1 picker, 1 portal
st1: tagged queueing
ch0: tagged queueing
ses0 at scsibus0 target 16 lun 0: enclosure
services fixed
ses0: SCSI-3 SES Device
To generate a diff of this commit:
cvs rdiff -u -r1.8.10.3 -r1.8.10.4 src/sys/dev/pci/mpii.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/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.8.10.3 src/sys/dev/pci/mpii.c:1.8.10.4
--- src/sys/dev/pci/mpii.c:1.8.10.3 Sat Dec 8 12:17:13 2018
+++ src/sys/dev/pci/mpii.c Mon Jan 7 13:49:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.8.10.3 2018/12/08 12:17:13 martin Exp $ */
+/* $NetBSD: mpii.c,v 1.8.10.4 2019/01/07 13:49:39 martin Exp $ */
/* OpenBSD: mpii.c,v 1.115 2012/04/11 13:29:14 naddy Exp */
/*
* Copyright (c) 2010 Mike Belopuhov
@@ -20,7 +20,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8.10.3 2018/12/08 12:17:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8.10.4 2019/01/07 13:49:39 martin Exp $");
#include "bio.h"
@@ -3035,7 +3035,7 @@ mpii_scsipi_request(struct scsipi_channe
io->sgl_offset0 = sizeof(struct mpii_msg_scsi_io) / 4;
io->io_flags = htole16(xs->cmdlen);
io->dev_handle = htole16(ccb->ccb_dev_handle);
- io->lun[0] = htole16(periph->periph_lun);
+ io->lun[0] = htobe16(periph->periph_lun);
switch (xs->xs_control & (XS_CTL_DATA_IN | XS_CTL_DATA_OUT)) {
case XS_CTL_DATA_IN:
CVS commit: src/lib/libnvmm
Module Name:src
Committed By: maxv
Date: Mon Jan 7 13:47:33 UTC 2019
Modified Files:
src/lib/libnvmm: libnvmm_x86.c
Log Message:
Improvements and fixes:
* Decode AND/OR/XOR from Group1.
* Sign-extend the immediates and displacements in 64bit mode.
* Fix the storage of {read,write}_guest_memory, now that we batch certain
IO operations we can copy more than 8 bytes, and shit hits the fan.
* Remove the CR4_PSE check in the 64bit MMU. This bit is actually ignored
in long mode, and some systems (like FreeBSD) don't set it.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libnvmm/libnvmm_x86.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnvmm/libnvmm_x86.c
diff -u src/lib/libnvmm/libnvmm_x86.c:1.10 src/lib/libnvmm/libnvmm_x86.c:1.11
--- src/lib/libnvmm/libnvmm_x86.c:1.10 Sun Jan 6 16:10:51 2019
+++ src/lib/libnvmm/libnvmm_x86.c Mon Jan 7 13:47:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libnvmm_x86.c,v 1.10 2019/01/06 16:10:51 maxv Exp $ */
+/* $NetBSD: libnvmm_x86.c,v 1.11 2019/01/07 13:47:33 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -282,7 +282,7 @@ x86_gva_64bit_canonical(gvaddr_t gva)
static int
x86_gva_to_gpa_64bit(struct nvmm_machine *mach, uint64_t cr3,
-gvaddr_t gva, gpaddr_t *gpa, bool has_pse, nvmm_prot_t *prot)
+gvaddr_t gva, gpaddr_t *gpa, nvmm_prot_t *prot)
{
gpaddr_t L4gpa, L3gpa, L2gpa, L1gpa;
uintptr_t L4hva, L3hva, L2hva, L1hva;
@@ -325,8 +325,6 @@ x86_gva_to_gpa_64bit(struct nvmm_machine
*prot &= ~NVMM_PROT_WRITE;
if (pte & PG_NX)
*prot &= ~NVMM_PROT_EXEC;
- if ((pte & PG_PS) && !has_pse)
- return -1;
if (pte & PG_PS) {
*gpa = (pte & PTE64_L3_FRAME);
*gpa = *gpa + (gva & (PTE64_L2_MASK|PTE64_L1_MASK));
@@ -347,8 +345,6 @@ x86_gva_to_gpa_64bit(struct nvmm_machine
*prot &= ~NVMM_PROT_WRITE;
if (pte & PG_NX)
*prot &= ~NVMM_PROT_EXEC;
- if ((pte & PG_PS) && !has_pse)
- return -1;
if (pte & PG_PS) {
*gpa = (pte & PTE64_L2_FRAME);
*gpa = *gpa + (gva & PTE64_L1_MASK);
@@ -402,7 +398,7 @@ x86_gva_to_gpa(struct nvmm_machine *mach
if (is_pae && is_lng) {
/* 64bit */
- ret = x86_gva_to_gpa_64bit(mach, cr3, gva, gpa, has_pse, prot);
+ ret = x86_gva_to_gpa_64bit(mach, cr3, gva, gpa, prot);
} else if (is_pae && !is_lng) {
/* 32bit PAE */
ret = x86_gva_to_gpa_32bit_pae(mach, cr3, gva, gpa, has_pse,
@@ -553,7 +549,6 @@ read_guest_memory(struct nvmm_machine *m
gvaddr_t gva, uint8_t *data, size_t size)
{
struct nvmm_mem mem;
- uint8_t membuf[8];
nvmm_prot_t prot;
gpaddr_t gpa;
uintptr_t hva;
@@ -580,13 +575,12 @@ read_guest_memory(struct nvmm_machine *m
is_mmio = (ret == -1);
if (is_mmio) {
- mem.data = membuf;
+ mem.data = data;
mem.gva = gva;
mem.gpa = gpa;
mem.write = false;
mem.size = size;
(*__callbacks.mem)();
- memcpy(data, mem.data, size);
} else {
memcpy(data, (uint8_t *)hva, size);
}
@@ -606,7 +600,6 @@ write_guest_memory(struct nvmm_machine *
gvaddr_t gva, uint8_t *data, size_t size)
{
struct nvmm_mem mem;
- uint8_t membuf[8];
nvmm_prot_t prot;
gpaddr_t gpa;
uintptr_t hva;
@@ -633,11 +626,10 @@ write_guest_memory(struct nvmm_machine *
is_mmio = (ret == -1);
if (is_mmio) {
- mem.data = membuf;
+ mem.data = data;
mem.gva = gva;
mem.gpa = gpa;
mem.write = true;
- memcpy(mem.data, data, size);
mem.size = size;
(*__callbacks.mem)();
} else {
@@ -878,7 +870,7 @@ enum x86_disp_type {
struct x86_disp {
enum x86_disp_type type;
- uint8_t data[4];
+ uint64_t data; /* 4 bytes, but can be sign-extended */
};
enum REGMODRM__Mod {
@@ -919,7 +911,7 @@ struct x86_regmodrm {
struct x86_immediate {
size_t size; /* 1/2/4/8 */
- uint8_t data[8];
+ uint64_t data;
};
struct x86_sib {
@@ -992,9 +984,9 @@ struct x86_opcode {
bool szoverride;
int defsize;
int allsize;
+ bool group1;
bool group11;
bool immediate;
- int immsize;
int flags;
void (*emul)(struct nvmm_mem *, void (*)(struct nvmm_mem *), uint64_t *);
};
@@ -1008,8 +1000,15 @@ struct x86_group_entry {
#define OPSIZE_DOUB 0x04 /* 4 bytes */
#define OPSIZE_QUAD 0x08 /* 8 bytes */
-#define FLAG_z 0x02
-#define FLAG_e 0x10
+#define FLAG_imm8 0x01
+#define FLAG_immz 0x02
+#define FLAG_ze 0x04
+
+static const struct x86_group_entry group1[8] = {
+ [1] = { .emul = x86_emul_or },
+ [4] = { .emul = x86_emul_and },
+ [6] = { .emul = x86_emul_xor }
+};
static const struct x86_group_entry group11[8] = {
[0] = { .emul = x86_emul_mov }
@@ -1017,9 +1016,27 @@ static const struct x86_group_entry grou
static const struct x86_opcode primary_opcode_table[] = {
/*
+ * Group1
+ */
+ {
+ /* Ev, Ib */
+ .byte = 0x83,
+ .regmodrm = true,
+ .regtorm = true,
+ .szoverride = true,
+ .defsize = -1,
+ .allsize = OPSIZE_WORD|OPSIZE_DOUB|OPSIZE_QUAD,
+ .group1 = true,
+ .immediate = true,
+ .flags
CVS commit: [netbsd-8] src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Mon Jan 7 13:46:57 UTC 2019 Modified Files: src/sys/arch/evbmips/conf [netbsd-8]: ADM5120 ADM5120-NB ADM5120-USB ALCHEMY AP30 CI20 CPMBR1400 DB120 ERLITE GDIUM LINKITSMART7688 LOONGSON MALTA MERAKI RB153 RB433UAH SBMIPS WGT624V3 XLSATX ZYXELKX Log Message: Pull up following revision(s) (requested by sevan in ticket #1156): sys/arch/evbmips/conf/ERLITE: revision 1.21 sys/arch/evbmips/conf/LOONGSON: revision 1.41 sys/arch/evbmips/conf/SBMIPS: revision 1.8 sys/arch/evbmips/conf/MALTA: revision 1.94 sys/arch/evbmips/conf/WGT624V3: revision 1.29 sys/arch/evbmips/conf/ZYXELKX: revision 1.15 sys/arch/evbmips/conf/XLSATX: revision 1.28 sys/arch/evbmips/conf/ADM5120-NB: revision 1.25 sys/arch/evbmips/conf/ADM5120: revision 1.27 sys/arch/evbmips/conf/MERAKI: revision 1.32 sys/arch/evbmips/conf/LINKITSMART7688: revision 1.10 sys/arch/evbmips/conf/DB120: revision 1.21 sys/arch/evbmips/conf/ADM5120-USB: revision 1.27 sys/arch/evbmips/conf/AP30: revision 1.38 sys/arch/evbmips/conf/ALCHEMY: revision 1.65 sys/arch/evbmips/conf/RB153: revision 1.22 sys/arch/evbmips/conf/RB433UAH: revision 1.18 sys/arch/evbmips/conf/CI20: revision 1.27 sys/arch/evbmips/conf/GDIUM: revision 1.35 sys/arch/evbmips/conf/CPMBR1400: revision 1.30 Enable the per-priority cyclical scan buffer queue strategy on evbmips kernels. time results of a Lemote Fuloong 2F extracting the pkgsrc tree brick$ time tar -jxf pkgsrc.tar.bz2 priocscan + log 612.90 real 103.45 user 194.98 sys priocscan nolog 1345.48 real 103.57 user 274.32 sys fcfs + log 736.02 real 101.71 user 192.95 sys fcfs nolog 1475.16 real 103.06 user 271.14 sys To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.6.1 src/sys/arch/evbmips/conf/ADM5120 \ src/sys/arch/evbmips/conf/CPMBR1400 cvs rdiff -u -r1.21 -r1.21.6.1 src/sys/arch/evbmips/conf/ADM5120-NB \ src/sys/arch/evbmips/conf/ADM5120-USB cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/evbmips/conf/ALCHEMY cvs rdiff -u -r1.34 -r1.34.10.1 src/sys/arch/evbmips/conf/AP30 cvs rdiff -u -r1.22.6.1 -r1.22.6.2 src/sys/arch/evbmips/conf/CI20 cvs rdiff -u -r1.16 -r1.16.10.1 src/sys/arch/evbmips/conf/DB120 cvs rdiff -u -r1.15 -r1.15.6.1 src/sys/arch/evbmips/conf/ERLITE cvs rdiff -u -r1.27 -r1.27.6.1 src/sys/arch/evbmips/conf/GDIUM cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/arch/evbmips/conf/LINKITSMART7688 cvs rdiff -u -r1.31.2.1 -r1.31.2.2 src/sys/arch/evbmips/conf/LOONGSON cvs rdiff -u -r1.85.8.1 -r1.85.8.2 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/evbmips/conf/MERAKI cvs rdiff -u -r1.18 -r1.18.6.1 src/sys/arch/evbmips/conf/RB153 cvs rdiff -u -r1.13 -r1.13.10.1 src/sys/arch/evbmips/conf/RB433UAH cvs rdiff -u -r1.3.4.2 -r1.3.4.3 src/sys/arch/evbmips/conf/SBMIPS cvs rdiff -u -r1.25 -r1.25.10.1 src/sys/arch/evbmips/conf/WGT624V3 cvs rdiff -u -r1.22 -r1.22.10.1 src/sys/arch/evbmips/conf/XLSATX cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/evbmips/conf/ZYXELKX 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/evbmips/conf/ADM5120 diff -u src/sys/arch/evbmips/conf/ADM5120:1.22 src/sys/arch/evbmips/conf/ADM5120:1.22.6.1 --- src/sys/arch/evbmips/conf/ADM5120:1.22 Sun Feb 19 07:47:00 2017 +++ src/sys/arch/evbmips/conf/ADM5120 Mon Jan 7 13:46:57 2019 @@ -1,11 +1,11 @@ -# $NetBSD: ADM5120,v 1.22 2017/02/19 07:47:00 rin Exp $ +# $NetBSD: ADM5120,v 1.22.6.1 2019/01/07 13:46:57 martin Exp $ # # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500, # DBAu1000 and DBAu1500 evaluation boards. include "arch/evbmips/conf/std.adm5120" -#ident "GENERIC-$Revision: 1.22 $" +#ident "GENERIC-$Revision: 1.22.6.1 $" maxusers 32 @@ -79,6 +79,11 @@ file-system NFS # Sun NFS-compatible fi #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. +# Alternate buffer queue strategies for better responsiveness under high +# disk I/O load. +#options BUFQ_READPRIO +options BUFQ_PRIOCSCAN + # Networking options options GATEWAY # IP packet forwarding options INET # Internet protocols Index: src/sys/arch/evbmips/conf/CPMBR1400 diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.22 src/sys/arch/evbmips/conf/CPMBR1400:1.22.6.1 --- src/sys/arch/evbmips/conf/CPMBR1400:1.22 Sun Feb 19 07:47:00 2017 +++ src/sys/arch/evbmips/conf/CPMBR1400 Mon Jan 7 13:46:57 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CPMBR1400,v 1.22 2017/02/19 07:47:00 rin Exp $ +# $NetBSD: CPMBR1400,v 1.22.6.1 2019/01/07 13:46:57 martin Exp $ include "arch/evbmips/conf/std.rasoc" @@ -110,6 +110,11 @@ file-system TMPFS # Efficient memory fi options
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Mon Jan 7 13:10:44 UTC 2019
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
When writing a kernel core dump, display the countdown w/o timestamps.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.290 src/sys/arch/sparc64/sparc64/machdep.c:1.291
--- src/sys/arch/sparc64/sparc64/machdep.c:1.290 Wed Dec 19 13:57:50 2018
+++ src/sys/arch/sparc64/sparc64/machdep.c Mon Jan 7 13:10:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.290 2018/12/19 13:57:50 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.291 2019/01/07 13:10:44 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.290 2018/12/19 13:57:50 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.291 2019/01/07 13:10:44 martin Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -122,6 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#define _SPARC_BUS_DMA_PRIVATE
#include
#include
+#include
#include
#include
#include
@@ -755,7 +756,8 @@ dumpsys(void)
/* print out how many MBs we still have to dump */
if ((todo % (1024*1024)) == 0)
-printf_nolog("\r%6" PRIu64 " M ",
+printf_flags(TOCONS|NOTSTAMP,
+"\r%6" PRIu64 " M ",
todo / (1024*1024));
for (off = 0; off < n; off += PAGE_SIZE)
pmap_kenter_pa(dumpspace+off, maddr+off,
@@ -790,7 +792,8 @@ dumpsys(void)
break;
case 0:
- printf("\rdump succeeded\n");
+ printf_flags(TOCONS|NOTSTAMP, "\r ");
+ printf("\ndump succeeded\n");
break;
default:
CVS commit: src/sys
Module Name:src
Committed By: martin
Date: Mon Jan 7 13:09:48 UTC 2019
Modified Files:
src/sys/kern: subr_prf.c
src/sys/sys: kprintf.h systm.h
Log Message:
Introduce new helper printf functions that get passed output
flags. Add a new kprintf flag to avoid adding time stamps
when outputing to the console. Mostly from Christos, any bugs
added by me.
Use above to print the "twiddle" (when using boot -z) without
timestamps.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/kprintf.h
cvs rdiff -u -r1.280 -r1.281 src/sys/sys/systm.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/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.174 src/sys/kern/subr_prf.c:1.175
--- src/sys/kern/subr_prf.c:1.174 Sun Jul 15 07:24:11 2018
+++ src/sys/kern/subr_prf.c Mon Jan 7 13:09:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.174 2018/07/15 07:24:11 martin Exp $ */
+/* $NetBSD: subr_prf.c,v 1.175 2019/01/07 13:09:48 martin Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.174 2018/07/15 07:24:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.175 2019/01/07 13:09:48 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -232,8 +232,8 @@ twiddle(void)
kprintf_lock();
- putchar(twiddle_chars[pos++ & 3], TOCONS, NULL);
- putchar('\b', TOCONS, NULL);
+ putchar(twiddle_chars[pos++ & 3], TOCONS|NOTSTAMP, NULL);
+ putchar('\b', TOCONS|NOTSTAMP, NULL);
kprintf_unlock();
}
@@ -526,7 +526,7 @@ putchar(int c, int flags, struct tty *tp
}
#ifndef KLOG_NOTIMESTAMP
- if (c != '\0' && c != '\n' && needtstamp) {
+ if (c != '\0' && c != '\n' && needtstamp && (flags & NOTSTAMP) == 0) {
addtstamp(flags, tp);
needtstamp = 0;
}
@@ -1052,17 +1052,31 @@ aprint_debug_ifnet(struct ifnet *ifp, co
}
void
-printf_tolog(const char *fmt, ...)
+vprintf_flags(int flags, const char *fmt, va_list ap)
{
- va_list ap;
-
kprintf_lock();
+ kprintf(fmt, flags, NULL, NULL, ap);
+ kprintf_unlock();
+}
+
+void
+printf_flags(int flags, const char *fmt, ...)
+{
+ va_list ap;
va_start(ap, fmt);
- kprintf(fmt, TOLOG, NULL, NULL, ap);
+ vprintf_flags(flags, fmt, ap);
va_end(ap);
+}
- kprintf_unlock();
+void
+printf_tolog(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ vprintf_flags(TOLOG, fmt, ap);
+ va_end(ap);
}
/*
@@ -1074,13 +1088,9 @@ printf_nolog(const char *fmt, ...)
{
va_list ap;
- kprintf_lock();
-
va_start(ap, fmt);
- kprintf(fmt, TOCONS, NULL, NULL, ap);
+ vprintf_flags(TOCONS, fmt, ap);
va_end(ap);
-
- kprintf_unlock();
}
/*
@@ -1095,16 +1105,9 @@ printf(const char *fmt, ...)
{
va_list ap;
- kprintf_lock();
-
va_start(ap, fmt);
- kprintf(fmt, TOCONS | TOLOG, NULL, NULL, ap);
+ vprintf_flags(TOCONS | TOLOG, fmt, ap);
va_end(ap);
-
- kprintf_unlock();
-
- if (!panicstr)
- logwakeup();
}
/*
@@ -1115,11 +1118,7 @@ printf(const char *fmt, ...)
void
vprintf(const char *fmt, va_list ap)
{
- kprintf_lock();
-
- kprintf(fmt, TOCONS | TOLOG, NULL, NULL, ap);
-
- kprintf_unlock();
+ vprintf_flags(TOCONS | TOLOG, fmt, ap);
if (!panicstr)
logwakeup();
Index: src/sys/sys/kprintf.h
diff -u src/sys/sys/kprintf.h:1.12 src/sys/sys/kprintf.h:1.13
--- src/sys/sys/kprintf.h:1.12 Sun Aug 10 16:44:36 2014
+++ src/sys/sys/kprintf.h Mon Jan 7 13:09:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kprintf.h,v 1.12 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: kprintf.h,v 1.13 2019/01/07 13:09:47 martin Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -55,6 +55,7 @@
#define TOBUFONLY 0x0008 /* to the buffer (only) [for snprintf] */
#define TODDB 0x0010 /* to ddb console */
#define NOLOCK 0x1000 /* don't acquire a tty lock */
+#define NOTSTAMP 0x2000 /* no time stamp on console */
void kprintf_init(void);
void kprintf_init_callout(void);
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.280 src/sys/sys/systm.h:1.281
--- src/sys/sys/systm.h:1.280 Sun Dec 2 21:00:13 2018
+++ src/sys/sys/systm.h Mon Jan 7 13:09:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.280 2018/12/02 21:00:13 maxv Exp $ */
+/* $NetBSD: systm.h,v 1.281 2019/01/07 13:09:47 martin Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -240,6 +240,10 @@ void vprintf(const char *, va_list) __pr
int vsnprintf(char *, size_t, const char *, va_list) __printflike(3, 0);
+void vprintf_flags(int, const char *, va_list) __printflike(2, 0);
+
+void printf_flags(int, const char *, ...) __printflike(2, 3);
+
int humanize_number(char *, size_t, uint64_t, const char *, int);
void twiddle(void);
