PERFORCE change 99677 for review
John Baldwin
jhb at FreeBSD.org
Tue Jun 20 17:20:58 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=99677
Change 99677 by jhb at jhb_mutex on 2006/06/20 17:20:27
IFC @99674.
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/fpu.c#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#53 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#59 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#44 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#47 integrate
.. //depot/projects/smpng/sys/amd64/include/md_var.h#13 integrate
.. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#7 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#29 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/smpng/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/smpng/sys/arm/conf/IQ31244#11 integrate
.. //depot/projects/smpng/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/smpng/sys/arm/conf/SIMICS#9 integrate
.. //depot/projects/smpng/sys/arm/conf/SKYEYE#3 integrate
.. //depot/projects/smpng/sys/boot/Makefile#21 integrate
.. //depot/projects/smpng/sys/conf/Makefile.arm#22 integrate
.. //depot/projects/smpng/sys/conf/NOTES#121 integrate
.. //depot/projects/smpng/sys/conf/files#177 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#55 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#20 integrate
.. //depot/projects/smpng/sys/ddb/db_sym.c#6 integrate
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#42 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#67 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#76 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#42 integrate
.. //depot/projects/smpng/sys/dev/mfi/mfi.c#6 integrate
.. //depot/projects/smpng/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate
.. //depot/projects/smpng/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/smpng/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/smpng/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete
.. //depot/projects/smpng/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete
.. //depot/projects/smpng/sys/dev/myri10ge/if_myri10ge.c#3 delete
.. //depot/projects/smpng/sys/dev/myri10ge/if_myri10ge_var.h#2 delete
.. //depot/projects/smpng/sys/dev/myri10ge/mcp_gen_header.h#2 delete
.. //depot/projects/smpng/sys/dev/myri10ge/myri10ge_mcp.h#2 delete
.. //depot/projects/smpng/sys/dev/sound/driver.c#7 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/midi.c#11 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ak452x.c#1 branch
.. //depot/projects/smpng/sys/dev/sound/pci/ak452x.h#1 branch
.. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#29 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#1 branch
.. //depot/projects/smpng/sys/dev/sound/pci/envy24.h#1 branch
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#21 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/ich.c#44 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#19 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#21 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#12 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#32 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/uhid.c#28 integrate
.. //depot/projects/smpng/sys/dev/usb/umodem.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/uplcom.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#90 integrate
.. //depot/projects/smpng/sys/dev/usb/uscanner.c#33 integrate
.. //depot/projects/smpng/sys/dev/usb/uvisor.c#17 integrate
.. //depot/projects/smpng/sys/dev/wl/if_wl.c#28 integrate
.. //depot/projects/smpng/sys/geom/geom_dev.c#41 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#34 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#77 integrate
.. //depot/projects/smpng/sys/i386/conf/XBOX#5 integrate
.. //depot/projects/smpng/sys/i386/i386/db_trace.c#29 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#45 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#98 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#93 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#11 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#50 integrate
.. //depot/projects/smpng/sys/ia64/conf/SKI#22 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#78 integrate
.. //depot/projects/smpng/sys/kern/kern_clock.c#51 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#71 integrate
.. //depot/projects/smpng/sys/kern/kern_module.c#19 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#104 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#50 integrate
.. //depot/projects/smpng/sys/kern/kern_tc.c#41 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#58 integrate
.. //depot/projects/smpng/sys/kern/sched_core.c#2 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#67 integrate
.. //depot/projects/smpng/sys/kern/subr_kdb.c#18 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#85 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#53 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#77 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#59 integrate
.. //depot/projects/smpng/sys/kern/vfs_cache.c#32 integrate
.. //depot/projects/smpng/sys/modules/Makefile#124 integrate
.. //depot/projects/smpng/sys/modules/myri10ge/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/myri10ge/myri10ge/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/ppc/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/sound/driver/Makefile#8 integrate
.. //depot/projects/smpng/sys/modules/sound/driver/ak452x/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/sound/driver/envy24/Makefile#1 branch
.. //depot/projects/smpng/sys/net/bpf.c#60 integrate
.. //depot/projects/smpng/sys/net/bpf.h#18 integrate
.. //depot/projects/smpng/sys/net/if.c#82 integrate
.. //depot/projects/smpng/sys/net/if.h#31 integrate
.. //depot/projects/smpng/sys/net/if_bridge.c#30 integrate
.. //depot/projects/smpng/sys/net/if_clone.c#9 integrate
.. //depot/projects/smpng/sys/net/if_var.h#44 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#71 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#86 integrate
.. //depot/projects/smpng/sys/netinet/tcp_seq.h#11 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#49 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#43 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#62 integrate
.. //depot/projects/smpng/sys/posix4/ksched.c#17 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#34 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/mmu_if.m#5 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/mmu_oea.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap_dispatch.c#5 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#69 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#65 integrate
.. //depot/projects/smpng/sys/sys/protosw.h#19 integrate
.. //depot/projects/smpng/sys/sys/sched.h#21 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#52 integrate
.. //depot/projects/smpng/sys/sys/sockio.h#11 integrate
.. //depot/projects/smpng/sys/tools/fw_stub.awk#2 integrate
.. //depot/projects/smpng/sys/vm/pmap.h#31 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#58 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#80 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#10 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.159 2006/06/19 22:36:01 davidxu Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,6 +125,10 @@
mxcsr = __INITIAL_MXCSR__;
ldmxcsr(mxcsr);
fxsave(&fpu_cleanstate);
+ if (fpu_cleanstate.sv_env.en_mxcsr_mask)
+ cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask;
+ else
+ cpu_mxcsr_mask = 0xFFBF;
start_emulating();
bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp));
bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm));
==== //depot/projects/smpng/sys/amd64/amd64/initcpu.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.49 2005/10/14 22:52:00 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.50 2006/06/19 22:59:28 davidxu Exp $");
#include "opt_cpu.h"
@@ -60,6 +60,7 @@
u_int cpu_procinfo2; /* Multicore info */
char cpu_vendor[20]; /* CPU Origin code */
u_int cpu_fxsr; /* SSE enabled */
+u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */
/*
* Initialize CPU control registers
==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#53 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -1507,7 +1507,7 @@
penv_xmm->en_rip = penv_fpreg->en_rip;
penv_xmm->en_rdp = penv_fpreg->en_rdp;
penv_xmm->en_mxcsr = penv_fpreg->en_mxcsr;
- penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask;
+ penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask & cpu_mxcsr_mask;
/* FPU registers */
for (i = 0; i < 8; ++i)
@@ -1634,6 +1634,7 @@
static int
set_fpcontext(struct thread *td, const mcontext_t *mcp)
{
+ struct savefpu *fpstate;
if (mcp->mc_fpformat == _MC_FPFMT_NODEV)
return (0);
@@ -1649,7 +1650,9 @@
* be called with interrupts disabled.
* XXX obsolete on trap-16 systems?
*/
- fpusetregs(td, (struct savefpu *)&mcp->mc_fpstate);
+ fpstate = (struct savefpu *)&mcp->mc_fpstate;
+ fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask;
+ fpusetregs(td, fpstate);
} else
return (EINVAL);
return (0);
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#59 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.556 2006/06/12 20:05:27 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.557 2006/06/15 01:01:05 ups Exp $");
/*
* Manages physical address maps.
@@ -2356,15 +2356,13 @@
* but is *MUCH* faster than pmap_enter...
*/
-vm_page_t
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
- vm_page_t mpte)
+void
+pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
{
PMAP_LOCK(pmap);
- mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte);
+ (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL);
PMAP_UNLOCK(pmap);
- return (mpte);
}
static vm_page_t
==== //depot/projects/smpng/sys/amd64/amd64/trap.c#44 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.303 2006/03/13 23:55:31 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $");
/*
* AMD64 Trap and System call handling
@@ -681,15 +681,9 @@
}
#ifdef KDB
- if (debugger_on_panic || kdb_active) {
- register_t rflags;
- rflags = intr_disable();
- if (kdb_trap(type, 0, frame)) {
- intr_restore(rflags);
+ if (debugger_on_panic || kdb_active)
+ if (kdb_trap(type, 0, frame))
return;
- }
- intr_restore(rflags);
- }
#endif
printf("trap number = %d\n", type);
if (type <= MAX_TRAP_MSG)
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#47 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.459 2006/06/13 13:12:56 davidxu Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.460 2006/06/15 19:58:52 netchild Exp $
cpu HAMMER
ident GENERIC
@@ -46,7 +46,6 @@
options PROCFS # Process filesystem (requires PSEUDOFS)
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_GPT # GUID Partition Tables.
-options COMPAT_43 # Needed by COMPAT_LINUX32
options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
==== //depot/projects/smpng/sys/amd64/include/md_var.h#13 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.77 2006/04/21 04:24:50 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
@@ -47,6 +47,7 @@
extern u_int cpu_fxsr;
extern u_int cpu_high;
extern u_int cpu_id;
+extern u_int cpu_mxcsr_mask;
extern u_int cpu_procinfo;
extern u_int cpu_procinfo2;
extern char cpu_vendor[];
==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#7 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.7 2006/06/12 22:58:50 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.8 2006/06/18 22:46:30 cognet Exp $");
#include <machine/asm.h>
#include <sys/types.h>
#include <sys/elf32.h>
@@ -64,7 +64,7 @@
#define cpu_idcache_wbinv_all xscale_cache_purgeID
#endif
-#ifdef KZIP
+
int arm_picache_size;
int arm_picache_line_size;
int arm_picache_ways;
@@ -91,7 +91,6 @@
extern int arm9_dcache_sets_max;
extern int arm9_dcache_index_max;
extern int arm9_dcache_index_inc;
-#endif
static __inline void *
memcpy(void *dst, const void *src, int len)
@@ -100,7 +99,7 @@
char *d = dst;
while (len) {
- if (0 && len >= 4 && !((vm_offset_t)d & 3) &&
+ if (len >= 4 && !((vm_offset_t)d & 3) &&
!((vm_offset_t)s & 3)) {
*(uint32_t *)d = *(uint32_t *)s;
s += 4;
@@ -137,7 +136,7 @@
{
int physaddr = KERNPHYSADDR;
int tmp1;
- unsigned int sp = (unsigned int)&_end;
+ unsigned int sp = ((unsigned int)&_end & ~3) + 4;
#ifdef KZIP
sp += KERNSIZE + 0x100;
sp &= ~(L1_TABLE_SIZE - 1);
@@ -164,6 +163,14 @@
"2: nop\n"
"mov sp, %2\n"
: "=r" (tmp1), "+r" (physaddr), "+r" (sp));
+#ifndef KZIP
+#ifdef CPU_ARM9
+ /* So that idcache_wbinv works; */
+ if ((cpufunc_id() & 0x0000f000) == 0x00009000)
+ arm9_setup();
+#endif
+ cpu_idcache_wbinv_all();
+#endif
__start();
}
@@ -305,6 +312,7 @@
output(void *dummy, unsigned char *ptr, unsigned long len)
{
+
memcpy(i_output, ptr, len);
i_output += len;
return (0);
@@ -461,6 +469,10 @@
__asm __volatile("mcr p15, 0, %0, c7, c5, 0\n"
"mcr p15, 0, %0, c7, c10, 4\n"
: : "r" (curaddr));
+ __asm __volatile("mrc p15, 0, %0, c1, c0, 0\n"
+ "bic %0, %0, #1\n" /* MMU_ENABLE */
+ "mcr p15, 0, %0, c1, c0, 0\n"
+ : "=r" (ssym));
/* Jump to the entry point. */
((void(*)(void))(entry_point - KERNVIRTADDR + curaddr))();
__asm __volatile(".globl func_end\n"
@@ -477,7 +489,8 @@
*/
int __hack;
static __inline void
-setup_pagetables(unsigned int pt_addr, vm_paddr_t physstart, vm_paddr_t physend)
+setup_pagetables(unsigned int pt_addr, vm_paddr_t physstart, vm_paddr_t physend,
+ int write_back)
{
unsigned int *pd = (unsigned int *)pt_addr;
vm_paddr_t addr;
@@ -485,9 +498,12 @@
int tmp;
bzero(pd, L1_TABLE_SIZE);
- for (addr = physstart; addr < physend; addr += L1_S_SIZE)
+ for (addr = physstart; addr < physend; addr += L1_S_SIZE) {
pd[addr >> L1_S_SHIFT] = L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)|
L1_S_DOM(PMAP_DOMAIN_KERNEL) | addr;
+ if (write_back)
+ pd[addr >> L1_S_SHIFT] |= L1_S_B;
+ }
/* XXX: See below */
if (0xfff00000 < physstart || 0xfff00000 > physend)
pd[0xfff00000 >> L1_S_SHIFT] = L1_TYPE_S|L1_S_AP(AP_KRW)|
@@ -520,13 +536,14 @@
void *dst, *altdst;
char *kernel = (char *)&kernel_start;
int sp;
+ int pt_addr;
__asm __volatile("mov %0, pc" :
"=r" (curaddr));
curaddr = (void*)((unsigned int)curaddr & 0xfff00000);
#ifdef KZIP
if (*kernel == 0x1f && kernel[1] == 0x8b) {
- int pt_addr = (((int)&_end + KERNSIZE + 0x100) &
+ pt_addr = (((int)&_end + KERNSIZE + 0x100) &
~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE;
#ifdef CPU_ARM9
@@ -535,7 +552,7 @@
arm9_setup();
#endif
setup_pagetables(pt_addr, (vm_paddr_t)curaddr,
- (vm_paddr_t)curaddr + 0x10000000);
+ (vm_paddr_t)curaddr + 0x10000000, 1);
/* Gzipped kernel */
dst = inflate_kernel(kernel, &_end);
kernel = (char *)&_end;
@@ -554,8 +571,13 @@
dst = 4 + load_kernel((unsigned int)&kernel_start,
(unsigned int)curaddr,
(unsigned int)&func_end, 0);
- sp = (vm_offset_t)dst + 4096;
- dst = (void *)sp;
+ dst = (void *)(((vm_offset_t)dst & ~3));
+ pt_addr = ((unsigned int)dst &~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE;
+ setup_pagetables(pt_addr, (vm_paddr_t)curaddr,
+ (vm_paddr_t)curaddr + 0x10000000, 0);
+ sp = pt_addr + L1_TABLE_SIZE + 8192;
+ sp = sp &~3;
+ dst = (void *)(sp + 4);
memcpy((void *)dst, (void *)&load_kernel, (unsigned int)&func_end -
(unsigned int)&load_kernel);
do_call(dst, kernel, dst + (unsigned int)(&func_end) -
==== //depot/projects/smpng/sys/arm/arm/pmap.c#29 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.63 2006/06/11 04:53:06 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.64 2006/06/15 01:01:05 ups Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -3572,16 +3572,14 @@
* but is *MUCH* faster than pmap_enter...
*/
-vm_page_t
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
- vm_page_t mpte)
+void
+pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
{
PMAP_LOCK(pmap);
pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE),
FALSE);
PMAP_UNLOCK(pmap);
- return (NULL);
}
/*
==== //depot/projects/smpng/sys/arm/at91/at91_pmc.c#2 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.1 2006/03/24 07:37:56 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.2 2006/06/17 23:22:10 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -332,12 +332,11 @@
mckr = RD4(sc, PMC_MCKR);
mck.parent = clock_list[mckr & 0x3];
mck.parent->refcnt++;
- freq = mck.parent->hz;
- freq /= 1 << ((mckr >> 2) & 3);
+ freq = mck.parent->hz / (1 << ((mckr >> 2) & 3));
mck.hz = freq / (1 + ((mckr >> 8) & 3));
device_printf(sc->dev,
- "main clock: %d Hz PLLA: %d MHz CPU: %d MHz main %d MHz\n",
+ "Primary: %d Hz PLLA: %d MHz CPU: %d MHz MCK: %d MHz\n",
sc->main_clock_hz,
at91_pmc_pll_rate(main_clock, RD4(sc, CKGR_PLLAR), 0) / 1000000,
freq / 1000000, mck.hz / 1000000);
==== //depot/projects/smpng/sys/arm/at91/if_ate.c#5 (text) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.7 2006/05/13 23:41:15 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.8 2006/06/17 23:24:35 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,6 +96,7 @@
int txcur; /* current tx map pointer */
bus_addr_t rx_desc_phys;
eth_rx_desc_t *rx_descs;
+ int use_rmii;
struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */
};
@@ -174,6 +175,8 @@
if (err)
goto out;
+ sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII;
+
/* calling atestop before ifp is set is OK */
atestop(sc);
ATE_LOCK_INIT(sc);
@@ -182,6 +185,7 @@
ate_get_mac(sc, eaddr);
ate_set_mac(sc, eaddr);
+
sc->ifp = ifp = if_alloc(IFT_ETHER);
if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) {
device_printf(dev, "Cannot find my PHY.\n");
@@ -693,11 +697,11 @@
* to this chip. Select the right one based on a compile-time
* option.
*/
-#ifdef ATE_USE_RMII
- WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_RMII);
-#else
- WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII);
-#endif
+ if (sc->use_rmii)
+ WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_RMII);
+ else
+ WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII);
+
/*
* Turn on the multicast hash, and write 0's to it.
*/
==== //depot/projects/smpng/sys/arm/conf/IQ31244#11 (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: src/sys/arm/conf/IQ31244,v 1.14 2006/06/07 22:41:14 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.15 2006/06/15 19:58:52 netchild Exp $
machine arm
ident IQ31244
@@ -48,7 +48,6 @@
options CD9660 #ISO 9660 Filesystem
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
-options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
==== //depot/projects/smpng/sys/arm/conf/KB920X#3 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/KB920X,v 1.5 2006/06/07 22:41:14 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.7 2006/06/17 23:34:59 imp Exp $
machine arm
ident KB920X
@@ -51,7 +51,6 @@
#options CD9660 #ISO 9660 Filesystem
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
-options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
#options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
@@ -80,5 +79,5 @@
device mem # Memory and kernel memory devices
device md
-device at91_twi # TWI: Two Wire Interface
+# device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
==== //depot/projects/smpng/sys/arm/conf/SIMICS#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: src/sys/arm/conf/SIMICS,v 1.9 2006/05/13 02:47:39 imp Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.10 2006/06/15 19:58:52 netchild Exp $
machine arm
ident SIMICS
@@ -48,7 +48,6 @@
options CD9660 #ISO 9660 Filesystem
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
-options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
#options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
==== //depot/projects/smpng/sys/arm/conf/SKYEYE#3 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.4 2006/06/07 22:41:14 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.5 2006/06/15 19:58:52 netchild Exp $
machine arm
ident KB920X
@@ -51,7 +51,6 @@
options CD9660 #ISO 9660 Filesystem
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
-options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
#options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
==== //depot/projects/smpng/sys/boot/Makefile#21 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/Makefile,v 1.28 2006/05/12 04:09:52 jhb Exp $
+# $FreeBSD: src/sys/boot/Makefile,v 1.29 2006/06/18 17:44:40 imp Exp $
.include <bsd.own.mk>
@@ -17,7 +17,9 @@
SUBDIR+= ofw
.endif
+.if ${MACHINE_ARCH} != "arm"
# Pick the machine-dependent subdir based on the target architecture.
SUBDIR+= ${MACHINE:S/amd64/i386/}
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/smpng/sys/conf/Makefile.arm#22 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.arm -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.28 2006/06/12 22:58:50 cognet Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.29 2006/06/18 22:46:30 cognet Exp $
#
# Makefile for FreeBSD
#
@@ -64,7 +64,7 @@
$S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \
$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S
trampoline: ${KERNEL_KO}.tramp
-${KERNEL_KO}.tramp: ${KERNEL_KO}
+${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c
echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h
sed s/${KERNVIRTADDR}/${KERNPHYSADDR}/ ldscript.$M > ldscript.$M.tramp
sed s/" + SIZEOF_HEADERS"// ldscript.$M.tramp > \
@@ -74,9 +74,10 @@
eval $$(stat -s ${KERNEL_KO}.tmp) && \
echo "#define KERNSIZE $$st_size" >>opt_kernname.h
${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp \
- $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S -o ${KERNEL_KO}.tramp
+ $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S ${FILES_CPU_FUNC} \
+ -o ${KERNEL_KO}.tramp
${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \
- $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S -o \
+ $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o \
${KERNEL_KO}.tramp.noheader
${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
${KERNEL_KO}.tramp.bin
==== //depot/projects/smpng/sys/conf/NOTES#121 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1366 2006/06/13 13:12:55 davidxu Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1367 2006/06/19 22:11:44 jhb Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1707,6 +1707,9 @@
# PCI and ISA varieties.
# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and
# Harris (Intersil) Chipset with PCnetMobile firmware by AMD.
+# bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet
+# adapters.
+# bfe: Broadcom BCM4401 Ethernet adapter.
# bge: Support for gigabit ethernet adapters based on the Broadcom
# BCM570x family of controllers, including the 3Com 3c996-T,
# the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and
@@ -1836,17 +1839,24 @@
device xe
# PCI Ethernet NICs that use the common MII bus controller code.
+device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
+device bfe # Broadcom BCM440x 10/100 Ethernet
+device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
hint.fxp.0.prefer_iomap="0"
device hme # Sun HME (Happy Meal Ethernet)
+device lge # Level 1 LXT1001 gigabit Ethernet
device my # Myson Fast Ethernet (MTD80X, MTD89X)
+device nge # NatSemi DP83820 gigabit Ethernet
device rl # RealTek 8129/8139
device pcn # AMD Am79C97x PCI 10/100 NICs
device sf # Adaptec AIC-6915 (``Starfire'')
device sbsh # Granch SBNI16 SHDSL modem
device sis # Silicon Integrated Systems SiS 900/SiS 7016
+device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
@@ -1859,12 +1869,7 @@
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
-# PCI Gigabit & FDDI NICs.
-device bge
-device lge
-device nge
-device sk
-device ti
+# PCI FDDI NICs.
device fpa
# PCI WAN adapters.
==== //depot/projects/smpng/sys/conf/files#177 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1124 2006/06/13 13:12:55 davidxu Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1125 2006/06/14 03:03:08 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -967,7 +967,9 @@
dev/uart/uart_dbg.c optional uart gdb
dev/uart/uart_dev_ns8250.c optional uart uart_ns8250
dev/uart/uart_dev_sab82532.c optional uart uart_sab82532
+dev/uart/uart_dev_sab82532.c optional uart scc
dev/uart/uart_dev_z8530.c optional uart uart_z8530
+dev/uart/uart_dev_z8530.c optional uart scc
dev/uart/uart_if.m optional uart
dev/uart/uart_subr.c optional uart
dev/uart/uart_tty.c optional uart
==== //depot/projects/smpng/sys/conf/kern.post.mk#55 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.94 2006/06/13 00:57:10 cognet Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.95 2006/06/18 17:48:45 imp Exp $
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
@@ -199,22 +199,6 @@
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
sh $S/conf/systags.sh
-.if ${MACHINE_ARCH} != "ia64"
-.if exists(${DESTDIR}/boot)
-kernel-install-check:
- @if [ ! -f ${DESTDIR}/boot/device.hints ] ; then \
- echo "You must set up a ${DESTDIR}/boot/device.hints file first." ; \
- exit 1 ; \
- fi
- @if [ x"`grep device.hints ${DESTDIR}/boot/defaults/loader.conf ${DESTDIR}/boot/loader.conf`" = "x" ]; then \
- echo "You must activate /boot/device.hints in loader.conf." ; \
- exit 1 ; \
- fi
-
-kernel-install: kernel-install-check
-.endif
-.endif
-
kernel-install:
@if [ ! -f ${KERNEL_KO} ] ; then \
echo "You must build a kernel first." ; \
==== //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#20 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.26 2005/12/05 11:58:31 ru Exp $ */
+/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.28 2006/06/16 10:25:06 mlaier Exp $ */
/* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */
/*
@@ -102,6 +102,8 @@
#include "opt_carp.h"
#ifdef DEV_CARP
#define NCARP 1
+#else
+#define NCARP 0
#endif
#else
#include "carp.h"
@@ -221,6 +223,7 @@
sc->sc_statep.s = NULL;
sc->sc_statep_net.s = NULL;
sc->sc_maxupdates = 128;
+ sc->sc_sync_peer.s_addr = htonl(INADDR_PFSYNC_GROUP);
sc->sc_sendaddr.s_addr = htonl(INADDR_PFSYNC_GROUP);
sc->sc_ureq_received = 0;
sc->sc_ureq_sent = 0;
@@ -1054,7 +1057,11 @@
return (error);
if (pfsyncr.pfsyncr_syncpeer.s_addr == 0)
+#ifdef __FreeBSD__
+ sc->sc_sync_peer.s_addr = htonl(INADDR_PFSYNC_GROUP);
+#else
sc->sc_sync_peer.s_addr = INADDR_PFSYNC_GROUP;
+#endif
else
sc->sc_sync_peer.s_addr =
pfsyncr.pfsyncr_syncpeer.s_addr;
@@ -1118,7 +1125,11 @@
}
if (sc->sc_sync_ifp &&
+#ifdef __FreeBSD__
+ sc->sc_sync_peer.s_addr == htonl(INADDR_PFSYNC_GROUP)) {
+#else
sc->sc_sync_peer.s_addr == INADDR_PFSYNC_GROUP) {
+#endif
struct in_addr addr;
if (!(sc->sc_sync_ifp->if_flags & IFF_MULTICAST)) {
@@ -1152,7 +1163,11 @@
}
if (sc->sc_sync_ifp ||
+#ifdef __FreeBSD__
+ sc->sc_sendaddr.s_addr != htonl(INADDR_PFSYNC_GROUP)) {
+#else
sc->sc_sendaddr.s_addr != INADDR_PFSYNC_GROUP) {
+#endif
/* Request a full state table update. */
sc->sc_ureq_sent = time_uptime;
#if NCARP > 0
@@ -1321,7 +1336,11 @@
* hear, does it make a sound?
*/
if (ifp->if_bpf == NULL && sc->sc_sync_ifp == NULL &&
+#ifdef __FreeBSD__
+ sc->sc_sync_peer.s_addr == htonl(INADDR_PFSYNC_GROUP)) {
+#else
sc->sc_sync_peer.s_addr == INADDR_PFSYNC_GROUP) {
+#endif
/* Don't leave any stale pfsync packets hanging around. */
if (sc->sc_mbuf != NULL) {
m_freem(sc->sc_mbuf);
@@ -1773,7 +1792,12 @@
sc->sc_statep_net.s = NULL;
}
- if (sc->sc_sync_ifp || sc->sc_sync_peer.s_addr != INADDR_PFSYNC_GROUP) {
+#ifdef __FreeBSD__
+ if (sc->sc_sync_ifp ||
+ sc->sc_sync_peer.s_addr != htonl(INADDR_PFSYNC_GROUP)) {
+#else
+ if (sc->sc_sync_ifp ||sc->sc_sync_peer.s_addr != INADDR_PFSYNC_GROUP) {
+#endif
struct ip *ip;
struct sockaddr sa;
@@ -1811,12 +1835,7 @@
#endif
m->m_flags |= M_MCAST;
ip->ip_dst = sc->sc_sendaddr;
-#ifdef __FreeBSD__
- /* XXX_IMPORT */
- sc->sc_sendaddr.s_addr = htonl(sc->sc_sync_peer.s_addr);
-#else
sc->sc_sendaddr.s_addr = sc->sc_sync_peer.s_addr;
-#endif
pfsyncstats.pfsyncs_opackets++;
#ifdef __FreeBSD__
==== //depot/projects/smpng/sys/ddb/db_sym.c#6 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.36 2005/01/06 01:34:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.37 2006/06/16 16:17:52 kib Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,7 +230,6 @@
c_db_sym_t ret = C_DB_SYM_NULL, sym;
newdiff = diff = ~0;
- db_last_symtab = 0;
for (i = 0; i < db_nsymtab; i++) {
sym = X_db_search_symbol(&db_symtabs[i], val, strategy, &newdiff);
if (newdiff < diff) {
==== //depot/projects/smpng/sys/dev/aac/aac_pci.c#42 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.58 2005/11/06 22:52:52 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.59 2006/06/17 18:42:26 brueffer Exp $");
/*
* PCI bus interface and resource allocation.
@@ -126,13 +126,13 @@
{0x9005, 0x0285, 0x9005, 0x0286, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2120S"},
{0x9005, 0x0285, 0x9005, 0x0290, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
- "Adaptec SCSI RAID 2410SA"},
+ "Adaptec SATA RAID 2410SA"},
{0x9005, 0x0285, 0x1028, 0x0291, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
"Dell CERC SATA RAID 2"},
{0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
- "Adaptec SCSI RAID 2810SA"},
+ "Adaptec SATA RAID 2810SA"},
{0x9005, 0x0285, 0x9005, 0x0293, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
- "Adaptec SCSI RAID 21610SA"},
+ "Adaptec SATA RAID 21610SA"},
{0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
"HP ML110 G2 (Adaptec 2610SA)"},
{0x9005, 0x0286, 0x9005, 0x028c, AAC_HWIF_RKT, 0,
@@ -161,9 +161,9 @@
{0x9005, 0x0286, 0x9005, 0x029d, AAC_HWIF_RKT, 0,
"Adaptec SATA RAID 2420SA"},
{0x9005, 0x0286, 0x9005, 0x029e, AAC_HWIF_RKT, 0,
- "ICP9024RO SATA RAID"},
+ "ICP ICP9024RO SCSI RAID"},
{0x9005, 0x0286, 0x9005, 0x029f, AAC_HWIF_RKT, 0,
- "ICP9014RO SATA RAID"},
+ "ICP ICP9014RO SCSI RAID"},
{0x9005, 0x0285, 0x9005, 0x0294, AAC_HWIF_I960RX, 0,
"Adaptec SATA RAID 2026ZCR"},
{0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, 0,
@@ -185,13 +185,13 @@
{0x9005, 0x0285, 0x9005, 0x028f, AAC_HWIF_I960RX, 0,
"Adaptec SATA RAID 2025SA ZCR"},
{0x9005, 0x0285, 0x9005, 0x02a4, AAC_HWIF_I960RX, 0,
- "ICP 9085LI SAS RAID"},
+ "ICP ICP9085LI SAS RAID"},
{0x9005, 0x0285, 0x9005, 0x02a5, AAC_HWIF_I960RX, 0,
- "ICP 5085BR SAS RAID"},
+ "ICP ICP5085BR SAS RAID"},
{0x9005, 0x0286, 0x9005, 0x02a0, AAC_HWIF_RKT, 0,
- "ICP9047MA SATA RAID"},
+ "ICP ICP9047MA SATA RAID"},
{0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0,
- "ICP9087MA SATA RAID"},
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list