From owner-svn-src-all@freebsd.org Tue Oct 8 02:36:54 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76B1412D62D; Tue, 8 Oct 2019 02:36:54 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46nM1f2WQTz48jv; Tue, 8 Oct 2019 02:36:54 +0000 (UTC) (envelope-from jhibbits@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AF8D213F8; Tue, 8 Oct 2019 02:36:54 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x982asWr009112; Tue, 8 Oct 2019 02:36:54 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x982as71009111; Tue, 8 Oct 2019 02:36:54 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201910080236.x982as71009111@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 8 Oct 2019 02:36:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353297 - head/stand/powerpc/ofw X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/stand/powerpc/ofw X-SVN-Commit-Revision: 353297 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2019 02:36:54 -0000 Author: jhibbits Date: Tue Oct 8 02:36:53 2019 New Revision: 353297 URL: https://svnweb.freebsd.org/changeset/base/353297 Log: loader/powerpc64: Include generic PVR values in CAS architecture list Add generic PVR values for PowerISA 2.07 and 3.00. This allows booting pseries in QEMU with compatibilty mode enabled. Submitted by: Shawn Anastasio Modified: head/stand/powerpc/ofw/cas.c Modified: head/stand/powerpc/ofw/cas.c ============================================================================== --- head/stand/powerpc/ofw/cas.c Tue Oct 8 01:36:34 2019 (r353296) +++ head/stand/powerpc/ofw/cas.c Tue Oct 8 02:36:53 2019 (r353297) @@ -30,12 +30,16 @@ __FBSDID("$FreeBSD$"); #include /* PVR */ -#define PVR_VER_P8E 0x004b0000 -#define PVR_VER_P8NVL 0x004c0000 -#define PVR_VER_P8 0x004d0000 -#define PVR_VER_P9 0x004e0000 -#define PVR_VER_MASK 0xffff0000 +#define PVR_CPU_P8E 0x004b0000 +#define PVR_CPU_P8NVL 0x004c0000 +#define PVR_CPU_P8 0x004d0000 +#define PVR_CPU_P9 0x004e0000 +#define PVR_CPU_MASK 0xffff0000 +#define PVR_ISA_207 0x0f000004 +#define PVR_ISA_300 0x0f000005 +#define PVR_ISA_MASK 0xffffffff + /* loader version of kernel's CPU_MAXSIZE */ #define MAX_CPUS ((uint32_t)256u) @@ -106,7 +110,7 @@ struct opt_vec5 { } __packed; static struct ibm_arch_vec { - struct pvr pvr_list[5]; + struct pvr pvr_list[7]; uint8_t num_opts; struct opt_vec_ignore vec1; struct opt_vec_ignore vec2; @@ -115,10 +119,12 @@ static struct ibm_arch_vec { struct opt_vec5 vec5; } __packed ibm_arch_vec = { /* pvr_list */ { - { PVR_VER_MASK, PVR_VER_P8 }, /* POWER8 */ - { PVR_VER_MASK, PVR_VER_P8E }, /* POWER8E */ - { PVR_VER_MASK, PVR_VER_P8NVL }, /* POWER8NVL */ - { PVR_VER_MASK, PVR_VER_P9 }, /* POWER9 */ + { PVR_CPU_MASK, PVR_CPU_P8 }, /* POWER8 */ + { PVR_CPU_MASK, PVR_CPU_P8E }, /* POWER8E */ + { PVR_CPU_MASK, PVR_CPU_P8NVL }, /* POWER8NVL */ + { PVR_CPU_MASK, PVR_CPU_P9 }, /* POWER9 */ + { PVR_ISA_MASK, PVR_ISA_207 }, /* All ISA 2.07 */ + { PVR_ISA_MASK, PVR_ISA_300 }, /* All ISA 3.00 */ { 0, 0xffffffffu } /* terminator */ }, 4, /* num_opts (4 actually means 5 option vectors) */ @@ -192,11 +198,11 @@ ppc64_cas(void) cell_t err; /* Perform CAS only for POWER8 and later cores */ - switch (mfpvr() & PVR_VER_MASK) { - case PVR_VER_P8: - case PVR_VER_P8E: - case PVR_VER_P8NVL: - case PVR_VER_P9: + switch (mfpvr() & PVR_CPU_MASK) { + case PVR_CPU_P8: + case PVR_CPU_P8E: + case PVR_CPU_P8NVL: + case PVR_CPU_P9: break; default: return (0);