From nobody Thu Oct 24 02:14:08 2024 X-Original-To: dev-commits-src-branches@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 4XYqGm4Hsmz5ZwbH; Thu, 24 Oct 2024 02:14:08 +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 4XYqGm2xjbz42Pk; Thu, 24 Oct 2024 02:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736048; 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=oigBcfRQ0TVwLGX8GWi3L5KzQ25eJpIk/gDXPH80bHs=; b=YFQYZ9Jxwjd+bS+6J+fP7JcHZ8wyNv0mOLJedt0EC0Qe8gXeOrKasImk7+G7/7Tsmsf3nV L50omwkElEbZiGLZQA34ZUnyVz3wPcbp1hKZynjSDrjKStFwB8DFmtZGjSLcbEA7p5WVJl aoq/vzViob9YIKiPOj8hwVL+xcha+flPoFtwBVGDbl7noMWDpErlhPJC8+qBsSxDnqMQZs /WEHZFOyVGQuDMGsId5MGPxJ9BBjZX0wORz+mujTNcVJDFjlz1ckUxF+ogKcWEYvyJbvEM bliCsNGx3DveAvClpGYPNrA5jVTE8Pz7T9oDc5SrGZBOBLcxqAUFsDHP4UwoZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736048; 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=oigBcfRQ0TVwLGX8GWi3L5KzQ25eJpIk/gDXPH80bHs=; b=Ugw/p4OV4yByYo/06iC555yKlIstjqboOJQ0aajYRgMT71Jpfv1IZwOzDLFvqIpjwxakPC 0h5Eqt2C/hCc7h0kDZuixGfzQpZPVqya4dHjdKvCTe9etHO0Nai48sI3N9RSw6c/CZsYCH We+VYf74yu0CwRw7spP8aEbfFFqT38TntQPV+ZGw6CmiuP3iveACpoU/fkXJxtkH5TnEDG iAwomtwIrGY5XrR3hblaRs/PP3AYpDLgkaEX0JIs1OlPgcRIoeX3ZwTHb4JC/SSnfcCxqQ EoOjOKz9KqJWmYont57egEQXMAUJc1h4mxV2TQjfEJ0ixvxmZWX0zl1mLfoBZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729736048; a=rsa-sha256; cv=none; b=xt6JUpjPoIwx13tolPKxlhAPMn3QdqtgliPeizumJsdwbv+Sbx2lo8s1djxtlGVHtE0pNb RpbfPI7Q6xFGEFjFazFutsOrWmK5NivzOIZXW08vhS03of+GhVf1YEVanYZTjvkMUh1jKV S88Ip+eXvTqywqRc9EcGbMh3SVGSqttqBQOpz6fxbGH2Ijs4rdVbMcECBqeN2Av/2aN0Aj W6WW49vIm1QkDDbSMWZsxaNiWP9NxC/ft9g8HhHmJD3C/KgpUhaeeigGt3dPKgqn1dbzdu lDm8AXfpHlzga5nJ7IFpRlJtuWN7DkXzK0L35bTKzaq43TQAwoAS2GER84yMTg== 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 4XYqGm2Xm3zNXb; Thu, 24 Oct 2024 02:14:08 +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 49O2E8E3029807; Thu, 24 Oct 2024 02:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2E8ss029804; Thu, 24 Oct 2024 02:14:08 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:14:08 GMT Message-Id: <202410240214.49O2E8ss029804@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: f9f006df1535 - stable/14 - powerpc: Add nominal support for POWER10 and POWER11 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: f9f006df1535dfcaa4764c3c4a67f66a05c7db7f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=f9f006df1535dfcaa4764c3c4a67f66a05c7db7f commit f9f006df1535dfcaa4764c3c4a67f66a05c7db7f Author: Justin Hibbits AuthorDate: 2024-10-11 21:03:12 +0000 Commit: Justin Hibbits CommitDate: 2024-10-24 02:07:20 +0000 powerpc: Add nominal support for POWER10 and POWER11 (cherry picked from commit 1e434da3b065ef96b389e5e0b604ae05a51e794e) --- sys/powerpc/include/cpu.h | 2 ++ sys/powerpc/include/spr.h | 2 ++ sys/powerpc/powerpc/cpu.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h index 02ff42877f0e..35b32566484c 100644 --- a/sys/powerpc/include/cpu.h +++ b/sys/powerpc/include/cpu.h @@ -90,6 +90,8 @@ extern u_long cpu_features2; #define PPC_FEATURE2_DARN 0x00200000 #define PPC_FEATURE2_SCV 0x00100000 #define PPC_FEATURE2_HTM_NOSUSPEND 0x00080000 +#define PPC_FEATURE2_ARCH_3_1 0x00040000 +#define PPC_FEATURE2_MMA 0x00020000 #define PPC_FEATURE_BITMASK \ "\20" \ diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h index 751a9e8184b6..5bb3858b0fb5 100644 --- a/sys/powerpc/include/spr.h +++ b/sys/powerpc/include/spr.h @@ -220,7 +220,9 @@ #define IBMPOWER9 0x004e #define MPC860 0x0050 #define IBMCELLBE 0x0070 +#define IBMPOWER10 0x0080 #define MPC8240 0x0081 +#define IBMPOWER11 0x0082 #define PA6T 0x0090 #define IBM405GP 0x4011 #define IBM405L 0x4161 diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index 19907e3973e7..f73ed25c8924 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -192,6 +192,24 @@ static const struct cputab models[] = { PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | PPC_FEATURE2_DARN, cpu_powerx_setup }, + { "IBM POWER10", IBMPOWER10, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU | + PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | PPC_FEATURE_ARCH_2_05 | + PPC_FEATURE_ARCH_2_06 | PPC_FEATURE_HAS_VSX | PPC_FEATURE_TRUE_LE, + PPC_FEATURE2_ARCH_2_07 | PPC_FEATURE2_DSCR | PPC_FEATURE2_EBB | + PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | + PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | + PPC_FEATURE2_DARN | PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_MMA, + cpu_powerx_setup }, + { "IBM POWER11", IBMPOWER11, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU | + PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | PPC_FEATURE_ARCH_2_05 | + PPC_FEATURE_ARCH_2_06 | PPC_FEATURE_HAS_VSX | PPC_FEATURE_TRUE_LE, + PPC_FEATURE2_ARCH_2_07 | PPC_FEATURE2_DSCR | PPC_FEATURE2_EBB | + PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | + PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | + PPC_FEATURE2_DARN | PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_MMA, + cpu_powerx_setup }, { "Motorola PowerPC 7400", MPC7400, REVFMT_MAJMIN, PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU, 0, cpu_6xx_setup }, { "Motorola PowerPC 7410", MPC7410, REVFMT_MAJMIN,