CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 19 07:59:17 UTC 2019
Modified Files:
src/sys/dev/pci: if_wmvar.h
Log Message:
Modify PHY tree in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.43 src/sys/dev/pci/if_wmvar.h:1.44
--- src/sys/dev/pci/if_wmvar.h:1.43 Thu Feb 7 10:29:53 2019
+++ src/sys/dev/pci/if_wmvar.h Tue Feb 19 07:59:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmvar.h,v 1.43 2019/02/07 10:29:53 msaitoh Exp $ */
+/* $NetBSD: if_wmvar.h,v 1.44 2019/02/19 07:59:17 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -167,13 +167,19 @@ typedef enum {
* |
* -+->
*
- * +--- 82580 - I350
- * |
- * +- 82578 - 82577 - 82579 - I217 - I218 - I219
- * |
- * +- 8256[34] --- 82567 - 82573
+ *
+ * + I347 - E1512 E1543
+ * | |
+ * | +--- I210 - I211
+ * | |
+ * | | +-+--- 82580 - I350
+ * | | | |
+ * | | +- 578 - 577 - 579 - I217 - I218 - I219
+ * | | |
+ * +- 56[34] -- 567 -- 573
+ * | (E1149) (E)
* |
- * -+--->
+ * -+--->
*/
typedef enum {
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Tue Feb 19 07:49:58 UTC 2019
Modified Files:
src/sys/dev/mii: ihphy.c
Log Message:
Match 82580(I340) and I350.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/mii/ihphy.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/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.11 src/sys/dev/mii/ihphy.c:1.12
--- src/sys/dev/mii/ihphy.c:1.11 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/mii/ihphy.c Tue Feb 19 07:49:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.11 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: ihphy.c,v 1.12 2019/02/19 07:49:58 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.11 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.12 2019/02/19 07:49:58 msaitoh Exp $");
#include
#include
@@ -100,6 +100,10 @@ static const struct mii_phydesc ihphys[]
MII_STR_INTEL_I82579 },
{ MII_OUI_INTEL, MII_MODEL_INTEL_I217,
MII_STR_INTEL_I217 },
+ { MII_OUI_INTEL, MII_MODEL_INTEL_I82580,
+ MII_STR_INTEL_I82580},
+ { MII_OUI_INTEL, MII_MODEL_INTEL_I350,
+ MII_STR_INTEL_I350},
{ 0,0,
NULL },
CVS commit: src/sys/kern
Module Name:src
Committed By: mlelstv
Date: Tue Feb 19 06:55:28 UTC 2019
Modified Files:
src/sys/kern: vfs_syscalls.c
Log Message:
Don't allow MNT_UNION on the root, there is no covered filesystem.
Fixes PR 53850
To generate a diff of this commit:
cvs rdiff -u -r1.524 -r1.525 src/sys/kern/vfs_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.524 src/sys/kern/vfs_syscalls.c:1.525
--- src/sys/kern/vfs_syscalls.c:1.524 Tue Feb 5 13:50:10 2019
+++ src/sys/kern/vfs_syscalls.c Tue Feb 19 06:55:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.524 2019/02/05 13:50:10 kamil Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.525 2019/02/19 06:55:28 mlelstv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.524 2019/02/05 13:50:10 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.525 2019/02/19 06:55:28 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -278,6 +278,15 @@ mount_update(struct lwp *l, struct vnode
goto out;
}
+ /*
+ * Enabling MNT_UNION requires a covered mountpoint and
+ * must not happen on the root mount.
+ */
+ if ((flags & MNT_UNION) != 0 && mp->mnt_vnodecovered == NULLVP) {
+ error = EOPNOTSUPP;
+ goto out;
+ }
+
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
KAUTH_REQ_SYSTEM_MOUNT_UPDATE, mp, KAUTH_ARG(flags), data);
if (error)
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Tue Feb 19 05:47:08 UTC 2019
Modified Files:
src/sys/dev/mii: makphy.c
Log Message:
- Match Intel I21[01]. These chips' model number is wrongly set to 0
(== 88E1000 with model number 0). It seems the PHY function is almost the
same as 88E1512. When we add 88E1512 related change to makphy.c, I21[01]
should be take into account.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/mii/makphy.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/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.53 src/sys/dev/mii/makphy.c:1.54
--- src/sys/dev/mii/makphy.c:1.53 Fri Feb 8 09:17:12 2019
+++ src/sys/dev/mii/makphy.c Tue Feb 19 05:47:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.53 2019/02/08 09:17:12 msaitoh Exp $ */
+/* $NetBSD: makphy.c,v 1.54 2019/02/19 05:47:08 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.53 2019/02/08 09:17:12 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.54 2019/02/19 05:47:08 msaitoh Exp $");
#include
#include
@@ -168,15 +168,30 @@ static const struct mii_phydesc makphys[
#define MAKARG_PDOWN true /* Power DOWN */
#define MAKARG_PUP false /* Power UP */
+static bool
+makphy_isi210(device_t parent, struct mii_attach_args *ma)
+{
+
+ /* I21[01]'s model number is 0 */
+ if ((MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxMARVELL)
+ && (MII_MODEL(ma->mii_id2) == 0)
+ && (device_is_a(parent, "wm")))
+ return true;
+ return false;
+}
+
static int
makphymatch(device_t parent, cfdata_t match, void *aux)
{
struct mii_attach_args *ma = aux;
if (mii_phy_match(ma, makphys) != NULL)
- return (10);
+ return 10;
- return (0);
+ if (makphy_isi210(parent, ma))
+ return 10;
+
+ return 0;
}
static void
@@ -186,11 +201,18 @@ makphyattach(device_t parent, device_t s
struct mii_attach_args *ma = aux;
struct mii_data *mii = ma->mii_data;
const struct mii_phydesc *mpd;
+ const char *name;
uint16_t reg;
mpd = mii_phy_match(ma, makphys);
aprint_naive(": Media interface\n");
- aprint_normal(": %s, rev. %d\n", mpd->mpd_name, MII_REV(ma->mii_id2));
+ if (mpd)
+ name = mpd->mpd_name;
+ else if (makphy_isi210(parent, ma))
+ name = MII_STR_xxMARVELL_I210;
+ else
+ panic("Unknown PHY");
+ aprint_normal(": %s, rev. %d\n", name, MII_REV(ma->mii_id2));
sc->mii_dev = self;
sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
@@ -316,7 +338,7 @@ makphy_service(struct mii_softc *sc, str
uint16_t bmcr;
if (!device_is_active(sc->mii_dev))
- return (ENXIO);
+ return ENXIO;
switch (cmd) {
case MII_POLLSTAT:
@@ -324,7 +346,7 @@ makphy_service(struct mii_softc *sc, str
* If we're not polling our PHY instance, just return.
*/
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
break;
case MII_MEDIACHG:
@@ -335,7 +357,7 @@ makphy_service(struct mii_softc *sc, str
if (IFM_INST(ife->ifm_media) != sc->mii_inst) {
PHY_READ(sc, MII_BMCR, &bmcr);
PHY_WRITE(sc, MII_BMCR, bmcr | BMCR_ISO);
- return (0);
+ return 0;
}
/*
@@ -367,15 +389,15 @@ makphy_service(struct mii_softc *sc, str
* If we're not currently selected, just return.
*/
if (IFM_INST(ife->ifm_media) != sc->mii_inst)
- return (0);
+ return 0;
if (mii_phy_tick(sc) == EJUSTRETURN)
- return (0);
+ return 0;
break;
case MII_DOWN:
mii_phy_down(sc);
- return (0);
+ return 0;
}
/* Update the media status. */
@@ -383,7 +405,7 @@ makphy_service(struct mii_softc *sc, str
/* Callback if something changed. */
mii_phy_update(sc, cmd);
- return (0);
+ return 0;
}
static void
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Tue Feb 19 02:51:02 UTC 2019
Modified Files:
src/sys/dev/mii: glxtphy.c
Log Message:
Fix duplicated LEVEL1_LXT1000_OLD entry. I suspect one of them is
LEVEL1_LXT1000.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/mii/glxtphy.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/glxtphy.c
diff -u src/sys/dev/mii/glxtphy.c:1.26 src/sys/dev/mii/glxtphy.c:1.27
--- src/sys/dev/mii/glxtphy.c:1.26 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/mii/glxtphy.c Tue Feb 19 02:51:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: glxtphy.c,v 1.26 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: glxtphy.c,v 1.27 2019/02/19 02:51:02 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.26 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.27 2019/02/19 02:51:02 msaitoh Exp $");
#include
#include
@@ -94,8 +94,8 @@ static const struct mii_phydesc glxtphys
{ MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000_OLD,
MII_STR_LEVEL1_LXT1000_OLD },
- { MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000_OLD,
- MII_STR_LEVEL1_LXT1000_OLD },
+ { MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000,
+ MII_STR_LEVEL1_LXT1000 },
{ 0,0,
NULL },
CVS commit: src/sys/arch/mac68k/mac68k
Module Name:src
Committed By: mrg
Date: Tue Feb 19 00:34:50 UTC 2019
Modified Files:
src/sys/arch/mac68k/mac68k: intr.c
Log Message:
convert 'extern long intrnames' to 'extern char intrnames[MAX_INAME_LENGTH]'.
also, assert that MAX_INAME_LENGTH is not larger than eintrnames - intrnames.
fixes gcc 7's object size checker checks. tested by martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mac68k/mac68k/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/mac68k/intr.c
diff -u src/sys/arch/mac68k/mac68k/intr.c:1.29 src/sys/arch/mac68k/mac68k/intr.c:1.30
--- src/sys/arch/mac68k/mac68k/intr.c:1.29 Mon Dec 20 00:25:36 2010
+++ src/sys/arch/mac68k/mac68k/intr.c Tue Feb 19 00:34:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.29 2010/12/20 00:25:36 matt Exp $ */
+/* $NetBSD: intr.c,v 1.30 2019/02/19 00:34:50 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.29 2010/12/20 00:25:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.30 2019/02/19 00:34:50 mrg Exp $");
#include
#include
@@ -100,9 +100,9 @@ void intr_computeipl(void);
void
intr_init(void)
{
- extern long intrnames;
+ extern char intrnames[MAX_INAME_LENGTH];
+ extern char eintrnames[] __diagused;
const char *inames;
- char *g_inames;
ipl2psl_table[IPL_NONE] = 0;
ipl2psl_table[IPL_SOFTCLOCK] = PSL_S|PSL_IPL1;
@@ -111,7 +111,6 @@ intr_init(void)
ipl2psl_table[IPL_SOFTBIO]= PSL_S|PSL_IPL1;
ipl2psl_table[IPL_HIGH] = PSL_S|PSL_IPL7;
- g_inames = (char *) &intrnames;
if (mac68k_machine.aux_interrupts) {
inames = AUX_INAMES;
@@ -132,7 +131,9 @@ intr_init(void)
}
}
- memcpy(g_inames, inames, MAX_INAME_LENGTH);
+ KASSERT(MAX_INAME_LENGTH <=
+ ((uintptr_t)eintrnames - (uintptr_t)intrnames));
+ memcpy(intrnames, inames, MAX_INAME_LENGTH);
intr_computeipl();
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: christos
Date: Tue Feb 19 00:30:16 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_ddi.c intel_display.c
intel_sdvo.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_bo.c
Log Message:
revert the upsteam portion of previous; we don't want to patch upstream
fallthrough/breaks.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.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/i915/intel_ddi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.9 Mon Feb 18 18:23:41 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Mon Feb 18 19:30:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $ */
+/* $NetBSD: intel_ddi.c,v 1.10 2019/02/19 00:30:16 christos Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.10 2019/02/19 00:30:16 christos Exp $");
#include
@@ -2228,7 +2228,6 @@ static uint32_t translate_signal_level(i
default:
DRM_DEBUG_KMS("Unsupported voltage swing/pre-emphasis level: 0x%x\n",
signal_levels);
- /*FALLTHROUGH*/
case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0:
level = 0;
break;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.25 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.26
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.25 Mon Feb 18 18:23:41 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Mon Feb 18 19:30:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $ */
+/* $NetBSD: intel_display.c,v 1.26 2019/02/19 00:30:16 christos Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.26 2019/02/19 00:30:16 christos Exp $");
#include
#include
@@ -5318,7 +5318,6 @@ intel_display_port_power_domain(struct i
case INTEL_OUTPUT_UNKNOWN:
/* Only DDI platforms should ever use this output type */
WARN_ON_ONCE(!HAS_DDI(dev));
- /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP:
@@ -5353,7 +5352,6 @@ intel_display_port_aux_power_domain(stru
* run the DP detection too.
*/
WARN_ON_ONCE(!HAS_DDI(dev));
- /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_EDP:
intel_dig_port = enc_to_dig_port(&intel_encoder->base);
@@ -6924,7 +6922,6 @@ static int pnv_get_display_clock_speed(s
return 20;
default:
DRM_ERROR("Unknown pnv display core clock 0x%04x\n", gcfgc);
- /*FALLTHROUGH*/
case GC_DISPLAY_CLOCK_133_MHZ_PNV:
return 13;
case GC_DISPLAY_CLOCK_167_MHZ_PNV:
@@ -9960,7 +9957,6 @@ static bool haswell_get_pipe_config(stru
switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
default:
WARN(1, "unknown pipe linked to edp transcoder\n");
- /*FALLTHROUGH*/
case TRANS_DDI_EDP_INPUT_A_ONOFF:
case TRANS_DDI_EDP_INPUT_A_ON:
trans_edp_pipe = PIPE_A;
@@ -12252,7 +12248,6 @@ static bool check_digital_port_conflicts
case INTEL_OUTPUT_UNKNOWN:
if (WARN_ON(!HAS_DDI(dev)))
break;
- /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.11 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.11 Mon Feb 18 18:23:41 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Mon Feb 18 19:30:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sdvo.c,v 1.11 2019/02/18 23:23:41 christos Exp $ */
+/* $NetBSD: intel_sdvo.c,v 1.12 2019/02/19 00:30:16 christos Exp $ */
/*
* Copyright 2006 Dave Airlie
@@ -28,7 +28,7 @@
* Eric Anholt
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.11 2019/02/18 23:23:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.12 2019/02/19 00:30:16 christos Exp $");
#include
#include
@@ -1278,7 +1278,6 @@ static void intel_sdvo_pre_enable(struct
switc
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Tue Feb 19 00:26:58 UTC 2019 Modified Files: src/sys/net: zlib.c Log Message: revert previous. we don't want to change upstream code. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/net/zlib.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/net/zlib.c diff -u src/sys/net/zlib.c:1.35 src/sys/net/zlib.c:1.36 --- src/sys/net/zlib.c:1.35 Mon Feb 18 18:13:14 2019 +++ src/sys/net/zlib.c Mon Feb 18 19:26:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ +/* $NetBSD: zlib.c,v 1.36 2019/02/19 00:26:57 christos Exp $ */ /* * This file is derived from various .h and .c files from the zlib-1.0.4 * distribution by Jean-loup Gailly and Mark Adler, with some additions @@ -11,7 +11,7 @@ * - added inflateIncomp and deflateOutputPending * - allow strm->next_out to be NULL, meaning discard the output * - * $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ + * $Id: zlib.c,v 1.36 2019/02/19 00:26:57 christos Exp $ */ /* @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.36 2019/02/19 00:26:57 christos Exp $"); #define NO_DUMMY_DECL #define NO_ZCFUNCS @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.3 subject to change. Applications should only use zlib.h. */ -/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ +/* @(#) $Id: zlib.c,v 1.36 2019/02/19 00:26:57 christos Exp $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H @@ -294,7 +294,7 @@ void zcfree(voidpf opaque, voidpf ptr) subject to change. Applications should only use zlib.h. */ -/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ +/* @(#) $Id: zlib.c,v 1.36 2019/02/19 00:26:57 christos Exp $ */ #ifndef _DEFLATE_H #define _DEFLATE_H @@ -656,7 +656,7 @@ void _tr_stored_type_only(deflate_state * */ -/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ +/* @(#) $Id: zlib.c,v 1.36 2019/02/19 00:26:57 christos Exp $ */ /* #include "deflate.h" */ @@ -1999,7 +1999,7 @@ local block_state deflate_slow(deflate_s * Addison-Wesley, 1983. ISBN 0-201-06672-6. */ -/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ +/* @(#) $Id: zlib.c,v 1.36 2019/02/19 00:26:57 christos Exp $ */ /* #define GEN_TREES_H */ @@ -3529,7 +3529,6 @@ int ZEXPORT inflate(z_streamp z, int f) break; } z->state->mode = FLAG; - /*FALLTHROUGH*/ case FLAG: NEEDBYTE b = NEXTBYTE; @@ -3547,22 +3546,18 @@ int ZEXPORT inflate(z_streamp z, int f) break; } z->state->mode = DICT4; - /*FALLTHROUGH*/ case DICT4: NEEDBYTE z->state->sub.check.need = (uLong)NEXTBYTE << 24; z->state->mode = DICT3; - /*FALLTHROUGH*/ case DICT3: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 16; z->state->mode = DICT2; - /*FALLTHROUGH*/ case DICT2: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 8; z->state->mode = DICT1; - /*FALLTHROUGH*/ case DICT1: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE; @@ -3596,22 +3591,18 @@ int ZEXPORT inflate(z_streamp z, int f) break; } z->state->mode = CHECK4; - /*FALLTHROUGH*/ case CHECK4: NEEDBYTE z->state->sub.check.need = (uLong)NEXTBYTE << 24; z->state->mode = CHECK3; - /*FALLTHROUGH*/ case CHECK3: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 16; z->state->mode = CHECK2; - /*FALLTHROUGH*/ case CHECK2: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 8; z->state->mode = CHECK1; - /*FALLTHROUGH*/ case CHECK1: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE; @@ -3625,7 +3616,6 @@ int ZEXPORT inflate(z_streamp z, int f) } Tracev((stderr, "inflate: zlib check ok\n")); z->state->mode = DONE; - /*FALLTHROUGH*/ case DONE: return Z_STREAM_END; case BAD: @@ -4207,7 +4197,6 @@ int inflate_blocks(inflate_blocks_statef s->sub.trees.index = 0; Tracev((stderr, "inflate: bits tree ok\n")); s->mode = DTREE; - /*FALLTHROUGH*/ case DTREE: while (t = s->sub.trees.table, s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f)) @@ -4283,7 +4272,6 @@ int inflate_blocks(inflate_blocks_statef } ZFREE(z, s->sub.trees.blens); s->mode = CODES; - /*FALLTHROUGH*/ case CODES: UPDATE if ((r = inflate_codes(s, z, r)) != Z_STREAM_END) @@ -4300,13 +4288,11 @@ int inflate_blocks(inflate_blocks_statef break; } s->mode = DRY; - /*FALLTHROUGH*/
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: christos
Date: Mon Feb 18 23:23:41 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_ddi.c intel_display.c
intel_sdvo.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_bo.c nouveau_usif.c
Log Message:
add failthrough and break as appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
cvs rdiff -u -r1.24 -r1.25 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.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/i915/intel_ddi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.8 Thu Sep 13 04:25:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Mon Feb 18 18:23:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ddi.c,v 1.8 2018/09/13 08:25:55 mrg Exp $ */
+/* $NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.8 2018/09/13 08:25:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $");
#include
@@ -2228,6 +2228,7 @@ static uint32_t translate_signal_level(i
default:
DRM_DEBUG_KMS("Unsupported voltage swing/pre-emphasis level: 0x%x\n",
signal_levels);
+ /*FALLTHROUGH*/
case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0:
level = 0;
break;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.24 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.25
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.24 Sun Sep 23 20:42:34 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Mon Feb 18 18:23:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $ */
+/* $NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $");
#include
#include
@@ -5318,6 +5318,7 @@ intel_display_port_power_domain(struct i
case INTEL_OUTPUT_UNKNOWN:
/* Only DDI platforms should ever use this output type */
WARN_ON_ONCE(!HAS_DDI(dev));
+ /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP:
@@ -5352,6 +5353,7 @@ intel_display_port_aux_power_domain(stru
* run the DP detection too.
*/
WARN_ON_ONCE(!HAS_DDI(dev));
+ /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_EDP:
intel_dig_port = enc_to_dig_port(&intel_encoder->base);
@@ -6922,6 +6924,7 @@ static int pnv_get_display_clock_speed(s
return 20;
default:
DRM_ERROR("Unknown pnv display core clock 0x%04x\n", gcfgc);
+ /*FALLTHROUGH*/
case GC_DISPLAY_CLOCK_133_MHZ_PNV:
return 13;
case GC_DISPLAY_CLOCK_167_MHZ_PNV:
@@ -9957,6 +9960,7 @@ static bool haswell_get_pipe_config(stru
switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
default:
WARN(1, "unknown pipe linked to edp transcoder\n");
+ /*FALLTHROUGH*/
case TRANS_DDI_EDP_INPUT_A_ONOFF:
case TRANS_DDI_EDP_INPUT_A_ON:
trans_edp_pipe = PIPE_A;
@@ -12248,6 +12252,7 @@ static bool check_digital_port_conflicts
case INTEL_OUTPUT_UNKNOWN:
if (WARN_ON(!HAS_DDI(dev)))
break;
+ /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.10 Mon Aug 27 02:16:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Mon Feb 18 18:23:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sdvo.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $ */
+/* $NetBSD: intel_sdvo.c,v 1.11 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright 2006 Dave Airlie
@@ -28,7 +28,7 @@
* Eric Anholt
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.11 2019/02/18 23:23:41 christos Exp $");
#include
#include
@@ -1278,6 +1278,7 @@ static
CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/clk
Module Name:src Committed By: christos Date: Mon Feb 18 23:19:36 UTC 2019 Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/clk: nouveau_nvkm_subdev_clk_gt215.c Log Message: remove multiplication as condition complaint To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/clk/nouveau_nvkm_subdev_clk_gt215.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/subdev/clk/nouveau_nvkm_subdev_clk_gt215.c diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/clk/nouveau_nvkm_subdev_clk_gt215.c:1.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/clk/nouveau_nvkm_subdev_clk_gt215.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/clk/nouveau_nvkm_subdev_clk_gt215.c:1.3 Mon Aug 27 03:38:56 2018 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/clk/nouveau_nvkm_subdev_clk_gt215.c Mon Feb 18 18:19:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_nvkm_subdev_clk_gt215.c,v 1.3 2018/08/27 07:38:56 riastradh Exp $ */ +/* $NetBSD: nouveau_nvkm_subdev_clk_gt215.c,v 1.4 2019/02/18 23:19:36 christos Exp $ */ /* * Copyright 2012 Red Hat Inc. @@ -25,7 +25,7 @@ * Roy Spliet */ #include -__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_clk_gt215.c,v 1.3 2018/08/27 07:38:56 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_clk_gt215.c,v 1.4 2019/02/18 23:19:36 christos Exp $"); #define gt215_clk(p) container_of((p), struct gt215_clk, base) #include "gt215.h" @@ -135,8 +135,9 @@ read_pll(struct gt215_clk *clk, int idx, sclk = read_clk(clk, 0x10 + idx, false); } - if (M * P) - return sclk * N / (M * P); + u32 mp = M * P; + if (mp != 0) + return sclk * N / mp; return 0; }
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Mon Feb 18 23:13:14 UTC 2019 Modified Files: src/sys/net: zlib.c Log Message: add fallthrough's To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/net/zlib.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/net/zlib.c diff -u src/sys/net/zlib.c:1.34 src/sys/net/zlib.c:1.35 --- src/sys/net/zlib.c:1.34 Sun Dec 29 03:09:44 2013 +++ src/sys/net/zlib.c Mon Feb 18 18:13:14 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: zlib.c,v 1.34 2013/12/29 08:09:44 pgoyette Exp $ */ +/* $NetBSD: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ /* * This file is derived from various .h and .c files from the zlib-1.0.4 * distribution by Jean-loup Gailly and Mark Adler, with some additions @@ -11,7 +11,7 @@ * - added inflateIncomp and deflateOutputPending * - allow strm->next_out to be NULL, meaning discard the output * - * $Id: zlib.c,v 1.34 2013/12/29 08:09:44 pgoyette Exp $ + * $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ /* @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.34 2013/12/29 08:09:44 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $"); #define NO_DUMMY_DECL #define NO_ZCFUNCS @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.3 subject to change. Applications should only use zlib.h. */ -/* @(#) $Id: zlib.c,v 1.34 2013/12/29 08:09:44 pgoyette Exp $ */ +/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H @@ -294,7 +294,7 @@ void zcfree(voidpf opaque, voidpf ptr) subject to change. Applications should only use zlib.h. */ -/* @(#) $Id: zlib.c,v 1.34 2013/12/29 08:09:44 pgoyette Exp $ */ +/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ #ifndef _DEFLATE_H #define _DEFLATE_H @@ -656,7 +656,7 @@ void _tr_stored_type_only(deflate_state * */ -/* @(#) $Id: zlib.c,v 1.34 2013/12/29 08:09:44 pgoyette Exp $ */ +/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ /* #include "deflate.h" */ @@ -1999,7 +1999,7 @@ local block_state deflate_slow(deflate_s * Addison-Wesley, 1983. ISBN 0-201-06672-6. */ -/* @(#) $Id: zlib.c,v 1.34 2013/12/29 08:09:44 pgoyette Exp $ */ +/* @(#) $Id: zlib.c,v 1.35 2019/02/18 23:13:14 christos Exp $ */ /* #define GEN_TREES_H */ @@ -3529,6 +3529,7 @@ int ZEXPORT inflate(z_streamp z, int f) break; } z->state->mode = FLAG; + /*FALLTHROUGH*/ case FLAG: NEEDBYTE b = NEXTBYTE; @@ -3546,18 +3547,22 @@ int ZEXPORT inflate(z_streamp z, int f) break; } z->state->mode = DICT4; + /*FALLTHROUGH*/ case DICT4: NEEDBYTE z->state->sub.check.need = (uLong)NEXTBYTE << 24; z->state->mode = DICT3; + /*FALLTHROUGH*/ case DICT3: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 16; z->state->mode = DICT2; + /*FALLTHROUGH*/ case DICT2: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 8; z->state->mode = DICT1; + /*FALLTHROUGH*/ case DICT1: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE; @@ -3591,18 +3596,22 @@ int ZEXPORT inflate(z_streamp z, int f) break; } z->state->mode = CHECK4; + /*FALLTHROUGH*/ case CHECK4: NEEDBYTE z->state->sub.check.need = (uLong)NEXTBYTE << 24; z->state->mode = CHECK3; + /*FALLTHROUGH*/ case CHECK3: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 16; z->state->mode = CHECK2; + /*FALLTHROUGH*/ case CHECK2: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE << 8; z->state->mode = CHECK1; + /*FALLTHROUGH*/ case CHECK1: NEEDBYTE z->state->sub.check.need += (uLong)NEXTBYTE; @@ -3616,6 +3625,7 @@ int ZEXPORT inflate(z_streamp z, int f) } Tracev((stderr, "inflate: zlib check ok\n")); z->state->mode = DONE; + /*FALLTHROUGH*/ case DONE: return Z_STREAM_END; case BAD: @@ -4197,6 +4207,7 @@ int inflate_blocks(inflate_blocks_statef s->sub.trees.index = 0; Tracev((stderr, "inflate: bits tree ok\n")); s->mode = DTREE; + /*FALLTHROUGH*/ case DTREE: while (t = s->sub.trees.table, s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f)) @@ -4272,6 +4283,7 @@ int inflate_blocks(inflate_blocks_statef } ZFREE(z, s->sub.trees.blens); s->mode = CODES; + /*FALLTHROUGH*/ case CODES: UPDATE if ((r = inflate_codes(s, z, r)) != Z_STREAM_END) @@ -4288,11 +4300,13 @@ int inflate_blocks(inflate_blocks_statef break; } s->mode = DRY; + /*FALLTHROUGH*/ case DRY: FLUSH if (s-
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Mon Feb 18 20:27:20 UTC 2019
Modified Files:
src/lib/libc/gen: devname.c
Log Message:
appease string + int warning.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/gen/devname.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/devname.c
diff -u src/lib/libc/gen/devname.c:1.22 src/lib/libc/gen/devname.c:1.23
--- src/lib/libc/gen/devname.c:1.22 Sun Jun 3 17:42:46 2012
+++ src/lib/libc/gen/devname.c Mon Feb 18 15:27:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: devname.c,v 1.22 2012/06/03 21:42:46 joerg Exp $ */
+/* $NetBSD: devname.c,v 1.23 2019/02/18 20:27:20 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: devname.c,v 1.22 2012/06/03 21:42:46 joerg Exp $");
+__RCSID("$NetBSD: devname.c,v 1.23 2019/02/18 20:27:20 christos Exp $");
#include "namespace.h"
#include "reentrant.h"
@@ -95,7 +95,7 @@ devname_ptslookup(dev_t dev, mode_t type
if (type != S_IFCHR || pts == NODEVMAJOR || major(dev) != pts)
return ENOENT;
- rv = snprintf(path, len, "%s%d", _PATH_DEV_PTS + sizeof(_PATH_DEV) - 1,
+ rv = snprintf(path, len, "%s%d", &_PATH_DEV_PTS[sizeof(_PATH_DEV) - 1],
minor(dev));
if (rv < 0 || (size_t)rv >= len)
return ERANGE;
CVS commit: src/games/backgammon/common_source
Module Name:src
Committed By: christos
Date: Mon Feb 18 19:35:44 UTC 2019
Modified Files:
src/games/backgammon/common_source: check.c
Log Message:
add fallthrough
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/games/backgammon/common_source/check.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/common_source/check.c
diff -u src/games/backgammon/common_source/check.c:1.8 src/games/backgammon/common_source/check.c:1.9
--- src/games/backgammon/common_source/check.c:1.8 Sat Oct 13 15:19:39 2012
+++ src/games/backgammon/common_source/check.c Mon Feb 18 14:35:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: check.c,v 1.8 2012/10/13 19:19:39 dholland Exp $ */
+/* $NetBSD: check.c,v 1.9 2019/02/18 19:35:44 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)check.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: check.c,v 1.8 2012/10/13 19:19:39 dholland Exp $");
+__RCSID("$NetBSD: check.c,v 1.9 2019/02/18 19:35:44 christos Exp $");
#endif
#endif /* not lint */
@@ -66,6 +66,7 @@ getmove(struct move *mm)
bflag = pnum;
return;
}
+ /*FALLTHROUGH*/
case -4:
case 0:
if (tflag)
CVS commit: src/external/mpl/bind/lib/libisc
Module Name:src
Committed By: christos
Date: Mon Feb 18 19:30:18 UTC 2019
Modified Files:
src/external/mpl/bind/lib/libisc: Makefile
Log Message:
Avoid clang errors about atomics on arm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/bind/lib/libisc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/lib/libisc/Makefile
diff -u src/external/mpl/bind/lib/libisc/Makefile:1.3 src/external/mpl/bind/lib/libisc/Makefile:1.4
--- src/external/mpl/bind/lib/libisc/Makefile:1.3 Wed Jan 9 11:55:23 2019
+++ src/external/mpl/bind/lib/libisc/Makefile Mon Feb 18 14:30:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/09 16:55:23 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/02/18 19:30:18 christos Exp $
LIB=isc
#USE_SHLIBDIR= yes
@@ -44,6 +44,13 @@ CPPFLAGS.net.c= -Wno-error
SRCS+= ipv6.c
.endif
+# On certain flavors of arm we don't have native atomics only ones
+# libcall ones which are inefficient. But this should not be an
+# error anyway.
+CPPFLAGS.mem.c+= ${${ACTIVE_CC} == "clang":? -Wno-error-atomic-alignment :}
+
+
+
LDADD+=-lz
DPADD+=${LIBZ}
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: maxv Date: Mon Feb 18 19:03:12 UTC 2019 Modified Files: src/sys/arch/x86/x86: pmap.c Log Message: Fix stupid mistake, I didn't reflect correctly the behavior of pmap_sync_pv in the EPT callback, 'optep' can be NULL. To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/sys/arch/x86/x86/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.323 src/sys/arch/x86/x86/pmap.c:1.324 --- src/sys/arch/x86/x86/pmap.c:1.323 Thu Feb 14 08:18:25 2019 +++ src/sys/arch/x86/x86/pmap.c Mon Feb 18 19:03:12 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.323 2019/02/14 08:18:25 cherry Exp $ */ +/* $NetBSD: pmap.c,v 1.324 2019/02/18 19:03:12 maxv Exp $ */ /* * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc. @@ -130,7 +130,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.323 2019/02/14 08:18:25 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.324 2019/02/18 19:03:12 maxv Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -5557,7 +5557,8 @@ pmap_ept_sync_pv(struct vm_page *ptp, va pmap_unmap_pte(); *oattrs = pmap_ept_to_pp_attrs(opte); - *optep = opte; + if (optep != NULL) + *optep = opte; return 0; }
CVS commit: src/sys/dev/nvmm
Module Name:src
Committed By: maxv
Date: Mon Feb 18 12:17:45 UTC 2019
Modified Files:
src/sys/dev/nvmm: nvmm.c
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c
Log Message:
Ah, finally found you. Fix scheduling bug in NVMM.
When processing guest page faults, we were calling uvm_fault with
preemption disabled. The thing is, uvm_fault may block, and if it does,
we land in sleepq_block which calls mi_switch; so we get switched away
while we explicitly asked not to be. From then on things could go really
wrong.
Fix that by processing such faults in MI, where we have preemption enabled
and are allowed to block.
A KASSERT in sleepq_block (or before) would have helped.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/nvmm/nvmm.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/nvmm/x86/nvmm_x86_vmx.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/nvmm.c
diff -u src/sys/dev/nvmm/nvmm.c:1.7 src/sys/dev/nvmm/nvmm.c:1.8
--- src/sys/dev/nvmm/nvmm.c:1.7 Wed Feb 13 16:03:16 2019
+++ src/sys/dev/nvmm/nvmm.c Mon Feb 18 12:17:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.c,v 1.7 2019/02/13 16:03:16 maxv Exp $ */
+/* $NetBSD: nvmm.c,v 1.8 2019/02/18 12:17:45 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.7 2019/02/13 16:03:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.8 2019/02/18 12:17:45 maxv Exp $");
#include
#include
@@ -478,6 +478,24 @@ out:
return error;
}
+static void
+nvmm_do_vcpu_run(struct nvmm_machine *mach, struct nvmm_cpu *vcpu,
+struct nvmm_exit *exit)
+{
+ struct vmspace *vm = mach->vm;
+
+ while (1) {
+ (*nvmm_impl->vcpu_run)(mach, vcpu, exit);
+
+ if (__predict_true(exit->reason != NVMM_EXIT_MEMORY)) {
+ break;
+ }
+ if (uvm_fault(&vm->vm_map, exit->u.mem.gpa, VM_PROT_ALL)) {
+ break;
+ }
+ }
+}
+
static int
nvmm_vcpu_run(struct nvmm_ioc_vcpu_run *args)
{
@@ -493,7 +511,7 @@ nvmm_vcpu_run(struct nvmm_ioc_vcpu_run *
if (error)
goto out;
- (*nvmm_impl->vcpu_run)(mach, vcpu, &args->exit);
+ nvmm_do_vcpu_run(mach, vcpu, &args->exit);
nvmm_vcpu_put(vcpu);
out:
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.26 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.27
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.26 Sat Feb 16 12:58:13 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Mon Feb 18 12:17:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.26 2019/02/16 12:58:13 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.27 2019/02/18 12:17:45 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.26 2019/02/16 12:58:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.27 2019/02/18 12:17:45 maxv Exp $");
#include
#include
@@ -1048,25 +1048,18 @@ svm_exit_npf(struct nvmm_machine *mach,
{
struct svm_cpudata *cpudata = vcpu->cpudata;
gpaddr_t gpa = cpudata->vmcb->ctrl.exitinfo2;
- int error;
-
- error = uvm_fault(&mach->vm->vm_map, gpa, VM_PROT_ALL);
- if (error) {
- exit->reason = NVMM_EXIT_MEMORY;
- if (cpudata->vmcb->ctrl.exitinfo1 & PGEX_W)
- exit->u.mem.perm = NVMM_EXIT_MEMORY_WRITE;
- else if (cpudata->vmcb->ctrl.exitinfo1 & PGEX_X)
- exit->u.mem.perm = NVMM_EXIT_MEMORY_EXEC;
- else
- exit->u.mem.perm = NVMM_EXIT_MEMORY_READ;
- exit->u.mem.gpa = gpa;
- exit->u.mem.inst_len = cpudata->vmcb->ctrl.inst_len;
- memcpy(exit->u.mem.inst_bytes, cpudata->vmcb->ctrl.inst_bytes,
- sizeof(exit->u.mem.inst_bytes));
- } else {
- exit->reason = NVMM_EXIT_NONE;
- }
+ exit->reason = NVMM_EXIT_MEMORY;
+ if (cpudata->vmcb->ctrl.exitinfo1 & PGEX_W)
+ exit->u.mem.perm = NVMM_EXIT_MEMORY_WRITE;
+ else if (cpudata->vmcb->ctrl.exitinfo1 & PGEX_X)
+ exit->u.mem.perm = NVMM_EXIT_MEMORY_EXEC;
+ else
+ exit->u.mem.perm = NVMM_EXIT_MEMORY_READ;
+ exit->u.mem.gpa = gpa;
+ exit->u.mem.inst_len = cpudata->vmcb->ctrl.inst_len;
+ memcpy(exit->u.mem.inst_bytes, cpudata->vmcb->ctrl.inst_bytes,
+ sizeof(exit->u.mem.inst_bytes));
}
static void
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.6 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.7
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.6 Sat Feb 16 12:40:31 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Mon Feb 18 12:17:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.6 2019/02/16 12:40:31 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.7 2019/02/18 12:17:45 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.6 2019/02/16 12:40:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.7 2019/02/18 12:17:45 maxv Exp $");
CVS commit: src/common/lib/libc
Module Name:src
Committed By: martin
Date: Mon Feb 18 11:22:56 UTC 2019
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_cas_64.S
src/common/lib/libc/atomic: atomic_init_testset.c
Log Message:
Add some atomic_cas_64_ni aliases
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/atomic/atomic_init_testset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.10 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.11
--- src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.10 Wed Mar 5 17:20:48 2014
+++ src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Mon Feb 18 11:22:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_64.S,v 1.10 2014/03/05 17:20:48 matt Exp $ */
+/* $NetBSD: atomic_cas_64.S,v 1.11 2019/02/18 11:22:56 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -70,6 +70,8 @@ ENTRY_NP(_atomic_cas_64)
END(_atomic_cas_64)
ATOMIC_OP_ALIAS(atomic_cas_64,_atomic_cas_64)
+ATOMIC_OP_ALIAS(atomic_cas_64_ni,_atomic_cas_64)
+STRONG_ALIAS(_atomic_cas_64_ni,_atomic_cas_64)
CRT_ALIAS(__sync_val_compare_and_swap_8,_atomic_cas_64)
#endif /* _ARM_ARCH_6 */
Index: src/common/lib/libc/atomic/atomic_init_testset.c
diff -u src/common/lib/libc/atomic/atomic_init_testset.c:1.15 src/common/lib/libc/atomic/atomic_init_testset.c:1.16
--- src/common/lib/libc/atomic/atomic_init_testset.c:1.15 Thu Feb 27 09:39:00 2014
+++ src/common/lib/libc/atomic/atomic_init_testset.c Mon Feb 18 11:22:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_init_testset.c,v 1.15 2014/02/27 09:39:00 matt Exp $ */
+/* $NetBSD: atomic_init_testset.c,v 1.16 2019/02/18 11:22:56 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__RCSID("$NetBSD: atomic_init_testset.c,v 1.15 2014/02/27 09:39:00 matt Exp $");
+__RCSID("$NetBSD: atomic_init_testset.c,v 1.16 2019/02/18 11:22:56 martin Exp $");
#include "atomic_op_namespace.h"
@@ -354,7 +354,8 @@ __strong_alias(_atomic_cas_ptr_ni,_atomi
//atomic_op_alias(atomic_cas_8,_atomic_cas_8)
//atomic_op_alias(atomic_cas_8_ni,_atomic_cas_8)
#ifdef __HAVE_ATOMIC_CAS_64_UP
-//atomic_op_alias(atomic_cas_64_ni,_atomic_cas_64)
+atomic_op_alias(atomic_cas_64_ni,_atomic_cas_64)
+__strong_alias(_atomic_cas_64_ni,_atomic_cas_64)
crt_alias(__sync_val_compare_and_swap_8,_atomic_cas_64)
#endif
crt_alias(__sync_val_compare_and_swap_4,_atomic_cas_32)
