From owner-p4-projects@FreeBSD.ORG Fri Oct 23 15:06:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B26E81065676; Fri, 23 Oct 2009 15:06:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D437106566C for ; Fri, 23 Oct 2009 15:06:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 41CC98FC18 for ; Fri, 23 Oct 2009 15:06:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9NF6SxK020005 for ; Fri, 23 Oct 2009 15:06:28 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9NF6STG020003 for perforce@freebsd.org; Fri, 23 Oct 2009 15:06:28 GMT (envelope-from mav@freebsd.org) Date: Fri, 23 Oct 2009 15:06:28 GMT Message-Id: <200910231506.n9NF6STG020003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2009 15:06:28 -0000 http://p4web.freebsd.org/chv.cgi?CH=169720 Change 169720 by mav@mav_mavbook on 2009/10/23 15:06:24 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap_subr.S#5 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#11 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.85 2009/05/01 08:03:46 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.86 2009/10/23 14:56:29 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.206 2009/07/08 05:56:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.207 2009/10/23 14:56:29 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.119 2009/02/28 22:07:15 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.120 2009/10/23 14:56:29 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.114 2009/04/26 09:21:37 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.115 2009/10/23 14:56:29 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#7 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/aim/mmu_oea64.c,v 1.6 2009/10/23 03:17:02 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/aim/mmu_oea64.c,v 1.7 2009/10/23 14:27:40 nwhitehorn Exp $"); /* * Manages physical address maps. @@ -868,15 +868,17 @@ ENABLE_TRANS(msr); /* - * Map certain important things, like ourselves and the exception - * vectors + * Map certain important things, like ourselves. + * + * NOTE: We do not map the exception vector space. That code is + * used only in real mode, and leaving it unmapped allows us to + * catch NULL pointer deferences, instead of making NULL a valid + * address. */ DISABLE_TRANS(msr); for (pa = kernelstart & ~PAGE_MASK; pa < kernelend; pa += PAGE_SIZE) moea64_kenter(mmup, pa, pa); - for (pa = EXC_RSVD; pa < EXC_LAST; pa += PAGE_SIZE) - moea64_kenter(mmup, pa, pa); ENABLE_TRANS(msr); if (!ofw_real_mode) { ==== //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap_subr.S#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/aim/trap_subr.S,v 1.26 2009/10/11 16:41:39 nwhitehorn Exp $ */ +/* $FreeBSD: src/sys/powerpc/aim/trap_subr.S,v 1.27 2009/10/23 14:27:40 nwhitehorn Exp $ */ /* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $ */ /*- @@ -275,10 +275,16 @@ /* * Processor reset exception handler. These are typically * the first instructions the processor executes after a - * software reset. + * software reset. We do this in two bits so that we are + * not still hanging around in the trap handling region + * once the MMU is turned on. */ .globl CNAME(rstcode), CNAME(rstsize) CNAME(rstcode): + ba cpu_reset +CNAME(rstsize) = . - CNAME(rstcode) + +cpu_reset: bl 1f .space 124 @@ -296,7 +302,6 @@ /* Should not be reached */ 9: b 9b -CNAME(rstsize) = . - CNAME(rstcode) #endif /*