From owner-p4-projects@FreeBSD.ORG  Wed Sep 29 00:27:22 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 84B6316A4D0; Wed, 29 Sep 2004 00:27:22 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5BED316A4CE
	for <perforce@freebsd.org>; Wed, 29 Sep 2004 00:27:22 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 51A5143D1F
	for <perforce@freebsd.org>; Wed, 29 Sep 2004 00:27:22 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8T0RMeh021521
	for <perforce@freebsd.org>; Wed, 29 Sep 2004 00:27:22 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8T0RMGL021518
	for perforce@freebsd.org; Wed, 29 Sep 2004 00:27:22 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 29 Sep 2004 00:27:22 GMT
Message-Id: <200409290027.i8T0RMGL021518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 62364 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Sep 2004 00:27:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=62364

Change 62364 by peter@peter_daintree on 2004/09/29 00:26:55

	Integ -I -b i386_hammer (mp_machdep pmap_invalidate fix etc)

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#73 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#109 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#73 (text+ko) ====

@@ -539,12 +539,14 @@
 	u_int32_t mpbioswarmvec;
 	int apic_id, cpu, i;
 	u_int64_t *pt4, *pt3, *pt2;
+	vm_offset_t va = boot_address + KERNBASE;
 
 	mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN);
 
 	/* install the AP 1st level boot code */
-	pmap_kenter(boot_address + KERNBASE, boot_address);
-	bcopy(mptramp_start, (void *)((uintptr_t)boot_address + KERNBASE), bootMP_size);
+	pmap_kenter(va, boot_address);
+	pmap_invalidate_page(kernel_pmap, va);
+	bcopy(mptramp_start, (void *)va, bootMP_size);
 
 	/* Locate the page tables, they'll be below the trampoline */
 	pt4 = (u_int64_t *)(uintptr_t)(mptramp_pagetables + KERNBASE);

==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#31 (text+ko) ====

@@ -928,7 +928,9 @@
 	if (args->vector == vector)
 		return;
 	KASSERT(args->vector == -1,
-	    ("Multiple entries for PCI IRQ %d", args->vector));
+	    ("Multiple IRQs for PCI interrupt %d.%d.INT%c: %d and %d\n",
+	    args->bus, args->irq >> 2, 'A' + (args->irq & 0x3), args->vector,
+	    vector));
 	args->vector = vector;
 }
 

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#109 (text+ko) ====