Date: Mon, 8 Sep 2014 04:49:21 GMT From: John-Mark Gurney <jmg@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 1198736 for review Message-ID: <201409080449.s884nL4N020796@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@1198736?ac=10 Change 1198736 by jmg@jmg_carbon2 on 2014/08/14 19:53:34 integrate from 1198731 Affected files ... .. //depot/projects/opencrypto/share/man/man4/iwn.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/opencrypto/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/intel/vtd.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/io/vatpic.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/vmm.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_aic.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_common.c#1 branch .. //depot/projects/opencrypto/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_pit.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91sam9260.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91sam9260reg.h#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/files.at91#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/std.atmel#2 integrate .. //depot/projects/opencrypto/sys/arm/include/acle-compat.h#1 branch .. //depot/projects/opencrypto/sys/arm/include/param.h#2 integrate .. //depot/projects/opencrypto/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/opencrypto/sys/conf/Makefile.arm#3 integrate .. //depot/projects/opencrypto/sys/conf/files#5 integrate .. //depot/projects/opencrypto/sys/conf/kern.mk#2 integrate .. //depot/projects/opencrypto/sys/ddb/db_run.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/opencrypto/sys/i386/conf/NOTES#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/opencrypto/sys/net/pfvar.h#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.c#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.h#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf_ioctl.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_fault.c#3 integrate Differences ... ==== //depot/projects/opencrypto/share/man/man4/iwn.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/iwn.4 267938 2014-06-26 21:46:14Z bapt $ +.\" $FreeBSD: head/share/man/man4/iwn.4 270000 2014-08-14 19:15:20Z gavin $ .\" -.Dd May 28, 2014 +.Dd August 14, 2014 .Dt IWN 4 .Os .Sh NAME @@ -46,6 +46,8 @@ Choose one from: .Bd -ragged -offset indent .Cd "device iwn1000fw" +.Cd "device iwn105fw" +.Cd "device iwn135fw" .Cd "device iwn2000fw" .Cd "device iwn2030fw" .Cd "device iwn4965fw" @@ -70,6 +72,8 @@ .Bd -literal -offset indent if_iwn_load="YES" iwn1000fw_load="YES" +iwn105fw_load="YES" +iwn135fw_load="YES" iwn2000fw_load="YES" iwn2030fw_load="YES" iwn4965fw_load="YES" @@ -89,11 +93,13 @@ .It Intel Centrino Advanced-N 6200 .It Intel Centrino Advanced-N 6205 .It Intel Centrino Advanced-N 6230 +.It Intel Centrino Advanced-N 6235 .It Intel Centrino Advanced-N + WiMAX 6250 .It Intel Centrino Ultimate-N 6300 .It Intel Centrino Wireless-N 100 .It Intel Centrino Wireless-N 105 .It Intel Centrino Wireless-N 130 +.It Intel Centrino Wireless-N 135 .It Intel Centrino Wireless-N 1000 .It Intel Centrino Wireless-N 1030 .It Intel Centrino Wireless-N 2200 ==== //depot/projects/opencrypto/share/man/man4/iwnfw.4#2 (text+ko) ==== @@ -20,9 +20,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/iwnfw.4 261702 2014-02-09 22:43:16Z brueffer $ +.\" $FreeBSD: head/share/man/man4/iwnfw.4 269999 2014-08-14 19:14:24Z gavin $ .\" -.Dd February 9, 2014 +.Dd August 14, 2014 .Dt IWNFW 4 .Os .Sh NAME @@ -36,11 +36,15 @@ .Cd "device iwnfw" .Ed .Pp -This will include three firmware images inside the kernel. +This will include firmware images for all +.Xr iwn 4 +devices inside the kernel. If you want to pick only the firmware image for your network adapter choose one of the following: .Bd -ragged -offset indent .Cd "device iwn1000fw" +.Cd "device iwn105fw" +.Cd "device iwn135fw" .Cd "device iwn2000fw" .Cd "device iwn2030fw" .Cd "device iwn4965fw" @@ -57,6 +61,8 @@ .Xr loader.conf 5 : .Bd -literal -offset indent iwn1000fw_load="YES" +iwn105fw_load="YES" +iwn135fw_load="YES" iwn2000fw_load="YES" iwn2030fw_load="YES" iwn4965fw_load="YES" @@ -69,7 +75,7 @@ .Ed .Sh DESCRIPTION This module provides access to firmware sets for the -Intel Wireless WiFi Link 1000, 2000, 2030, 4965, 5000 and 6000 series of +Intel Wireless WiFi Link 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000 series of IEEE 802.11n adapters. It may be statically linked into the kernel, or loaded as a module. ==== //depot/projects/opencrypto/sys/amd64/conf/NOTES#2 (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 269992 2014-08-14 18:29:55Z gavin $ # # @@ -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 ==== //depot/projects/opencrypto/sys/amd64/vmm/intel/vtd.c#2 (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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/kernel.h> @@ -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/opencrypto/sys/amd64/vmm/io/vatpic.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/types.h> @@ -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/opencrypto/sys/amd64/vmm/vmm.c#2 (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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -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/opencrypto/sys/arm/arm/disassem.c#2 (text+ko) ==== @@ -48,13 +48,14 @@ */ #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> #include <machine/disassem.h> #include <machine/armreg.h> +#include <machine/acle-compat.h> #include <ddb/ddb.h> /* @@ -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/opencrypto/sys/arm/arm/nexus.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -362,4 +362,3 @@ return (interrupt); } #endif - ==== //depot/projects/opencrypto/sys/arm/at91/at91.c#2 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -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/opencrypto/sys/arm/at91/at91_aic.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include "opt_platform.h" #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/bus.h> @@ -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/opencrypto/sys/arm/at91/at91_machdep.c#2 (text+ko) ==== @@ -43,8 +43,10 @@ * Created : 17/09/94 */ +#include "opt_platform.h" + #include <sys/cdefs.h> -__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 269958 2014-08-14 04:21:20Z imp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -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]; +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/opencrypto/sys/arm/at91/at91_pit.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/bus.h> @@ -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/opencrypto/sys/arm/at91/at91_pmc.c#2 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -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/opencrypto/sys/arm/at91/at91sam9260.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__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 <sys/param.h> #include <sys/systm.h> @@ -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/opencrypto/sys/arm/at91/at91sam9260reg.h#2 (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 #define AT91SAM9260_AIC_SIZE 0x200 ==== //depot/projects/opencrypto/sys/arm/at91/files.at91#2 (text) ==== @@ -1,30 +1,36 @@ -# $FreeBSD: head/sys/arm/at91/files.at91 262979 2014-03-10 18:10:09Z ian $ +# $FreeBSD: head/sys/arm/at91/files.at91 269957 2014-08-14 04:21:14Z imp $ arm/arm/cpufunc_asm_arm9.S standard arm/at91/at91_machdep.c standard arm/at91/at91_aic.c standard arm/at91/at91.c standard +arm/at91/at91_aic.c standard +arm/at91/at91_pio.c standard +arm/at91/at91_pmc.c standard +arm/at91/at91_smc.c standard arm/at91/at91_cfata.c optional at91_cfata +arm/at91/at91_common.c optional fdt arm/at91/at91_mci.c optional at91_mci -dev/nand/nfc_at91.c optional nand -arm/at91/at91_pio.c standard -arm/at91/at91_pmc.c standard +arm/at91/at91_pinctrl.c optional fdt arm/at91/at91_pit.c optional at91sam9 arm/at91/at91_reset.S optional at91sam9 arm/at91/at91_rst.c optional at91sam9 arm/at91/at91_rtc.c optional at91_rtc -arm/at91/at91_smc.c standard +arm/at91/at91_sdramc.c optional fdt +arm/at91/at91_shdwc.c optional fdt arm/at91/at91_spi.c optional at91_spi \ dependency "spibus_if.h" arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_st.c optional at91rm9200 -arm/at91/at91_tc.c optional at91_tc +arm/at91/at91_tcb.c optional fdt arm/at91/at91_twi.c optional at91_twi arm/at91/at91_wdt.c optional at91_wdt arm/at91/if_ate.c optional ate arm/at91/if_macb.c optional macb -arm/at91/uart_bus_at91usart.c optional uart -arm/at91/uart_cpu_at91usart.c optional uart +arm/at91/uart_bus_at91usart.c optional uart ! fdt +arm/at91/uart_cpu_at91usart.c optional uart ! fdt arm/at91/uart_dev_at91usart.c optional uart +dev/uart/uart_cpu_fdt.c optional uart fdt +dev/nand/nfc_at91.c optional nand # # All the "systems on a chip" we support # @@ -54,5 +60,7 @@ # usb # dev/usb/controller/at91dci.c optional at91_dci -dev/usb/controller/at91dci_atmelarm.c optional at91_dci -dev/usb/controller/ohci_atmelarm.c optional ohci +dev/usb/controller/at91dci_atmelarm.c optional at91_dci !fdt +dev/usb/controller/ohci_atmelarm.c optional ohci !fdt +dev/usb/controller/at91dci_fdt.c optional at91_dci fdt +dev/usb/controller/ohci_fdt.c optional ohci fdt ==== //depot/projects/opencrypto/sys/arm/at91/std.atmel#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/at91/std.atmel 239362 2012-08-18 05:48:19Z andrew $ +# $FreeBSD: head/sys/arm/at91/std.atmel 269959 2014-08-14 04:21:25Z imp $ include "../at91/std.at91sam9" @@ -11,3 +11,5 @@ # bring in the sam specific timers and such device at91sam9 + +options ARM_DEVICE_MULTIPASS ==== //depot/projects/opencrypto/sys/arm/include/param.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: head/sys/arm/include/param.h 263637 2014-03-22 15:59:18Z andrew $ + * $FreeBSD: head/sys/arm/include/param.h 269956 2014-08-14 04:20:13Z imp $ */ #ifndef _ARM_INCLUDE_PARAM_H_ @@ -46,13 +46,14 @@ */ #include <machine/_align.h> +#include <machine/acle-compat.h> #define STACKALIGNBYTES (8 - 1) #define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) #define __PCI_REROUTE_INTERRUPT -#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) +#if __ARM_ARCH >= 6 #define _V6_SUFFIX "v6" #else #define _V6_SUFFIX "" @@ -64,7 +65,7 @@ #define _HF_SUFFIX "" #endif -#ifdef __ARMEB__ +#ifdef __ARM_BIG_ENDIAN #define _EB_SUFFIX "eb" #else #define _EB_SUFFIX "" ==== //depot/projects/opencrypto/sys/cam/ata/ata_da.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 268205 2014-07-03 05:22:13Z imp $"); +__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 269974 2014-08-14 13:57:17Z smh $"); #include "opt_ada.h" @@ -299,10 +299,10 @@ }, { /* - * Corsair Force GT SSDs + * Corsair Force GT & GS SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ - { T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force GT*", "*" }, + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force G*", "*" }, /*quirks*/ADA_Q_4K }, { @@ -443,6 +443,14 @@ }, { /* + * Samsung 840 SSDs + * 4k optimised + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 840*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* * SuperTalent TeraDrive CT SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ ==== //depot/projects/opencrypto/sys/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 267992 2014-06-28 03:56:17Z hselasky $"); +__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 269974 2014-08-14 13:57:17Z smh $"); #include <sys/param.h> @@ -967,10 +967,10 @@ }, { /* - * Corsair Force GT SSDs + * Corsair Force GT & GS SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ - { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force GT*", "*" }, + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force G*", "*" }, /*quirks*/DA_Q_4K }, { @@ -1111,6 +1111,14 @@ }, { /* + * Samsung 840 SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 840*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* * SuperTalent TeraDrive CT SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ ==== //depot/projects/opencrypto/sys/conf/Makefile.arm#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: head/sys/conf/Makefile.arm 269697 2014-08-08 01:21:52Z ian $ +# $FreeBSD: head/sys/conf/Makefile.arm 269957 2014-08-14 04:21:14Z imp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600012 +%VERSREQ= 600013 STD8X16FONT?= iso ==== //depot/projects/opencrypto/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/files 269567 2014-08-05 07:03:16Z hselasky $ +# $FreeBSD: head/sys/conf/files 269991 2014-08-14 18:16:27Z gavin $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1596,6 +1596,34 @@ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwn1000.fw" +iwn105fw.c optional iwn105fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn105.fw:iwn105fw -miwn105fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwn105fw.c" +iwn105fw.fwo optional iwn105fw | iwnfw \ + dependency "iwn105.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwn105fw.fwo" +iwn105.fw optional iwn105fw | iwnfw \ + dependency "$S/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwn105.fw" +iwn135fw.c optional iwn135fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn135.fw:iwn135fw -miwn135fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwn135fw.c" +iwn135fw.fwo optional iwn135fw | iwnfw \ + dependency "iwn135.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwn135fw.fwo" +iwn135.fw optional iwn135fw | iwnfw \ + dependency "$S/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwn135.fw" iwn2000fw.c optional iwn2000fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw -miwn2000fw -c${.TARGET}" \ no-implicit-rule before-depend local \ ==== //depot/projects/opencrypto/sys/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/kern.mk 268774 2014-07-16 20:37:03Z dim $ +# $FreeBSD: head/sys/conf/kern.mk 269981 2014-08-14 16:01:46Z imp $ # # Warning flags for compiling the kernel and components of the kernel: @@ -29,14 +29,17 @@ # enough to error out the whole kernel build. Display them anyway, so there is # some incentive to fix them eventually. CWARNEXTRA?= -Wno-error-tautological-compare -Wno-error-empty-body \ - -Wno-error-parentheses-equality -Wno-error-unused-function \ - ${NO_WFORMAT} + -Wno-error-parentheses-equality -Wno-error-unused-function +.endif + +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40300 +CWARNEXTRA?= -Wno-inline .endif # External compilers may not support our format extensions. Allow them # to be disabled. WARNING: format checking is disabled in this case. .if ${MK_FORMAT_EXTENSIONS} == "no" -NO_WFORMAT= -Wno-format +FORMAT_EXTENSIONS= -Wno-format .else FORMAT_EXTENSIONS= -fformat-extensions .endif ==== //depot/projects/opencrypto/sys/ddb/db_run.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/ddb/db_run.c 181175 2008-08-02 12:49:43Z cognet $"); +__FBSDID("$FreeBSD: head/sys/ddb/db_run.c 269982 2014-08-14 16:01:51Z imp $"); #include <sys/param.h> #include <sys/kdb.h> @@ -188,14 +188,14 @@ if ((db_run_mode == STEP_COUNT) || (db_run_mode == STEP_RETURN) || (db_run_mode == STEP_CALLT)) { - db_expr_t ins; - /* * We are about to execute this instruction, * so count it now. */ - - ins = db_get_value(pc, sizeof(int), FALSE); +#ifdef SOFTWARE_SSTEP + db_expr_t ins = +#endif + db_get_value(pc, sizeof(int), FALSE); db_inst_count++; db_load_count += inst_load(ins); db_store_count += inst_store(ins); ==== //depot/projects/opencrypto/sys/dev/cs/if_cs.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/cs/if_cs.c 267992 2014-06-28 03:56:17Z hselasky $"); +__FBSDID("$FreeBSD: head/sys/dev/cs/if_cs.c 269980 2014-08-14 16:01:38Z imp $"); /* * @@ -264,7 +264,7 @@ uint16_t id; char chip_revision; uint16_t eeprom_buff[CHKSUM_LEN]; - int chip_type, pp_isaint, pp_isadma; + int chip_type, pp_isaint; sc->dev = dev; error = cs_alloc_port(dev, 0, CS_89x0_IO_PORTS); @@ -299,11 +299,9 @@ if (chip_type == CS8900) { pp_isaint = PP_CS8900_ISAINT; - pp_isadma = PP_CS8900_ISADMA; sc->send_cmd = TX_CS8900_AFTER_ALL; } else { pp_isaint = PP_CS8920_ISAINT; - pp_isadma = PP_CS8920_ISADMA; sc->send_cmd = TX_CS8920_AFTER_ALL; } @@ -381,17 +379,6 @@ if (!(sc->flags & CS_NO_IRQ)) cs_writereg(sc, pp_isaint, irq); - /* - * Temporary disabled - * - if (drq>0) - cs_writereg(sc, pp_isadma, drq); - else { - device_printf(dev, "incorrect drq\n",); - return (0); - } - */ - if (bootverbose) device_printf(dev, "CS89%c0%s rev %c media%s%s%s\n", chip_type == CS8900 ? '0' : '2', @@ -702,7 +689,6 @@ { struct ifnet *ifp = sc->ifp; int status, length; - struct ether_header *eh; struct mbuf *m; #ifdef CS_DEBUG @@ -746,8 +732,6 @@ bus_read_multi_2(sc->port_res, RX_FRAME_PORT, mtod(m, uint16_t *), (length + 1) >> 1); - eh = mtod(m, struct ether_header *); - #ifdef CS_DEBUG for (i=0;i<length;i++) printf(" %02x",(unsigned char)*((char *)(m->m_data+i))); ==== //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 268917 2014-07-20 08:43:53Z adrian $*/ +/*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 269972 2014-08-14 13:25:05Z smh $*/ #include "opt_inet.h" @@ -317,7 +317,7 @@ ** doing so you are on your own :) */ static int allow_unsupported_sfp = FALSE; -TUNABLE_INT("hw.ixgbe.unsupported_sfp", &allow_unsupported_sfp); +TUNABLE_INT("hw.ix.unsupported_sfp", &allow_unsupported_sfp); /* ** HW RSC control: ==== //depot/projects/opencrypto/sys/i386/conf/NOTES#2 (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/i386/conf/NOTES 268069 2014-07-01 00:22:54Z emaste $ +# $FreeBSD: head/sys/i386/conf/NOTES 269992 2014-08-14 18:29:55Z gavin $ # >>> TRUNCATED FOR MAIL (1000 lines) <<<home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409080449.s884nL4N020796>