From owner-svn-src-head@freebsd.org Tue Dec 19 16:45:42 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 519B2E8F35B; Tue, 19 Dec 2017 16:45:42 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1915180C47; Tue, 19 Dec 2017 16:45:42 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBJGjf2p006335; Tue, 19 Dec 2017 16:45:41 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBJGjfeD006333; Tue, 19 Dec 2017 16:45:41 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201712191645.vBJGjfeD006333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Tue, 19 Dec 2017 16:45:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326981 - in head/sys/powerpc: booke powerpc X-SVN-Group: head X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: in head/sys/powerpc: booke powerpc X-SVN-Commit-Revision: 326981 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 16:45:42 -0000 Author: nwhitehorn Date: Tue Dec 19 16:45:40 2017 New Revision: 326981 URL: https://svnweb.freebsd.org/changeset/base/326981 Log: The highest-order bit of the bootloader cookie is 1, with the result that the 32-bit cookie can be sign-extended on its way out of the loader and through Open Firmware. If sign-extended, the in-kernel check of its value would fail on 64-bit systems, resulting in a mountroot prompt. Solve this by telling the kernel to ignore the high-order bits. PR: kern/224437 Submitted by: Gustavo Romero Modified: head/sys/powerpc/booke/booke_machdep.c head/sys/powerpc/powerpc/machdep.c Modified: head/sys/powerpc/booke/booke_machdep.c ============================================================================== --- head/sys/powerpc/booke/booke_machdep.c Tue Dec 19 16:20:13 2017 (r326980) +++ head/sys/powerpc/booke/booke_machdep.c Tue Dec 19 16:45:40 2017 (r326981) @@ -201,7 +201,7 @@ extern void *int_performance_counter; mtspr(ivor, (uintptr_t)(&handler) & 0xffffUL); uintptr_t powerpc_init(vm_offset_t fdt, vm_offset_t, vm_offset_t, void *mdp, - vm_offset_t mdp_cookie); + uint32_t mdp_cookie); void booke_cpu_init(void); void Modified: head/sys/powerpc/powerpc/machdep.c ============================================================================== --- head/sys/powerpc/powerpc/machdep.c Tue Dec 19 16:20:13 2017 (r326980) +++ head/sys/powerpc/powerpc/machdep.c Tue Dec 19 16:45:40 2017 (r326981) @@ -155,7 +155,7 @@ SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, CTLFLAG_RD, &cacheline_size, 0, ""); uintptr_t powerpc_init(vm_offset_t, vm_offset_t, vm_offset_t, void *, - vm_offset_t); + uint32_t); long Maxmem = 0; long realmem = 0; @@ -234,7 +234,7 @@ void booke_cpu_init(void); uintptr_t powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offset_t ofentry, void *mdp, - vm_offset_t mdp_cookie) + uint32_t mdp_cookie) { struct pcpu *pc; struct cpuref bsp;