Date: Mon, 6 Mar 2006 20:34:18 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 92876 for review Message-ID: <200603062034.k26KYID0098582@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=92876 Change 92876 by marcel@marcel_nfs on 2006/03/06 20:33:37 IFC @92871 Affected files ... .. //depot/projects/uart/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/uart/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/uart/amd64/conf/NOTES#6 integrate .. //depot/projects/uart/amd64/include/apicvar.h#8 integrate .. //depot/projects/uart/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/uart/amd64/include/mptable.h#3 integrate .. //depot/projects/uart/amd64/isa/atpic.c#4 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/uart/arm/arm/pmap.c#10 integrate .. //depot/projects/uart/arm/arm/trap.c#11 integrate .. //depot/projects/uart/arm/arm/undefined.c#10 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#10 integrate .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/uart/arm/include/pmap.h#8 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/uart/bsm/audit.h#3 integrate .. //depot/projects/uart/bsm/audit_internal.h#2 integrate .. //depot/projects/uart/coda/coda.h#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/uart/conf/NOTES#30 integrate .. //depot/projects/uart/conf/files#50 integrate .. //depot/projects/uart/conf/files.alpha#13 integrate .. //depot/projects/uart/conf/files.amd64#17 integrate .. //depot/projects/uart/conf/files.i386#22 integrate .. //depot/projects/uart/conf/files.ia64#15 integrate .. //depot/projects/uart/conf/files.pc98#19 integrate .. //depot/projects/uart/conf/files.powerpc#6 integrate .. //depot/projects/uart/conf/files.sparc64#14 integrate .. //depot/projects/uart/conf/options#24 integrate .. //depot/projects/uart/conf/options.i386#11 integrate .. //depot/projects/uart/conf/options.pc98#10 integrate .. //depot/projects/uart/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/uart/dev/ata/ata-all.c#18 integrate .. //depot/projects/uart/dev/ata/ata-all.h#12 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#12 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#15 integrate .. //depot/projects/uart/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/uart/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/uart/dev/ath/if_ath.c#24 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#18 integrate .. //depot/projects/uart/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/uart/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/uart/dev/de/dc21040reg.h#1 branch .. //depot/projects/uart/dev/de/if_de.c#1 branch .. //depot/projects/uart/dev/de/if_devar.h#1 branch .. //depot/projects/uart/dev/iir/iir.c#8 integrate .. //depot/projects/uart/dev/iir/iir.h#8 integrate .. //depot/projects/uart/dev/iir/iir_pci.c#10 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/uart/dev/kbd/kbd.c#7 integrate .. //depot/projects/uart/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_type.h#8 integrate .. //depot/projects/uart/dev/mpt/mpt.c#9 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/uart/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/uart/dev/ral/if_ral.c#6 delete .. //depot/projects/uart/dev/ral/if_ral_pccard.c#4 delete .. //depot/projects/uart/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/uart/dev/ral/if_ralreg.h#4 delete .. //depot/projects/uart/dev/ral/if_ralvar.h#4 delete .. //depot/projects/uart/dev/ral/rt2560.c#1 branch .. //depot/projects/uart/dev/ral/rt2560reg.h#1 branch .. //depot/projects/uart/dev/ral/rt2560var.h#1 branch .. //depot/projects/uart/dev/ral/rt2661.c#1 branch .. //depot/projects/uart/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/uart/dev/ral/rt2661reg.h#1 branch .. //depot/projects/uart/dev/ral/rt2661var.h#1 branch .. //depot/projects/uart/dev/re/if_re.c#16 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#17 integrate .. //depot/projects/uart/dev/syscons/syscons.c#13 integrate .. //depot/projects/uart/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/uart/dev/tdfx/tdfx_pci.c#8 integrate .. //depot/projects/uart/dev/usb/ehci.c#14 integrate .. //depot/projects/uart/dev/usb/ohci.c#16 integrate .. //depot/projects/uart/dev/usb/uhci.c#15 integrate .. //depot/projects/uart/dev/usb/ukbd.c#8 integrate .. //depot/projects/uart/dev/usb/umass.c#17 integrate .. //depot/projects/uart/dev/usb/uplcom.c#13 integrate .. //depot/projects/uart/dev/usb/usb_port.h#12 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#15 integrate .. //depot/projects/uart/dev/usb/usbdevs#19 integrate .. //depot/projects/uart/dev/usb/usbdivar.h#8 integrate .. //depot/projects/uart/dev/vkbd/vkbd.c#6 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/uart/geom/geom_io.c#9 integrate .. //depot/projects/uart/geom/geom_vfs.c#5 integrate .. //depot/projects/uart/geom/label/g_label_ufs.c#7 integrate .. //depot/projects/uart/i386/conf/NOTES#16 integrate .. //depot/projects/uart/i386/conf/PAE#9 integrate .. //depot/projects/uart/i386/conf/XBOX#3 integrate .. //depot/projects/uart/i386/i386/geode.c#5 integrate .. //depot/projects/uart/i386/i386/identcpu.c#17 integrate .. //depot/projects/uart/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/uart/i386/i386/io_apic.c#7 integrate .. //depot/projects/uart/i386/i386/local_apic.c#9 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#19 integrate .. //depot/projects/uart/i386/include/apicvar.h#8 integrate .. //depot/projects/uart/i386/include/intr_machdep.h#5 integrate .. //depot/projects/uart/i386/include/xbox.h#3 integrate .. //depot/projects/uart/i386/isa/atpic.c#5 integrate .. //depot/projects/uart/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/uart/isa/syscons_isa.c#5 integrate .. //depot/projects/uart/kern/init_sysent.c#15 integrate .. //depot/projects/uart/kern/kern_cpu.c#5 integrate .. //depot/projects/uart/kern/kern_malloc.c#13 integrate .. //depot/projects/uart/kern/kern_mbuf.c#8 integrate .. //depot/projects/uart/kern/kern_sig.c#25 integrate .. //depot/projects/uart/kern/kern_tc.c#12 integrate .. //depot/projects/uart/kern/kern_time.c#8 integrate .. //depot/projects/uart/kern/syscalls.c#15 integrate .. //depot/projects/uart/kern/syscalls.master#15 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#4 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#15 integrate .. //depot/projects/uart/kern/vfs_aio.c#13 integrate .. //depot/projects/uart/kern/vfs_subr.c#22 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#21 integrate .. //depot/projects/uart/modules/3dfx/Makefile#3 integrate .. //depot/projects/uart/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/uart/modules/Makefile#27 integrate .. //depot/projects/uart/modules/ce/Makefile#2 integrate .. //depot/projects/uart/modules/coda5/Makefile#5 integrate .. //depot/projects/uart/modules/crypto/Makefile#4 integrate .. //depot/projects/uart/modules/de/Makefile#5 integrate .. //depot/projects/uart/modules/if_ppp/Makefile#5 integrate .. //depot/projects/uart/modules/kbdmux/Makefile#3 integrate .. //depot/projects/uart/modules/ral/Makefile#3 integrate .. //depot/projects/uart/modules/smbfs/Makefile#5 integrate .. //depot/projects/uart/net/bridgestp.c#5 integrate .. //depot/projects/uart/net/if_bridge.c#6 integrate .. //depot/projects/uart/net/if_bridgevar.h#5 integrate .. //depot/projects/uart/net/if_ethersubr.c#15 integrate .. //depot/projects/uart/net/ppp_deflate.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#15 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#16 integrate .. //depot/projects/uart/net80211/ieee80211_node.h#13 integrate .. //depot/projects/uart/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#14 integrate .. //depot/projects/uart/netinet/ip_fw2.c#19 integrate .. //depot/projects/uart/netinet/tcp_input.c#17 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#14 integrate .. //depot/projects/uart/netinet/tcp_var.h#10 integrate .. //depot/projects/uart/netinet6/mld6.c#8 integrate .. //depot/projects/uart/netsmb/smb_crypt.c#4 integrate .. //depot/projects/uart/netsmb/smb_smb.c#4 integrate .. //depot/projects/uart/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/uart/opencrypto/crypto.c#5 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#8 integrate .. //depot/projects/uart/pc98/conf/NOTES#15 integrate .. //depot/projects/uart/pci/dc21040reg.h#2 delete .. //depot/projects/uart/pci/if_de.c#9 delete .. //depot/projects/uart/pci/if_devar.h#6 delete .. //depot/projects/uart/security/audit/audit.c#3 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/uart/security/audit/audit_pipe.c#2 integrate .. //depot/projects/uart/security/audit/audit_private.h#2 integrate .. //depot/projects/uart/security/mac/mac_process.c#4 integrate .. //depot/projects/uart/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#10 integrate .. //depot/projects/uart/sys/_types.h#6 integrate .. //depot/projects/uart/sys/ata.h#9 integrate .. //depot/projects/uart/sys/bio.h#7 integrate .. //depot/projects/uart/sys/mount.h#14 integrate .. //depot/projects/uart/sys/proc.h#20 integrate .. //depot/projects/uart/sys/queue.h#8 integrate .. //depot/projects/uart/sys/signalvar.h#7 integrate .. //depot/projects/uart/sys/syscall.h#14 integrate .. //depot/projects/uart/sys/syscall.mk#14 integrate .. //depot/projects/uart/sys/syscallsubr.h#10 integrate .. //depot/projects/uart/sys/sysproto.h#14 integrate .. //depot/projects/uart/sys/timers.h#4 integrate .. //depot/projects/uart/sys/vnode.h#16 integrate .. //depot/projects/uart/ufs/ffs/ffs_alloc.c#8 integrate .. //depot/projects/uart/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/uart/ufs/ffs/ffs_rawread.c#9 integrate .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#15 integrate .. //depot/projects/uart/ufs/ffs/softdep.h#4 integrate .. //depot/projects/uart/ufs/ufs/ufsmount.h#6 integrate .. //depot/projects/uart/vm/vm_contig.c#15 integrate .. //depot/projects/uart/vm/vm_object.c#21 integrate .. //depot/projects/uart/vm/vnode_pager.c#18 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/intr_machdep.c#8 (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.18 2005/12/08 18:33:29 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ */ /* @@ -63,6 +63,12 @@ static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +#ifdef SMP +static int assign_cpu; + +static void intr_assign_next_cpu(struct intsrc *isrc); +#endif + static void intr_init(void *__dummy); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); @@ -93,6 +99,7 @@ } intrcnt_register(isrc); interrupt_sources[vector] = isrc; + isrc->is_enabled = 0; mtx_unlock_spin(&intr_table_lock); return (0); } @@ -118,7 +125,17 @@ intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); - isrc->is_pic->pic_enable_intr(isrc); + mtx_lock_spin(&intr_table_lock); + if (!isrc->is_enabled) { + isrc->is_enabled = 1; +#ifdef SMP + if (assign_cpu) + intr_assign_next_cpu(isrc); +#endif + mtx_unlock_spin(&intr_table_lock); + isrc->is_pic->pic_enable_intr(isrc); + } else + mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_source(isrc); } return (error); @@ -335,3 +352,76 @@ db_dump_intr_event((*isrc)->is_event, verbose); } #endif + +#ifdef SMP +/* + * Support for balancing interrupt sources across CPUs. For now we just + * allocate CPUs round-robin. + */ + +static u_int cpu_apic_ids[MAXCPU]; +static int current_cpu, num_cpus; + +static void +intr_assign_next_cpu(struct intsrc *isrc) +{ + struct pic *pic; + u_int apic_id; + + /* + * Assign this source to a local APIC in a round-robin fashion. + */ + pic = isrc->is_pic; + apic_id = cpu_apic_ids[current_cpu]; + current_cpu++; + if (current_cpu >= num_cpus) + current_cpu = 0; + if (bootverbose) { + printf("INTR: Assigning IRQ %d", pic->pic_vector(isrc)); + printf(" to local APIC %u\n", apic_id); + } + pic->pic_assign_cpu(isrc, apic_id); +} + +/* + * Add a local APIC ID to our list of valid local APIC IDs that can + * be destinations of interrupts. + */ +void +intr_add_cpu(u_int apic_id) +{ + + if (bootverbose) + printf("INTR: Adding local APIC %d as a target\n", apic_id); + if (num_cpus >= MAXCPU) + panic("WARNING: Local APIC IDs exhausted!"); + cpu_apic_ids[num_cpus] = apic_id; + num_cpus++; +} + +/* + * Distribute all the interrupt sources among the available CPUs once the + * AP's have been launched. + */ +static void +intr_shuffle_irqs(void *arg __unused) +{ + struct intsrc *isrc; + int i; + + /* Don't bother on UP. */ + if (num_cpus <= 1) + return; + + /* Round-robin assign each enabled source a CPU. */ + mtx_lock_spin(&intr_table_lock); + assign_cpu = 1; + for (i = 0; i < NUM_IO_INTS; i++) { + isrc = interrupt_sources[i]; + if (isrc != NULL && isrc->is_enabled) + intr_assign_next_cpu(isrc); + } + mtx_unlock_spin(&intr_table_lock); +} +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +#endif ==== //depot/projects/uart/amd64/amd64/io_apic.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.20 2005/11/16 20:29:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -61,8 +61,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define DEST_NONE -1 - #define TODO printf("%s: not implemented!\n", __func__) static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); @@ -82,10 +80,10 @@ u_int io_irq; u_int io_intpin:8; u_int io_vector:8; + u_int io_cpu:8; u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; - int io_dest:5; int io_bus:4; }; @@ -114,7 +112,7 @@ enum intr_polarity pol); static void ioapic_suspend(struct intsrc *isrc); static void ioapic_resume(struct intsrc *isrc); -static void ioapic_program_destination(struct ioapic_intsrc *intpin); +static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -122,10 +120,10 @@ ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, ioapic_suspend, ioapic_resume, - ioapic_config_intr }; - -static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; -static u_int next_id, program_logical_dest; + ioapic_config_intr, ioapic_assign_cpu }; + +static int next_ioapic_base; +static u_int next_id; SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); static int enable_extint; @@ -273,14 +271,8 @@ } /* Set the destination. */ - if (intpin->io_dest == DEST_NONE) { - low = IOART_DESTPHY; - high = bsp_id << APIC_ID_SHIFT; - } else { - low = IOART_DESTLOG; - high = (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | - APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; - } + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; /* Program the rest of the low word. */ if (intpin->io_edgetrigger) @@ -312,7 +304,7 @@ default: KASSERT(intpin->io_vector != 0, ("No vector for IRQ %u", intpin->io_irq)); - low |= IOART_DELLOPRI | intpin->io_vector; + low |= IOART_DELFIXED | intpin->io_vector; } /* Write the values to the APIC. */ @@ -325,60 +317,31 @@ mtx_unlock_spin(&icu_lock); } -/* - * Program an individual intpin's logical destination. - */ static void -ioapic_program_destination(struct ioapic_intsrc *intpin) +ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id) { - struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + struct ioapic *io = (struct ioapic *)isrc->is_pic; - KASSERT(intpin->io_dest != DEST_NONE, - ("intpin not assigned to a cluster")); + intpin->io_cpu = apic_id; if (bootverbose) { - printf("ioapic%u: routing intpin %u (", io->io_id, - intpin->io_intpin); + printf("ioapic%u: Assigning ", io->io_id); ioapic_print_irq(intpin); - printf(") to cluster %u\n", intpin->io_dest); + printf(" to local APIC %u\n", intpin->io_cpu); } ioapic_program_intpin(intpin); } static void -ioapic_assign_cluster(struct ioapic_intsrc *intpin) -{ - - /* - * Assign this intpin to a logical APIC cluster in a - * round-robin fashion. We don't actually use the logical - * destination for this intpin until after all the CPU's - * have been started so that we don't end up with interrupts - * that don't go anywhere. Another alternative might be to - * start up the CPU's earlier so that they can handle interrupts - * sooner. - */ - intpin->io_dest = current_cluster; - current_cluster++; - if (current_cluster >= logical_clusters) - current_cluster = 0; - if (program_logical_dest) - ioapic_program_destination(intpin); -} - -static void ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - if (intpin->io_dest == DEST_NONE) { + if (intpin->io_vector == 0) { /* * Allocate an APIC vector for this interrupt pin. Once - * we have a vector we program the interrupt pin. Note - * that after we have booted ioapic_assign_cluster() - * will program the interrupt pin again, but it doesn't - * hurt to do that and trying to avoid that adds needless - * complication. + * we have a vector we program the interrupt pin. */ intpin->io_vector = apic_alloc_vector(intpin->io_irq); if (bootverbose) { @@ -388,7 +351,6 @@ printf(") to vector %u\n", intpin->io_vector); } ioapic_program_intpin(intpin); - ioapic_assign_cluster(intpin); apic_enable_vector(intpin->io_vector); } } @@ -469,22 +431,6 @@ } /* - * Allocate and return a logical cluster ID. Note that the first time - * this is called, it returns cluster 0. ioapic_enable_intr() treats - * the two cases of logical_clusters == 0 and logical_clusters == 1 the - * same: one cluster of ID 0 exists. The logical_clusters == 0 case is - * for UP kernels, which should never call this function. - */ -int -ioapic_next_logical_cluster(void) -{ - - if (logical_clusters >= APIC_MAX_CLUSTER) - panic("WARNING: Local APIC cluster IDs exhausted!"); - return (logical_clusters++); -} - -/* * Create a plain I/O APIC object. */ void * @@ -568,11 +514,10 @@ } /* - * Route interrupts to the BSP by default using physical - * addressing. Vectored interrupts get readdressed using - * logical IDs to CPU clusters when they are enabled. + * Route interrupts to the BSP by default. Interrupts may + * be routed to other CPUs later after they are enabled. */ - intpin->io_dest = DEST_NONE; + intpin->io_cpu = PCPU_GET(apic_id); if (bootverbose && intpin->io_irq != IRQ_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); ioapic_print_irq(intpin); @@ -778,29 +723,9 @@ printf("ioapic%u <Version %u.%u> irqs %u-%u on motherboard\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); - bsp_id = PCPU_GET(apic_id); /* Register valid pins as interrupt sources. */ for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); } - -/* - * Program all the intpins to use logical destinations once the AP's - * have been launched. - */ -static void -ioapic_set_logical_destinations(void *arg __unused) -{ - struct ioapic *io; - int i; - - program_logical_dest = 1; - STAILQ_FOREACH(io, &ioapic_list, io_next) - for (i = 0; i < io->io_numintr; i++) - if (io->io_pins[i].io_dest != DEST_NONE) - ioapic_program_destination(&io->io_pins[i]); -} -SYSINIT(ioapic_destinations, SI_SUB_SMP, SI_ORDER_SECOND, - ioapic_set_logical_destinations, NULL) ==== //depot/projects/uart/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.23 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.24 2006/02/28 22:24:54 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -217,6 +217,7 @@ /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); + intr_add_cpu(PCPU_GET(apic_id)); /* Local APIC timer interrupt. */ setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); @@ -279,7 +280,7 @@ lapic_setup(void) { struct lapic *la; - u_int32_t value, maxlvt; + u_int32_t maxlvt; register_t eflags; char buf[MAXCOMLEN + 1]; @@ -291,19 +292,6 @@ /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); - /* Use the cluster model for logical IDs. */ - value = lapic->dfr; - value &= ~APIC_DFR_MODEL_MASK; - value |= APIC_DFR_MODEL_CLUSTER; - lapic->dfr = value; - - /* Set this APIC's logical ID. */ - value = lapic->ldr; - value &= ~APIC_ID_MASK; - value |= (la->la_cluster << APIC_ID_CLUSTER_SHIFT | - 1 << la->la_cluster_id) << APIC_ID_SHIFT; - lapic->ldr = value; - /* Setup spurious vector and enable the local APIC. */ lapic_enable(); ==== //depot/projects/uart/amd64/amd64/mp_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.268 2006/02/07 21:22:01 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.269 2006/02/28 22:24:54 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -160,7 +160,7 @@ static u_int boot_address; -static void set_logical_apic_ids(void); +static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); @@ -405,7 +405,7 @@ hyperthreading_cpus = logical_cpus; } - set_logical_apic_ids(); + set_interrupt_apic_ids(); } @@ -596,33 +596,29 @@ */ /* - * Set the APIC logical IDs. - * - * We want to cluster logical CPU's within the same APIC ID cluster. - * Since logical CPU's are aligned simply filling in the clusters in - * APIC ID order works fine. Note that this does not try to balance - * the number of CPU's in each cluster. (XXX?) + * We tell the I/O APIC code about all the CPUs we want to receive + * interrupts. If we don't want certain CPUs to receive IRQs we + * can simply not tell the I/O APIC code about them in this function. + * We also do not tell it about the BSP since it tells itself about + * the BSP internally to work with UP kernels and on UP machines. */ static void -set_logical_apic_ids(void) +set_interrupt_apic_ids(void) { - u_int apic_id, cluster, cluster_id; + u_int apic_id; - /* Force us to allocate cluster 0 at the start. */ - cluster = -1; - cluster_id = APIC_MAX_INTRACLUSTER_ID; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; - if (cluster_id == APIC_MAX_INTRACLUSTER_ID) { - cluster = ioapic_next_logical_cluster(); - cluster_id = 0; - } else - cluster_id++; - if (bootverbose) - printf("APIC ID: physical %u, logical %u:%u\n", - apic_id, cluster, cluster_id); - lapic_set_logical_id(apic_id, cluster, cluster_id); + if (cpu_info[apic_id].cpu_bsp) + continue; +#if 0 + /* Don't let hyperthreads service interrupts. */ + if (hyperthreading_cpus > 1 && + apic_id % hyperthreading_cpus != 0) + continue; +#endif + intr_add_cpu(apic_id); } } ==== //depot/projects/uart/amd64/conf/NOTES#6 (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.51 2005/12/03 01:23:49 anholt Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.52 2006/03/06 15:29:28 yar Exp $ # # @@ -170,11 +170,10 @@ # the tdfx DRI module from XFree86 and is completely unrelated. # # To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. +# config as well. The other option is to load both as modules. device tdfx # Enable 3Dfx Voodoo support -#XXX#options TDFX_LINUX # Enable Linuxulator support +#XXX#device tdfx_linux # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference ==== //depot/projects/uart/amd64/include/apicvar.h#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.16 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.17 2006/02/28 22:24:54 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -181,7 +181,6 @@ void *ioapic_create(uintptr_t addr, int32_t id, int intbase); int ioapic_disable_pin(void *cookie, u_int pin); int ioapic_get_vector(void *cookie, u_int pin); -int ioapic_next_logical_cluster(void); void ioapic_register(void *cookie); int ioapic_remap_vector(void *cookie, u_int pin, int vector); int ioapic_set_bus(void *cookie, u_int pin, int bus_type); ==== //depot/projects/uart/amd64/include/intr_machdep.h#4 (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.8 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.9 2006/02/28 22:24:54 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -85,6 +85,7 @@ void (*pic_resume)(struct intsrc *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); + void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); }; /* Flags for pic_disable_source() */ @@ -105,6 +106,7 @@ u_long *is_count; u_long *is_straycount; u_int is_index; + u_int is_enabled:1; }; struct trapframe; @@ -117,6 +119,11 @@ enum intr_trigger elcr_read_trigger(u_int irq); void elcr_resume(void); void elcr_write_trigger(u_int irq, enum intr_trigger trigger); +#ifdef SMP +void intr_add_cpu(u_int apic_id); +#else +#define intr_add_cpu(apic_id) +#endif int intr_add_handler(const char *name, int vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, ==== //depot/projects/uart/amd64/include/mptable.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.222 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.223 2006/03/01 05:59:56 sam Exp $ */ #ifndef __MACHINE_MPTABLE_H__ @@ -139,7 +139,8 @@ char name[16]; } basetable_entry; +#ifdef _KERNEL int mptable_pci_probe_table(int bus); int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin); - +#endif #endif /* !__MACHINE_MPTABLE_H__ */ ==== //depot/projects/uart/amd64/isa/atpic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.18 2005/12/08 18:33:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.19 2006/02/28 22:24:54 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -108,8 +108,8 @@ #define ATPIC(io, base, eoi, imenptr) \ { { atpic_enable_source, atpic_disable_source, (eoi), \ atpic_enable_intr, atpic_vector, atpic_source_pending, NULL, \ - atpic_resume, atpic_config_intr }, (io), (base), \ - IDT_IO_INTS + (base), (imenptr) } + atpic_resume, atpic_config_intr, atpic_assign_cpu }, (io), \ + (base), IDT_IO_INTS + (base), (imenptr) } #define INTSRC(irq) \ { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \ @@ -142,6 +142,7 @@ static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); +static void atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void i8259_init(struct atpic *pic, int slave); static struct atpic atpics[] = { @@ -353,6 +354,17 @@ } static void +atpic_assign_cpu(struct intsrc *isrc, u_int apic_id) +{ + + /* + * 8259A's are only used in UP in which case all interrupts always + * go to the sole CPU and this function shouldn't even be called. + */ + panic("%s: bad cookie", __func__); +} + +static void i8259_init(struct atpic *pic, int slave) { int imr_addr; ==== //depot/projects/uart/arm/arm/busdma_machdep.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.24 2005/10/03 22:44:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.25 2006/03/01 23:04:25 cognet Exp $"); /* * MacPPC bus dma support routines @@ -93,6 +93,8 @@ bus_dma_tag_t dmat; int flags; void *buffer; + void *origbuffer; + void *allocbuffer; TAILQ_ENTRY(bus_dmamap) freelist; int len; }; @@ -416,6 +418,23 @@ *mapp = NULL; return (ENOMEM); } + if (flags & BUS_DMA_COHERENT) { + void *tmpaddr = arm_remap_nocache( + (void *)((vm_offset_t)*vaddr &~ PAGE_MASK), + dmat->maxsize + ((vm_offset_t)*vaddr & PAGE_MASK)); + + if (tmpaddr) { + tmpaddr = (void *)((vm_offset_t)(tmpaddr) + + ((vm_offset_t)*vaddr & PAGE_MASK)); + newmap->origbuffer = *vaddr; + newmap->allocbuffer = tmpaddr; + cpu_idcache_wbinv_range((vm_offset_t)*vaddr, + dmat->maxsize); + *vaddr = tmpaddr; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; return (0); } @@ -426,6 +445,12 @@ void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) { + if (map->allocbuffer) { + KASSERT(map->allocbuffer == vaddr, + ("Trying to freeing the wrong DMA buffer")); + vaddr = map->origbuffer; + arm_unmap_nocache(map->allocbuffer, dmat->maxsize); + } if (dmat->maxsize <= PAGE_SIZE) free(vaddr, M_DEVBUF); else { ==== //depot/projects/uart/arm/arm/pmap.c#10 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.41 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.42 2006/03/01 23:04:25 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -2553,9 +2553,12 @@ virtual_avail = round_page(virtual_avail); virtual_end = lastaddr; kernel_vm_end = pmap_curmaxkvaddr; + arm_nocache_startaddr = lastaddr; + #ifdef ARM_USE_SMALL_ALLOC mtx_init(&smallalloc_mtx, "Small alloc page list", NULL, MTX_DEF); - alloc_firstaddr = alloc_curaddr = lastaddr; + alloc_firstaddr = alloc_curaddr = arm_nocache_startaddr + + ARM_NOCACHE_KVA_SIZE; #endif } @@ -2916,6 +2919,13 @@ } void +pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa) +{ + + pmap_kenter_internal(va, pa, 0); +} + +void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa) { ==== //depot/projects/uart/arm/arm/trap.c#11 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.21 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); #include <sys/types.h> @@ -428,15 +428,14 @@ error = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); pcb->pcb_onfault = onfault; - if (__predict_true(error == 0)) { - goto out; - } if (map != kernel_map) { PROC_LOCK(p); p->p_lock--; PROC_UNLOCK(p); } + if (__predict_true(error == 0)) + goto out; if (user == 0) { if (pcb->pcb_onfault) { tf->tf_r0 = error; @@ -930,6 +929,8 @@ AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); AUDIT_SYSCALL_EXIT(error, td); + KASSERT(td->td_ar == NULL, + ("returning from syscall with td_ar set!")); } switch (error) { case 0: ==== //depot/projects/uart/arm/arm/undefined.c#10 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.11 2006/02/22 18:57:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.12 2006/03/01 18:33:45 cognet Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -212,7 +212,7 @@ ksi.ksi_code = ILL_ILLADR; ksi.ksi_addr = (u_int32_t *)(intptr_t) fault_pc; trapsignal(td, &ksi); - userret(td, frame, 0); + userret(td, frame); return; } @@ -317,6 +317,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603062034.k26KYID0098582>