From owner-svn-src-projects@FreeBSD.ORG  Thu May  5 03:57:44 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32B4F106566C;
	Thu,  5 May 2011 03:57:44 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 219EB8FC15;
	Thu,  5 May 2011 03:57:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p453viuM080680;
	Thu, 5 May 2011 03:57:44 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p453viAv080678;
	Thu, 5 May 2011 03:57:44 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201105050357.p453viAv080678@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 5 May 2011 03:57:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221481 - projects/altix/sys/ia64/ia64
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 May 2011 03:57:44 -0000

Author: marcel
Date: Thu May  5 03:57:43 2011
New Revision: 221481
URL: http://svn.freebsd.org/changeset/base/221481

Log:
  Implement ipi_send() for Altix. This is quick-n-dirty, but works.
  We have SMP up and running. I haven't had a chance to test whether
  ptc.g works properly (given that the SHub has a register for it),
  but that's easily found out.

Modified:
  projects/altix/sys/ia64/ia64/mp_machdep.c

Modified: projects/altix/sys/ia64/ia64/mp_machdep.c
==============================================================================
--- projects/altix/sys/ia64/ia64/mp_machdep.c	Thu May  5 03:42:04 2011	(r221480)
+++ projects/altix/sys/ia64/ia64/mp_machdep.c	Thu May  5 03:57:43 2011	(r221481)
@@ -497,14 +497,25 @@ ipi_all_but_self(int ipi)
 void
 ipi_send(struct pcpu *cpu, int xiv)
 {
+	uint64_t *ipip;
+	uint64_t ipi;
 	u_int sapic_id;
 
 	KASSERT(xiv != 0, ("ipi_send"));
 
 	sapic_id = IA64_LID_GET_SAPIC_ID(cpu->pc_md.lid);
 
+#if 0
+	ipip = &(ia64_pib->ib_ipi[sapic_id][0]);
+	ipi = xiv;
+#else
+	ipip = (void *)(IA64_PHYS_TO_RR6(0x800000000UL) |
+	    ((u_long)cpu->pc_md.sgisn_nasid << 38) | 0x110000380UL);
+	ipi = 0x80000001fdc00000UL | ((u_long)xiv << 52) | (sapic_id << 4);
+#endif
+
 	ia64_mf();
-	ia64_st8(&(ia64_pib->ib_ipi[sapic_id][0]), xiv);
+	ia64_st8(ipip, ipi);
 	ia64_mf_a();
 	CTR3(KTR_SMP, "ipi_send(%p, %d): cpuid=%d", cpu, xiv, PCPU_GET(cpuid));
 }