From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:45 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E67BEE6; Mon, 8 Sep 2014 04:50:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1CBD9665 for ; Mon, 8 Sep 2014 04:50:01 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED2A41C0A for ; Mon, 8 Sep 2014 04:50:00 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884o0Wr022742 for ; Mon, 8 Sep 2014 04:50:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884o0ho022738 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:00 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:50:00 GMT Message-Id: <201409080450.s884o0ho022738@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199026 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:45 -0000 http://p4web.freebsd.org/@@1199026?ac=10 Change 1199026 by jhb@jhb_ralph on 2014/08/21 21:44:28 IFC @1199023 Affected files ... .. //depot/projects/smpng/share/man/man9/timeout.9#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#139 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#79 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#35 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#25 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vtd.c#6 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#3 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/disassem.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#22 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#24 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#32 integrate .. //depot/projects/smpng/sys/arm/at91/at91_aic.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/at91_common.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_machdep.c#19 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#24 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mcireg.h#6 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_pio.c#15 integrate .. //depot/projects/smpng/sys/arm/at91/at91_piovar.h#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pit.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pmc.c#20 integrate .. //depot/projects/smpng/sys/arm/at91/at91sam9260.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/at91sam9260reg.h#7 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#17 integrate .. //depot/projects/smpng/sys/arm/at91/std.atmel#5 integrate .. //depot/projects/smpng/sys/arm/conf/HL201#12 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#5 integrate .. //depot/projects/smpng/sys/arm/include/acle-compat.h#1 branch .. //depot/projects/smpng/sys/arm/include/elf.h#16 integrate .. //depot/projects/smpng/sys/arm/include/param.h#24 integrate .. //depot/projects/smpng/sys/arm/include/platform.h#2 integrate .. //depot/projects/smpng/sys/arm/ti/ti_i2c.c#7 integrate .. //depot/projects/smpng/sys/arm/ti/ti_i2c.h#3 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/sam9260ek.dts#1 branch .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#32 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#16 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#40 integrate .. //depot/projects/smpng/sys/boot/mips/beri/boot2/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/mips/beri/loader/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#27 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#28 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#26 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#28 integrate .. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#24 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_iscsi.c#4 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_tpc.c#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#119 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#26 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#23 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#24 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#23 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#30 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/fm.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt.c#8 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt.h#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt_powerpc.c#5 delete .. //depot/projects/smpng/sys/cddl/dev/fbt/powerpc/fbt_isa.c#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/powerpc/fbt_isa.h#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/x86/fbt_isa.c#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/x86/fbt_isa.h#1 branch .. //depot/projects/smpng/sys/conf/Makefile.arm#50 integrate .. //depot/projects/smpng/sys/conf/NOTES#214 integrate .. //depot/projects/smpng/sys/conf/files#300 integrate .. //depot/projects/smpng/sys/conf/kern.mk#44 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#77 integrate .. //depot/projects/smpng/sys/conf/options#210 integrate .. //depot/projects/smpng/sys/ddb/db_run.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#28 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#28 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_netmap.c#2 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#41 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#48 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#23 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#38 integrate .. //depot/projects/smpng/sys/dev/iscsi/icl.c#6 integrate .. //depot/projects/smpng/sys/dev/iscsi/icl_proxy.c#3 integrate .. //depot/projects/smpng/sys/dev/iscsi/iscsi.c#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#44 integrate .. //depot/projects/smpng/sys/dev/netmap/if_em_netmap.h#9 integrate .. //depot/projects/smpng/sys/dev/netmap/if_igb_netmap.h#10 integrate .. //depot/projects/smpng/sys/dev/netmap/if_lem_netmap.h#8 integrate .. //depot/projects/smpng/sys/dev/netmap/if_re_netmap.h#9 integrate .. //depot/projects/smpng/sys/dev/netmap/if_vtnet_netmap.h#1 branch .. //depot/projects/smpng/sys/dev/netmap/ixgbe_netmap.h#10 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap.c#14 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_freebsd.c#6 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_generic.c#5 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_kern.h#14 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mbq.h#4 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mem2.c#12 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mem2.h#5 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_monitor.c#1 branch .. //depot/projects/smpng/sys/dev/netmap/netmap_offloadings.c#2 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_pipe.c#3 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_vale.c#5 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#141 integrate .. //depot/projects/smpng/sys/dev/pci/pci_if.m#13 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#34 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#44 integrate .. //depot/projects/smpng/sys/dev/si/si.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#53 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#192 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#9 integrate .. //depot/projects/smpng/sys/dev/virtio/network/if_vtnet.c#15 integrate .. //depot/projects/smpng/sys/dev/virtio/virtqueue.c#9 integrate .. //depot/projects/smpng/sys/dev/vt/font/vt_mouse_cursor.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/hw/vga/vt_vga.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt.h#6 integrate .. //depot/projects/smpng/sys/dev/vt/vt_buf.c#4 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#6 integrate .. //depot/projects/smpng/sys/dev/vt/vt_sysmouse.c#5 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs.c#1 branch .. //depot/projects/smpng/sys/fs/autofs/autofs.h#4 branch .. //depot/projects/smpng/sys/fs/autofs/autofs_ioctl.h#1 branch .. //depot/projects/smpng/sys/fs/autofs/autofs_vfsops.c#4 branch .. //depot/projects/smpng/sys/fs/autofs/autofs_vnops.c#4 branch .. //depot/projects/smpng/sys/geom/geom_dev.c#68 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sam9260ek_common.dtsi#1 branch .. //depot/projects/smpng/sys/i386/conf/NOTES#171 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#175 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#38 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#153 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#167 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#76 integrate .. //depot/projects/smpng/sys/kern/uipc_shm.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#158 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#122 integrate .. //depot/projects/smpng/sys/libkern/strndup.c#1 branch .. //depot/projects/smpng/sys/modules/Makefile#205 integrate .. //depot/projects/smpng/sys/modules/autofs/Makefile#4 branch .. //depot/projects/smpng/sys/modules/dtrace/fbt/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/si/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wds/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wl/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#158 integrate .. //depot/projects/smpng/sys/net/if_gre.c#55 integrate .. //depot/projects/smpng/sys/net/if_stf.c#63 integrate .. //depot/projects/smpng/sys/net/netmap.h#12 integrate .. //depot/projects/smpng/sys/net/netmap_user.h#12 integrate .. //depot/projects/smpng/sys/net/paravirt.h#1 branch .. //depot/projects/smpng/sys/net/pfvar.h#6 integrate .. //depot/projects/smpng/sys/net/rtsock.c#99 integrate .. //depot/projects/smpng/sys/net/sff8436.h#1 branch .. //depot/projects/smpng/sys/net/sff8472.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.c#11 integrate .. //depot/projects/smpng/sys/netinet/cc/cc_cdg.c#3 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#38 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#60 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#86 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#58 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#106 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#28 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#53 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#64 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#37 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#41 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#56 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#64 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#34 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#52 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#60 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#30 integrate .. //depot/projects/smpng/sys/netipsec/keysock.h#9 integrate .. //depot/projects/smpng/sys/netpfil/pf/if_pfsync.c#10 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.c#12 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.h#3 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf_ioctl.c#8 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf_lb.c#7 integrate .. //depot/projects/smpng/sys/ofed/include/linux/pci.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#27 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#112 integrate .. //depot/projects/smpng/sys/sys/_cpuset.h#5 integrate .. //depot/projects/smpng/sys/sys/callout.h#21 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#31 integrate .. //depot/projects/smpng/sys/sys/hhook.h#5 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#21 integrate .. //depot/projects/smpng/sys/sys/khelp.h#4 integrate .. //depot/projects/smpng/sys/sys/libkern.h#37 integrate .. //depot/projects/smpng/sys/sys/mount.h#94 integrate .. //depot/projects/smpng/sys/sys/param.h#193 integrate .. //depot/projects/smpng/sys/sys/protosw.h#29 integrate .. //depot/projects/smpng/sys/sys/sf_buf.h#11 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#76 integrate .. //depot/projects/smpng/sys/sys/time.h#42 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#138 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#96 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#101 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#84 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/timeout.9#11 (text+ko) ==== @@ -27,9 +27,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/timeout.9 268817 2014-07-17 23:14:47Z delphij $ +.\" $FreeBSD: head/share/man/man9/timeout.9 270251 2014-08-20 23:29:34Z gavin $ .\" -.Dd July 17, 2014 +.Dd August 21, 2014 .Dt TIMEOUT 9 .Os .Sh NAME @@ -74,7 +74,7 @@ .Fn callout_init "struct callout *c" "int mpsafe" .Ft void .Fn callout_init_mtx "struct callout *c" "struct mtx *mtx" "int flags" -.Fn void +.Ft void .Fn callout_init_rm "struct callout *c" "struct rmlock *rm" "int flags" .Ft void .Fn callout_init_rw "struct callout *c" "struct rwlock *rw" "int flags" @@ -103,6 +103,7 @@ .Fn callout_pending "struct callout *c" .Ft int .Fn callout_active "struct callout *c" +.Ft void .Fn callout_deactivate "struct callout *c" .Sh DESCRIPTION The function ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#139 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 269759 2014-08-09 17:13:02Z alc $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270151 2014-08-18 20:28:08Z alc $"); /* * Manages physical address maps. @@ -4201,9 +4201,10 @@ mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va), nosleep ? NULL : &lock); if (mpte == NULL && nosleep) { - KASSERT(lock == NULL, ("lock leaked for nosleep")); + if (lock != NULL) + rw_wunlock(lock); + rw_runlock(&pvh_global_lock); PMAP_UNLOCK(pmap); - rw_runlock(&pvh_global_lock); return (KERN_RESOURCE_SHORTAGE); } goto retry; ==== //depot/projects/smpng/sys/amd64/conf/NOTES#79 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: head/sys/amd64/conf/NOTES 268069 2014-07-01 00:22:54Z emaste $ +# $FreeBSD: head/sys/amd64/conf/NOTES 270224 2014-08-20 16:07:17Z jhb $ # # @@ -307,7 +307,8 @@ # Requires the ipw firmware module # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # Requires the iwi firmware module -# iwn: Intel Wireless WiFi Link 4965/1000/5000/6000 802.11 network adapters +# iwn: Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn +# 802.11 network adapters # Requires the iwn firmware module # mlx4ib: Mellanox ConnectX HCA InfiniBand # mlxen: Mellanox ConnectX HCA Ethernet @@ -347,12 +348,18 @@ # iwiibssfw: IBSS mode firmware # iwimonitorfw: Monitor mode firmware # Intel Wireless WiFi Link 4965/1000/5000/6000 series firmware: -# iwnfw: Single module to support the 4965/1000/5000/5150/6000 +# iwnfw: Single module to support all devices +# iwn1000fw: Specific module for the 1000 only +# iwn105fw: Specific module for the 105 only +# iwn135fw: Specific module for the 135 only +# iwn2000fw: Specific module for the 2000 only +# iwn2030fw: Specific module for the 2030 only # iwn4965fw: Specific module for the 4965 only -# iwn1000fw: Specific module for the 1000 only # iwn5000fw: Specific module for the 5000 only # iwn5150fw: Specific module for the 5150 only # iwn6000fw: Specific module for the 6000 only +# iwn6000g2afw: Specific module for the 6000g2a only +# iwn6000g2bfw: Specific module for the 6000g2b only # iwn6050fw: Specific module for the 6050 only # wpifw: Intel 3945ABG Wireless LAN Controller firmware @@ -365,11 +372,17 @@ device ipwibssfw device ipwmonitorfw device iwnfw +device iwn1000fw +device iwn105fw +device iwn135fw +device iwn2000fw +device iwn2030fw device iwn4965fw -device iwn1000fw device iwn5000fw device iwn5150fw device iwn6000fw +device iwn6000g2afw +device iwn6000g2bfw device iwn6050fw device wpifw @@ -508,7 +521,7 @@ device smbios device vpd device asmc -#device si +device si device tpm device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG ==== //depot/projects/smpng/sys/amd64/include/param.h#35 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: head/sys/amd64/include/param.h 266093 2014-05-14 22:24:09Z neel $ + * $FreeBSD: head/sys/amd64/include/param.h 270223 2014-08-20 16:06:24Z jhb $ */ @@ -65,7 +65,7 @@ #if defined(SMP) || defined(KLD_MODULE) #ifndef MAXCPU -#define MAXCPU 64 +#define MAXCPU 256 #endif #else #define MAXCPU 1 ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#25 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: head/sys/amd64/include/vmparam.h 257854 2013-11-08 16:25:00Z alc $ + * $FreeBSD: head/sys/amd64/include/vmparam.h 270202 2014-08-20 08:07:08Z kib $ */ @@ -87,7 +87,7 @@ * largest physical address that is accessible by ISA DMA is split * into two PHYSSEG entries. */ -#define VM_PHYSSEG_MAX 31 +#define VM_PHYSSEG_MAX 63 /* * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool ==== //depot/projects/smpng/sys/amd64/vmm/intel/vtd.c#6 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vtd.c 264009 2014-04-01 15:54:03Z rstone $ + * $FreeBSD: head/sys/amd64/vmm/intel/vtd.c 269962 2014-08-14 05:00:45Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vtd.c 264009 2014-04-01 15:54:03Z rstone $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vtd.c 269962 2014-08-14 05:00:45Z neel $"); #include #include @@ -448,6 +448,11 @@ ptpindex = 0; ptpshift = 0; + KASSERT(gpa + len > gpa, ("%s: invalid gpa range %#lx/%#lx", __func__, + gpa, len)); + KASSERT(gpa + len <= dom->maxaddr, ("%s: gpa range %#lx/%#lx beyond " + "domain maxaddr %#lx", __func__, gpa, len, dom->maxaddr)); + if (gpa & PAGE_MASK) panic("vtd_create_mapping: unaligned gpa 0x%0lx", gpa); ==== //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 266572 2014-05-23 05:04:50Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 269989 2014-08-14 18:03:38Z neel $"); #include #include @@ -195,26 +195,29 @@ atpic->mask, atpic->request, atpic->service); /* + * From Section 3.6.2, "Interrupt Modes", in the + * MPtable Specification, Version 1.4 + * * PIC interrupts are routed to both the Local APIC * and the I/O APIC to support operation in 1 of 3 * modes. * * 1. Legacy PIC Mode: the PIC effectively bypasses - * all APIC components. In mode '1' the local APIC is + * all APIC components. In this mode the local APIC is * disabled and LINT0 is reconfigured as INTR to * deliver the PIC interrupt directly to the CPU. * * 2. Virtual Wire Mode: the APIC is treated as a * virtual wire which delivers interrupts from the PIC - * to the CPU. In mode '2' LINT0 is programmed as + * to the CPU. In this mode LINT0 is programmed as * ExtINT to indicate that the PIC is the source of * the interrupt. * - * 3. Symmetric I/O Mode: PIC interrupts are fielded - * by the I/O APIC and delivered to the appropriate - * CPU. In mode '3' the I/O APIC input 0 is - * programmed as ExtINT to indicate that the PIC is - * the source of the interrupt. + * 3. Virtual Wire Mode via I/O APIC: PIC interrupts are + * fielded by the I/O APIC and delivered to the appropriate + * CPU. In this mode the I/O APIC input 0 is programmed + * as ExtINT to indicate that the PIC is the source of the + * interrupt. */ atpic->intr_raised = true; lapic_set_local_intr(vatpic->vm, -1, APIC_LVT_LINT0); ==== //depot/projects/smpng/sys/amd64/vmm/vmm.c#13 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm.c 269109 2014-07-26 02:53:51Z neel $ + * $FreeBSD: head/sys/amd64/vmm/vmm.c 269962 2014-08-14 05:00:45Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 269109 2014-07-26 02:53:51Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 269962 2014-08-14 05:00:45Z neel $"); #include #include @@ -572,6 +572,21 @@ return (0); } +static vm_paddr_t +vm_maxmem(struct vm *vm) +{ + int i; + vm_paddr_t gpa, maxmem; + + maxmem = 0; + for (i = 0; i < vm->num_mem_segs; i++) { + gpa = vm->mem_segs[i].gpa + vm->mem_segs[i].len; + if (gpa > maxmem) + maxmem = gpa; + } + return (maxmem); +} + static void vm_gpa_unwire(struct vm *vm) { @@ -709,7 +724,7 @@ if (ppt_assigned_devices(vm) == 0) { KASSERT(vm->iommu == NULL, ("vm_assign_pptdev: iommu must be NULL")); - maxaddr = vmm_mem_maxaddr(); + maxaddr = vm_maxmem(vm); vm->iommu = iommu_create_domain(maxaddr); error = vm_gpa_wire(vm); ==== //depot/projects/smpng/sys/arm/arm/disassem.c#7 (text+ko) ==== @@ -48,13 +48,14 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/disassem.c 248119 2013-03-09 23:55:23Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/disassem.c 269956 2014-08-14 04:20:13Z imp $"); #include #include #include #include +#include #include /* @@ -130,7 +131,7 @@ { 0x0c500000, 0x04100000, "ldr", "daW" }, { 0x0c500000, 0x04400000, "strb", "daW" }, { 0x0c500000, 0x04500000, "ldrb", "daW" }, -#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) +#if __ARM_ARCH >= 6 { 0xffffffff, 0xf57ff01f, "clrex", "c" }, { 0x0ff00ff0, 0x01800f90, "strex", "dmo" }, { 0x0ff00fff, 0x01900f9f, "ldrex", "do" }, ==== //depot/projects/smpng/sys/arm/arm/elf_machdep.c#22 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/elf_machdep.c 269767 2014-08-09 22:51:26Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/elf_machdep.c 270124 2014-08-18 02:45:06Z imp $"); #include #include @@ -46,6 +46,8 @@ #include #include +static boolean_t elf32_arm_abi_supported(struct image_params *); + struct sysentvec elf32_freebsd_sysvec = { .sv_size = SYS_MAXSYSCALL, .sv_table = sysent, @@ -90,29 +92,42 @@ .sysvec = &elf32_freebsd_sysvec, .interp_newpath = NULL, .brand_note = &elf32_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE, + .header_supported= elf32_arm_abi_supported, }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); -static Elf32_Brandinfo freebsd_brand_oinfo = { - .brand = ELFOSABI_FREEBSD, - .machine = EM_ARM, - .compat_3_brand = "FreeBSD", - .emul_path = NULL, - .interp_path = "/usr/libexec/ld-elf.so.1", - .sysvec = &elf32_freebsd_sysvec, - .interp_newpath = NULL, - .brand_note = &elf32_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE -}; +static boolean_t +elf32_arm_abi_supported(struct image_params *imgp) +{ + const Elf_Ehdr *hdr = (const Elf_Ehdr *)imgp->image_header; -SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, - (sysinit_cfunc_t) elf32_insert_brand_entry, - &freebsd_brand_oinfo); - +#ifdef __ARM_EABI__ + /* + * When configured for EABI, FreeBSD supports EABI vesions 4 and 5. + */ + if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) { + if (bootverbose) + uprintf("Attempting to execute non EABI binary (rev %d) image %s", + EF_ARM_EABI_VERSION(hdr->e_flags), imgp->args->fname); + return (FALSE); + } +#else + /* + * When configured for OABI, that's all we do, so reject EABI binaries. + */ + if (EF_ARM_EABI_VERSION(hdr->e_flags) != EF_ARM_EABI_VERSION_UNKNOWN) { + if (bootverbose) + uprintf("Attempting to execute EABI binary (rev %d) image %s", + EF_ARM_EABI_VERSION(hdr->e_flags), imgp->args->fname); + return (FALSE); + } +#endif + return (TRUE); +} void elf32_dump_thread(struct thread *td __unused, void *dst __unused, ==== //depot/projects/smpng/sys/arm/arm/nexus.c#24 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269606 2014-08-05 19:06:45Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -362,4 +362,3 @@ return (interrupt); } #endif - ==== //depot/projects/smpng/sys/arm/at91/at91.c#32 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91.c 262925 2014-03-08 06:06:50Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91.c 269960 2014-08-14 04:21:31Z imp $"); #include #include @@ -255,7 +255,7 @@ { int i; - for (i = 1; walker->name; i++, walker++) { + for (i = 0; walker->name; i++, walker++) { at91_add_child(dev, i, walker->name, walker->unit, walker->mem_base, walker->mem_len, walker->irq0, walker->irq1, walker->irq2); ==== //depot/projects/smpng/sys/arm/at91/at91_aic.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_aic.c 262925 2014-03-08 06:06:50Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_aic.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -176,13 +176,9 @@ static devclass_t at91_aic_devclass; #ifdef FDT -DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); #else -DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); #endif -/* not yet -EARLY_DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, - NULL, NULL, BUS_PASS_INTERRUPT); -*/ ==== //depot/projects/smpng/sys/arm/at91/at91_machdep.c#19 (text+ko) ==== @@ -43,8 +43,10 @@ * Created : 17/09/94 */ +#include "opt_platform.h" + #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_machdep.c 265852 2014-05-10 20:03:03Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_machdep.c 270104 2014-08-17 16:53:14Z imp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -111,8 +113,12 @@ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) +extern struct bus_space at91_bs_tag; + struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; +extern uint32_t at91_master_clock; + /* Static device mappings. */ const struct arm_devmap_entry at91_devmap[] = { /* @@ -194,15 +200,6 @@ { 0, 0, 0, 0, 0, } }; -/* Physical and virtual addresses for some global pages */ - -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; - #ifdef LINUX_BOOT_ABI extern int membanks; extern int memstart[]; @@ -444,6 +441,16 @@ } #endif +#ifndef FDT +/* Physical and virtual addresses for some global pages */ + +struct pv_addr msgbufpv; +struct pv_addr kernelstack; +struct pv_addr systempage; +struct pv_addr irqstack; +struct pv_addr abtstack; +struct pv_addr undstack; + void * initarm(struct arm_boot_params *abp) { @@ -651,6 +658,7 @@ return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } +#endif /* * These functions are handled elsewhere, so make them nops here. ==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#24 (text+ko) ==== @@ -28,7 +28,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_mci.c 261681 2014-02-09 20:55:49Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_mci.c 270154 2014-08-18 21:04:35Z imp $"); #include #include @@ -1210,10 +1210,11 @@ */ if (cmd->opcode != 8) { device_printf(sc->dev, - "IO error; status MCI_SR = 0x%x cmd opcode = %d%s\n", - sr, cmd->opcode, + "IO error; status MCI_SR = 0x%b cmd opcode = %d%s\n", + sr, MCI_SR_BITSTRING, cmd->opcode, (cmd->opcode != 12) ? "" : (sc->flags & CMD_MULTIREAD) ? " after read" : " after write"); + /* XXX not sure RTOE needs a full reset, just a retry */ at91_mci_reset(sc); } at91_mci_next_operation(sc); ==== //depot/projects/smpng/sys/arm/at91/at91_mcireg.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: head/sys/arm/at91/at91_mcireg.h 234560 2012-04-22 00:43:32Z marius $ */ +/* $FreeBSD: head/sys/arm/at91/at91_mcireg.h 270006 2014-08-14 23:17:33Z imp $ */ #ifndef ARM_AT91_AT91_MCIREG_H #define ARM_AT91_AT91_MCIREG_H @@ -118,6 +118,30 @@ #define MCI_SR_OVRE (0x1u << 30) /* (MCI) Overrun flag */ #define MCI_SR_UNRE (0x1u << 31) /* (MCI) Underrun flag */ +/* TXRDY,DTIP,ENDTX,TXBUFE,RTOE */ + +#define MCI_SR_BITSTRING \ + "\020" \ + "\001CMDRDY" \ + "\002RXRDY" \ + "\003TXRDY" \ + "\004BLKE" \ + "\005DTIP" \ + "\006NOTBUSY" \ + "\007ENDRX" \ + "\010ENDTX" \ + "\017RXBUFF" \ + "\020TXBUFE" \ + "\021RINDE" \ + "\022RDIRE" \ + "\023RCRCE" \ + "\024RENDE" \ + "\025RTOE" \ + "\026DCRCE" \ + "\027DTOE" \ + "\037OVRE" \ + "\040UNRE" + /* -------- MCI_IER : (MCI Offset: 0x44) MCI Interrupt Enable Register -------- */ /* -------- MCI_IDR : (MCI Offset: 0x48) MCI Interrupt Disable Register -------- */ /* -------- MCI_IMR : (MCI Offset: 0x4c) MCI Interrupt Mask Register -------- */ ==== //depot/projects/smpng/sys/arm/at91/at91_pio.c#15 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 261682 2014-02-09 20:56:39Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 270025 2014-08-15 16:08:52Z imp $"); #include #include @@ -591,6 +591,17 @@ } void +at91_pio_gpio_pullup(uint32_t pio, uint32_t data_mask, int do_pullup) +{ + uint32_t *PIO = (uint32_t *)(AT91_BASE + pio); + + if (do_pullup) + PIO[PIO_PUER / 4] = data_mask; + else + PIO[PIO_PUDR / 4] = data_mask; +} + +void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt) { @@ -611,12 +622,21 @@ return (PIO[PIO_ISR / 4]); } +static void +at91_pio_new_pass(device_t dev) +{ + + device_printf(dev, "Pass %d\n", bus_current_pass); +} + static device_method_t at91_pio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_pio_probe), DEVMETHOD(device_attach, at91_pio_attach), DEVMETHOD(device_detach, at91_pio_detach), + DEVMETHOD(bus_new_pass, at91_pio_new_pass), + DEVMETHOD_END }; @@ -626,10 +646,5 @@ sizeof(struct at91_pio_softc), }; -#ifdef FDT -DRIVER_MODULE(at91_pio, simplebus, at91_pio_driver, at91_pio_devclass, NULL, - NULL); -#else -DRIVER_MODULE(at91_pio, atmelarm, at91_pio_driver, at91_pio_devclass, NULL, - NULL); -#endif +EARLY_DRIVER_MODULE(at91_pio, at91_pinctrl, at91_pio_driver, at91_pio_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); ==== //depot/projects/smpng/sys/arm/at91/at91_piovar.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: head/sys/arm/at91/at91_piovar.h 249232 2013-04-07 13:03:57Z hselasky $ */ +/* $FreeBSD: head/sys/arm/at91/at91_piovar.h 270025 2014-08-15 16:08:52Z imp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H #define ARM_AT91_AT91_PIOVAR_H @@ -45,5 +45,6 @@ void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt); uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio); +void at91_pio_gpio_pullup(uint32_t pio, uint32_t data_mask, int do_pullup); #endif /* ARM_AT91_AT91_PIOVAR_H */ ==== //depot/projects/smpng/sys/arm/at91/at91_pit.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pit.c 261683 2014-02-09 20:57:26Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pit.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -214,9 +214,9 @@ static devclass_t at91_pit_devclass; #ifdef FDT -DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass, + NULL, NULL, BUS_PASS_TIMER); #else -DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass, + NULL, NULL, BUS_PASS_TIMER); #endif ==== //depot/projects/smpng/sys/arm/at91/at91_pmc.c#20 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pmc.c 261684 2014-02-09 20:58:03Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pmc.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -709,9 +709,9 @@ static devclass_t at91_pmc_devclass; #ifdef FDT -DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass, + NULL, NULL, BUS_PASS_CPU); #else -DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, + NULL, NULL, BUS_PASS_CPU); #endif ==== //depot/projects/smpng/sys/arm/at91/at91sam9260.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91sam9260.c 260696 2014-01-15 19:53:36Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91sam9260.c 269960 2014-08-14 04:21:31Z imp $"); #include #include @@ -103,6 +103,7 @@ static const struct cpu_devs at91_devs[] = { + DEVICE("at91_aic", AIC, 0), DEVICE("at91_pmc", PMC, 0), DEVICE("at91_wdt", WDT, 0), DEVICE("at91_rst", RSTC, 0), ==== //depot/projects/smpng/sys/arm/at91/at91sam9260reg.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: head/sys/arm/at91/at91sam9260reg.h 261353 2014-02-01 17:53:35Z imp $ */ +/* $FreeBSD: head/sys/arm/at91/at91sam9260reg.h 269960 2014-08-14 04:21:31Z imp $ */ #ifndef AT91SAM9260REG_H_ #define AT91SAM9260REG_H_ @@ -220,6 +220,7 @@ #define AT91SAM9260_IRQ_RSTC AT91SAM9260_IRQ_SYSTEM #define AT91SAM9260_IRQ_OHCI AT91SAM9260_IRQ_UHP #define AT91SAM9260_IRQ_NAND (-1) +#define AT91SAM9260_IRQ_AIC (-1) #define AT91SAM9260_AIC_BASE 0xffff000 >>> TRUNCATED FOR MAIL (1000 lines) <<<