PSARC/2009/505 IRM Framework Extension(s)

PSARC/2009/665 Pcitool Extensions
6669984 Solaris x86 need to provide large number of interrupt vectors for MSI/MSI-x
6866130 Interrupt Resource Management (IRM) support on x86 platforms
6876744 Need a new mdb debugger module for the new apix PSM
6881939 decouple current i86xpv interrupt implementation from i86pc
6916041 Pcitool Enhancement(1M) for the new apix PSM on X86
6957091 update pcitool(1m) manpage for 6916041

--HG--
rename : usr/src/cmd/mdb/i86pc/modules/pcplusmp/apic.c => usr/src/cmd/mdb/i86pc/modules/pcplusmp/pcplusmp.c

1 files changed, 6 insertions, 7 deletions

diff --git a/usr/src/cmd/intrd/intrd.pl b/usr/src/cmd/intrd/intrd.pl
index 004909327b..78276e34b3 100644
--- a/usr/src/cmd/intrd/intrd.pl
+++ b/usr/src/cmd/intrd/intrd.pl
@@ -21,8 +21,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 require 5.8.4;
@@ -66,7 +65,7 @@ while ($_ = shift @ARGV) {
 if ($using_scengen == 0) {
 	require Sun::Solaris::Kstat;
 	require Sun::Solaris::Intrs;
-	import Sun::Solaris::Intrs(qw(intrmove is_pcplusmp));
+	import Sun::Solaris::Intrs(qw(intrmove is_apic));
 	require Sys::Syslog;
 	import Sys::Syslog;
 	openlog($cmdname, 'pid', 'daemon');
@@ -937,8 +936,8 @@ sub do_reconfig($)
 		while (my ($inum, $ivec) = each %{$cpu->{ivecs}}) {
 			next if ($ivec->{origcpu} == $cpuid);
 
-			if (!intrmove($ivec->{buspath}, $ivec->{ino},
-			    $cpuid, $ivec->{num_ino})) {
+			if (!intrmove($ivec->{buspath}, $ivec->{origcpu},
+			    $ivec->{ino}, $cpuid, $ivec->{num_ino})) {
 				syslog('warning', "Unable to move interrupts")
 				    if $warned++ == 0;
 				syslog('debug', "Unable to move buspath ".
@@ -1275,8 +1274,8 @@ my $elem0 = $elem[0];
 my $elemval = (values(%$elem0))[0];
 
 # Use its buspath to query the system.  It is assumed that either all or none
-# of the busses on a system are hosted by the pcplusmp APIC.
-my $pcplusmp_sys = is_pcplusmp($elemval->{buspath});
+# of the busses on a system are hosted by the pcplusmp APIC or APIX.
+my $pcplusmp_sys = is_apic($elemval->{buspath});
 
 my $stat = getstat($ks, $pcplusmp_sys);