Date: Wed, 7 Mar 2012 08:33:34 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 207573 for review Message-ID: <201203070833.q278XYoh057358@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@207573?ac=10 Change 207573 by jhb@jhb_kavik on 2012/03/07 08:32:44 IFC @207572 Affected files ... .. //depot/projects/pci/sys/amd64/amd64/ptrace_machdep.c#2 integrate .. //depot/projects/pci/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/pci/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/pci/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/pci/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/pci/sys/amd64/include/float.h#3 integrate .. //depot/projects/pci/sys/amd64/include/ptrace.h#3 integrate .. //depot/projects/pci/sys/amd64/include/trap.h#3 integrate .. //depot/projects/pci/sys/arm/conf/DEFAULTS#3 integrate .. //depot/projects/pci/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/db78100.dts#2 integrate .. //depot/projects/pci/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/pci/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/pci/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/pci/sys/cam/ctl/ctl.c#2 integrate .. //depot/projects/pci/sys/cam/ctl/ctl.h#2 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_backend.h#2 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_backend_block.c#2 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_backend_ramdisk.c#2 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_error.c#2 integrate .. //depot/projects/pci/sys/cam/ctl/ctl_ioctl.h#2 integrate .. //depot/projects/pci/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/pci/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/pci/sys/conf/files.amd64#5 integrate .. //depot/projects/pci/sys/conf/files.i386#7 integrate .. //depot/projects/pci/sys/conf/kern.mk#6 integrate .. //depot/projects/pci/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/pci/sys/conf/kmod.mk#6 integrate .. //depot/projects/pci/sys/dev/fdt/fdt_common.c#3 integrate .. //depot/projects/pci/sys/dev/fdt/fdt_common.h#2 integrate .. //depot/projects/pci/sys/dev/hwpmc/hwpmc_core.c#4 integrate .. //depot/projects/pci/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/pci/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/pci/sys/dev/oce/oce_hw.c#2 integrate .. //depot/projects/pci/sys/dev/pci/hostb_pci.c#3 integrate .. //depot/projects/pci/sys/dev/pci/pci.c#33 integrate .. //depot/projects/pci/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/pci/sys/dev/pci/pci_private.h#10 integrate .. //depot/projects/pci/sys/dev/pci/pcivar.h#9 integrate .. //depot/projects/pci/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/pci/sys/dev/siba/siba_bwn.c#3 integrate .. //depot/projects/pci/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/pci/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/pci/sys/dev/tsec/if_tsec_fdt.c#3 integrate .. //depot/projects/pci/sys/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/pci/sys/dev/usb/controller/dwc_otg.c#2 integrate .. //depot/projects/pci/sys/dev/usb/controller/dwc_otg.h#2 integrate .. //depot/projects/pci/sys/dev/usb/controller/dwc_otg_atmelarm.c#2 integrate .. //depot/projects/pci/sys/dev/virtio/pci/virtio_pci.c#2 integrate .. //depot/projects/pci/sys/dev/wbwd/wbwd.c#1 branch .. //depot/projects/pci/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/pci/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/pci/sys/fs/fifofs/fifo.h#3 integrate .. //depot/projects/pci/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/pci/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/pci/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/pci/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/pci/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/pci/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/pci/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/pci/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/pci/sys/i386/conf/NOTES#4 integrate .. //depot/projects/pci/sys/i386/conf/XBOX#4 integrate .. //depot/projects/pci/sys/i386/include/float.h#3 integrate .. //depot/projects/pci/sys/i386/include/ptrace.h#3 integrate .. //depot/projects/pci/sys/i386/include/trap.h#3 integrate .. //depot/projects/pci/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/pci/sys/kern/kern_jail.c#8 integrate .. //depot/projects/pci/sys/kern/kern_lock.c#4 integrate .. //depot/projects/pci/sys/kern/kern_racct.c#7 integrate .. //depot/projects/pci/sys/kern/sys_generic.c#3 integrate .. //depot/projects/pci/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/pci/sys/mips/atheros/if_arge.c#6 integrate .. //depot/projects/pci/sys/mips/conf/DEFAULTS#3 integrate .. //depot/projects/pci/sys/mips/include/asm.h#3 integrate .. //depot/projects/pci/sys/mips/include/cpu.h#2 integrate .. //depot/projects/pci/sys/mips/include/cpuregs.h#4 integrate .. //depot/projects/pci/sys/mips/include/locore.h#2 integrate .. //depot/projects/pci/sys/mips/include/tls.h#1 branch .. //depot/projects/pci/sys/mips/include/ucontext.h#3 integrate .. //depot/projects/pci/sys/mips/mips/cpu.c#4 integrate .. //depot/projects/pci/sys/mips/mips/elf64_machdep.c#4 delete .. //depot/projects/pci/sys/mips/mips/exception.S#5 integrate .. //depot/projects/pci/sys/mips/mips/freebsd32_machdep.c#2 integrate .. //depot/projects/pci/sys/mips/mips/genassym.c#5 integrate .. //depot/projects/pci/sys/mips/mips/locore.S#4 integrate .. //depot/projects/pci/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/pci/sys/mips/mips/mpboot.S#2 integrate .. //depot/projects/pci/sys/mips/mips/pm_machdep.c#3 integrate .. //depot/projects/pci/sys/mips/mips/support.S#3 integrate .. //depot/projects/pci/sys/mips/mips/trap.c#5 integrate .. //depot/projects/pci/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/pci/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/pci/sys/modules/Makefile#8 integrate .. //depot/projects/pci/sys/modules/dtrace/dtrace/Makefile#2 integrate .. //depot/projects/pci/sys/modules/usb/Makefile#5 integrate .. //depot/projects/pci/sys/modules/usb/dwc_otg/Makefile#1 branch .. //depot/projects/pci/sys/modules/wbwd/Makefile#1 branch .. //depot/projects/pci/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/pci/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/pci/sys/net/if_lagg.c#7 integrate .. //depot/projects/pci/sys/net/if_lagg.h#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/pci/sys/net80211/ieee80211_alq.c#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_alq.h#2 integrate .. //depot/projects/pci/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/pci/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/pci/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/pci/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/pci/sys/netinet/icmp6.h#3 integrate .. //depot/projects/pci/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/pci/sys/netinet6/nd6.c#6 integrate .. //depot/projects/pci/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/pci/sys/pc98/include/float.h#2 integrate .. //depot/projects/pci/sys/pc98/include/ptrace.h#2 integrate .. //depot/projects/pci/sys/pc98/include/trap.h#2 integrate .. //depot/projects/pci/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/pci/sys/powerpc/include/asm.h#3 integrate .. //depot/projects/pci/sys/powerpc/powermac/smu.c#5 integrate .. //depot/projects/pci/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/pci/sys/sys/cdefs.h#3 integrate .. //depot/projects/pci/sys/sys/pipe.h#3 integrate .. //depot/projects/pci/sys/sys/racct.h#5 integrate .. //depot/projects/pci/sys/x86/include/_stdint.h#2 integrate .. //depot/projects/pci/sys/x86/include/float.h#1 branch .. //depot/projects/pci/sys/x86/include/ptrace.h#1 branch .. //depot/projects/pci/sys/x86/include/trap.h#1 branch Differences ... ==== //depot/projects/pci/sys/amd64/amd64/ptrace_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/ptrace_machdep.c,v 1.1 2012/01/21 17:45:27 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/ptrace_machdep.c,v 1.2 2012/03/04 20:24:28 tijl Exp $"); #include "opt_compat.h" @@ -126,6 +126,12 @@ return (cpu32_ptrace(td, req, addr, data)); #endif + /* Support old values of PT_GETXSTATE and PT_SETXSTATE. */ + if (req == PT_FIRSTMACH + 0) + req = PT_GETXSTATE; + if (req == PT_FIRSTMACH + 1) + req = PT_SETXSTATE; + switch (req) { case PT_GETXSTATE: case PT_SETXSTATE: ==== //depot/projects/pci/sys/amd64/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.23 2011/11/08 10:18:07 attilio Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.24 2012/03/06 20:01:25 attilio Exp $ machine amd64 @@ -22,6 +22,3 @@ options GEOM_PART_MBR options NEW_PCIB - -# Allow mounting non-MPSAFE filesystems -options VFS_ALLOW_NONMPSAFE ==== //depot/projects/pci/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.580 2012/03/03 00:11:46 jkim Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.582 2012/03/05 18:47:42 jkim Exp $ cpu HAMMER ident GENERIC @@ -168,7 +168,7 @@ device kbdmux # keyboard multiplexer device vga # VGA video card driver -options VESA # add support for VESA BIOS Extensions +options VESA # Add support for VESA BIOS Extensions (VBE) device splash # Splash screen and screen saver support @@ -303,39 +303,8 @@ device ehci # EHCI PCI->USB interface (USB 2.0) device xhci # XHCI PCI->USB interface (USB 3.0) device usb # USB Bus (required) -#device udbp # USB Double Bulk Pipe devices (needs netgraph) -device uhid # "Human Interface Devices" device ukbd # Keyboard -device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse -device urio # Diamond Rio 500 MP3 player -# USB Serial devices -device u3g # USB-based 3G modems (Option, Huawei, Sierra) -device uark # Technologies ARK3116 based serial adapters -device ubsa # Belkin F5U103 and compatible serial adapters -device uftdi # For FTDI usb serial adapters -device uipaq # Some WinCE based devices -device uplcom # Prolific PL-2303 serial adapters -device uslcom # SI Labs CP2101/CP2102 serial adapters -device uvisor # Visor and Palm devices -device uvscom # USB serial support for DDI pocket's PHS -# USB Ethernet, requires miibus -device aue # ADMtek USB Ethernet -device axe # ASIX Electronics USB Ethernet -device cdce # Generic USB over Ethernet -device cue # CATC USB Ethernet -device kue # Kawasaki LSI USB Ethernet -device rue # RealTek RTL8150 USB Ethernet -device udav # Davicom DM9601E USB -# USB Wireless -device rum # Ralink Technology RT2501USB wireless NICs -device run # Ralink Technology RT2700/RT2800/RT3000 NICs. -device uath # Atheros AR5523 wireless NICs -device upgt # Conexant/Intersil PrismGT wireless NICs. -device ural # Ralink Technology RT2500USB wireless NICs -device urtw # Realtek RTL8187B/L wireless NICs -device zyd # ZyDAS zd1211/zd1211b wireless NICs # FireWire support device firewire # FireWire bus code @@ -351,7 +320,6 @@ device snd_es137x # Ensoniq AudioPCI ES137x device snd_hda # Intel High Definition Audio device snd_ich # Intel, NVidia and other ICH AC'97 Audio -device snd_uaudio # USB Audio device snd_via8233 # VIA VT8233x Audio # MMC/SD ==== //depot/projects/pci/sys/amd64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.22 2010/07/16 23:21:46 mav Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.23 2012/03/06 18:44:52 bz Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -30,3 +30,4 @@ hint.attimer.0.at="isa" hint.attimer.0.port="0x40" hint.attimer.0.irq="0" +hint.wbwd.0.at="isa" ==== //depot/projects/pci/sys/amd64/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.113 2012/01/31 19:38:18 jimharris Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.114 2012/03/06 18:44:52 bz Exp $ # # @@ -465,10 +465,12 @@ # ichwd: Intel ICH watchdog timer # amdsbwd: AMD SB7xx watchdog timer # viawd: VIA south bridge watchdog timer +# wbwd: Winbond watchdog timer # device ichwd device amdsbwd device viawd +device wbwd # # Temperature sensors: ==== //depot/projects/pci/sys/amd64/include/float.h#3 (text+ko) ==== @@ -1,94 +1,6 @@ /*- - * Copyright (c) 1989 Regents of the University of California. - * All rights reserved. - * - * 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. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.17 2012/01/23 06:36:41 das Exp $ + * This file is in the public domain. */ +/* $FreeBSD: src/sys/amd64/include/float.h,v 1.18 2012/03/04 14:00:32 tijl Exp $ */ -#ifndef _MACHINE_FLOAT_H_ -#define _MACHINE_FLOAT_H_ 1 - -#include <sys/cdefs.h> - -__BEGIN_DECLS -extern int __flt_rounds(void); -__END_DECLS - -#define FLT_RADIX 2 /* b */ -#define FLT_ROUNDS __flt_rounds() -#if __ISO_C_VISIBLE >= 1999 -#define FLT_EVAL_METHOD 0 /* no promotions */ -#define DECIMAL_DIG 21 /* max precision in decimal digits */ -#endif - -#define FLT_MANT_DIG 24 /* p */ -#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ -#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */ -#define FLT_MIN_EXP (-125) /* emin */ -#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */ -#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */ -#define FLT_MAX_EXP 128 /* emax */ -#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */ -#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */ -#if __ISO_C_VISIBLE >= 2011 -#define FLT_TRUE_MIN 1.40129846E-45F /* b**(emin-p) */ -#define FLT_DECIMAL_DIG 9 /* ceil(1+p*log10(b)) */ -#define FLT_HAS_SUBNORM 1 -#endif /* __ISO_C_VISIBLE >= 2011 */ - -#define DBL_MANT_DIG 53 -#define DBL_EPSILON 2.2204460492503131E-16 -#define DBL_DIG 15 -#define DBL_MIN_EXP (-1021) -#define DBL_MIN 2.2250738585072014E-308 -#define DBL_MIN_10_EXP (-307) -#define DBL_MAX_EXP 1024 -#define DBL_MAX 1.7976931348623157E+308 -#define DBL_MAX_10_EXP 308 -#if __ISO_C_VISIBLE >= 2011 -#define DBL_TRUE_MIN 4.9406564584124654E-324 -#define DBL_DECIMAL_DIG 17 -#define DBL_HAS_SUBNORM 1 -#endif /* __ISO_C_VISIBLE >= 2011 */ - -#define LDBL_MANT_DIG 64 -#define LDBL_EPSILON 1.0842021724855044340E-19L -#define LDBL_DIG 18 -#define LDBL_MIN_EXP (-16381) -#define LDBL_MIN 3.3621031431120935063E-4932L -#define LDBL_MIN_10_EXP (-4931) -#define LDBL_MAX_EXP 16384 -#define LDBL_MAX 1.1897314953572317650E+4932L -#define LDBL_MAX_10_EXP 4932 -#if __ISO_C_VISIBLE >= 2011 -#define LDBL_TRUE_MIN 3.6451995318824746025E-4951L -#define LDBL_DECIMAL_DIG 21 -#define LDBL_HAS_SUBNORM 1 -#endif /* __ISO_C_VISIBLE >= 2011 */ - -#endif /* _MACHINE_FLOAT_H_ */ +#include <x86/float.h> ==== //depot/projects/pci/sys/amd64/include/ptrace.h#3 (text+ko) ==== @@ -1,41 +1,6 @@ /*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/ptrace.h,v 1.14 2012/01/21 17:45:27 kib Exp $ + * This file is in the public domain. */ +/* $FreeBSD: src/sys/amd64/include/ptrace.h,v 1.15 2012/03/04 20:24:28 tijl Exp $ */ -#ifndef _MACHINE_PTRACE_H_ -#define _MACHINE_PTRACE_H_ - -#define __HAVE_PTRACE_MACHDEP - -#define PT_GETXSTATE (PT_FIRSTMACH + 0) -#define PT_SETXSTATE (PT_FIRSTMACH + 1) - -#endif +#include <x86/ptrace.h> ==== //depot/projects/pci/sys/amd64/include/trap.h#3 (text+ko) ==== @@ -1,95 +1,6 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * 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. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * from: @(#)trap.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/trap.h,v 1.17 2011/11/07 01:53:25 rstone Exp $ + * This file is in the public domain. */ +/* $FreeBSD: src/sys/amd64/include/trap.h,v 1.18 2012/03/04 14:12:57 tijl Exp $ */ -#ifndef _MACHINE_TRAP_H_ -#define _MACHINE_TRAP_H_ - -/* - * Trap type values - * also known in trap.c for name strings - */ - -#define T_PRIVINFLT 1 /* privileged instruction */ -#define T_BPTFLT 3 /* breakpoint instruction */ -#define T_ARITHTRAP 6 /* arithmetic trap */ -#define T_PROTFLT 9 /* protection fault */ -#define T_TRCTRAP 10 /* debug exception (sic) */ -#define T_PAGEFLT 12 /* page fault */ -#define T_ALIGNFLT 14 /* alignment fault */ - -#define T_DIVIDE 18 /* integer divide fault */ -#define T_NMI 19 /* non-maskable trap */ -#define T_OFLOW 20 /* overflow trap */ -#define T_BOUND 21 /* bound instruction fault */ -#define T_DNA 22 /* device not available fault */ -#define T_DOUBLEFLT 23 /* double fault */ -#define T_FPOPFLT 24 /* fp coprocessor operand fetch fault */ -#define T_TSSFLT 25 /* invalid tss fault */ -#define T_SEGNPFLT 26 /* segment not present fault */ -#define T_STKFLT 27 /* stack fault */ -#define T_MCHK 28 /* machine check trap */ -#define T_XMMFLT 29 /* SIMD floating-point exception */ -#define T_RESERVED 30 /* reserved (unknown) */ -#define T_DTRACE_RET 32 /* DTrace pid return */ -#define T_DTRACE_PROBE 33 /* DTrace fasttrap probe */ - -/* XXX most of the following codes aren't used, but could be. */ - -/* definitions for <sys/signal.h> */ -#define ILL_RESAD_FAULT T_RESADFLT -#define ILL_PRIVIN_FAULT T_PRIVINFLT -#define ILL_RESOP_FAULT T_RESOPFLT -#define ILL_ALIGN_FAULT T_ALIGNFLT -#define ILL_FPOP_FAULT T_FPOPFLT /* coprocessor operand fault */ - -/* old FreeBSD macros, deprecated */ -#define FPE_INTOVF_TRAP 0x1 /* integer overflow */ -#define FPE_INTDIV_TRAP 0x2 /* integer divide by zero */ -#define FPE_FLTDIV_TRAP 0x3 /* floating/decimal divide by zero */ -#define FPE_FLTOVF_TRAP 0x4 /* floating overflow */ -#define FPE_FLTUND_TRAP 0x5 /* floating underflow */ -#define FPE_FPU_NP_TRAP 0x6 /* floating point unit not present */ -#define FPE_SUBRNG_TRAP 0x7 /* subrange out of bounds */ - -/* codes for SIGBUS */ -#define BUS_PAGE_FAULT T_PAGEFLT /* page fault protection base */ -#define BUS_SEGNP_FAULT T_SEGNPFLT /* segment not present */ -#define BUS_STK_FAULT T_STKFLT /* stack segment */ -#define BUS_SEGM_FAULT T_RESERVED /* segment protection base */ - -/* Trap's coming from user mode */ -#define T_USER 0x100 - -#endif /* !_MACHINE_TRAP_H_ */ +#include <x86/trap.h> ==== //depot/projects/pci/sys/arm/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/arm # -# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.5 2011/11/08 10:18:07 attilio Exp $ +# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.6 2012/03/06 20:01:25 attilio Exp $ machine arm @@ -9,5 +9,3 @@ options GEOM_PART_BSD options GEOM_PART_MBR - -options VFS_ALLOW_NONMPSAFE ==== //depot/projects/pci/sys/arm/mv/mvreg.h#2 (text+ko) ==== @@ -28,138 +28,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.9 2010/06/13 13:28:53 raj Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.10 2012/03/04 18:13:45 raj Exp $ */ #ifndef _MVREG_H_ #define _MVREG_H_ -/* - * Interrupt sources - */ -#if defined(SOC_MV_ORION) - -#define MV_INT_BRIDGE 0 /* AHB-MBus Bridge Interrupt */ -#define MV_INT_UART0 3 /* UART0 Interrupt */ -#define MV_INT_UART1 4 -#define MV_INT_GPIO7_0 6 /* GPIO[7:0] Interrupt */ -#define MV_INT_GPIO15_8 7 /* GPIO[15:8] Interrupt */ -#define MV_INT_GPIO23_16 8 /* GPIO[23:16] Interrupt */ -#define MV_INT_GPIO31_24 9 /* GPIO[31:24] Interrupt */ -#define MV_INT_PEX0_ERR 10 /* PCI Express Error */ -#define MV_INT_PEX0 11 /* PCI Express INTA,B,C,D Message */ -#define MV_INT_PCI_ERR 15 /* PCI Error */ -#define MV_INT_USB_BERR 16 /* USB Bridge Error */ -#define MV_INT_USB_CI 17 /* USB Controller interrupt */ -#define MV_INT_GBERX 18 /* GbE receive interrupt */ -#define MV_INT_GBETX 19 /* GbE transmit interrupt */ -#define MV_INT_GBEMISC 20 /* GbE misc. interrupt */ -#define MV_INT_GBESUM 21 /* GbE summary interrupt */ -#define MV_INT_GBEERR 22 /* GbE error interrupt */ -#define MV_INT_IDMA_ERR 23 /* DMA error interrupt */ -#define MV_INT_IDMA0 24 /* IDMA chan. 0 completion interrupt */ -#define MV_INT_IDMA1 25 /* IDMA chan. 1 completion interrupt */ -#define MV_INT_IDMA2 26 /* IDMA chan. 2 completion interrupt */ -#define MV_INT_IDMA3 27 /* IDMA chan. 3 completion interrupt */ -#define MV_INT_SATA 29 /* Serial-ATA Interrupt */ - -#elif defined(SOC_MV_KIRKWOOD) - -#define MV_INT_BRIDGE 1 /* AHB-MBus Bridge Interrupt */ -#define MV_INT_XOR0_CHAN0 5 /* XOR engine 0 channel 0 Interrupt */ -#define MV_INT_XOR0_CHAN1 6 /* XOR engine 0 channel 1 Interrupt */ -#define MV_INT_XOR1_CHAN0 7 /* XOR engine 1 channel 0 Interrupt */ -#define MV_INT_XOR1_CHAN1 8 /* XOR engine 1 channel 1 Interrupt */ -#define MV_INT_PEX0 9 /* PCI Express INTA,B,C,D Message */ -#define MV_INT_GBESUM 11 /* GbE0 summary interrupt */ -#define MV_INT_GBERX 12 /* GbE0 receive interrupt */ -#define MV_INT_GBETX 13 /* GbE0 transmit interrupt */ -#define MV_INT_GBEMISC 14 /* GbE0 misc. interrupt */ -#define MV_INT_GBE1SUM 15 /* GbE1 summary interrupt */ -#define MV_INT_GBE1RX 16 /* GbE1 receive interrupt */ -#define MV_INT_GBE1TX 17 /* GbE1 transmit interrupt */ -#define MV_INT_GBE1MISC 18 /* GbE1 misc. interrupt */ -#define MV_INT_USB_CI 19 /* USB Controller interrupt */ -#define MV_INT_SATA 21 /* Serial-ATA Interrupt */ -#define MV_INT_CESA 22 /* Security engine completion int. */ -#define MV_INT_IDMA_ERR 23 /* DMA error interrupt */ -#define MV_INT_UART0 33 /* UART0 Interrupt */ -#define MV_INT_UART1 34 -#define MV_INT_GPIO7_0 35 /* GPIO[7:0] Interrupt */ -#define MV_INT_GPIO15_8 36 /* GPIO[15:8] Interrupt */ -#define MV_INT_GPIO23_16 37 /* GPIO[23:16] Interrupt */ -#define MV_INT_GPIO31_24 38 /* GPIO[31:24] Interrupt */ -#define MV_INT_GPIOHI7_0 39 /* GPIOHI[7:0] Interrupt */ -#define MV_INT_GPIOHI15_8 40 /* GPIOHI[15:8] Interrupt */ -#define MV_INT_GPIOHI23_16 41 /* GPIOHI[23:16] Interrupt */ -#define MV_INT_XOR0_ERR 42 /* XOR engine 0 error Interrupt */ -#define MV_INT_XOR1_ERR 43 /* XOR engine 1 error Interrupt */ -#define MV_INT_PEX0_ERR 44 /* PCI Express Error */ -#define MV_INT_GBEERR 46 /* GbE0 error interrupt */ -#define MV_INT_GBE1ERR 47 /* GbE1 error interrupt */ -#define MV_INT_USB_BERR 48 /* USB Bridge Error */ - -#elif defined(SOC_MV_DISCOVERY) - -#define MV_INT_ERRSUM 0 /* Summary of error interrupts */ -#define MV_INT_SPI 1 /* SPI interrupt */ -#define MV_INT_TWSI0 2 /* TWSI0 interrupt */ -#define MV_INT_TWSI1 3 /* TWSI1 interrupt */ -#define MV_INT_IDMA0 4 /* IDMA Channel0 completion */ -#define MV_INT_IDMA1 5 /* IDMA Channel0 completion */ -#define MV_INT_IDMA2 6 /* IDMA Channel0 completion */ -#define MV_INT_IDMA3 7 /* IDMA Channel0 completion */ -#define MV_INT_TIMER0 8 /* Timer0 interrupt */ -#define MV_INT_TIMER1 9 /* Timer1 interrupt */ -#define MV_INT_TIMER2 10 /* Timer2 interrupt */ -#define MV_INT_TIMER3 11 /* Timer3 interrupt */ -#define MV_INT_UART0 12 /* UART0 interrupt */ -#define MV_INT_UART1 13 /* UART1 interrupt */ -#define MV_INT_UART2 14 /* UART2 interrupt */ -#define MV_INT_UART3 15 /* UART3 interrupt */ -#define MV_INT_USB0 16 /* USB0 interrupt */ -#define MV_INT_USB1 17 /* USB1 interrupt */ -#define MV_INT_USB2 18 /* USB2 interrupt */ -#define MV_INT_CESA 19 /* Crypto engine completion interrupt */ -#define MV_INT_XOR0 22 /* XOR engine 0 completion interrupt */ -#define MV_INT_XOR1 23 /* XOR engine 1 completion interrupt */ -#define MV_INT_SATA 26 /* SATA interrupt */ -#define MV_INT_PEX00 32 /* PCI Express port 0.0 INTA/B/C/D */ -#define MV_INT_PEX01 33 /* PCI Express port 0.1 INTA/B/C/D */ -#define MV_INT_PEX02 34 /* PCI Express port 0.2 INTA/B/C/D */ -#define MV_INT_PEX03 35 /* PCI Express port 0.3 INTA/B/C/D */ -#define MV_INT_PEX10 36 /* PCI Express port 1.0 INTA/B/C/D */ -#define MV_INT_PEX11 37 /* PCI Express port 1.1 INTA/B/C/D */ -#define MV_INT_PEX12 38 /* PCI Express port 1.2 INTA/B/C/D */ -#define MV_INT_PEX13 39 /* PCI Express port 1.3 INTA/B/C/D */ -#define MV_INT_GBESUM 40 /* Gigabit Ethernet Port 0 summary */ -#define MV_INT_GBERX 41 /* Gigabit Ethernet Port 0 Rx summary */ -#define MV_INT_GBETX 42 /* Gigabit Ethernet Port 0 Tx summary */ -#define MV_INT_GBEMISC 43 /* Gigabit Ethernet Port 0 Misc summ. */ -#define MV_INT_GBE1SUM 44 /* Gigabit Ethernet Port 1 summary */ -#define MV_INT_GBE1RX 45 /* Gigabit Ethernet Port 1 Rx summary */ -#define MV_INT_GBE1TX 46 /* Gigabit Ethernet Port 1 Tx summary */ -#define MV_INT_GBE1MISC 47 /* Gigabit Ethernet Port 1 Misc summ. */ -#define MV_INT_GPIO7_0 56 /* GPIO[7:0] Interrupt */ -#define MV_INT_GPIO15_8 57 /* GPIO[15:8] Interrupt */ -#define MV_INT_GPIO23_16 58 /* GPIO[23:16] Interrupt */ -#define MV_INT_GPIO31_24 59 /* GPIO[31:24] Interrupt */ -#define MV_INT_DB_IN 60 /* Inbound Doorbell Cause reg Summary */ -#define MV_INT_DB_OUT 61 /* Outbound Doorbell Cause reg Summ. */ -#define MV_INT_CRYPT_ERR 64 /* Crypto engine error */ -#define MV_INT_DEV_ERR 65 /* Device bus error */ -#define MV_INT_IDMA_ERR 66 /* DMA error */ -#define MV_INT_CPU_ERR 67 /* CPU error */ -#define MV_INT_PEX0_ERR 68 /* PCI-Express port0 error */ -#define MV_INT_PEX1_ERR 69 /* PCI-Express port1 error */ -#define MV_INT_GBE_ERR 70 /* Gigabit Ethernet error */ -#define MV_INT_USB_ERR 72 /* USB error */ -#define MV_INT_DRAM_ERR 73 /* DRAM ECC error */ -#define MV_INT_XOR_ERR 74 /* XOR engine error */ -#define MV_INT_WD 79 /* WD Timer interrupt */ - -#endif /* SOC_MV_ORION */ - #define BRIDGE_IRQ_CAUSE 0x10 #define BRIGDE_IRQ_MASK 0x14 ==== //depot/projects/pci/sys/boot/fdt/dts/db78100.dts#2 (text+ko) ==== @@ -28,7 +28,7 @@ * * Marvell DB-78100 Device Tree Source. * - * $FreeBSD: src/sys/boot/fdt/dts/db78100.dts,v 1.2 2011/02/04 01:09:02 marcel Exp $ + * $FreeBSD: src/sys/boot/fdt/dts/db78100.dts,v 1.3 2012/03/04 19:22:52 raj Exp $ */ /dts-v1/; @@ -221,6 +221,9 @@ phy0: ethernet-phy@0 { reg = <0x8>; }; + phy1: ethernet-phy@1 { + reg = <0x9>; + }; }; }; @@ -234,17 +237,7 @@ local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <45 46 47 44 70>; interrupt-parent = <&PIC>; - phy-handle = <&phy0>; - - mdio@0 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "mrvl,mdio"; - - phy0: ethernet-phy@0 { - reg = <0x9>; - }; - }; + phy-handle = <&phy1>; }; serial0: serial@12000 { ==== //depot/projects/pci/sys/boot/forth/loader.conf#6 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.163 2012/01/14 17:34:32 eadler Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.164 2012/03/06 18:44:52 bz Exp $ ############################################################## ### Basic configuration options ############################ @@ -488,6 +488,7 @@ vpo_load="NO" # Parallel to SCSI interface driver amdtemp_load="NO" # AMD K8/K10/K11 temperature monitor tpm_load="NO" # Trusted Platform Module +wbwd_load="NO" # Winbond watchdog ############################################################## ### ACPI settings ########################################## ==== //depot/projects/pci/sys/boot/i386/boot2/boot1.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.34 2010/11/14 08:31:02 brucec Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.35 2012/03/06 20:45:13 jhb Exp $ */ /* Memory Locations */ @@ -125,7 +125,10 @@ mov $start,%sp # stack /* * Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets - * %cx == 0x100. + * %cx == 0x100. Note that boot1 does not use this relocated copy + * of itself while loading boot2; however, BTX reclaims the memory + * used by boot1 during its initialization. As a result, boot2 uses + * xread from the relocated copy. */ mov %sp,%si # Source mov $MEM_REL,%di # Destination ==== //depot/projects/pci/sys/boot/i386/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.99 2011/10/25 19:45:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.100 2012/03/05 19:53:17 jhb Exp $"); #include <sys/param.h> #include <sys/disklabel.h> @@ -128,7 +128,7 @@ unsigned start; int init; } dsk; -static char cmd[512], cmddup[512]; +static char cmd[512], cmddup[512], knamebuf[1024]; static const char *kname; static uint32_t opts; static int comspeed = SIOSPD; @@ -223,7 +223,9 @@ { uint8_t autoboot; ino_t ino; + size_t nbyte; + opts = 0; kname = NULL; dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base); v86.ctl = V86_FLAGS; @@ -240,8 +242,10 @@ autoboot = 1; if ((ino = lookup(PATH_CONFIG)) || - (ino = lookup(PATH_DOTCONFIG))) - fsread(ino, cmd, sizeof(cmd)); + (ino = lookup(PATH_DOTCONFIG))) { + nbyte = fsread(ino, cmd, sizeof(cmd) - 1); + cmd[nbyte] = '\0'; + } if (*cmd) { memcpy(cmddup, cmd, sizeof(cmd)); @@ -258,9 +262,9 @@ * or in case of failure, try to load a kernel directly instead. */ - if (autoboot && !kname) { + if (!kname) { kname = PATH_BOOT3; - if (!keyhit(3*SECOND)) { + if (autoboot && !keyhit(3*SECOND)) { load(); kname = PATH_KERNEL; } @@ -457,7 +461,12 @@ ? DRV_HARD : 0) + drv; dsk_meta = 0; } - kname = arg; + if ((i = ep - arg)) { + if ((size_t)i >= sizeof(knamebuf)) + return -1; + memcpy(knamebuf, arg, i + 1); + kname = knamebuf; + } } arg = p; } ==== //depot/projects/pci/sys/cam/ctl/ctl.c#2 (text+ko) ==== @@ -1,7 +1,11 @@ /*- * Copyright (c) 2003-2009 Silicon Graphics International Corp. + * Copyright (c) 2012 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by Edward Tomasz Napierala + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -38,7 +42,7 @@ #define _CTL_C #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/ctl/ctl.c,v 1.2 2012/01/19 18:42:03 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ctl/ctl.c,v 1.3 2012/03/06 13:43:57 trasz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -4797,6 +4801,25 @@ return (0); } +void +ctl_lun_capacity_changed(struct ctl_be_lun *be_lun) +{ + struct ctl_lun *lun; + struct ctl_softc *softc; + int i; + + softc = control_softc; + + mtx_lock(&softc->ctl_lock); + + lun = (struct ctl_lun *)be_lun->ctl_lun; + + for (i = 0; i < CTL_MAX_INITIATORS; i++) + lun->pending_sense[i].ua_pending |= CTL_UA_CAPACITY_CHANGED; + + mtx_unlock(&softc->ctl_lock); +} + /* * Backend "memory move is complete" callback for requests that never * make it down to say RAIDCore's configuration code. ==== //depot/projects/pci/sys/cam/ctl/ctl.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGES. * * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl.h#5 $ - * $FreeBSD: src/sys/cam/ctl/ctl.h,v 1.1 2012/01/12 00:34:33 ken Exp $ + * $FreeBSD: src/sys/cam/ctl/ctl.h,v 1.2 2012/03/06 13:43:57 trasz Exp $ */ /* * Function definitions used both within CTL and potentially in various CTL @@ -120,7 +120,8 @@ CTL_UA_RES_PREEMPT = 0x0200, CTL_UA_RES_RELEASE = 0x0400, CTL_UA_REG_PREEMPT = 0x0800, - CTL_UA_ASYM_ACC_CHANGE = 0x1000 + CTL_UA_ASYM_ACC_CHANGE = 0x1000, + CTL_UA_CAPACITY_CHANGED = 0x2000 } ctl_ua_type; #ifdef _KERNEL ==== //depot/projects/pci/sys/cam/ctl/ctl_backend.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGES. * * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_backend.h#2 $ - * $FreeBSD: src/sys/cam/ctl/ctl_backend.h,v 1.1 2012/01/12 00:34:33 ken Exp $ + * $FreeBSD: src/sys/cam/ctl/ctl_backend.h,v 1.2 2012/03/06 13:43:57 trasz Exp $ */ /* * CTL backend driver definitions @@ -280,6 +280,11 @@ int ctl_lun_offline(struct ctl_be_lun *be_lun); int ctl_lun_online(struct ctl_be_lun *be_lun); +/* + * Let the backend notify the initiator about changed capacity. + */ +void ctl_lun_capacity_changed(struct ctl_be_lun *be_lun); + #endif /* _KERNEL */ #endif /* _CTL_BACKEND_H_ */ ==== //depot/projects/pci/sys/cam/ctl/ctl_backend_block.c#2 (text+ko) ==== @@ -1,8 +1,12 @@ /*- * Copyright (c) 2003 Silicon Graphics International Corp. * Copyright (c) 2009-2011 Spectra Logic Corporation + * Copyright (c) 2012 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by Edward Tomasz Napierala + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -36,7 +40,7 @@ * Author: Ken Merry <ken@FreeBSD.org> */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/ctl/ctl_backend_block.c,v 1.2 2012/01/19 18:42:03 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ctl/ctl_backend_block.c,v 1.3 2012/03/06 13:43:57 trasz Exp $"); #include <opt_kdtrace.h> @@ -250,6 +254,12 @@ struct ctl_lun_req *req); static int ctl_be_block_rm(struct ctl_be_block_softc *softc, struct ctl_lun_req *req); +static int ctl_be_block_modify_file(struct ctl_be_block_lun *be_lun, + struct ctl_lun_req *req); +static int ctl_be_block_modify_dev(struct ctl_be_block_lun *be_lun, + struct ctl_lun_req *req); +static int ctl_be_block_modify(struct ctl_be_block_softc *softc, + struct ctl_lun_req *req); static void ctl_be_block_lun_shutdown(void *be_lun); static void ctl_be_block_lun_config_status(void *be_lun, ctl_lun_config_status status); @@ -1263,6 +1273,9 @@ case CTL_LUNREQ_RM: error = ctl_be_block_rm(softc, lun_req); break; + case CTL_LUNREQ_MODIFY: + error = ctl_be_block_modify(softc, lun_req); + break; default: lun_req->status = CTL_LUN_ERROR; snprintf(lun_req->error_str, sizeof(lun_req->error_str), >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203070833.q278XYoh057358>