Date: Fri, 15 Dec 2006 13:56:15 GMT From: Olivier Houchard <cognet@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 111738 for review Message-ID: <200612151356.kBFDuFcw037626@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=111738 Change 111738 by cognet@hulglah on 2006/12/15 13:55:21 IFC Paolo, I didn't touch powerpc/intr_machdep.c because it seems a lot has changed, the P4 markers are still there. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#12 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#10 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#10 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/pmap.h#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/soc2006/intr_filter/boot/forth/loader.conf#5 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_ccb.h#3 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_periph.c#3 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#6 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.h#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linsysfs/linsysfs.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#8 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_stats.c#4 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#11 integrate .. //depot/projects/soc2006/intr_filter/conf/files#10 integrate .. //depot/projects/soc2006/intr_filter/conf/options#9 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/dev/ath/version.h#2 integrate .. //depot/projects/soc2006/intr_filter/ddb/db_ps.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/aac/aac_pci.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/advansys.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/advansys/adwcam.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/aha/aha.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aha/aha_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/aha/aha_mca.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ahb/ahb.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/amd/amd.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/amr/amr_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/asr/asr.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athrate.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athvar.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/awi/awivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/buslogic/bt.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/if_dc.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ep/if_ep.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwdev.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/gem/if_gem.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/hme/if_hme.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iicbus_if.m#3 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/iicbus/iiconf.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/iir/iir_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispmbox.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispvar.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ispfw/ispfw.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/le/am7990.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/le/am79900.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/le/lance.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/le/lancevar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/md/md.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfireg.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/acphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/amphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/bmtphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/brgphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/ciphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/e1000phy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/inphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/lxtphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/mii_physubr.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/miidevs#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/miivar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/mlphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/nsgphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/nsphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/pnaphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/qsphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/rgephy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/rlphy.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/tdkphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/tlphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/xmphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mly/mly.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/msk/if_mskreg.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_private.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcib_private.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcireg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcivar.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ppbus/vpo.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ral/rt2661.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_sk.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_skreg.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/trm/trm.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_aue.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_auereg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_ethersubr.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/wds/wd7000.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/wi/if_wi.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/wi/if_wivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union.h#2 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#10 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#19 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#7 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/include/intr_machdep.h#6 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#8 integrate .. //depot/projects/soc2006/intr_filter/i386/pci/pci_bus.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/soc2006/intr_filter/kern/init_main.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_clock.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_idle.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#20 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_kse.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_poll.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_proc.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_subr.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_switch.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thr.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thread.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_umtx.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/ksched.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_4bsd.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_lock.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_rman.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_trap.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/tty.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_export.c#3 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#9 integrate .. //depot/projects/soc2006/intr_filter/modules/isp/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/msk/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/net/bridgestp.c#7 integrate .. //depot/projects/soc2006/intr_filter/net/bridgestp.h#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_atmsubr.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#10 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridgevar.h#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#6 integrate .. //depot/projects/soc2006/intr_filter/net/if_llc.h#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_ppp.c#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_pppvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_spppsubr.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/ppp_tty.c#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_input.c#6 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_output.c#6 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_nat.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/igmp.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_carp.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_output.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/libalias/alias.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_constants.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_structs.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_uio.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet6/frag6.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/icmp6.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_gif.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_src.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_var.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_forward.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_input.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ipsec.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet6/mld6.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/scope6.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/soc2006/intr_filter/netipsec/ipsec.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipsec/ipsec_input.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/soc2006/intr_filter/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/pci/if_rl.c#4 integrate .. //depot/projects/soc2006/intr_filter/pci/if_rlreg.h#6 integrate .. //depot/projects/soc2006/intr_filter/pci/if_xl.c#7 integrate .. //depot/projects/soc2006/intr_filter/pci/if_xlreg.h#5 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/bus.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/pmap.h#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#14 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/mmu_if.m#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/mmu_oea.c#8 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/ofw_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/pmap_dispatch.c#5 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_framework.h#3 integrate .. //depot/projects/soc2006/intr_filter/security/mac/mac_inet.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/soc2006/intr_filter/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#5 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/pcpu.h#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/tsb.h#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#10 integrate .. //depot/projects/soc2006/intr_filter/sys/mac_policy.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/proc.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/rtprio.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/runq.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/sched.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/umtx.h#5 integrate .. //depot/projects/soc2006/intr_filter/sys/vnode.h#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_glue.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.c#8 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#12 (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/amd64/intr_machdep.c,v 1.26 2006/11/17 16:41:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ */ /* @@ -200,13 +200,13 @@ int intr_remove_handler(void *cookie) { + struct intsrc *isrc; int error; + isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); -#ifdef XXX if (error == 0) - intrcnt_updatename(/* XXX */); -#endif + intrcnt_updatename(isrc); return (error); } ==== //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -514,6 +514,7 @@ * help lock contention somewhat, and this is critical for HTT. -Peter */ static int cpu_idle_hlt = 1; +TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt); SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -1121,11 +1122,7 @@ * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -215,7 +215,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is an entire 2M page. */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { if (is_dumpable(pa)) dump_add_page(pa); @@ -326,7 +326,7 @@ j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1)); if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) { /* This is a single 2M block. Generate a fake PTP */ - pa = pd[j] & PG_FRAME & ~PDRMASK; + pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M; } ==== //depot/projects/soc2006/intr_filter/amd64/amd64/mptable_pci.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.5 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -72,6 +72,27 @@ return (bus_generic_attach(dev)); } +/* Pass MSI alloc requests up to the nexus. */ +static int +mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +mptable_hostb_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static device_method_t mptable_hostb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, mptable_hostb_probe), @@ -96,9 +117,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -165,4 +186,3 @@ DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); - ==== //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); /* * Manages physical address maps. @@ -947,9 +947,7 @@ pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract: bad pde")); - rtval = (pde & PG_FRAME) | (va & PDRMASK); + rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); PMAP_UNLOCK(pmap); return rtval; } @@ -982,9 +980,7 @@ if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - KASSERT((pde & PG_FRAME & PDRMASK) == 0, - ("pmap_extract_and_hold: bad pde")); - m = PHYS_TO_VM_PAGE((pde & PG_FRAME) | + m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); } @@ -1013,7 +1009,7 @@ } else { pde = vtopde(va); if (*pde & PG_PS) { - pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1)); + pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); } else { pa = *vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); ==== //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#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/amd64/conf/GENERIC,v 1.469 2006/11/22 10:34:12 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp $ cpu HAMMER ident GENERIC @@ -71,11 +71,6 @@ # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -# Linux 32-bit ABI support -options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS -options LINSYSFS - # Bus support. device acpi device pci @@ -200,6 +195,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') ==== //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#6 (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/amd64/include/intr_machdep.h,v 1.12 2006/11/13 22:23:33 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -148,9 +148,9 @@ void intr_resume(void); void intr_suspend(void); void intrcnt_add(const char *name, u_long **countp); -void msi_init(void); int msi_alloc(device_t dev, int count, int maxcount, int *irqs, int *newirq, int *newcount); +void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); int msix_release(int irq); ==== //depot/projects/soc2006/intr_filter/amd64/include/pmap.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -71,6 +71,7 @@ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) +#define PG_PS_FRAME (0x000fffffffe00000ul) #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ ==== //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -425,24 +426,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysvec.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1120,7 +1120,7 @@ printf("Could not deinstall ELF interpreter entry\n"); break; default: - break; + return EOPNOTSUPP; } return error; } ==== //depot/projects/soc2006/intr_filter/amd64/pci/pci_bus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.118 2006/11/13 22:23:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $"); #include "opt_cpu.h" @@ -81,6 +81,28 @@ return (PCI_INVALID_IRQ); } +/* Pass MSI alloc requests up to the nexus. */ + +static int +legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +legacy_pcib_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, uint32_t id, uint8_t class, uint8_t subclass, @@ -322,9 +344,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, legacy_pcib_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } ==== //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#7 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.76 2006/12/01 12:29:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -2807,6 +2807,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); pmap_free_pv_entry(pv); + pmap_free_l2_bucket(pmap, l2b, 1); } vm_page_unlock_queues(); cpu_idcache_wbinv_all(); ==== //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#9 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.20 2006/12/06 06:34:53 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -455,11 +455,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/soc2006/intr_filter/arm/at91/uart_dev_at91usart.c#4 (text) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.9 2006/07/20 21:03:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $"); #include "opt_comconsole.h" @@ -323,7 +323,10 @@ static int at91_usart_bus_attach(struct uart_softc *sc) { - int err, i; +#ifndef SKYEYE_WORKAROUNDS + int err; + int i; +#endif uint32_t cr; struct at91_usart_softc *atsc; @@ -345,6 +348,7 @@ sc->sc_rxfifosz = USART_BUFFER_SIZE; sc->sc_hwiflow = 0; +#ifndef SKYEYE_WORKAROUNDS /* * Allocate DMA tags and maps */ @@ -374,6 +378,7 @@ atsc->ping = &atsc->ping_pong[0]; atsc->pong = &atsc->ping_pong[1]; } +#endif /* * Prime the pump with the RX buffer. We use two 64 byte bounce @@ -407,9 +412,13 @@ WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); } WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK); +#ifndef SKYEYE_WORKAROUNDS errout:; // XXX bad return (err); +#else + return (0); +#endif } static int ==== //depot/projects/soc2006/intr_filter/arm/sa11x0/assabet_machdep.c#5 (text+ko) ==== @@ -47,7 +47,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.21 2006/12/06 06:34:54 julian Exp $"); #include "opt_md.h" @@ -422,11 +422,7 @@ /* Set stack for exception handlers */ -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/ep80219_machdep.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.4 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.5 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -429,11 +429,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_space.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.6 2006/11/20 13:21:02 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.7 2006/12/02 13:37:29 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,6 +139,42 @@ generic_armv4_bs_c_2, NULL, NULL, + + /* read (single) stream */ + generic_bs_r_1, + generic_armv4_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple stream */ + generic_bs_rm_1, + generic_armv4_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region stream */ + generic_bs_rr_1, + generic_armv4_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) stream */ + generic_bs_w_1, + generic_armv4_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple stream */ + generic_bs_wm_1, + generic_armv4_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region stream */ + NULL, + generic_armv4_bs_wr_2, + generic_bs_wr_4, + NULL, }; void ==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq31244_machdep.c#6 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.25 2006/11/17 00:53:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.26 2006/12/06 06:34:54 julian Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -427,11 +427,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); -#ifdef KSE - proc_linkup(&proc0, &ksegrp0, &thread0); -#else proc_linkup(&proc0, &thread0); -#endif thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; ==== //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.2 2006/12/06 06:34:54 julian Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612151356.kBFDuFcw037626>