CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Wed Jun 22 08:05:10 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_cpu_pstate.c acpi_cpu_tstate.c Log Message: Contrary to the previous, use aprint_error(9) but suppress warnings caused by the (optional) BIOS-based dynamic voltage and frequency scaling. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dev/acpi/acpi_cpu_pstate.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_cpu_tstate.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/acpi_cpu_pstate.c diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.49 src/sys/dev/acpi/acpi_cpu_pstate.c:1.50 --- src/sys/dev/acpi/acpi_cpu_pstate.c:1.49 Sat Jun 4 18:03:10 2011 +++ src/sys/dev/acpi/acpi_cpu_pstate.c Wed Jun 22 08:05:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_pstate.c,v 1.49 2011/06/04 18:03:10 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_pstate.c,v 1.50 2011/06/22 08:05:10 jruoho Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.49 2011/06/04 18:03:10 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.50 2011/06/22 08:05:10 jruoho Exp $"); #include #include @@ -965,7 +965,7 @@ return 0; fail: - aprint_debug_dev(sc->sc_dev, "failed " + aprint_error_dev(sc->sc_dev, "failed " "to get frequency (err %d)\n", rv); mutex_enter(&sc->sc_mtx); @@ -1099,8 +1099,9 @@ return; fail: - aprint_debug_dev(sc->sc_dev, "failed to set " - "frequency to %u (err %d)\n", freq, rv); + if (rv != EINVAL) + aprint_error_dev(sc->sc_dev, "failed to set " + "frequency to %u (err %d)\n", freq, rv); mutex_enter(&sc->sc_mtx); sc->sc_pstate_current = ACPICPU_P_STATE_UNKNOWN; Index: src/sys/dev/acpi/acpi_cpu_tstate.c diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.28 src/sys/dev/acpi/acpi_cpu_tstate.c:1.29 --- src/sys/dev/acpi/acpi_cpu_tstate.c:1.28 Sat Jun 4 18:03:10 2011 +++ src/sys/dev/acpi/acpi_cpu_tstate.c Wed Jun 22 08:05:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_tstate.c,v 1.28 2011/06/04 18:03:10 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_tstate.c,v 1.29 2011/06/22 08:05:10 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.28 2011/06/04 18:03:10 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.29 2011/06/22 08:05:10 jruoho Exp $"); #include #include @@ -740,7 +740,7 @@ return 0; fail: - aprint_debug_dev(sc->sc_dev, "failed " + aprint_error_dev(sc->sc_dev, "failed " "to get T-state (err %d)\n", rv); mutex_enter(&sc->sc_mtx); @@ -881,8 +881,9 @@ return; fail: - aprint_debug_dev(sc->sc_dev, "failed to " - "throttle to %u %% (err %d)\n", percent, rv); + if (rv != EINVAL) + aprint_error_dev(sc->sc_dev, "failed to " + "throttle to %u %% (err %d)\n", percent, rv); mutex_enter(&sc->sc_mtx); sc->sc_tstate_current = ACPICPU_T_STATE_UNKNOWN;
CVS commit: src/sys
Module Name:src
Committed By: jruoho
Date: Wed Jun 22 08:49:54 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c
acpi_cpu_pstate.c acpi_cpu_tstate.c
Log Message:
Get rid of RUN_ONCE(9). Should fix PR # kern/44043.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/acpi/acpi_cpu.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/acpi/acpi_cpu_cstate.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/acpi/acpi_cpu_pstate.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/acpi_cpu_tstate.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/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.61 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.62
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.61 Sun Jun 12 10:11:52 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Wed Jun 22 08:49:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.61 2011/06/12 10:11:52 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.62 2011/06/22 08:49:54 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.61 2011/06/12 10:11:52 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.62 2011/06/22 08:49:54 jruoho Exp $");
#include
#include
@@ -373,9 +373,16 @@
int
acpicpu_md_cstate_stop(void)
{
+ static char text[16];
+ void (*func)(void);
uint64_t xc;
bool ipi;
+ x86_cpu_idle_get(&func, text, sizeof(text));
+
+ if (func == native_idle)
+ return EALREADY;
+
ipi = (native_idle != x86_cpu_idle_halt) ? false : true;
x86_cpu_idle_set(native_idle, native_idle_text, ipi);
@@ -424,7 +431,25 @@
int
acpicpu_md_pstate_start(struct acpicpu_softc *sc)
{
- uint64_t xc;
+ uint64_t xc, val;
+
+ /*
+ * Make sure EST is enabled.
+ */
+ if ((sc->sc_flags & ACPICPU_FLAG_P_FFH) != 0) {
+
+ val = rdmsr(MSR_MISC_ENABLE);
+
+ if ((val & MSR_MISC_ENABLE_EST) == 0) {
+
+ val |= MSR_MISC_ENABLE_EST;
+ wrmsr(MSR_MISC_ENABLE, val);
+ val = rdmsr(MSR_MISC_ENABLE);
+
+ if ((val & MSR_MISC_ENABLE_EST) == 0)
+return ENOTTY;
+ }
+ }
/*
* Reset the APERF and MPERF counters.
@@ -440,8 +465,12 @@
int
acpicpu_md_pstate_stop(void)
{
- if (acpicpu_log != NULL)
- sysctl_teardown(&acpicpu_log);
+
+ if (acpicpu_log == NULL)
+ return EALREADY;
+
+ sysctl_teardown(&acpicpu_log);
+ acpicpu_log = NULL;
return 0;
}
@@ -452,7 +481,6 @@
struct cpu_info *ci = sc->sc_ci;
struct acpicpu_pstate *ps, msr;
uint32_t family, i = 0;
- uint64_t val;
(void)memset(&msr, 0, sizeof(struct acpicpu_pstate));
@@ -462,24 +490,6 @@
case CPUVENDOR_INTEL:
/*
- * Make sure EST is enabled.
- */
- if ((sc->sc_flags & ACPICPU_FLAG_P_FFH) != 0) {
-
- val = rdmsr(MSR_MISC_ENABLE);
-
- if ((val & MSR_MISC_ENABLE_EST) == 0) {
-
-val |= MSR_MISC_ENABLE_EST;
-wrmsr(MSR_MISC_ENABLE, val);
-val = rdmsr(MSR_MISC_ENABLE);
-
-if ((val & MSR_MISC_ENABLE_EST) == 0)
- return ENOTTY;
- }
- }
-
- /*
* If the so-called Turbo Boost is present,
* the P0-state is always the "turbo state".
* It is shown as the P1 frequency + 1 MHz.
Index: src/sys/dev/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.43 src/sys/dev/acpi/acpi_cpu.c:1.44
--- src/sys/dev/acpi/acpi_cpu.c:1.43 Tue Jun 21 03:37:21 2011
+++ src/sys/dev/acpi/acpi_cpu.c Wed Jun 22 08:49:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.43 2011/06/21 03:37:21 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.44 2011/06/22 08:49:54 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.43 2011/06/21 03:37:21 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.44 2011/06/22 08:49:54 jruoho Exp $");
#include
#include
@@ -202,33 +202,17 @@
acpicpu_detach(device_t self, int flags)
{
struct acpicpu_softc *sc = device_private(self);
- int rv = 0;
sc->sc_cold = true;
acpicpu_evcnt_detach(self);
acpi_deregister_notify(sc->sc_node);
- if ((sc->sc_flags & ACPICPU_FLAG_C) != 0)
- rv = acpicpu_cstate_detach(self);
-
- if (rv != 0)
- return rv;
-
- if ((sc->sc_flags & ACPICPU_FLAG_P) != 0)
- rv = acpicpu_pstate_detach(self);
-
- if (rv != 0)
- return rv;
-
- if ((sc->sc_flags & ACPICPU_FLAG_T) != 0)
- rv = acpicpu_tstate_detach(self);
-
- if (rv != 0)
- return rv;
+ acpicpu_cstate_detach(self);
+ acpicpu_pstate_detach(self);
+ acpicpu_tstate_detach(self);
mutex_destroy(&sc->sc_mtx);
-
sc->sc_node->ad_device = NULL;
acpicpu_count--;
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.41 src/sys/dev/acpi/acpi_cpu.h:1.42
--- src/sys/dev/acpi/acpi_cpu.h:1.41 S
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: jruoho Date: Wed Jun 22 09:28:08 UTC 2011 Modified Files: src/sys/arch/x86/x86: cpu.c Log Message: Add small comment. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/x86/x86/cpu.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.c diff -u src/sys/arch/x86/x86/cpu.c:1.88 src/sys/arch/x86/x86/cpu.c:1.89 --- src/sys/arch/x86/x86/cpu.c:1.88 Sun Jun 12 03:35:50 2011 +++ src/sys/arch/x86/x86/cpu.c Wed Jun 22 09:28:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.88 2011/06/12 03:35:50 rmind Exp $ */ +/* $NetBSD: cpu.c,v 1.89 2011/06/22 09:28:08 jruoho Exp $ */ /*- * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.88 2011/06/12 03:35:50 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.89 2011/06/22 09:28:08 jruoho Exp $"); #include "opt_ddb.h" #include "opt_mpbios.h" /* for MPDEBUG */ @@ -448,6 +448,11 @@ ); } + /* + * Postpone the "cpufeaturebus" scan. + * It is safe to scan the pseudo-bus + * only after all CPUs have attached. + */ (void)config_defer(self, cpu_defer); }
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: martin
Date: Wed Jun 22 14:05:38 UTC 2011
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Include liblzma to unbreak gzip on the install CD. (Hi Joerg!)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.12 src/distrib/sparc64/cdroms/installcd/Makefile:1.13
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.12 Sun Jun 19 10:52:08 2011
+++ src/distrib/sparc64/cdroms/installcd/Makefile Wed Jun 22 14:05:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/06/19 10:52:08 martin Exp $
+# $NetBSD: Makefile,v 1.13 2011/06/22 14:05:38 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -44,6 +44,7 @@
CDRUNTIME+= ./usr/lib/libgcc_s.so*
CDRUNTIME+= ./usr/lib/libintl.so*
CDRUNTIME+= ./usr/lib/libkvm.so*
+CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
CVS commit: src/sys/arch
Module Name:src
Committed By: kiyohara
Date: Wed Jun 22 16:18:55 UTC 2011
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_i2c.c pxa2x0_i2c.h
src/sys/arch/zaurus/dev: zaudio.c
Log Message:
Add member sc_addr to struct pxa2x0_i2c_softc.
And use sc_addr to bus_space_map() instead of macro-directly.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/xscale/pxa2x0_i2c.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/pxa2x0_i2c.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/dev/zaudio.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/xscale/pxa2x0_i2c.c
diff -u src/sys/arch/arm/xscale/pxa2x0_i2c.c:1.5 src/sys/arch/arm/xscale/pxa2x0_i2c.c:1.6
--- src/sys/arch/arm/xscale/pxa2x0_i2c.c:1.5 Sun Jun 19 16:16:42 2011
+++ src/sys/arch/arm/xscale/pxa2x0_i2c.c Wed Jun 22 16:18:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_i2c.c,v 1.5 2011/06/19 16:16:42 nonaka Exp $ */
+/* $NetBSD: pxa2x0_i2c.c,v 1.6 2011/06/22 16:18:55 kiyohara Exp $ */
/* $OpenBSD: pxa2x0_i2c.c,v 1.2 2005/05/26 03:52:07 pascoe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2c.c,v 1.5 2011/06/19 16:16:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2c.c,v 1.6 2011/06/22 16:18:55 kiyohara Exp $");
#include
#include
@@ -44,7 +44,7 @@
{
int error;
- error = bus_space_map(sc->sc_iot, PXA2X0_I2C_BASE, sc->sc_size, 0,
+ error = bus_space_map(sc->sc_iot, sc->sc_addr, sc->sc_size, 0,
&sc->sc_ioh);
if (error) {
aprint_error_dev(sc->sc_dev, "unable to map register\n");
Index: src/sys/arch/arm/xscale/pxa2x0_i2c.h
diff -u src/sys/arch/arm/xscale/pxa2x0_i2c.h:1.3 src/sys/arch/arm/xscale/pxa2x0_i2c.h:1.4
--- src/sys/arch/arm/xscale/pxa2x0_i2c.h:1.3 Sun Jun 19 16:16:42 2011
+++ src/sys/arch/arm/xscale/pxa2x0_i2c.h Wed Jun 22 16:18:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_i2c.h,v 1.3 2011/06/19 16:16:42 nonaka Exp $ */
+/* $NetBSD: pxa2x0_i2c.h,v 1.4 2011/06/22 16:18:55 kiyohara Exp $ */
/* $OpenBSD: pxa2x0_i2c.h,v 1.2 2005/05/26 03:52:07 pascoe Exp $ */
/*
@@ -27,6 +27,7 @@
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
+ bus_addr_t sc_addr;
bus_size_t sc_size;
uint32_t sc_icr;
Index: src/sys/arch/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.13 src/sys/arch/zaurus/dev/zaudio.c:1.14
--- src/sys/arch/zaurus/dev/zaudio.c:1.13 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zaudio.c Wed Jun 22 16:18:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zaudio.c,v 1.13 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $ */
/* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */
/*
@@ -51,7 +51,7 @@
#include "opt_zaudio.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.13 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $");
#include
#include
@@ -344,6 +344,7 @@
sc->sc_i2s.sc_iot = &pxa2x0_bs_tag;
sc->sc_i2s.sc_dmat = &pxa2x0_bus_dma_tag;
+ sc->sc_i2c.sc_addr = PXA2X0_I2C_BASE;
sc->sc_i2s.sc_size = PXA2X0_I2S_SIZE;
if (pxa2x0_i2s_attach_sub(&sc->sc_i2s)) {
aprint_error_dev(self, "unable to attach I2S\n");
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: matt Date: Wed Jun 22 17:52:58 UTC 2011 Modified Files: src/sys/arch/evbppc/conf: OPENBLOCKS266 Log Message: bump up SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbppc/conf/OPENBLOCKS266 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/evbppc/conf/OPENBLOCKS266 diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266:1.54 src/sys/arch/evbppc/conf/OPENBLOCKS266:1.55 --- src/sys/arch/evbppc/conf/OPENBLOCKS266:1.54 Fri Jun 17 21:18:57 2011 +++ src/sys/arch/evbppc/conf/OPENBLOCKS266 Wed Jun 22 17:52:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS266,v 1.54 2011/06/17 21:18:57 matt Exp $ +# $NetBSD: OPENBLOCKS266,v 1.55 2011/06/22 17:52:57 matt Exp $ # # GENERIC -- everything that's currently supported # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "OPENBLOCKS266-$Revision: 1.54 $" +#ident "OPENBLOCKS266-$Revision: 1.55 $" maxusers 32 @@ -44,7 +44,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT -options SYMTAB_SPACE=66 # size for embedded symbol table +options SYMTAB_SPACE=666000 # size for embedded symbol table makeoptions DEBUG="-g" # compile full symbol table
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: matt
Date: Wed Jun 22 18:03:30 UTC 2011
Modified Files:
src/sys/dev/pci: pcivar.h
Log Message:
Add inline accessors for pba_pc and pa_pc so that
can use them in inline functions.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 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.93 src/sys/dev/pci/pcivar.h:1.94
--- src/sys/dev/pci/pcivar.h:1.93 Tue May 17 17:34:54 2011
+++ src/sys/dev/pci/pcivar.h Wed Jun 22 18:03:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivar.h,v 1.93 2011/05/17 17:34:54 dyoung Exp $ */
+/* $NetBSD: pcivar.h,v 1.94 2011/06/22 18:03:30 matt Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -120,6 +120,16 @@
};
/*
+ * This is used by to access the pba_pc member. It
+ * can't use it directly since pcibus_attach_args has yet to be defined.
+ */
+static inline pci_chipset_tag_t
+pcibus_attach_args_pc(struct pcibus_attach_args *pba)
+{
+ return pba->pba_pc;
+}
+
+/*
* PCI device attach arguments.
*/
struct pci_attach_args {
@@ -152,6 +162,16 @@
};
/*
+ * This is used by to access the pa_pc member. It
+ * can't use it directly since pci_attach_args has yet to be defined.
+ */
+static inline pci_chipset_tag_t
+pci_attach_args_pc(const struct pci_attach_args *pa)
+{
+ return pa->pa_pc;
+}
+
+/*
* Flags given in the bus and device attachment args.
*/
#define PCI_FLAGS_IO_OKAY 0x01 /* I/O space is okay */
CVS commit: src/sys/modules/arch/powerpc/powerpc-4xx
Module Name:src Committed By: matt Date: Wed Jun 22 18:17:17 UTC 2011 Modified Files: src/sys/modules/arch/powerpc/powerpc-4xx: bsd.powerpc-4xx.mk Log Message: ibm4xx now uses To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk 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/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk diff -u src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk:1.2 src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk:1.3 --- src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk:1.2 Mon Jun 20 20:18:43 2011 +++ src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk Wed Jun 22 18:17:17 2011 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.powerpc-4xx.mk,v 1.2 2011/06/20 20:18:43 matt Exp $ +# $NetBSD: bsd.powerpc-4xx.mk,v 1.3 2011/06/22 18:17:17 matt Exp $ .ifndef _BSD_POWERPC_4XX_MK_ _BSD_POWERPC_4XX_MK_=1 @@ -10,7 +10,7 @@ # hack into bsd.kmodule.mk PPC_INTR_IMPL=\"powerpc/intr.h\" -PPC_PCI_MACHDEP_IMPL=\"powerpc/ibm4xx/pci_machdep.h\" +PPC_PCI_MACHDEP_IMPL=\"powerpc/pci_machdep.h\" AFLAGS+= -mcpu=403
CVS commit: src/sys/arch/powerpc/pci
Module Name:src Committed By: matt Date: Wed Jun 22 18:20:59 UTC 2011 Added Files: src/sys/arch/powerpc/pci: pci_module.c Log Message: Provide the pci_* routines for modules to use. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/pci/pci_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/powerpc/pci/pci_module.c diff -u /dev/null src/sys/arch/powerpc/pci/pci_module.c:1.1 --- /dev/null Wed Jun 22 18:20:59 2011 +++ src/sys/arch/powerpc/pci/pci_module.c Wed Jun 22 18:20:59 2011 @@ -0,0 +1,48 @@ +/* $NetBSD: pci_module.c,v 1.1 2011/06/22 18:20:59 matt Exp $ */ + +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * + * 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. + */ + +/* + * Through magic contained in , this provide the + * pci_* routines (which just call through pci_chipset_tag_t) for loadable + * modules. This keeps pci_chipset_tag_t opaque for modules. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: pci_module.c,v 1.1 2011/06/22 18:20:59 matt Exp $"); + +#define __PCI_NOINLINE + +#include +#include +#include +#include + +#include
CVS commit: src/sys/net
Module Name:src
Committed By: kefren
Date: Wed Jun 22 19:08:29 UTC 2011
Modified Files:
src/sys/net: if_mpls.c
Log Message:
make LSE prepend the rest of the shims in they exist
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/net/if_mpls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.6 src/sys/net/if_mpls.c:1.7
--- src/sys/net/if_mpls.c:1.6 Tue Jun 21 14:30:19 2011
+++ src/sys/net/if_mpls.c Wed Jun 22 19:08:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.6 2011/06/21 14:30:19 kefren Exp $ */
+/* $NetBSD: if_mpls.c,v 1.7 2011/06/22 19:08:29 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.6 2011/06/21 14:30:19 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.7 2011/06/22 19:08:29 kefren Exp $");
#include "opt_inet.h"
#include "opt_mpls.h"
@@ -218,7 +218,8 @@
while (psize <= rt_gettag(rt)->sa_len - sizeof(mh)) {
pms++;
- m = mpls_prepend_shim(m, &mh);
+ if ((m = mpls_prepend_shim(m, &mh)) == NULL)
+ return ENOBUFS;
memset(&mh, 0, sizeof(mh));
mh.s_addr = ntohl(pms->s_addr);
mh.shim.bos = mh.shim.exp = 0;
@@ -305,6 +306,7 @@
union mpls_shim tshim, *htag;
struct rtentry *rt = NULL;
int error = ENOBUFS;
+ uint psize = sizeof(struct sockaddr_mpls);
if (m->m_len < sizeof(union mpls_shim) &&
(m = m_pullup(m, sizeof(union mpls_shim))) == NULL)
@@ -382,6 +384,19 @@
htag->shim.label = tshim.shim.label;
htag->s_addr = htonl(htag->s_addr);
+ /* check if there is anything more to prepend */
+ htag = &((struct sockaddr_mpls*)rt_gettag(rt))->smpls_addr;
+ while (psize <= rt_gettag(rt)->sa_len - sizeof(tshim)) {
+ htag++;
+ memset(&tshim, 0, sizeof(tshim));
+ tshim.s_addr = ntohl(htag->s_addr);
+ tshim.shim.bos = tshim.shim.exp = 0;
+ tshim.shim.ttl = mpls_defttl;
+ if ((m = mpls_prepend_shim(m, &tshim)) == NULL)
+ return ENOBUFS;
+ psize += sizeof(tshim);
+ }
+
error = mpls_send_frame(m, rt->rt_ifp, rt);
done:
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Wed Jun 22 19:26:22 UTC 2011 Modified Files: src/sys/dev/acpi: acpidevs Log Message: Add SMO8800. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/dev/acpi/acpidevs 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/acpidevs diff -u src/sys/dev/acpi/acpidevs:1.34 src/sys/dev/acpi/acpidevs:1.35 --- src/sys/dev/acpi/acpidevs:1.34 Mon Jun 20 15:56:07 2011 +++ src/sys/dev/acpi/acpidevs Wed Jun 22 19:26:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: acpidevs,v 1.34 2011/06/20 15:56:07 jruoho Exp $ +# $NetBSD: acpidevs,v 1.35 2011/06/22 19:26:22 jruoho Exp $ # # Originally extracted from: @@ -395,3 +395,4 @@ INT0800 Intel Firmware Hub Device IPI0001 Intelligent Platform Management Interface LEN0014 Lenovo ThinkPad Extras +SMO8800 ST Microelectronics Accelerometer
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Wed Jun 22 19:26:36 UTC 2011
Modified Files:
src/sys/dev/acpi: acpidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/acpidevs_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/acpi/acpidevs_data.h
diff -u src/sys/dev/acpi/acpidevs_data.h:1.25 src/sys/dev/acpi/acpidevs_data.h:1.26
--- src/sys/dev/acpi/acpidevs_data.h:1.25 Mon Jun 20 15:56:36 2011
+++ src/sys/dev/acpi/acpidevs_data.h Wed Jun 22 19:26:36 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: acpidevs_data.h,v 1.25 2011/06/20 15:56:36 jruoho Exp $ */
+/* $NetBSD: acpidevs_data.h,v 1.26 2011/06/22 19:26:36 jruoho Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * # NetBSD: acpidevs,v 1.34 2011/06/20 15:56:07 jruoho Exp
+ * # NetBSD: acpidevs,v 1.35 2011/06/22 19:26:22 jruoho Exp
*/
const struct { const char *pnp, *str; } acpi_knowndevs[] = {
@@ -1456,4 +1456,8 @@
"LEN0014",
"Lenovo ThinkPad Extras",
},
+ {
+ "SMO8800",
+ "ST Microelectronics Accelerometer",
+ },
};
CVS commit: src
Module Name:src Committed By: jruoho Date: Wed Jun 22 19:34:53 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Added Files: src/share/man/man4: sysmon.4 Log Message: Add a small summary page for sysmon. From the list in PR # kern/21345. To generate a diff of this commit: cvs rdiff -u -r1.1319 -r1.1320 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.558 -r1.559 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/sysmon.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1319 src/distrib/sets/lists/man/mi:1.1320 --- src/distrib/sets/lists/man/mi:1.1319 Mon Jun 6 16:52:15 2011 +++ src/distrib/sets/lists/man/mi Wed Jun 22 19:34:53 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1319 2011/06/06 16:52:15 jruoho Exp $ +# $NetBSD: mi,v 1.1320 2011/06/22 19:34:53 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1598,6 +1598,7 @@ ./usr/share/man/cat4/swsensor.0 man-sys-catman .cat ./usr/share/man/cat4/swwdog.0 man-sys-catman .cat ./usr/share/man/cat4/sysbeep.0 man-sys-catman .cat +./usr/share/man/cat4/sysmon.0 man-sys-catman .cat ./usr/share/man/cat4/systrace.0 man-obsolete obsolete ./usr/share/man/cat4/tap.0 man-sys-catman .cat ./usr/share/man/cat4/tb.0 man-obsolete obsolete @@ -4315,6 +4316,7 @@ ./usr/share/man/html4/swsensor.html man-sys-htmlman html ./usr/share/man/html4/swwdog.html man-sys-htmlman html ./usr/share/man/html4/sysbeep.html man-sys-htmlman html +./usr/share/man/html4/sysmon.html man-sys-htmlman html ./usr/share/man/html4/tap.html man-sys-htmlman html ./usr/share/man/html4/tc.html man-sys-htmlman html ./usr/share/man/html4/tcds.html man-sys-htmlman html @@ -6951,6 +6953,7 @@ ./usr/share/man/man4/swsensor.4 man-sys-man .man ./usr/share/man/man4/swwdog.4 man-sys-man .man ./usr/share/man/man4/sysbeep.4 man-sys-man .man +./usr/share/man/man4/sysmon.4 man-sys-man .man ./usr/share/man/man4/systrace.4 man-obsolete obsolete ./usr/share/man/man4/tap.4 man-sys-man .man ./usr/share/man/man4/tb.4 man-obsolete obsolete Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.558 src/share/man/man4/Makefile:1.559 --- src/share/man/man4/Makefile:1.558 Tue Apr 5 11:24:46 2011 +++ src/share/man/man4/Makefile Wed Jun 22 19:34:53 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.558 2011/04/05 11:24:46 phx Exp $ +# $NetBSD: Makefile,v 1.559 2011/06/22 19:34:53 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -55,7 +55,7 @@ shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \ sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \ st.4 ste.4 stge.4 sti.4 stpcide.4 sv.4 strip.4 \ - svwsata.4 swsensor.4 swwdog.4 \ + svwsata.4 swsensor.4 swwdog.4 sysmon.4 \ tap.4 tc.4 tcds.4 tcp.4 termios.4 tfb.4 thinkpad.4 \ ti.4 tl.4 tlp.4 tlphy.4 \ tp.4 tr.4 tra.4 trm.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \ Added files: Index: src/share/man/man4/sysmon.4 diff -u /dev/null src/share/man/man4/sysmon.4:1.1 --- /dev/null Wed Jun 22 19:34:53 2011 +++ src/share/man/man4/sysmon.4 Wed Jun 22 19:34:53 2011 @@ -0,0 +1,75 @@ +.\" $NetBSD: sysmon.4,v 1.1 2011/06/22 19:34:53 jruoho Exp $ +.\" +.\" Copyright (c) 2011 Jukka Ruohonen +.\" +.\" 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 COPYRIGHT HOLDERS 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 COPYRIGHT +.\" OWNER 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. +.\" +.Dd June 22, 2011 +.Dt SYSMON 4 +.Os +.Sh NAME +.Nm sysmon +.Nd system monitoring and power management interface +.Sh DES
CVS commit: src
Module Name:src Committed By: jruoho Date: Wed Jun 22 20:29:39 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Added Files: src/share/man/man4: altq.4 Log Message: Add a small summary page for altq. From the list in PR # kern/21345. To generate a diff of this commit: cvs rdiff -u -r1.1320 -r1.1321 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.559 -r1.560 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/altq.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1320 src/distrib/sets/lists/man/mi:1.1321 --- src/distrib/sets/lists/man/mi:1.1320 Wed Jun 22 19:34:53 2011 +++ src/distrib/sets/lists/man/mi Wed Jun 22 20:29:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1320 2011/06/22 19:34:53 jruoho Exp $ +# $NetBSD: mi,v 1.1321 2011/06/22 20:29:38 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -704,6 +704,7 @@ ./usr/share/man/cat4/alpha/ttwoga.0 man-sys-catman .cat ./usr/share/man/cat4/alpha/ttwopci.0 man-sys-catman .cat ./usr/share/man/cat4/altmem.0 man-sys-catman .cat +./usr/share/man/cat4/altq.0 man-sys-catman .cat ./usr/share/man/cat4/amdpm.0 man-sys-catman .cat ./usr/share/man/cat4/amdtemp.0 man-sys-catman .cat ./usr/share/man/cat4/amhphy.0 man-sys-catman .cat @@ -3533,6 +3534,7 @@ ./usr/share/man/html4/alpha/ttwoga.html man-sys-htmlman html ./usr/share/man/html4/alpha/ttwopci.html man-sys-htmlman html ./usr/share/man/html4/altmem.html man-sys-htmlman html +./usr/share/man/html4/altq.html man-sys-htmlman html ./usr/share/man/html4/amdpm.html man-sys-htmlman html ./usr/share/man/html4/amdtemp.html man-sys-htmlman html ./usr/share/man/html4/amhphy.html man-sys-htmlman html @@ -6059,6 +6061,7 @@ ./usr/share/man/man4/alpha/ttwoga.4 man-sys-man .man ./usr/share/man/man4/alpha/ttwopci.4 man-sys-man .man ./usr/share/man/man4/altmem.4 man-sys-man .man +./usr/share/man/man4/altq.4 man-sys-man .man ./usr/share/man/man4/amdpm.4 man-sys-man .man ./usr/share/man/man4/amdtemp.4 man-sys-man .man ./usr/share/man/man4/amhphy.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.559 src/share/man/man4/Makefile:1.560 --- src/share/man/man4/Makefile:1.559 Wed Jun 22 19:34:53 2011 +++ src/share/man/man4/Makefile Wed Jun 22 20:29:38 2011 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.559 2011/06/22 19:34:53 jruoho Exp $ +# $NetBSD: Makefile,v 1.560 2011/06/22 20:29:38 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ adbbt.4 adbkbd.4 adbms.4 \ adc.4 admtemp.4 adv.4 adw.4 age.4 agp.4 agr.4 ahb.4 ahc.4 \ ahcisata.4 ahd.4 \ - aibs.4 alc.4 ale.4 alipm.4 altmem.4 amdpm.4 amdtemp.4 amhphy.4 \ + aibs.4 alc.4 ale.4 alipm.4 altmem.4 altq.4 amdpm.4 amdtemp.4 amhphy.4 \ amr.4 aps.4 \ an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \ ath.4 atphy.4 atppc.4 attimer.4 atw.4 \ Added files: Index: src/share/man/man4/altq.4 diff -u /dev/null src/share/man/man4/altq.4:1.1 --- /dev/null Wed Jun 22 20:29:39 2011 +++ src/share/man/man4/altq.4 Wed Jun 22 20:29:38 2011 @@ -0,0 +1,85 @@ +.\" $NetBSD: altq.4,v 1.1 2011/06/22 20:29:38 jruoho Exp $ +.\" +.\" Copyright (c) 2011 Jukka Ruohonen +.\" +.\" 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 COPYRIGHT HOLDERS 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 COPYRIGHT +.\" OWNER 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. +.\" +.Dd June 22, 2011 +.Dt ALTQ 4 +.Os +.Sh NAME +.Nm altq +.Nd alternate queueing framework +.Sh SYNOPSIS +.Cd options ALTQ +.Cd options ALTQ_BLUE +.Cd options ALT
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Jun 22 21:13:13 UTC 2011
Modified Files:
src/usr.bin/make: meta.c
Log Message:
After each strsep(&p) check that p is valid.
If not the .meta file is corrupted (build interrupted?)
issue a warning and declare target oodate.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/meta.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.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.19 src/usr.bin/make/meta.c:1.20
--- src/usr.bin/make/meta.c:1.19 Sat Jun 11 02:10:48 2011
+++ src/usr.bin/make/meta.c Wed Jun 22 21:13:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.19 2011/06/11 02:10:48 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.20 2011/06/22 21:13:12 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -809,6 +809,17 @@
*/
#define LDIR_VNAME_FMT ".meta.%d.ldir"
+/*
+ * It is possible that a .meta file is corrupted,
+ * if we detect this we want to reproduce it.
+ * Setting oodate TRUE will have that effect.
+ */
+#define CHECK_VALID_META(p) if (!(p && *p)) { \
+warnx("%s: %d: malformed", fname, lineno); \
+oodate = TRUE; \
+continue; \
+}
+
Boolean
meta_oodate(GNode *gn, Boolean oodate)
{
@@ -882,9 +893,11 @@
lineno++;
if (buf[x - 1] == '\n')
buf[x - 1] = '\0';
- else
+ else {
warnx("%s: %d: line truncated at %u", fname, lineno, x);
-
+ oodate = TRUE;
+ break;
+ }
/* Find the start of the build monitor section. */
if (!f) {
if (strncmp(buf, "-- filemon", 10) == 0) {
@@ -940,6 +953,7 @@
* re-initialize 'latestdir' to any pre-saved
* value for the current 'pid' and 'CWD' if none.
*/
+ CHECK_VALID_META(p);
pid = atoi(p);
if (pid > 0 && pid != lastpid) {
char *ldir;
@@ -969,6 +983,8 @@
break;
}
+ CHECK_VALID_META(p);
+
/* Process according to record type. */
switch (buf[0]) {
case 'X': /* eXit */
@@ -1020,6 +1036,7 @@
/* we want the target */
if (strsep(&p, " ") == NULL)
continue;
+ CHECK_VALID_META(p);
/* 'L' and 'M' put single quotes around the args */
if (*p == '\'') {
char *ep;
CVS commit: src/sys/dev/nor
Module Name:src
Committed By: ahoka
Date: Wed Jun 22 21:59:16 UTC 2011
Added Files:
src/sys/dev/nor: cfi.h files.nor nor.c nor.h
Log Message:
Initial work on a NOR driver; it's commited here as is,
so I can cooperate with Cliff Neighbors on finishing it.
Not any way connected to the build.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/nor/cfi.h src/sys/dev/nor/files.nor \
src/sys/dev/nor/nor.c src/sys/dev/nor/nor.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/dev/nor/cfi.h
diff -u /dev/null src/sys/dev/nor/cfi.h:1.1
--- /dev/null Wed Jun 22 21:59:16 2011
+++ src/sys/dev/nor/cfi.h Wed Jun 22 21:59:15 2011
@@ -0,0 +1,16 @@
+#ifndef _CFI_H_
+#define _CFI_H_
+
+enum {
+ CFI_QUERY_MODE_ADDRESS = 0x55, /* some devices accept anything */
+ CFI_QUERY_DATA = 0x98,
+
+ CFI_READ_ARRAY_MODE_ADDRESS = 0x00, /* could be anything */
+ CFI_READ_ARRAY_MODE_DATA = 0xf0,/* also can be 0xff */
+
+ CFI_ADDR_IDENTIFICATION_STRING = 0x10,
+ CFI_ADDR_SYS_INTERFACE_INFO = 0x1b,
+ CFI_ADDR_DEV_GEOMETRY = 0x27
+};
+
+#endif
Index: src/sys/dev/nor/files.nor
diff -u /dev/null src/sys/dev/nor/files.nor:1.1
--- /dev/null Wed Jun 22 21:59:16 2011
+++ src/sys/dev/nor/files.nor Wed Jun 22 21:59:15 2011
@@ -0,0 +1,11 @@
+# $NetBSD: files.nor,v 1.1 2011/06/22 21:59:15 ahoka Exp $
+
+define norbus { }
+
+device nor: flashbus
+attach nor at norbus
+file dev/nor/nor.c nor
+#file dev/nor/nor_io.c nor
+
+defflag opt_nor.h NOR_DEBUG
+defflag opt_nor.h NOR_VERBOSE
Index: src/sys/dev/nor/nor.c
diff -u /dev/null src/sys/dev/nor/nor.c:1.1
--- /dev/null Wed Jun 22 21:59:16 2011
+++ src/sys/dev/nor/nor.c Wed Jun 22 21:59:15 2011
@@ -0,0 +1,582 @@
+/* $NetBSD: nor.c,v 1.1 2011/06/22 21:59:15 ahoka Exp $ */
+
+/*-
+ * Copyright (c) 2011 Department of Software Engineering,
+ * University of Szeged, Hungary
+ * Copyright (c) 2011 Adam Hoka
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by the Department of Software Engineering, University of Szeged, Hungary
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/* Common driver for NOR chips implementing the ONFI CFI specification */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: nor.c,v 1.1 2011/06/22 21:59:15 ahoka Exp $");
+
+#include "locators.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+//#include "opt_nor.h"
+
+int nor_match(device_t, cfdata_t, void *);
+void nor_attach(device_t, device_t, void *);
+int nor_detach(device_t, int);
+bool nor_shutdown(device_t, int);
+
+int nor_print(void *, const char *);
+static int nor_search(device_t, cfdata_t, const int *, void *);
+
+CFATTACH_DECL_NEW(nor, sizeof(struct nor_softc),
+nor_match, nor_attach, nor_detach, NULL);
+
+#ifdef NOR_DEBUG
+int nordebug = NOR_DEBUG;
+#endif
+
+int nor_cachesync_timeout = 1;
+int nor_cachesync_nodenum;
+
+#ifdef NOR_VERBOSE
+const struct nor_manufacturer nor_mfrs[] = {
+ { NOR_MFR_AMD, "AMD" },
+ { NOR_MFR_FUJITSU, "Fujitsu" },
+ { NOR_MFR_RENESAS, "Renesas" },
+ { NOR_MFR_STMICRO, "ST Micro" },
+ { NOR_MFR_MICRON, "Micron" },
+ { NOR_MFR_NATIONAL, "National" },
+ { NOR_MFR_TOSHIBA, "Toshiba" },
+ { NOR_MFR_HYNIX, "Hynix" },
+ { NOR_MFR_SAMSUNG, "Samsung" },
+ { NOR_MFR_UNKNOWN, "Unknown" }
+};
+
+static const char *
+nor_midtoname(int id)
+{
+ int i;
+
+ for (i = 0; nor_mfrs[i].id != 0; i++) {
+ if (nor_mfrs[i].id == id)
+ return nor_mfrs[i].name;
+ }
+
+ KASSERT(nor_mfrs[i].id == 0);
+
+ return nor_mfrs[i].name;
+}
+#endif
+
+/* ARGSUSED */
+int
+nor_match(device_t parent, cfdata_t match, void *aux)
+{
+ /* pseudo device, always at
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Thu Jun 23 00:46:38 UTC 2011 Modified Files: src/sys/sys: gpio.h Log Message: Add GPIO_PIN_INTR and GPIO_PIN_INTR_HIGH (placeholders for now). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/sys/gpio.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/gpio.h diff -u src/sys/sys/gpio.h:1.7 src/sys/sys/gpio.h:1.8 --- src/sys/sys/gpio.h:1.7 Fri Sep 25 20:27:50 2009 +++ src/sys/sys/gpio.h Thu Jun 23 00:46:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */ +/* $NetBSD: gpio.h,v 1.8 2011/06/23 00:46:37 matt Exp $ */ /* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */ /* * Copyright (c) 2009 Marc Balmer @@ -40,6 +40,8 @@ #define GPIO_PIN_INVOUT 0x0200 /* invert output */ #define GPIO_PIN_USER 0x0400 /* user != 0 can access */ #define GPIO_PIN_PULSATE 0x0800 /* pulsate in hardware */ +#define GPIO_PIN_INTR 0x1000 /* can be as an interrupt */ +#define GPIO_PIN_INTR_HIGH 0x2000 /* interrupt leading edge high */ #define GPIO_PIN_SET 0x8000 /* set for securelevel access */ /* GPIO controller description */
CVS commit: src/sys
Module Name:src
Committed By: matt
Date: Thu Jun 23 01:27:21 UTC 2011
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
src/sys/arch/powerpc/booke: booke_stubs.c e500_tlb.c
src/sys/arch/powerpc/include: types.h
src/sys/arch/powerpc/include/booke: cpuvar.h pte.h
src/sys/common/pmap/tlb: pmap_tlb.c
Log Message:
Switch to using the common
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/booke_stubs.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/booke/e500_tlb.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/include/booke/cpuvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/booke/pte.h
cvs rdiff -u -r1.4 -r1.5 src/sys/common/pmap/tlb/pmap_tlb.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/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.11 src/sys/arch/evbppc/mpc85xx/machdep.c:1.12
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.11 Wed Jun 15 15:18:20 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Thu Jun 23 01:27:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.11 2011/06/15 15:18:20 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.12 2011/06/23 01:27:20 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -821,8 +821,8 @@
* We know the GUR is mapped via a TLB1 entry so we add a limited
* mapiodev which allows mappings in GUR space.
*/
- CTASSERT(offsetof(struct tlb_md_ops, md_tlb_mapiodev) == 0);
- cpu_md_ops.md_tlb_ops = (const void *)&early_tlb_mapiodev;
+ CTASSERT(offsetof(struct tlb_md_io_ops, md_tlb_mapiodev) == 0);
+ cpu_md_ops.md_tlb_io_ops = (const void *)&early_tlb_mapiodev;
bus_space_init(&gur_bst, NULL, NULL, 0);
bus_space_init(&gur_le_bst, NULL, NULL, 0);
cpu->cpu_bst = &gur_bst;
Index: src/sys/arch/powerpc/booke/booke_stubs.c
diff -u src/sys/arch/powerpc/booke/booke_stubs.c:1.6 src/sys/arch/powerpc/booke/booke_stubs.c:1.7
--- src/sys/arch/powerpc/booke/booke_stubs.c:1.6 Wed Jun 15 15:22:56 2011
+++ src/sys/arch/powerpc/booke/booke_stubs.c Thu Jun 23 01:27:20 2011
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: booke_stubs.c,v 1.6 2011/06/15 15:22:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_stubs.c,v 1.7 2011/06/23 01:27:20 matt Exp $");
#include
#include
@@ -45,17 +45,17 @@
#define __stub __section(".stub") __noprofile
-void tlb_set_asid(uint32_t) __stub;
+void tlb_set_asid(tlb_asid_t) __stub;
void
-tlb_set_asid(uint32_t asid)
+tlb_set_asid(tlb_asid_t asid)
{
(*cpu_md_ops.md_tlb_ops->md_tlb_set_asid)(asid);
}
-uint32_t tlb_get_asid(void) __stub;
+tlb_asid_t tlb_get_asid(void) __stub;
-uint32_t
+tlb_asid_t
tlb_get_asid(void)
{
return (*cpu_md_ops.md_tlb_ops->md_tlb_get_asid)();
@@ -77,26 +77,26 @@
(*cpu_md_ops.md_tlb_ops->md_tlb_invalidate_globals)();
}
-void tlb_invalidate_asids(uint32_t, uint32_t) __stub;
+void tlb_invalidate_asids(tlb_asid_t, tlb_asid_t) __stub;
void
-tlb_invalidate_asids(uint32_t asid_lo, uint32_t asid_hi)
+tlb_invalidate_asids(tlb_asid_t asid_lo, tlb_asid_t asid_hi)
{
(*cpu_md_ops.md_tlb_ops->md_tlb_invalidate_asids)(asid_lo, asid_hi);
}
-void tlb_invalidate_addr(vaddr_t, uint32_t) __stub;
+void tlb_invalidate_addr(vaddr_t, tlb_asid_t) __stub;
void
-tlb_invalidate_addr(vaddr_t va, uint32_t asid)
+tlb_invalidate_addr(vaddr_t va, tlb_asid_t asid)
{
(*cpu_md_ops.md_tlb_ops->md_tlb_invalidate_addr)(va, asid);
}
-bool tlb_update_addr(vaddr_t, uint32_t, uint32_t, bool) __stub;
+bool tlb_update_addr(vaddr_t, tlb_asid_t, pt_entry_t, bool) __stub;
bool
-tlb_update_addr(vaddr_t va, uint32_t asid, uint32_t pte, bool insert_p)
+tlb_update_addr(vaddr_t va, tlb_asid_t asid, pt_entry_t pte, bool insert_p)
{
return (*cpu_md_ops.md_tlb_ops->md_tlb_update_addr)(va, asid, pte, insert_p);
}
@@ -109,12 +109,37 @@
(*cpu_md_ops.md_tlb_ops->md_tlb_read_entry)(pos, tlb);
}
-u_int tlb_record_asids(u_long *, uint32_t) __stub;
+void tlb_write_entry(size_t, const struct tlbmask *) __stub;
+
+void
+tlb_write_entry(size_t pos, const struct tlbmask *tlb)
+{
+ (*cpu_md_ops.md_tlb_ops->md_tlb_write_entry)(pos, tlb);
+}
+
+u_int tlb_record_asids(u_long *) __stub;
u_int
-tlb_record_asids(u_long *bitmap, uint32_t start)
+tlb_record_asids(u_long *bitmap)
+{
+ return (*cpu_md_ops.md_tlb_ops->md_tlb_record_asids)(bitmap);
+}
+
+void tlb_dump(void (*)(const char *, ...)) __stub;
+
+void
+tlb_dump(void (*pr)(const char *, ...))
{
- return (*cpu_md_ops.md_tlb_ops->md_tlb_record_asids)(bitmap, start);
+ (*cpu_md_ops.md_tlb_ops->md_tlb_dump)(pr);
+}
+
+void tlb_walk(void *, bool (*)(void *, vaddr_t, uint32_t, uint32_t))
+__stub;
+
+void
+tlb_walk(void *ctx, bool (*func)(void *, vaddr_t, uint32_t, uint32_t))
CVS commit: src/sys
Module Name:src
Committed By: matt
Date: Thu Jun 23 02:33:44 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c
src/sys/arch/powerpc/include/booke: pmap.h
src/sys/common/pmap/tlb: pmap.c pmap.h pmap_tlb.c
Log Message:
Move some MD parts back to the booke pmap.c. Cleanup initialization a bit.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/booke/pmap.h
cvs rdiff -u -r1.6 -r1.7 src/sys/common/pmap/tlb/pmap.c
cvs rdiff -u -r1.5 -r1.6 src/sys/common/pmap/tlb/pmap.h \
src/sys/common/pmap/tlb/pmap_tlb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.6 src/sys/arch/powerpc/booke/booke_pmap.c:1.7
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.6 Mon Jun 20 20:24:28 2011
+++ src/sys/arch/powerpc/booke/booke_pmap.c Thu Jun 23 02:33:44 2011
@@ -37,7 +37,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.6 2011/06/20 20:24:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.7 2011/06/23 02:33:44 matt Exp $");
#include
#include
@@ -308,3 +308,24 @@
&& !(VM_MIN_KERNEL_ADDRESS <= va && va < VM_MAX_KERNEL_ADDRESS);
}
+bool
+pmap_md_tlb_check_entry(void *ctx, vaddr_t va, tlb_asid_t asid, pt_entry_t pte)
+{
+ pmap_t pm = ctx;
+struct pmap_asid_info * const pai = PMAP_PAI(pm, curcpu()->ci_tlb_info);
+
+ if (asid != pai->pai_asid)
+ return true;
+
+ const pt_entry_t * const ptep = pmap_pte_lookup(pm, va);
+ KASSERT(ptep != NULL);
+ pt_entry_t xpte = *ptep;
+ xpte &= ~((xpte & (PTE_UNSYNCED|PTE_UNMODIFIED)) << 1);
+ xpte ^= xpte & (PTE_UNSYNCED|PTE_UNMODIFIED|PTE_WIRED);
+
+ KASSERTMSG(pte == xpte,
+ ("pm=%p va=%#"PRIxVADDR" asid=%u: TLB pte (%#x) != real pte (%#x/%#x)",
+ pm, va, asid, pte, xpte, *ptep));
+
+ return true;
+}
Index: src/sys/arch/powerpc/include/booke/pmap.h
diff -u src/sys/arch/powerpc/include/booke/pmap.h:1.6 src/sys/arch/powerpc/include/booke/pmap.h:1.7
--- src/sys/arch/powerpc/include/booke/pmap.h:1.6 Mon Jun 20 20:24:28 2011
+++ src/sys/arch/powerpc/include/booke/pmap.h Thu Jun 23 02:33:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.6 2011/06/20 20:24:28 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.7 2011/06/23 02:33:44 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -75,6 +75,7 @@
void pmap_procwr(struct proc *, vaddr_t, size_t);
#define PMAP_NEED_PROCWR
+#ifdef __PMAP_PRIVATE
struct vm_page *
pmap_md_alloc_poolpage(int flags);
vaddr_t pmap_md_map_poolpage(paddr_t);
@@ -84,6 +85,9 @@
vaddr_t pmap_md_direct_map_paddr(paddr_t);
void pmap_md_init(void);
+bool pmap_md_tlb_check_entry(void *, vaddr_t, tlb_asid_t, pt_entry_t);
+#endif
+
void pmap_md_page_syncicache(struct vm_page *, __cpuset_t);
void pmap_bootstrap(vaddr_t, vaddr_t, const phys_ram_seg_t *, size_t);
bool pmap_extract(struct pmap *, vaddr_t, paddr_t *);
@@ -101,6 +105,7 @@
return (paddr_t) -1;
}
+#ifdef __PMAP_PRIVATE
/*
* Virtual Cache Alias helper routines. Not a problem for Booke CPUs.
*/
@@ -121,6 +126,13 @@
{
}
+static inline size_t
+pmap_md_tlb_asid_max(void)
+{
+ return PMAP_TLB_NUM_PIDS - 1;
+}
+#endif
+
#define POOL_VTOPHYS(va) ((paddr_t)(vaddr_t)(va))
#define POOL_PHYSTOV(pa) ((vaddr_t)(paddr_t)(pa))
Index: src/sys/common/pmap/tlb/pmap.c
diff -u src/sys/common/pmap/tlb/pmap.c:1.6 src/sys/common/pmap/tlb/pmap.c:1.7
--- src/sys/common/pmap/tlb/pmap.c:1.6 Mon Jun 20 20:24:29 2011
+++ src/sys/common/pmap/tlb/pmap.c Thu Jun 23 02:33:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.6 2011/06/20 20:24:29 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.7 2011/06/23 02:33:44 matt Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.6 2011/06/20 20:24:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.7 2011/06/23 02:33:44 matt Exp $");
/*
* Manages physical address maps.
@@ -591,7 +591,7 @@
PMAP_COUNT(shootdown_ipis);
#endif
#ifdef DEBUG
- pmap_tlb_check(pmap);
+ pmap_tlb_check(pmap, pmap_md_tlb_check_entry);
#endif /* DEBUG */
/*
Index: src/sys/common/pmap/tlb/pmap.h
diff -u src/sys/common/pmap/tlb/pmap.h:1.5 src/sys/common/pmap/tlb/pmap.h:1.6
--- src/sys/common/pmap/tlb/pmap.h:1.5 Mon Jun 20 20:24:29 2011
+++ src/sys/common/pmap/tlb/pmap.h Thu Jun 23 02:33:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.5 2011/06/20 20:24:29 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.6 2011/06/23 02:33:44 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -245,7 +245,7 @@
#define PMAP_TLB_NEED_IPI 0x01
#define PMAP_TLB_INSERT 0x02
void pmap_tlb_invalidate_addr(pmap_t, vaddr_t);
-void pmap_tlb_check(pmap_t);
+void pmap_tlb_check(pmap_t, bool (*)(void *, vaddr_t, tlb_asid_t, pt
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: enami
Date: Thu Jun 23 02:35:56 UTC 2011
Modified Files:
src/usr.sbin/makefs: cd9660.h
src/usr.sbin/makefs/cd9660: cd9660_eltorito.c
Log Message:
Move inclusion of sys/endian.h from cd9660_eltorito.c to cd9660.h
since actual user is not cd9660_eltorito.c but iso.h and
cd9660_eltorito.h.
Actually, include order/place of sys/endian.h doesn't matter on
netbsd since it is always included by sys/types.h but it's not
true on other system. This should fix cross build breakage on
freebsd introduced by rev. 1.16 of cd9660_eltorito.c.
Problem reported and fix suggested on twitter.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/cd9660.h
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/cd9660/cd9660_eltorito.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/makefs/cd9660.h
diff -u src/usr.sbin/makefs/cd9660.h:1.16 src/usr.sbin/makefs/cd9660.h:1.17
--- src/usr.sbin/makefs/cd9660.h:1.16 Sun May 22 21:51:39 2011
+++ src/usr.sbin/makefs/cd9660.h Thu Jun 23 02:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.h,v 1.16 2011/05/22 21:51:39 christos Exp $ */
+/* $NetBSD: cd9660.h,v 1.17 2011/06/23 02:35:56 enami Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#include "makefs.h"
#include "iso.h"
Index: src/usr.sbin/makefs/cd9660/cd9660_eltorito.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.16 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.17
--- src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.16 Mon May 23 00:21:50 2011
+++ src/usr.sbin/makefs/cd9660/cd9660_eltorito.c Thu Jun 23 02:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_eltorito.c,v 1.16 2011/05/23 00:21:50 christos Exp $ */
+/* $NetBSD: cd9660_eltorito.c,v 1.17 2011/06/23 02:35:56 enami Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -36,11 +36,9 @@
#include "cd9660.h"
#include "cd9660_eltorito.h"
-#include
-
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_eltorito.c,v 1.16 2011/05/23 00:21:50 christos Exp $");
+__RCSID("$NetBSD: cd9660_eltorito.c,v 1.17 2011/06/23 02:35:56 enami Exp $");
#endif /* !__lint */
#ifdef DEBUG
CVS commit: src/external/lgpl3/mpfr/lib/libmpfr
Module Name:src
Committed By: mrg
Date: Thu Jun 23 04:38:36 UTC 2011
Modified Files:
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
fix this to actually build and seem to work.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/lgpl3/mpfr/lib/libmpfr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.1 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.2
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.1 Tue Jun 21 04:23:56 2011
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Thu Jun 23 04:38:36 2011
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 04:23:56 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 04:38:36 mrg Exp $
.include
+# XXX get_d.c triggers lint div zero errors (which is valid?)
+MKLINT=no
+
LIB= mpfr
SRCS= \
@@ -220,15 +223,265 @@
zeta.c \
zeta_ui.c
+SRCS+= \
+ exceptions.c \
+ extract.c \
+ uceil_exp2.c \
+ uceil_log2.c \
+ ufloor_log2.c \
+ add.c \
+ add1.c \
+ add_ui.c \
+ agm.c \
+ clear.c \
+ cmp.c \
+ cmp_abs.c \
+ cmp_si.c \
+ cmp_ui.c \
+ comparisons.c \
+ div_2exp.c \
+ div_2si.c \
+ div_2ui.c \
+ div.c \
+ div_ui.c \
+ dump.c \
+ eq.c \
+ exp10.c \
+ exp2.c \
+ exp3.c \
+ exp.c \
+ frac.c \
+ get_d.c \
+ get_exp.c \
+ get_str.c \
+ init.c \
+ inp_str.c \
+ isinteger.c \
+ isinf.c \
+ isnan.c \
+ isnum.c \
+ const_log2.c \
+ log.c \
+ modf.c \
+ mul_2exp.c \
+ mul_2si.c \
+ mul_2ui.c \
+ mul.c \
+ mul_ui.c \
+ neg.c \
+ next.c \
+ out_str.c \
+ printf.c \
+ vasprintf.c \
+ const_pi.c \
+ pow.c \
+ pow_si.c \
+ pow_ui.c \
+ print_raw.c \
+ print_rnd_mode.c \
+ reldiff.c \
+ round_prec.c \
+ set.c \
+ setmax.c \
+ setmin.c \
+ set_d.c \
+ set_dfl_prec.c \
+ set_exp.c \
+ set_rnd.c \
+ set_f.c \
+ set_prc_raw.c \
+ set_prec.c \
+ set_q.c \
+ set_si.c \
+ set_str.c \
+ set_str_raw.c \
+ set_ui.c \
+ set_z.c \
+ sqrt.c \
+ sqrt_ui.c \
+ sub.c \
+ sub1.c \
+ sub_ui.c \
+ rint.c \
+ ui_div.c \
+ ui_sub.c \
+ urandom.c \
+ urandomb.c \
+ get_z_exp.c \
+ swap.c \
+ factorial.c \
+ cosh.c \
+ sinh.c \
+ tanh.c \
+ sinh_cosh.c \
+ acosh.c \
+ asinh.c \
+ atanh.c \
+ atan.c \
+ cmp2.c \
+ exp_2.c \
+ asin.c \
+ const_euler.c \
+ cos.c \
+ sin.c \
+ tan.c \
+ fma.c \
+ fms.c \
+ hypot.c \
+ log1p.c \
+ expm1.c \
+ log2.c \
+ log10.c \
+ ui_pow.c \
+ ui_pow_ui.c \
+ minmax.c \
+ dim.c \
+ signbit.c \
+ copysign.c \
+ setsign.c \
+ gmp_op.c \
+ init2.c \
+ acos.c \
+ sin_cos.c \
+ set_nan.c \
+ set_inf.c \
+ set_zero.c \
+ powerof2.c \
+ gamma.c \
+ set_ld.c \
+ get_ld.c \
+ cbrt.c \
+ volatile.c \
+ fits_sshort.c \
+ fits_sint.c \
+ fits_slong.c \
+ fits_ushort.c \
+ fits_uint.c \
+ fits_ulong.c \
+ fits_uintmax.c \
+ fits_intmax.c \
+ get_si.c \
+ get_ui.c \
+ zeta.c \
+ cmp_d.c \
+ erf.c \
+ inits.c \
+ inits2.c \
+ clears.c \
+ sgn.c \
+ check.c \
+ sub1sp.c \
+ version.c \
+ mpn_exp.c \
+ mpfr-gmp.c \
+ mp_clz_tab.c \
+ sum.c \
+ add1sp.c \
+ free_cache.c \
+ si_op.c \
+ cmp_ld.c \
+ set_ui_2exp.c \
+ set_si_2exp.c \
+ set_uj.c \
+ set_sj.c \
+ get_sj.c \
+ get_uj.c \
+ get_z.c \
+ iszero.c \
+ cache.c \
+ sqr.c \
+ int_ceil_log2.c \
+ isqrt.c \
+ strtofr.c \
+ pow_z.c \
+ logging.c \
+ mulders.c \
+ get_f.c \
+ round_p.c \
+ erfc.c \
+ atan2.c \
+ subnormal.c \
+ const_catalan.c \
+ root.c \
+ sec.c \
+ csc.c \
+ cot.c \
+ eint.c \
+ sech.c \
+ csch.c \
+ coth.c \
+ round_near_x.c \
+ constant.c \
+ abort_prec_max.c \
+ stack_interface.c \
+ lngamma.c \
+ zeta_ui.c \
+ set_d64.c \
+ get_d64.c \
+ jn.c \
+ yn.c \
+ rem1.c \
+ get_patches.c \
+ add_d.c \
+ sub_d.c \
+ d_sub.c \
+ mul_d.c \
+ div_d.c \
+ d_div.c \
+ li2.c \
+ rec_sqrt.c \
+ min_prec.c \
+ buildopt.c \
+ digamma.c \
+ bernoulli.c \
+ isregular.c \
+ set_flt.c \
+ get_flt.c \
+ scale2.c \
+ set_z_exp.c \
+ ai.c \
+ gammaonethird.c
+
INCS= mpf2mpfr.h mpfr.h
INCSDIR= /usr/include
-#INFO= mpfr.info
+INFO= mpfr.info
+
+CPPFLAGS+= -I. \
+ -DHAVE_INTTYPES_H=1 \
+ -DHAVE_STDINT_H=1 \
+ -DTIME_WITH_SYS_TIME=1 \
+ -DHAVE_LOCALE_H=1 \
+ -DHAVE_WCHAR_H=1 \
+ -DHAVE_STDARG=1 \
+ -DHAVE_SYS_TIME_H=1 \
+ -DHAVE_STDINT_H=1 \
+ -DHAVE_VA_COPY=1 \
+ -DHAVE_SETLOCALE=1 \
+ -DHAVE_GETTIMEOFDAY=1 \
+ -DHAVE_LONG_LONG=1 \
+ -DHAVE_INTMAX_T=1 \
+ -DMPFR_HAVE_INTMAX_MAX=1 \
+ -DMPFR_HAVE_FESETROUND=1 \
+ -DHAVE_DENORMS=1 \
+ -DHAVE_ROUND=1 \
+ -DHAVE_TRUNC=1 \
+ -DHAVE_FLOOR=1 \
+ -DHAVE_CEIL=1 \
+ -DHAVE_ATTRIBUTE_MODE=1
+
+.if ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+= -DHAVE_LDOUBLE_IEEE_EXT_LITTLE=1
+.endif
-CPPFLAGS+= ?
WITHOUT_MAN= yes
.include
+mparam.h: mparam_h.in
+ cp ${.ALLSRC} ${.TARGET}
+
+${SRCS}: mparam.h
+
.PATH: ${.CURDIR}/../../dist
CVS commit: src/external/lgpl2/mpc/lib/libmpc
Module Name:src
Committed By: mrg
Date: Thu Jun 23 04:39:24 UTC 2011
Modified Files:
src/external/lgpl2/mpc/lib/libmpc: Makefile
Log Message:
fix the file list and make this work.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/lgpl2/mpc/lib/libmpc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl2/mpc/lib/libmpc/Makefile
diff -u src/external/lgpl2/mpc/lib/libmpc/Makefile:1.1 src/external/lgpl2/mpc/lib/libmpc/Makefile:1.2
--- src/external/lgpl2/mpc/lib/libmpc/Makefile:1.1 Tue Jun 21 04:23:56 2011
+++ src/external/lgpl2/mpc/lib/libmpc/Makefile Thu Jun 23 04:39:24 2011
@@ -1,82 +1,85 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 04:23:56 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 04:39:24 mrg Exp $
.include
LIB= mpc
-SRCS= \
- abs.c \
- acos.c \
- acosh.c \
- add.c \
- add_fr.c \
- add_ui.c \
- arg.c \
- asin.c \
- asinh.c \
- atan.c \
- atanh.c \
- clear.c \
- cmp.c \
- cmp_si_si.c \
- conj.c \
- cos.c \
- cosh.c \
- div.c \
- div_2exp.c \
- div_fr.c \
- div_ui.c \
- exp.c \
- fr_div.c \
- fr_sub.c \
- get_prec.c \
- get_prec2.c \
- get_str.c \
- get_version.c \
- imag.c \
- init2.c \
- init3.c \
- inp_str.c \
- log.c \
- mem.c \
- mul.c \
- mul_2exp.c \
- mul_fr.c \
- mul_i.c \
- mul_si.c \
- mul_ui.c \
- neg.c \
- norm.c \
- out_str.c \
- pow.c \
- pow_d.c \
- pow_fr.c \
- pow_ld.c \
- pow_si.c \
- pow_ui.c \
- pow_z.c \
- proj.c \
- real.c \
- set.c \
- set_prec.c \
- set_str.c \
- set_x.c \
- set_x_x.c \
- sin.c \
- sinh.c \
- sqr.c \
- sqrt.c \
- strtoc.c \
- sub.c \
- sub_fr.c \
- sub_ui.c \
- swap.c \
- tan.c \
- tanh.c \
- uceil_log2.c \
- ui_div.c \
- ui_ui_sub.c \
- urandom.c
+SRCS= \
+ abs.c \
+ acos.c \
+ acosh.c \
+ add.c \
+ add_fr.c \
+ add_si.c \
+ add_ui.c \
+ arg.c \
+ asin.c \
+ asinh.c \
+ atan.c \
+ atanh.c \
+ clear.c \
+ cmp.c \
+ cmp_si_si.c \
+ conj.c \
+ cosh.c \
+ div_2exp.c \
+ div.c \
+ div_fr.c \
+ div_ui.c \
+ exp.c \
+ fma.c \
+ fr_div.c \
+ fr_sub.c \
+ get.c \
+ get_prec2.c \
+ get_prec.c \
+ get_str.c \
+ get_version.c \
+ imag.c \
+ init2.c \
+ init3.c \
+ inp_str.c \
+ log.c \
+ mem.c \
+ mul_2exp.c \
+ mul.c \
+ mul_fr.c \
+ mul_i.c \
+ mul_si.c \
+ mul_ui.c \
+ neg.c \
+ norm.c \
+ out_str.c \
+ pow.c \
+ pow_fr.c \
+ pow_ld.c \
+ pow_d.c \
+ pow_si.c \
+ pow_ui.c \
+ pow_z.c \
+ proj.c \
+ real.c \
+ urandom.c \
+ set.c \
+ set_prec.c \
+ set_str.c \
+ set_x.c \
+ set_x_x.c \
+ sin_cos.c \
+ sinh.c \
+ sqr.c \
+ sqrt.c \
+ strtoc.c \
+ sub.c \
+ sub_fr.c \
+ sub_ui.c \
+ swap.c \
+ tan.c \
+ tanh.c \
+ uceil_log2.c \
+ ui_div.c \
+ ui_ui_sub.c
+
INCS= mpc.h mpc-log.h
INCSDIR= /usr/include
@@ -84,3 +87,5 @@
CPPFLAGS+= -I${.CURDIR}
.include
+
+.PATH: ${.CURDIR}/../../dist/src
CVS commit: src/sys
Module Name:src
Committed By: matt
Date: Thu Jun 23 05:42:28 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke: booke_machdep.c e500_tlb.c
src/sys/common/pmap/tlb: pmap.h pmap_tlb.c
Log Message:
Cleanup comments in pmap_tlb.c. Attach tlb evcnts.
eliminate ti_mask
Cleanup some of the MP code. Conditionalize shootdown code.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/booke/booke_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/e500_tlb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/common/pmap/tlb/pmap.h \
src/sys/common/pmap/tlb/pmap_tlb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.10 src/sys/arch/powerpc/booke/booke_machdep.c:1.11
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.10 Tue Jun 21 04:21:16 2011
+++ src/sys/arch/powerpc/booke/booke_machdep.c Thu Jun 23 05:42:27 2011
@@ -177,6 +177,11 @@
printf("avail memory = %s\n", pbuf);
/*
+ * Register the tlb's evcnts
+ */
+ pmap_tlb_info_evcnt_attach(curcpu()->ci_tlb_info);
+
+ /*
* Set up the board properties database.
*/
board_info_init();
Index: src/sys/arch/powerpc/booke/e500_tlb.c
diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.4 src/sys/arch/powerpc/booke/e500_tlb.c:1.5
--- src/sys/arch/powerpc/booke/e500_tlb.c:1.4 Thu Jun 23 01:27:20 2011
+++ src/sys/arch/powerpc/booke/e500_tlb.c Thu Jun 23 05:42:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_tlb.c,v 1.4 2011/06/23 01:27:20 matt Exp $ */
+/* $NetBSD: e500_tlb.c,v 1.5 2011/06/23 05:42:27 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.4 2011/06/23 01:27:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.5 2011/06/23 05:42:27 matt Exp $");
#include
@@ -436,7 +436,7 @@
*/
if ((mas1 & (MAS1_V|MAS1_TS)) == (MAS1_V|MAS1_TS)
&& asid_lo <= (mas1 & MAS1_TID)
- && (mas1 & MAS1_TID) < asid_hi) {
+ && (mas1 & MAS1_TID) <= asid_hi) {
mtspr(SPR_MAS1, mas1 ^ MAS1_V);
#if 0
printf("%s[%zu,%zu]->[%x]\n",
Index: src/sys/common/pmap/tlb/pmap.h
diff -u src/sys/common/pmap/tlb/pmap.h:1.6 src/sys/common/pmap/tlb/pmap.h:1.7
--- src/sys/common/pmap/tlb/pmap.h:1.6 Thu Jun 23 02:33:44 2011
+++ src/sys/common/pmap/tlb/pmap.h Thu Jun 23 05:42:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.6 2011/06/23 02:33:44 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.7 2011/06/23 05:42:27 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -161,7 +161,6 @@
#define tlbinfo_noasids_p(ti) ((ti)->ti_asids_free == 0)
kmutex_t *ti_lock;
u_int ti_wired; /* # of wired TLB entries */
- uint32_t ti_asid_mask;
uint32_t ti_asid_max;
LIST_HEAD(, pmap_asid_info) ti_pais; /* list of active ASIDs */
#ifdef MULTIPROCESSOR
@@ -180,6 +179,7 @@
#else
#define tlbinfo_index(ti) (0)
#endif
+ struct evcnt ti_evcnt_asid_reinits;
u_long ti_asid_bitmap[256 / (sizeof(u_long) * 8)];
};
@@ -238,6 +238,7 @@
void pmap_tlb_syncicache(vaddr_t, uint32_t);
#endif
void pmap_tlb_info_init(struct pmap_tlb_info *);
+void pmap_tlb_info_evcnt_attach(struct pmap_tlb_info *);
void pmap_tlb_asid_acquire(pmap_t, struct lwp *l);
void pmap_tlb_asid_deactivate(pmap_t);
void pmap_tlb_asid_release_all(pmap_t);
Index: src/sys/common/pmap/tlb/pmap_tlb.c
diff -u src/sys/common/pmap/tlb/pmap_tlb.c:1.6 src/sys/common/pmap/tlb/pmap_tlb.c:1.7
--- src/sys/common/pmap/tlb/pmap_tlb.c:1.6 Thu Jun 23 02:33:44 2011
+++ src/sys/common/pmap/tlb/pmap_tlb.c Thu Jun 23 05:42:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_tlb.c,v 1.6 2011/06/23 02:33:44 matt Exp $ */
+/* $NetBSD: pmap_tlb.c,v 1.7 2011/06/23 05:42:27 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.6 2011/06/23 02:33:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.7 2011/06/23 05:42:27 matt Exp $");
/*
* Manages address spaces in a TLB.
@@ -79,16 +79,16 @@
*
* When a change to the local TLB may require a change in the TLB's of other
* CPUs, we try to avoid sending an IPI if at all possible. For instance, if
- * are updating a PTE and that PTE previously was invalid and therefore
- * couldn't support an active mapping, there's no need for an IPI since can be
- * no TLB entry to invalidate. The other case is when we change a PTE to be
- * modified we just update the local TLB. If another TLB has a stale entry,
- * a TLB MOD exception will be raised and that will cause the local TLB to be
- * updated.
+ * we are updating a PTE and that PTE previously was invalid and therefore
+ * couldn't support an active mapping, there's no need for an IPI since there
+ * can't be a TLB entry to invalidate. The other case is when we change a PTE
+ * to be m
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Jun 23 05:42:37 UTC 2011
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
get this some what working with GCC 4.5. i at least have managed to
get crtstuff and libgcc to build for amd64, and have linked and tested
/bin/sh with all these GCC 4.5 compiled part.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/tools/gcc/Makefile
cvs rdiff -u -r1.46 -r1.47 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.38 src/tools/gcc/Makefile:1.39
--- src/tools/gcc/Makefile:1.38 Tue Jun 21 09:37:41 2011
+++ src/tools/gcc/Makefile Thu Jun 23 05:42:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2011/06/21 09:37:41 mrg Exp $
+# $NetBSD: Makefile,v 1.39 2011/06/23 05:42:37 mrg Exp $
.include
@@ -76,6 +76,7 @@
LIBS=-lintl \
ac_cv_prog_cc_cross=yes \
ac_cv_func_strcoll_works=yes \
+ ac_cv_func_elf_getshstrndx=no \
gcc_cv_func_printf_ptr=yes \
gcc_cv_libc_provides_ssp=yes \
gdb_cv_printf_has_long_double=yes \
@@ -100,7 +101,7 @@
.if ${HAVE_GCC} >= 45
CXXADDFLAGS= --sysroot=${DESTDIR}
-CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
.else
CXXADDFLAGS= ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++
CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
@@ -148,6 +149,8 @@
< Makefile.config > Makefile) && \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
+ (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h unwind.h)
+ PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so && \
${MKNATIVE_ENV} ${BUILD_MAKE} configure-target-libiberty \
${MKNATIVE_CONFIG_TARGET_LIBS} configure-target-libobjc \
@@ -167,9 +170,11 @@
CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
all-local) && \
true
+.if 0
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/${MACHINE_GNU_PLATFORM}/libiberty && \
${MKNATIVE_ENV} ${BUILD_MAKE} needed-list)
+.endif
@touch $@
clean: clean.native
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.46 src/tools/gcc/mknative-gcc:1.47
--- src/tools/gcc/mknative-gcc:1.46 Tue Jun 21 04:11:12 2011
+++ src/tools/gcc/mknative-gcc Thu Jun 23 05:42:37 2011
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.46 2011/06/21 04:11:12 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.47 2011/06/23 05:42:37 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/gnu/dist/gcc.
@@ -519,24 +519,24 @@
get_gcc () {
_subdir="$1"
mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH
+ mkdir -p $_OUTDIR/usr.bin/$_subdir/libcpp/arch/$MACHINE_ARCH
case ${_subdir} in
gcc4)
- mkdir -p $_OUTDIR/usr.bin/$_subdir/libcpp/arch/$MACHINE_ARCH
_buildname="BUILD_"
_libcppsubdir=""
_extravars="TM_H ALL_OPT_FILES"
_hconfig_h=""
_extravars2="tm_file_list build_xm_include_list"
_extravars3="tm_p_include_list"
-
;;
- *)
- _buildname="HOST_"
- _libcppsubdir="gcc/"
- _extravars=""
- _hconfig_h="HCONFIG_H"
- _extravars2=""
- _extravars3=""
+
+ gcc)
+ _buildname="BUILD_"
+ _libcppsubdir=""
+ _extravars="TM_H ALL_OPT_FILES"
+ _hconfig_h=""
+ _extravars2="tm_file_list build_xm_include_list"
+ _extravars3="tm_p_include_list"
;;
esac
CVS commit: src/sys/common/pmap/tlb
Module Name:src Committed By: matt Date: Thu Jun 23 05:50:24 UTC 2011 Modified Files: src/sys/common/pmap/tlb: pmap.h Log Message: Add pmap_md_tlb_info_attach prototype. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/common/pmap/tlb/pmap.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/common/pmap/tlb/pmap.h diff -u src/sys/common/pmap/tlb/pmap.h:1.7 src/sys/common/pmap/tlb/pmap.h:1.8 --- src/sys/common/pmap/tlb/pmap.h:1.7 Thu Jun 23 05:42:27 2011 +++ src/sys/common/pmap/tlb/pmap.h Thu Jun 23 05:50:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.7 2011/06/23 05:42:27 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.8 2011/06/23 05:50:24 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -233,6 +233,7 @@ void pmap_tlb_shootdown_process(void); bool pmap_tlb_shootdown_bystanders(pmap_t pmap); void pmap_tlb_info_attach(struct pmap_tlb_info *, struct cpu_info *); +void pmap_md_tlb_info_attach(struct pmap_tlb_info *, struct cpu_info *); void pmap_tlb_syncicache_ast(struct cpu_info *); void pmap_tlb_syncicache_wanted(struct cpu_info *); void pmap_tlb_syncicache(vaddr_t, uint32_t);
