CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: macallan
Date: Tue Nov 5 11:08:20 UTC 2013
Modified Files:
src/sys/arch/macppc/dev: pmu.c
Log Message:
do what cuda does - if we read garbage from the RTC try a few more times
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/macppc/dev/pmu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/pmu.c
diff -u src/sys/arch/macppc/dev/pmu.c:1.21 src/sys/arch/macppc/dev/pmu.c:1.22
--- src/sys/arch/macppc/dev/pmu.c:1.21 Fri Jul 1 18:41:52 2011
+++ src/sys/arch/macppc/dev/pmu.c Tue Nov 5 11:08:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmu.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $ */
+/* $NetBSD: pmu.c,v 1.22 2013/11/05 11:08:20 macallan Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmu.c,v 1.21 2011/07/01 18:41:52 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmu.c,v 1.22 2013/11/05 11:08:20 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -702,13 +702,26 @@ pmu_todr_get(todr_chip_handle_t tch, str
{
struct pmu_softc *sc = tch-cookie;
uint32_t sec;
+ int count = 10;
+ int ok = FALSE;
uint8_t resp[16];
DPRINTF(pmu_todr_get\n);
- pmu_send(sc, PMU_READ_RTC, 0, NULL, 16, resp);
+ while ((count 0) (!ok)) {
+ pmu_send(sc, PMU_READ_RTC, 0, NULL, 16, resp);
- memcpy(sec, resp[1], 4);
- tvp-tv_sec = sec - DIFF19041970;
+ memcpy(sec, resp[1], 4);
+ tvp-tv_sec = sec - DIFF19041970;
+ ok = (sec DIFF19041970) (sec 0xf000);
+ if (!ok) aprint_error_dev(sc-sc_dev,
+ got garbage from rtc (%08x)\n, sec);
+ count--;
+ }
+ if (count == 0) {
+ aprint_error_dev(sc-sc_dev,
+ unable to get a sane time value\n);
+ tvp-tv_sec = 0;
+ }
DPRINTF(tod: % PRIo64 \n, tvp-tv_sec);
tvp-tv_usec = 0;
return 0;
CVS commit: xsrc/external/mit/xf86-video-igs/dist/src
Module Name:xsrc Committed By: macallan Date: Tue Nov 5 11:26:43 UTC 2013 Modified Files: xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c Log Message: use WSDISPLAYIO_MODE_MAPPED To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.9 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.10 --- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.9 Wed Dec 14 23:58:54 2011 +++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Tue Nov 5 11:26:43 2013 @@ -1,5 +1,5 @@ /* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */ -/* $NetBSD: igs_driver.c,v 1.9 2011/12/14 23:58:54 macallan Exp $ */ +/* $NetBSD: igs_driver.c,v 1.10 2013/11/05 11:26:43 macallan Exp $ */ /* * Copyright (c) 2001 Matthieu Herrb * 2009 Michael Lorenz @@ -651,7 +651,7 @@ IgsScreenInit(int scrnIndex, ScreenPtr p IgsPtr fPtr = IGSPTR(pScrn); VisualPtr visual; int ret, flags, ncolors; - int wsmode = WSDISPLAYIO_MODE_DUMBFB; + int wsmode = WSDISPLAYIO_MODE_MAPPED; size_t len; TRACE_ENTER(IgsScreenInit);
CVS commit: xsrc/external/mit/xf86-video-crime/dist/src
Module Name:xsrc
Committed By: macallan
Date: Tue Nov 5 11:28:10 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-crime/dist/src: crime_driver.c
Log Message:
use WSDISPLAYIO_MODE_MAPPED
while there, change vendor string to TNF since X.org had nothing to do with
this driver
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.10 xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.11
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.10 Thu May 19 03:05:19 2011
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c Tue Nov 5 11:28:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_driver.c,v 1.10 2011/05/19 03:05:19 christos Exp $ */
+/* $NetBSD: crime_driver.c,v 1.11 2013/11/05 11:28:09 macallan Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -171,7 +171,7 @@ static const char *ramdacSymbols[] = {
#ifdef XFree86LOADER
static XF86ModuleVersionInfo CrimeVersRec = {
crime,
- MODULEVENDORSTRING,
+ The NetBSD Foundation,
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
@@ -542,7 +542,7 @@ CrimeScreenInit(int scrnIndex, ScreenPtr
CrimePtr fPtr = CRIMEPTR(pScrn);
VisualPtr visual;
int ret, flags, width, height, i, j;
- int wsmode = WSDISPLAYIO_MODE_DUMBFB;
+ int wsmode = WSDISPLAYIO_MODE_MAPPED;
size_t len;
#ifdef CRIME_DEBUG
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: kefren
Date: Tue Nov 5 13:09:12 UTC 2013
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
sync an example with the latest group syntax change
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/npf/npfctl/npf.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.31 src/usr.sbin/npf/npfctl/npf.conf.5:1.32
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.31 Fri Sep 20 03:03:52 2013
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Tue Nov 5 13:09:12 2013
@@ -1,4 +1,4 @@
-.\$NetBSD: npf.conf.5,v 1.31 2013/09/20 03:03:52 rmind Exp $
+.\$NetBSD: npf.conf.5,v 1.32 2013/11/05 13:09:12 kefren Exp $
.\
.\ Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd September 20, 2013
+.Dd November 5, 2013
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -115,7 +115,7 @@ Groups may have the following options: n
They are defined in the following form:
.Pp
.Bd -literal
-group (name my_group, interface wm0, in) {
+group my_group_name in on wm0 {
# List of rules
}
.Ed
CVS commit: src/sys
Module Name:src
Committed By: martin
Date: Tue Nov 5 14:26:19 UTC 2013
Modified Files:
src/sys/kern: exec_elf.c
src/sys/sys: exec_elf.h
Log Message:
Define a new NetBSD specific note to encode the code model used for a binary.
Allow MD code to check these notes in the exec path.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.131 -r1.132 src/sys/sys/exec_elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.48 src/sys/kern/exec_elf.c:1.49
--- src/sys/kern/exec_elf.c:1.48 Wed Oct 30 23:32:30 2013
+++ src/sys/kern/exec_elf.c Tue Nov 5 14:26:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.48 2013/10/30 23:32:30 joerg Exp $ */
+/* $NetBSD: exec_elf.c,v 1.49 2013/11/05 14:26:19 martin Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.48 2013/10/30 23:32:30 joerg Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.49 2013/11/05 14:26:19 martin Exp $);
#ifdef _KERNEL_OPT
#include opt_pax.h
@@ -961,6 +961,21 @@ bad:
sizeof(epp-ep_machine_arch));
break;
}
+ case ELF_NOTE_TYPE_MCMODEL_TAG:
+ /*
+ * arch specific check for code model
+ */
+#ifdef ELF_MD_MCMODEL_CHECK
+ if (np-n_namesz == ELF_NOTE_MCMODEL_NAMESZ
+ memcmp(ndata, ELF_NOTE_MCMODEL_NAME,
+ELF_NOTE_MCMODEL_NAMESZ) == 0) {
+ELF_MD_MCMODEL_CHECK(epp,
+ndata + roundup(ELF_NOTE_MCMODEL_NAMESZ, 4),
+np-n_descsz);
+break;
+ }
+#endif
+ break;
/*
* Dunno, warn for diagnostic
Index: src/sys/sys/exec_elf.h
diff -u src/sys/sys/exec_elf.h:1.131 src/sys/sys/exec_elf.h:1.132
--- src/sys/sys/exec_elf.h:1.131 Tue Oct 29 00:22:59 2013
+++ src/sys/sys/exec_elf.h Tue Nov 5 14:26:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.h,v 1.131 2013/10/29 00:22:59 christos Exp $ */
+/* $NetBSD: exec_elf.h,v 1.132 2013/11/05 14:26:19 martin Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -983,6 +983,21 @@ struct netbsd_elfcore_procinfo {
/* NetBSD-specific note name */
#define ELF_NOTE_MARCH_NAME ELF_NOTE_NETBSD_NAME
+/*
+ * NetBSD-specific note type: MCMODEL
+ * There should be 1 NOTE per executable.
+ * name: NetBSD\0
+ * namesz: 7
+ * code model: string
+ */
+
+#define ELF_NOTE_TYPE_MCMODEL_TAG 6
+/* NetBSD-specific note name and description sizes */
+#define ELF_NOTE_MCMODEL_NAMESZ ELF_NOTE_NETBSD_NAMESZ
+/* NetBSD-specific note name */
+#define ELF_NOTE_MCMODEL_NAME ELF_NOTE_NETBSD_NAME
+
+
#if !defined(ELFSIZE) defined(ARCH_ELFSIZE)
#define ELFSIZE ARCH_ELFSIZE
#endif
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: christos Date: Tue Nov 5 16:04:13 UTC 2013 Modified Files: src/sys/arch/x86/include: cpu.h Log Message: initialize cii before using it. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x86/include/cpu.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/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.55 src/sys/arch/x86/include/cpu.h:1.56 --- src/sys/arch/x86/include/cpu.h:1.55 Wed Oct 23 16:18:50 2013 +++ src/sys/arch/x86/include/cpu.h Tue Nov 5 11:04:13 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.55 2013/10/23 20:18:50 drochner Exp $ */ +/* $NetBSD: cpu.h,v 1.56 2013/11/05 16:04:13 christos Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -285,7 +285,8 @@ extern struct cpu_info cpu_info_primary; extern struct cpu_info *cpu_info_list; #define CPU_INFO_ITERATOR int -#define CPU_INFO_FOREACH(cii, ci) __USE(cii), ci = cpu_info_list; \ +#define CPU_INFO_FOREACH(cii, ci) cii = 0, __USE(cii), \ + ci = cpu_info_list; \ ci != NULL; ci = ci-ci_next #define CPU_STARTUP(_ci, _target) ((_ci)-ci_func-start(_ci, _target))
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src
Committed By: matt
Date: Tue Nov 5 18:32:45 UTC 2013
Modified Files:
src/sys/dev/pci [matt-nb5-mips64]: ahcisata_pci.c
Log Message:
Support a 64-bit BAR for AHCI
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.2.4.1 src/sys/dev/pci/ahcisata_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.12.4.2 src/sys/dev/pci/ahcisata_pci.c:1.12.4.2.4.1
--- src/sys/dev/pci/ahcisata_pci.c:1.12.4.2 Mon Mar 30 16:49:25 2009
+++ src/sys/dev/pci/ahcisata_pci.c Tue Nov 5 18:32:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.12.4.2 2009/03/30 16:49:25 snj Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.12.4.2.4.1 2013/11/05 18:32:45 matt Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.12.4.2 2009/03/30 16:49:25 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.12.4.2.4.1 2013/11/05 18:32:45 matt Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, $NetBSD: ahcisata_pci
#include dev/ic/ahcisatavar.h
#define AHCI_PCI_QUIRK_FORCE 1 /* force attach */
+#define AHCI_PCI_QUIRK_BAR0 2
static const struct pci_quirkdata ahci_pci_quirks[] = {
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA,
@@ -64,6 +65,8 @@ static const struct pci_quirkdata ahci_p
AHCI_PCI_QUIRK_FORCE },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_AHCI_1,
AHCI_PCI_QUIRK_FORCE },
+ { PCI_VENDOR_NETLOGIC, PCI_PRODUCT_NETLOGIC_XLP_AHCISATA,
+ AHCI_PCI_QUIRK_BAR0 },
};
struct ahci_pci_softc {
@@ -92,6 +95,7 @@ ahci_pci_match(device_t parent, cfdata_t
bus_size_t size;
int ret = 0;
const struct pci_quirkdata *quirks;
+ int bar = AHCI_PCI_ABAR;
quirks = ahci_pci_lookup_quirkdata(PCI_VENDOR(pa-pa_id),
PCI_PRODUCT(pa-pa_id));
@@ -104,10 +108,26 @@ ahci_pci_match(device_t parent, cfdata_t
(quirks == NULL || (quirks-quirks AHCI_PCI_QUIRK_FORCE) == 0))
return 0;
- if (pci_mapreg_map(pa, AHCI_PCI_ABAR,
- PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
- regt, regh, NULL, size) != 0)
+ /*
+ * Sometimes people just can't read specs.
+ */
+ if (quirks != NULL (quirks-quirks AHCI_PCI_QUIRK_BAR0)) {
+ bar = PCI_BAR0;
+ }
+
+ pcireg_t mem_type = pci_mapreg_type(pa-pa_pc, pa-pa_tag, bar);
+ if (PCI_MAPREG_TYPE(mem_type) != PCI_MAPREG_TYPE_MEM) {
+ printf(%s: tag %#lx: unexpected type %#x\n,
+ __func__, pa-pa_tag, mem_type);
+ return 0;
+ }
+
+ if (pci_mapreg_map(pa, bar, mem_type, 0,
+ regt, regh, NULL, size) != 0) {
+ printf(%s: tag %#lx: pci_mapreg_map failed\n,
+ __func__, pa-pa_tag);
return 0;
+ }
if ((PCI_SUBCLASS(pa-pa_class) == PCI_SUBCLASS_MASS_STORAGE_SATA
PCI_INTERFACE(pa-pa_class) == PCI_INTERFACE_SATA_AHCI) ||
@@ -130,13 +150,23 @@ ahci_pci_attach(device_t parent, device_
const char *intrstr;
pci_intr_handle_t intrhandle;
void *ih;
+ const struct pci_quirkdata *quirks;
+ int bar = AHCI_PCI_ABAR;
sc-sc_atac.atac_dev = self;
- if (pci_mapreg_map(pa, AHCI_PCI_ABAR,
- PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
+ /*
+ * Sometimes people just can't read specs.
+ */
+ quirks = ahci_pci_lookup_quirkdata(PCI_VENDOR(pa-pa_id),
+ PCI_PRODUCT(pa-pa_id));
+ if (quirks != NULL (quirks-quirks AHCI_PCI_QUIRK_BAR0)) {
+ bar = PCI_BAR0;
+ }
+
+ if (pci_mapreg_map(pa, bar, PCI_MAPREG_TYPE_MEM, 0,
sc-sc_ahcit, sc-sc_ahcih, NULL, size) != 0) {
- aprint_error_dev(self, can't map ahci registers\n);
+ aprint_error_dev(self, : can't map ahci registers\n);
return;
}
psc-sc_pc = pa-pa_pc;
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src
Committed By: matt
Date: Tue Nov 5 18:34:21 UTC 2013
Modified Files:
src/sys/dev/pci [matt-nb5-mips64]: pci_subr.c
Log Message:
Pull in support for pci_aprint_devinfo_fancy
To generate a diff of this commit:
cvs rdiff -u -r1.75.10.1.4.1 -r1.75.10.1.4.2 src/sys/dev/pci/pci_subr.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.75.10.1.4.1 src/sys/dev/pci/pci_subr.c:1.75.10.1.4.2
--- src/sys/dev/pci/pci_subr.c:1.75.10.1.4.1 Mon Dec 26 03:44:49 2011
+++ src/sys/dev/pci/pci_subr.c Tue Nov 5 18:34:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.75.10.1.4.1 2011/12/26 03:44:49 matt Exp $ */
+/* $NetBSD: pci_subr.c,v 1.75.10.1.4.2 2013/11/05 18:34:21 matt Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.75.10.1.4.1 2011/12/26 03:44:49 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.75.10.1.4.2 2013/11/05 18:34:21 matt Exp $);
#ifdef _KERNEL_OPT
#include opt_pci.h
@@ -421,6 +421,32 @@ pci_devinfo(pcireg_t id_reg, pcireg_t cl
}
}
+#ifdef _KERNEL
+void
+pci_aprint_devinfo_fancy(const struct pci_attach_args *pa, const char *naive,
+ const char *known, int addrev)
+{
+ char devinfo[256];
+
+ if (known) {
+ aprint_normal(: %s, known);
+ if (addrev)
+ aprint_normal( (rev. 0x%02x),
+ PCI_REVISION(pa-pa_class));
+ aprint_normal(\n);
+ } else {
+ pci_devinfo(pa-pa_id, pa-pa_class, 0,
+ devinfo, sizeof(devinfo));
+ aprint_normal(: %s (rev. 0x%02x)\n, devinfo,
+ PCI_REVISION(pa-pa_class));
+ }
+ if (naive)
+ aprint_naive(: %s\n, naive);
+ else
+ aprint_naive(\n);
+}
+#endif
+
/*
* Print out most of the PCI configuration registers. Typically used
* in a device attach routine like this:
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src Committed By: matt Date: Tue Nov 5 18:34:44 UTC 2013 Modified Files: src/sys/dev/pci [matt-nb5-mips64]: pcivar.h Log Message: Pull in support for pci_aprint_devinfo_fancy To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.83.12.1 src/sys/dev/pci/pcivar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcivar.h diff -u src/sys/dev/pci/pcivar.h:1.83 src/sys/dev/pci/pcivar.h:1.83.12.1 --- src/sys/dev/pci/pcivar.h:1.83 Tue Jul 22 04:52:19 2008 +++ src/sys/dev/pci/pcivar.h Tue Nov 5 18:34:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pcivar.h,v 1.83 2008/07/22 04:52:19 bjs Exp $ */ +/* $NetBSD: pcivar.h,v 1.83.12.1 2013/11/05 18:34:44 matt Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -213,6 +213,10 @@ int pci_get_capability(pci_chipset_tag_t int pci_probe_device(struct pci_softc *, pcitag_t tag, int (*)(struct pci_attach_args *), struct pci_attach_args *); void pci_devinfo(pcireg_t, pcireg_t, int, char *, size_t); +void pci_aprint_devinfo_fancy(const struct pci_attach_args *, + const char *, const char *, int); +#define pci_aprint_devinfo(pap, naive) \ + pci_aprint_devinfo_fancy(pap, naive, NULL, 0); void pci_conf_print(pci_chipset_tag_t, pcitag_t, void (*)(pci_chipset_tag_t, pcitag_t, const pcireg_t *)); const struct pci_quirkdata *
CVS commit: [matt-nb5-mips64] src/sys/dev/sdmmc
Module Name:src
Committed By: matt
Date: Tue Nov 5 18:35:35 UTC 2013
Modified Files:
src/sys/dev/sdmmc [matt-nb5-mips64]: sdhc.c
Log Message:
turn off debug
To generate a diff of this commit:
cvs rdiff -u -r1.7.2.4 -r1.7.2.5 src/sys/dev/sdmmc/sdhc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.7.2.4 src/sys/dev/sdmmc/sdhc.c:1.7.2.5
--- src/sys/dev/sdmmc/sdhc.c:1.7.2.4 Tue Dec 27 17:12:47 2011
+++ src/sys/dev/sdmmc/sdhc.c Tue Nov 5 18:35:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.7.2.4 2011/12/27 17:12:47 matt Exp $ */
+/* $NetBSD: sdhc.c,v 1.7.2.5 2013/11/05 18:35:35 matt Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.7.2.4 2011/12/27 17:12:47 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.7.2.5 2013/11/05 18:35:35 matt Exp $);
#include sys/param.h
#include sys/device.h
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.7
#include dev/sdmmc/sdmmcvar.h
#ifdef SDHC_DEBUG
-int sdhcdebug = 2;
+int sdhcdebug = 0;
#define DPRINTF(n,s) do { if ((n) = sdhcdebug) printf s; } while (0)
void sdhc_dump_regs(struct sdhc_host *);
#else
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src Committed By: matt Date: Tue Nov 5 18:37:37 UTC 2013 Modified Files: src/sys/dev/pci [matt-nb5-mips64]: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.963.4.1.4.8 -r1.963.4.1.4.9 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.962.4.1.4.8 -r1.962.4.1.4.9 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. Modified files: Index: src/sys/dev/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.963.4.1.4.8 src/sys/dev/pci/pcidevs.h:1.963.4.1.4.9 --- src/sys/dev/pci/pcidevs.h:1.963.4.1.4.8 Tue Nov 5 18:36:18 2013 +++ src/sys/dev/pci/pcidevs.h Tue Nov 5 18:37:24 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.963.4.1.4.8 2013/11/05 18:36:18 matt Exp $ */ +/* $NetBSD: pcidevs.h,v 1.963.4.1.4.9 2013/11/05 18:37:24 matt Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.962.4.1.4.7 2012/01/03 18:27:47 matt Exp + * NetBSD: pcidevs,v 1.962.4.1.4.8 2013/11/05 18:36:18 matt Exp */ /* Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.8 src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.9 --- src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.8 Tue Nov 5 18:36:18 2013 +++ src/sys/dev/pci/pcidevs_data.h Tue Nov 5 18:37:24 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.962.4.1.4.8 2013/11/05 18:36:18 matt Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.962.4.1.4.9 2013/11/05 18:37:24 matt Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.962.4.1.4.7 2012/01/03 18:27:47 matt Exp + * NetBSD: pcidevs,v 1.962.4.1.4.8 2013/11/05 18:36:18 matt Exp */ /*
CVS commit: [matt-nb5-mips64] src/sys/dev/i2c
Module Name:src
Committed By: matt
Date: Tue Nov 5 18:40:22 UTC 2013
Modified Files:
src/sys/dev/i2c [matt-nb5-mips64]: spdmem.c
Log Message:
Deal with larger DIMMs
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/dev/i2c/spdmem.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/i2c/spdmem.c
diff -u src/sys/dev/i2c/spdmem.c:1.11 src/sys/dev/i2c/spdmem.c:1.11.8.1
--- src/sys/dev/i2c/spdmem.c:1.11 Sun Sep 28 12:59:54 2008
+++ src/sys/dev/i2c/spdmem.c Tue Nov 5 18:40:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem.c,v 1.11 2008/09/28 12:59:54 pgoyette Exp $ */
+/* $NetBSD: spdmem.c,v 1.11.8.1 2013/11/05 18:40:22 matt Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: spdmem.c,v 1.11 2008/09/28 12:59:54 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: spdmem.c,v 1.11.8.1 2013/11/05 18:40:22 matt Exp $);
#include sys/param.h
#include sys/device.h
@@ -227,7 +227,7 @@ spdmem_attach(device_t parent, device_t
const char *rambus_rev = Reserved;
int num_banks = 0;
int per_chip = 0;
- int dimm_size, cycle_time, d_clk, p_clk, bits;
+ unsigned int dimm_size, cycle_time, d_clk, p_clk, bits;
int i;
unsigned int spd_len, spd_size;
unsigned int tAA, tRCD, tRP, tRAS;
@@ -420,9 +420,12 @@ spdmem_attach(device_t parent, device_t
}
if (IS_RAMBUS_TYPE ||
(num_banks = 8 per_chip = 8 dimm_size 0
- dimm_size = 12)) {
+ dimm_size = 18)) {
dimm_size = (1 dimm_size) * num_banks * per_chip;
- aprint_normal(, %dMB, dimm_size);
+ if (dimm_size = 1024)
+ aprint_normal(, %uGB, dimm_size / 1024);
+ else
+ aprint_normal(, %uMB, dimm_size);
if (node != NULL)
sysctl_createv(NULL, 0, NULL, NULL,
CTLFLAG_IMMEDIATE,
@@ -545,7 +548,7 @@ spdmem_attach(device_t parent, device_t
p_clk += 50;
p_clk -= p_clk % 100;
}
- aprint_normal(, %dMHz (%s-%d)\n,
+ aprint_normal(, %uMHz (%s-%u)\n,
d_clk, ddr_type_string, p_clk);
if (node != NULL)
sysctl_createv(NULL, 0, NULL, NULL,
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Tue Nov 5 18:41:57 UTC 2013 Modified Files: src/sys/arch/evbmips/conf [matt-nb5-mips64]: XLPEVB Log Message: Add xhci To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/arch/evbmips/conf/XLPEVB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/XLPEVB diff -u src/sys/arch/evbmips/conf/XLPEVB:1.1.2.7 src/sys/arch/evbmips/conf/XLPEVB:1.1.2.8 --- src/sys/arch/evbmips/conf/XLPEVB:1.1.2.7 Fri Feb 10 08:54:18 2012 +++ src/sys/arch/evbmips/conf/XLPEVB Tue Nov 5 18:41:57 2013 @@ -1,8 +1,8 @@ -# $NetBSD: XLPEVB,v 1.1.2.7 2012/02/10 08:54:18 matt Exp $ +# $NetBSD: XLPEVB,v 1.1.2.8 2013/11/05 18:41:57 matt Exp $ include arch/evbmips/conf/std.rmixlp -#ident XLSATX-$Revision: 1.1.2.7 $ +#ident XLSATX-$Revision: 1.1.2.8 $ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -153,6 +153,7 @@ ukphy* at mii? phy ? # unknown PHY com* at pci? dev ? function ? ehci* at pci? dev ? function ? ohci* at pci? dev ? function ? +xhci* at pci? dev ? function ? xlsdio* at pci? dev ? function ? sdhc* at xlsdio? slot 0 sdmmc* at sdhc? @@ -195,6 +196,7 @@ wd* at atabus? drive ? flags 0x # USB usb* at ohci? usb* at ehci? +usb* at xhci? uhub* at usb? uhub* at uhub? port ? umass* at uhub? port ? configuration ? interface ?
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: matt
Date: Tue Nov 5 18:44:02 UTC 2013
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_nand_pci.c
Log Message:
Start of a nand for xlp3xx/xlp2xx.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/rmi/rmixl_nand_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_nand_pci.c
diff -u src/sys/arch/mips/rmi/rmixl_nand_pci.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_nand_pci.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_nand_pci.c:1.1.2.2 Fri Dec 30 06:48:56 2011
+++ src/sys/arch/mips/rmi/rmixl_nand_pci.c Tue Nov 5 18:44:02 2013
@@ -27,16 +27,18 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include locators.h
+
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: rmixl_nand_pci.c,v 1.1.2.2 2011/12/30 06:48:56 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: rmixl_nand_pci.c,v 1.1.2.3 2013/11/05 18:44:02 matt Exp $);
#include sys/param.h
+#include sys/condvar.h
#include sys/device.h
+#include sys/mutex.h
#include sys/bus.h
-#include locators.h
-
#include dev/pci/pcireg.h
#include dev/pci/pcivar.h
#include dev/pci/pcidevs.h
@@ -51,27 +53,118 @@ __KERNEL_RCSID(1, $NetBSD: rmixl_nand_p
static int xlnand_pci_match(device_t, cfdata_t, void *);
static void xlnand_pci_attach(device_t, device_t, void *);
+static int xlnand_pci_detach(device_t, int);
+
+static int xlnand_read_page(device_t, size_t, uint8_t *);
+static int xlnand_program_page(device_t, size_t, const uint8_t *);
+
+static void xlnand_select(device_t, bool);
+static void xlnand_command(device_t, uint8_t);
+static void xlnand_address(device_t, uint8_t);
+static void xlnand_busy(device_t);
+static void xlnand_read_buf(device_t, void *, size_t);
+static void xlnand_write_buf(device_t, const void *, size_t);
+
+static void xlnand_read_1(device_t, uint8_t *);
+static void xlnand_read_2(device_t, uint16_t *);
+static void xlnand_write_1(device_t, uint8_t);
+static void xlnand_write_2(device_t, uint16_t);
+
+static int xlnand_intr(void *);
+
+struct xlnand_chip {
+ device_t xlch_nanddev;
+ kcondvar_t xlch_cv_ready;
+
+ uint32_t xlch_cmds;
+ uint64_t xlch_addrs;
+ uint32_t xlch_data;
+ uint32_t xlch_int_mask;
+ uint8_t xlch_cmdshift;
+ uint8_t xlch_addrshift;
+ uint8_t xlch_num;
+ uint8_t xlch_datalen;
+ uint8_t xlch_chipnum;
+
+ struct nand_interface xlch_nand_if;
+ char xlch_wmesg[16];
+};
struct xlnand_softc {
- device_t sc_dev;
- bus_space_tag_t sc_bst;
- bus_space_handle_t sc_bsh;
+ device_t xlsc_dev;
+ bus_dma_tag_t xlsc_dmat;
+ bus_space_tag_t xlsc_bst;
+ bus_space_handle_t xlsc_bsh;
+ void *xlsc_ih;
+ uint8_t xlsc_buswidth;
+
+ kcondvar_t xlsc_cv_available;
+ struct xlnand_chip *xlsc_active_chip;
+
+ bus_dma_segment_t xlsc_xferseg;
+ bus_dmamap_t xlsc_xfermap;
+ void *xlsc_xferbuf;
+
+ struct xlnand_chip xlsc_chips[8];
+
+ kmutex_t xlsc_intr_lock __aligned(64);
+ kmutex_t xlsc_wait_lock __aligned(64);
+};
+
+#define CMDSEQ1(a,b) (((ONFI_ ## b) 8) | RMIXLP_NAND_CMD_ ## a)
+#define CMDSEQ2(a,b,c) (((ONFI_ ## c) 16) | CMDSEQ1(a,b))
+#define CMDSEQ3(a,b,c,d) (((ONFI_ ## d) 14) | CMDSEQ2(a,b,c))
+
+static const uint32_t xlnand_cmdseqs[] = {
+ CMDSEQ1(SEQ_0, RESET),
+ //CMDSEQ1(SEQ_0, SYNCRONOUS_RESET),
+ CMDSEQ1(SEQ_1, READ_ID),
+ CMDSEQ1(SEQ_2, READ_UNIQUE_ID),
+ CMDSEQ1(SEQ_2, READ_PARAMETER_PAGE),
+ CMDSEQ1(SEQ_2, GET_FEATURES),
+ CMDSEQ1(SEQ_3, SET_FEATURES),
+ //CMDSEQ1(SEQ_17, SET_FEATURES2),
+ CMDSEQ1(SEQ_4, READ_STATUS),
+ //CMDSEQ1(SEQ_5, SELECT_LUN_WITH_STATUS),
+ CMDSEQ2(SEQ_6, CHANGE_READ_COLUMN, CHANGE_READ_COLUMN_START),
+ //CMDSEQ2(SEQ_7, SELECT_CACHE_REGISTER, CHANGE_READ_COLUMN_START),
+ //CMDSEQ1(SEQ_8, CHANGE_WRITE_COLUMN),
+ //CMDSEQ1(SEQ_12, CHANGE_ROW_ADDRESS),
+ CMDSEQ2(SEQ_10, READ, READ_START),
+ CMDSEQ2(SEQ_10, READ, READ_CACHE_RANDOM),
+ CMDSEQ1(SEQ_11, READ_CACHE_SEQUENTIAL),
+ CMDSEQ1(SEQ_11, READ_CACHE_END),
+ CMDSEQ2(SEQ_12, READ, READ_INTERLEAVED),
+ //CMDSEQ2(SEQ_15, READ, READ, READ_START),
+ CMDSEQ2(SEQ_12, PAGE_PROGRAM, PAGE_PROGRAM_START),
+ CMDSEQ1(SEQ_13, PAGE_PROGRAM),
+ CMDSEQ2(SEQ_12, PAGE_PROGRAM, PAGE_CACHE_PROGRAM),
+ CMDSEQ2(SEQ_12, PAGE_PROGRAM, PAGE_PROGRAM_INTERLEAVED),
+ //CMDSEQ1(SEQ_0, WRITE_PAGE),
+ //CMDSEQ1(SEQ_0, WRITE_PAGE_CACHE),
+ //CMDSEQ1(SEQ_0, WRITE_PAGE_INTERLEAVED),
+ CMDSEQ2(SEQ_10, READ, READ_COPYBACK),
+ CMDSEQ2(SEQ_9, COPYBACK_PROGRAM, COPYBACK_PROGRAM_START),
+ CMDSEQ2(SEQ_12, COPYBACK_PROGRAM, COPYBACK_PROGRAM_INTERLEAVED),
+ CMDSEQ1(SEQ_13, COPYBACK_PROGRAM),
+ CMDSEQ2(SEQ_14, BLOCK_ERASE, BLOCK_ERASE_START),
+ CMDSEQ2(SEQ_14, BLOCK_ERASE, BLOCK_ERASE_INTERLEAVED),
};
static inline uint32_t
-xlnand_read_4(struct xlnand_softc *sc, bus_size_t off)
+xlnand_read_4(struct xlnand_softc *xlsc, bus_size_t off)
{
- return bus_space_read_4(sc-sc_bst, sc-sc_bsh, off);
+ return bus_space_read_4(xlsc-xlsc_bst, xlsc-xlsc_bsh, off);
}
static inline void
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Wed Nov 6 00:53:03 UTC 2013 Modified Files: src/etc/mtree: NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.sparc64 NetBSD.dist.x86_64 Log Message: add g++ subdirs for GCC 4.8. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/etc/mtree/NetBSD.dist.mips64eb \ src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.mips64el \ src/etc/mtree/NetBSD.dist.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.mips64eb diff -u src/etc/mtree/NetBSD.dist.mips64eb:1.6 src/etc/mtree/NetBSD.dist.mips64eb:1.7 --- src/etc/mtree/NetBSD.dist.mips64eb:1.6 Tue Mar 12 20:01:55 2013 +++ src/etc/mtree/NetBSD.dist.mips64eb Wed Nov 6 00:53:03 2013 @@ -1,9 +1,12 @@ -# $NetBSD: NetBSD.dist.mips64eb,v 1.6 2013/03/12 20:01:55 christos Exp $ +# $NetBSD: NetBSD.dist.mips64eb,v 1.7 2013/11/06 00:53:03 mrg Exp $ ./lib/o32 ./lib/o32/npf ./lib/64 ./lib/64/npf +./usr/include/g++/bits/mips64 +./usr/include/g++/bits/mips32 +./usr/include/g++/bits/mipso32 ./usr/lib/o32 ./usr/lib/o32/i18n ./usr/lib/o32/lua Index: src/etc/mtree/NetBSD.dist.x86_64 diff -u src/etc/mtree/NetBSD.dist.x86_64:1.6 src/etc/mtree/NetBSD.dist.x86_64:1.7 --- src/etc/mtree/NetBSD.dist.x86_64:1.6 Tue Mar 12 20:01:55 2013 +++ src/etc/mtree/NetBSD.dist.x86_64 Wed Nov 6 00:53:03 2013 @@ -1,7 +1,9 @@ -# $NetBSD: NetBSD.dist.x86_64,v 1.6 2013/03/12 20:01:55 christos Exp $ +# $NetBSD: NetBSD.dist.x86_64,v 1.7 2013/11/06 00:53:03 mrg Exp $ ./lib/i386 ./lib/i386/npf +./usr/include/g++/bits/i386 +./usr/include/g++/bits/x86_64 ./usr/lib/i386 ./usr/lib/i386/i18n ./usr/lib/i386/lua Index: src/etc/mtree/NetBSD.dist.mips64el diff -u src/etc/mtree/NetBSD.dist.mips64el:1.7 src/etc/mtree/NetBSD.dist.mips64el:1.8 --- src/etc/mtree/NetBSD.dist.mips64el:1.7 Tue Mar 12 20:01:55 2013 +++ src/etc/mtree/NetBSD.dist.mips64el Wed Nov 6 00:53:03 2013 @@ -1,9 +1,12 @@ -# $NetBSD: NetBSD.dist.mips64el,v 1.7 2013/03/12 20:01:55 christos Exp $ +# $NetBSD: NetBSD.dist.mips64el,v 1.8 2013/11/06 00:53:03 mrg Exp $ ./lib/o32 ./lib/o32/npf ./lib/64 ./lib/64/npf +./usr/include/g++/bits/mips64 +./usr/include/g++/bits/mips32 +./usr/include/g++/bits/mipso32 ./usr/lib/o32 ./usr/lib/o32/i18n ./usr/lib/o32/lua Index: src/etc/mtree/NetBSD.dist.sparc64 diff -u src/etc/mtree/NetBSD.dist.sparc64:1.7 src/etc/mtree/NetBSD.dist.sparc64:1.8 --- src/etc/mtree/NetBSD.dist.sparc64:1.7 Tue Mar 12 20:22:00 2013 +++ src/etc/mtree/NetBSD.dist.sparc64 Wed Nov 6 00:53:03 2013 @@ -1,7 +1,9 @@ -# $NetBSD: NetBSD.dist.sparc64,v 1.7 2013/03/12 20:22:00 christos Exp $ +# $NetBSD: NetBSD.dist.sparc64,v 1.8 2013/11/06 00:53:03 mrg Exp $ ./lib/sparc ./lib/sparc/npf +./usr/include/g++/bits/sparc +./usr/include/g++/bits/sparc64 ./usr/lib/sparc ./usr/lib/sparc/i18n ./usr/lib/sparc/lua
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Wed Nov 6 00:53:39 UTC 2013 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.sparc md.sparc64 Log Message: update set lists for gcc 4.8. To generate a diff of this commit: cvs rdiff -u -r1.205 -r1.206 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/comp/md.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.205 src/distrib/sets/lists/comp/md.amd64:1.206 --- src/distrib/sets/lists/comp/md.amd64:1.205 Sat Nov 2 23:23:41 2013 +++ src/distrib/sets/lists/comp/md.amd64 Wed Nov 6 00:53:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.205 2013/11/02 23:23:41 christos Exp $ +# $NetBSD: md.amd64,v 1.206 2013/11/06 00:53:39 mrg Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include @@ -173,6 +173,10 @@ ./usr/include/clang-3.4/xmmintrin.h comp-c-include llvm ./usr/include/clang-3.4/xopintrin.h comp-c-include llvm ./usr/include/emmintrin.h comp-obsolete obsolete +./usr/include/g++/bits/i386 comp-c-include gcccmds,gcc=48,compat +./usr/include/g++/bits/i386/c++config.h comp-c-include gcccmds,gcc=48,compat +./usr/include/g++/bits/x86_64 comp-c-include gcccmds,gcc=48,compat +./usr/include/g++/bits/x86_64/c++config.h comp-c-include gcccmds,gcc=48,compat ./usr/include/gcc-4.1/emmintrin.h comp-c-include gcccmds,gcc=4 ./usr/include/gcc-4.1/emmintrin.h comp-obsolete gcc=45,obsolete ./usr/include/gcc-4.1/emmintrin.h comp-obsolete gcc=48,obsolete Index: src/distrib/sets/lists/comp/md.sparc diff -u src/distrib/sets/lists/comp/md.sparc:1.81 src/distrib/sets/lists/comp/md.sparc:1.82 --- src/distrib/sets/lists/comp/md.sparc:1.81 Fri Nov 1 07:48:31 2013 +++ src/distrib/sets/lists/comp/md.sparc Wed Nov 6 00:53:39 2013 @@ -1,6 +1,7 @@ -# $NetBSD: md.sparc,v 1.81 2013/11/01 07:48:31 mrg Exp $ +# $NetBSD: md.sparc,v 1.82 2013/11/06 00:53:39 mrg Exp $ ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc=48 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.173 src/distrib/sets/lists/comp/md.sparc64:1.174 --- src/distrib/sets/lists/comp/md.sparc64:1.173 Sat Nov 2 23:23:41 2013 +++ src/distrib/sets/lists/comp/md.sparc64 Wed Nov 6 00:53:39 2013 @@ -1,6 +1,11 @@ -# $NetBSD: md.sparc64,v 1.173 2013/11/02 23:23:41 christos Exp $ +# $NetBSD: md.sparc64,v 1.174 2013/11/06 00:53:39 mrg Exp $ +./usr/include/g++/bits/sparc comp-c-include gcccmds,gcc=48,compat +./usr/include/g++/bits/sparc/c++config.h comp-c-include gcccmds,gcc=48,compat +./usr/include/g++/bits/sparc64 comp-c-include gcccmds,gcc=48,compat +./usr/include/g++/bits/sparc64/c++config.h comp-c-include gcccmds,gcc=48,compat ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48 +./usr/include/gcc-4.8/visintrin.h comp-c-include gcccmds,gcc=48 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: christos Date: Wed Nov 6 02:02:00 UTC 2013 Modified Files: src/sys/arch/arm/include: cpu.h Log Message: use cii To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/arch/arm/include/cpu.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/arm/include/cpu.h diff -u src/sys/arch/arm/include/cpu.h:1.80 src/sys/arch/arm/include/cpu.h:1.81 --- src/sys/arch/arm/include/cpu.h:1.80 Sun Aug 18 19:14:27 2013 +++ src/sys/arch/arm/include/cpu.h Tue Nov 5 21:02:00 2013 @@ -217,7 +217,7 @@ void cpu_boot_secondary_processors(void) #define CPU_IS_PRIMARY(ci) true #define CPU_INFO_FOREACH(cii, ci) \ - cii = 0, ci = curcpu(); ci != NULL; ci = NULL + cii = 0, __USE(cii), ci = curcpu(); ci != NULL; ci = NULL #endif #define LWP0_CPU_INFO (cpu_info_store)
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: christos
Date: Wed Nov 6 02:34:10 UTC 2013
Modified Files:
src/sys/arch/arm/arm: arm_machdep.c
Log Message:
add diagused
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/arm/arm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.38 src/sys/arch/arm/arm/arm_machdep.c:1.39
--- src/sys/arch/arm/arm/arm_machdep.c:1.38 Fri Aug 23 01:22:01 2013
+++ src/sys/arch/arm/arm/arm_machdep.c Tue Nov 5 21:34:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_machdep.c,v 1.38 2013/08/23 05:22:01 matt Exp $ */
+/* $NetBSD: arm_machdep.c,v 1.39 2013/11/06 02:34:10 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -78,7 +78,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: arm_machdep.c,v 1.38 2013/08/23 05:22:01 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: arm_machdep.c,v 1.39 2013/11/06 02:34:10 christos Exp $);
#include sys/exec.h
#include sys/proc.h
@@ -201,7 +201,7 @@ startlwp(void *arg)
{
ucontext_t *uc = arg;
lwp_t *l = curlwp;
- int error;
+ int error __diagused;
error = cpu_setmcontext(l, uc-uc_mcontext, uc-uc_flags);
KASSERT(error == 0);
CVS commit: src/sys/arch/shark/shark
Module Name:src
Committed By: christos
Date: Wed Nov 6 02:35:26 UTC 2013
Modified Files:
src/sys/arch/shark/shark: consinit.c
Log Message:
move code inside ifdef
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/shark/shark/consinit.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/shark/shark/consinit.c
diff -u src/sys/arch/shark/shark/consinit.c:1.12 src/sys/arch/shark/shark/consinit.c:1.13
--- src/sys/arch/shark/shark/consinit.c:1.12 Sat Oct 13 13:58:53 2012
+++ src/sys/arch/shark/shark/consinit.c Tue Nov 5 21:35:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.12 2012/10/13 17:58:53 jdc Exp $ */
+/* $NetBSD: consinit.c,v 1.13 2013/11/06 02:35:26 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.12 2012/10/13 17:58:53 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.13 2013/11/06 02:35:26 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -103,13 +103,11 @@ int comconsole = 0;
void
consinit(void)
{
- struct consdev *cp;
static int initted;
if (initted)
return;
initted = 1;
- cp = NULL;
#if (NVGA 0)
/* The font built into the VGA ROM is broken: all the characters
@@ -150,7 +148,7 @@ consinit(void)
#else /* NVGA */
#if (NOFCONS 0)
- cp = ofcons;
+ struct consdev *cp = ofcons;
ofcons_cnprobe(cp);
if (cp-cn_pri == CN_INTERNAL) {
ofcons_cninit(cp);
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: christos
Date: Wed Nov 6 02:36:36 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
ifdef notyet code.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/arm/arm/cpufunc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.127 src/sys/arch/arm/arm/cpufunc.c:1.128
--- src/sys/arch/arm/arm/cpufunc.c:1.127 Wed Oct 23 16:28:11 2013
+++ src/sys/arch/arm/arm/cpufunc.c Tue Nov 5 21:36:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.127 2013/10/23 20:28:11 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.127 2013/10/23 20:28:11 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos Exp $);
#include opt_compat_netbsd.h
#include opt_cpuoptions.h
@@ -3192,19 +3192,19 @@ struct cpu_option sa110_options[] = {
void
sa110_setup(char *args)
{
- int cpuctrl, cpuctrlmask;
-
- cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
+ int cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
| CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE
| CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
| CPU_CONTROL_WBUF_ENABLE;
- cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
+#ifdef notyet
+ int cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
| CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE
| CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
| CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
| CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
| CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE
| CPU_CONTROL_CPCLK;
+#endif
#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -3226,7 +3226,9 @@ sa110_setup(char *args)
/* Set the control register */
curcpu()-ci_ctrl = cpuctrl;
-/* cpu_control(cpuctrlmask, cpuctrl);*/
+#ifdef notyet
+ cpu_control(cpuctrlmask, cpuctrl);
+#endif
cpu_control(0x, cpuctrl);
/*
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: christos
Date: Wed Nov 6 02:37:58 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: fault.c
Log Message:
sprinkle diagused
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/arm/arm32/fault.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.90 src/sys/arch/arm/arm32/fault.c:1.91
--- src/sys/arch/arm/arm32/fault.c:1.90 Sun Aug 18 02:28:18 2013
+++ src/sys/arch/arm/arm32/fault.c Tue Nov 5 21:37:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.90 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: fault.c,v 1.91 2013/11/06 02:37:58 christos Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
#include opt_kgdb.h
#include sys/types.h
-__KERNEL_RCSID(0, $NetBSD: fault.c,v 1.90 2013/08/18 06:28:18 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: fault.c,v 1.91 2013/11/06 02:37:58 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -758,7 +758,7 @@ void
prefetch_abort_handler(trapframe_t *tf)
{
struct lwp *l;
- struct pcb *pcb;
+ struct pcb *pcb __diagused;
struct vm_map *map;
vaddr_t fault_pc, va;
ksiginfo_t ksi;
CVS commit: src/sys/arch/shark/ofw
Module Name:src
Committed By: christos
Date: Wed Nov 6 02:41:12 UTC 2013
Modified Files:
src/sys/arch/shark/ofw: ofw.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/shark/ofw/ofw.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/shark/ofw/ofw.c
diff -u src/sys/arch/shark/ofw/ofw.c:1.61 src/sys/arch/shark/ofw/ofw.c:1.62
--- src/sys/arch/shark/ofw/ofw.c:1.61 Sun Aug 18 03:01:45 2013
+++ src/sys/arch/shark/ofw/ofw.c Tue Nov 5 21:41:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.61 2013/08/18 07:01:45 matt Exp $ */
+/* $NetBSD: ofw.c,v 1.62 2013/11/06 02:41:12 christos Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ofw.c,v 1.61 2013/08/18 07:01:45 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ofw.c,v 1.62 2013/11/06 02:41:12 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1202,7 +1202,6 @@ ofw_callbackhandler(void *v)
args-nreturns = 1;
} else if (strcmp(name, claim-virt) == 0) {
vaddr_t va;
- vsize_t size;
vaddr_t align;
/* XXX - notyet */
@@ -1220,7 +1219,6 @@ ofw_callbackhandler(void *v)
args_n_results[nargs] = 0; /* properly formatted request */
/* Allocate size bytes with specified alignment. */
- size = (vsize_t)args_n_results[0];
align = (vaddr_t)args_n_results[1];
if (align % PAGE_SIZE != 0) {
args_n_results[nargs + 1] = -1;
@@ -1239,8 +1237,6 @@ ofw_callbackhandler(void *v)
args-nreturns = 3;
}
} else if (strcmp(name, release-virt) == 0) {
- vaddr_t va;
- vsize_t size;
/* XXX - notyet */
printf(unimplemented ofw callback - %s\n, name);
@@ -1256,10 +1252,6 @@ ofw_callbackhandler(void *v)
}
args_n_results[nargs] = 0; /* properly formatted request */
- /* Release bytes. */
- va = (vaddr_t)args_n_results[0];
- size = (vsize_t)args_n_results[1];
-
args-nreturns = 1;
} else {
args_n_results[nargs] = -1;
CVS commit: src/sys/dev/marvell
Module Name:src
Committed By: mrg
Date: Wed Nov 6 06:20:12 UTC 2013
Modified Files:
src/sys/dev/marvell: gtpci.c
Log Message:
move some variables inside their #ifdef use.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/marvell/gtpci.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/marvell/gtpci.c
diff -u src/sys/dev/marvell/gtpci.c:1.30 src/sys/dev/marvell/gtpci.c:1.31
--- src/sys/dev/marvell/gtpci.c:1.30 Fri Sep 7 04:25:37 2012
+++ src/sys/dev/marvell/gtpci.c Wed Nov 6 06:20:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpci.c,v 1.30 2012/09/07 04:25:37 matt Exp $ */
+/* $NetBSD: gtpci.c,v 1.31 2013/11/06 06:20:12 mrg Exp $ */
/*
* Copyright (c) 2008, 2009 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gtpci.c,v 1.30 2012/09/07 04:25:37 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: gtpci.c,v 1.31 2013/11/06 06:20:12 mrg Exp $);
#include opt_pci.h
#include pci.h
@@ -314,12 +314,9 @@ gtpci_barinit(struct gtpci_softc *sc)
};
device_t pdev = device_parent(sc-sc_dev);
uint64_t base;
- uint32_t p2pc, size, bare;
- int map, bus, dev, rv;
+ uint32_t size, bare;
+ int map, rv;
- p2pc = GTPCI_READ(sc, GTPCI_P2PC);
- bus = GTPCI_P2PC_BUSNUMBER(p2pc);
- dev = GTPCI_P2PC_DEVNUM(p2pc);
bare = GTPCI_BARE_ALLDISABLE;
for (map = 0; maps[map].tag != MARVELL_TAG_UNDEFINED; map++) {
@@ -337,6 +334,9 @@ gtpci_barinit(struct gtpci_softc *sc)
if (maps[map].func != -1) {
pcitag_t tag;
pcireg_t reg;
+ int dev = GTPCI_P2PC_DEVNUM(p2pc);
+ int bus = GTPCI_P2PC_BUSNUMBER(p2pc);
+ uint32_t p2pc = GTPCI_READ(sc, GTPCI_P2PC);
tag = gtpci_make_tag(NULL, bus, dev, maps[map].func);
reg = gtpci_conf_read(sc, tag, maps[map].balow);
CVS commit: src/sys/arch
Module Name:src
Committed By: mrg
Date: Wed Nov 6 06:23:15 UTC 2013
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/xen/x86: mainbus.c x86_xpmap.c
src/sys/arch/xen/xen: privcmd.c xbd_xenbus.c xbdback_xenbus.c
Log Message:
- move variables inside their #ifdef use
- remove unused and set-but-unused variables
- use __USE() in a particularly ugly case
with these, and a couple of other changes, amd64 gcc 4.8.1 world
is able to complete build.sh release.
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/xen/x86/mainbus.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/xen/xen/privcmd.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.58 -r1.59 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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.197 src/sys/arch/amd64/amd64/machdep.c:1.198
--- src/sys/arch/amd64/amd64/machdep.c:1.197 Wed Oct 23 20:18:50 2013
+++ src/sys/arch/amd64/amd64/machdep.c Wed Nov 6 06:23:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.197 2013/10/23 20:18:50 drochner Exp $ */
+/* $NetBSD: machdep.c,v 1.198 2013/11/06 06:23:15 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.197 2013/10/23 20:18:50 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.198 2013/11/06 06:23:15 mrg Exp $);
/* #define XENDEBUG_LOW */
@@ -649,6 +649,7 @@ cpu_reboot(int howto, char *bootstr)
{
static bool syncdone = false;
int s = IPL_NONE;
+ __USE(s); /* ugly otherwise */
if (cold) {
howto |= RB_HALT;
Index: src/sys/arch/xen/x86/mainbus.c
diff -u src/sys/arch/xen/x86/mainbus.c:1.15 src/sys/arch/xen/x86/mainbus.c:1.16
--- src/sys/arch/xen/x86/mainbus.c:1.15 Tue Sep 20 00:12:24 2011
+++ src/sys/arch/xen/x86/mainbus.c Wed Nov 6 06:23:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.15 2011/09/20 00:12:24 jym Exp $ */
+/* $NetBSD: mainbus.c,v 1.16 2013/11/06 06:23:15 mrg Exp $ */
/* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.15 2011/09/20 00:12:24 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.16 2013/11/06 06:23:15 mrg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -133,7 +133,7 @@ mainbus_match(device_t parent, cfdata_t
void
mainbus_attach(device_t parent, device_t self, void *aux)
{
-#if defined(DOM0OPS) NPCI 0
+#if defined(DOM0OPS) NPCI 0 defined(PCI_BUS_FIXUP)
int mode;
#endif
union mainbus_attach_args mba;
@@ -157,8 +157,8 @@ mainbus_attach(device_t parent, device_t
#endif
#if NPCI 0
/* ACPI needs to be able to access PCI configuration space. */
- mode = pci_mode_detect();
#ifdef PCI_BUS_FIXUP
+ mode = pci_mode_detect();
if (mode != 0) {
pci_maxbus = pci_bus_fixup(NULL, 0);
aprint_debug_dev(self, PCI bus max, after
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.49 src/sys/arch/xen/x86/x86_xpmap.c:1.50
--- src/sys/arch/xen/x86/x86_xpmap.c:1.49 Sun Sep 16 22:09:34 2012
+++ src/sys/arch/xen/x86/x86_xpmap.c Wed Nov 6 06:23:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.49 2012/09/16 22:09:34 rmind Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.50 2013/11/06 06:23:15 mrg Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert m...@adviseo.fr
@@ -69,7 +69,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_xpmap.c,v 1.49 2012/09/16 22:09:34 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_xpmap.c,v 1.50 2013/11/06 06:23:15 mrg Exp $);
#include opt_xen.h
#include opt_ddb.h
@@ -701,7 +701,7 @@ xen_bootstrap_tables (vaddr_t old_pgd, v
int old_count, int new_count, int final)
{
pd_entry_t *pdtpe, *pde, *pte;
- pd_entry_t *cur_pgd, *bt_pgd;
+ pd_entry_t *bt_pgd;
paddr_t addr;
vaddr_t page, avail, text_end, map_end;
int i;
@@ -761,7 +761,6 @@ xen_bootstrap_tables (vaddr_t old_pgd, v
* - some PTEs (level 1)
*/
- cur_pgd = (pd_entry_t *) old_pgd;
bt_pgd = (pd_entry_t *) new_pgd;
memset (bt_pgd, 0, PAGE_SIZE);
avail = new_pgd + PAGE_SIZE;
Index: src/sys/arch/xen/xen/privcmd.c
diff -u src/sys/arch/xen/xen/privcmd.c:1.44 src/sys/arch/xen/xen/privcmd.c:1.45
--- src/sys/arch/xen/xen/privcmd.c:1.44 Wed Jun 27 00:37:10 2012
+++ src/sys/arch/xen/xen/privcmd.c Wed Nov 6 06:23:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: privcmd.c,v 1.44 2012/06/27 00:37:10 jym Exp $ */
+/* $NetBSD: privcmd.c,v 1.45 2013/11/06 06:23:15 mrg Exp $ */
/*-
* Copyright (c) 2004 Christian Limpach.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: privcmd.c,v 1.44
