From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3BE7C433E0 for ; Tue, 7 Jul 2020 06:24:04 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54D4A206CD for ; Tue, 7 Jul 2020 06:24:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=neuling.org header.i=@neuling.org header.b="CgCzSAlq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54D4A206CD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=neuling.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4B1C7k0M8QzDqgk for ; Tue, 7 Jul 2020 16:24:02 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4B1C5l361QzDqXb for ; Tue, 7 Jul 2020 16:22:19 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=neuling.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=neuling.org header.i=@neuling.org header.a=rsa-sha256 header.s=201811 header.b=CgCzSAlq; dkim-atps=neutral Received: from neuling.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 4B1C5l1bbCz9sRN; Tue, 7 Jul 2020 16:22:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=neuling.org; s=201811; t=1594102939; bh=Xx92tvALMyBxH70o/7GRbPXu/YZ2lUJ9v7ICl13VZ5k=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=CgCzSAlq5U+LqmI9YqcktiaGG+nNY4z/iKXtCjAxUIIyZA27SxbtlmeZ7tdS8zrno vlJIBq965dP2EuJvJapoR+eJO40NI82Kfl+OB/sGcLP8xT7ab96lJ+pfchPOdoSEtg 7fpcxgiF0zsonpqiuVEvYOSmq4pKYFtTmmtOzbj0tFyhzOuAXiPNvXnUhfaeE8TRTG u04mFv0cGTleyJ4mfh6FtwDcclOe8Fu+SQvQs3OEYcK0nlvdcHE9pieLHDmljZEpCr 37Q97NVaO0wgV2CTiNvNfCEU0kDgpy6279/4bEV490VB4uBsPQnTiyiCwy2/s5n6Up NGE5UaLwnISdA== Received: by neuling.org (Postfix, from userid 1000) id 166EA2C0672; Tue, 7 Jul 2020 16:22:19 +1000 (AEST) Message-ID: Subject: Re: [PATCH v2 04/10] powerpc/perf: Add power10_feat to dt_cpu_ftrs From: Michael Neuling To: Athira Rajeev , mpe@ellerman.id.au Date: Tue, 07 Jul 2020 16:22:18 +1000 In-Reply-To: <1593595262-1433-5-git-send-email-atrajeev@linux.vnet.ibm.com> References: <1593595262-1433-1-git-send-email-atrajeev@linux.vnet.ibm.com> <1593595262-1433-5-git-send-email-atrajeev@linux.vnet.ibm.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.36.3 (3.36.3-1.fc32) MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: maddy@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Wed, 2020-07-01 at 05:20 -0400, Athira Rajeev wrote: > From: Madhavan Srinivasan >=20 > Add power10 feature function to dt_cpu_ftrs.c along > with a power10 specific init() to initialize pmu sprs. Can you say why you're doing this? Can you add some text about what you're doing to the BHRB in this patch? Mikey >=20 > Signed-off-by: Madhavan Srinivasan > --- > arch/powerpc/include/asm/reg.h | 3 +++ > arch/powerpc/kernel/cpu_setup_power.S | 7 +++++++ > arch/powerpc/kernel/dt_cpu_ftrs.c | 26 ++++++++++++++++++++++++++ > 3 files changed, 36 insertions(+) >=20 > diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/re= g.h > index 21a1b2d..900ada1 100644 > --- a/arch/powerpc/include/asm/reg.h > +++ b/arch/powerpc/include/asm/reg.h > @@ -1068,6 +1068,9 @@ > #define MMCR0_PMC2_LOADMISSTIME 0x5 > #endif > =20 > +/* BHRB disable bit for PowerISA v3.10 */ > +#define MMCRA_BHRB_DISABLE 0x0000002000000000 > + > /* > * SPRG usage: > * > diff --git a/arch/powerpc/kernel/cpu_setup_power.S > b/arch/powerpc/kernel/cpu_setup_power.S > index efdcfa7..e8b3370c 100644 > --- a/arch/powerpc/kernel/cpu_setup_power.S > +++ b/arch/powerpc/kernel/cpu_setup_power.S > @@ -233,3 +233,10 @@ __init_PMU_ISA207: > li r5,0 > mtspr SPRN_MMCRS,r5 > blr > + > +__init_PMU_ISA31: > + li r5,0 > + mtspr SPRN_MMCR3,r5 > + LOAD_REG_IMMEDIATE(r5, MMCRA_BHRB_DISABLE) > + mtspr SPRN_MMCRA,r5 > + blr > diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c > b/arch/powerpc/kernel/dt_cpu_ftrs.c > index a0edeb3..14a513f 100644 > --- a/arch/powerpc/kernel/dt_cpu_ftrs.c > +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c > @@ -449,6 +449,31 @@ static int __init feat_enable_pmu_power9(struct > dt_cpu_feature *f) > return 1; > } > =20 > +static void init_pmu_power10(void) > +{ > + init_pmu_power9(); > + > + mtspr(SPRN_MMCR3, 0); > + mtspr(SPRN_MMCRA, MMCRA_BHRB_DISABLE); > +} > + > +static int __init feat_enable_pmu_power10(struct dt_cpu_feature *f) > +{ > + hfscr_pmu_enable(); > + > + init_pmu_power10(); > + init_pmu_registers =3D init_pmu_power10; > + > + cur_cpu_spec->cpu_features |=3D CPU_FTR_MMCRA; > + cur_cpu_spec->cpu_user_features |=3D PPC_FEATURE_PSERIES_PERFMON_COMPAT= ; > + > + cur_cpu_spec->num_pmcs =3D 6; > + cur_cpu_spec->pmc_type =3D PPC_PMC_IBM; > + cur_cpu_spec->oprofile_cpu_type =3D "ppc64/power10"; > + > + return 1; > +} > + > static int __init feat_enable_tm(struct dt_cpu_feature *f) > { > #ifdef CONFIG_PPC_TRANSACTIONAL_MEM > @@ -638,6 +663,7 @@ struct dt_cpu_feature_match { > {"pc-relative-addressing", feat_enable, 0}, > {"machine-check-power9", feat_enable_mce_power9, 0}, > {"performance-monitor-power9", feat_enable_pmu_power9, 0}, > + {"performance-monitor-power10", feat_enable_pmu_power10, 0}, > {"event-based-branch-v3", feat_enable, 0}, > {"random-number-generator", feat_enable, 0}, > {"system-call-vectored", feat_disable, 0},