Re: CVS commit: src/lib/libedit
Am 19.05.14 21:54, schrieb Christos Zoulas:
Module Name: src
Committed By: christos
Date: Mon May 19 19:54:12 UTC 2014
Modified Files:
src/lib/libedit: tty.c tty.h
Log Message:
more tty modes refactoring, no functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/lib/libedit/tty.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libedit/tty.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/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.43 src/lib/libedit/tty.c:1.44
--- src/lib/libedit/tty.c:1.43Mon May 19 13:14:41 2014
+++ src/lib/libedit/tty.c Mon May 19 15:54:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.43 2014/05/19 17:14:41 christos Exp $*/
+/* $NetBSD: tty.c,v 1.44 2014/05/19 19:54:12 christos Exp $*/
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)tty.c8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: tty.c,v 1.43 2014/05/19 17:14:41 christos Exp $);
+__RCSID($NetBSD: tty.c,v 1.44 2014/05/19 19:54:12 christos Exp $);
#endif
#endif /* not lint not SCCSID */
@@ -919,6 +919,58 @@ tty_bind_char(EditLine *el, int force)
}
+private tcflag_t *
private? I think you mean static, right?
+tty__get_flag(struct termios *t, int kind) {
+ switch (kind) {
+ case MD_INP:
+ return t-c_iflag;
+ case MD_OUT:
+ return t-c_oflag;
+ case MD_CTL:
+ return t-c_cflag;
+ case MD_LIN:
+ return t-c_lflag;
+ default:
+ abort();
+ /*NOTREACHED*/
+ }
+}
+
+
+private tcflag_t
dito
+tty_update_flag(EditLine *el, tcflag_t f, int mode, int kind)
+{
+ f = ~el-el_tty.t_t[mode][kind].t_clrmask;
+ f |= el-el_tty.t_t[mode][kind].t_setmask;
+ return f;
+}
+
+
+private void
dito
+tty_update_flags(EditLine *el, int kind)
+{
+ tcflag_t *tt, *ed, *ex;
+ tt = tty__get_flag(el-el_tty.t_ts, kind);
+ ed = tty__get_flag(el-el_tty.t_ed, kind);
+ ex = tty__get_flag(el-el_tty.t_ex, kind);
+
+ if (*tt != *ex (kind != MD_CTL || *tt != *ed)) {
+ *ed = tty_update_flag(el, *tt, ED_IO, kind);
+ *ex = tty_update_flag(el, *tt, EX_IO, kind);
+ }
+}
+
+
+private void
dito
+tty_update_char(EditLine *el, int mode, int c) {
+ if (!((el-el_tty.t_t[mode][MD_CHAR].t_setmask C_SH(c)))
+ (el-el_tty.t_c[TS_IO][c] != el-el_tty.t_c[EX_IO][c]))
+ el-el_tty.t_c[mode][c] = el-el_tty.t_c[TS_IO][c];
+ if (el-el_tty.t_t[mode][MD_CHAR].t_clrmask C_SH(c))
+ el-el_tty.t_c[mode][c] = el-el_tty.t_vdisable;
+}
+
+
[...]
Christoph
Re: CVS commit: src/sys/sys
Am 29.03.14 20:30, schrieb Christos Zoulas:
Module Name: src
Committed By: christos
Date: Sat Mar 29 19:30:49 UTC 2014
Modified Files:
src/sys/sys: param.h
Log Message:
sprintf removal
{pci,eisa}_intr_string signature change
To generate a diff of this commit:
cvs rdiff -u -r1.447 -r1.448 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.447 src/sys/sys/param.h:1.448
--- src/sys/sys/param.h:1.447 Mon Mar 24 09:42:40 2014
+++ src/sys/sys/param.h Sat Mar 29 15:30:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.447 2014/03/24 13:42:40 hannken Exp $ */
+/* $NetBSD: param.h,v 1.448 2014/03/29 19:30:49 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 699003800 /* NetBSD 6.99.38 */
+#define __NetBSD_Version__ 699003800 /* NetBSD 6.99.39 */
change in comment only is not enough.
Christoph
Re: CVS commit: src/sys/arch/amd64/conf
Am 15.03.14 20:18, schrieb John Nemeth: On Mar 15, 1:50pm, Jonathan A. Kollasch wrote: } } Module Name:src } Committed By: jakllsch } Date: Sat Mar 15 13:50:01 UTC 2014 } } Modified Files: } src/sys/arch/amd64/conf: XEN3_DOMU } } Log Message: } Enable PCI support in amd64 XEN3_DOMU config to match i386 XEN3_DOMU config. PCI support in a DOMU kernel would only be useful when the DOM0 is setup with pci passthrough for some device, which isn't the norm. My answer would be to go the opposite way and disable PCI support in both kernels. Also, simply enabling PCI support without adding a whole schwak of PCI devices isn't very useful. As well, I don't think PCI passthrough is working with modern versions of Xen. PCI passthrough does work as upstream QEMU got the patches now. The actual missing part is the NetBSD adaption of the PCI access code in QEMU and in libxl. Christoph
Re: CVS commit: src/external/gpl3/gcc
On 26.02.14 11:50, matthew green wrote:
Module Name: src
Committed By: mrg
Date: Wed Feb 26 10:50:23 UTC 2014
Added Files:
src/external/gpl3/gcc: gcc2gcc.old
Log Message:
script to copy gcc to gcc.old, ready for importing.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/gcc2gcc.old
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/gpl3/gcc/gcc2gcc.old
diff -u /dev/null src/external/gpl3/gcc/gcc2gcc.old:1.1
--- /dev/null Wed Feb 26 10:50:23 2014
+++ src/external/gpl3/gcc/gcc2gcc.old Wed Feb 26 10:50:23 2014
@@ -0,0 +1,63 @@
+#! /bin/sh
+#
+#$NetBSD: gcc2gcc.old,v 1.1 2014/02/26 10:50:23 mrg Exp $
+
+# run it like eg:
+#
+# % ./gcc2gcc.old /usr/src/external/gpl3/gcc /home/import/gcc
+
+doit=echo
+doit=
Isn't that a nop?
+
+progname=$(basename $0)
+
+usage() {
+ echo Usage: $progname src/external/gpl3/gcc copy-to-dir 12
+ edho Note that copy-to-dir must not exist. 12
s/edho/echo/
+ exit 1
+}
+
+#set -x
+set -e
+
+srcdir=$1
+destdir=$2
+
+if [ -z $srcdir -o -z $destdir ]; then
+ usage
+fi
+
+if [ ! -d $srcdir ]; then
+ echo srcdir '$srcdir' is not a directory 12
+ usage
+fi
+if [ -e $destdir ]; then
+ echo destdir '$destdir' is something 12
+ ls -ld $destdir
+ usage
+fi
+
+# Assumes that ../gcc/. == .
+cd $srcdir/..
+if [ ! -d gcc ]; then
+ echo $srcdir/../gcc doesn't exist. 12
+ usage
+fi
+
+echo Copying files to $destdir...
+$doit pax -rwpp gcc $destdir
+
+
+# clean the copy
+echo Cleaning CVS turds and ChangeLogs
+$doit find $destdir -name .CVS -exec rm -rf {} +
+$doit find $destdir -name CVS -exec rm -rf {} +
+$doit find $destdir -name ChangeLog* -exec rm -f {} +
+$doit rm -f $destdir/gcc2netbsd $destdir/gcc2gcc.old
+
+date=$(date +%Y%m%M-%H%M)
I think, it isn't necessary to invoke a subshell.
date=`date +%Y%m%M-%H%M` is enough.
Christoph
+echo GCC copied to gcc.old. use these commands to import:
+echo cd $destdir/gcc
+echo cvs import src/external/gpl3/gcc.old NetBSD src-external-gpl3-gcc-$date
+
+exit 0
Re: CVS commit: src
Am 13.02.14 00:24, schrieb David Laight: [...] Index: src/sys/arch/amd64/amd64/cpufunc.S diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.24 src/sys/arch/amd64/amd64/cpufunc.S:1.25 --- src/sys/arch/amd64/amd64/cpufunc.S:1.24 Sun Feb 9 19:42:04 2014 +++ src/sys/arch/amd64/amd64/cpufunc.SWed Feb 12 23:24:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.24 2014/02/09 19:42:04 dsl Exp $ */ +/* $NetBSD: cpufunc.S,v 1.25 2014/02/12 23:24:09 dsl Exp $ */ /*- * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -441,6 +441,10 @@ ENTRY(fnstcw) fnstcw (%rdi) ret +ENTRY(fngetsw) + fnstsw %ax + ret + Not sure if you mean fngetsw here (copy paste) ? Christoph ENTRY(fnstsw) fnstsw (%rdi) ret @@ -480,7 +484,7 @@ ENTRY(fxrstor) ENTRY(fldummy) ffree %st(7) - flds(%rdi) + fldz ret ENTRY(xsave)
Re: CVS commit: [netbsd-6] src/usr.bin/gzip
Am 05.12.13 19:44, schrieb Manuel Bouyer:
Module Name: src
Committed By: bouyer
Date: Thu Dec 5 18:44:26 UTC 2013
Modified Files:
src/usr.bin/gzip [netbsd-6]: zmore
Log Message:
Pull up following revision(s) (requested by pettai in ticket #982):
distrib/sets/lists/base/mi: revision 1.1049
distrib/sets/lists/man/mi: revision 1.1449
usr.bin/gzip/Makefile: revision 1.17
usr.bin/gzip/Makefile: revision 1.18
usr.bin/gzip/zmore: revision 1.4
usr.bin/gzip/zmore.1: revision 1.4
Added zless(1) - comes in the lastest version of zmore(1) from OpenBSD
(OKed by tron@)
Add zfgrep that fell off from last update
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.52.1 src/usr.bin/gzip/zmore
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/zmore
diff -u src/usr.bin/gzip/zmore:1.3 src/usr.bin/gzip/zmore:1.3.52.1
--- src/usr.bin/gzip/zmore:1.3Mon Mar 29 09:59:42 2004
+++ src/usr.bin/gzip/zmoreThu Dec 5 18:44:26 2013
@@ -1,8 +1,8 @@
#!/bin/sh -
#
-# $NetBSD: zmore,v 1.3 2004/03/29 09:59:42 wiz Exp $
+# $NetBSD: zmore,v 1.3.52.1 2013/12/05 18:44:26 bouyer Exp $
#
-# $OpenBSD: zmore,v 1.4 2003/07/29 07:42:45 otto Exp $
+# $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $
#
# Copyright (c) 2003 Todd C. Miller todd.mil...@courtesan.com
#
@@ -41,6 +41,12 @@ while test $# -ne 0; do
esac
done
+if [ `basename $0` == zless ] ; then
The == is bash'ism.
Christoph
+ pager=${PAGER-less}
+else
+ pager=${PAGER-more}
+fi
+
# No files means read from stdin
if [ $# -eq 0 ]; then
gzip -cdfq 21 | ${PAGER-more} $flags
Re: CVS commit: src/sys
Am 23.11.13 17:15, schrieb Jeff Rizzo: Module Name: src Committed By: riz Date: Sat Nov 23 16:15:25 UTC 2013 Modified Files: src/sys/coda: coda_vfsops.c src/sys/compat/netbsd32: netbsd32_compat_20.c src/sys/compat/osf1: osf1_mount.c src/sys/compat/ultrix: ultrix_fs.c src/sys/gdbscripts: vchain Log Message: Since mountlist is now a TAILQ, convert some missed usages so things build again. Why don't you use the TAILQ macros? I saw christos@ already did that for coda_vfsops.c. Christoph
Re: CVS commit: src/sys/arch/x86/pci
On 12.11.13 16:08, SAITOH Masanobu wrote: Module Name: src Committed By: msaitoh Date: Tue Nov 12 15:08:01 UTC 2013 Modified Files: src/sys/arch/x86/pci: amdtemp.c Log Message: Calcurate the processor family correctly. The extended family bits should be added only when the base family is 0xf. The old code is correct as the extended family bits are 0 when base family is 0xf. Also, the amdtemp driver does not attach on such old cpus. Christoph
Re: CVS commit: src/sys/arch/x86/pci
On 12.11.13 16:38, SAITOH Masanobu wrote: (2013/11/13 0:12), Christoph Egger wrote: On 12.11.13 16:08, SAITOH Masanobu wrote: Module Name:src Committed By: msaitoh Date: Tue Nov 12 15:08:01 UTC 2013 Modified Files: src/sys/arch/x86/pci: amdtemp.c Log Message: Calcurate the processor family correctly. The extended family bits should be added only when the base family is 0xf. The old code is correct as the extended family bits are 0 when base family is 0xf. Also, the amdtemp driver does not attach on such old cpus. Christoph My change doesn't break anything, right? It's intentional. No, it does not break anything. I'm now fixing and rewriting macros for cpu family and model to avoid trivial bugs and to reduce the code duplication. Ok. Christoph
Re: CVS commit: src/external/lgpl3/gmp/dist
On 16.12.12 15:40, Christoph Egger wrote: Module Name:src Committed By: cegger Date: Sun Dec 16 14:40:08 UTC 2012 Modified Files: src/external/lgpl3/gmp/dist: gmp-h.in Log Message: Always use extern __inline__ with gcc= 4.2. Fall back to prototypes on older gcc versions. Fixes link errors (duplicate symbols) when mpfr's configure check for libgmp Forgot to mention this has been discussed on tech-toolchain. Christoph
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: cegger Date: Sun Dec 16 14:40:08 UTC 2012 Modified Files: src/external/lgpl3/gmp/dist: gmp-h.in Log Message: Always use extern __inline__ with gcc = 4.2. Fall back to prototypes on older gcc versions. Fixes link errors (duplicate symbols) when mpfr's configure check for libgmp To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/dist/gmp-h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/gmp-h.in diff -u src/external/lgpl3/gmp/dist/gmp-h.in:1.2 src/external/lgpl3/gmp/dist/gmp-h.in:1.3 --- src/external/lgpl3/gmp/dist/gmp-h.in:1.2 Sat Jul 2 14:05:03 2011 +++ src/external/lgpl3/gmp/dist/gmp-h.in Sun Dec 16 14:40:07 2012 @@ -421,10 +421,9 @@ typedef __mpq_struct *mpq_ptr; GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 inline semantics, unless -fgnu89-inline is used. */ #ifdef __GNUC__ -#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 __GNUC_MINOR__ == 2) +#if (defined __GNUC_STDC_INLINE__) || \ +(__GNUC__ == 4 __GNUC_MINOR__ = 2) || (__GNUC__ 4) #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) -#else -#define __GMP_EXTERN_INLINE extern __inline__ #endif #define __GMP_INLINE_PROTOTYPES 1 #endif
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: cegger Date: Sun Dec 16 14:40:08 UTC 2012 Modified Files: src/external/lgpl3/gmp/dist: gmp-h.in Log Message: Always use extern __inline__ with gcc = 4.2. Fall back to prototypes on older gcc versions. Fixes link errors (duplicate symbols) when mpfr's configure check for libgmp To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/dist/gmp-h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi/wmi
Module Name:src
Committed By: cegger
Date: Fri Oct 12 13:02:30 UTC 2012
Modified Files:
src/sys/dev/acpi/wmi: wmi_hp.c
Log Message:
Add support for various things:
- hddtemp sensor
- ambient light sensor on/off (via sysctl)
- display info
- docking station info
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/wmi/wmi_hp.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/acpi/wmi/wmi_hp.c
diff -u src/sys/dev/acpi/wmi/wmi_hp.c:1.6 src/sys/dev/acpi/wmi/wmi_hp.c:1.7
--- src/sys/dev/acpi/wmi/wmi_hp.c:1.6 Wed Feb 16 13:15:49 2011
+++ src/sys/dev/acpi/wmi/wmi_hp.c Fri Oct 12 13:02:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_hp.c,v 1.6 2011/02/16 13:15:49 jruoho Exp $ */
+/* $NetBSD: wmi_hp.c,v 1.7 2012/10/12 13:02:28 cegger Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wmi_hp.c,v 1.6 2011/02/16 13:15:49 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: wmi_hp.c,v 1.7 2012/10/12 13:02:28 cegger Exp $);
#include sys/param.h
#include sys/device.h
@@ -70,6 +70,13 @@ __KERNEL_RCSID(0, $NetBSD: wmi_hp.c,v 1
#include dev/sysmon/sysmonvar.h
+#include sys/sysctl.h
+
+/*
+ * HP CMI whitepaper:
+ * http://h20331.www2.hp.com/Hpsub/downloads/cmi_whitepaper.pdf
+ */
+
#define _COMPONENT ACPI_RESOURCE_COMPONENT
ACPI_MODULE_NAME (wmi_hp)
@@ -93,6 +100,12 @@ ACPI_MODULE_NAME (wmi_hp)
#define WMI_HP_HOTKEY_BRIGHTNESS_UP 0x02
#define WMI_HP_HOTKEY_BRIGHTNESS_DOWN 0x03
+#define WMI_HP_HOTKEY_PROG1 0x20e6
+#define WMI_HP_HOTKEY_MEDIA1 0x20e8
+#define WMI_HP_HOTKEY_MEDIA2 0x2142
+#define WMI_HP_HOTKEY_INFO 0x213b
+#define WMI_HP_HOTKEY_DIRECTION 0x2169
+#define WMI_HP_HOTKEY_HELP 0x231b
/* WMI_HP_HOTKEY_UNKNOWN 0xXX */
#define WMI_HP_SWITCH_WLAN 0x01
@@ -118,12 +131,21 @@ ACPI_MODULE_NAME (wmi_hp)
#define WMI_HP_GUID_EVENT 95F24279-4D7B-4334-9387-ACCDC67EF61C
#define WMI_HP_GUID_METHOD 5FB7F034-2C63-45E9-BE91-3D44E2C707E4
+#define WMI_HP_GUID_CMI 2D114B49-2DFB-4130-B8FE-4A3C09E75133
#define WMI_HP_SENSOR_WLAN 0
#define WMI_HP_SENSOR_BT 1
#define WMI_HP_SENSOR_WWAN 2
-#define WMI_HP_SENSOR_COUNT 3
-#define WMI_HP_SENSOR_SIZE 3 * sizeof(envsys_data_t)
+#define WMI_HP_SENSOR_HDDTEMP 3
+#define WMI_HP_SENSOR_DISPLAY 4
+#define WMI_HP_SENSOR_DOCK 5
+#define WMI_HP_SENSOR_COUNT 6
+#define WMI_HP_SENSOR_SIZE WMI_HP_SENSOR_COUNT * sizeof(envsys_data_t)
+
+#define ACPI_HP_CMI_PATHS 0x01
+#define ACPI_HP_CMI_ENUMS 0x02
+#define ACPI_HP_CMI_FLAGS 0x04
+#define ACPI_HP_CMI_MAX_INSTANCE 0x08
struct wmi_hp_softc {
device_t sc_dev;
@@ -143,13 +165,17 @@ static void wmi_hp_notify_handler(ACPI_H
static void wmi_hp_hotkey(void *);
static bool wmi_hp_method(struct wmi_hp_softc *);
static bool wmi_hp_method_read(struct wmi_hp_softc *, uint8_t);
-
-#if 0
static bool wmi_hp_method_write(struct wmi_hp_softc *, uint8_t, uint32_t);
-#endif
static void wmi_hp_sensor_init(struct wmi_hp_softc *);
-static void wmi_hp_sensor_update(void *);
+static void wmi_hp_sensor_switch_update(void *);
+static void wmi_hp_sensor_refresh(struct sysmon_envsys *, envsys_data_t *);
+
+static void sysctl_wmi_hp_setup(struct wmi_hp_softc *);
+static int sysctl_wmi_hp_set_als(SYSCTLFN_PROTO);
+static struct sysctllog *wmihp_sysctllog = NULL;
+static int wmihp_als = 0;
+static struct wmi_hp_softc *wmi_hp_sc = NULL; /* XXX */
CFATTACH_DECL_NEW(wmihp, sizeof(struct wmi_hp_softc),
wmi_hp_match, wmi_hp_attach, wmi_hp_detach, NULL);
@@ -193,7 +219,9 @@ wmi_hp_attach(device_t parent, device_t
if (sc-sc_sensor == NULL)
return;
+ wmi_hp_sc = sc; /* XXX Can I pass sc as a cookie to sysctl? */
wmi_hp_sensor_init(sc);
+ sysctl_wmi_hp_setup(sc);
}
static int
@@ -215,6 +243,11 @@ wmi_hp_detach(device_t self, int flags)
pmf_device_deregister(self);
+ if (wmihp_sysctllog != NULL)
+ sysctl_teardown(wmihp_sysctllog);
+ wmihp_sysctllog = NULL;
+ wmi_hp_sc = NULL;
+
return 0;
}
@@ -283,7 +316,7 @@ wmi_hp_notify_handler(ACPI_HANDLE hdl, u
switch (val) {
case WMI_HP_EVENT_SWITCH:
- rv = AcpiOsExecute(handler, wmi_hp_sensor_update, self);
+ rv = AcpiOsExecute(handler, wmi_hp_sensor_switch_update, self);
break;
case WMI_HP_EVENT_HOTKEY:
@@ -327,6 +360,24 @@ wmi_hp_hotkey(void *aux)
pmf_event_inject(NULL, PMFE_DISPLAY_BRIGHTNESS_DOWN);
break;
+ case WMI_HP_HOTKEY_PROG1:
+ aprint_debug_dev(self, PROG1 hotkey pressed\n);
+ break;
+ case WMI_HP_HOTKEY_MEDIA1:
+ aprint_debug_dev(self, MEDIA1 hotkey pressed\n);
+ break;
+ case WMI_HP_HOTKEY_MEDIA2:
+ aprint_debug_dev(self, MEDIA2 hotkey pressed\n);
+ break;
+ case WMI_HP_HOTKEY_INFO:
+ aprint_debug_dev(self, INFO hotkey pressed\n);
+ break;
+ case WMI_HP_HOTKEY_DIRECTION:
+ aprint_debug_dev(self, DIRECTION hotkey pressed\n);
+ break;
+ case WMI_HP_HOTKEY_HELP:
+
CVS commit: src/sys/dev/acpi/wmi
Module Name:src Committed By: cegger Date: Fri Oct 12 13:02:30 UTC 2012 Modified Files: src/sys/dev/acpi/wmi: wmi_hp.c Log Message: Add support for various things: - hddtemp sensor - ambient light sensor on/off (via sysctl) - display info - docking station info To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/wmi/wmi_hp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/usb
On 07/17/12 02:56, matthew green wrote: Module Name:src Committed By: mrg Date: Sun Jul 15 21:13:31 UTC 2012 Modified Files: src/sys/dev/usb: usb_subr.c usbdi.c usbdi.h usbdivar.h Log Message: commit my workaround for PR 46648 for now, as the more involved fix is not ready yet: move the clear endpoint stall async call into the task thread, to avoid trying to call kmem_alloc() from a softint thread. XXX ideally moving callbacks into the task thread (or perhaps a different high priority task thread) would be better than this workaround, once that method is working. I get this at boot now: panic: lockdebug_lookup: uninitialized lock (lock=0x80d3fe28, from=806fd980) fatal breakpoint trap in supervisor mode trap type 1 code 0 rip 80212035 cs e030 rflags 246 cr2 0 ilevel 8 rsp a00019f0d910 curlwp 0xa13e2c00 pid 0 lid 26 lowest kstack 0xa00019f0a000 Stopped in pid 0.26 (system) at netbsd:breakpoint+0x5: leave breakpoint() at netbsd:breakpoint+0x5 vpanic() at netbsd:vpanic+0x1f2 printf_nolog() at netbsd:printf_nolog lockdebug_wantlock() at netbsd:lockdebug_wantlock+0x18f mutex_enter() at netbsd:mutex_enter+0x27b usb_rem_task() at netbsd:usb_rem_task+0x2b usbd_kill_pipe() at netbsd:usbd_kill_pipe+0x56 usbd_new_device() at netbsd:usbd_new_device+0x41b usb_doattach() at netbsd:usb_doattach+0xea config_interrupts_thread() at netbsd:config_interrupts_thread+0x30 can you show the prior messages please? what usb devices do you have? [...] ohci0 at pci0 dev 3 function 0: ServerWorks HT1000 USB (rev. 0x01) csr: 02b00017 ohci0: interrupting at ioapic0 pin 10, event channel 10 ohci0: OHCI version 1.0, legacy support usb0 at ohci0: USB revision 1.0 usb0: WARNING: power management not supported ohci1 at pci0 dev 3 function 1: ServerWorks HT1000 USB (rev. 0x01) csr: 02b00017 ohci1: interrupting at ioapic0 pin 10, event channel 10 ohci1: OHCI version 1.0, legacy support usb1 at ohci1: USB revision 1.0 usb1: WARNING: power management not supported ehci0 at pci0 dev 3 function 2: ServerWorks HT1000 USB (rev. 0x01) ehci0: interrupting at ioapic0 pin 10, event channel 10 ehci0: companion controllers, 2 ports each: ohci0 ohci1 usb2 at ehci0: USB revision 2.0 usb2: WARNING: power management not supported [...] isa0 at pcib0 com1 at isa0 port 0x2f8-0x2ff irq 3: ns16550a, working fifo Initializing SSP: bd0cbf008749bd1a 40f970fb37887ac0 90dc8e711387bd49 21a5a4e2c1c59735 1d0d45e934bd8cce ecdb4bec302d0b3 8b7214a3b549393f dbea3b25db036a83 scsibus0: waiting 2 seconds for devices to settle... svwsata0 port 0: device present, speed: 1.5Gb/s panic: lockdebug_lookup: uninitialized lock (lock=0x80d3fe28, from=806fd910) fatal breakpoint trap in supervisor mode trap type 1 code 0 rip 80212035 cs e030 rflags 246 cr2 0 ilevel 8 rsp a00019f21930 curlwp 0xa13a6800 pid 0 lid 31 lowest kstack 0xa00019f1e000 Stopped in pid 0.31 (system) at netbsd:breakpoint+0x5: leave breakpoint() at netbsd:breakpoint+0x5 vpanic() at netbsd:vpanic+0x1f2 printf_nolog() at netbsd:printf_nolog lockdebug_wantlock() at netbsd:lockdebug_wantlock+0x18f mutex_enter() at netbsd:mutex_enter+0x27b usb_rem_task() at netbsd:usb_rem_task+0x2b usbd_kill_pipe() at netbsd:usbd_kill_pipe+0x56 usbd_new_device() at netbsd:usbd_new_device+0x41b usb_doattach() at netbsd:usb_doattach+0xe1 config_interrupts_thread() at netbsd:config_interrupts_thread+0x30 Christoph
Re: CVS commit: src/sys/dev/usb
On 07/17/12 11:25, Christoph Egger wrote: On 07/17/12 02:56, matthew green wrote: Module Name: src Committed By: mrg Date: Sun Jul 15 21:13:31 UTC 2012 Modified Files: src/sys/dev/usb: usb_subr.c usbdi.c usbdi.h usbdivar.h Log Message: commit my workaround for PR 46648 for now, as the more involved fix is not ready yet: move the clear endpoint stall async call into the task thread, to avoid trying to call kmem_alloc() from a softint thread. XXX ideally moving callbacks into the task thread (or perhaps a different high priority task thread) would be better than this workaround, once that method is working. I get this at boot now: panic: lockdebug_lookup: uninitialized lock (lock=0x80d3fe28, from=806fd980) fatal breakpoint trap in supervisor mode trap type 1 code 0 rip 80212035 cs e030 rflags 246 cr2 0 ilevel 8 rsp a00019f0d910 curlwp 0xa13e2c00 pid 0 lid 26 lowest kstack 0xa00019f0a000 Stopped in pid 0.26 (system) at netbsd:breakpoint+0x5: leave breakpoint() at netbsd:breakpoint+0x5 vpanic() at netbsd:vpanic+0x1f2 printf_nolog() at netbsd:printf_nolog lockdebug_wantlock() at netbsd:lockdebug_wantlock+0x18f mutex_enter() at netbsd:mutex_enter+0x27b usb_rem_task() at netbsd:usb_rem_task+0x2b usbd_kill_pipe() at netbsd:usbd_kill_pipe+0x56 usbd_new_device() at netbsd:usbd_new_device+0x41b usb_doattach() at netbsd:usb_doattach+0xea config_interrupts_thread() at netbsd:config_interrupts_thread+0x30 Fixed in usb.c rev 1.131. Christoph
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: cegger
Date: Tue Jul 17 10:18:43 UTC 2012
Modified Files:
src/sys/dev/usb: usb.c
Log Message:
Do not mutex_enter() a usb_taskq[-1].
Fixes LOCKDEBUG panic.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/usb/usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.130 src/sys/dev/usb/usb.c:1.131
--- src/sys/dev/usb/usb.c:1.130 Sun Jun 10 06:15:54 2012
+++ src/sys/dev/usb/usb.c Tue Jul 17 10:18:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.130 2012/06/10 06:15:54 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.131 2012/07/17 10:18:43 cegger Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.130 2012/06/10 06:15:54 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.131 2012/07/17 10:18:43 cegger Exp $);
#include opt_compat_netbsd.h
#include opt_usb.h
@@ -364,12 +364,13 @@ usb_rem_task(usbd_device_handle dev, str
{
struct usb_taskq *taskq;
+ if (task-queue == -1)
+ return;
+
taskq = usb_taskq[task-queue];
mutex_enter(taskq-lock);
- if (task-queue != -1) {
- TAILQ_REMOVE(taskq-tasks, task, next);
- task-queue = -1;
- }
+ TAILQ_REMOVE(taskq-tasks, task, next);
+ task-queue = -1;
mutex_exit(taskq-lock);
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: cegger
Date: Tue Jul 17 10:33:46 UTC 2012
Modified Files:
src/sys/dev/usb: usb.c
Log Message:
revert previous. testing queue number requires lock held.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/usb/usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.131 src/sys/dev/usb/usb.c:1.132
--- src/sys/dev/usb/usb.c:1.131 Tue Jul 17 10:18:43 2012
+++ src/sys/dev/usb/usb.c Tue Jul 17 10:33:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.131 2012/07/17 10:18:43 cegger Exp $ */
+/* $NetBSD: usb.c,v 1.132 2012/07/17 10:33:46 cegger Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.131 2012/07/17 10:18:43 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.132 2012/07/17 10:33:46 cegger Exp $);
#include opt_compat_netbsd.h
#include opt_usb.h
@@ -364,13 +364,12 @@ usb_rem_task(usbd_device_handle dev, str
{
struct usb_taskq *taskq;
- if (task-queue == -1)
- return;
-
taskq = usb_taskq[task-queue];
mutex_enter(taskq-lock);
- TAILQ_REMOVE(taskq-tasks, task, next);
- task-queue = -1;
+ if (task-queue != -1) {
+ TAILQ_REMOVE(taskq-tasks, task, next);
+ task-queue = -1;
+ }
mutex_exit(taskq-lock);
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: cegger Date: Tue Jul 17 10:18:43 UTC 2012 Modified Files: src/sys/dev/usb: usb.c Log Message: Do not mutex_enter() a usb_taskq[-1]. Fixes LOCKDEBUG panic. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/dev/usb/usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: cegger Date: Tue Jul 17 10:33:46 UTC 2012 Modified Files: src/sys/dev/usb: usb.c Log Message: revert previous. testing queue number requires lock held. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/dev/usb/usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/usb
On 07/15/12 23:13, matthew green wrote: Module Name: src Committed By: mrg Date: Sun Jul 15 21:13:31 UTC 2012 Modified Files: src/sys/dev/usb: usb_subr.c usbdi.c usbdi.h usbdivar.h Log Message: commit my workaround for PR 46648 for now, as the more involved fix is not ready yet: move the clear endpoint stall async call into the task thread, to avoid trying to call kmem_alloc() from a softint thread. XXX ideally moving callbacks into the task thread (or perhaps a different high priority task thread) would be better than this workaround, once that method is working. I get this at boot now: panic: lockdebug_lookup: uninitialized lock (lock=0x80d3fe28, from=806fd980) fatal breakpoint trap in supervisor mode trap type 1 code 0 rip 80212035 cs e030 rflags 246 cr2 0 ilevel 8 rsp a00019f0d910 curlwp 0xa13e2c00 pid 0 lid 26 lowest kstack 0xa00019f0a000 Stopped in pid 0.26 (system) at netbsd:breakpoint+0x5: leave breakpoint() at netbsd:breakpoint+0x5 vpanic() at netbsd:vpanic+0x1f2 printf_nolog() at netbsd:printf_nolog lockdebug_wantlock() at netbsd:lockdebug_wantlock+0x18f mutex_enter() at netbsd:mutex_enter+0x27b usb_rem_task() at netbsd:usb_rem_task+0x2b usbd_kill_pipe() at netbsd:usbd_kill_pipe+0x56 usbd_new_device() at netbsd:usbd_new_device+0x41b usb_doattach() at netbsd:usb_doattach+0xea config_interrupts_thread() at netbsd:config_interrupts_thread+0x30 Christoph
Re: CVS commit: src/sys/arch/xen
On 24.06.12 20:31, Jean-Yves Migeon wrote: Module Name:src Committed By: jym Date: Sun Jun 24 18:31:53 UTC 2012 Modified Files: src/sys/arch/xen/include: xenpmap.h src/sys/arch/xen/x86: xen_pmap.c Log Message: Enable the map/unmap recursive mapping functions for all Xen ports for save/restore. For an unknown reason (to me) Xen refuses to update VM translations when the entry is pointing back to itself (which is precisely what our recursive VM model does). So enable the functions that take care of this, which will avoid all sort of memory corruption upon restore leading domU to trample upon itself. Please report this Xen behaviour to xen-devel. Christoph Save/restore works again for amd64. The occasional domU frontend corruption is still present, but is harmless to dom0. Now we have a working shell and ddb inside domU, that helps debugging a tiny bit. XXX pull-up to -6.
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: cegger Date: Wed May 23 10:01:51 UTC 2012 Modified Files: src/sys/arch/xen/xen: xbdback_xenbus.c Log Message: destroy mutex and cv first. Fixes LOCKDEBUG crash when a guest shut down. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbdback_xenbus.c diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.55 src/sys/arch/xen/xen/xbdback_xenbus.c:1.56 --- src/sys/arch/xen/xen/xbdback_xenbus.c:1.55 Wed Dec 7 15:47:43 2011 +++ src/sys/arch/xen/xen/xbdback_xenbus.c Wed May 23 10:01:51 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: xbdback_xenbus.c,v 1.55 2011/12/07 15:47:43 cegger Exp $ */ +/* $NetBSD: xbdback_xenbus.c,v 1.56 2012/05/23 10:01:51 cegger Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.55 2011/12/07 15:47:43 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.56 2012/05/23 10:01:51 cegger Exp $); #include sys/atomic.h #include sys/buf.h @@ -513,6 +513,8 @@ xbdback_xenbus_destroy(void *arg) vn_close(xbdi-xbdi_vp, FREAD, NOCRED); } SLIST_REMOVE(xbdback_instances, xbdi, xbdback_instance, next); + mutex_destroy(xbdi-xbdi_lock); + cv_destroy(xbdi-xbdi_cv); kmem_free(xbdi, sizeof(*xbdi)); return 0; }
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: cegger Date: Wed May 23 10:01:51 UTC 2012 Modified Files: src/sys/arch/xen/xen: xbdback_xenbus.c Log Message: destroy mutex and cv first. Fixes LOCKDEBUG crash when a guest shut down. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/xen/xen/xbdback_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: cegger Date: Thu May 10 12:35:53 UTC 2012 Modified Files: src/sys/arch/x86/x86: cpu_ucode_amd.c Log Message: xc_wait() does not wait for all cpus to finish their callback. That means the ucode buffer is released while still in use and this causes a crash. Quick fix: check if the ucode buffer has been freed and abort. You may need to run 'cpuctl ucode' twice to apply it to all cpus. Per discussion with rmind@ use low priority xcalls and splhigh. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/cpu_ucode_amd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: cegger
Date: Wed May 9 13:58:09 UTC 2012
Modified Files:
src/sys/arch/x86/x86: cpu_ucode_amd.c
Log Message:
fix crash when booting with -x.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/x86/cpu_ucode_amd.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/cpu_ucode_amd.c
diff -u src/sys/arch/x86/x86/cpu_ucode_amd.c:1.1 src/sys/arch/x86/x86/cpu_ucode_amd.c:1.2
--- src/sys/arch/x86/x86/cpu_ucode_amd.c:1.1 Fri Jan 13 16:05:15 2012
+++ src/sys/arch/x86/x86/cpu_ucode_amd.c Wed May 9 13:58:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_amd.c,v 1.1 2012/01/13 16:05:15 cegger Exp $ */
+/* $NetBSD: cpu_ucode_amd.c,v 1.2 2012/05/09 13:58:09 cegger Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_ucode_amd.c,v 1.1 2012/01/13 16:05:15 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_ucode_amd.c,v 1.2 2012/05/09 13:58:09 cegger Exp $);
#include opt_xen.h
#include opt_cpu_ucode.h
@@ -168,7 +168,7 @@ cpu_apply_cb(void *arg0, void *arg1)
hdr = (struct microcode_amd_header *)mc_amd.mpb;
if (hdr-ah_processor_rev_id != mc.mc_equiv_cpuid) {
- aprint_debug_dev(dev, ucode: patch does not
+ aprint_debug_dev(dev, ucode: patch does not
match this cpu
(patch is for cpu id %x, cpu id is %x)\n,
hdr-ah_processor_rev_id, mc.mc_equiv_cpuid);
@@ -196,6 +196,8 @@ cpu_apply_cb(void *arg0, void *arg1)
}
next:
+ if (mc.mc_mpbuf == NULL)
+ break;
mc.mc_buf += mc.mc_mpbuf-mpb_len +
sizeof(mc.mc_mpbuf-mpb_type) +
sizeof(mc.mc_mpbuf-mpb_len);
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: cegger Date: Wed May 9 13:58:09 UTC 2012 Modified Files: src/sys/arch/x86/x86: cpu_ucode_amd.c Log Message: fix crash when booting with -x. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/x86/cpu_ucode_amd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/tests/lib/libc/gen (address alignment)
On 21.04.12 19:38, Jean-Yves Migeon wrote: Le 21/04/12 16:31, Jean-Yves Migeon a écrit : Okay, thanks for the report. So this rules out Virtual Box, it seems to happen on native amd64 too. I am taking a look right now. This seems to be a bug in the trap handling code. The signal is caught correctly (it reaches T_ALIGNFLT|T_USER in trap()), but things blow up just after: we end signalling the process with a SIGILL (which does not come from trap()). Using 32 bits compat mode (cc -m 32) also causes the crash. So something in e_trapsignal() or userret() goes wrong. Still digging. Interesting. The uncatchable SIGILL comes from sendsig_siginfo [1] and is used in a way that the signal will force-exit the program (when the copyout fails). It's a feature I was not aware of. Anyway, upon entering trap() for this exception (trap11), it looks like the trapframe is a mess: pid 470 (malign): BUS/SEGV (107) at rip 0 addr 7f7ff7701020 rip 0x0 rsp 0x50202 rfl 0x1f rdi 0x7f7ff7701080 rsi 0x8 rdx 0xf7701078 rcx 0x0 r8 0x7 r9 0x7f7ff770178 [...] rip 0x0 and rsp 0x50202 look really abnormal to me. I'll have a look in FreeBSD, that's probably a group of exceptions that have to be handled differently. rip 0x0 often means that a function pointer has been called which is NULL. Christoph
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: cegger
Date: Tue Apr 17 13:00:10 UTC 2012
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
print cpu family for AMD CPU families 0x12 - 0x15
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.30 src/usr.sbin/cpuctl/arch/i386.c:1.31
--- src/usr.sbin/cpuctl/arch/i386.c:1.30 Thu Apr 5 11:05:53 2012
+++ src/usr.sbin/cpuctl/arch/i386.c Tue Apr 17 13:00:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.30 2012/04/05 11:05:53 cegger Exp $ */
+/* $NetBSD: i386.c,v 1.31 2012/04/17 13:00:09 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: i386.c,v 1.30 2012/04/05 11:05:53 cegger Exp $);
+__RCSID($NetBSD: i386.c,v 1.31 2012/04/17 13:00:09 cegger Exp $);
#endif /* not lint */
#include sys/types.h
@@ -959,24 +959,22 @@ amd_amd64_name(struct cpu_info *ci)
}
break;
case 0x01:
- switch (model) {
- case 0x02:
-ret = Family 10h;
-break;
- default:
-ret = Unknown AMD64 CPU;
-break;
- }
+ ret = Family 10h;
break;
case 0x02:
- switch (model) {
- case 0x03:
-ret = Family 11h;
-break;
- default:
-ret = Unknown AMD64 CPU;
-break;
- }
+ ret = Family 11h;
+ break;
+ case 0x03:
+ ret = Family 12h;
+ break;
+ case 0x05:
+ ret = Family 14h;
+ break;
+ case 0x06:
+ ret = Family 15h;
+ break;
+ default:
+ ret = Unknown AMD64 CPU;
break;
}
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: cegger Date: Tue Apr 17 13:00:10 UTC 2012 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: print cpu family for AMD CPU families 0x12 - 0x15 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: cegger
Date: Mon Apr 16 16:07:24 UTC 2012
Modified Files:
src/sys/arch/x86/pci: amdnb_misc.c
Log Message:
Add rescan support. Re-fixes PR 45268.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/amdnb_misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/amdnb_misc.c
diff -u src/sys/arch/x86/pci/amdnb_misc.c:1.1 src/sys/arch/x86/pci/amdnb_misc.c:1.2
--- src/sys/arch/x86/pci/amdnb_misc.c:1.1 Fri Apr 13 13:11:17 2012
+++ src/sys/arch/x86/pci/amdnb_misc.c Mon Apr 16 16:07:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amdnb_misc.c,v 1.1 2012/04/13 13:11:17 cegger Exp $ */
+/* $NetBSD: amdnb_misc.c,v 1.2 2012/04/16 16:07:24 cegger Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amdnb_misc.c,v 1.1 2012/04/13 13:11:17 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: amdnb_misc.c,v 1.2 2012/04/16 16:07:24 cegger Exp $);
#include sys/param.h
#include sys/device.h
@@ -41,9 +41,16 @@ __KERNEL_RCSID(0, $NetBSD: amdnb_misc.c
static int amdnb_misc_match(device_t, cfdata_t match, void *);
static void amdnb_misc_attach(device_t, device_t, void *);
static int amdnb_misc_detach(device_t, int);
+static int amdnb_misc_rescan(device_t, const char *, const int *);
+static void amdnb_misc_childdet(device_t, device_t);
-CFATTACH_DECL_NEW(amdnb_misc, 0,
-amdnb_misc_match, amdnb_misc_attach, amdnb_misc_detach, NULL);
+struct amdnb_misc_softc {
+ struct pci_attach_args sc_pa;
+};
+
+CFATTACH_DECL3_NEW(amdnb_misc, sizeof(struct amdnb_misc_softc),
+amdnb_misc_match, amdnb_misc_attach, amdnb_misc_detach, NULL,
+amdnb_misc_rescan, amdnb_misc_childdet, DVF_DETACH_SHUTDOWN);
static int
@@ -71,8 +78,41 @@ amdnb_misc_match(device_t parent, cfdata
static int
amdnb_misc_search(device_t parent, cfdata_t cf, const int *locs, void *aux)
{
- if (config_match(parent, cf, aux))
- config_attach_loc(parent, cf, locs, aux, NULL);
+ device_t dev;
+ deviter_t di;
+ bool attach;
+
+ if (!config_match(parent, cf, aux))
+ return 0;
+
+ attach = true;
+
+ /* Figure out if found child 'cf' is already attached.
+ * No need to attach it twice.
+ */
+
+ /* XXX: I only want to iterate over the children of *this* device.
+ * Can we introduce a
+ * deviter_first_child(di, parent, DEVITER_F_LEAVES_ONLY)
+ * or even better, can we introduce a query function that returns
+ * if a child is already attached?
+ */
+ for (dev = deviter_first(di, DEVITER_F_LEAVES_FIRST); dev != NULL;
+ dev = deviter_next(di))
+ {
+ if (device_parent(dev) != parent)
+ continue;
+ if (device_is_a(dev, cf-cf_name)) {
+ attach = false;
+ break;
+ }
+ }
+ deviter_release(di);
+
+ if (!attach)
+ return 0;
+
+ config_attach_loc(parent, cf, locs, aux, NULL);
return 0;
}
@@ -80,13 +120,20 @@ amdnb_misc_search(device_t parent, cfdat
static void
amdnb_misc_attach(device_t parent, device_t self, void *aux)
{
+ struct amdnb_misc_softc *sc = device_private(self);
+ struct pci_attach_args *pa = aux;
+
+ sc-sc_pa = *pa;
+
aprint_naive(\n);
aprint_normal(: AMD NB Misc Configuration\n);
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, couldn't establish power handler\n);
- config_search_loc(amdnb_misc_search, self, amdnb_miscbus, NULL, aux);
+ config_search_loc(amdnb_misc_search, self, amdnb_miscbus,
+ NULL, sc-sc_pa);
+
return;
}
@@ -102,3 +149,23 @@ amdnb_misc_detach(device_t self, int fla
pmf_device_deregister(self);
return rv;
}
+
+static int
+amdnb_misc_rescan(device_t self, const char *ifattr, const int *locators)
+{
+ struct amdnb_misc_softc *sc = device_private(self);
+
+ if (!ifattr_match(ifattr, amdnb_miscbus))
+ return 0;
+
+ config_search_loc(amdnb_misc_search, self, ifattr,
+ locators, sc-sc_pa);
+
+ return 0;
+}
+
+static void
+amdnb_misc_childdet(device_t self, device_t child)
+{
+ return;
+}
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: cegger Date: Mon Apr 16 16:07:24 UTC 2012 Modified Files: src/sys/arch/x86/pci: amdnb_misc.c Log Message: Add rescan support. Re-fixes PR 45268. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/amdnb_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch
On 04/13/12 15:19, Paul Goyette wrote: I think you may also need to update src/sys/modules/amdtemp/amdtemp.ioconf Thanks for pointing this out. Done. Christoph On Fri, 13 Apr 2012, Christoph Egger wrote: Module Name: src Committed By: cegger Date: Fri Apr 13 13:11:17 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0 src/sys/arch/x86/pci: amdtemp.c files.pci Added Files: src/sys/arch/x86/pci: amdnb_misc.c Log Message: Replace amdtempbus with amdnb_miscbus. This allows us to have independent drivers on the same device (northbridge f3) each coming with a certain functionality/feature. This way we do not need to mess with amdtemp(4) to utilize other features.. To generate a diff of this commit: cvs rdiff -u -r1.352 -r1.353 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.335 -r1.336 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1070 -r1.1071 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.64 -r1.65 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/pci/amdnb_misc.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/amdtemp.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/pci/files.pci Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. !DSPAM:4f8826141989530048591! - | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com | | Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net | | Kernel Developer | | pgoyette at netbsd.org | -
Re: CVS commit: src/sys/arch
On 13.04.12 19:58, Nicolas Joly wrote:
On Fri, Apr 13, 2012 at 01:11:17PM +, Christoph Egger wrote:
Module Name: src
Committed By:cegger
Date:Fri Apr 13 13:11:17 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/x86/pci: amdtemp.c files.pci
Added Files:
src/sys/arch/x86/pci: amdnb_misc.c
Log Message:
Replace amdtempbus with amdnb_miscbus.
This allows us to have independent drivers on the same device (northbridge
f3)
each coming with a certain functionality/feature.
This way we do not need to mess with amdtemp(4) to utilize other features.
Hi Christoph,
This change seems incomplete. You removed the amdtempbus definition
from files.pci but a few uses remains :
njoly@lynche [arch/x86] pwd
/local/src/NetBSD/src/sys/arch/x86
njoly@lynche [arch/x86] grep amdtempbus **/*
pci/pchb.c:static void pchb_amdtempbus_configure(struct pchb_softc
*);
pci/pchb.c: pchb_amdtempbus_configure(sc);
pci/pchb.c: if (ifattr_match(ifattr,amdtempbus))
pci/pchb.c: pchb_amdtempbus_configure(sc);
pci/pchb.c: if (sc-sc_amdtempbus == child) {
pci/pchb.c: sc-sc_amdtempbus = NULL;
pci/pchb.c:pchb_amdtempbus_configure(struct pchb_softc *sc)
pci/pchb.c: if (sc-sc_amdtempbus != NULL)
pci/pchb.c: sc-sc_amdtempbus =
config_found_ia(sc-sc_dev,amdtempbus,sc-sc_pa,NULL);
pci/pchbvar.h: device_t sc_amdtempbus;
oh, I wasn't aware of that at all. Actually I am tempted
to revert rev 1.32 of pci/pchb.c.
But I want to test that change on monday first before
I commit that then.
And this makes my kernel panic as soon as it tries to search for
childs in pchb(4) configuration :
[...]
ipmi0 at mainbus0
pci0 at mainbus0 bus 0: configuration mode 1
pchb0 at pci0 dev 0 function 0: ATI Technologies RD890 North Bridge Dual Slot
2x16 GFX (rev. 0x02)
panic: kernel diagnostic assertion !ifattr ||
cfdriver_get_iattr(parent-dv_cfdriver,ifattr)failed: file
/local/src/NetBSD/src/sys/kern/subr_autoconf.c,line 945
fatal breakpoint trap in supervisor mode
trap type 1 code 0 rip 80254b25 cs 8 rflags 246 cr2 0 cpl 8 rsp
8133c830
Stopped in pid 0.1 (system) at netbsd:breakpoint+0x5: leave
db{0} bt
breakpoint() at netbsd:breakpoint+0x5
vpanic() at netbsd:vpanic+0x1f2
kern_assert() at netbsd:kern_assert+0x48
config_search_loc() at netbsd:config_search_loc+0x15d
config_found_sm_loc() at netbsd:config_found_sm_loc+0x2b
pchbattach() at netbsd:pchbattach+0x248
config_attach_loc() at netbsd:config_attach_loc+0x182
pci_probe_device() at netbsd:pci_probe_device+0x4a6
pci_enumerate_bus() at netbsd:pci_enumerate_bus+0x189
pcirescan() at netbsd:pcirescan+0x47
pciattach() at netbsd:pciattach+0x196
config_attach_loc() at netbsd:config_attach_loc+0x182
mp_pci_scan() at netbsd:mp_pci_scan+0xa4
mainbus_attach() at netbsd:mainbus_attach+0x35e
config_attach_loc() at netbsd:config_attach_loc+0x182
cpu_configure() at netbsd:cpu_configure+0x26
main() at netbsd:main+0x2b0
Yes, I got exactly the same panic and was wondering whether
that KASSERT is wrong or not. cfdriver_get_iattr() returns NULL.
Removing the KASSERT makes the machine boot for me and things
continue to work as expected.
Christoph
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Fri Apr 13 12:03:14 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add AMD Family15h ids To generate a diff of this commit: cvs rdiff -u -r1.1114 -r1.1115 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1114 src/sys/dev/pci/pcidevs:1.1115 --- src/sys/dev/pci/pcidevs:1.1114 Mon Apr 9 08:09:36 2012 +++ src/sys/dev/pci/pcidevs Fri Apr 13 12:03:14 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1114 2012/04/09 08:09:36 mlelstv Exp $ +$NetBSD: pcidevs,v 1.1115 2012/04/13 12:03:14 cegger Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -932,6 +932,12 @@ product AMD AMD64_F11_DRAM 0x1302 AMD64 product AMD AMD64_F11_MISC 0x1303 AMD64 Family11h Miscellaneous Configuration product AMD AMD64_F11_LINK 0x1304 AMD64 Family11h Link Configuration product AMD F14_RC 0x1510 Family14h Root Complex +product AMD F15_HT 0x1600 Family15h HyperTransport Configuration +product AMD F15_ADDR 0x1601 Family15h Address Map Configuration +product AMD F15_DRAM 0x1602 Family15h DRAM Configuration +product AMD F15_MISC 0x1603 Family15h Miscellaneous Configuration +product AMD F15_LINK 0x1604 Family15h Link Configuration +product AMD F15_NB 0x1605 Family15h North Bridge Configuration product AMD F14_HT 0x1700 Family12h/14h HyperTransport Configuration product AMD F14_ADDR 0x1701 Family12h/14h Address Map Configuration product AMD F14_DRAM 0x1702 Family12h/14h DRAM Configuration
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: cegger
Date: Fri Apr 13 12:14:42 UTC 2012
Modified Files:
src/sys/arch/x86/pci: amdtemp.c
Log Message:
- support AMD Family15h
- deregister pmf on detach
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/pci/amdtemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/amdtemp.c
diff -u src/sys/arch/x86/pci/amdtemp.c:1.13 src/sys/arch/x86/pci/amdtemp.c:1.14
--- src/sys/arch/x86/pci/amdtemp.c:1.13 Fri Mar 2 19:26:41 2012
+++ src/sys/arch/x86/pci/amdtemp.c Fri Apr 13 12:14:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amdtemp.c,v 1.13 2012/03/02 19:26:41 nonaka Exp $ */
+/* $NetBSD: amdtemp.c,v 1.14 2012/04/13 12:14:41 cegger Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -48,7 +48,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amdtemp.c,v 1.13 2012/03/02 19:26:41 nonaka Exp $ );
+__KERNEL_RCSID(0, $NetBSD: amdtemp.c,v 1.14 2012/04/13 12:14:41 cegger Exp $ );
#include sys/param.h
#include sys/bus.h
@@ -197,6 +197,7 @@ amdtemp_match(device_t parent, cfdata_t
case PCI_PRODUCT_AMD_AMD64_F10_MISC:
case PCI_PRODUCT_AMD_AMD64_F11_MISC:
case PCI_PRODUCT_AMD_F14_NB: /* Family12h too */
+ case PCI_PRODUCT_AMD_F15_MISC:
break;
default:
return 0;
@@ -225,7 +226,7 @@ amdtemp_match(device_t parent, cfdata_t
/* Not yet supported CPUs */
- if (family 0x14)
+ if (family 0x15)
return 0;
return 2; /* supercede pchb(4) */
@@ -270,6 +271,7 @@ amdtemp_attach(device_t parent, device_t
case 0x11: /* AMD Griffin */
case 0x12: /* AMD Lynx/Sabine (Llano) */
case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */
+ case 0x15:
amdtemp_family10_init(sc);
break;
@@ -299,6 +301,7 @@ amdtemp_attach(device_t parent, device_t
case 0x11:
case 0x12:
case 0x14:
+ case 0x15:
amdtemp_family10_setup_sensors(sc, device_unit(self));
break;
}
@@ -326,6 +329,7 @@ amdtemp_attach(device_t parent, device_t
case 0x11:
case 0x12:
case 0x14:
+ case 0x15:
sc-sc_sme-sme_refresh = amdtemp_family10_refresh;
break;
}
@@ -358,6 +362,7 @@ amdtemp_detach(device_t self, int flags)
{
struct amdtemp_softc *sc = device_private(self);
+ pmf_device_deregister(self);
if (sc-sc_sme != NULL)
sysmon_envsys_unregister(sc-sc_sme);
CVS commit: src/sys/arch
-ISA w/ HPET
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.64 src/sys/arch/i386/conf/XEN3_DOM0:1.65
--- src/sys/arch/i386/conf/XEN3_DOM0:1.64 Sat Mar 10 21:51:53 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Apr 13 13:11:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.64 2012/03/10 21:51:53 joerg Exp $
+# $NetBSD: XEN3_DOM0,v 1.65 2012/04/13 13:11:16 cegger Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -273,7 +273,8 @@ lpt0 at isa? port 0x378 irq 7 # standard
# Hardware monitors
-amdtemp* at pchb? # AMD CPU Temperature sensors
+amdnb_misc* at pci? # AMD NB Misc Configuration
+amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
Index: src/sys/arch/x86/pci/amdtemp.c
diff -u src/sys/arch/x86/pci/amdtemp.c:1.14 src/sys/arch/x86/pci/amdtemp.c:1.15
--- src/sys/arch/x86/pci/amdtemp.c:1.14 Fri Apr 13 12:14:41 2012
+++ src/sys/arch/x86/pci/amdtemp.c Fri Apr 13 13:11:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amdtemp.c,v 1.14 2012/04/13 12:14:41 cegger Exp $ */
+/* $NetBSD: amdtemp.c,v 1.15 2012/04/13 13:11:17 cegger Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -48,7 +48,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amdtemp.c,v 1.14 2012/04/13 12:14:41 cegger Exp $ );
+__KERNEL_RCSID(0, $NetBSD: amdtemp.c,v 1.15 2012/04/13 13:11:17 cegger Exp $ );
#include sys/param.h
#include sys/bus.h
@@ -189,19 +189,7 @@ amdtemp_match(device_t parent, cfdata_t
pcireg_t cpu_signature;
uint32_t family;
- if (PCI_VENDOR(pa-pa_id) != PCI_VENDOR_AMD)
- return 0;
-
- switch (PCI_PRODUCT(pa-pa_id)) {
- case PCI_PRODUCT_AMD_AMD64_MISC:
- case PCI_PRODUCT_AMD_AMD64_F10_MISC:
- case PCI_PRODUCT_AMD_AMD64_F11_MISC:
- case PCI_PRODUCT_AMD_F14_NB: /* Family12h too */
- case PCI_PRODUCT_AMD_F15_MISC:
- break;
- default:
- return 0;
- }
+ KASSERT(PCI_VENDOR(pa-pa_id) == PCI_VENDOR_AMD);
cpu_signature = pci_conf_read(pa-pa_pc,
pa-pa_tag, CPUID_FAMILY_MODEL_R);
@@ -229,7 +217,7 @@ amdtemp_match(device_t parent, cfdata_t
if (family 0x15)
return 0;
- return 2; /* supercede pchb(4) */
+ return 1;
}
static void
Index: src/sys/arch/x86/pci/files.pci
diff -u src/sys/arch/x86/pci/files.pci:1.13 src/sys/arch/x86/pci/files.pci:1.14
--- src/sys/arch/x86/pci/files.pci:1.13 Thu Aug 18 20:55:20 2011
+++ src/sys/arch/x86/pci/files.pci Fri Apr 13 13:11:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.13 2011/08/18 20:55:20 jakllsch Exp $
+# $NetBSD: files.pci,v 1.14 2012/04/13 13:11:17 cegger Exp $
device aapic
attach aapic at pci
@@ -6,9 +6,10 @@ file arch/x86/pci/aapic.c aapic
file arch/x86/pci/agp_machdep.c agp
+define amdnb_miscbus {}
+
# PCI-Host bridge chipsets
-define amdtempbus {}
-device pchb: pcibus, agpbus, amdtempbus,
+device pchb: pcibus, agpbus,
agp_ali, agp_amd, agp_amd64, agp_i810,
agp_intel, agp_sis, agp_via
attach pchb at pci
@@ -28,8 +29,12 @@ attach hpet at amdpcib with amdpcib_hpe
filearch/x86/pci/amdpcib_hpet.c amdpcib_hpet
# AMD Processors -- Miscellaneous Control
+device amdnb_misc: amdnb_miscbus
+attach amdnb_misc at pci
+file arch/x86/pci/amdnb_misc.c amdnb_misc
+
device amdtemp: sysmon_envsys
-attach amdtemp at amdtempbus
+attach amdtemp at amdnb_miscbus
file arch/x86/pci/amdtemp.c amdtemp
# PCI-LPC bridges
Added files:
Index: src/sys/arch/x86/pci/amdnb_misc.c
diff -u /dev/null src/sys/arch/x86/pci/amdnb_misc.c:1.1
--- /dev/null Fri Apr 13 13:11:17 2012
+++ src/sys/arch/x86/pci/amdnb_misc.c Fri Apr 13 13:11:17 2012
@@ -0,0 +1,104 @@
+/* $NetBSD: amdnb_misc.c,v 1.1 2012/04/13 13:11:17 cegger Exp $ */
+/*
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christoph Egger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION
CVS commit: src/sys/modules/amdtemp
Module Name:src Committed By: cegger Date: Fri Apr 13 13:36:57 UTC 2012 Modified Files: src/sys/modules/amdtemp: amdtemp.ioconf Log Message: replace amdtempbus with amdnb_miscbus. pointed out by pgoyette@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/amdtemp/amdtemp.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/amdtemp/amdtemp.ioconf diff -u src/sys/modules/amdtemp/amdtemp.ioconf:1.3 src/sys/modules/amdtemp/amdtemp.ioconf:1.4 --- src/sys/modules/amdtemp/amdtemp.ioconf:1.3 Sat Aug 20 19:53:45 2011 +++ src/sys/modules/amdtemp/amdtemp.ioconf Fri Apr 13 13:36:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: amdtemp.ioconf,v 1.3 2011/08/20 19:53:45 jakllsch Exp $ +# $NetBSD: amdtemp.ioconf,v 1.4 2012/04/13 13:36:57 cegger Exp $ ioconf amdtemp @@ -6,6 +6,6 @@ include conf/files include dev/pci/files.pci include arch/x86/pci/files.pci -pseudo-root amdtempbus* +pseudo-root amdnb_miscbus* -amdtemp* at amdtempbus? +amdtemp* at amdnb_miscbus?
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Fri Apr 13 12:03:14 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add AMD Family15h ids To generate a diff of this commit: cvs rdiff -u -r1.1114 -r1.1115 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Fri Apr 13 12:04:13 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.1108 -r1.1109 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1107 -r1.1108 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: cegger Date: Fri Apr 13 12:14:42 UTC 2012 Modified Files: src/sys/arch/x86/pci: amdtemp.c Log Message: - support AMD Family15h - deregister pmf on detach To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/pci/amdtemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: cegger Date: Fri Apr 13 13:11:17 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0 src/sys/arch/x86/pci: amdtemp.c files.pci Added Files: src/sys/arch/x86/pci: amdnb_misc.c Log Message: Replace amdtempbus with amdnb_miscbus. This allows us to have independent drivers on the same device (northbridge f3) each coming with a certain functionality/feature. This way we do not need to mess with amdtemp(4) to utilize other features. To generate a diff of this commit: cvs rdiff -u -r1.352 -r1.353 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.335 -r1.336 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1070 -r1.1071 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.64 -r1.65 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/pci/amdnb_misc.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/amdtemp.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/pci/files.pci Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/amdtemp
Module Name:src Committed By: cegger Date: Fri Apr 13 13:36:57 UTC 2012 Modified Files: src/sys/modules/amdtemp: amdtemp.ioconf Log Message: replace amdtempbus with amdnb_miscbus. pointed out by pgoyette@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/amdtemp/amdtemp.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: cegger
Date: Thu Apr 5 11:05:54 UTC 2012
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
report l3 cache information on AMD Family 10h and newer processors
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.29 src/usr.sbin/cpuctl/arch/i386.c:1.30
--- src/usr.sbin/cpuctl/arch/i386.c:1.29 Fri Mar 2 16:29:31 2012
+++ src/usr.sbin/cpuctl/arch/i386.c Thu Apr 5 11:05:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.29 2012/03/02 16:29:31 sborrill Exp $ */
+/* $NetBSD: i386.c,v 1.30 2012/04/05 11:05:53 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: i386.c,v 1.29 2012/03/02 16:29:31 sborrill Exp $);
+__RCSID($NetBSD: i386.c,v 1.30 2012/04/05 11:05:53 cegger Exp $);
#endif /* not lint */
#include sys/types.h
@@ -1769,9 +1769,9 @@ amd_cpu_cacheinfo(struct cpu_info *ci)
cai-cai_associativity = 0; /* XXX Unknown/reserved */
/*
- * Determine L3 cache info on AMD Family 10h processors
+ * Determine L3 cache info on AMD Family 10h and newer processors
*/
- if (family == 0x10) {
+ if (family = 0x10) {
cai = ci-ci_cinfo[CAI_L3CACHE];
cai-cai_totalsize = AMD_L3_EDX_C_SIZE(descs[3]);
cai-cai_associativity = AMD_L3_EDX_C_ASSOC(descs[3]);
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: cegger Date: Thu Apr 5 11:05:54 UTC 2012 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: report l3 cache information on AMD Family 10h and newer processors To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: cegger Date: Tue Jan 17 10:47:28 UTC 2012 Modified Files: src/share/man/man9: kauth.9 secmodel_securelevel.9 src/sys/kern: kern_cpu.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c src/sys/sys: kauth.h Log Message: fix secmodel implementation of CPU_UCODE. ok wiz@ for the manpages ok elad@ To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/share/man/man9/kauth.9 cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/secmodel_securelevel.9 cvs rdiff -u -r1.53 -r1.54 src/sys/kern/kern_cpu.c cvs rdiff -u -r1.25 -r1.26 \ src/sys/secmodel/securelevel/secmodel_securelevel.c cvs rdiff -u -r1.37 -r1.38 src/sys/secmodel/suser/secmodel_suser.c cvs rdiff -u -r1.67 -r1.68 src/sys/sys/kauth.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/kauth.9 diff -u src/share/man/man9/kauth.9:1.95 src/share/man/man9/kauth.9:1.96 --- src/share/man/man9/kauth.9:1.95 Sun Dec 4 23:59:25 2011 +++ src/share/man/man9/kauth.9 Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: kauth.9,v 1.95 2011/12/04 23:59:25 jym Exp $ +.\ $NetBSD: kauth.9,v 1.96 2012/01/17 10:47:27 cegger Exp $ .\ .\ Copyright (c) 2005, 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -25,7 +25,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 8, 2011 +.Dd January 16, 2012 .Dt KAUTH 9 .Os .Sh NAME @@ -770,6 +770,12 @@ platforms. Below is a list of available actions, along with which platforms are affected by each. .Bl -tag -width compact +.It Dv KAUTH_MACHDEP_CPU_UCODE_APPLY +Request to apply a CPU microcode to a CPU. +This is related to the +.Em CPU_UCODE +kernel config +.Xr options 4 . .It Dv KAUTH_MACHDEP_CACHEFLUSH Request to flush the whole CPU cache. Affects Index: src/share/man/man9/secmodel_securelevel.9 diff -u src/share/man/man9/secmodel_securelevel.9:1.11 src/share/man/man9/secmodel_securelevel.9:1.12 --- src/share/man/man9/secmodel_securelevel.9:1.11 Sun Dec 4 21:08:45 2011 +++ src/share/man/man9/secmodel_securelevel.9 Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: secmodel_securelevel.9,v 1.11 2011/12/04 21:08:45 jym Exp $ +.\ $NetBSD: secmodel_securelevel.9,v 1.12 2012/01/17 10:47:27 cegger Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ Copyright (c) 2000 Hugh Graham @@ -26,7 +26,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 4, 2011 +.Dd January 16, 2012 .Dt SECMODEL_SECURELEVEL 9 .Os .Sh NAME @@ -154,6 +154,8 @@ The system clock may not be set backward Per-process coredump name may not be changed. .It Packet filtering and NAT rules may not be altered. +.It +CPU ucode loading is denied on platforms that support it. .El .El .Pp Index: src/sys/kern/kern_cpu.c diff -u src/sys/kern/kern_cpu.c:1.53 src/sys/kern/kern_cpu.c:1.54 --- src/sys/kern/kern_cpu.c:1.53 Fri Jan 13 16:05:15 2012 +++ src/sys/kern/kern_cpu.c Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_cpu.c,v 1.53 2012/01/13 16:05:15 cegger Exp $ */ +/* $NetBSD: kern_cpu.c,v 1.54 2012/01/17 10:47:27 cegger Exp $ */ /*- * Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.53 2012/01/13 16:05:15 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_cpu.c,v 1.54 2012/01/17 10:47:27 cegger Exp $); #include opt_cpu_ucode.h @@ -258,11 +258,6 @@ cpuctl_ioctl(dev_t dev, u_long cmd, void NULL, NULL, NULL, NULL); if (error != 0) break; - error = kauth_authorize_system(l-l_cred, - KAUTH_SYSTEM_CPU, KAUTH_REQ_SYSTEM_CPU_UCODE_APPLY, - data, NULL, NULL); - if (error != 0) - break; error = cpu_ucode_apply(data); break; #endif Index: src/sys/secmodel/securelevel/secmodel_securelevel.c diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.25 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.26 --- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.25 Fri Jan 13 16:05:15 2012 +++ src/sys/secmodel/securelevel/secmodel_securelevel.c Tue Jan 17 10:47:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: secmodel_securelevel.c,v 1.25 2012/01/13 16:05:15 cegger Exp $ */ +/* $NetBSD: secmodel_securelevel.c,v 1.26 2012/01/17 10:47:27 cegger Exp $ */ /*- * Copyright (c) 2006 Elad Efrat e...@netbsd.org * All rights reserved. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: secmodel_securelevel.c,v 1.25 2012/01/13 16:05:15 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: secmodel_securelevel.c,v 1.26 2012/01/17 10:47:27 cegger Exp $); #ifdef _KERNEL_OPT #include opt_insecure.h @@ -484,8 +484,8
CVS commit: src
Module Name:src Committed By: cegger Date: Tue Jan 17 10:47:28 UTC 2012 Modified Files: src/share/man/man9: kauth.9 secmodel_securelevel.9 src/sys/kern: kern_cpu.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c src/sys/sys: kauth.h Log Message: fix secmodel implementation of CPU_UCODE. ok wiz@ for the manpages ok elad@ To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/share/man/man9/kauth.9 cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/secmodel_securelevel.9 cvs rdiff -u -r1.53 -r1.54 src/sys/kern/kern_cpu.c cvs rdiff -u -r1.25 -r1.26 \ src/sys/secmodel/securelevel/secmodel_securelevel.c cvs rdiff -u -r1.37 -r1.38 src/sys/secmodel/suser/secmodel_suser.c cvs rdiff -u -r1.67 -r1.68 src/sys/sys/kauth.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: cegger Date: Mon Jan 16 10:36:16 UTC 2012 Modified Files: src/sys/sys: cpuio.h Log Message: include limits.h for PATH_MAX. Reported by njoly@. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/sys/cpuio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
ucode [file]\n, progname);
exit(EXIT_FAILURE);
/* NOTREACHED */
}
@@ -181,11 +188,34 @@ cpu_nointr(char **argv)
}
static void
+cpu_ucode(char **argv)
+{
+ int error;
+ struct cpu_ucode uc;
+
+ if (argv[0] != NULL)
+ strlcpy(uc.fwname, argv[0], sizeof(uc.fwname));
+ else
+ memset(uc.fwname, '\0', sizeof(uc.fwname));
+
+ error = ioctl(fd, IOC_CPU_UCODE_APPLY, uc);
+ if (error 0) {
+ if (uc.fwname[0])
+ err(EXIT_FAILURE, %s, uc.fwname);
+ else
+ err(EXIT_FAILURE, IOC_CPU_UCODE_APPLY);
+ }
+}
+
+
+static void
cpu_identify(char **argv)
{
char name[32];
unsigned int id, np;
cpuset_t *cpuset;
+ struct cpu_ucode ucode;
+ char ucbuf[16];
np = sysconf(_SC_NPROCESSORS_CONF);
id = getcpuid(argv);
@@ -209,6 +239,16 @@ cpu_identify(char **argv)
cpuset_destroy(cpuset);
}
identifycpu(name);
+
+ if (ioctl(fd, IOC_CPU_UCODE_GET_VERSION, ucode) 0)
+ ucode.version = (uint64_t)-1;
+ if (ucode.version == (uint64_t)-1)
+ strcpy(ucbuf, ?);
+ else
+ snprintf(ucbuf, sizeof(ucbuf), 0x%PRIx64,
+ ucode.version);
+
+ printf(%s: UCode version: %s\n, name, ucbuf);
}
static u_int
@@ -263,11 +303,13 @@ cpu_list(char **argv)
strcpy(ibuf, ?);
else
snprintf(ibuf, sizeof(ibuf), %d, cs.cs_intrcnt - 1);
+
lastmod = (time_t)cs.cs_lastmod |
((time_t)cs.cs_lastmodhi 32);
ts = asctime(localtime(lastmod));
ts[strlen(ts) - 1] = '\0';
- printf(%-4d %-4x %-12s %-10s %s %s\n, i, cs.cs_hwid, state,
+ printf(%-4d %-4x %-12s %-10s %s %-5s\n,
+ i, cs.cs_hwid, state,
intr, ts, ibuf);
}
}
Added files:
Index: src/sys/arch/x86/include/cpu_ucode.h
diff -u /dev/null src/sys/arch/x86/include/cpu_ucode.h:1.1
--- /dev/null Fri Jan 13 16:05:16 2012
+++ src/sys/arch/x86/include/cpu_ucode.h Fri Jan 13 16:05:14 2012
@@ -0,0 +1,42 @@
+/* $NetBSD: cpu_ucode.h,v 1.1 2012/01/13 16:05:14 cegger Exp $ */
+/*
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christoph Egger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _X86_CPU_UCODE_H_
+#define _X86_CPU_UCODE_H_
+
+#include sys/cpu.h
+#include sys/cpuio.h
+#include dev/firmload.h
+
+int cpu_ucode_amd_get_version(struct cpu_ucode *);
+int cpu_ucode_amd_firmware_open(firmware_handle_t *, const char *);
+int cpu_ucode_amd_apply(struct cpu_ucode_softc *);
+
+#endif
Index: src/sys/arch/x86/x86/cpu_ucode.c
diff -u /dev/null src/sys/arch/x86/x86/cpu_ucode.c:1.1
--- /dev/null Fri Jan 13 16:05:16 2012
+++ src/sys/arch/x86/x86/cpu_ucode.c Fri Jan 13 16:05:15 2012
@@ -0,0 +1,102 @@
+/* $NetBSD: cpu_ucode.c,v 1.1 2012/01/13 16:05:15 cegger Exp $ */
+/*
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christoph Egger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
CVS commit: src/doc
Module Name:src Committed By: cegger Date: Fri Jan 13 16:15:48 UTC 2012 Modified Files: src/doc: CHANGES Log Message: cpu ucode loading support for x86 and xen To generate a diff of this commit: cvs rdiff -u -r1.1643 -r1.1644 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.1643 src/doc/CHANGES:1.1644 --- src/doc/CHANGES:1.1643 Fri Jan 13 09:21:11 2012 +++ src/doc/CHANGES Fri Jan 13 16:15:48 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1643 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1644 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1198,3 +1198,4 @@ Changes from NetBSD 5.0 to NetBSD 6.0: sandpoint: Iomega Storcenter support. [phx 20111228] adventure(6): New save file format. Please regenerate (restore and re-save) any old save files. [dholland 20120107] + x86, xen: Add cpu ucode loading support via cpuctl(8). [cegger 20120113]
CVS commit: src
Module Name:src Committed By: cegger Date: Fri Jan 13 16:05:16 UTC 2012 Modified Files: src/share/man/man4: options.4 src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: GENERIC XEN3_DOM0 src/sys/arch/x86/conf: files.x86 src/sys/arch/xen/conf: files.xen src/sys/kern: kern_cpu.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c src/sys/sys: cpu.h cpuio.h kauth.h src/usr.sbin/cpuctl: cpuctl.8 cpuctl.c Added Files: src/sys/arch/x86/include: cpu_ucode.h src/sys/arch/x86/x86: cpu_ucode.c cpu_ucode_amd.c src/sys/arch/xen/xen: xen_ucode.c Log Message: Support CPU microcode loading via cpuctl(8). Implemented and enabled via CPU_UCODE kernel config option for x86 and Xen Dom0. Tested on different AMD machines with different CPU families. ok wiz@ for the manpages ok releng@ ok core@ via releng@ To generate a diff of this commit: cvs rdiff -u -r1.410 -r1.411 src/share/man/man4/options.4 cvs rdiff -u -r1.342 -r1.343 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.1061 -r1.1062 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.75 -r1.76 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/include/cpu_ucode.h cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/x86/cpu_ucode.c \ src/sys/arch/x86/x86/cpu_ucode_amd.c cvs rdiff -u -r1.123 -r1.124 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r0 -r1.1 src/sys/arch/xen/xen/xen_ucode.c cvs rdiff -u -r1.52 -r1.53 src/sys/kern/kern_cpu.c cvs rdiff -u -r1.24 -r1.25 \ src/sys/secmodel/securelevel/secmodel_securelevel.c cvs rdiff -u -r1.36 -r1.37 src/sys/secmodel/suser/secmodel_suser.c cvs rdiff -u -r1.33 -r1.34 src/sys/sys/cpu.h cvs rdiff -u -r1.5 -r1.6 src/sys/sys/cpuio.h cvs rdiff -u -r1.66 -r1.67 src/sys/sys/kauth.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/cpuctl/cpuctl.8 cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/cpuctl/cpuctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: cegger Date: Fri Dec 9 10:08:47 UTC 2011 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: add AMD ucode MSRs To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.53 src/sys/arch/x86/include/specialreg.h:1.54 --- src/sys/arch/x86/include/specialreg.h:1.53 Mon Oct 3 17:31:35 2011 +++ src/sys/arch/x86/include/specialreg.h Fri Dec 9 10:08:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.53 2011/10/03 17:31:35 njoly Exp $ */ +/* $NetBSD: specialreg.h,v 1.54 2011/12/09 10:08:47 cegger Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -503,6 +503,8 @@ /* AMD Family10h MSRs */ #define MSR_OSVW_ID_LENGTH 0xc0010140 #define MSR_OSVW_STATUS 0xc0010141 +#define MSR_UCODE_AMD_PATCHLEVEL 0x008b +#define MSR_UCODE_AMD_PATCHLOADER 0xc0010020 /* X86 MSRs */ #define MSR_RDTSCP_AUX 0xc103
CVS commit: src/sys/arch/xen/include/xen-public/arch-x86
Module Name:src
Committed By: cegger
Date: Fri Dec 9 10:14:20 UTC 2011
Modified Files:
src/sys/arch/xen/include/xen-public/arch-x86: xen.h
Log Message:
re-apply merge loss
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/arch/xen/include/xen-public/arch-x86/xen.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/xen/include/xen-public/arch-x86/xen.h
diff -u src/sys/arch/xen/include/xen-public/arch-x86/xen.h:1.1.1.2 src/sys/arch/xen/include/xen-public/arch-x86/xen.h:1.2
--- src/sys/arch/xen/include/xen-public/arch-x86/xen.h:1.1.1.2 Wed Dec 7 14:41:17 2011
+++ src/sys/arch/xen/include/xen-public/arch-x86/xen.h Fri Dec 9 10:14:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xen.h,v 1.1.1.2 2011/12/07 14:41:17 cegger Exp $ */
+/* $NetBSD: xen.h,v 1.2 2011/12/09 10:14:20 cegger Exp $ */
/**
* arch-x86/xen.h
*
@@ -46,10 +46,14 @@
#define __XEN_GUEST_HANDLE(name)__guest_handle_ ## name
#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name)
#define set_xen_guest_handle_raw(hnd, val) do { (hnd).p = val; } while (0)
-#ifdef __XEN_TOOLS__
+
+#if __XEN_INTERFACE_VERSION__ = 0x00030201
+#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
#define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0)
+#else
+#define set_xen_guest_handle(hnd, val) (hnd) = val
+#define get_xen_guest_handle(val, hnd) val = (hnd)
#endif
-#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
#if defined(__i386__)
#include xen-x86_32.h
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: cegger Date: Fri Dec 9 10:08:47 UTC 2011 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: add AMD ucode MSRs To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/include/xen-public/arch-x86
Module Name:src Committed By: cegger Date: Fri Dec 9 10:14:20 UTC 2011 Modified Files: src/sys/arch/xen/include/xen-public/arch-x86: xen.h Log Message: re-apply merge loss To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/sys/arch/xen/include/xen-public/arch-x86/xen.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/xen/xen
On 12/08/11 04:34, Cherry G. Mathew wrote: Module Name:src Committed By: cherry Date: Thu Dec 8 03:34:48 UTC 2011 Modified Files: src/sys/arch/xen/xen: evtchn.c Log Message: kmem_free() the appropriate size. Thanks cegger@ This is still not enough: In pirq_establish() you allocate sizeof(struct pintrhand) but in event_remove_handler you free sizeof(struct intrhand). And sizeof(struct pintrhand) != sizeof(intrhand). We need a ih_size field to track the right size. Christoph
Re: amd64 direct map causing crashes at boot (Re: CVS commit: src/sys/arch)
On 08.12.11 23:17, Manuel Bouyer wrote: On Thu, Dec 08, 2011 at 11:10:41PM +0100, Nicolas Joly wrote: That was me. I do have two machines that fail to boot with this change. 1) A Dell Optiplex 740 that reboots early after loading the kernel. Includes 1 AMD Athlon(tm) 64 X2 Dual Core Processor 4800+ CPU. 2) A Supermicro H8DG6-F motherboard (only 1 socket populated) later on boot mostly when sshd start (or fc-cache is updated). Includes 1 AMD Opteron(tm) Processor 6128A CPU Do they announce 1GB pages support ? AMD CPUs family 0x10 and later announce 1GB page support. Christoph
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: cegger Date: Wed Dec 7 13:49:04 UTC 2011 Modified Files: src/sys/arch/xen/xen: evtchn.c Log Message: build fix: add back sys/malloc.h. malloc(9) is still in use. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/xen/evtchn.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/xen/xen/evtchn.c diff -u src/sys/arch/xen/xen/evtchn.c:1.57 src/sys/arch/xen/xen/evtchn.c:1.58 --- src/sys/arch/xen/xen/evtchn.c:1.57 Wed Dec 7 12:31:51 2011 +++ src/sys/arch/xen/xen/evtchn.c Wed Dec 7 13:49:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: evtchn.c,v 1.57 2011/12/07 12:31:51 cherry Exp $ */ +/* $NetBSD: evtchn.c,v 1.58 2011/12/07 13:49:04 cegger Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -54,7 +54,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.57 2011/12/07 12:31:51 cherry Exp $); +__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.58 2011/12/07 13:49:04 cegger Exp $); #include opt_xen.h #include isa.h @@ -66,6 +66,7 @@ __KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1 #include sys/systm.h #include sys/device.h #include sys/proc.h +#include sys/malloc.h #include sys/kmem.h #include sys/reboot.h #include sys/mutex.h
CVS commit: src/sys/arch/xen/include/xen-public
Module Name:src Committed By: cegger Date: Wed Dec 7 14:41:19 UTC 2011 Update of /cvsroot/src/sys/arch/xen/include/xen-public In directory ivanova.netbsd.org:/tmp/cvs-serv11047 Log Message: Welcome to Xen 4.1.2 headers. New interfaces for PV drivers: - Xen transcedent memory - USB IO - SCSI IO PCI IO improvements: - PCI MSI support - PCI Express AER support New features: - xen honors flags to be placed into guest kernel available pte bits if enabled (for grant table) - support for 128 vcpus (old interface is still present and supports up to 32 vcpus) - PCI passthrough: new hypercalls to support SR-IOV - new hypercall for physical cpu hotplugging - new hypercall for physical page offlining - fixes to compile with clang - machine check recovery mechanism Status: Vendor Tag: Xen Release Tags: xen-4_1_2 C src/sys/arch/xen/include/xen-public/grant_table.h U src/sys/arch/xen/include/xen-public/xencomm.h N src/sys/arch/xen/include/xen-public/tmem.h C src/sys/arch/xen/include/xen-public/dom0_ops.h U src/sys/arch/xen/include/xen-public/nmi.h U src/sys/arch/xen/include/xen-public/kexec.h U src/sys/arch/xen/include/xen-public/platform.h U src/sys/arch/xen/include/xen-public/sysctl.h C src/sys/arch/xen/include/xen-public/event_channel.h U src/sys/arch/xen/include/xen-public/features.h U src/sys/arch/xen/include/xen-public/COPYING C src/sys/arch/xen/include/xen-public/physdev.h U src/sys/arch/xen/include/xen-public/version.h U src/sys/arch/xen/include/xen-public/elfnote.h U src/sys/arch/xen/include/xen-public/callback.h U src/sys/arch/xen/include/xen-public/memory.h N src/sys/arch/xen/include/xen-public/mem_event.h C src/sys/arch/xen/include/xen-public/trace.h U src/sys/arch/xen/include/xen-public/xen-compat.h U src/sys/arch/xen/include/xen-public/sched.h U src/sys/arch/xen/include/xen-public/vcpu.h C src/sys/arch/xen/include/xen-public/arch-x86_32.h C src/sys/arch/xen/include/xen-public/arch-x86_64.h U src/sys/arch/xen/include/xen-public/arch-ia64.h U src/sys/arch/xen/include/xen-public/xenoprof.h C src/sys/arch/xen/include/xen-public/xen.h U src/sys/arch/xen/include/xen-public/domctl.h U src/sys/arch/xen/include/xen-public/xsm/flask_op.h U src/sys/arch/xen/include/xen-public/xsm/acm.h U src/sys/arch/xen/include/xen-public/xsm/acm_ops.h U src/sys/arch/xen/include/xen-public/io/console.h U src/sys/arch/xen/include/xen-public/io/tpmif.h U src/sys/arch/xen/include/xen-public/io/ring.h U src/sys/arch/xen/include/xen-public/io/protocols.h U src/sys/arch/xen/include/xen-public/io/pciif.h N src/sys/arch/xen/include/xen-public/io/usbif.h U src/sys/arch/xen/include/xen-public/io/kbdif.h U src/sys/arch/xen/include/xen-public/io/fbif.h C src/sys/arch/xen/include/xen-public/io/blkif.h U src/sys/arch/xen/include/xen-public/io/xenbus.h N src/sys/arch/xen/include/xen-public/io/vscsiif.h U src/sys/arch/xen/include/xen-public/io/fsif.h U src/sys/arch/xen/include/xen-public/io/xs_wire.h C src/sys/arch/xen/include/xen-public/io/netif.h U src/sys/arch/xen/include/xen-public/hvm/hvm_info_table.h U src/sys/arch/xen/include/xen-public/hvm/save.h U src/sys/arch/xen/include/xen-public/hvm/params.h U src/sys/arch/xen/include/xen-public/hvm/ioreq.h U src/sys/arch/xen/include/xen-public/hvm/hvm_op.h U src/sys/arch/xen/include/xen-public/hvm/e820.h U src/sys/arch/xen/include/xen-public/arch-ia64/sioemu.h U src/sys/arch/xen/include/xen-public/arch-ia64/debug_op.h U src/sys/arch/xen/include/xen-public/arch-ia64/hvm/save.h U src/sys/arch/xen/include/xen-public/arch-ia64/hvm/memmap.h U src/sys/arch/xen/include/xen-public/arch-x86/xen.h U src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_64.h U src/sys/arch/xen/include/xen-public/arch-x86/cpuid.h U src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h U src/sys/arch/xen/include/xen-public/arch-x86/xen-mca.h U src/sys/arch/xen/include/xen-public/arch-x86/hvm/save.h 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jXen:yesterday -jXen src/sys/arch/xen/include/xen-public
CVS commit: src/sys/arch/xen/include/xen-public
Module Name:src
Committed By: cegger
Date: Wed Dec 7 15:04:19 UTC 2011
Modified Files:
src/sys/arch/xen/include/xen-public: event_channel.h grant_table.h
physdev.h trace.h xen.h
src/sys/arch/xen/include/xen-public/arch-x86: xen-x86_32.h
src/sys/arch/xen/include/xen-public/io: blkif.h netif.h xs_wire.h
Log Message:
merge.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/include/xen-public/event_channel.h \
src/sys/arch/xen/include/xen-public/grant_table.h \
src/sys/arch/xen/include/xen-public/physdev.h \
src/sys/arch/xen/include/xen-public/trace.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/xen/include/xen-public/xen.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/include/xen-public/io/blkif.h \
src/sys/arch/xen/include/xen-public/io/netif.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/arch/xen/include/xen-public/io/xs_wire.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/xen/include/xen-public/event_channel.h
diff -u src/sys/arch/xen/include/xen-public/event_channel.h:1.5 src/sys/arch/xen/include/xen-public/event_channel.h:1.6
--- src/sys/arch/xen/include/xen-public/event_channel.h:1.5 Wed Dec 7 13:24:04 2011
+++ src/sys/arch/xen/include/xen-public/event_channel.h Wed Dec 7 15:04:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: event_channel.h,v 1.5 2011/12/07 13:24:04 cegger Exp $ */
+/* $NetBSD: event_channel.h,v 1.6 2011/12/07 15:04:18 cegger Exp $ */
/**
* event_channel.h
*
@@ -28,6 +28,8 @@
#ifndef __XEN_PUBLIC_EVENT_CHANNEL_H__
#define __XEN_PUBLIC_EVENT_CHANNEL_H__
+#include xen.h
+
/*
* Prototype for this hypercall is:
* int event_channel_op(int cmd, void *args)
Index: src/sys/arch/xen/include/xen-public/grant_table.h
diff -u src/sys/arch/xen/include/xen-public/grant_table.h:1.5 src/sys/arch/xen/include/xen-public/grant_table.h:1.6
--- src/sys/arch/xen/include/xen-public/grant_table.h:1.5 Wed Dec 7 13:24:04 2011
+++ src/sys/arch/xen/include/xen-public/grant_table.h Wed Dec 7 15:04:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: grant_table.h,v 1.5 2011/12/07 13:24:04 cegger Exp $ */
+/* $NetBSD: grant_table.h,v 1.6 2011/12/07 15:04:18 cegger Exp $ */
/**
* grant_table.h
*
@@ -29,6 +29,7 @@
#ifndef __XEN_PUBLIC_GRANT_TABLE_H__
#define __XEN_PUBLIC_GRANT_TABLE_H__
+#include xen.h
/***
* GRANT TABLE REPRESENTATION
@@ -85,12 +86,26 @@
*/
/*
+ * Reference to a grant entry in a specified domain's grant table.
+ */
+typedef uint32_t grant_ref_t;
+
+/*
* A grant table comprises a packed array of grant entries in one or more
* page frames shared between Xen and a guest.
* [XEN]: This field is written by Xen and read by the sharing guest.
* [GST]: This field is written by the guest and read by Xen.
*/
-struct grant_entry {
+
+/*
+ * Version 1 of the grant table entry structure is maintained purely
+ * for backwards compatibility. New guests should use version 2.
+ */
+#if __XEN_INTERFACE_VERSION__ 0x0003020a
+#define grant_entry_v1 grant_entry
+#define grant_entry_v1_t grant_entry_t
+#endif
+struct grant_entry_v1 {
/* GTF_xxx: various type and flag information. [XEN,GST] */
uint16_t flags;
/* The domain being granted foreign privileges. [GST] */
@@ -101,7 +116,7 @@ struct grant_entry {
*/
uint32_t frame;
};
-typedef struct grant_entry grant_entry_t;
+typedef struct grant_entry_v1 grant_entry_v1_t;
/*
* Type of grant entry.
@@ -109,10 +124,13 @@ typedef struct grant_entry grant_entry_t
* GTF_permit_access: Allow @domid to map/access @frame.
* GTF_accept_transfer: Allow @domid to transfer ownership of one page frame
* to this guest. Xen writes the page number to @frame.
+ * GTF_transitive: Allow @domid to transitively access a subrange of
+ * @trans_grant in @trans_domid. No mappings are allowed.
*/
#define GTF_invalid (0U0)
#define GTF_permit_access (1U0)
#define GTF_accept_transfer (2U0)
+#define GTF_transitive (3U0)
#define GTF_type_mask (3U0)
/*
@@ -121,6 +139,9 @@ typedef struct grant_entry grant_entry_t
* GTF_reading: Grant entry is currently mapped for reading by @domid. [XEN]
* GTF_writing: Grant entry is currently mapped for writing by @domid. [XEN]
* GTF_PAT, GTF_PWT, GTF_PCD: (x86) cache attribute flags for the grant [GST]
+ * GTF_sub_page: Grant access to only a subrange of the page. @domid
+ *will only be allowed to copy from the grant, and not
+ *map it. [GST]
*/
#define _GTF_readonly (2)
#define GTF_readonly(1U_GTF_readonly)
@@ -134,6
CVS commit: src/sys/arch
Module Name:src Committed By: cegger Date: Wed Dec 7 15:47:43 UTC 2011 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf src/sys/arch/x86/include: cpu.h src/sys/arch/x86/x86: pmap.c src/sys/arch/xen/include: granttables.h hypervisor.h xenbus.h src/sys/arch/xen/include/amd64: hypercalls.h src/sys/arch/xen/include/i386: hypercalls.h src/sys/arch/xen/x86: cpu.c xen_ipi.c xen_pmap.c src/sys/arch/xen/xen: clock.c evtchn.c hypervisor.c if_xennet_xenbus.c pciback.c xbd_xenbus.c xbdback_xenbus.c xencons.c xpci_xenbus.c Log Message: switch from xen3-public to xen-public. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.90 -r1.91 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.143 -r1.144 src/sys/arch/x86/x86/pmap.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/include/granttables.h cvs rdiff -u -r1.35 -r1.36 src/sys/arch/xen/include/hypervisor.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/include/xenbus.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/include/amd64/hypercalls.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/include/i386/hypercalls.h cvs rdiff -u -r1.70 -r1.71 src/sys/arch/xen/x86/cpu.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/xen/x86/xen_pmap.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/xen/clock.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/xen/xen/evtchn.c \ src/sys/arch/xen/xen/hypervisor.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/xen/xen/if_xennet_xenbus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/pciback.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/xen/xbd_xenbus.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/xen/xen/xbdback_xenbus.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/xen/xencons.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/xen/xpci_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.48 src/sys/arch/amd64/amd64/genassym.cf:1.49 --- src/sys/arch/amd64/amd64/genassym.cf:1.48 Fri Jul 1 19:24:14 2011 +++ src/sys/arch/amd64/amd64/genassym.cf Wed Dec 7 15:47:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.48 2011/07/01 19:24:14 dyoung Exp $ +# $NetBSD: genassym.cf,v 1.49 2011/12/07 15:47:41 cegger Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -119,7 +119,7 @@ include machine/i82093var.h endif ifdef XEN -include xen/xen3-public/xen.h +include xen/xen-public/xen.h endif include sys/bus.h Index: src/sys/arch/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.90 src/sys/arch/i386/i386/genassym.cf:1.91 --- src/sys/arch/i386/i386/genassym.cf:1.90 Fri Jul 1 18:14:15 2011 +++ src/sys/arch/i386/i386/genassym.cf Wed Dec 7 15:47:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.90 2011/07/01 18:14:15 dyoung Exp $ +# $NetBSD: genassym.cf,v 1.91 2011/12/07 15:47:42 cegger Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -99,7 +99,7 @@ include machine/types.h include machine/segments.h ifdef XEN -include xen/xen3-public/sched.h +include xen/xen-public/sched.h endif if defined(_KERNEL) defined(_KERNEL_OPT) Index: src/sys/arch/x86/include/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.43 src/sys/arch/x86/include/cpu.h:1.44 --- src/sys/arch/x86/include/cpu.h:1.43 Sat Nov 19 17:13:39 2011 +++ src/sys/arch/x86/include/cpu.h Wed Dec 7 15:47:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.43 2011/11/19 17:13:39 cherry Exp $ */ +/* $NetBSD: cpu.h,v 1.44 2011/12/07 15:47:42 cegger Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -68,8 +68,8 @@ #include sys/device_if.h /* for device_t */ #ifdef XEN -#include xen/xen3-public/xen.h -#include xen/xen3-public/event_channel.h +#include xen/xen-public/xen.h +#include xen/xen-public/event_channel.h #endif /* XEN */ struct intrsource; Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.143 src/sys/arch/x86/x86/pmap.c:1.144 --- src/sys/arch/x86/x86/pmap.c:1.143 Sun Dec 4 16:24:13 2011 +++ src/sys/arch/x86/x86/pmap.c Wed Dec 7 15:47:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.143 2011/12/04 16:24:13 chs Exp $ */ +/* $NetBSD: pmap.c,v 1.144 2011/12/07 15:47:42 cegger Exp $ */ /*- * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. @@ -171,7 +171,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.143 2011/12/04 16:24:13 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.144 2011/12/07 15:47:42 cegger Exp $); #include opt_user_ldt.h #include opt_lockdebug.h @@ -209,7 +209,7 @@ __KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.1 #include x86/i82489var.h #ifdef XEN -#include
CVS commit: src/sys/arch/xen/include
Module Name:src Committed By: cegger Date: Wed Dec 7 16:01:39 UTC 2011 Modified Files: src/sys/arch/xen/include/amd64: hypercalls.h src/sys/arch/xen/include/i386: hypercalls.h Log Message: switch from xen3-public to xen-public. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/xen/include/amd64/hypercalls.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/include/i386/hypercalls.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/xen/include/amd64/hypercalls.h diff -u src/sys/arch/xen/include/amd64/hypercalls.h:1.7 src/sys/arch/xen/include/amd64/hypercalls.h:1.8 --- src/sys/arch/xen/include/amd64/hypercalls.h:1.7 Wed Dec 7 15:47:42 2011 +++ src/sys/arch/xen/include/amd64/hypercalls.h Wed Dec 7 16:01:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hypercalls.h,v 1.7 2011/12/07 15:47:42 cegger Exp $ */ +/* $NetBSD: hypercalls.h,v 1.8 2011/12/07 16:01:39 cegger Exp $ */ /** * hypercall.h * @@ -399,7 +399,7 @@ HYPERVISOR_dom0_op( } #endif /* __XEN_INTERFACE_VERSION__ */ -#include xen/xen3-public/arch-x86/xen-mca.h +#include xen/xen-public/arch-x86/xen-mca.h static inline int HYPERVISOR_machine_check(struct xen_mc *mc) Index: src/sys/arch/xen/include/i386/hypercalls.h diff -u src/sys/arch/xen/include/i386/hypercalls.h:1.13 src/sys/arch/xen/include/i386/hypercalls.h:1.14 --- src/sys/arch/xen/include/i386/hypercalls.h:1.13 Wed Dec 7 15:47:42 2011 +++ src/sys/arch/xen/include/i386/hypercalls.h Wed Dec 7 16:01:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hypercalls.h,v 1.13 2011/12/07 15:47:42 cegger Exp $ */ +/* $NetBSD: hypercalls.h,v 1.14 2011/12/07 16:01:39 cegger Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -173,7 +173,7 @@ HYPERVISOR_get_debugreg(int reg) return ret; } -#include xen/xen3-public/arch-x86/xen-mca.h +#include xen/xen-public/arch-x86/xen-mca.h static __inline int HYPERVISOR_machine_check(struct xen_mc *mc)
CVS commit: src/sys/arch/xen/include/xen3-public
Module Name:src Committed By: cegger Date: Wed Dec 7 16:11:02 UTC 2011 Removed Files: src/sys/arch/xen/include/xen3-public: COPYING arch-ia64.h arch-x86_32.h arch-x86_64.h callback.h dom0_ops.h domctl.h elfnote.h elfstructs.h event_channel.h features.h grant_table.h kexec.h libelf.h memory.h nmi.h physdev.h platform.h sched.h sysctl.h trace.h vcpu.h version.h xen-compat.h xen.h xencomm.h xenoprof.h src/sys/arch/xen/include/xen3-public/arch-ia64: debug_op.h sioemu.h src/sys/arch/xen/include/xen3-public/arch-ia64/hvm: memmap.h save.h src/sys/arch/xen/include/xen3-public/arch-x86: cpuid.h xen-mca.h xen-x86_32.h xen-x86_64.h xen.h src/sys/arch/xen/include/xen3-public/arch-x86/hvm: save.h src/sys/arch/xen/include/xen3-public/hvm: e820.h hvm_info_table.h hvm_op.h ioreq.h params.h save.h vmx_assist.h src/sys/arch/xen/include/xen3-public/io: blkif.h console.h fbif.h fsif.h kbdif.h netif.h pciif.h protocols.h ring.h tpmif.h xenbus.h xs_wire.h src/sys/arch/xen/include/xen3-public/xsm: acm.h acm_ops.h flask_op.h Log Message: remove xen3-public To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/xen/include/xen3-public/COPYING \ src/sys/arch/xen/include/xen3-public/callback.h \ src/sys/arch/xen/include/xen3-public/elfstructs.h \ src/sys/arch/xen/include/xen3-public/nmi.h \ src/sys/arch/xen/include/xen3-public/xenoprof.h cvs rdiff -u -r1.7 -r0 src/sys/arch/xen/include/xen3-public/arch-ia64.h \ src/sys/arch/xen/include/xen3-public/physdev.h \ src/sys/arch/xen/include/xen3-public/trace.h cvs rdiff -u -r1.6 -r0 src/sys/arch/xen/include/xen3-public/arch-x86_32.h \ src/sys/arch/xen/include/xen3-public/memory.h \ src/sys/arch/xen/include/xen3-public/sched.h \ src/sys/arch/xen/include/xen3-public/vcpu.h cvs rdiff -u -r1.5 -r0 src/sys/arch/xen/include/xen3-public/arch-x86_64.h \ src/sys/arch/xen/include/xen3-public/dom0_ops.h \ src/sys/arch/xen/include/xen3-public/event_channel.h \ src/sys/arch/xen/include/xen3-public/version.h \ src/sys/arch/xen/include/xen3-public/xen-compat.h cvs rdiff -u -r1.4 -r0 src/sys/arch/xen/include/xen3-public/domctl.h \ src/sys/arch/xen/include/xen3-public/features.h \ src/sys/arch/xen/include/xen3-public/kexec.h \ src/sys/arch/xen/include/xen3-public/libelf.h \ src/sys/arch/xen/include/xen3-public/platform.h \ src/sys/arch/xen/include/xen3-public/sysctl.h cvs rdiff -u -r1.2 -r0 src/sys/arch/xen/include/xen3-public/elfnote.h \ src/sys/arch/xen/include/xen3-public/xencomm.h cvs rdiff -u -r1.8 -r0 src/sys/arch/xen/include/xen3-public/grant_table.h cvs rdiff -u -r1.9 -r0 src/sys/arch/xen/include/xen3-public/xen.h cvs rdiff -u -r1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/debug_op.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/sioemu.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/hvm/memmap.h cvs rdiff -u -r1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/hvm/save.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-x86/cpuid.h \ src/sys/arch/xen/include/xen3-public/arch-x86/xen-mca.h cvs rdiff -u -r1.4 -r0 \ src/sys/arch/xen/include/xen3-public/arch-x86/xen-x86_32.h \ src/sys/arch/xen/include/xen3-public/arch-x86/xen-x86_64.h \ src/sys/arch/xen/include/xen3-public/arch-x86/xen.h cvs rdiff -u -r1.2 -r0 \ src/sys/arch/xen/include/xen3-public/arch-x86/hvm/save.h cvs rdiff -u -r1.4 -r0 src/sys/arch/xen/include/xen3-public/hvm/e820.h \ src/sys/arch/xen/include/xen3-public/hvm/hvm_op.h \ src/sys/arch/xen/include/xen3-public/hvm/ioreq.h \ src/sys/arch/xen/include/xen3-public/hvm/params.h \ src/sys/arch/xen/include/xen3-public/hvm/vmx_assist.h cvs rdiff -u -r1.3 -r0 \ src/sys/arch/xen/include/xen3-public/hvm/hvm_info_table.h \ src/sys/arch/xen/include/xen3-public/hvm/save.h cvs rdiff -u -r1.7 -r0 src/sys/arch/xen/include/xen3-public/io/blkif.h cvs rdiff -u -r1.4 -r0 src/sys/arch/xen/include/xen3-public/io/console.h \ src/sys/arch/xen/include/xen3-public/io/kbdif.h cvs rdiff -u -r1.3 -r0 src/sys/arch/xen/include/xen3-public/io/fbif.h \ src/sys/arch/xen/include/xen3-public/io/protocols.h cvs rdiff -u -r1.1.1.1 -r0 src/sys/arch/xen/include/xen3-public/io/fsif.h cvs rdiff -u -r1.6 -r0 src/sys/arch/xen/include/xen3-public/io/netif.h \ src/sys/arch/xen/include/xen3-public/io/xenbus.h cvs rdiff -u -r1.5 -r0 src/sys/arch/xen/include/xen3-public/io/pciif.h \ src/sys/arch/xen/include/xen3-public/io/tpmif.h cvs rdiff -u -r1.12 -r0 src/sys/arch/xen/include/xen3-public/io/ring.h cvs rdiff -u -r1.9 -r0 src/sys/arch/xen/include/xen3-public/io/xs_wire.h cvs rdiff -u -r1.2 -r0 src/sys/arch/xen/include/xen3-public/xsm/acm.h \
CVS commit: src/sys/arch/xen/include/xen-public
Module Name:src Committed By: cegger Date: Wed Dec 7 13:15:47 UTC 2011 Update of /cvsroot/src/sys/arch/xen/include/xen-public In directory ivanova.netbsd.org:/tmp/cvs-serv3955 Log Message: re-import xen3-public to rename this to xen-public Status: Vendor Tag: Xen Release Tags: xen-3_3_0 N src/sys/arch/xen/include/xen-public/COPYING N src/sys/arch/xen/include/xen-public/arch-ia64.h C src/sys/arch/xen/include/xen-public/arch-x86_32.h C src/sys/arch/xen/include/xen-public/arch-x86_64.h N src/sys/arch/xen/include/xen-public/callback.h C src/sys/arch/xen/include/xen-public/dom0_ops.h N src/sys/arch/xen/include/xen-public/domctl.h N src/sys/arch/xen/include/xen-public/elfnote.h N src/sys/arch/xen/include/xen-public/elfstructs.h C src/sys/arch/xen/include/xen-public/event_channel.h N src/sys/arch/xen/include/xen-public/features.h C src/sys/arch/xen/include/xen-public/grant_table.h N src/sys/arch/xen/include/xen-public/kexec.h N src/sys/arch/xen/include/xen-public/libelf.h N src/sys/arch/xen/include/xen-public/memory.h N src/sys/arch/xen/include/xen-public/nmi.h C src/sys/arch/xen/include/xen-public/physdev.h N src/sys/arch/xen/include/xen-public/platform.h N src/sys/arch/xen/include/xen-public/sched.h N src/sys/arch/xen/include/xen-public/sysctl.h C src/sys/arch/xen/include/xen-public/trace.h N src/sys/arch/xen/include/xen-public/vcpu.h C src/sys/arch/xen/include/xen-public/xen.h N src/sys/arch/xen/include/xen-public/version.h N src/sys/arch/xen/include/xen-public/xen-compat.h N src/sys/arch/xen/include/xen-public/xencomm.h N src/sys/arch/xen/include/xen-public/xenoprof.h N src/sys/arch/xen/include/xen-public/arch-ia64/debug_op.h N src/sys/arch/xen/include/xen-public/arch-ia64/sioemu.h N src/sys/arch/xen/include/xen-public/arch-ia64/hvm/memmap.h N src/sys/arch/xen/include/xen-public/arch-ia64/hvm/save.h N src/sys/arch/xen/include/xen-public/arch-x86/cpuid.h N src/sys/arch/xen/include/xen-public/arch-x86/xen-mca.h N src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h N src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_64.h N src/sys/arch/xen/include/xen-public/arch-x86/xen.h N src/sys/arch/xen/include/xen-public/arch-x86/hvm/save.h N src/sys/arch/xen/include/xen-public/hvm/hvm_op.h N src/sys/arch/xen/include/xen-public/hvm/e820.h N src/sys/arch/xen/include/xen-public/hvm/hvm_info_table.h N src/sys/arch/xen/include/xen-public/hvm/ioreq.h N src/sys/arch/xen/include/xen-public/hvm/params.h N src/sys/arch/xen/include/xen-public/hvm/save.h N src/sys/arch/xen/include/xen-public/hvm/vmx_assist.h C src/sys/arch/xen/include/xen-public/io/blkif.h N src/sys/arch/xen/include/xen-public/io/console.h N src/sys/arch/xen/include/xen-public/io/fbif.h N src/sys/arch/xen/include/xen-public/io/fsif.h N src/sys/arch/xen/include/xen-public/io/kbdif.h C src/sys/arch/xen/include/xen-public/io/netif.h N src/sys/arch/xen/include/xen-public/io/pciif.h N src/sys/arch/xen/include/xen-public/io/protocols.h N src/sys/arch/xen/include/xen-public/io/ring.h N src/sys/arch/xen/include/xen-public/io/tpmif.h N src/sys/arch/xen/include/xen-public/io/xenbus.h N src/sys/arch/xen/include/xen-public/io/xs_wire.h N src/sys/arch/xen/include/xen-public/xsm/acm_ops.h N src/sys/arch/xen/include/xen-public/xsm/acm.h N src/sys/arch/xen/include/xen-public/xsm/flask_op.h 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jXen:yesterday -jXen src/sys/arch/xen/include/xen-public
CVS commit: src/sys/arch/xen/include/xen-public
Module Name:src Committed By: cegger Date: Wed Dec 7 13:24:04 UTC 2011 Added Files: src/sys/arch/xen/include/xen-public: arch-x86_32.h arch-x86_64.h dom0_ops.h event_channel.h grant_table.h physdev.h trace.h xen.h src/sys/arch/xen/include/xen-public/io: blkif.h netif.h Log Message: merge. The 'conflicts' happened because xen-public was once used for xen2 headers. To generate a diff of this commit: cvs rdiff -u -r0 -r1.5 src/sys/arch/xen/include/xen-public/arch-x86_32.h \ src/sys/arch/xen/include/xen-public/arch-x86_64.h \ src/sys/arch/xen/include/xen-public/dom0_ops.h \ src/sys/arch/xen/include/xen-public/event_channel.h \ src/sys/arch/xen/include/xen-public/grant_table.h \ src/sys/arch/xen/include/xen-public/physdev.h \ src/sys/arch/xen/include/xen-public/trace.h cvs rdiff -u -r0 -r1.10 src/sys/arch/xen/include/xen-public/xen.h cvs rdiff -u -r0 -r1.5 src/sys/arch/xen/include/xen-public/io/blkif.h \ src/sys/arch/xen/include/xen-public/io/netif.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: cegger Date: Wed Dec 7 13:49:04 UTC 2011 Modified Files: src/sys/arch/xen/xen: evtchn.c Log Message: build fix: add back sys/malloc.h. malloc(9) is still in use. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/xen/evtchn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/include/xen-public
Module Name:src Committed By: cegger Date: Wed Dec 7 14:41:19 UTC 2011 Update of /cvsroot/src/sys/arch/xen/include/xen-public In directory ivanova.netbsd.org:/tmp/cvs-serv11047 Log Message: Welcome to Xen 4.1.2 headers. New interfaces for PV drivers: - Xen transcedent memory - USB IO - SCSI IO PCI IO improvements: - PCI MSI support - PCI Express AER support New features: - xen honors flags to be placed into guest kernel available pte bits if enabled (for grant table) - support for 128 vcpus (old interface is still present and supports up to 32 vcpus) - PCI passthrough: new hypercalls to support SR-IOV - new hypercall for physical cpu hotplugging - new hypercall for physical page offlining - fixes to compile with clang - machine check recovery mechanism Status: Vendor Tag: Xen Release Tags: xen-4_1_2 C src/sys/arch/xen/include/xen-public/grant_table.h U src/sys/arch/xen/include/xen-public/xencomm.h N src/sys/arch/xen/include/xen-public/tmem.h C src/sys/arch/xen/include/xen-public/dom0_ops.h U src/sys/arch/xen/include/xen-public/nmi.h U src/sys/arch/xen/include/xen-public/kexec.h U src/sys/arch/xen/include/xen-public/platform.h U src/sys/arch/xen/include/xen-public/sysctl.h C src/sys/arch/xen/include/xen-public/event_channel.h U src/sys/arch/xen/include/xen-public/features.h U src/sys/arch/xen/include/xen-public/COPYING C src/sys/arch/xen/include/xen-public/physdev.h U src/sys/arch/xen/include/xen-public/version.h U src/sys/arch/xen/include/xen-public/elfnote.h U src/sys/arch/xen/include/xen-public/callback.h U src/sys/arch/xen/include/xen-public/memory.h N src/sys/arch/xen/include/xen-public/mem_event.h C src/sys/arch/xen/include/xen-public/trace.h U src/sys/arch/xen/include/xen-public/xen-compat.h U src/sys/arch/xen/include/xen-public/sched.h U src/sys/arch/xen/include/xen-public/vcpu.h C src/sys/arch/xen/include/xen-public/arch-x86_32.h C src/sys/arch/xen/include/xen-public/arch-x86_64.h U src/sys/arch/xen/include/xen-public/arch-ia64.h U src/sys/arch/xen/include/xen-public/xenoprof.h C src/sys/arch/xen/include/xen-public/xen.h U src/sys/arch/xen/include/xen-public/domctl.h U src/sys/arch/xen/include/xen-public/xsm/flask_op.h U src/sys/arch/xen/include/xen-public/xsm/acm.h U src/sys/arch/xen/include/xen-public/xsm/acm_ops.h U src/sys/arch/xen/include/xen-public/io/console.h U src/sys/arch/xen/include/xen-public/io/tpmif.h U src/sys/arch/xen/include/xen-public/io/ring.h U src/sys/arch/xen/include/xen-public/io/protocols.h U src/sys/arch/xen/include/xen-public/io/pciif.h N src/sys/arch/xen/include/xen-public/io/usbif.h U src/sys/arch/xen/include/xen-public/io/kbdif.h U src/sys/arch/xen/include/xen-public/io/fbif.h C src/sys/arch/xen/include/xen-public/io/blkif.h U src/sys/arch/xen/include/xen-public/io/xenbus.h N src/sys/arch/xen/include/xen-public/io/vscsiif.h U src/sys/arch/xen/include/xen-public/io/fsif.h U src/sys/arch/xen/include/xen-public/io/xs_wire.h C src/sys/arch/xen/include/xen-public/io/netif.h U src/sys/arch/xen/include/xen-public/hvm/hvm_info_table.h U src/sys/arch/xen/include/xen-public/hvm/save.h U src/sys/arch/xen/include/xen-public/hvm/params.h U src/sys/arch/xen/include/xen-public/hvm/ioreq.h U src/sys/arch/xen/include/xen-public/hvm/hvm_op.h U src/sys/arch/xen/include/xen-public/hvm/e820.h U src/sys/arch/xen/include/xen-public/arch-ia64/sioemu.h U src/sys/arch/xen/include/xen-public/arch-ia64/debug_op.h U src/sys/arch/xen/include/xen-public/arch-ia64/hvm/save.h U src/sys/arch/xen/include/xen-public/arch-ia64/hvm/memmap.h U src/sys/arch/xen/include/xen-public/arch-x86/xen.h U src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_64.h U src/sys/arch/xen/include/xen-public/arch-x86/cpuid.h U src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h U src/sys/arch/xen/include/xen-public/arch-x86/xen-mca.h U src/sys/arch/xen/include/xen-public/arch-x86/hvm/save.h 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jXen:yesterday -jXen src/sys/arch/xen/include/xen-public
CVS commit: src/sys/arch/xen/include/xen-public
Module Name:src Committed By: cegger Date: Wed Dec 7 15:04:19 UTC 2011 Modified Files: src/sys/arch/xen/include/xen-public: event_channel.h grant_table.h physdev.h trace.h xen.h src/sys/arch/xen/include/xen-public/arch-x86: xen-x86_32.h src/sys/arch/xen/include/xen-public/io: blkif.h netif.h xs_wire.h Log Message: merge. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/include/xen-public/event_channel.h \ src/sys/arch/xen/include/xen-public/grant_table.h \ src/sys/arch/xen/include/xen-public/physdev.h \ src/sys/arch/xen/include/xen-public/trace.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/xen/include/xen-public/xen.h cvs rdiff -u -r1.1.1.2 -r1.2 \ src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/include/xen-public/io/blkif.h \ src/sys/arch/xen/include/xen-public/io/netif.h cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/arch/xen/include/xen-public/io/xs_wire.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/include/xen-public/io
Module Name:src Committed By: cegger Date: Wed Dec 7 15:40:15 UTC 2011 Modified Files: src/sys/arch/xen/include/xen-public/io: ring.h Log Message: merge. (forgot in previous) To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/arch/xen/include/xen-public/io/ring.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: cegger Date: Wed Dec 7 15:47:43 UTC 2011 Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf src/sys/arch/x86/include: cpu.h src/sys/arch/x86/x86: pmap.c src/sys/arch/xen/include: granttables.h hypervisor.h xenbus.h src/sys/arch/xen/include/amd64: hypercalls.h src/sys/arch/xen/include/i386: hypercalls.h src/sys/arch/xen/x86: cpu.c xen_ipi.c xen_pmap.c src/sys/arch/xen/xen: clock.c evtchn.c hypervisor.c if_xennet_xenbus.c pciback.c xbd_xenbus.c xbdback_xenbus.c xencons.c xpci_xenbus.c Log Message: switch from xen3-public to xen-public. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.90 -r1.91 src/sys/arch/i386/i386/genassym.cf cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.143 -r1.144 src/sys/arch/x86/x86/pmap.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/include/granttables.h cvs rdiff -u -r1.35 -r1.36 src/sys/arch/xen/include/hypervisor.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/include/xenbus.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/include/amd64/hypercalls.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/include/i386/hypercalls.h cvs rdiff -u -r1.70 -r1.71 src/sys/arch/xen/x86/cpu.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/xen/x86/xen_pmap.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/xen/clock.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/xen/xen/evtchn.c \ src/sys/arch/xen/xen/hypervisor.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/xen/xen/if_xennet_xenbus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/pciback.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/xen/xbd_xenbus.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/xen/xen/xbdback_xenbus.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/xen/xencons.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/xen/xpci_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/include
Module Name:src Committed By: cegger Date: Wed Dec 7 16:01:39 UTC 2011 Modified Files: src/sys/arch/xen/include/amd64: hypercalls.h src/sys/arch/xen/include/i386: hypercalls.h Log Message: switch from xen3-public to xen-public. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/xen/include/amd64/hypercalls.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/include/i386/hypercalls.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/include/xen3-public
Module Name:src Committed By: cegger Date: Wed Dec 7 16:11:02 UTC 2011 Removed Files: src/sys/arch/xen/include/xen3-public: COPYING arch-ia64.h arch-x86_32.h arch-x86_64.h callback.h dom0_ops.h domctl.h elfnote.h elfstructs.h event_channel.h features.h grant_table.h kexec.h libelf.h memory.h nmi.h physdev.h platform.h sched.h sysctl.h trace.h vcpu.h version.h xen-compat.h xen.h xencomm.h xenoprof.h src/sys/arch/xen/include/xen3-public/arch-ia64: debug_op.h sioemu.h src/sys/arch/xen/include/xen3-public/arch-ia64/hvm: memmap.h save.h src/sys/arch/xen/include/xen3-public/arch-x86: cpuid.h xen-mca.h xen-x86_32.h xen-x86_64.h xen.h src/sys/arch/xen/include/xen3-public/arch-x86/hvm: save.h src/sys/arch/xen/include/xen3-public/hvm: e820.h hvm_info_table.h hvm_op.h ioreq.h params.h save.h vmx_assist.h src/sys/arch/xen/include/xen3-public/io: blkif.h console.h fbif.h fsif.h kbdif.h netif.h pciif.h protocols.h ring.h tpmif.h xenbus.h xs_wire.h src/sys/arch/xen/include/xen3-public/xsm: acm.h acm_ops.h flask_op.h Log Message: remove xen3-public To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/xen/include/xen3-public/COPYING \ src/sys/arch/xen/include/xen3-public/callback.h \ src/sys/arch/xen/include/xen3-public/elfstructs.h \ src/sys/arch/xen/include/xen3-public/nmi.h \ src/sys/arch/xen/include/xen3-public/xenoprof.h cvs rdiff -u -r1.7 -r0 src/sys/arch/xen/include/xen3-public/arch-ia64.h \ src/sys/arch/xen/include/xen3-public/physdev.h \ src/sys/arch/xen/include/xen3-public/trace.h cvs rdiff -u -r1.6 -r0 src/sys/arch/xen/include/xen3-public/arch-x86_32.h \ src/sys/arch/xen/include/xen3-public/memory.h \ src/sys/arch/xen/include/xen3-public/sched.h \ src/sys/arch/xen/include/xen3-public/vcpu.h cvs rdiff -u -r1.5 -r0 src/sys/arch/xen/include/xen3-public/arch-x86_64.h \ src/sys/arch/xen/include/xen3-public/dom0_ops.h \ src/sys/arch/xen/include/xen3-public/event_channel.h \ src/sys/arch/xen/include/xen3-public/version.h \ src/sys/arch/xen/include/xen3-public/xen-compat.h cvs rdiff -u -r1.4 -r0 src/sys/arch/xen/include/xen3-public/domctl.h \ src/sys/arch/xen/include/xen3-public/features.h \ src/sys/arch/xen/include/xen3-public/kexec.h \ src/sys/arch/xen/include/xen3-public/libelf.h \ src/sys/arch/xen/include/xen3-public/platform.h \ src/sys/arch/xen/include/xen3-public/sysctl.h cvs rdiff -u -r1.2 -r0 src/sys/arch/xen/include/xen3-public/elfnote.h \ src/sys/arch/xen/include/xen3-public/xencomm.h cvs rdiff -u -r1.8 -r0 src/sys/arch/xen/include/xen3-public/grant_table.h cvs rdiff -u -r1.9 -r0 src/sys/arch/xen/include/xen3-public/xen.h cvs rdiff -u -r1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/debug_op.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/sioemu.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/hvm/memmap.h cvs rdiff -u -r1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-ia64/hvm/save.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/arch/xen/include/xen3-public/arch-x86/cpuid.h \ src/sys/arch/xen/include/xen3-public/arch-x86/xen-mca.h cvs rdiff -u -r1.4 -r0 \ src/sys/arch/xen/include/xen3-public/arch-x86/xen-x86_32.h \ src/sys/arch/xen/include/xen3-public/arch-x86/xen-x86_64.h \ src/sys/arch/xen/include/xen3-public/arch-x86/xen.h cvs rdiff -u -r1.2 -r0 \ src/sys/arch/xen/include/xen3-public/arch-x86/hvm/save.h cvs rdiff -u -r1.4 -r0 src/sys/arch/xen/include/xen3-public/hvm/e820.h \ src/sys/arch/xen/include/xen3-public/hvm/hvm_op.h \ src/sys/arch/xen/include/xen3-public/hvm/ioreq.h \ src/sys/arch/xen/include/xen3-public/hvm/params.h \ src/sys/arch/xen/include/xen3-public/hvm/vmx_assist.h cvs rdiff -u -r1.3 -r0 \ src/sys/arch/xen/include/xen3-public/hvm/hvm_info_table.h \ src/sys/arch/xen/include/xen3-public/hvm/save.h cvs rdiff -u -r1.7 -r0 src/sys/arch/xen/include/xen3-public/io/blkif.h cvs rdiff -u -r1.4 -r0 src/sys/arch/xen/include/xen3-public/io/console.h \ src/sys/arch/xen/include/xen3-public/io/kbdif.h cvs rdiff -u -r1.3 -r0 src/sys/arch/xen/include/xen3-public/io/fbif.h \ src/sys/arch/xen/include/xen3-public/io/protocols.h cvs rdiff -u -r1.1.1.1 -r0 src/sys/arch/xen/include/xen3-public/io/fsif.h cvs rdiff -u -r1.6 -r0 src/sys/arch/xen/include/xen3-public/io/netif.h \ src/sys/arch/xen/include/xen3-public/io/xenbus.h cvs rdiff -u -r1.5 -r0 src/sys/arch/xen/include/xen3-public/io/pciif.h \ src/sys/arch/xen/include/xen3-public/io/tpmif.h cvs rdiff -u -r1.12 -r0 src/sys/arch/xen/include/xen3-public/io/ring.h cvs rdiff -u -r1.9 -r0 src/sys/arch/xen/include/xen3-public/io/xs_wire.h cvs rdiff -u -r1.2 -r0 src/sys/arch/xen/include/xen3-public/xsm/acm.h \
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: cegger Date: Wed Dec 7 16:26:23 UTC 2011 Modified Files: src/sys/arch/xen/xen: evtchn.c Log Message: replace malloc() with kmem_zalloc() per request from cherry. While here fix error path. XXX: The size allocated and freed for interrupt handlers looks inconsistent to me. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/xen/xen/evtchn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On 11/23/11 11:47, Thor Lancelot Simon wrote: Module Name:src Committed By: tls Date: Wed Nov 23 10:47:50 UTC 2011 Modified Files: src/distrib/sets/lists/etc: mi src/etc/defaults: rc.conf src/etc/rc.d: Makefile src/sbin/rndctl: rndctl.8 rndctl.c src/sys/dev: rnd.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c src/sys/sys: kauth.h rnd.h Added Files: src/etc/rc.d: random_seed Log Message: Load entropy at system boot (only works at securelevel 1); save at system shutdown. Disable with random_seed=NO in rc.conf if desired. Goes to some trouble to never load or save to network filesystems. Entropy should really be loaded by the boot loader but I am still sorting out how to pass it to the kernel. How about passing it as a module similar to the multiboot technique? Christoph
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: cegger
Date: Wed Sep 21 15:26:47 UTC 2011
Modified Files:
src/sys/arch/xen/xen: evtchn.c
Log Message:
Initialize mutex before use. Lets me boot a dom0 kernel again
without a lockdebug panic.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/xen/xen/evtchn.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/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.54 src/sys/arch/xen/xen/evtchn.c:1.55
--- src/sys/arch/xen/xen/evtchn.c:1.54 Tue Sep 20 00:12:24 2011
+++ src/sys/arch/xen/xen/evtchn.c Wed Sep 21 15:26:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.54 2011/09/20 00:12:24 jym Exp $ */
+/* $NetBSD: evtchn.c,v 1.55 2011/09/21 15:26:47 cegger Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.54 2011/09/20 00:12:24 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.55 2011/09/21 15:26:47 cegger Exp $);
#include opt_xen.h
#include isa.h
@@ -179,6 +179,7 @@
void
events_init(void)
{
+ mutex_init(evtchn_lock, MUTEX_DEFAULT, IPL_NONE);
debug_port = bind_virq_to_evtch(VIRQ_DEBUG);
KASSERT(debug_port != -1);
Re: CVS commit: src/sys/dev/wscons
On 11.09.11 21:19, Jonathan A. Kollasch wrote:
Module Name: src
Committed By: jakllsch
Date: Sun Sep 11 19:19:19 UTC 2011
Modified Files:
src/sys/dev/wscons: wsmouse.c
Log Message:
Initialize the W axis value on open as is already done for the other axes.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/wscons/wsmouse.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/wscons/wsmouse.c
diff -u src/sys/dev/wscons/wsmouse.c:1.62 src/sys/dev/wscons/wsmouse.c:1.63
--- src/sys/dev/wscons/wsmouse.c:1.62 Thu Jan 15 04:22:11 2009
+++ src/sys/dev/wscons/wsmouse.c Sun Sep 11 19:19:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.62 2009/01/15 04:22:11 yamt Exp $ */
+/* $NetBSD: wsmouse.c,v 1.63 2011/09/11 19:19:19 jakllsch Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wsmouse.c,v 1.62 2009/01/15 04:22:11 yamt Exp
$);
+__KERNEL_RCSID(0, $NetBSD: wsmouse.c,v 1.63 2011/09/11 19:19:19 jakllsch
Exp $);
#include wsmouse.h
#include wsdisplay.h
@@ -143,6 +143,7 @@
#define INVALID_XINT_MAX
#define INVALID_YINT_MAX
#define INVALID_ZINT_MAX
+#define INVALID_WINT_MAX
struct wsmouse_softc {
struct wsevsrc sc_base;
@@ -621,6 +622,7 @@
sc-sc_x = INVALID_X;
sc-sc_y = INVALID_Y;
sc-sc_z = INVALID_Z;
+ sc-sc_z = INVALID_W;
You mean sc-sc_w here, right ?
Christoph
/* Stop button repeating when messing with the device. */
if (sc-sc_repeat_button != -1) {
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: cegger Date: Wed Sep 7 08:43:20 UTC 2011 Modified Files: src/sys/dev/acpi: hpacel_acpi.c Log Message: hpacel_reg_info() wants a device_t and not an ACPI_HANDLE. Fixes NULL pointer dereference in hpacel_reg_info(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/hpacel_acpi.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/acpi/hpacel_acpi.c diff -u src/sys/dev/acpi/hpacel_acpi.c:1.2 src/sys/dev/acpi/hpacel_acpi.c:1.3 --- src/sys/dev/acpi/hpacel_acpi.c:1.2 Wed Jul 13 10:59:35 2011 +++ src/sys/dev/acpi/hpacel_acpi.c Wed Sep 7 08:43:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hpacel_acpi.c,v 1.2 2011/07/13 10:59:35 jruoho Exp $ */ +/* $NetBSD: hpacel_acpi.c,v 1.3 2011/09/07 08:43:20 cegger Exp $ */ /*- * Copyright (c) 2009, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: hpacel_acpi.c,v 1.2 2011/07/13 10:59:35 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: hpacel_acpi.c,v 1.3 2011/09/07 08:43:20 cegger Exp $); #include sys/param.h #include sys/module.h @@ -324,7 +324,7 @@ /* * Update the register information. */ - (void)hpacel_reg_info(hdl); + (void)hpacel_reg_info(self); out: if (ACPI_FAILURE(rv))
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: cegger Date: Wed Sep 7 08:43:20 UTC 2011 Modified Files: src/sys/dev/acpi: hpacel_acpi.c Log Message: hpacel_reg_info() wants a device_t and not an ACPI_HANDLE. Fixes NULL pointer dereference in hpacel_reg_info(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/hpacel_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/man/man4
On 29.08.11 06:26, Christoph Egger wrote: On 29.08.11 00:09, Jean-Yves Migeon wrote: Module Name: src Committed By:jym Date:Sun Aug 28 22:09:37 UTC 2011 Modified Files: src/share/man/man4: ddb.4 Log Message: Be more precise for Xen: + is only valid for Xen domUs. dom0 uses the same key sequences as i386/amd64. + also works for me in a dom0. I think I have to mention I am using serial console regularly. Christoph
Re: CVS commit: src/sys/conf
On 07/04/11 15:00, matthew green wrote:
Module Name:src
Committed By: mrg
Date: Mon Jul 4 13:00:19 UTC 2011
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
apply some -Wno-foo to 3 files that are non-trivial to solve, for GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.140
src/sys/conf/Makefile.kern.inc:1.141
--- src/sys/conf/Makefile.kern.inc:1.140Mon Jun 20 06:52:38 2011
+++ src/sys/conf/Makefile.kern.inc Mon Jul 4 13:00:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.140 2011/06/20 06:52:38 mrg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.141 2011/07/04 13:00:19 mrg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -510,12 +510,19 @@
uvm/uvm_pager.c dev/ic/aic7xxx.c dev/ic/aic79xx.c arch/xen/i386/gdt.c \
dev/ofw/ofw_subr.c
-. if defined(HAVE_GCC) || defined(HAVE_PCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
Please revert this part.
Christoph
.for __varstack in ${VARSTACK}
COPTS.${__varstack:T} += -Wno-stack-protector
.endfor
.endif
+# XXX ugly ugly to fix
+.if defined(HAVE_GCC) ${HAVE_GCC} == 45
+CWARNFLAGS.tulip.c+= -Wno-array-bounds
+CWARNFLAGS.radeonfb.c+=-Wno-cast-qual
+CWARNFLAGS.dbcool.c+= -Wno-cast-qual
+.endif
+
AFLAGS+= ${AOPTS.${.IMPSRC:T}}
CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}}
CPPFLAGS+=${CPPFLAGS.${.IMPSRC:T}}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Thu Jun 9 12:04:30 UTC 2011 Modified Files: src/sys/dev/pci: if_bge.c Log Message: the BCM5785 is a PCIe chip but does not report PCIe capabilities. Check for this chip explicitely and enable PCIe. Fixes 'firmware handshake timeout'. Tested with root on nfs. patch from msaitoh@ To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: cegger Date: Tue Jun 7 09:24:17 UTC 2011 Modified Files: src/sys/dev/mii: miidevs Log Message: add BCM5785 To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/dev/mii/miidevs 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/miidevs diff -u src/sys/dev/mii/miidevs:1.101 src/sys/dev/mii/miidevs:1.102 --- src/sys/dev/mii/miidevs:1.101 Sat May 28 05:55:58 2011 +++ src/sys/dev/mii/miidevs Tue Jun 7 09:24:17 2011 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.101 2011/05/28 05:55:58 matt Exp $ +$NetBSD: miidevs,v 1.102 2011/06/07 09:24:17 cegger Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -169,6 +169,7 @@ model BROADCOM2 BCM5482 0x000b BCM5482 1000BASE-T media interface model BROADCOM2 BCM5755 0x000c BCM5755 1000BASE-T media interface model BROADCOM2 BCM5754 0x000e BCM5754/5787 1000BASE-T media interface +model BROADCOM2 BCM5785 0x0016 BCM5785 1000BASE-T media interface model BROADCOM2 BCM5709CAX 0x002c BCM5709CAX 10/100/1000baseT PHY model BROADCOM2 BCM5722 0x002d BCM5722 1000BASE-T media interface model BROADCOM2 BCM5784 0x003a BCM5784 10/100/1000baseT PHY
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: cegger
Date: Tue Jun 7 09:26:27 UTC 2011
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
regen.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/mii/miidevs_data.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/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.104 src/sys/dev/mii/miidevs.h:1.105
--- src/sys/dev/mii/miidevs.h:1.104 Sat May 28 05:56:15 2011
+++ src/sys/dev/mii/miidevs.h Tue Jun 7 09:26:27 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.104 2011/05/28 05:56:15 matt Exp $ */
+/* $NetBSD: miidevs.h,v 1.105 2011/06/07 09:26:27 cegger Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.101 2011/05/28 05:55:58 matt Exp
+ * NetBSD: miidevs,v 1.102 2011/06/07 09:24:17 cegger Exp
*/
/*-
@@ -220,6 +220,8 @@
#define MII_STR_BROADCOM2_BCM5755 BCM5755 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5754 0x000e
#define MII_STR_BROADCOM2_BCM5754 BCM5754/5787 1000BASE-T media interface
+#define MII_MODEL_BROADCOM2_BCM5785 0x0016
+#define MII_STR_BROADCOM2_BCM5785 BCM5785 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5709CAX 0x002c
#define MII_STR_BROADCOM2_BCM5709CAX BCM5709CAX 10/100/1000baseT PHY
#define MII_MODEL_BROADCOM2_BCM5722 0x002d
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.92 src/sys/dev/mii/miidevs_data.h:1.93
--- src/sys/dev/mii/miidevs_data.h:1.92 Sat May 28 05:56:15 2011
+++ src/sys/dev/mii/miidevs_data.h Tue Jun 7 09:26:27 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.92 2011/05/28 05:56:15 matt Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.93 2011/06/07 09:26:27 cegger Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.101 2011/05/28 05:55:58 matt Exp
+ * NetBSD: miidevs,v 1.102 2011/06/07 09:24:17 cegger Exp
*/
/*-
@@ -81,6 +81,7 @@
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5482, MII_STR_BROADCOM2_BCM5482 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5755, MII_STR_BROADCOM2_BCM5755 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5754, MII_STR_BROADCOM2_BCM5754 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5785, MII_STR_BROADCOM2_BCM5785 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709CAX, MII_STR_BROADCOM2_BCM5709CAX },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5722, MII_STR_BROADCOM2_BCM5722 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5784, MII_STR_BROADCOM2_BCM5784 },
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Tue Jun 7 10:07:35 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: add ATI Radeon Cypress and Lucent IEEE 1394b Controller To generate a diff of this commit: cvs rdiff -u -r1.1084 -r1.1085 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1084 src/sys/dev/pci/pcidevs:1.1085 --- src/sys/dev/pci/pcidevs:1.1084 Mon Jun 6 14:31:23 2011 +++ src/sys/dev/pci/pcidevs Tue Jun 7 10:07:35 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1084 2011/06/06 14:31:23 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1085 2011/06/07 10:07:35 cegger Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1405,6 +1405,7 @@ product ATI RADEON_X850XT_S 0x5d72 Radeon X850 XT Secondary product ATI RADEON_X700 0x5e4b Radeon X700 Pro product ATI RADEON_X700_S 0x5e6b Radeon X700 Pro Secondary +product ATI RADEON_HD5870 0x6898 Radeon HD 5870 Cypress product ATI RADEON_HD5600_RD 0x68c1 Redwood product ATI RADEON_X1300 0x7146 Radeon X1300 Series (RV515) product ATI RADEON_X1300_S 0x7166 Radeon X1300 Series (RV515) Secondary @@ -3172,6 +3173,7 @@ product LUCENT USBHC 0x5801 USB Host Controller product LUCENT USBHC2 0x5802 2-port USB Host Controller product LUCENT FW322_323 0x5811 FW322/323 IEEE 1394 Host Controller +product LUCENT FW643_PCIE 0x5901 FW643 PCIE IEEE 1394b Host Controller product LUCENT ET1310 0xed00 ET1310 10/100/1000 Ethernet product LUCENT ET1301 0xed01 ET1301 10/100 Ethernet
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: cegger
Date: Tue Jun 7 10:10:44 UTC 2011
Modified Files:
src/sys/dev/mii: brgphy.c
Log Message:
add BCM5785 phy:
brgphy0 at bge0 phy 1: BCM5785 1000BASE-T media interface, rev. 3
brgphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, 1000baseT,
1000baseT-FD , auto
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/brgphy.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.58 src/sys/dev/mii/brgphy.c:1.59
--- src/sys/dev/mii/brgphy.c:1.58 Mon May 2 09:03:10 2011
+++ src/sys/dev/mii/brgphy.c Tue Jun 7 10:10:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.58 2011/05/02 09:03:10 jym Exp $ */
+/* $NetBSD: brgphy.c,v 1.59 2011/06/07 10:10:44 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.58 2011/05/02 09:03:10 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59 2011/06/07 10:10:44 cegger Exp $);
#include sys/param.h
#include sys/systm.h
@@ -202,6 +202,9 @@
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5784,
MII_STR_BROADCOM2_BCM5784 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5785,
+ MII_STR_BROADCOM2_BCM5785 },
+
{ MII_OUI_xxBROADCOM_ALT1, MII_MODEL_xxBROADCOM_ALT1_BCM5906,
MII_STR_xxBROADCOM_ALT1_BCM5906 },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: cegger Date: Tue Jun 7 09:24:17 UTC 2011 Modified Files: src/sys/dev/mii: miidevs Log Message: add BCM5785 To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: cegger Date: Tue Jun 7 09:26:27 UTC 2011 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.92 -r1.93 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Tue Jun 7 10:07:35 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: add ATI Radeon Cypress and Lucent IEEE 1394b Controller To generate a diff of this commit: cvs rdiff -u -r1.1084 -r1.1085 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Tue Jun 7 10:08:04 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.1080 -r1.1081 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1079 -r1.1080 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: cegger Date: Tue Jun 7 10:10:44 UTC 2011 Modified Files: src/sys/dev/mii: brgphy.c Log Message: add BCM5785 phy: brgphy0 at bge0 phy 1: BCM5785 1000BASE-T media interface, rev. 3 brgphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, 1000baseT, 1000baseT-FD , auto To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/dev/mii/brgphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: cegger
Date: Fri Jun 3 09:51:40 UTC 2011
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
fix crash by NULL pointer dereferencing I get everytime
right after this message:
bge0: discarding oversize frame (len=-4)
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.196 src/sys/dev/pci/if_bge.c:1.197
--- src/sys/dev/pci/if_bge.c:1.196 Sun May 22 08:15:20 2011
+++ src/sys/dev/pci/if_bge.c Fri Jun 3 09:51:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.196 2011/05/22 08:15:20 mrg Exp $ */
+/* $NetBSD: if_bge.c,v 1.197 2011/06/03 09:51:40 cegger Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.196 2011/05/22 08:15:20 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.197 2011/06/03 09:51:40 cegger Exp $);
#include vlan.h
#include rnd.h
@@ -3406,6 +3406,11 @@
stdcnt++;
dmamap = sc-bge_cdata.bge_rx_std_map[rxidx];
sc-bge_cdata.bge_rx_std_map[rxidx] = 0;
+ if (dmamap == NULL) {
+ifp-if_ierrors++;
+bge_newbuf_std(sc, sc-bge_std, m, dmamap);
+continue;
+ }
bus_dmamap_sync(sc-bge_dmatag, dmamap, 0,
dmamap-dm_mapsize, BUS_DMASYNC_POSTREAD);
bus_dmamap_unload(sc-bge_dmatag, dmamap);
CVS commit: src/sys/dev/pci
Module Name:src Committed By: cegger Date: Fri Jun 3 09:51:40 UTC 2011 Modified Files: src/sys/dev/pci: if_bge.c Log Message: fix crash by NULL pointer dereferencing I get everytime right after this message: bge0: discarding oversize frame (len=-4) To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
On 30.11.10 05:31, Jukka Ruohonen wrote: Module Name: src Committed By: jruoho Date: Tue Nov 30 04:31:00 UTC 2010 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/dev/acpi: acpi_cpu.h acpi_cpu_cstate.c Log Message: Add AMD C1E quirk. Tested by cegger@. (a) This should be removed once C-states are supported. (b) As there seems to be no reliable way to detect whether C1E is present, the quirk blindly assumes that C1E is used on families 10h and 11h. On family 10h there is a reliable way to detect C1E via OSVW. Anyway, thanks for doing this. Christoph
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: cegger Date: Mon Apr 11 08:56:17 UTC 2011 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: build xen kernels again after db_trace merge To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/xen/conf/files.xen 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/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.114 src/sys/arch/xen/conf/files.xen:1.115 --- src/sys/arch/xen/conf/files.xen:1.114 Sun Apr 3 22:29:27 2011 +++ src/sys/arch/xen/conf/files.xen Mon Apr 11 08:56:17 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.114 2011/04/03 22:29:27 dyoung Exp $ +# $NetBSD: files.xen,v 1.115 2011/04/11 08:56:17 cegger Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp @@ -42,8 +42,8 @@ file arch/i386/i386/db_dbgreg.S ddb | kstack_check_dr0 file arch/i386/i386/db_disasm.c ddb file arch/i386/i386/db_interface.c ddb +file arch/i386/i386/db_machdep.c ddb file arch/i386/i386/db_memrw.c ddb | kgdb -file arch/i386/i386/db_trace.c ddb file arch/i386/i386/dumpsys.c file arch/i386/i386/gdt.c file arch/i386/i386/ipkdb_glue.c ipkdb @@ -72,9 +72,9 @@ file arch/amd64/amd64/cpufunc.S file arch/amd64/amd64/cpu_in_cksum.S (inet | inet6) cpu_in_cksum file arch/amd64/amd64/db_disasm.c ddb -file arch/amd64/amd64/db_interface.c ddb +file arch/amd64/amd64/db_interface.c ddb +file arch/amd64/amd64/db_machdep.c ddb file arch/amd64/amd64/db_memrw.c ddb | kgdb -file arch/amd64/amd64/db_trace.c ddb file arch/amd64/amd64/kgdb_machdep.c kgdb file arch/amd64/amd64/kobj_machdep.c modular file arch/amd64/amd64/gdt.c @@ -88,6 +88,7 @@ endif file kern/subr_disk_mbr.c disk +file arch/x86/x86/db_trace.c ddb file arch/xen/x86/hypervisor_machdep.c # file arch/x86/x86/mtrr_i686.c mtrr file arch/x86/x86/syscall.c
CVS commit: src/sys/arch/xen/xenbus
Module Name:src
Committed By: cegger
Date: Mon Apr 11 15:00:49 UTC 2011
Modified Files:
src/sys/arch/xen/xenbus: xenbus_probe.c
Log Message:
Continue scanning for other frontends when initialization
of one frontend failed. Bug reported by Konrad Wilk on port-xen@.
Fix this for all error pathes within the loop.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/xen/xenbus/xenbus_probe.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/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.29 src/sys/arch/xen/xenbus/xenbus_probe.c:1.30
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.29 Wed Mar 30 22:34:03 2011
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Mon Apr 11 15:00:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.29 2011/03/30 22:34:03 jym Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $ */
/**
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.29 2011/03/30 22:34:03 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $);
#if 0
#define DPRINTK(fmt, args...) \
@@ -294,6 +294,7 @@
return err;
for (i = 0; i dir_n; i++) {
+ err = 0;
/*
* add size of path to size of xenbus_device. xenbus_device
* already has room for one char in xbusd_path.
CVS commit: src/sys/arch/xen/xenbus
Module Name:src
Committed By: cegger
Date: Tue Apr 12 05:09:32 UTC 2011
Modified Files:
src/sys/arch/xen/xenbus: xenbus_probe.c
Log Message:
previous fix does not work if there is exactly only one entry where continue
exits the loop.
Apply fix from Konrad Wilke on port-xen@
That makes NetBSD DomU boot on Linux Dom0 with xl.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/xen/xenbus/xenbus_probe.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/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.30 src/sys/arch/xen/xenbus/xenbus_probe.c:1.31
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.30 Mon Apr 11 15:00:49 2011
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Tue Apr 12 05:09:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.31 2011/04/12 05:09:32 cegger Exp $ */
/**
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: xenbus_probe.c,v 1.31 2011/04/12 05:09:32 cegger Exp $);
#if 0
#define DPRINTK(fmt, args...) \
@@ -317,6 +317,7 @@
printf(xenbus: can't get state
for %s (%d)\n, xbusd-xbusd_path, err);
free(xbusd, M_DEVBUF);
+ err = 0;
continue;
}
if (state != XenbusStateInitialising) {
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: cegger Date: Mon Apr 11 08:56:17 UTC 2011 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: build xen kernels again after db_trace merge To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/xen/conf/files.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/xenbus
Module Name:src Committed By: cegger Date: Mon Apr 11 15:00:49 UTC 2011 Modified Files: src/sys/arch/xen/xenbus: xenbus_probe.c Log Message: Continue scanning for other frontends when initialization of one frontend failed. Bug reported by Konrad Wilk on port-xen@. Fix this for all error pathes within the loop. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/xen/xenbus/xenbus_probe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/xenbus
Module Name:src Committed By: cegger Date: Tue Apr 12 05:09:32 UTC 2011 Modified Files: src/sys/arch/xen/xenbus: xenbus_probe.c Log Message: previous fix does not work if there is exactly only one entry where continue exits the loop. Apply fix from Konrad Wilke on port-xen@ That makes NetBSD DomU boot on Linux Dom0 with xl. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/xen/xenbus/xenbus_probe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/mk
On 10.04.11 23:03, Joerg Sonnenberger wrote:
Module Name: src
Committed By: joerg
Date: Sun Apr 10 21:03:17 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Use ?: operator to determine when to add --sysroot. Unbreaks clang
bootstrap.
[...]
-CPPFLAGS+= ${HOSTPROG:U${HOSTLIB:U${DESTDIR:D--sysroot=${DESTDIR
-LDFLAGS+=${HOSTPROG:U${HOSTLIB:U${DESTDIR:D--sysroot=${DESTDIR
+CPPFLAGS+= ${!defined(HOSTPROG) !defined(HOSTLIB) defined(DESTDIR)
:? --sysroot=${DESTDIR} :}
+LDFLAGS+=${!defined(HOSTPROG) !defined(HOSTLIB) defined(DESTDIR)
:? --sysroot=${DESTDIR} :}
.endif # EXTERNAL_TOOLCHAIN
# }
:? == ?: operator?
Christoph
