CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Wed Feb 27 09:29:21 UTC 2013 Modified Files: src/sys/dev/ic: isp.c Log Message: Disable ICBOPT_FAST_POST for ISP 2100. Fixes PR kern/47302. From Matthew Jacob. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/dev/ic/isp.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/ic/isp.c diff -u src/sys/dev/ic/isp.c:1.122 src/sys/dev/ic/isp.c:1.123 --- src/sys/dev/ic/isp.c:1.122 Mon Feb 28 17:17:55 2011 +++ src/sys/dev/ic/isp.c Wed Feb 27 09:29:21 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: isp.c,v 1.122 2011/02/28 17:17:55 mjacob Exp $ */ +/* $NetBSD: isp.c,v 1.123 2013/02/27 09:29:21 martin Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -43,7 +43,7 @@ */ #ifdef __NetBSD__ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: isp.c,v 1.122 2011/02/28 17:17:55 mjacob Exp $); +__KERNEL_RCSID(0, $NetBSD: isp.c,v 1.123 2013/02/27 09:29:21 martin Exp $); #include dev/ic/isp_netbsd.h #endif #ifdef __FreeBSD__ @@ -1580,7 +1580,13 @@ isp_fibre_init(ispsoftc_t *isp) * * NB: for the 2300, ICBOPT_EXTENDED is required. */ - if (IS_2200(isp) || IS_23XX(isp)) { + if (IS_2100(isp)) { + /* + * We can't have Fast Posting any more- we now + * have 32 bit handles. + */ + icbp-icb_fwoptions = ~ICBOPT_FAST_POST; + } else if (IS_2200(isp) || IS_23XX(isp)) { icbp-icb_fwoptions |= ICBOPT_EXTENDED; /* * Prefer or force Point-To-Point instead Loop?
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 27 13:53:51 UTC 2013 Modified Files: src/sys/dev/pci: if_bgevar.h Log Message: Fix macro definitions. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_bgevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_bgevar.h diff -u src/sys/dev/pci/if_bgevar.h:1.9 src/sys/dev/pci/if_bgevar.h:1.10 --- src/sys/dev/pci/if_bgevar.h:1.9 Thu Feb 2 19:43:05 2012 +++ src/sys/dev/pci/if_bgevar.h Wed Feb 27 13:53:51 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bgevar.h,v 1.9 2012/02/02 19:43:05 tls Exp $ */ +/* $NetBSD: if_bgevar.h,v 1.10 2013/02/27 13:53:51 msaitoh Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -100,14 +100,14 @@ bus_space_read_4(sc-bge_btag, sc-bge_bhandle, reg) #define BGE_SETBIT(sc, reg, x) \ - CSR_WRITE_4(sc, reg, (CSR_READ_4(sc, reg) | x)) + CSR_WRITE_4(sc, reg, (CSR_READ_4(sc, reg) | (x))) #define BGE_CLRBIT(sc, reg, x) \ - CSR_WRITE_4(sc, reg, (CSR_READ_4(sc, reg) ~x)) + CSR_WRITE_4(sc, reg, (CSR_READ_4(sc, reg) ~(x))) #define PCI_SETBIT(pc, tag, reg, x) \ - pci_conf_write(pc, tag, reg, (pci_conf_read(pc, tag, reg) | x)) + pci_conf_write(pc, tag, reg, (pci_conf_read(pc, tag, reg) | (x))) #define PCI_CLRBIT(pc, tag, reg, x) \ - pci_conf_write(pc, tag, reg, (pci_conf_read(pc, tag, reg) ~x)) + pci_conf_write(pc, tag, reg, (pci_conf_read(pc, tag, reg) ~(x))) /* * Memory management stuff. Note: the SSLOTS, MSLOTS and JSLOTS
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 27 13:59:01 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: - Add APPLE BCM5701 - Add BROADCOM BCM57766 - BCM5719 is not 10G but 1G To generate a diff of this commit: cvs rdiff -u -r1.1148 -r1.1149 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1148 src/sys/dev/pci/pcidevs:1.1149 --- src/sys/dev/pci/pcidevs:1.1148 Wed Feb 20 04:40:15 2013 +++ src/sys/dev/pci/pcidevs Wed Feb 27 13:59:00 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1148 2013/02/20 04:40:15 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1149 2013/02/27 13:59:00 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1119,6 +1119,7 @@ product APPLE INTREPID2_PCI2 0x0068 Intr product APPLE INTREPID2_ATA 0x0069 Intrepid 2 ATA product APPLE INTREPID2_FW 0x006a Intrepid 2 FireWire product APPLE INTREPID2_GMAC 0x006b Intrepid 2 GMAC +product APPLE BCM5701 0x1645 BCM5701 /* ARC Logic products */ product ARC 1000PV 0xa091 1000PV @@ -1630,8 +1631,7 @@ product BROADCOM BCM5705 0x1653 BCM5705 product BROADCOM BCM5705K 0x1654 BCM5705K 10/100/1000 Ethernet product BROADCOM BCM5717 0x1655 BCM5717 10/100/1000 Ethernet product BROADCOM BCM5718 0x1656 BCM5718 10/100/1000 Ethernet -product BROADCOM BCM5719 0x1657 BCM5719 NetXtreme II 10Gb Ethernet -// product BROADCOM BCM5720 0x1658 BCM5720 NetXtreme 1000baseT Ethernet +product BROADCOM BCM5719 0x1657 BCM5719 NetXtreme 1000baseT Ethernet product BROADCOM BCM5721 0x1659 BCM5721 NetXtreme 1000baseT Ethernet product BROADCOM BCM5722 0x165a BCM5722 NetXtreme 1000baseT Ethernet product BROADCOM BCM5723 0x165b BCM5723 NetXtreme 1000baseT Ethernet @@ -1663,6 +1663,7 @@ product BROADCOM BCM5761E 0x1680 BCM5761 product BROADCOM BCM5761 0x1681 BCM5761 10/100/1000 Ethernet product BROADCOM BCM57762 0x1682 BCM57762 Gigabit Ethernet product BROADCOM BCM5764 0x1684 BCM5764 NetXtreme 1000baseT Ethernet +product BROADCOM BCM57766 0x1686 BCM57766 NetXtreme 1000baseT Ethernet product BROADCOM BCM5761S 0x1688 BCM5761S 10/100/1000 Ethernet product BROADCOM BCM5761SE 0x1689 BCM5761SE 10/100/1000 Ethernet product BROADCOM BCM57760 0x1690 BCM57760 NetXtreme 1000baseT Ethernet
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Feb 27 14:19:38 UTC 2013 Modified Files: src/sys/dev/pci: if_bge.c if_bgereg.h Log Message: No functional change: - Fix comments. - Change macro name. - Change sysctl related functions for consistency. To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 src/sys/dev/pci/if_bge.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/if_bgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_bge.c diff -u src/sys/dev/pci/if_bge.c:1.206 src/sys/dev/pci/if_bge.c:1.207 --- src/sys/dev/pci/if_bge.c:1.206 Tue Feb 26 11:06:23 2013 +++ src/sys/dev/pci/if_bge.c Wed Feb 27 14:19:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.206 2013/02/26 11:06:23 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.207 2013/02/27 14:19:38 msaitoh Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.206 2013/02/26 11:06:23 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.207 2013/02/27 14:19:38 msaitoh Exp $); #include vlan.h @@ -259,8 +259,8 @@ static void bge_sig_pre_reset(struct bge static void bge_stop_fw(struct bge_softc *); static int bge_reset(struct bge_softc *); static void bge_link_upd(struct bge_softc *); -static void sysctl_bge_init(struct bge_softc *); -static int sysctl_bge_verify(SYSCTLFN_PROTO); +static void bge_sysctl_init(struct bge_softc *); +static int bge_sysctl_verify(SYSCTLFN_PROTO); #ifdef BGE_DEBUG #define DPRINTF(x) if (bgedebug) printf x @@ -624,18 +624,10 @@ static const struct bge_product { NULL }, }; -/* - * XXX: how to handle variants based on 5750 and derivatives: - * 5750 5751, 5721, possibly 5714, 5752, and 5708?, which - * in general behave like a 5705, except with additional quirks. - * This driver's current handling of the 5721 is wrong; - * how we map ASIC revision to quirks needs more thought. - * (defined here until the thought is done). - */ #define BGE_IS_5700_FAMILY(sc) ((sc)-bge_flags BGE_5700_FAMILY) #define BGE_IS_5714_FAMILY(sc) ((sc)-bge_flags BGE_5714_FAMILY) #define BGE_IS_5705_PLUS(sc) ((sc)-bge_flags BGE_5705_PLUS) -#define BGE_IS_5750_OR_BEYOND(sc) ((sc)-bge_flags BGE_5750_PLUS) +#define BGE_IS_575X_PLUS(sc) ((sc)-bge_flags BGE_575X_PLUS) #define BGE_IS_5755_PLUS(sc) ((sc)-bge_flags BGE_5755_PLUS) #define BGE_IS_JUMBO_CAPABLE(sc) ((sc)-bge_flags BGE_JUMBO_CAPABLE) @@ -2690,10 +2682,10 @@ bge_attach(device_t parent, device_t sel BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5906 || BGE_IS_5755_PLUS(sc) || BGE_IS_5714_FAMILY(sc)) - sc-bge_flags |= BGE_5750_PLUS; + sc-bge_flags |= BGE_575X_PLUS; if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5705 || - BGE_IS_5750_OR_BEYOND(sc)) + BGE_IS_575X_PLUS(sc)) sc-bge_flags |= BGE_5705_PLUS; /* @@ -2820,7 +2812,7 @@ bge_attach(device_t parent, device_t sel BGE_HWCFG_ASF) { sc-bge_asf_mode |= ASF_ENABLE; sc-bge_asf_mode |= ASF_STACKUP; - if (BGE_IS_5750_OR_BEYOND(sc)) { + if (BGE_IS_575X_PLUS(sc)) { sc-bge_asf_mode |= ASF_NEW_HANDSHAKE; } } @@ -3092,7 +3084,7 @@ bge_attach(device_t parent, device_t sel else aprint_error_dev(self, couldn't establish power handler\n); - sysctl_bge_init(sc); + bge_sysctl_init(sc); #ifdef BGE_DEBUG bge_debug_info(sc); @@ -3120,7 +3112,7 @@ bge_reset(struct bge_softc *sc) int i, val; void (*write_op)(struct bge_softc *, int, int); - if (BGE_IS_5750_OR_BEYOND(sc) !BGE_IS_5714_FAMILY(sc) + if (BGE_IS_575X_PLUS(sc) !BGE_IS_5714_FAMILY(sc) (BGE_ASICREV(sc-bge_chipid) != BGE_ASICREV_BCM5906)) { if (sc-bge_flags BGE_PCIE) write_op = bge_writemem_direct; @@ -3940,7 +3932,7 @@ bge_compact_dma_runt(struct mbuf *pkt) } /* - * Encapsulate an mbuf chain in the tx ring by coupling the mbuf data + * Encapsulate an mbuf chain in the tx ring by coupling the mbuf data * pointers to descriptors. */ static int @@ -4092,7 +4084,7 @@ doit: - sizeof(struct tcphdr) - sizeof(struct ip)) 2; } - if (BGE_IS_5750_OR_BEYOND(sc)) { + if (BGE_IS_575X_PLUS(sc)) { th-th_sum = 0; csum_flags = ~(BGE_TXBDFLAG_TCP_UDP_CSUM); } else { @@ -4176,7 +4168,7 @@ doit: * of TSO flags and segsize. */ if (use_tso) { - if (BGE_IS_5750_OR_BEYOND(sc) || i == 0) { + if (BGE_IS_575X_PLUS(sc) || i == 0) { f-bge_rsvd = maxsegsize; f-bge_flags = csum_flags | txbd_tso_flags; } else { @@ -4856,7 +4848,7 @@ bge_link_upd(struct bge_softc *sc) } static int -sysctl_bge_verify(SYSCTLFN_ARGS) +bge_sysctl_verify(SYSCTLFN_ARGS) { int error, t; struct sysctlnode node; @@ -4889,7 +4881,7 @@ sysctl_bge_verify(SYSCTLFN_ARGS) * Set up sysctl(3) MIB, hw.bge.*. */ static void -sysctl_bge_init(struct bge_softc *sc) +bge_sysctl_init(struct bge_softc *sc) { int rc, bge_root_num;
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Wed Feb 27 16:55:39 UTC 2013 Modified Files: src/sys/arch/arm/arm32: arm32_kvminit.c Log Message: Add a zero flag to valloc_pages so that we can *not* zero the msgbuf so it will be preserved across boots. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/arm32/arm32_kvminit.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/arm32_kvminit.c diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.16 src/sys/arch/arm/arm32/arm32_kvminit.c:1.17 --- src/sys/arch/arm/arm32/arm32_kvminit.c:1.16 Mon Dec 31 01:23:31 2012 +++ src/sys/arch/arm/arm32/arm32_kvminit.c Wed Feb 27 16:55:39 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_kvminit.c,v 1.16 2012/12/31 01:23:31 matt Exp $ */ +/* $NetBSD: arm32_kvminit.c,v 1.17 2013/02/27 16:55:39 matt Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -122,7 +122,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.16 2012/12/31 01:23:31 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.17 2013/02/27 16:55:39 matt Exp $); #include sys/param.h #include sys/device.h @@ -295,7 +295,7 @@ add_pages(struct bootmem_info *bmi, pv_a static void valloc_pages(struct bootmem_info *bmi, pv_addr_t *pv, size_t npages, - int prot, int cache) + int prot, int cache, bool zero_p) { size_t nbytes = npages * PAGE_SIZE; pv_addr_t *free_pv = bmi-bmi_freeblocks; @@ -311,7 +311,7 @@ valloc_pages(struct bootmem_info *bmi, p free_pv-pv_size = L1_TABLE_SIZE) { l1pt_found = true; valloc_pages(bmi, kernel_l1pt, L1_TABLE_SIZE / PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); + VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true); add_pages(bmi, kernel_l1pt); } @@ -454,7 +454,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b printf( vector); #endif valloc_pages(bmi, bmi-bmi_vector_l2pt, L2_TABLE_SIZE / PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); + VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true); add_pages(bmi, bmi-bmi_vector_l2pt); /* @@ -465,7 +465,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b #endif for (size_t idx = 0; idx KERNEL_L2PT_KERNEL_NUM; ++idx) { valloc_pages(bmi, kernel_l2pt[idx], L2_TABLE_SIZE / PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); + VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true); add_pages(bmi, kernel_l2pt[idx]); } @@ -477,7 +477,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b #endif for (size_t idx = 0; idx KERNEL_L2PT_VMDATA_NUM; ++idx) { valloc_pages(bmi, vmdata_l2pt[idx], L2_TABLE_SIZE / PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); + VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true); add_pages(bmi, vmdata_l2pt[idx]); } @@ -489,7 +489,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b printf( io); #endif valloc_pages(bmi, bmi-bmi_io_l2pt, L2_TABLE_SIZE / PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); + VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE, true); add_pages(bmi, bmi-bmi_io_l2pt); } @@ -499,28 +499,28 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b /* Allocate stacks for all modes and CPUs */ valloc_pages(bmi, abtstack, ABT_STACK_SIZE * cpu_num, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE, true); add_pages(bmi, abtstack); valloc_pages(bmi, fiqstack, FIQ_STACK_SIZE * cpu_num, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE, true); add_pages(bmi, fiqstack); valloc_pages(bmi, irqstack, IRQ_STACK_SIZE * cpu_num, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE, true); add_pages(bmi, irqstack); valloc_pages(bmi, undstack, UND_STACK_SIZE * cpu_num, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE, true); add_pages(bmi, undstack); valloc_pages(bmi, idlestack, UPAGES * cpu_num, /* SVC32 */ - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE, true); add_pages(bmi, idlestack); valloc_pages(bmi, kernelstack, UPAGES, /* SVC32 */ - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE, true); add_pages(bmi, kernelstack); /* Allocate the message buffer from the end of memory. */ const size_t msgbuf_pgs = round_page(MSGBUFSIZE) / PAGE_SIZE; valloc_pages(bmi, msgbuf, msgbuf_pgs, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE, false); add_pages(bmi, msgbuf); msgbufphys = msgbuf.pv_pa; @@ -529,7 +529,8 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b * This page will just contain the system vectors and can be * shared by all processes. */ - valloc_pages(bmi, systempage, 1, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); +
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src Committed By: matt Date: Wed Feb 27 17:50:07 UTC 2013 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Define PAGESHIFT using PGSHIFT To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/include/arm32/vmparam.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/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.28 src/sys/arch/arm/include/arm32/vmparam.h:1.29 --- src/sys/arch/arm/include/arm32/vmparam.h:1.28 Mon Feb 25 16:12:13 2013 +++ src/sys/arch/arm/include/arm32/vmparam.h Wed Feb 27 17:50:07 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.28 2013/02/25 16:12:13 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.29 2013/02/27 17:50:07 matt Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ * While the ARM architecture defines Section mappings, large pages, * and small pages, the standard page size is (and will always be) 4K. */ -#define PAGE_SHIFT 12 +#define PAGE_SHIFT PGSHIFT #define PAGE_SIZE (1 PAGE_SHIFT) #define PAGE_MASK (PAGE_SIZE - 1)
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Wed Feb 27 17:52:44 UTC 2013 Modified Files: src/sys/arch/arm/arm32: cpuswitch.S locore.S Log Message: Don't include machine/param.h since we should be getting that stuff from assym.h To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/arm/arm32/cpuswitch.S cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/arm32/locore.S 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/cpuswitch.S diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.76 src/sys/arch/arm/arm32/cpuswitch.S:1.77 --- src/sys/arch/arm/arm32/cpuswitch.S:1.76 Mon Dec 17 17:45:01 2012 +++ src/sys/arch/arm/arm32/cpuswitch.S Wed Feb 27 17:52:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuswitch.S,v 1.76 2012/12/17 17:45:01 matt Exp $ */ +/* $NetBSD: cpuswitch.S,v 1.77 2013/02/27 17:52:44 matt Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -84,12 +84,11 @@ #include opt_lockdebug.h #include assym.h -#include machine/param.h -#include machine/frame.h #include machine/asm.h #include machine/cpu.h +#include machine/frame.h - RCSID($NetBSD: cpuswitch.S,v 1.76 2012/12/17 17:45:01 matt Exp $) + RCSID($NetBSD: cpuswitch.S,v 1.77 2013/02/27 17:52:44 matt Exp $) /* LINTSTUB: include sys/param.h */ Index: src/sys/arch/arm/arm32/locore.S diff -u src/sys/arch/arm/arm32/locore.S:1.30 src/sys/arch/arm/arm32/locore.S:1.31 --- src/sys/arch/arm/arm32/locore.S:1.30 Wed Nov 21 19:38:36 2012 +++ src/sys/arch/arm/arm32/locore.S Wed Feb 27 17:52:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.30 2012/11/21 19:38:36 matt Exp $ */ +/* $NetBSD: locore.S,v 1.31 2013/02/27 17:52:44 matt Exp $ */ /* * Copyright (C) 1994-1997 Mark Brinicombe @@ -37,12 +37,11 @@ #include machine/asm.h #include machine/cpu.h #include machine/frame.h -#include machine/param.h /* What size should this really be ? It is only used by init_arm() */ #define INIT_ARM_STACK_SIZE 2048 - RCSID($NetBSD: locore.S,v 1.30 2012/11/21 19:38:36 matt Exp $) + RCSID($NetBSD: locore.S,v 1.31 2013/02/27 17:52:44 matt Exp $) /* * This is for kvm_mkdb, and should be the address of the beginning
CVS commit: src/tests/lib/libc/rpc
Module Name:src Committed By: christos Date: Wed Feb 27 18:39:58 UTC 2013 Modified Files: src/tests/lib/libc/rpc: t_rpc.c Log Message: skip the tests if rpcbind is not responding. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/rpc/t_rpc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/rpc/t_rpc.c diff -u src/tests/lib/libc/rpc/t_rpc.c:1.1 src/tests/lib/libc/rpc/t_rpc.c:1.2 --- src/tests/lib/libc/rpc/t_rpc.c:1.1 Tue Feb 26 12:06:55 2013 +++ src/tests/lib/libc/rpc/t_rpc.c Wed Feb 27 13:39:58 2013 @@ -1,7 +1,7 @@ -/* $NetBSD: t_rpc.c,v 1.1 2013/02/26 17:06:55 christos Exp $ */ +/* $NetBSD: t_rpc.c,v 1.2 2013/02/27 18:39:58 christos Exp $ */ #include sys/cdefs.h -__RCSID($NetBSD: t_rpc.c,v 1.1 2013/02/26 17:06:55 christos Exp $); +__RCSID($NetBSD: t_rpc.c,v 1.2 2013/02/27 18:39:58 christos Exp $); #include sys/types.h #include sys/socket.h @@ -17,8 +17,15 @@ __RCSID($NetBSD: t_rpc.c,v 1.1 2013/02/ #include atf-c.h #define ERRX(ev, msg, ...) ATF_REQUIRE_MSG(0, msg, __VA_ARGS__) + +#define SKIPX(ev, msg, ...) do { \ + atf_tc_skip(msg, __VA_ARGS__); \ + return; \ +} while(/*CONSTCOND*/0) + #else #define ERRX(ev, msg, ...) errx(ev, msg, __VA_ARGS__) +#define SKIPX(ev, msg, ...) errx(ev, msg, __VA_ARGS__) #endif @@ -40,6 +47,8 @@ reply(caddr_t replyp, struct netbuf * ra return 0; } +extern bool __rpc_control(int, void *); + static void onehost(const char *host, const char *transp) { @@ -47,9 +56,16 @@ onehost(const char *host, const char *tr struct netbuf addr; struct timeval tv; + /* + * Magic! + */ + tv.tv_sec = 0; + tv.tv_usec = 50; +#define CLCR_SET_RPCB_TIMEOUT 2 + __rpc_control(CLCR_SET_RPCB_TIMEOUT, tv); if ((clnt = clnt_create(host, RPCBPROG, RPCBVERS, transp)) == NULL) - ERRX(EXIT_FAILURE, clnt_create (%s), clnt_spcreateerror()); + SKIPX(EXIT_FAILURE, clnt_create (%s), clnt_spcreateerror()); tv.tv_sec = 1; tv.tv_usec = 0;
CVS commit: src/usr.bin/vis
Module Name:src Committed By: christos Date: Wed Feb 27 20:12:44 UTC 2013 Modified Files: src/usr.bin/vis: vis.1 Log Message: update dates, version To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/vis/vis.1 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/vis/vis.1 diff -u src/usr.bin/vis/vis.1:1.17 src/usr.bin/vis/vis.1:1.18 --- src/usr.bin/vis/vis.1:1.17 Thu Feb 14 09:00:00 2013 +++ src/usr.bin/vis/vis.1 Wed Feb 27 15:12:44 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: vis.1,v 1.17 2013/02/14 14:00:00 christos Exp $ +.\ $NetBSD: vis.1,v 1.18 2013/02/27 20:12:44 christos Exp $ .\ .\ Copyright (c) 1989, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)vis.1 8.4 (Berkeley) 4/19/94 .\ -.Dd February 13, 2013 +.Dd February 19, 2013 .Dt VIS 1 .Os .Sh NAME @@ -164,6 +164,6 @@ The command appears in .Bx 4.4 . Myltibyte character support was added in -.Nx 6.1 +.Nx 7.0 and .Fx 9.2 .
CVS commit: src/sbin/mbrlabel
Module Name:src Committed By: is Date: Wed Feb 27 20:43:00 UTC 2013 Modified Files: src/sbin/mbrlabel: mbrlabel.8 Log Message: Fix terminology issue brought up by Bug Hunting in PR 47314. The boot records in extended partitions are called Extended Boot Record (EBR); use that in the documentation where appropriate. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sbin/mbrlabel/mbrlabel.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mbrlabel/mbrlabel.8 diff -u src/sbin/mbrlabel/mbrlabel.8:1.18 src/sbin/mbrlabel/mbrlabel.8:1.19 --- src/sbin/mbrlabel/mbrlabel.8:1.18 Sat Jul 14 20:13:30 2012 +++ src/sbin/mbrlabel/mbrlabel.8 Wed Feb 27 20:43:00 2013 @@ -27,9 +27,9 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.\ $NetBSD: mbrlabel.8,v 1.18 2012/07/14 20:13:30 wiz Exp $ +.\ $NetBSD: mbrlabel.8,v 1.19 2013/02/27 20:43:00 is Exp $ .\ -.Dd July 13, 2012 +.Dd February 27, 2013 .Dt MBRLABEL 8 .Os .Sh NAME @@ -44,7 +44,8 @@ .Nm is used to update a .Nx -disk label from the Master Boot Record (MBR) label(s) found +disk label from the Master Boot Record (MBR) label and Extended +Boot Record (EBR) label(s) found on disks that were previously used on DOS/Windows systems (or other MBR using systems). .Pp @@ -53,11 +54,11 @@ scans the MBR contained in the very firs block specified through the .Fl s flag), then walks through every extended partition found and generates -additional partition entries for the disk from the MBRs found in +additional partition entries for the disk from the EBRs found in those extended partitions. .Pp -Each MBR partition which does not have an equivalent partition in the -disk label (equivalent in having the same size and offset) is added to +Each MBR and each EBR partition which does not have an equivalent partition +in the disk label (equivalent in having the same size and offset) is added to the first free partition slot in the disk label. A free partition slot is defined as one with an .Dv fstype @@ -105,6 +106,11 @@ See also .Xr dkctl 8 , .Xr fdisk 8 , .Xr mbr 8 +.Rs +.%A Tn Microsoft corporation +.%T Disk Concepts and Troubleshooting +.%R Tn Microsoft technical library +.Re .Sh HISTORY The .Nm
CVS commit: src/sbin/mbrlabel
Module Name:src Committed By: wiz Date: Wed Feb 27 21:21:47 UTC 2013 Modified Files: src/sbin/mbrlabel: mbrlabel.8 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/mbrlabel/mbrlabel.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mbrlabel/mbrlabel.8 diff -u src/sbin/mbrlabel/mbrlabel.8:1.19 src/sbin/mbrlabel/mbrlabel.8:1.20 --- src/sbin/mbrlabel/mbrlabel.8:1.19 Wed Feb 27 20:43:00 2013 +++ src/sbin/mbrlabel/mbrlabel.8 Wed Feb 27 21:21:47 2013 @@ -27,7 +27,7 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.\ $NetBSD: mbrlabel.8,v 1.19 2013/02/27 20:43:00 is Exp $ +.\ $NetBSD: mbrlabel.8,v 1.20 2013/02/27 21:21:47 wiz Exp $ .\ .Dd February 27, 2013 .Dt MBRLABEL 8 @@ -44,7 +44,7 @@ .Nm is used to update a .Nx -disk label from the Master Boot Record (MBR) label and Extended +disk label from the Master Boot Record (MBR) label and Extended Boot Record (EBR) label(s) found on disks that were previously used on DOS/Windows systems (or other MBR using systems).
CVS commit: src
Module Name:src Committed By: joerg Date: Wed Feb 27 21:25:14 UTC 2013 Modified Files: src/distrib/sets: sets.subr src/distrib/sets/lists/comp: mi src/external/bsd/llvm: Makefile Makefile.inc link.mk src/external/bsd/llvm/bin: Makefile src/external/bsd/llvm/lib: Makefile src/share/mk: bsd.own.mk src/tools: Makefile Added Files: src/external/bsd/llvm/bin/llvm-mcld: Makefile src/external/bsd/llvm/config/mclinker/mcld/Config: Config.h Linkers.def Targets.def src/external/bsd/llvm/lib/libMCLinkerADT: Makefile src/external/bsd/llvm/lib/libMCLinkerARMCodeGen: Makefile src/external/bsd/llvm/lib/libMCLinkerARMTargetInfo: Makefile src/external/bsd/llvm/lib/libMCLinkerCodeGen: Makefile src/external/bsd/llvm/lib/libMCLinkerCore: Makefile src/external/bsd/llvm/lib/libMCLinkerFragment: Makefile src/external/bsd/llvm/lib/libMCLinkerLD: Makefile src/external/bsd/llvm/lib/libMCLinkerMC: Makefile src/external/bsd/llvm/lib/libMCLinkerMipsCodeGen: Makefile src/external/bsd/llvm/lib/libMCLinkerMipsTargetInfo: Makefile src/external/bsd/llvm/lib/libMCLinkerObject: Makefile src/external/bsd/llvm/lib/libMCLinkerSupport: Makefile src/external/bsd/llvm/lib/libMCLinkerTarget: Makefile src/external/bsd/llvm/lib/libMCLinkerX86CodeGen: Makefile src/external/bsd/llvm/lib/libMCLinkerX86TargetInfo: Makefile src/tools/llvm-lib/libMCLinkerADT: Makefile src/tools/llvm-lib/libMCLinkerARMCodeGen: Makefile src/tools/llvm-lib/libMCLinkerARMTargetInfo: Makefile src/tools/llvm-lib/libMCLinkerCodeGen: Makefile src/tools/llvm-lib/libMCLinkerCore: Makefile src/tools/llvm-lib/libMCLinkerFragment: Makefile src/tools/llvm-lib/libMCLinkerLD: Makefile src/tools/llvm-lib/libMCLinkerMC: Makefile src/tools/llvm-lib/libMCLinkerMipsCodeGen: Makefile src/tools/llvm-lib/libMCLinkerMipsTargetInfo: Makefile src/tools/llvm-lib/libMCLinkerObject: Makefile src/tools/llvm-lib/libMCLinkerSupport: Makefile src/tools/llvm-lib/libMCLinkerTarget: Makefile src/tools/llvm-lib/libMCLinkerX86CodeGen: Makefile src/tools/llvm-lib/libMCLinkerX86TargetInfo: Makefile src/tools/llvm-mcld: Makefile Log Message: Add infrastructure for building MCLinker. To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/sets.subr cvs rdiff -u -r1.1806 -r1.1807 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/Makefile \ src/external/bsd/llvm/link.mk cvs rdiff -u -r1.46 -r1.47 src/external/bsd/llvm/Makefile.inc cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/bin/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/bin/llvm-mcld/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/config/mclinker/mcld/Config/Config.h \ src/external/bsd/llvm/config/mclinker/mcld/Config/Linkers.def \ src/external/bsd/llvm/config/mclinker/mcld/Config/Targets.def cvs rdiff -u -r1.28 -r1.29 src/external/bsd/llvm/lib/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerADT/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libMCLinkerARMCodeGen/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libMCLinkerARMTargetInfo/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerCodeGen/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerCore/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerFragment/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerLD/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerMC/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libMCLinkerMipsCodeGen/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libMCLinkerMipsTargetInfo/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerObject/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerSupport/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libMCLinkerTarget/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libMCLinkerX86CodeGen/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/bsd/llvm/lib/libMCLinkerX86TargetInfo/Makefile cvs rdiff -u -r1.724 -r1.725 src/share/mk/bsd.own.mk cvs rdiff -u -r1.167 -r1.168 src/tools/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libMCLinkerADT/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libMCLinkerARMCodeGen/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libMCLinkerARMTargetInfo/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libMCLinkerCodeGen/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libMCLinkerCore/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libMCLinkerFragment/Makefile cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libMCLinkerLD/Makefile cvs rdiff -u -r0 -r1.1
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: matt Date: Wed Feb 27 22:15:46 UTC 2013 Modified Files: src/sys/arch/arm/arm32: arm32_kvminit.c Log Message: Actually use zero_p now that we pass it in. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm32/arm32_kvminit.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/arm32_kvminit.c diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.17 src/sys/arch/arm/arm32/arm32_kvminit.c:1.18 --- src/sys/arch/arm/arm32/arm32_kvminit.c:1.17 Wed Feb 27 16:55:39 2013 +++ src/sys/arch/arm/arm32/arm32_kvminit.c Wed Feb 27 22:15:46 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_kvminit.c,v 1.17 2013/02/27 16:55:39 matt Exp $ */ +/* $NetBSD: arm32_kvminit.c,v 1.18 2013/02/27 22:15:46 matt Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -122,7 +122,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.17 2013/02/27 16:55:39 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: arm32_kvminit.c,v 1.18 2013/02/27 22:15:46 matt Exp $); #include sys/param.h #include sys/device.h @@ -358,7 +358,8 @@ valloc_pages(struct bootmem_info *bmi, p bmi-bmi_freepages -= npages; - memset((void *)pv-pv_va, 0, nbytes); + if (zero_p) + memset((void *)pv-pv_va, 0, nbytes); } void @@ -542,7 +543,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b if (xscale_use_minidata) #endif valloc_pages(bmi, extrapv, nextrapages, - VM_PROT_READ|VM_PROT_WRITE, 0, false); + VM_PROT_READ|VM_PROT_WRITE, 0, true); #endif /*
CVS commit: src/sys/conf
Module Name:src Committed By: christos Date: Thu Feb 28 02:00:03 UTC 2013 Modified Files: src/sys/conf: majors Log Message: add a major for dtrace To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.63 src/sys/conf/majors:1.64 --- src/sys/conf/majors:1.63 Fri Feb 8 10:00:26 2013 +++ src/sys/conf/majors Wed Feb 27 21:00:03 2013 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.63 2013/02/08 15:00:26 jdc Exp $ +# $NetBSD: majors,v 1.64 2013/02/28 02:00:03 christos Exp $ # # Device majors for Machine-Independent drivers. # @@ -52,3 +52,4 @@ device-major iscsi char 203 device-major tpm char 204 tpm device-major mfi char 205 mfi device-major seeprom char 206 seeprom +device-major dtracechar 207 dtrace
CVS commit: src/etc
Module Name:src Committed By: christos Date: Thu Feb 28 02:00:27 UTC 2013 Modified Files: src/etc: MAKEDEV.tmpl Log Message: node for dtrace To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.162 src/etc/MAKEDEV.tmpl:1.163 --- src/etc/MAKEDEV.tmpl:1.162 Sun Feb 10 09:54:33 2013 +++ src/etc/MAKEDEV.tmpl Wed Feb 27 21:00:27 2013 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.162 2013/02/10 14:54:33 christos Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.163 2013/02/28 02:00:27 christos Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -296,6 +296,9 @@ # # Trusted Computing devices # tpm Trusted Platform Module +# +# Debugging and tracing + dtrace Dynamic tracing framework # @@ -2073,6 +2076,11 @@ tpm) mkdev tpm c %tpm_chr% 0 600 ;; +dtrace) + makedir dtrace 755 + mkdev dtrace/dtrace c %dtrace_chr% 0 600 + ;; + fw[0-9]*) unit=${i#fw} for j in 0 1 2 3
CVS commit: src/etc
Module Name:src Committed By: christos Date: Thu Feb 28 03:04:12 UTC 2013 Modified Files: src/etc: MAKEDEV.tmpl Log Message: missing comment To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/etc/MAKEDEV.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.163 src/etc/MAKEDEV.tmpl:1.164 --- src/etc/MAKEDEV.tmpl:1.163 Wed Feb 27 21:00:27 2013 +++ src/etc/MAKEDEV.tmpl Wed Feb 27 22:04:12 2013 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.163 2013/02/28 02:00:27 christos Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.164 2013/02/28 03:04:12 christos Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -298,7 +298,7 @@ # tpm Trusted Platform Module # # Debugging and tracing - dtrace Dynamic tracing framework +# dtrace Dynamic tracing framework #