From nobody Thu Oct 24 02:14:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XYqGl2WB8z5ZwbG; Thu, 24 Oct 2024 02:14:07 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqGl1blmz42VS; Thu, 24 Oct 2024 02:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frf+DupAL0cJLrCfqhF2D/882DkXuRSK1lkN7LZ2J68=; b=CheU8Bwa12IhTVMQ2CHJV11dVvEFXVoFZteZXzNrjt7MoJypiei3KpsVDlJVYt28nWNn51 qobc1GUOY/qecyddtJCTzRl5tw4DxdnCvWF0wqPtdw5M2RFYLmhCEI4HbsCiY0Q4lTHzfC qdgq2zsRAoWWnL7zfh28SuiIH3/3WwqCImGnz45Yih0qCpi2naQYY+nee24YmYl14bf6Jh OmkrPOrAqI7AWSBpn0BS2lRvZDndB9C0pokegLv224tyFEykAMQpMzZpsf2x8tTHmPqk+3 SWG6ICa9YMyjlGJzRnXYzUbHHkhMbncY4C8q6pMv7XfxlgKQKTDE/6vNw8YaIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frf+DupAL0cJLrCfqhF2D/882DkXuRSK1lkN7LZ2J68=; b=AXPR5LvLJhcVfohfTgDTr4htgFkrYIw1lW1GsQDZ+dLf39tX8MLnSD3Udb8Fk2BWEnNsKn XssmHpA4YSIWkL75SaehtQ+EQwwBqwyliObB8AgeKzmarGYR7JwfJUP6Dc8mWK7UquWC60 OUSTTTG65U0SRPsUs1iQyZEmI+Tw7g4JEDOedTB4fNe5NIkAzE7YRI7qKhXsb/rmIPEpRk HIwDWoPAT+jNfv6Yh4UCmzlL8+CHpLIeMGw2U3YGYojcOqLckMfveYj7LQXZ9xk6aFbYUE PACFsIU8PEzLOOANkKlw30NTyjX2eWAKfEiSxuPdkBCa+mv6eKPPHMZuhccb8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729736047; a=rsa-sha256; cv=none; b=kvU1F3ZI2YezyInyH/GQy+Xb4pDLoUnVA2xJTCr+n5dfK/A/jag5UZo2QVo5DYzhxDH9aM S3gDgKfyqwHofAnn6byGuMgY8wrKi2MHx/kVwEbmY5i9MCJNd0VjI/89foCBUvxpgK4Mc0 XDIrM50SCi85yXxrsiOUu2zs7vBGK7mF1Uv7bE572JMn3TKl2SDzNR5yg0Ekc80DqK83OX 9Sj/4GYGty6TXWVEyngAMGEVVLnSwc/RZg5wtM+hX5D57/hLKsE76niHGmTwAw1pBGC0/i on9o4zK2IKOfFITcBaVRHBZ9TL1sZp+jmwg5v0t72SrlYIyL0mJ1noXOv0eybg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqGl1CfDzNXZ; Thu, 24 Oct 2024 02:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2E7fp029752; Thu, 24 Oct 2024 02:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2E7FS029749; Thu, 24 Oct 2024 02:14:07 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:14:07 GMT Message-Id: <202410240214.49O2E7FS029749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 4f55ea6b5926 - stable/14 - loader/powerpc: Add some CAS support for newer POWER CPUs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f55ea6b592647ac8718166c0053fac048cde602 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=4f55ea6b592647ac8718166c0053fac048cde602 commit 4f55ea6b592647ac8718166c0053fac048cde602 Author: Justin Hibbits AuthorDate: 2024-10-11 21:01:15 +0000 Commit: Justin Hibbits CommitDate: 2024-10-24 02:07:20 +0000 loader/powerpc: Add some CAS support for newer POWER CPUs * Add PVR bits for POWER10 and POWER11 * Initialize the `err` outvar, in case it's not touched on success by the hypervisor, to prevent spurious errors. (cherry picked from commit f2e62e601304cea927bbeea70c484030b8e9fe45) --- stand/powerpc/ofw/cas.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stand/powerpc/ofw/cas.c b/stand/powerpc/ofw/cas.c index b112aae67d85..45fd4d8d567f 100644 --- a/stand/powerpc/ofw/cas.c +++ b/stand/powerpc/ofw/cas.c @@ -40,10 +40,13 @@ #define PVR_CPU_P8NVL 0x004c0000 #define PVR_CPU_P8 0x004d0000 #define PVR_CPU_P9 0x004e0000 +#define PVR_CPU_P10 0x00800000 +#define PVR_CPU_P11 0x00820000 #define PVR_CPU_MASK 0xffff0000 #define PVR_ISA_207 0x0f000004 #define PVR_ISA_300 0x0f000005 +#define PVR_ISA_31 0x0f000006 #define PVR_ISA_MASK 0xffffffff /* loader version of kernel's CPU_MAXSIZE */ @@ -122,7 +125,7 @@ struct opt_vec5 { } __packed; static struct ibm_arch_vec { - struct pvr pvr_list[7]; + struct pvr pvr_list[10]; uint8_t num_opts; struct opt_vec_ignore vec1; struct opt_vec_ignore vec2; @@ -135,8 +138,11 @@ static struct ibm_arch_vec { { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P8E) }, { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P8NVL) }, { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P9) }, + { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P10) }, + { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P11) }, { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_207) }, { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_300) }, + { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_31) }, { 0, 0xffffffffu } /* terminator */ }, 4, /* num_opts (4 actually means 5 option vectors) */ @@ -185,7 +191,7 @@ ppc64_cas(void) { phandle_t pkg; ihandle_t inst; - cell_t err; + cell_t err = 0; uint8_t buf[16], idx, val; int i, len, rc, radix_mmu; const char *var;