http://defect.opensolaris.org/bz/show_bug.cgi?id=5295
Bill Holler <bill.holler at sun.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|CAUSEKNOWN |CLOSED
Resolution| |FIXED
--- Comment #3 from Bill Holler <bill.holler at sun.com> 2009-01-14 11:41:13
---
(In reply to comment #2)
The proposed patch to add hpet_acpi.o into the i86xpv pcplusmp module
does not work because i86xpv does not contain APIC Timer access
code required by hpet_acpi.o.
According to the xpv folks the HPET will not be visible in an xpv domain
any time soon. We will work on HPET support in xpv when it becomes available
in the future.
The fix being pushed removes calls from pcplusmp into hpet_acpi.o.
The fix has been tested on xpv.
*Note: HVM has not yet been tested.*
diff -r ee73751171e9 -r a1a626af1ba1 usr/src/uts/i86pc/io/mp_platform_common.c
--- a/usr/src/uts/i86pc/io/mp_platform_common.c Sat Jan 10 14:31:08 2009 -0800
+++ b/usr/src/uts/i86pc/io/mp_platform_common.c Tue Jan 13 20:56:32 2009 -0800
@@ -39,7 +39,6 @@
#include <sys/cram.h>
#include <sys/acpi/acpi.h>
#include <sys/acpica.h>
-#include <sys/hpet_acpi.h>
#include <sys/psm_common.h>
#include <sys/apic.h>
#include <sys/pit.h>
@@ -63,6 +62,9 @@
#include <sys/note.h>
#include <sys/pci_intr_lib.h>
#include <sys/sunndi.h>
+#if !defined(__xpv)
+#include <sys/hpet_acpi.h>
+#endif
/*
@@ -104,9 +106,11 @@
int apic_sci_vect = -1;
iflag_t apic_sci_flags;
+#if !defined(__xpv)
/* ACPI HPET interrupt configuration; -1 if HPET not used */
int apic_hpet_vect = -1;
iflag_t apic_hpet_flags;
+#endif
/*
* psm name pointer
@@ -898,13 +902,16 @@
"?Using ACPI for CPU/IOAPIC information ONLY\n");
}
+#if !defined(__xpv)
/*
* probe ACPI for hpet information here which is used later
* in apic_picinit().
*/
- if (hpet_acpi_init(&apic_hpet_vect, &apic_hpet_flags) < 0) {
+ if (hpet_acpi_init(&apic_hpet_vect, &apic_hpet_flags) !=
+ DDI_SUCCESS) {
cmn_err(CE_NOTE, "!ACPI HPET table query failed\n");
}
+#endif
return (PSM_SUCCESS);
}
@@ -1339,6 +1346,7 @@
irqptr->airq_share++;
}
+#if !defined(__xpv)
/*
* Hack alert: deal with ACPI HPET interrupt chicken/egg here.
*/
@@ -1370,6 +1378,7 @@
irqptr->airq_share++;
}
+#endif /* !defined(__xpv) */
}
/*
--
Configure bugmail: http://defect.opensolaris.org/bz/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
