Mercurial > illumos > illumos-gate

changeset 13972:e844373201f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3426 assertion failed: irq < 16 on VMware hardware version 9 (apix related) Reviewed by: Albert Lee <trisk@nexenta.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Boris Protopopov <boris.protopopov@nexenta.com> Reviewed by: Ilya Usvyatsky <ilya.usvyatsky@nexenta.com> Reviewed by: Marcel Telka <marcel.telka@nexenta.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Rich Lowe <richlowe@richlowe.net> Reviewed by: Garrett D'Amore <garrett@damore.org> Approved by: Gordon Ross <gwr@nexenta.com>
author Hans Rosenfeld <hans.rosenfeld@nexenta.com>
date Wed, 27 Feb 2013 21:13:42 +0100
parents d1648d817bd6
children 4972ab336f54
files usr/src/uts/i86pc/io/apix/apix_utils.c
diffstat 1 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/i86pc/io/apix/apix_utils.c	Mon Feb 25 21:41:47 2013 -0800
+++ b/usr/src/uts/i86pc/io/apix/apix_utils.c	Wed Feb 27 21:13:42 2013 +0100
@@ -26,6 +26,9 @@
  * Copyright (c) 2010, Intel Corporation.
  * All rights reserved.
  */
+/*
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ */
 
 #include <sys/processor.h>
 #include <sys/time.h>
@@ -1829,26 +1832,39 @@
 	ulong_t iflag;
 	struct autovec *avp;
 
-	irqp = apic_irq_table[irqno];
 	ioapicindex = acpi_find_ioapic(irqno);
 	ASSERT(ioapicindex != 0xFF);
 	ipin = irqno - apic_io_vectbase[ioapicindex];
 
-	if ((irqp != NULL) && (irqp->airq_mps_intr_index == ACPI_INDEX)) {
+	mutex_enter(&airq_mutex);
+	irqp = apic_irq_table[irqno];
+
+	/*
+	 * The irq table entry shouldn't exist unless the interrupts are shared.
+	 * In that case, make sure it matches what we would initialize it to.
+	 */
+	if (irqp != NULL) {
+		ASSERT(irqp->airq_mps_intr_index == ACPI_INDEX);
 		ASSERT(irqp->airq_intin_no == ipin &&
 		    irqp->airq_ioapicindex == ioapicindex);
 		vecp = xv_vector(irqp->airq_cpu, irqp->airq_vector);
 		ASSERT(!IS_VECT_FREE(vecp));
+		mutex_exit(&airq_mutex);
 	} else {
-		vecp = apix_alloc_intx(NULL, 0, irqno);
+		irqp = kmem_zalloc(sizeof (apic_irq_t), KM_SLEEP);
 
-		irqp = apic_irq_table[irqno];
+		irqp->airq_cpu = IRQ_UNINIT;
+		irqp->airq_origirq = (uchar_t)irqno;
 		irqp->airq_mps_intr_index = ACPI_INDEX;
 		irqp->airq_ioapicindex = ioapicindex;
 		irqp->airq_intin_no = ipin;
 		irqp->airq_iflag = *flagp;
 		irqp->airq_share++;
-		apic_record_rdt_entry(irqp, irqno);
+
+		apic_irq_table[irqno] = irqp;
+		mutex_exit(&airq_mutex);
+
+		vecp = apix_alloc_intx(NULL, 0, irqno);
 	}
 
 	/* copy over autovect */