Date: Thu, 10 Sep 2009 18:23:34 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 168417 for review Message-ID: <200909101823.n8AINYtE079737@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=168417 Change 168417 by jhb@jhb_jhbbsd on 2009/09/10 18:23:03 IFC @168412 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#35 integrate .. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#46 integrate .. //depot/projects/smpng/sys/amd64/amd64/msi.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#99 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#54 integrate .. //depot/projects/smpng/sys/amd64/include/_align.h#1 branch .. //depot/projects/smpng/sys/amd64/include/param.h#26 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#22 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#27 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#32 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#10 integrate .. //depot/projects/smpng/sys/arm/include/_align.h#1 branch .. //depot/projects/smpng/sys/arm/include/param.h#13 integrate .. //depot/projects/smpng/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/smpng/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#61 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#39 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#87 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#7 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#63 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#59 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#25 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#81 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#65 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#102 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#21 integrate .. //depot/projects/smpng/sys/conf/NOTES#177 integrate .. //depot/projects/smpng/sys/conf/files#252 integrate .. //depot/projects/smpng/sys/conf/files.amd64#68 integrate .. //depot/projects/smpng/sys/conf/files.i386#127 integrate .. //depot/projects/smpng/sys/conf/files.ia64#65 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#56 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#74 integrate .. //depot/projects/smpng/sys/conf/options#177 integrate .. //depot/projects/smpng/sys/conf/options.amd64#27 integrate .. //depot/projects/smpng/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/smpng/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/smpng/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/smpng/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/smpng/sys/dev/aac/aac.c#68 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#31 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#52 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#73 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#57 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#57 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-acerlabs.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-marvell.c#8 integrate .. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#10 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#11 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v3.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_regdomain.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#82 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#31 integrate .. //depot/projects/smpng/sys/dev/coretemp/coretemp.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#25 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#23 integrate .. //depot/projects/smpng/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/smpng/sys/dev/e1000/if_em.c#13 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#31 integrate .. //depot/projects/smpng/sys/dev/ep/if_epreg.h#9 integrate .. //depot/projects/smpng/sys/dev/fb/s3_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/fb/vesa.c#1 branch .. //depot/projects/smpng/sys/dev/fb/vesa.h#1 branch .. //depot/projects/smpng/sys/dev/fb/vga.c#25 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#13 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#29 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#94 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.c#5 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#5 integrate .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#6 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#22 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#11 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#16 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#20 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#5 integrate .. //depot/projects/smpng/sys/dev/null/null.c#21 integrate .. //depot/projects/smpng/sys/dev/pty/pty.c#2 integrate .. //depot/projects/smpng/sys/dev/rp/rp_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/siis/siis.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#39 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac_private.h#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/syscons/daemon/daemon_saver.c#9 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#10 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/Makefile#2 delete .. //depot/projects/smpng/sys/dev/syscons/teken/gensequences#2 delete .. //depot/projects/smpng/sys/dev/syscons/teken/sequences#4 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#8 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#6 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken_demo.c#4 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken_scs.h#2 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken_stress.c#3 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken_subr.h#4 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken_subr_compat.h#4 delete .. //depot/projects/smpng/sys/dev/syscons/teken/teken_wcwidth.h#2 delete .. //depot/projects/smpng/sys/dev/txp/if_txp.c#41 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#12 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#96 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#7 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#53 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#20 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#32 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#61 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#53 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#57 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#52 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#10 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#14 integrate .. //depot/projects/smpng/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#20 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#146 integrate .. //depot/projects/smpng/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#66 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#68 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#146 integrate .. //depot/projects/smpng/sys/i386/i386/msi.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#138 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#20 integrate .. //depot/projects/smpng/sys/i386/include/_align.h#1 branch .. //depot/projects/smpng/sys/i386/include/param.h#24 integrate .. //depot/projects/smpng/sys/i386/include/pc/vesa.h#4 delete .. //depot/projects/smpng/sys/i386/include/pcpu.h#22 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#47 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#27 integrate .. //depot/projects/smpng/sys/i386/isa/dpms.c#2 delete .. //depot/projects/smpng/sys/i386/isa/vesa.c#22 delete .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#46 integrate .. //depot/projects/smpng/sys/i386/xen/locore.s#4 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#11 integrate .. //depot/projects/smpng/sys/ia64/include/_align.h#1 branch .. //depot/projects/smpng/sys/ia64/include/param.h#23 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#124 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#145 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#125 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#106 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#157 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#115 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#84 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#181 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#62 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#132 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#171 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#155 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#99 integrate .. //depot/projects/smpng/sys/mips/include/_align.h#1 branch .. //depot/projects/smpng/sys/mips/include/param.h#5 integrate .. //depot/projects/smpng/sys/modules/Makefile#167 integrate .. //depot/projects/smpng/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/vesa/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/x86emu/Makefile#1 branch .. //depot/projects/smpng/sys/net/flowtable.c#8 integrate .. //depot/projects/smpng/sys/net/if.c#128 integrate .. //depot/projects/smpng/sys/net/if_arp.h#10 integrate .. //depot/projects/smpng/sys/net/if_llatbl.c#7 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#71 integrate .. //depot/projects/smpng/sys/net/route.h#34 integrate .. //depot/projects/smpng/sys/net/rtsock.c#78 integrate .. //depot/projects/smpng/sys/net/vnet.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_dfs.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#29 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#13 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#76 integrate .. //depot/projects/smpng/sys/netinet/if_ether.h#13 integrate .. //depot/projects/smpng/sys/netinet/in.c#61 integrate .. //depot/projects/smpng/sys/netinet/in.h#48 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#39 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#115 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#13 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#61 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#66 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#46 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#70 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#69 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#38 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#21 integrate .. //depot/projects/smpng/sys/netipsec/key.c#43 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#34 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#67 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#28 integrate .. //depot/projects/smpng/sys/pc98/include/_align.h#1 branch .. //depot/projects/smpng/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#62 integrate .. //depot/projects/smpng/sys/powerpc/include/_align.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/param.h#18 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#17 integrate .. //depot/projects/smpng/sys/sparc64/include/_align.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/param.h#23 integrate .. //depot/projects/smpng/sys/sun4v/include/_align.h#1 branch .. //depot/projects/smpng/sys/sun4v/include/param.h#5 integrate .. //depot/projects/smpng/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/smpng/sys/sys/bus.h#37 integrate .. //depot/projects/smpng/sys/sys/conf.h#61 integrate .. //depot/projects/smpng/sys/sys/imgact_aout.h#11 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#15 integrate .. //depot/projects/smpng/sys/sys/ioctl_compat.h#9 integrate .. //depot/projects/smpng/sys/sys/param.h#156 integrate .. //depot/projects/smpng/sys/sys/proc.h#201 integrate .. //depot/projects/smpng/sys/sys/socket.h#36 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#63 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#98 integrate .. //depot/projects/smpng/sys/sys/tty.h#32 integrate .. //depot/projects/smpng/sys/sys/ttycom.h#11 integrate .. //depot/projects/smpng/sys/sys/types.h#39 integrate .. //depot/projects/smpng/sys/teken/Makefile#1 branch .. //depot/projects/smpng/sys/teken/gensequences#1 branch .. //depot/projects/smpng/sys/teken/sequences#1 branch .. //depot/projects/smpng/sys/teken/teken.c#1 branch .. //depot/projects/smpng/sys/teken/teken.h#1 branch .. //depot/projects/smpng/sys/teken/teken_demo.c#1 branch .. //depot/projects/smpng/sys/teken/teken_scs.h#1 branch .. //depot/projects/smpng/sys/teken/teken_stress.c#1 branch .. //depot/projects/smpng/sys/teken/teken_subr.h#1 branch .. //depot/projects/smpng/sys/teken/teken_subr_compat.h#1 branch .. //depot/projects/smpng/sys/teken/teken_wcwidth.h#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#77 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#115 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#19 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#29 integrate .. //depot/projects/smpng/sys/vm/sg_pager.c#2 integrate .. //depot/projects/smpng/sys/vm/vm.h#16 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#38 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#69 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#18 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.31 2009/08/24 16:19:47 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.32 2009/08/30 14:38:17 bz Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -118,7 +118,7 @@ .sysvec = &elf64_freebsd_sysvec, .interp_newpath = NULL, .brand_note = &elf64_kfreebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY }; SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#35 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -371,21 +371,21 @@ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + CPUID_TO_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2) tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xe) || - (AMD64_CPU_FAMILY(cpu_id) == 0xf && - AMD64_CPU_MODEL(cpu_id) >= 0x3)) + (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xe) || + (CPUID_TO_FAMILY(cpu_id) == 0xf && + CPUID_TO_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf && + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf && (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; ==== //depot/projects/smpng/sys/amd64/amd64/initcpu.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.55 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -154,8 +154,8 @@ pg_nx = PG_NX; } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) init_via(); /* ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#46 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.60 2009/08/14 21:05:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.61 2009/09/02 00:39:59 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -990,18 +990,21 @@ * we don't lose an interrupt delivery race. */ td = curthread; - thread_lock(td); - if (sched_is_bound(td)) - panic("apic_free_vector: Thread already bound.\n"); - sched_bind(td, apic_cpuid(apic_id)); - thread_unlock(td); + if (!rebooting) { + thread_lock(td); + if (sched_is_bound(td)) + panic("apic_free_vector: Thread already bound.\n"); + sched_bind(td, apic_cpuid(apic_id)); + thread_unlock(td); + } mtx_lock_spin(&icu_lock); lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1; mtx_unlock_spin(&icu_lock); - thread_lock(td); - sched_unbind(td); - thread_unlock(td); - + if (!rebooting) { + thread_lock(td); + sched_unbind(td); + thread_unlock(td); + } } /* Map an IDT vector (APIC) to an IRQ (interrupt source). */ ==== //depot/projects/smpng/sys/amd64/amd64/msi.c#15 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.14 2009/07/06 18:23:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.15 2009/09/10 17:27:36 jkim Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -275,8 +275,8 @@ case CPU_VENDOR_AMD: break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) break; /* FALLTHROUGH */ default: ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#99 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.668 2009/08/17 13:27:55 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.672 2009/09/02 16:47:10 jkim Exp $"); /* * Manages physical address maps. @@ -178,6 +178,8 @@ vm_offset_t kernel_vm_end = VM_MIN_KERNEL_ADDRESS; pt_entry_t pg_nx; +static int pat_works = 0; /* Is page attribute table sane? */ + SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); static int pg_ps_enabled = 1; @@ -590,20 +592,56 @@ pmap_init_pat(void) { uint64_t pat_msr; + char *sysenv; + static int pat_tested = 0; /* Bail if this CPU doesn't implement PAT. */ if (!(cpu_feature & CPUID_PAT)) panic("no PAT??"); /* - * Leave the indices 0-3 at the default of WB, WT, UC, and UC-. - * Program 4 and 5 as WP and WC. - * Leave 6 and 7 as UC and UC-. + * Some Apple Macs based on nVidia chipsets cannot enter ACPI mode + * via SMI# when we use upper 4 PAT entries for unknown reason. */ - pat_msr = rdmsr(MSR_PAT); - pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5)); - pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) | - PAT_VALUE(5, PAT_WRITE_COMBINING); + if (!pat_tested) { + pat_works = 1; + sysenv = getenv("smbios.system.product"); + if (sysenv != NULL) { + if (strncmp(sysenv, "MacBook5,1", 10) == 0 || + strncmp(sysenv, "MacBookPro5,5", 13) == 0 || + strncmp(sysenv, "Macmini3,1", 10) == 0) + pat_works = 0; + freeenv(sysenv); + } + pat_tested = 1; + } + + /* Initialize default PAT entries. */ + pat_msr = PAT_VALUE(0, PAT_WRITE_BACK) | + PAT_VALUE(1, PAT_WRITE_THROUGH) | + PAT_VALUE(2, PAT_UNCACHED) | + PAT_VALUE(3, PAT_UNCACHEABLE) | + PAT_VALUE(4, PAT_WRITE_BACK) | + PAT_VALUE(5, PAT_WRITE_THROUGH) | + PAT_VALUE(6, PAT_UNCACHED) | + PAT_VALUE(7, PAT_UNCACHEABLE); + + if (pat_works) { + /* + * Leave the indices 0-3 at the default of WB, WT, UC-, and UC. + * Program 4 and 5 as WP and WC. + * Leave 6 and 7 as UC- and UC. + */ + pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5)); + pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) | + PAT_VALUE(5, PAT_WRITE_COMBINING); + } else { + /* + * Just replace PAT Index 2 with WC instead of UC-. + */ + pat_msr &= ~PAT_MASK(2); + pat_msr |= PAT_VALUE(2, PAT_WRITE_COMBINING); + } wrmsr(MSR_PAT, pat_msr); } @@ -754,27 +792,48 @@ pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT; /* Map the caching mode to a PAT index. */ - switch (mode) { - case PAT_UNCACHEABLE: - pat_index = 3; - break; - case PAT_WRITE_THROUGH: - pat_index = 1; - break; - case PAT_WRITE_BACK: - pat_index = 0; - break; - case PAT_UNCACHED: - pat_index = 2; - break; - case PAT_WRITE_COMBINING: - pat_index = 5; - break; - case PAT_WRITE_PROTECTED: - pat_index = 4; - break; - default: - panic("Unknown caching mode %d\n", mode); + if (pat_works) { + switch (mode) { + case PAT_UNCACHEABLE: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_UNCACHED: + pat_index = 2; + break; + case PAT_WRITE_COMBINING: + pat_index = 5; + break; + case PAT_WRITE_PROTECTED: + pat_index = 4; + break; + default: + panic("Unknown caching mode %d\n", mode); + } + } else { + switch (mode) { + case PAT_UNCACHED: + case PAT_UNCACHEABLE: + case PAT_WRITE_PROTECTED: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_WRITE_COMBINING: + pat_index = 2; + break; + default: + panic("Unknown caching mode %d\n", mode); + } } /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ @@ -943,8 +1002,8 @@ * coherence domain. */ mfence(); - for (; eva < sva; eva += cpu_clflush_line_size) - clflush(eva); + for (; sva < eva; sva += cpu_clflush_line_size) + clflush(sva); mfence(); } else { @@ -4476,7 +4535,8 @@ if (base < DMAP_MIN_ADDRESS) return (EINVAL); - cache_bits_pde = cache_bits_pte = -1; + cache_bits_pde = pmap_cache_bits(mode, 1); + cache_bits_pte = pmap_cache_bits(mode, 0); changed = FALSE; /* @@ -4493,8 +4553,6 @@ * memory type, then we need not demote this page. Just * increment tmpva to the next 1GB page frame. */ - if (cache_bits_pde < 0) - cache_bits_pde = pmap_cache_bits(mode, 1); if ((*pdpe & PG_PDE_CACHE) == cache_bits_pde) { tmpva = trunc_1gpage(tmpva) + NBPDP; continue; @@ -4522,8 +4580,6 @@ * memory type, then we need not demote this page. Just * increment tmpva to the next 2MB page frame. */ - if (cache_bits_pde < 0) - cache_bits_pde = pmap_cache_bits(mode, 1); if ((*pde & PG_PDE_CACHE) == cache_bits_pde) { tmpva = trunc_2mpage(tmpva) + NBPDR; continue; @@ -4557,12 +4613,9 @@ for (tmpva = base; tmpva < base + size; ) { pdpe = pmap_pdpe(kernel_pmap, tmpva); if (*pdpe & PG_PS) { - if (cache_bits_pde < 0) - cache_bits_pde = pmap_cache_bits(mode, 1); if ((*pdpe & PG_PDE_CACHE) != cache_bits_pde) { pmap_pde_attr(pdpe, cache_bits_pde); - if (!changed) - changed = TRUE; + changed = TRUE; } if (tmpva >= VM_MIN_KERNEL_ADDRESS) { if (pa_start == pa_end) { @@ -4588,12 +4641,9 @@ } pde = pmap_pdpe_to_pde(pdpe, tmpva); if (*pde & PG_PS) { - if (cache_bits_pde < 0) - cache_bits_pde = pmap_cache_bits(mode, 1); if ((*pde & PG_PDE_CACHE) != cache_bits_pde) { pmap_pde_attr(pde, cache_bits_pde); - if (!changed) - changed = TRUE; + changed = TRUE; } if (tmpva >= VM_MIN_KERNEL_ADDRESS) { if (pa_start == pa_end) { @@ -4616,13 +4666,10 @@ } tmpva = trunc_2mpage(tmpva) + NBPDR; } else { - if (cache_bits_pte < 0) - cache_bits_pte = pmap_cache_bits(mode, 0); pte = pmap_pde_to_pte(pde, tmpva); if ((*pte & PG_PTE_CACHE) != cache_bits_pte) { pmap_pte_attr(pte, cache_bits_pte); - if (!changed) - changed = TRUE; + changed = TRUE; } if (tmpva >= VM_MIN_KERNEL_ADDRESS) { if (pa_start == pa_end) { ==== //depot/projects/smpng/sys/amd64/conf/NOTES#54 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.92 2009/08/13 17:09:45 attilio Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.93 2009/09/09 09:50:31 delphij Exp $ # # @@ -154,6 +154,12 @@ ##################################################################### # HARDWARE DEVICE CONFIGURATION +# To include support for VGA VESA video modes (depends on X86EMU) +options VESA + +# Turn on extra debugging checks and output for VESA support. +options VESA_DEBUG + # # Optional devices: # ==== //depot/projects/smpng/sys/amd64/include/param.h#26 (text+ko) ==== @@ -36,33 +36,23 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.30 2009/07/05 17:45:48 sam Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.32 2009/09/08 20:45:40 phk Exp $ */ + +#ifndef _AMD64_INCLUDE_PARAM_H_ +#define _AMD64_INCLUDE_PARAM_H_ + +#include <machine/_align.h> + /* * Machine dependent constants for AMD64. */ -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is u_long and - * must be cast to any desired pointer type. - */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(long) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) -#endif - -#ifndef _NO_NAMESPACE_POLLUTION #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ - #ifndef MACHINE #define MACHINE "amd64" #endif @@ -150,5 +140,4 @@ #define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) -#endif /* !_MACHINE_PARAM_H_ */ -#endif /* !_NO_NAMESPACE_POLLUTION */ +#endif /* !_AMD64_INCLUDE_PARAM_H_ */ ==== //depot/projects/smpng/sys/amd64/include/specialreg.h#22 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.55 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.56 2009/09/10 17:27:36 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -168,10 +168,10 @@ #define CPUID_FAMILY 0x00000f00 #define CPUID_EXT_MODEL 0x000f0000 #define CPUID_EXT_FAMILY 0x0ff00000 -#define AMD64_CPU_MODEL(id) \ +#define CPUID_TO_MODEL(id) \ ((((id) & CPUID_MODEL) >> 4) | \ (((id) & CPUID_EXT_MODEL) >> 12)) -#define AMD64_CPU_FAMILY(id) \ +#define CPUID_TO_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ (((id) & CPUID_EXT_FAMILY) >> 20)) ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#27 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -1257,6 +1257,13 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD7 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#32 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.40 2009/07/20 07:53:07 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.43 2009/09/01 11:41:51 kib Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -119,9 +119,6 @@ #ifdef __XSCALE__ #ifndef CPU_XSCALE_CORE3 pmap_use_minicache(td2->td_kstack, td2->td_kstack_pages * PAGE_SIZE); - if (td2->td_altkstack) - pmap_use_minicache(td2->td_altkstack, td2->td_altkstack_pages * - PAGE_SIZE); #endif #endif td2->td_pcb = pcb2; ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA#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: src/sys/arm/conf/CAMBRIA,v 1.12 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ ident CAMBRIA ==== //depot/projects/smpng/sys/arm/include/param.h#13 (text+ko) ==== @@ -35,35 +35,23 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.16 2009/07/05 17:45:48 sam Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.17 2009/09/08 20:45:40 phk Exp $ */ +#ifndef _ARM_INCLUDE_PARAM_H_ +#define _ARM_INCLUDE_PARAM_H_ + /* * Machine dependent constants for StrongARM */ -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is unsigned int - * and must be cast to any desired pointer type. - */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(int) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) -#endif +#include <machine/_align.h> #define STACKALIGNBYTES (8 - 1) #define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) -#ifndef _NO_NAMESPACE_POLLUTION - #define __PCI_REROUTE_INTERRUPT -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ - #ifndef MACHINE #define MACHINE "arm" #endif @@ -136,5 +124,4 @@ #define pgtok(x) ((x) * (PAGE_SIZE / 1024)) -#endif /* !_MACHINE_PARAM_H_ */ -#endif /* !_NO_NAMESPACE_POLLUTION */ +#endif /* !_ARM_INCLUDE_PARAM_H_ */ ==== //depot/projects/smpng/sys/cam/ata/ata_all.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.1 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.2 2009/08/30 16:31:25 mav Exp $"); #include <sys/param.h> @@ -91,7 +91,7 @@ } void -ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count) { bzero(&ataio->cmd, sizeof(ataio->cmd)); ==== //depot/projects/smpng/sys/cam/ata/ata_all.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.1 2009/07/10 08:18:08 scottl Exp $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $ */ #ifndef CAM_ATA_ALL_H @@ -83,7 +83,7 @@ int ata_version(int ver); void ata_print_ident(struct ata_params *ident_data); -void ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, +void ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, uint32_t lba, uint8_t sector_count); void ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features, uint64_t lba, uint16_t sector_count); ==== //depot/projects/smpng/sys/cam/ata/ata_da.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.2 2009/07/17 21:48:08 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.4 2009/08/30 16:31:25 mav Exp $"); #include <sys/param.h> @@ -287,7 +287,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0); cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0, /*sense_flags*/SF_RETRY_UA, softc->disk->d_devstat); @@ -411,7 +411,7 @@ ata_48bit_cmd(&ccb.ataio, ATA_WRITE_DMA48, 0, lba, count); } else { - ata_36bit_cmd(&ccb.ataio, ATA_WRITE_DMA, + ata_28bit_cmd(&ccb.ataio, ATA_WRITE_DMA, 0, lba, count); } xpt_polled_action(&ccb); @@ -441,7 +441,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); xpt_polled_action(&ccb); if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) @@ -856,10 +856,10 @@ } } else { if (bp->bio_cmd == BIO_READ) { - ata_36bit_cmd(ataio, ATA_READ_DMA, + ata_28bit_cmd(ataio, ATA_READ_DMA, 0, lba, count); } else { - ata_36bit_cmd(ataio, ATA_WRITE_DMA, + ata_28bit_cmd(ataio, ATA_WRITE_DMA, 0, lba, count); } } @@ -878,7 +878,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0); break; } start_ccb->ccb_h.ccb_state = ADA_CCB_BUFFER_IO; @@ -1126,7 +1126,7 @@ if (softc->flags & ADA_FLAG_CAN_48BIT) ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0); else - ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); + ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0); xpt_polled_action(&ccb); if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) ==== //depot/projects/smpng/sys/cam/ata/ata_xpt.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.4 2009/08/18 09:27:17 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.5 2009/08/30 16:31:25 mav Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -357,9 +357,9 @@ /*dxfer_len*/sizeof(struct ata_params), 30 * 1000); if (periph->path->device->protocol == PROTO_ATA) - ata_36bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0); + ata_28bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909101823.n8AINYtE079737>