From: Aditya Gupta <adityag@linux.ibm.com>
To: "Nicholas Piggin" <npiggin@gmail.com>,
"Mahesh J Salgaonkar" <mahesh@linux.ibm.com>,
"Madhavan Srinivasan" <maddy@linux.ibm.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>
Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Subject: Re: [PATCH v5 1/5] target/ppc: reduce code duplication across Power9/10 init code
Date: Tue, 23 Jul 2024 10:32:29 +0530 [thread overview]
Message-ID: <ae6a6523-f6e4-42bb-bd0f-624765dba4f1@linux.ibm.com> (raw)
In-Reply-To: <D2WMQC0RQB4E.2LNADN0L45O9G@gmail.com>
On 23/07/24 09:51, Nicholas Piggin wrote:
> On Thu Jun 6, 2024 at 10:16 PM AEST, Aditya Gupta wrote:
>> From: Harsh Prateek Bora <harshpb@linux.ibm.com>
>>
>> Power9/10 initialization code consists of a lot of logical OR of
>> various flag bits as supported by respective Power platform during its
>> initialization, most of which is duplicated and only selected bits are
>> added or removed as needed with each new platform support being added.
>> Remove the duplicate code and share using common macros.
>>
>> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Thanks for the reviewed-by, Nick !
- Aditya Gupta
>
>> ---
>> target/ppc/cpu_init.c | 124 +++++-------------------------------------
>> target/ppc/cpu_init.h | 78 ++++++++++++++++++++++++++
>> 2 files changed, 93 insertions(+), 109 deletions(-)
>> create mode 100644 target/ppc/cpu_init.h
>>
>> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
>> index 01e358a4a5ac..3d8a112935ae 100644
>> --- a/target/ppc/cpu_init.c
>> +++ b/target/ppc/cpu_init.c
>> @@ -51,6 +51,7 @@
>> #include "kvm_ppc.h"
>> #endif
>>
>> +#include "cpu_init.h"
>> /* #define PPC_DEBUG_SPR */
>> /* #define USE_APPLE_GDB */
>>
>> @@ -6508,58 +6509,15 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
>> dc->fw_name = "PowerPC,POWER9";
>> dc->desc = "POWER9";
>> pcc->pvr_match = ppc_pvr_match_power9;
>> - pcc->pcr_mask = PCR_COMPAT_2_05 | PCR_COMPAT_2_06 | PCR_COMPAT_2_07;
>> - pcc->pcr_supported = PCR_COMPAT_3_00 | PCR_COMPAT_2_07 | PCR_COMPAT_2_06 |
>> - PCR_COMPAT_2_05;
>> + pcc->pcr_mask = POWERPC_POWER9_PCC_PCR_MASK;
>> + pcc->pcr_supported = POWERPC_POWER9_PCC_PCR_SUPPORTED;
>> pcc->init_proc = init_proc_POWER9;
>> pcc->check_pow = check_pow_nocheck;
>> pcc->check_attn = check_attn_hid0_power9;
>> - pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
>> - PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
>> - PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
>> - PPC_FLOAT_FRSQRTES |
>> - PPC_FLOAT_STFIWX |
>> - PPC_FLOAT_EXT |
>> - PPC_CACHE | PPC_CACHE_ICBI | PPC_CACHE_DCBZ |
>> - PPC_MEM_SYNC | PPC_MEM_EIEIO |
>> - PPC_MEM_TLBIE | PPC_MEM_TLBSYNC |
>> - PPC_64B | PPC_64H | PPC_64BX | PPC_ALTIVEC |
>> - PPC_SEGMENT_64B | PPC_SLBI |
>> - PPC_POPCNTB | PPC_POPCNTWD |
>> - PPC_CILDST;
>> - pcc->insns_flags2 = PPC2_VSX | PPC2_VSX207 | PPC2_DFP | PPC2_DBRX |
>> - PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 |
>> - PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 |
>> - PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 |
>> - PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 |
>> - PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 |
>> - PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL | PPC2_MEM_LWSYNC |
>> - PPC2_BCDA_ISA206;
>> - pcc->msr_mask = (1ull << MSR_SF) |
>> - (1ull << MSR_HV) |
>> - (1ull << MSR_TM) |
>> - (1ull << MSR_VR) |
>> - (1ull << MSR_VSX) |
>> - (1ull << MSR_EE) |
>> - (1ull << MSR_PR) |
>> - (1ull << MSR_FP) |
>> - (1ull << MSR_ME) |
>> - (1ull << MSR_FE0) |
>> - (1ull << MSR_SE) |
>> - (1ull << MSR_DE) |
>> - (1ull << MSR_FE1) |
>> - (1ull << MSR_IR) |
>> - (1ull << MSR_DR) |
>> - (1ull << MSR_PMM) |
>> - (1ull << MSR_RI) |
>> - (1ull << MSR_LE);
>> - pcc->lpcr_mask = LPCR_VPM1 | LPCR_ISL | LPCR_KBV | LPCR_DPFD |
>> - (LPCR_PECE_U_MASK & LPCR_HVEE) | LPCR_ILE | LPCR_AIL |
>> - LPCR_UPRT | LPCR_EVIRT | LPCR_ONL | LPCR_HR | LPCR_LD |
>> - (LPCR_PECE_L_MASK & (LPCR_PDEE | LPCR_HDEE | LPCR_EEE |
>> - LPCR_DEE | LPCR_OEE))
>> - | LPCR_MER | LPCR_GTSE | LPCR_TC |
>> - LPCR_HEIC | LPCR_LPES0 | LPCR_HVICE | LPCR_HDICE;
>> + pcc->insns_flags = POWERPC_FAMILY_POWER9_INSNS_FLAGS;
>> + pcc->insns_flags2 = POWERPC_FAMILY_POWER9_INSNS_FLAGS2;
>> + pcc->msr_mask = POWERPC_POWER9_PCC_MSR_MASK;
>> + pcc->lpcr_mask = POWERPC_POWER9_PCC_LPCR_MASK;
>> pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
>> pcc->mmu_model = POWERPC_MMU_3_00;
>> #if !defined(CONFIG_USER_ONLY)
>> @@ -6572,10 +6530,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
>> pcc->excp_model = POWERPC_EXCP_POWER9;
>> pcc->bus_model = PPC_FLAGS_INPUT_POWER9;
>> pcc->bfd_mach = bfd_mach_ppc64;
>> - pcc->flags = POWERPC_FLAG_VRE | POWERPC_FLAG_SE |
>> - POWERPC_FLAG_BE | POWERPC_FLAG_PMM |
>> - POWERPC_FLAG_BUS_CLK | POWERPC_FLAG_CFAR |
>> - POWERPC_FLAG_VSX | POWERPC_FLAG_TM | POWERPC_FLAG_SCV;
>> + pcc->flags = POWERPC_POWER9_PCC_FLAGS;
>> pcc->l1_dcache_size = 0x8000;
>> pcc->l1_icache_size = 0x8000;
>> }
>> @@ -6688,60 +6643,15 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
>> dc->fw_name = "PowerPC,POWER10";
>> dc->desc = "POWER10";
>> pcc->pvr_match = ppc_pvr_match_power10;
>> - pcc->pcr_mask = PCR_COMPAT_2_05 | PCR_COMPAT_2_06 | PCR_COMPAT_2_07 |
>> - PCR_COMPAT_3_00;
>> - pcc->pcr_supported = PCR_COMPAT_3_10 | PCR_COMPAT_3_00 | PCR_COMPAT_2_07 |
>> - PCR_COMPAT_2_06 | PCR_COMPAT_2_05;
>> + pcc->pcr_mask = POWERPC_POWER10_PCC_PCR_MASK;
>> + pcc->pcr_supported = POWERPC_POWER10_PCC_PCR_SUPPORTED;
>> pcc->init_proc = init_proc_POWER10;
>> pcc->check_pow = check_pow_nocheck;
>> pcc->check_attn = check_attn_hid0_power9;
>> - pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
>> - PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES |
>> - PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
>> - PPC_FLOAT_FRSQRTES |
>> - PPC_FLOAT_STFIWX |
>> - PPC_FLOAT_EXT |
>> - PPC_CACHE | PPC_CACHE_ICBI | PPC_CACHE_DCBZ |
>> - PPC_MEM_SYNC | PPC_MEM_EIEIO |
>> - PPC_MEM_TLBIE | PPC_MEM_TLBSYNC |
>> - PPC_64B | PPC_64H | PPC_64BX | PPC_ALTIVEC |
>> - PPC_SEGMENT_64B | PPC_SLBI |
>> - PPC_POPCNTB | PPC_POPCNTWD |
>> - PPC_CILDST;
>> - pcc->insns_flags2 = PPC2_VSX | PPC2_VSX207 | PPC2_DFP | PPC2_DBRX |
>> - PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 |
>> - PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 |
>> - PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 |
>> - PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 |
>> - PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 |
>> - PPC2_ISA300 | PPC2_PRCNTL | PPC2_ISA310 |
>> - PPC2_MEM_LWSYNC | PPC2_BCDA_ISA206;
>> - pcc->msr_mask = (1ull << MSR_SF) |
>> - (1ull << MSR_HV) |
>> - (1ull << MSR_VR) |
>> - (1ull << MSR_VSX) |
>> - (1ull << MSR_EE) |
>> - (1ull << MSR_PR) |
>> - (1ull << MSR_FP) |
>> - (1ull << MSR_ME) |
>> - (1ull << MSR_FE0) |
>> - (1ull << MSR_SE) |
>> - (1ull << MSR_DE) |
>> - (1ull << MSR_FE1) |
>> - (1ull << MSR_IR) |
>> - (1ull << MSR_DR) |
>> - (1ull << MSR_PMM) |
>> - (1ull << MSR_RI) |
>> - (1ull << MSR_LE);
>> - pcc->lpcr_mask = LPCR_VPM1 | LPCR_ISL | LPCR_KBV | LPCR_DPFD |
>> - (LPCR_PECE_U_MASK & LPCR_HVEE) | LPCR_ILE | LPCR_AIL |
>> - LPCR_UPRT | LPCR_EVIRT | LPCR_ONL | LPCR_HR | LPCR_LD |
>> - (LPCR_PECE_L_MASK & (LPCR_PDEE | LPCR_HDEE | LPCR_EEE |
>> - LPCR_DEE | LPCR_OEE))
>> - | LPCR_MER | LPCR_GTSE | LPCR_TC |
>> - LPCR_HEIC | LPCR_LPES0 | LPCR_HVICE | LPCR_HDICE;
>> - /* DD2 adds an extra HAIL bit */
>> - pcc->lpcr_mask |= LPCR_HAIL;
>> + pcc->insns_flags = POWERPC_FAMILY_POWER9_INSNS_FLAGS; /* same as P9 */
>> + pcc->insns_flags2 = POWERPC_FAMILY_POWER10_INSNS_FLAGS2;
>> + pcc->msr_mask = POWERPC_POWER10_PCC_MSR_MASK;
>> + pcc->lpcr_mask = POWERPC_POWER10_PCC_LPCR_MASK;
>>
>> pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
>> pcc->mmu_model = POWERPC_MMU_3_00;
>> @@ -6754,11 +6664,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data)
>> pcc->excp_model = POWERPC_EXCP_POWER10;
>> pcc->bus_model = PPC_FLAGS_INPUT_POWER9;
>> pcc->bfd_mach = bfd_mach_ppc64;
>> - pcc->flags = POWERPC_FLAG_VRE | POWERPC_FLAG_SE |
>> - POWERPC_FLAG_BE | POWERPC_FLAG_PMM |
>> - POWERPC_FLAG_BUS_CLK | POWERPC_FLAG_CFAR |
>> - POWERPC_FLAG_VSX | POWERPC_FLAG_SCV |
>> - POWERPC_FLAG_BHRB;
>> + pcc->flags = POWERPC_POWER10_PCC_FLAGS;
>> pcc->l1_dcache_size = 0x8000;
>> pcc->l1_icache_size = 0x8000;
>> }
>> diff --git a/target/ppc/cpu_init.h b/target/ppc/cpu_init.h
>> new file mode 100644
>> index 000000000000..e04be6a655d8
>> --- /dev/null
>> +++ b/target/ppc/cpu_init.h
>> @@ -0,0 +1,78 @@
>> +#ifndef TARGET_PPC_CPU_INIT_H
>> +#define TARGET_PPC_CPU_INIT_H
>> +
>> +#define POWERPC_FAMILY_POWER9_INSNS_FLAGS \
>> + PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB | \
>> + PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | \
>> + PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | PPC_FLOAT_FRSQRTES | \
>> + PPC_FLOAT_STFIWX | PPC_FLOAT_EXT |PPC_CACHE | PPC_CACHE_ICBI | \
>> + PPC_CACHE_DCBZ | PPC_MEM_SYNC | PPC_MEM_EIEIO | PPC_MEM_TLBIE | \
>> + PPC_MEM_TLBSYNC | PPC_64B | PPC_64H | PPC_64BX | PPC_ALTIVEC | \
>> + PPC_SEGMENT_64B | PPC_SLBI | PPC_POPCNTB | PPC_POPCNTWD | \
>> + PPC_CILDST
>> +
>> +#define POWERPC_FAMILY_POWER9_INSNS_FLAGS2_COMMON \
>> + PPC2_VSX | PPC2_VSX207 | PPC2_DFP | PPC2_DBRX | \
>> + PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \
>> + PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | \
>> + PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | \
>> + PPC2_ISA207S | PPC2_FP_CVT_S64 | PPC2_ISA300 | PPC2_PRCNTL | \
>> + PPC2_MEM_LWSYNC | PPC2_BCDA_ISA206
>> +
>> +#define POWERPC_FAMILY_POWER9_INSNS_FLAGS2 \
>> + POWERPC_FAMILY_POWER9_INSNS_FLAGS2_COMMON | PPC2_TM
>> +#define POWERPC_FAMILY_POWER10_INSNS_FLAGS2 \
>> + POWERPC_FAMILY_POWER9_INSNS_FLAGS2_COMMON | PPC2_ISA310
>> +
>> +#define POWERPC_POWER9_COMMON_PCC_MSR_MASK \
>> + (1ull << MSR_SF) | \
>> + (1ull << MSR_HV) | \
>> + (1ull << MSR_VR) | \
>> + (1ull << MSR_VSX) | \
>> + (1ull << MSR_EE) | \
>> + (1ull << MSR_PR) | \
>> + (1ull << MSR_FP) | \
>> + (1ull << MSR_ME) | \
>> + (1ull << MSR_FE0) | \
>> + (1ull << MSR_SE) | \
>> + (1ull << MSR_DE) | \
>> + (1ull << MSR_FE1) | \
>> + (1ull << MSR_IR) | \
>> + (1ull << MSR_DR) | \
>> + (1ull << MSR_PMM) | \
>> + (1ull << MSR_RI) | \
>> + (1ull << MSR_LE)
>> +
>> +#define POWERPC_POWER9_PCC_MSR_MASK \
>> + POWERPC_POWER9_COMMON_PCC_MSR_MASK | (1ull << MSR_TM)
>> +#define POWERPC_POWER10_PCC_MSR_MASK \
>> + POWERPC_POWER9_COMMON_PCC_MSR_MASK
>> +#define POWERPC_POWER9_PCC_PCR_MASK \
>> + PCR_COMPAT_2_05 | PCR_COMPAT_2_06 | PCR_COMPAT_2_07
>> +#define POWERPC_POWER10_PCC_PCR_MASK \
>> + POWERPC_POWER9_PCC_PCR_MASK | PCR_COMPAT_3_00
>> +#define POWERPC_POWER9_PCC_PCR_SUPPORTED \
>> + PCR_COMPAT_3_00 | PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_2_05
>> +#define POWERPC_POWER10_PCC_PCR_SUPPORTED \
>> + POWERPC_POWER9_PCC_PCR_SUPPORTED | PCR_COMPAT_3_10
>> +#define POWERPC_POWER9_PCC_LPCR_MASK \
>> + LPCR_VPM1 | LPCR_ISL | LPCR_KBV | LPCR_DPFD | \
>> + (LPCR_PECE_U_MASK & LPCR_HVEE) | LPCR_ILE | LPCR_AIL | \
>> + LPCR_UPRT | LPCR_EVIRT | LPCR_ONL | LPCR_HR | LPCR_LD | \
>> + (LPCR_PECE_L_MASK & (LPCR_PDEE|LPCR_HDEE|LPCR_EEE|LPCR_DEE|LPCR_OEE)) | \
>> + LPCR_MER | LPCR_GTSE | LPCR_TC | LPCR_HEIC | LPCR_LPES0 | LPCR_HVICE | \
>> + LPCR_HDICE
>> +/* DD2 adds an extra HAIL bit */
>> +#define POWERPC_POWER10_PCC_LPCR_MASK \
>> + POWERPC_POWER9_PCC_LPCR_MASK | LPCR_HAIL
>> +#define POWERPC_POWER9_PCC_FLAGS_COMMON \
>> + POWERPC_FLAG_VRE | POWERPC_FLAG_SE | POWERPC_FLAG_BE | \
>> + POWERPC_FLAG_PMM | POWERPC_FLAG_BUS_CLK | POWERPC_FLAG_CFAR | \
>> + POWERPC_FLAG_VSX | POWERPC_FLAG_SCV
>> +
>> +#define POWERPC_POWER9_PCC_FLAGS \
>> + POWERPC_POWER9_PCC_FLAGS_COMMON | POWERPC_FLAG_TM
>> +#define POWERPC_POWER10_PCC_FLAGS \
>> + POWERPC_POWER9_PCC_FLAGS_COMMON | POWERPC_FLAG_BHRB
>> +
>> +#endif /* TARGET_PPC_CPU_INIT_H */
next prev parent reply other threads:[~2024-07-23 5:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 12:16 [PATCH v5 0/5] Power11 support for QEMU [PSeries] Aditya Gupta
2024-06-06 12:16 ` [PATCH v5 1/5] target/ppc: reduce code duplication across Power9/10 init code Aditya Gupta
2024-07-23 4:21 ` Nicholas Piggin
2024-07-23 5:02 ` Aditya Gupta [this message]
2024-07-23 5:22 ` Nicholas Piggin
2024-07-23 15:13 ` Aditya Gupta
2024-07-24 4:16 ` Harsh Prateek Bora
2024-07-24 6:31 ` Aditya Gupta
2024-07-24 6:50 ` Aditya Gupta
2024-07-24 12:04 ` BALATON Zoltan
2024-06-06 12:16 ` [PATCH v5 2/5] target/ppc: Add Power11 DD2.0 processor Aditya Gupta
2024-07-23 4:30 ` Nicholas Piggin
2024-07-23 5:01 ` Aditya Gupta
2024-07-23 5:27 ` Nicholas Piggin
2024-06-06 12:16 ` [PATCH v5 3/5] ppc/pseries: Add Power11 cpu type Aditya Gupta
2024-07-23 4:34 ` Nicholas Piggin
2024-06-06 12:16 ` [PATCH v5 4/5] target/ppc: Introduce 'PowerPCCPUClass::logical_pvr' Aditya Gupta
2024-07-23 5:13 ` Nicholas Piggin
2024-07-23 5:42 ` Aditya Gupta
2024-06-06 12:16 ` [PATCH v5 5/5] target/ppc: Fix regression due to Power10 and Power11 having same PCR Aditya Gupta
2024-07-23 4:58 ` Nicholas Piggin
2024-07-23 5:08 ` Aditya Gupta
2024-06-06 12:22 ` [PATCH v5 0/5] Power11 support for QEMU [PSeries] Aditya Gupta
2024-07-22 9:12 ` Aditya Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae6a6523-f6e4-42bb-bd0f-624765dba4f1@linux.ibm.com \
--to=adityag@linux.ibm.com \
--cc=clg@kaod.org \
--cc=harshpb@linux.ibm.com \
--cc=maddy@linux.ibm.com \
--cc=mahesh@linux.ibm.com \
--cc=npiggin@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).