Date: Fri, 3 Oct 2008 10:00:50 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 150849 for review Message-ID: <200810031000.m93A0ok7084798@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150849 Change 150849 by zec@zec_tpx32 on 2008/10/03 10:00:45 IFC @ 150847 (effectively making this branch equal to head) Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/param.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/protosw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#20 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,27 +105,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -326,7 +305,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#11 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,27 +81,6 @@ return (0); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - #define PG2MB(pgs) (((pgs) + (1 << 8) - 1) >> 8) static int @@ -284,7 +263,7 @@ mdhdr.dmapbase = DMAP_MIN_ADDRESS; mdhdr.dmapend = DMAP_MAX_ADDRESS; - mkdumpheader(&kdh, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize); printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576); printf("Dumping %llu MB:", (long long)dumpsize >> 20); ==== //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.23 2008/08/01 04:55:38 alc Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ */ /* @@ -80,7 +80,7 @@ #endif #if defined(SMP) || defined(KLD_MODULE) -#define MAXCPU 16 +#define MAXCPU 32 #else #define MAXCPU 1 #endif ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,27 +103,6 @@ return (mdp); } -/* XXX should be MI */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, - uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - static int buf_write(struct dumperinfo *di, char *ptr, size_t sz) { @@ -325,7 +304,7 @@ dumplo = di->mediaoffset + di->mediasize - dumpsize; dumplo -= sizeof(kdh) * 2; - mkdumpheader(&kdh, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); + mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize); printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20, ehdr.e_phnum); ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.11 2008/07/18 06:14:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.12 2008/10/02 22:31:30 bms Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -480,6 +480,11 @@ init_param1(); init_param2(physmem); kdb_init(); + + /* use static kernel environment if so configured */ + if (envmode == 1) + kern_envp = static_env; + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.123 2008/09/26 15:29:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.124 2008/10/02 15:37:58 zec Exp $"); #include <sys/param.h> #include <sys/queue.h> ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.228 2008/10/02 15:37:58 zec Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.76 2008/09/09 13:01:14 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.21 2008/10/02 15:37:58 zec Exp $"); #include <sys/param.h> #include <sys/proc.h> ==== //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.222 2008/03/04 16:54:31 jhb Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.223 2008/10/02 14:45:29 bms Exp $ # # The include file <bsd.kmod.mk> handles building and installing loadable # kernel modules. @@ -331,7 +331,8 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ - kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ + kern/bus_if.m kern/clock_if.m \ + kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m ==== //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#3 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.76 2008/07/13 20:08:38 dougb Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.77 2008/10/01 22:52:20 peter Exp $ TYPE="FreeBSD" REVISION="8.0" @@ -97,7 +97,7 @@ done if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then - svn=" r`cd $SRCDIR && $svnversion`" + svn=" r`cd $SRCDIR/sys && $svnversion`" else svn="" fi ==== //depot/projects/vimage-commit2/src/sys/conf/options#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.641 2008/08/27 01:31:42 imp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ # # On the handling of kernel options # @@ -741,9 +741,6 @@ DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# VFS options -LOOKUP_SHARED opt_vfs.h - # HWPMC options HWPMC_HOOKS ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $ */ /* * Copyright (C) 1998-2003 by Darren Reed & Guido van Rooij. @@ -125,7 +125,7 @@ /* END OF INCLUDES */ #if !defined(lint) -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.47 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.48 2008/10/02 15:37:58 zec Exp $"; /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.73.2.24 2007/09/09 11:32:04 darrenr Exp $"; */ #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.57 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.17 2008/10/02 15:37:58 zec Exp $"); #endif #include <sys/param.h> ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.36 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.37 2008/10/02 15:37:58 zec Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.6 2008/10/02 15:37:58 zec Exp $"); #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.17 2008/03/29 00:24:36 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.18 2008/10/02 15:37:58 zec Exp $ */ /* $OpenBSD: pfvar.h,v 1.244 2007/02/23 21:31:51 deraadt Exp $ */ /* ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.3 2008/10/02 15:37:58 zec Exp $"); #include <sys/param.h> #include <sys/condvar.h> ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#8 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); #include "opt_config.h" @@ -177,30 +177,6 @@ static struct kerneldumpheader kdh; /* - * Text dumps are prefixed with a normal kernel dump header but with a - * different magic number to allow them to be uniquely identified. - */ -static void -mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, - uint64_t dumplen, uint32_t blksz) -{ - - bzero(kdh, sizeof(*kdh)); - strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); - strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = htod32(KERNELDUMPVERSION); - kdh->architectureversion = htod32(archver); - kdh->dumplength = htod64(dumplen); - kdh->dumptime = htod64(time_second); - kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); - strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); - if (panicstr != NULL) - strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); - kdh->parity = kerneldump_parity(kdh); -} - -/* * Calculate and fill in the checksum for a ustar header. */ static void @@ -468,7 +444,7 @@ */ textdump_offset = di->mediasize - sizeof(kdh); textdump_saveoff(&trailer_offset); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, 0, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); /* @@ -493,7 +469,7 @@ * size. */ dumplen = trailer_offset - (textdump_offset + TEXTDUMP_BLOCKSIZE); - mkdumpheader(&kdh, KERNELDUMP_TEXT_VERSION, dumplen, + mkdumpheader(&kdh, TEXTDUMPMAGIC, KERNELDUMP_TEXT_VERSION, dumplen, TEXTDUMP_BLOCKSIZE); (void)textdump_writenextblock(di, (char *)&kdh); textdump_restoreoff(trailer_offset); ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.47 2008/08/01 13:11:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.48 2008/10/02 20:29:45 rnoland Exp $"); #include "opt_bus.h" @@ -70,6 +70,7 @@ CHIP_I915, /* 915G/915GM */ CHIP_I965, /* G965 */ CHIP_G33, /* G33/Q33/Q35 */ + CHIP_G4X, /* G45/Q45 */ }; /* The i810 through i855 have the registers at BAR 1, and the GATT gets @@ -133,7 +134,7 @@ {0x25628086, CHIP_I830, 0x00020000, "Intel 82845M (845M GMCH) SVGA controller"}, {0x35828086, CHIP_I855, 0x00020000, - "Intel 82852/5"}, + "Intel 82852/855GM SVGA controller"}, {0x25728086, CHIP_I855, 0x00020000, "Intel 82865G (865G GMCH) SVGA controller"}, {0x25828086, CHIP_I915, 0x00020000, @@ -154,18 +155,26 @@ "Intel G965 SVGA controller"}, {0x29928086, CHIP_I965, 0x00020000, "Intel Q965 SVGA controller"}, - {0x29a28086, CHIP_I965, 0x00020000, + {0x29A28086, CHIP_I965, 0x00020000, "Intel G965 SVGA controller"}, - {0x29b28086, CHIP_G33, 0x00020000, + {0x29B28086, CHIP_G33, 0x00020000, "Intel Q35 SVGA controller"}, - {0x29c28086, CHIP_G33, 0x00020000, + {0x29C28086, CHIP_G33, 0x00020000, "Intel G33 SVGA controller"}, - {0x29d28086, CHIP_G33, 0x00020000, + {0x29D28086, CHIP_G33, 0x00020000, "Intel Q33 SVGA controller"}, - {0x2a028086, CHIP_I965, 0x00020000, + {0x2A028086, CHIP_I965, 0x00020000, "Intel GM965 SVGA controller"}, - {0x2a128086, CHIP_I965, 0x00020000, + {0x2A128086, CHIP_I965, 0x00020000, "Intel GME965 SVGA controller"}, + {0x2A428086, CHIP_I965, 0x00020000, + "Intel GM45 SVGA controller"}, + {0x2E028086, CHIP_G4X, 0x00020000, + "Intel 4 Series SVGA controller"}, + {0x2E128086, CHIP_G4X, 0x00020000, + "Intel Q45 SVGA controller"}, + {0x2E228086, CHIP_G4X, 0x00020000, + "Intel G45 SVGA controller"}, {0, 0, 0, NULL} }; @@ -377,6 +386,7 @@ agp_set_aperture_resource(dev, AGP_I915_GMADR); break; case CHIP_I965: + case CHIP_G4X: sc->sc_res_spec = agp_i965_res_spec; agp_set_aperture_resource(dev, AGP_I915_GMADR); break; @@ -476,7 +486,8 @@ gatt->ag_physical = pgtblctl & ~1; } else if (sc->chiptype == CHIP_I855 || sc->chiptype == CHIP_I915 || - sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33) { + sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { unsigned int gcc1, pgtblctl, stolen, gtt_size; /* Stolen memory is set up at the beginning of the aperture by @@ -491,7 +502,6 @@ gtt_size = 256; break; case CHIP_I965: - case CHIP_G33: switch (bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL) & AGP_I810_PGTBL_SIZE_MASK) { case AGP_I810_PGTBL_SIZE_128KB: @@ -503,6 +513,15 @@ case AGP_I810_PGTBL_SIZE_512KB: gtt_size = 512; break; + case AGP_I965_PGTBL_SIZE_1MB: + gtt_size = 1024; + break; + case AGP_I965_PGTBL_SIZE_2MB: + gtt_size = 2048; + break; + case AGP_I965_PGTBL_SIZE_1_5MB: + gtt_size = 1024 + 512; + break; default: device_printf(dev, "Bad PGTBL size\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -512,6 +531,27 @@ return EINVAL; } break; + case CHIP_G33: + gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 2); + switch (gcc1 & AGP_G33_MGGC_GGMS_MASK) { + case AGP_G33_MGGC_GGMS_SIZE_1M: + gtt_size = 1024; + break; + case AGP_G33_MGGC_GGMS_SIZE_2M: + gtt_size = 2048; + break; + default: + device_printf(dev, "Bad PGTBL size\n"); + bus_release_resources(dev, sc->sc_res_spec, + sc->sc_res); + free(gatt, M_AGP); + agp_generic_detach(dev); + return EINVAL; + } + break; + case CHIP_G4X: + gtt_size = 0; + break; default: device_printf(dev, "Bad chiptype\n"); bus_release_resources(dev, sc->sc_res_spec, @@ -528,28 +568,86 @@ stolen = 1024; break; case AGP_I855_GCC1_GMS_STOLEN_4M: - stolen = 4096; + stolen = 4 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_8M: - stolen = 8192; + stolen = 8 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_16M: - stolen = 16384; + stolen = 16 * 1024; break; case AGP_I855_GCC1_GMS_STOLEN_32M: - stolen = 32768; + stolen = 32 * 1024; break; case AGP_I915_GCC1_GMS_STOLEN_48M: - stolen = 49152; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 48 * 1024; + } else { + stolen = 0; + } break; case AGP_I915_GCC1_GMS_STOLEN_64M: - stolen = 65536; + if (sc->chiptype == CHIP_I915 || + sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 64 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_128M: - stolen = 128 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 128 * 1024; + } else { + stolen = 0; + } break; case AGP_G33_GCC1_GMS_STOLEN_256M: - stolen = 256 * 1024; + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { + stolen = 256 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_96M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 96 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_160M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 160 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_224M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 224 * 1024; + } else { + stolen = 0; + } + break; + case AGP_G4X_GCC1_GMS_STOLEN_352M: + if (sc->chiptype == CHIP_I965 || + sc->chiptype == CHIP_G4X) { + stolen = 352 * 1024; + } else { + stolen = 0; + } break; default: device_printf(dev, "unknown memory configuration, " @@ -560,7 +658,11 @@ agp_generic_detach(dev); return EINVAL; } - sc->stolen = (stolen - gtt_size - 4) * 1024 / 4096; + + if (sc->chiptype != CHIP_G4X) + gtt_size += 4; + + sc->stolen = (stolen - gtt_size) * 1024 / 4096; if (sc->stolen > 0) device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4); device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); ==== //depot/projects/vimage-commit2/src/sys/dev/agp/agpreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.19 2007/07/13 16:28:12 anholt Exp $ + * $FreeBSD: src/sys/dev/agp/agpreg.h,v 1.20 2008/10/02 20:29:45 rnoland Exp $ */ #ifndef _PCI_AGPREG_H_ @@ -215,7 +215,7 @@ #define AGP_I855_GCC1_DEV2 0x08 #define AGP_I855_GCC1_DEV2_ENABLED 0x00 #define AGP_I855_GCC1_DEV2_DISABLED 0x08 -#define AGP_I855_GCC1_GMS 0x70 +#define AGP_I855_GCC1_GMS 0xf0 /* Top bit reserved pre-G33 */ #define AGP_I855_GCC1_GMS_STOLEN_0M 0x00 #define AGP_I855_GCC1_GMS_STOLEN_1M 0x10 #define AGP_I855_GCC1_GMS_STOLEN_4M 0x20 @@ -259,14 +259,28 @@ #define AGP_I965_MSAC_GMASIZE_128 0x00 #define AGP_I965_MSAC_GMASIZE_256 0x02 #define AGP_I965_MSAC_GMASIZE_512 0x06 +#define AGP_I965_PGTBL_SIZE_1MB (3 << 1) +#define AGP_I965_PGTBL_SIZE_2MB (4 << 1) +#define AGP_I965_PGTBL_SIZE_1_5MB (5 << 1) /* * G33 registers */ +#define AGP_G33_MGGC_GGMS_MASK (3 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_1M (1 << 8) +#define AGP_G33_MGGC_GGMS_SIZE_2M (2 << 8) #define AGP_G33_GCC1_GMS_STOLEN_128M 0x80 #define AGP_G33_GCC1_GMS_STOLEN_256M 0x90 /* + * G4X registers + */ +#define AGP_G4X_GCC1_GMS_STOLEN_96M 0xa0 +#define AGP_G4X_GCC1_GMS_STOLEN_160M 0xb0 +#define AGP_G4X_GCC1_GMS_STOLEN_224M 0xc0 +#define AGP_G4X_GCC1_GMS_STOLEN_352M 0xd0 + +/* * NVIDIA nForce/nForce2 registers */ #define AGP_NVIDIA_0_APBASE 0x10 ==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.228 2008/09/26 07:29:48 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.229 2008/10/02 19:18:28 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -2124,59 +2124,66 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); static struct ata_chip_id ids[] = - {{ ATA_I82371FB, 0, 0, 0x00, ATA_WDMA2, "PIIX" }, - { ATA_I82371SB, 0, 0, 0x00, ATA_WDMA2, "PIIX3" }, - { ATA_I82371AB, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82443MX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82451NX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, - { ATA_I82801AB, 0, 0, 0x00, ATA_UDMA2, "ICH0" }, - { ATA_I82801AA, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82372FB, 0, 0, 0x00, ATA_UDMA4, "ICH" }, - { ATA_I82801BA, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801BA_1, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, - { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, - { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801DB_1, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, - { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "ICH5" }, - { ATA_I82801EB_S1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I82801EB_R1, 0, 0, 0x00, ATA_SA150, "ICH5" }, - { ATA_I6300ESB, 0, 0, 0x00, ATA_UDMA5, "6300ESB" }, - { ATA_I6300ESB_S1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I6300ESB_R1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, - { ATA_I82801FB, 0, 0, 0x00, ATA_UDMA5, "ICH6" }, - { ATA_I82801FB_S1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FB_R1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, - { ATA_I82801FBM, 0, AHCI, 0x00, ATA_SA150, "ICH6M" }, - { ATA_I82801GB, 0, 0, 0x00, ATA_UDMA5, "ICH7" }, - { ATA_I82801GB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, - { ATA_I82801GBM_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7M" }, - { ATA_I63XXESB2, 0, 0, 0x00, ATA_UDMA5, "63XXESB2" }, - { ATA_I63XXESB2_S1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_S2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R1, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I63XXESB2_R2, 0, AHCI, 0x00, ATA_SA300, "63XXESB2" }, - { ATA_I82801HB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_R1, 2, AHCI, 0x00, ATA_SA300, "ICH9R" }, - { ATA_I82801HB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH8" }, - { ATA_I82801HBM, 0, 0, 0x00, ATA_UDMA5, "ICH8M" }, - { ATA_I82801HBM_S1, 0, 0, 0x00, ATA_SA150, "ICH8M" }, - { ATA_I82801HBM_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, - { ATA_I82801HBM_S3, 0, AHCI, 0x00, ATA_SA300, "ICH8M" }, - { ATA_I82801IB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_S2, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH2, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I82801IB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH9" }, - { ATA_I31244, 0, 0, 0x00, ATA_SA150, "31244" }, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810031000.m93A0ok7084798>