From owner-svn-src-projects@freebsd.org Sun Sep 17 19:53:53 2017 Return-Path: Delivered-To: svn-src-projects@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 86B9EE00C69 for ; Sun, 17 Sep 2017 19:53:53 +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 507CB6B7FE; Sun, 17 Sep 2017 19:53:53 +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 v8HJrqXu025735; Sun, 17 Sep 2017 19:53:52 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8HJrqPv025734; Sun, 17 Sep 2017 19:53:52 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201709171953.v8HJrqPv025734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sun, 17 Sep 2017 19:53:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323685 - projects/powernv/powerpc/powerpc X-SVN-Group: projects X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: projects/powernv/powerpc/powerpc X-SVN-Commit-Revision: 323685 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2017 19:53:53 -0000 Author: nwhitehorn Date: Sun Sep 17 19:53:52 2017 New Revision: 323685 URL: https://svnweb.freebsd.org/changeset/base/323685 Log: Make sure to record the BSP's hwref. This previously worked by accident since the BSP hwref was always zero, but that isn't necessarily true with PowerNV. This prevents a QEMU segfault on recent QEMU versions and, I'm sure, some fascinating problems on hardware. Modified: projects/powernv/powerpc/powerpc/machdep.c Modified: projects/powernv/powerpc/powerpc/machdep.c ============================================================================== --- projects/powernv/powerpc/powerpc/machdep.c Sun Sep 17 19:40:17 2017 (r323684) +++ projects/powernv/powerpc/powerpc/machdep.c Sun Sep 17 19:53:52 2017 (r323685) @@ -376,6 +376,7 @@ powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offs pc->pc_curthread = &thread0; thread0.td_oncpu = bsp.cr_cpuid; pc->pc_cpuid = bsp.cr_cpuid; + pc->pc_hwref = bsp.cr_hwref; pc->pc_pir = mfspr(SPR_PIR); __asm __volatile("mtsprg 0, %0" :: "r"(pc));