Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C8A8C55182 for ; Mon, 3 Aug 2026 19:09:44 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4hDR7W0fPXz2y7Y; Tue, 04 Aug 2026 05:09:43 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1785784183; cv=none; b=LL105dxGyVoF/WR+BjURMluyaV7DpPNz123gVhOPsdtaGMoy3gkHx4aVHJX98DLALisYcxF6lTUA6A6BCSqTppcWQVIh2woX5rbCj4g9ijTA82OKLKHB/1M6Y++BUrADbGE71j9AVvNRc1DOnHFm2PEYk5TKxx5g1bG7CtQJS/VML1EXpg8BnITQg43Hjz59zagxNinnF1oZNmFLImb8JlfinSejgKDcuAsSkD9w6R2WbEpejZTdxa6lUqjmaTKJN8pL/SU+opu4WSDRXHY54ZzmlvHp2ZuBo+YtwPJPdfqX48+P4hc+npO//0qB5ynDjcXrEqxg/PMhMpnIXc1j3A== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1785784183; c=relaxed/relaxed; bh=0YovQnurKWm4AwJFU30NtiVz7yRXjPkonDMgiY5yKbE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=L3nQ/zOA6XfKiV19thwOBxZqYST0Dp2CiKUbPkolILuzwalv2PM6NcVQdnwX2nBk5pVqOyn9J2K/xLUY60nQkI7dOPaBls6FE2XnKqeYXY/z/N7WwVcLwnx1Rq1oQm6jmCoHP0Pn1fxCxZQrlOYXLHodukkvDv9TL01Vpj2/cXrXMSIv2sAHaPZedS1NhvKieQouyqevSAHbX4qzjjCyJJ8hovS5VkodiXtFpRggJXQT0M35CihzpAtY2S6BlzWvW7lBeTed2PaROvrNwsiCe1G7D2C5BvxP5nGy5JcsLB1cWbK+tgjcwL3AOiqmiP+ytL9iLtbc1NCTY67dms8Eog== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=h46MIHiN; dkim-atps=neutral; spf=pass (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=amachhiw@linux.ibm.com; receiver=lists.ozlabs.org) smtp.mailfrom=linux.ibm.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=h46MIHiN; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=amachhiw@linux.ibm.com; receiver=lists.ozlabs.org) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4hDR7T3Z6Nz2xyk for ; Tue, 04 Aug 2026 05:09:40 +1000 (AEST) Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 673HHfAL2684200 for ; Mon, 3 Aug 2026 19:09:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=0YovQn urKWm4AwJFU30NtiVz7yRXjPkonDMgiY5yKbE=; b=h46MIHiN30wHjIgBn1ZjZ9 YFrKlDOXcKbL1ihYoCEC5266nQd2ZwMsTDUr2Rt8giDcyBVXS0hq7i156Uw72z3P ag01PJcFRL6MrsIui8iu/+OTFQHrf3JIkm74dGoTJ69uy9CASRmq2U2IvEvQ7YxF W8USDLl824e7Pcjp1IXgT4FTR1PT0neLagBt9JEw9XsMXW1vZhbFFlV0Iunczw4N Pm5kdfx1vHb4ub00cvE5shT+MkRg2XzbYROAiKAoNR+CmPyYyDrl5KB8xwRTqJl1 SJrxo/ckgaCDh8NRCQV7s7mp9hUums/qRGFS0SoFgretJBoGJ3naEUppUE7ITcig == Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fs8h4te50-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 19:09:37 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 673IuMJp023968; Mon, 3 Aug 2026 19:09:36 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsugvxwct-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 19:09:36 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 673J9VYn26870178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Aug 2026 19:09:31 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9B89D2004E; Mon, 3 Aug 2026 19:09:31 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D2FFE2004D; Mon, 3 Aug 2026 19:09:29 +0000 (GMT) Received: from fedora (unknown [9.5.7.39]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTPS; Mon, 3 Aug 2026 19:09:29 +0000 (GMT) Date: Tue, 4 Aug 2026 00:40:10 +0530 From: Amit Machhiwal To: Mahesh Salgaonkar Cc: linuxppc-dev , Nicholas Piggin , Madhavan Srinivasan , "Ritesh Harjani (IBM)" , Praveen K Pandey , Nikhil Kumar Singh Subject: Re: [PATCH v2 2/4] powerpc: Add Power12 raw mode Message-ID: <20260804002831.e8e53baf-75-amachhiw@linux.ibm.com> Mail-Followup-To: Mahesh Salgaonkar , linuxppc-dev , Nicholas Piggin , Madhavan Srinivasan , "Ritesh Harjani (IBM)" , Praveen K Pandey , Nikhil Kumar Singh References: <20260803155724.3272052-1-mahesh@linux.ibm.com> <20260803155724.3272052-3-mahesh@linux.ibm.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260803155724.3272052-3-mahesh@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODAzMDE2NiBTYWx0ZWRfX9Sc+B8JmJg+p by+RNEwUus1reuhP3tXYi0jqCTdI9MDD7Br3uNxxqBhvSGu0BUk+pblmPB+9+qIzA0xfxyaZ6i6 e/dT1weKREBV6ySskbJdPB4TbM9GCRM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODAzMDE2NiBTYWx0ZWRfX4kLOEDvjh+yp 3IoDDAgS5BtFnJCcEMu7RY7i1pcx2DXmd6Ox2TOqDM82BERWss396CGNEai5Kd/mvqVXT9WDbWu Kfx23MTYgm3YCwl/qrO42SAi7fiukffw8bCDy3nsA0y/9tkfoOnoVoU5+edxQgTszt320GapMoG z5t5dsEBblNgRHBJcPnOolNpcRjowb2kONzG9RtczTEAeC3XcXQzPyURsD0Qivfu4TaOZU5vqiZ 0G+y/mLZpCsr8SGiNgRvqUE1leGcNRbaL8fla+esGgoaCUuubhDeG9PEPGPXPji3pBUO/KkIiGR LPqEb+R//mRokn69iEEuKN1QqobZW1y4udis4H/T+gRBYZ4ib50jEUlzyLPfIZcN2cL5qO81IG7 ug34xLdqq1SalgtHA61jr77i6K8UH47IlmTPPeeQTTEU7ph55Gq4I3ZNRG31t78m/ADMmDXg7O9 bk/NlixzgSwbWpftUcw== X-Authority-Analysis: v=2.4 cv=SI1ykuvH c=1 sm=1 tr=0 ts=6a70e771 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=pGLkceISAAAA:8 a=VnNF1IyMAAAA:8 a=dp3qCl66cxt0RW_jIEgA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 X-Proofpoint-ORIG-GUID: RwxHZQSB5fbUtElgJfB9g-q6dpnEbp38 X-Proofpoint-GUID: KuJEk8dxUaWQ69_EbnuPMiiqPDFT5JvM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-03_04,2026-08-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 suspectscore=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608030166 On 2026/08/03 09:27 PM, Mahesh Salgaonkar wrote: > From: Nicholas Piggin > > Add CPU table entries for raw mode. > > Signed-off-by: Nicholas Piggin > Signed-off-by: Ritesh Harjani (IBM) > Signed-off-by: Mahesh Salgaonkar > Tested-by: Praveen K Pandey > Reviewed-by: Nikhil Kumar Singh > --- > Change in v2: > - Added Reviewed-by from Nikhil > --- > arch/powerpc/include/asm/cpu_setup.h | 2 ++ > arch/powerpc/include/asm/cputable.h | 17 +++++++-- > arch/powerpc/include/asm/mmu.h | 1 + > arch/powerpc/include/asm/reg.h | 5 ++- > arch/powerpc/include/asm/synch.h | 6 +++- > arch/powerpc/include/uapi/asm/cputable.h | 1 + > arch/powerpc/kernel/cpu_setup_power.c | 43 +++++++++++++++++++++++ > arch/powerpc/kernel/cpu_specs_book3s_64.h | 22 ++++++++++++ > arch/powerpc/kernel/dt_cpu_ftrs.c | 37 +++++++++++++++++++ > arch/powerpc/kernel/setup-common.c | 1 + > arch/powerpc/kvm/book3s_hv.c | 9 +++-- > arch/powerpc/mm/book3s64/hash_native.c | 22 ++++++++---- > arch/powerpc/mm/init_64.c | 4 ++- > 13 files changed, 157 insertions(+), 13 deletions(-) > > diff --git a/arch/powerpc/include/asm/cpu_setup.h b/arch/powerpc/include/asm/cpu_setup.h > index 30e2fe3895024..26d2c0e2c99c6 100644 > --- a/arch/powerpc/include/asm/cpu_setup.h > +++ b/arch/powerpc/include/asm/cpu_setup.h > @@ -9,10 +9,12 @@ void __setup_cpu_power7(unsigned long offset, struct cpu_spec *spec); > void __setup_cpu_power8(unsigned long offset, struct cpu_spec *spec); > void __setup_cpu_power9(unsigned long offset, struct cpu_spec *spec); > void __setup_cpu_power10(unsigned long offset, struct cpu_spec *spec); > +void __setup_cpu_power12(unsigned long offset, struct cpu_spec *spec); > void __restore_cpu_power7(void); > void __restore_cpu_power8(void); > void __restore_cpu_power9(void); > void __restore_cpu_power10(void); > +void __restore_cpu_power12(void); > > void __setup_cpu_e500v1(unsigned long offset, struct cpu_spec *spec); > void __setup_cpu_e500v2(unsigned long offset, struct cpu_spec *spec); > diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h > index ec16c12296da8..a3be81c47df3a 100644 > --- a/arch/powerpc/include/asm/cputable.h > +++ b/arch/powerpc/include/asm/cputable.h > @@ -194,6 +194,7 @@ static inline void cpu_feature_keys_init(void) { } > #define CPU_FTR_DAWR1 LONG_ASM_CONST(0x0008000000000000) > #define CPU_FTR_DEXCR_NPHIE LONG_ASM_CONST(0x0010000000000000) > #define CPU_FTR_P11_PVR LONG_ASM_CONST(0x0020000000000000) > +#define CPU_FTR_ARCH_32 LONG_ASM_CONST(0x0040000000000000) > > #ifndef __ASSEMBLER__ > > @@ -457,6 +458,18 @@ static inline void cpu_feature_keys_init(void) { } > > #define CPU_FTRS_POWER11 (CPU_FTRS_POWER10 | CPU_FTR_P11_PVR) > > +#define CPU_FTRS_POWER12 (CPU_FTR_LWSYNC | \ > + CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | CPU_FTR_ARCH_206 |\ > + CPU_FTR_MMCRA | CPU_FTR_SMT | \ > + CPU_FTR_COHERENT_ICACHE | \ > + CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \ > + CPU_FTR_DSCR | \ > + CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \ > + CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \ > + CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_ARCH_207S | \ > + CPU_FTR_ARCH_300 | CPU_FTR_ARCH_31 | CPU_FTR_ARCH_32 | \ > + CPU_FTR_DAWR | CPU_FTR_DAWR1) > + > #define CPU_FTRS_CELL (CPU_FTR_LWSYNC | \ > CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ > CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ > @@ -476,7 +489,7 @@ static inline void cpu_feature_keys_init(void) { } > (CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | CPU_FTRS_POWER8 | \ > CPU_FTR_ALTIVEC_COMP | CPU_FTR_VSX_COMP | CPU_FTRS_POWER9 | \ > CPU_FTRS_POWER9_DD2_1 | CPU_FTRS_POWER9_DD2_2 | \ > - CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10 | CPU_FTRS_POWER11) > + CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10 | CPU_FTRS_POWER11 | CPU_FTRS_POWER12) Line exceeds 80 columns. Please wrap CPU_FTRS_POWER12 onto its own line. Same applies to the #else variant below. > #else > #define CPU_FTRS_POSSIBLE \ > (CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \ > @@ -484,7 +497,7 @@ static inline void cpu_feature_keys_init(void) { } > CPU_FTRS_POWER8 | CPU_FTRS_CELL | CPU_FTRS_PA6T | \ > CPU_FTR_VSX_COMP | CPU_FTR_ALTIVEC_COMP | CPU_FTRS_POWER9 | \ > CPU_FTRS_POWER9_DD2_1 | CPU_FTRS_POWER9_DD2_2 | \ > - CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10 | CPU_FTRS_POWER11) > + CPU_FTRS_POWER9_DD2_3 | CPU_FTRS_POWER10 | CPU_FTRS_POWER11 | CPU_FTRS_POWER12) > #endif /* CONFIG_CPU_LITTLE_ENDIAN */ > #endif > #else > diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h > index 5f9c5d436e171..4fd7f81a29304 100644 > --- a/arch/powerpc/include/asm/mmu.h > +++ b/arch/powerpc/include/asm/mmu.h > @@ -133,6 +133,7 @@ > #define MMU_FTRS_POWER9 MMU_FTRS_POWER6 > #define MMU_FTRS_POWER10 MMU_FTRS_POWER6 > #define MMU_FTRS_POWER11 MMU_FTRS_POWER6 > +#define MMU_FTRS_POWER12 MMU_FTRS_POWER6 > #define MMU_FTRS_CELL MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \ > MMU_FTR_CI_LARGE_PAGE > #define MMU_FTRS_PA6T MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \ > diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h > index 3449dd2b577d4..4460b666c603e 100644 > --- a/arch/powerpc/include/asm/reg.h > +++ b/arch/powerpc/include/asm/reg.h > @@ -492,11 +492,12 @@ > * determine both the compatibility level which we want to emulate and the > * compatibility level which the host is capable of emulating. > */ > +#define PCR_ARCH_31 0x20 /* Architecture 3.1 */ > #define PCR_ARCH_300 0x10 /* Architecture 3.00 */ > #define PCR_ARCH_207 0x8 /* Architecture 2.07 */ > #define PCR_ARCH_206 0x4 /* Architecture 2.06 */ > #define PCR_ARCH_205 0x2 /* Architecture 2.05 */ > -#define PCR_LOW_BITS (PCR_ARCH_207 | PCR_ARCH_206 | PCR_ARCH_205 | PCR_ARCH_300) > +#define PCR_LOW_BITS (PCR_ARCH_207 | PCR_ARCH_206 | PCR_ARCH_205 | PCR_ARCH_300 | PCR_ARCH_31) > #define PCR_MASK ~(PCR_HIGH_BITS | PCR_LOW_BITS) /* PCR Reserved Bits */ > #define SPRN_HEIR 0x153 /* Hypervisor Emulated Instruction Register */ > #define SPRN_TLBINDEXR 0x154 /* P7 TLB control register */ > @@ -1344,6 +1345,7 @@ > #define PVR_POWER9 0x004E > #define PVR_POWER10 0x0080 > #define PVR_POWER11 0x0082 > +#define PVR_POWER12 0x0083 > #define PVR_BE 0x0070 > #define PVR_PA6T 0x0090 > > @@ -1356,6 +1358,7 @@ > #define PVR_ARCH_300 0x0f000005 > #define PVR_ARCH_31 0x0f000006 > #define PVR_ARCH_31_P11 0x0f000007 > +#define PVR_ARCH_32 0x0f000008 > > /* Macros for setting and retrieving special purpose registers */ > #ifndef __ASSEMBLER__ > diff --git a/arch/powerpc/include/asm/synch.h b/arch/powerpc/include/asm/synch.h > index 0d3ccb34adfb2..d0e9765dee287 100644 > --- a/arch/powerpc/include/asm/synch.h > +++ b/arch/powerpc/include/asm/synch.h > @@ -37,8 +37,12 @@ static inline void ppc_after_tlbiel_barrier(void) > * accelerators mapped will use tlbie (which does invalidate the copy) > * to invalidate translations. It's not possible to limit POWER10 this > * way due to local copy-paste. > + * > + * POWER12 does not need it. > */ > - asm volatile(ASM_FTR_IFSET(PPC_CP_ABORT, "", %0) : : "i" (CPU_FTR_ARCH_31) : "memory"); > + asm volatile(ASM_FTR_IF(PPC_CP_ABORT, "", %0, %1) : > + : "i" (CPU_FTR_ARCH_31|CPU_FTR_ARCH_32), "i" (CPU_FTR_ARCH_31) > + : "memory"); > } > #endif /* __ASSEMBLER__ */ > > diff --git a/arch/powerpc/include/uapi/asm/cputable.h b/arch/powerpc/include/uapi/asm/cputable.h > index 731b97dc2d150..bc9bd225f5876 100644 > --- a/arch/powerpc/include/uapi/asm/cputable.h > +++ b/arch/powerpc/include/uapi/asm/cputable.h > @@ -52,6 +52,7 @@ > #define PPC_FEATURE2_HTM_NO_SUSPEND 0x00080000 /* TM w/out suspended state */ > #define PPC_FEATURE2_ARCH_3_1 0x00040000 /* ISA 3.1 */ > #define PPC_FEATURE2_MMA 0x00020000 /* Matrix Multiply Assist */ > +#define PPC_FEATURE2_ARCH_3_2 0x00010000 /* ISA 3.2 */ > > /* > * IMPORTANT! > diff --git a/arch/powerpc/kernel/cpu_setup_power.c b/arch/powerpc/kernel/cpu_setup_power.c > index 98bd4e6c17705..5de704ac031d8 100644 > --- a/arch/powerpc/kernel/cpu_setup_power.c > +++ b/arch/powerpc/kernel/cpu_setup_power.c > @@ -286,3 +286,46 @@ void __restore_cpu_power10(void) > init_HFSCR(); > init_PMU_HV(); > } > + > +void __setup_cpu_power12(unsigned long offset, struct cpu_spec *t) > +{ > + init_FSCR_power10(); > + init_PMU(); > + init_PMU_ISA31(); > + > + if (!init_hvmode_206(t)) > + return; > + > + mtspr(SPRN_PSSCR, 0); > + mtspr(SPRN_LPID, 0); > + mtspr(SPRN_PID, 0); > + mtspr(SPRN_AMOR, ~0); > + mtspr(SPRN_PCR, PCR_MASK); > + init_LPCR_ISA300((mfspr(SPRN_LPCR) | LPCR_PECEDH | LPCR_PECE_HVEE |\ The '\' continuation is unnecessary inside a function body — the enclosing parentheses are sufficient for the compiler. While this pattern exists in the upstream __setup_cpu_power10 and __restore_cpu_power10 functions, please consider not perpetuating it in the new Power12 functions. Simply drop the '\'. checkpatch.pl does report this: WARNING: Avoid unnecessary line continuations #201: FILE: arch/powerpc/kernel/cpu_setup_power.c:304: + init_LPCR_ISA300((mfspr(SPRN_LPCR) | LPCR_PECEDH | LPCR_PECE_HVEE |\ WARNING: Avoid unnecessary line continuations #224: FILE: arch/powerpc/kernel/cpu_setup_power.c:327: + init_LPCR_ISA300((mfspr(SPRN_LPCR) | LPCR_PECEDH | LPCR_PECE_HVEE |\ Thanks, Amit > + LPCR_HVICE | LPCR_HEIC) & ~(LPCR_UPRT | LPCR_HR), 0); > + init_HFSCR(); > + init_PMU_HV(); > +} > + > +void __restore_cpu_power12(void) > +{ > + u64 msr; > + > + init_FSCR_power10(); > + init_PMU(); > + init_PMU_ISA31(); > + > + msr = mfmsr(); > + if (!(msr & MSR_HV)) > + return; > + > + mtspr(SPRN_PSSCR, 0); > + mtspr(SPRN_LPID, 0); > + mtspr(SPRN_PID, 0); > + mtspr(SPRN_AMOR, ~0); > + mtspr(SPRN_PCR, PCR_MASK); > + init_LPCR_ISA300((mfspr(SPRN_LPCR) | LPCR_PECEDH | LPCR_PECE_HVEE |\ Ditto. > + LPCR_HVICE | LPCR_HEIC) & ~(LPCR_UPRT | LPCR_HR), 0); > + init_HFSCR(); > + init_PMU_HV(); > +} > diff --git a/arch/powerpc/kernel/cpu_specs_book3s_64.h b/arch/powerpc/kernel/cpu_specs_book3s_64.h > index 98d4274a1b6bf..7619dd157646f 100644 > --- a/arch/powerpc/kernel/cpu_specs_book3s_64.h > +++ b/arch/powerpc/kernel/cpu_specs_book3s_64.h > @@ -63,6 +63,11 @@ > #define COMMON_USER_POWER11 COMMON_USER_POWER10 > #define COMMON_USER2_POWER11 COMMON_USER2_POWER10 > > +#define COMMON_USER_POWER12 COMMON_USER_POWER10 > +#define COMMON_USER2_POWER12 (COMMON_USER2_POWER10 | \ > + PPC_FEATURE2_ARCH_3_2) > + > + > static struct cpu_spec cpu_specs[] __initdata = { > { /* PPC970 */ > .pvr_mask = 0xffff0000, > @@ -485,6 +490,23 @@ static struct cpu_spec cpu_specs[] __initdata = { > .machine_check_early = __machine_check_early_realmode_p10, > .platform = "power11", > }, > + { /* Power12 */ > + .pvr_mask = 0xffff0000, > + .pvr_value = 0x00830000, > + .cpu_name = "Power12 (raw)", > + .cpu_features = CPU_FTRS_POWER12, > + .cpu_user_features = COMMON_USER_POWER12, > + .cpu_user_features2 = COMMON_USER2_POWER12, > + .mmu_features = MMU_FTRS_POWER12, > + .icache_bsize = 128, > + .dcache_bsize = 128, > + .num_pmcs = 6, > + .pmc_type = PPC_PMC_IBM, > + .cpu_setup = __setup_cpu_power12, > + .cpu_restore = __restore_cpu_power12, > + .machine_check_early = __machine_check_early_realmode_p10, > + .platform = "power12", > + }, > { /* Cell Broadband Engine */ > .pvr_mask = 0xffff0000, > .pvr_value = 0x00700000, > diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c b/arch/powerpc/kernel/dt_cpu_ftrs.c > index e5853daa6a486..b369e8cda12ee 100644 > --- a/arch/powerpc/kernel/dt_cpu_ftrs.c > +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c > @@ -26,6 +26,7 @@ > /* Device-tree visible constants follow */ > #define ISA_V3_0B 3000 > #define ISA_V3_1 3100 > +#define ISA_V3_2 3200 > > #define USABLE_PR (1U << 0) > #define USABLE_OS (1U << 1) > @@ -466,6 +467,35 @@ static int __init feat_enable_mce_power11(struct dt_cpu_feature *f) > return 1; > } > > +static void init_pmu_power12(void) > +{ > + init_pmu_power10(); > +} > + > +static int __init feat_enable_pmu_power12(struct dt_cpu_feature *f) > +{ > + hfscr_pmu_enable(); > + > + init_pmu_power12(); > + init_pmu_registers = init_pmu_power12; > + > + cur_cpu_spec->cpu_features |= CPU_FTR_MMCRA; > + cur_cpu_spec->cpu_user_features |= PPC_FEATURE_PSERIES_PERFMON_COMPAT; > + > + cur_cpu_spec->num_pmcs = 6; > + cur_cpu_spec->pmc_type = PPC_PMC_IBM; > + > + return 1; > +} > + > +static int __init feat_enable_mce_power12(struct dt_cpu_feature *f) > +{ > + cur_cpu_spec->platform = "power12"; > + cur_cpu_spec->machine_check_early = __machine_check_early_realmode_p10; > + > + return 1; > +} > + > static int __init feat_enable_tm(struct dt_cpu_feature *f) > { > #ifdef CONFIG_PPC_TRANSACTIONAL_MEM > @@ -657,9 +687,11 @@ static struct dt_cpu_feature_match __initdata > {"machine-check-power9", feat_enable_mce_power9, 0}, > {"machine-check-power10", feat_enable_mce_power10, 0}, > {"machine-check-power11", feat_enable_mce_power11, 0}, > + {"machine-check-power12", feat_enable_mce_power12, 0}, > {"performance-monitor-power9", feat_enable_pmu_power9, 0}, > {"performance-monitor-power10", feat_enable_pmu_power10, 0}, > {"performance-monitor-power11", feat_enable_pmu_power10, 0}, > + {"performance-monitor-power12", feat_enable_pmu_power12, 0}, > {"event-based-branch-v3", feat_enable, 0}, > {"random-number-generator", feat_enable, 0}, > {"system-call-vectored", feat_disable, 0}, > @@ -714,6 +746,11 @@ static void __init cpufeatures_setup_start(u32 isa) > if (PVR_VER(mfspr(SPRN_PVR)) >= PVR_POWER11) > cur_cpu_spec->cpu_features |= CPU_FTR_P11_PVR; > } > + > + if (isa >= ISA_V3_2) { > + cur_cpu_spec->cpu_features |= CPU_FTR_ARCH_32; > + cur_cpu_spec->cpu_user_features2 |= PPC_FEATURE2_ARCH_3_2; > + } > } > > static bool __init cpufeatures_process_feature(struct dt_cpu_feature *f) > diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c > index 67c545f61f0d7..4afaba19b5867 100644 > --- a/arch/powerpc/kernel/setup-common.c > +++ b/arch/powerpc/kernel/setup-common.c > @@ -304,6 +304,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) > break; > case 0x004e: /* POWER9 bits 12-15 give chip type */ > case 0x0080: /* POWER10 bit 12 gives SMT8/4 */ > + case 0x0083: /* POWER12 bit 12 gives SMT8/4 */ > maj = (pvr >> 8) & 0x0F; > min = pvr & 0xFF; > break; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 61dbeea317f3b..6ad4e3d0b5a08 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -388,7 +388,7 @@ static void kvmppc_set_pvr_hv(struct kvm_vcpu *vcpu, u32 pvr) > } > > /* Dummy value used in computing PCR value below */ > -#define PCR_ARCH_31 (PCR_ARCH_300 << 1) > +#define PCR_ARCH_32 (PCR_ARCH_31 << 1) > > static inline unsigned long map_pcr_to_cap(unsigned long pcr) > { > @@ -417,7 +417,9 @@ static int kvmppc_set_arch_compat(struct kvm_vcpu *vcpu, u32 arch_compat) > struct kvmppc_vcore *vc = vcpu->arch.vcore; > > /* We can (emulate) our own architecture version and anything older */ > - if (cpu_has_feature(CPU_FTR_P11_PVR) || cpu_has_feature(CPU_FTR_ARCH_31)) > + if (cpu_has_feature(CPU_FTR_ARCH_32)) > + host_pcr_bit = PCR_ARCH_32; > + else if (cpu_has_feature(CPU_FTR_P11_PVR) || cpu_has_feature(CPU_FTR_ARCH_31)) > host_pcr_bit = PCR_ARCH_31; > else if (cpu_has_feature(CPU_FTR_ARCH_300)) > host_pcr_bit = PCR_ARCH_300; > @@ -449,6 +451,9 @@ static int kvmppc_set_arch_compat(struct kvm_vcpu *vcpu, u32 arch_compat) > case PVR_ARCH_31_P11: > guest_pcr_bit = PCR_ARCH_31; > break; > + case PVR_ARCH_32: > + guest_pcr_bit = PCR_ARCH_32; > + break; > default: > return -EINVAL; > } > diff --git a/arch/powerpc/mm/book3s64/hash_native.c b/arch/powerpc/mm/book3s64/hash_native.c > index e9e2dd70c0605..ab2a80e59011c 100644 > --- a/arch/powerpc/mm/book3s64/hash_native.c > +++ b/arch/powerpc/mm/book3s64/hash_native.c > @@ -184,9 +184,14 @@ static inline void __tlbiel(unsigned long vpn, int psize, int apsize, int ssize) > va |= ssize << 8; > sllp = get_sllp_encoding(apsize); > va |= sllp << 5; > - asm volatile(ASM_FTR_IFSET("tlbiel %0", PPC_TLBIEL_v205(%0, 0), %1) > - : : "r" (va), "i" (CPU_FTR_ARCH_206) > - : "memory"); > + > + if (cpu_has_feature(CPU_FTR_ARCH_32)) { > + asm volatile(PPC_TLBIEL(%0, %1, 0, 0, 0) : : "r"(va), "r"(0) : "memory"); > + } else { > + asm volatile(ASM_FTR_IFSET("tlbiel %0", PPC_TLBIEL_v205(%0, 0), %1) > + : : "r" (va), "i" (CPU_FTR_ARCH_206) > + : "memory"); > + } > break; > default: > /* We need 14 to 14 + i bits of va */ > @@ -203,9 +208,14 @@ static inline void __tlbiel(unsigned long vpn, int psize, int apsize, int ssize) > */ > va |= (vpn & 0xfe); > va |= 1; /* L */ > - asm volatile(ASM_FTR_IFSET("tlbiel %0", PPC_TLBIEL_v205(%0, 1), %1) > - : : "r" (va), "i" (CPU_FTR_ARCH_206) > - : "memory"); > + > + if (cpu_has_feature(CPU_FTR_ARCH_32)) { > + asm volatile(PPC_TLBIEL(%0, %1, 0, 0, 0) : : "r"(va), "r"(0) : "memory"); > + } else { > + asm volatile(ASM_FTR_IFSET("tlbiel %0", PPC_TLBIEL_v205(%0, 1), %1) > + : : "r" (va), "i" (CPU_FTR_ARCH_206) > + : "memory"); > + } > break; > } > trace_tlbie(0, 1, va, 0, 0, 0, 0); > diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c > index 64f0df5bb5cdc..0e777d7dc3326 100644 > --- a/arch/powerpc/mm/init_64.c > +++ b/arch/powerpc/mm/init_64.c > @@ -628,7 +628,9 @@ void __init mmu_early_init_devtree(void) > > of_scan_flat_dt(dt_scan_mmu_pid_width, NULL); > if (hvmode && !mmu_lpid_bits) { > - if (early_cpu_has_feature(CPU_FTR_ARCH_207S)) > + if (early_cpu_has_feature(CPU_FTR_ARCH_32)) > + mmu_lpid_bits = 16; /* POWER12 */ > + else if (early_cpu_has_feature(CPU_FTR_ARCH_207S)) > mmu_lpid_bits = 12; /* POWER8-10 */ > else > mmu_lpid_bits = 10; /* POWER7 */ > -- > 2.55.0 > >