PERFORCE change 1199644 for review
John Baldwin
jhb at FreeBSD.org
Mon Sep 8 04:53:20 UTC 2014
http://p4web.freebsd.org/@@1199644?ac=10
Change 1199644 by jhb at jhb_pippin on 2014/09/01 13:51:59
IFC @1199642
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#129 integrate
.. //depot/projects/smpng/sys/amd64/amd64/support.S#28 integrate
.. //depot/projects/smpng/sys/amd64/include/pc/bios.h#9 integrate
.. //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#12 integrate
.. //depot/projects/smpng/sys/arm/arm/locore.S#34 integrate
.. //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#12 integrate
.. //depot/projects/smpng/sys/arm/conf/CNS11XXNAS#11 integrate
.. //depot/projects/smpng/sys/arm/conf/CUBIEBOARD#7 integrate
.. //depot/projects/smpng/sys/arm/conf/CUBIEBOARD2#5 integrate
.. //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#6 integrate
.. //depot/projects/smpng/sys/arm/conf/EB9200#7 integrate
.. //depot/projects/smpng/sys/arm/conf/EFIKA_MX#6 integrate
.. //depot/projects/smpng/sys/arm/conf/EXYNOS5.common#2 integrate
.. //depot/projects/smpng/sys/arm/conf/HL200#21 integrate
.. //depot/projects/smpng/sys/arm/conf/HL201#13 integrate
.. //depot/projects/smpng/sys/arm/conf/IMX53-QSB#5 integrate
.. //depot/projects/smpng/sys/arm/conf/IMX6#3 integrate
.. //depot/projects/smpng/sys/arm/conf/KB920X#31 integrate
.. //depot/projects/smpng/sys/arm/conf/NSLU#17 integrate
.. //depot/projects/smpng/sys/arm/conf/PANDABOARD#10 integrate
.. //depot/projects/smpng/sys/arm/conf/QILA9G20#12 integrate
.. //depot/projects/smpng/sys/arm/conf/RK3188#2 integrate
.. //depot/projects/smpng/sys/arm/conf/SAM9G20EK#12 integrate
.. //depot/projects/smpng/sys/arm/conf/SAM9X25EK#9 integrate
.. //depot/projects/smpng/sys/arm/conf/SN9G45#8 integrate
.. //depot/projects/smpng/sys/arm/conf/VYBRID#3 integrate
.. //depot/projects/smpng/sys/arm/conf/WANDBOARD-DUAL#3 integrate
.. //depot/projects/smpng/sys/arm/conf/WANDBOARD-QUAD#3 integrate
.. //depot/projects/smpng/sys/arm/conf/WANDBOARD-SOLO#3 integrate
.. //depot/projects/smpng/sys/arm/conf/ZEDBOARD#7 integrate
.. //depot/projects/smpng/sys/arm/include/cpuconf.h#18 integrate
.. //depot/projects/smpng/sys/arm/include/intr.h#21 integrate
.. //depot/projects/smpng/sys/cam/ata/ata_all.c#14 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#10 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kmem.h#11 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#12 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#34 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#100 integrate
.. //depot/projects/smpng/sys/conf/files#302 integrate
.. //depot/projects/smpng/sys/dev/ae/if_ae.c#21 integrate
.. //depot/projects/smpng/sys/dev/age/if_age.c#23 integrate
.. //depot/projects/smpng/sys/dev/ahci/ahci.c#37 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alc.c#23 integrate
.. //depot/projects/smpng/sys/dev/ale/if_ale.c#20 integrate
.. //depot/projects/smpng/sys/dev/altera/atse/if_atse.c#4 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#40 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#136 integrate
.. //depot/projects/smpng/sys/dev/bktr/CHANGELOG.TXT#8 integrate
.. //depot/projects/smpng/sys/dev/bxe/bxe.c#8 integrate
.. //depot/projects/smpng/sys/dev/cas/if_cas.c#18 integrate
.. //depot/projects/smpng/sys/dev/dc/if_dc.c#34 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_em.c#42 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_igb.c#49 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_lem.c#24 integrate
.. //depot/projects/smpng/sys/dev/ffec/if_ffec.c#6 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#41 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#109 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#52 integrate
.. //depot/projects/smpng/sys/dev/gxemul/ether/if_gx.c#4 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#43 integrate
.. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#6 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#73 integrate
.. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#30 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#45 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#23 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixv.c#12 integrate
.. //depot/projects/smpng/sys/dev/ixl/if_ixl.c#2 integrate
.. //depot/projects/smpng/sys/dev/ixl/if_ixlv.c#2 integrate
.. //depot/projects/smpng/sys/dev/jme/if_jme.c#20 integrate
.. //depot/projects/smpng/sys/dev/le/lance.c#10 integrate
.. //depot/projects/smpng/sys/dev/mii/mii.c#29 integrate
.. //depot/projects/smpng/sys/dev/msk/if_msk.c#42 integrate
.. //depot/projects/smpng/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c#3 integrate
.. //depot/projects/smpng/sys/dev/netmap/netmap_kern.h#15 integrate
.. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#35 integrate
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#64 integrate
.. //depot/projects/smpng/sys/dev/qlxgb/qla_os.c#9 integrate
.. //depot/projects/smpng/sys/dev/qlxgbe/ql_os.c#6 integrate
.. //depot/projects/smpng/sys/dev/qlxge/qls_os.c#5 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#106 integrate
.. //depot/projects/smpng/sys/dev/rt/if_rt.c#8 integrate
.. //depot/projects/smpng/sys/dev/sdhci/sdhci.c#20 integrate
.. //depot/projects/smpng/sys/dev/sdhci/sdhci.h#8 integrate
.. //depot/projects/smpng/sys/dev/sdhci/sdhci_fdt.c#4 integrate
.. //depot/projects/smpng/sys/dev/sdhci/sdhci_if.m#4 integrate
.. //depot/projects/smpng/sys/dev/sdhci/sdhci_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/sf/if_sf.c#13 integrate
.. //depot/projects/smpng/sys/dev/sge/if_sge.c#11 integrate
.. //depot/projects/smpng/sys/dev/sis/if_sis.c#21 integrate
.. //depot/projects/smpng/sys/dev/sk/if_sk.c#31 integrate
.. //depot/projects/smpng/sys/dev/ste/if_ste.c#15 integrate
.. //depot/projects/smpng/sys/dev/stge/if_stge.c#26 integrate
.. //depot/projects/smpng/sys/dev/txp/if_txp.c#47 integrate
.. //depot/projects/smpng/sys/dev/vge/if_vge.c#39 integrate
.. //depot/projects/smpng/sys/dev/virtio/network/if_vtnet.c#16 integrate
.. //depot/projects/smpng/sys/dev/vr/if_vr.c#18 integrate
.. //depot/projects/smpng/sys/dev/vxge/vxge.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/db_disasm.c#10 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#191 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#154 integrate
.. //depot/projects/smpng/sys/i386/i386/support.s#34 integrate
.. //depot/projects/smpng/sys/i386/i386/swtch.s#38 integrate
.. //depot/projects/smpng/sys/i386/include/npx.h#18 integrate
.. //depot/projects/smpng/sys/i386/include/pc/bios.h#12 integrate
.. //depot/projects/smpng/sys/i386/include/pcb.h#21 integrate
.. //depot/projects/smpng/sys/i386/isa/npx.c#81 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#92 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#64 integrate
.. //depot/projects/smpng/sys/kern/uipc_shm.c#26 integrate
.. //depot/projects/smpng/sys/mips/cavium/if_octm.c#7 integrate
.. //depot/projects/smpng/sys/mips/cavium/octe/octe.c#7 integrate
.. //depot/projects/smpng/sys/net/if.c#159 integrate
.. //depot/projects/smpng/sys/net/if.h#62 integrate
.. //depot/projects/smpng/sys/net/if_mib.c#23 integrate
.. //depot/projects/smpng/sys/net/if_var.h#92 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#100 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#105 integrate
.. //depot/projects/smpng/sys/netinet6/in6_src.c#61 integrate
.. //depot/projects/smpng/sys/netpfil/pf/pf.c#13 integrate
.. //depot/projects/smpng/sys/sys/ata.h#43 integrate
.. //depot/projects/smpng/sys/sys/mman.h#23 integrate
.. //depot/projects/smpng/sys/sys/sockio.h#25 integrate
.. //depot/projects/smpng/sys/tools/fdt/make_dtb.sh#3 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#143 integrate
.. //depot/projects/smpng/sys/x86/acpica/acpi_wakeup.c#7 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#129 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 268982 2014-07-22 13:58:33Z emaste $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 270828 2014-08-29 21:25:47Z jhb $");
#include "opt_atpic.h"
#include "opt_compat.h"
==== //depot/projects/smpng/sys/amd64/amd64/support.S#28 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/amd64/support.S 249439 2013-04-13 15:20:33Z kib $
+ * $FreeBSD: head/sys/amd64/amd64/support.S 270844 2014-08-30 15:41:07Z pfg $
*/
#include "opt_ddb.h"
@@ -59,7 +59,7 @@
stosb
ret
END(bzero)
-
+
/* Address: %rdi */
ENTRY(pagezero)
movq $-PAGE_SIZE,%rdx
@@ -137,7 +137,7 @@
cld
ret
END(bcopy)
-
+
/*
* Note: memcpy does not support overlapping copies
*/
@@ -181,10 +181,10 @@
ret
END(pagecopy)
-/* fillw(pat, base, cnt) */
+/* fillw(pat, base, cnt) */
/* %rdi,%rsi, %rdx */
ENTRY(fillw)
- movq %rdi,%rax
+ movq %rdi,%rax
movq %rsi,%rdi
movq %rdx,%rcx
cld
@@ -388,7 +388,7 @@
movq (%rdi),%rax
movq $0,PCB_ONFAULT(%rcx)
ret
-END(fuword64)
+END(fuword64)
END(fuword)
ENTRY(fuword32)
==== //depot/projects/smpng/sys/amd64/include/pc/bios.h#9 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/include/pc/bios.h 263009 2014-03-11 10:23:03Z royger $
+ * $FreeBSD: head/sys/amd64/include/pc/bios.h 270828 2014-08-29 21:25:47Z jhb $
*/
#ifndef _MACHINE_PC_BIOS_H_
==== //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#12 (text+ko) ====
@@ -24,11 +24,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270689 2014-08-27 00:53:56Z grehan $
+ * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270857 2014-08-30 19:59:42Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270689 2014-08-27 00:53:56Z grehan $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270857 2014-08-30 19:59:42Z neel $");
#ifdef _KERNEL
#include <sys/param.h>
@@ -316,46 +316,36 @@
return (error);
}
+#define RFLAGS_STATUS_BITS (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_V)
+
/*
* Return the status flags that would result from doing (x - y).
*/
-static u_long
-getcc16(uint16_t x, uint16_t y)
-{
- u_long rflags;
+#define GETCC(sz) \
+static u_long \
+getcc##sz(uint##sz##_t x, uint##sz##_t y) \
+{ \
+ u_long rflags; \
+ \
+ __asm __volatile("sub %2,%1; pushfq; popq %0" : \
+ "=r" (rflags), "+r" (x) : "m" (y)); \
+ return (rflags); \
+} struct __hack
- __asm __volatile("sub %1,%2; pushfq; popq %0" :
- "=r" (rflags) : "m" (y), "r" (x));
- return (rflags);
-}
+GETCC(8);
+GETCC(16);
+GETCC(32);
+GETCC(64);
static u_long
-getcc32(uint32_t x, uint32_t y)
-{
- u_long rflags;
-
- __asm __volatile("sub %1,%2; pushfq; popq %0" :
- "=r" (rflags) : "m" (y), "r" (x));
- return (rflags);
-}
-
-static u_long
-getcc64(uint64_t x, uint64_t y)
-{
- u_long rflags;
-
- __asm __volatile("sub %1,%2; pushfq; popq %0" :
- "=r" (rflags) : "m" (y), "r" (x));
- return (rflags);
-}
-
-static u_long
getcc(int opsize, uint64_t x, uint64_t y)
{
- KASSERT(opsize == 2 || opsize == 4 || opsize == 8,
+ KASSERT(opsize == 1 || opsize == 2 || opsize == 4 || opsize == 8,
("getcc: invalid operand size %d", opsize));
- if (opsize == 2)
+ if (opsize == 1)
+ return (getcc8(x, y));
+ else if (opsize == 2)
return (getcc16(x, y));
else if (opsize == 4)
return (getcc32(x, y));
@@ -569,7 +559,7 @@
{
int error, size;
enum vm_reg_name reg;
- uint64_t val1, val2;
+ uint64_t result, rflags, rflags2, val1, val2;
size = vie->opsize;
error = EINVAL;
@@ -597,8 +587,8 @@
break;
/* perform the operation and write the result */
- val1 &= val2;
- error = vie_update_register(vm, vcpuid, reg, val1, size);
+ result = val1 & val2;
+ error = vie_update_register(vm, vcpuid, reg, result, size);
break;
case 0x81:
/*
@@ -625,11 +615,11 @@
switch (vie->reg & 7) {
case 0x4:
/* modrm:reg == b100, AND */
- val1 &= vie->immediate;
+ result = val1 & vie->immediate;
break;
case 0x1:
/* modrm:reg == b001, OR */
- val1 |= vie->immediate;
+ result = val1 | vie->immediate;
break;
default:
error = EINVAL;
@@ -638,11 +628,29 @@
if (error)
break;
- error = memwrite(vm, vcpuid, gpa, val1, size, arg);
+ error = memwrite(vm, vcpuid, gpa, result, size, arg);
break;
default:
break;
}
+ if (error)
+ return (error);
+
+ error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags);
+ if (error)
+ return (error);
+
+ /*
+ * OF and CF are cleared; the SF, ZF and PF flags are set according
+ * to the result; AF is undefined.
+ *
+ * The updated status flags are obtained by subtracting 0 from 'result'.
+ */
+ rflags2 = getcc(size, result, 0);
+ rflags &= ~RFLAGS_STATUS_BITS;
+ rflags |= rflags2 & (PSL_PF | PSL_Z | PSL_N);
+
+ error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, rflags, 8);
return (error);
}
@@ -651,7 +659,7 @@
mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
{
int error, size;
- uint64_t val1;
+ uint64_t val1, result, rflags, rflags2;
size = vie->opsize;
error = EINVAL;
@@ -681,17 +689,33 @@
* perform the operation with the pre-fetched immediate
* operand and write the result
*/
- val1 |= vie->immediate;
- error = memwrite(vm, vcpuid, gpa, val1, size, arg);
+ result = val1 | vie->immediate;
+ error = memwrite(vm, vcpuid, gpa, result, size, arg);
break;
default:
break;
}
+ if (error)
+ return (error);
+
+ error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags);
+ if (error)
+ return (error);
+
+ /*
+ * OF and CF are cleared; the SF, ZF and PF flags are set according
+ * to the result; AF is undefined.
+ *
+ * The updated status flags are obtained by subtracting 0 from 'result'.
+ */
+ rflags2 = getcc(size, result, 0);
+ rflags &= ~RFLAGS_STATUS_BITS;
+ rflags |= rflags2 & (PSL_PF | PSL_Z | PSL_N);
+
+ error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, rflags, 8);
return (error);
}
-#define RFLAGS_STATUS_BITS (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_V)
-
static int
emulate_cmp(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
==== //depot/projects/smpng/sys/arm/arm/locore.S#34 (text+ko) ====
@@ -37,9 +37,10 @@
#include <sys/syscall.h>
#include <machine/asm.h>
#include <machine/armreg.h>
+#include <machine/cpuconf.h>
#include <machine/pte.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/locore.S 269390 2014-08-01 18:24:44Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/locore.S 270862 2014-08-30 22:21:57Z ian $");
/* What size should this really be ? It is only used by initarm() */
#define INIT_ARM_STACK_SIZE (2048 * 4)
@@ -389,9 +390,9 @@
nop
CPWAIT(r0)
-#if defined(ARM_MMU_V6)
+#if ARM_MMU_V6
bl armv6_idcache_inv_all /* Modifies r0 only */
-#elif defined(ARM_MMU_V7)
+#elif ARM_MMU_V7
bl armv7_idcache_inv_all /* Modifies r0-r3, ip */
#endif
==== //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#12 (text+ko) ====
@@ -18,7 +18,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/BEAGLEBONE 266647 2014-05-25 10:17:26Z andrew $
+# $FreeBSD: head/sys/arm/conf/BEAGLEBONE 270912 2014-09-01 03:49:21Z imp $
ident BEAGLEBONE
@@ -116,7 +116,7 @@
#options USB_VERBOSE
device musb
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
# Ethernet
==== //depot/projects/smpng/sys/arm/conf/CNS11XXNAS#11 (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: head/sys/arm/conf/CNS11XXNAS 264219 2014-04-07 05:33:30Z rpaulo $
+# $FreeBSD: head/sys/arm/conf/CNS11XXNAS 270912 2014-09-01 03:49:21Z imp $
ident CNS11XXNAS
@@ -111,7 +111,7 @@
device ohci
device ehci
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device pass
device cfi
==== //depot/projects/smpng/sys/arm/conf/CUBIEBOARD#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: head/sys/arm/conf/CUBIEBOARD 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/CUBIEBOARD 270912 2014-09-01 03:49:21Z imp $
ident CUBIEBOARD
@@ -104,7 +104,7 @@
# GPIO
device gpio
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device pass
==== //depot/projects/smpng/sys/arm/conf/CUBIEBOARD2#5 (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: head/sys/arm/conf/CUBIEBOARD2 263698 2014-03-25 01:34:39Z ganbold $
+# $FreeBSD: head/sys/arm/conf/CUBIEBOARD2 270912 2014-09-01 03:49:21Z imp $
ident CUBIEBOARD2
@@ -104,7 +104,7 @@
# GPIO
device gpio
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device pass
==== //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#6 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 264251 2014-04-08 04:05:04Z rpaulo $
+# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 270912 2014-09-01 03:49:21Z imp $
ident DIGI-CCWMX53
@@ -130,10 +130,10 @@
device iicbus
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
==== //depot/projects/smpng/sys/arm/conf/EB9200#7 (text+ko) ====
@@ -10,7 +10,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/EB9200 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/EB9200 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -102,10 +102,10 @@
device usb # USB Bus (required)
device umass # Disks/Mass storage - Requires scbus and da
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB device (gadget) support
#device at91_dci # Atmel's usb device
==== //depot/projects/smpng/sys/arm/conf/EFIKA_MX#6 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/EFIKA_MX 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/EFIKA_MX 270912 2014-09-01 03:49:21Z imp $
ident EFIKA_MX
@@ -126,10 +126,10 @@
device iicbus
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
==== //depot/projects/smpng/sys/arm/conf/EXYNOS5.common#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/EXYNOS5.common 269369 2014-08-01 06:20:25Z br $
+# $FreeBSD: head/sys/arm/conf/EXYNOS5.common 270912 2014-09-01 03:49:21Z imp $
makeoptions MODULES_OVERRIDE=""
makeoptions WITHOUT_MODULES="ahc"
@@ -104,7 +104,7 @@
device xhci
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device pass
==== //depot/projects/smpng/sys/arm/conf/HL200#21 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/HL200 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/HL200 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -132,10 +132,10 @@
device ural # Ralink Technology RT2500USB wireless NICs
device zyd # ZyDAS zd1211/zd1211b wireless NICs
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# Wireless NIC cards
device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
==== //depot/projects/smpng/sys/arm/conf/HL201#13 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/HL201 270103 2014-08-17 16:53:10Z imp $
+# $FreeBSD: head/sys/arm/conf/HL201 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -116,10 +116,10 @@
#device ural # Ralink Technology RT2500USB wireless NICs
#device zyd # ZyDAS zd1211/zd1211b wireless NICs
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# Wireless NIC cards
#device wlan # 802.11 support
#device wlan_wep # 802.11 WEP support
==== //depot/projects/smpng/sys/arm/conf/IMX53-QSB#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/IMX53-QSB 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/IMX53-QSB 270912 2014-09-01 03:49:21Z imp $
ident IMX53-QSB
@@ -129,10 +129,10 @@
device iicbus
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
==== //depot/projects/smpng/sys/arm/conf/IMX6#3 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/IMX6 268977 2014-07-22 04:39:32Z br $
+# $FreeBSD: head/sys/arm/conf/IMX6 270912 2014-09-01 03:49:21Z imp $
ident IMX6
include "../freescale/imx/std.imx6"
@@ -25,7 +25,7 @@
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
options INET6 # IPv6 communications protocols
-#options SCTP # Stream Control Transmission Protocol
+options SCTP # Stream Control Transmission Protocol
options FFS # Berkeley Fast Filesystem
options SOFTUPDATES # Enable FFS soft updates support
options UFS_ACL # Support for access control lists
@@ -94,10 +94,10 @@
device mmcsd # SDCard disk device
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
#options USB_DEBUG # enable debug msgs
==== //depot/projects/smpng/sys/arm/conf/KB920X#31 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/KB920X 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/KB920X 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -132,10 +132,10 @@
device ural # Ralink Technology RT2500USB wireless NICs
device zyd # ZyDAS zd1211/zd1211b wireless NICs
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# Wireless NIC cards
device wlan # 802.11 support
device wlan_wep # 802.11 WEP support
==== //depot/projects/smpng/sys/arm/conf/NSLU#17 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/NSLU 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/NSLU 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -115,5 +115,5 @@
device ohci
device ehci
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
==== //depot/projects/smpng/sys/arm/conf/PANDABOARD#10 (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: head/sys/arm/conf/PANDABOARD 266647 2014-05-25 10:17:26Z andrew $
+# $FreeBSD: head/sys/arm/conf/PANDABOARD 270912 2014-09-01 03:49:21Z imp $
ident PANDABOARD
@@ -122,7 +122,7 @@
device ohci
device ehci
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
# Ethernet
==== //depot/projects/smpng/sys/arm/conf/QILA9G20#12 (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: head/sys/arm/conf/QILA9G20 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/QILA9G20 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -117,10 +117,10 @@
device icee
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
device ohci # OHCI localbus->USB interface
==== //depot/projects/smpng/sys/arm/conf/RK3188#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/RK3188 266940 2014-06-01 05:02:48Z ganbold $
+# $FreeBSD: head/sys/arm/conf/RK3188 270912 2014-09-01 03:49:21Z imp $
ident RK3188
@@ -88,7 +88,7 @@
# GPIO
device gpio
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device pass
==== //depot/projects/smpng/sys/arm/conf/SAM9G20EK#12 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/SAM9G20EK 263301 2014-03-18 14:41:18Z imp $
+# $FreeBSD: head/sys/arm/conf/SAM9G20EK 270912 2014-09-01 03:49:21Z imp $
ident SAM9G20EK
@@ -119,10 +119,10 @@
device icee
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
device ohci # OHCI localbus->USB interface
==== //depot/projects/smpng/sys/arm/conf/SAM9X25EK#9 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/SAM9X25EK 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/SAM9X25EK 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -118,10 +118,10 @@
device icee
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
#device ohci # OHCI localbus->USB interface
==== //depot/projects/smpng/sys/arm/conf/SN9G45#8 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/SN9G45 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/SN9G45 270912 2014-09-01 03:49:21Z imp $
#NO_UNIVERSE
@@ -95,10 +95,10 @@
device at91_wdt # WDT: Watchdog timer
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device pass # Passthrough device (direct ATA/SCSI access)
# USB support
device ohci # OHCI localbus->USB interface
==== //depot/projects/smpng/sys/arm/conf/VYBRID#3 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/VYBRID 269234 2014-07-29 12:44:19Z br $
+# $FreeBSD: head/sys/arm/conf/VYBRID 270912 2014-09-01 03:49:21Z imp $
ident VYBRID
include "../freescale/vybrid/std.vybrid"
@@ -112,7 +112,7 @@
#device ohci
device umass
-device scbus # SCSI bus (required for SCSI)
+device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device pass
==== //depot/projects/smpng/sys/arm/conf/WANDBOARD-DUAL#3 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/WANDBOARD-DUAL 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/WANDBOARD-DUAL 270879 2014-08-31 15:25:40Z ian $
#NO_UNIVERSE
@@ -23,7 +23,6 @@
ident WANDBOARD-DUAL
# Flattened Device Tree
-options FDT
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=wandboard-dual.dts
==== //depot/projects/smpng/sys/arm/conf/WANDBOARD-QUAD#3 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/WANDBOARD-QUAD 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/WANDBOARD-QUAD 270879 2014-08-31 15:25:40Z ian $
#NO_UNIVERSE
@@ -23,7 +23,6 @@
ident WANDBOARD-QUAD
# Flattened Device Tree
-options FDT
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=wandboard-quad.dts
==== //depot/projects/smpng/sys/arm/conf/WANDBOARD-SOLO#3 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: head/sys/arm/conf/WANDBOARD-SOLO 265155 2014-04-30 18:02:10Z imp $
+# $FreeBSD: head/sys/arm/conf/WANDBOARD-SOLO 270879 2014-08-31 15:25:40Z ian $
#NO_UNIVERSE
@@ -23,7 +23,6 @@
ident WANDBOARD-SOLO
# Flattened Device Tree
-options FDT
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=wandboard-solo.dts
==== //depot/projects/smpng/sys/arm/conf/ZEDBOARD#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: head/sys/arm/conf/ZEDBOARD 267146 2014-06-06 04:08:55Z imp $
+# $FreeBSD: head/sys/arm/conf/ZEDBOARD 270912 2014-09-01 03:49:21Z imp $
ident ZEDBOARD
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list