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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 BFC11C2D0A3 for ; Mon, 9 Nov 2020 09:41:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 3D404206ED for ; Mon, 9 Nov 2020 09:41:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ugZ6DwrY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D404206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ee2Pj7tRyIhF33mWV/YF5rnshN9O4jhJlIMzCkhWtGs=; b=ugZ6DwrYSYe3S9BBG5G2R50xV zqpS+6NS7IW64Krh1PWVZn9zdZsWThc5wUJhDowJ2cl5ISOh7DiwtMNfw3GvIhreA54YipH5gLHf2 7nBgK9volSHsgmUEA/6P0U9tiXMN4ArZVvP/3waiX6JQN8aB/1FiIyQ1BrsBfpdzizjFAemyIMyRi 9l/2p2WbYF3qkcEJISsBFzvrYT5zHeMOxbqhQIabQckGUCTAfW7GHzhYPCUHAmtVsA2MsgItRNGgV ySBzLOk+q2LTWQbs9X57sOfU/q8/2mJQeQdt4LsAvrjVMheRgeIQxs3pBf1aWDqeRe7+PBy7GlXKZ ZMnm5/6Hg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc3fh-0007QR-NF; Mon, 09 Nov 2020 09:41:10 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kc3fd-0007PB-8E for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2020 09:41:07 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AB48C1042; Mon, 9 Nov 2020 01:41:02 -0800 (PST) Received: from [10.57.23.123] (unknown [10.57.23.123]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BB8013F718; Mon, 9 Nov 2020 01:41:01 -0800 (PST) Subject: Re: [PATCH v3 17/26] coresight: etm4x: Cleanup secure exception level masks To: Mathieu Poirier References: <20201028220945.3826358-1-suzuki.poulose@arm.com> <20201028220945.3826358-19-suzuki.poulose@arm.com> <20201105215526.GC3047244@xps15> From: Suzuki K Poulose Message-ID: Date: Mon, 9 Nov 2020 09:40:54 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.1 MIME-Version: 1.0 In-Reply-To: <20201105215526.GC3047244@xps15> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_044105_443115_D243DDD6 X-CRM114-Status: GOOD ( 23.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: coresight@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mike.leach@linaro.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 11/5/20 9:55 PM, Mathieu Poirier wrote: > On Wed, Oct 28, 2020 at 10:09:36PM +0000, Suzuki K Poulose wrote: >> We rely on the ETM architecture version to decide whether >> Secure EL2 is available on the CPU for excluding the level >> for address comparators and viewinst main control register. >> We must instead use the TRCDIDR3.EXLEVEL_S field to detect >> the supported levels. >> >> Signed-off-by: Suzuki K Poulose >> --- >> drivers/hwtracing/coresight/coresight-etm4x-core.c | 13 +++---------- >> drivers/hwtracing/coresight/coresight-etm4x.h | 6 ++++-- >> 2 files changed, 7 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> index a12d58a04c5d..6e3f9cb7de3f 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c >> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c >> @@ -733,7 +733,6 @@ static void etm4_init_arch_data(void *info) >> * TRCARCHMAJ, bits[11:8] architecture major versin number >> */ >> drvdata->arch = BMVAL(etmidr1, 4, 11); >> - drvdata->config.arch = drvdata->arch; >> >> /* maximum size of resources */ >> etmidr2 = etm4x_relaxed_read32(csa, TRCIDR2); >> @@ -749,6 +748,7 @@ static void etm4_init_arch_data(void *info) >> drvdata->ccitmin = BMVAL(etmidr3, 0, 11); >> /* EXLEVEL_S, bits[19:16] Secure state instruction tracing */ >> drvdata->s_ex_level = BMVAL(etmidr3, 16, 19); >> + drvdata->config.s_ex_level = drvdata->s_ex_level; >> /* EXLEVEL_NS, bits[23:20] Non-secure state instruction tracing */ >> drvdata->ns_ex_level = BMVAL(etmidr3, 20, 23); >> >> @@ -920,16 +920,9 @@ static u64 etm4_get_ns_access_type(struct etmv4_config *config) >> static u64 etm4_get_access_type(struct etmv4_config *config) >> { >> u64 access_type = etm4_get_ns_access_type(config); >> - u64 s_hyp = (config->arch & 0x0f) >= 0x4 ? ETM_EXLEVEL_S_HYP : 0; >> >> - /* >> - * EXLEVEL_S, bits[11:8], don't trace anything happening >> - * in secure state. >> - */ >> - access_type |= (ETM_EXLEVEL_S_APP | >> - ETM_EXLEVEL_S_OS | >> - s_hyp | >> - ETM_EXLEVEL_S_MON); >> + /* All supported secure ELs are excluded */ >> + access_type |= (u64)config->s_ex_level << TRCACATR_EXLEVEL_SHIFT; >> >> return access_type; >> } >> diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h >> index e7f6b7b16fb7..2ac4ecb0af61 100644 >> --- a/drivers/hwtracing/coresight/coresight-etm4x.h >> +++ b/drivers/hwtracing/coresight/coresight-etm4x.h >> @@ -546,6 +546,8 @@ >> /* PowerDown Control Register bits */ >> #define TRCPDCR_PU BIT(3) >> >> +#define TRCACATR_EXLEVEL_SHIFT 8 >> + >> /* secure state access levels - TRCACATRn */ >> #define ETM_EXLEVEL_S_APP BIT(8) >> #define ETM_EXLEVEL_S_OS BIT(9) >> @@ -615,7 +617,7 @@ >> * @vmid_mask0: VM ID comparator mask for comparator 0-3. >> * @vmid_mask1: VM ID comparator mask for comparator 4-7. >> * @ext_inp: External input selection. >> - * @arch: ETM architecture version (for arch dependent config). >> + * @s_ex_level: Secure ELs where tracing is supported. >> */ >> struct etmv4_config { >> u32 mode; >> @@ -659,7 +661,7 @@ struct etmv4_config { >> u32 vmid_mask0; >> u32 vmid_mask1; >> u32 ext_inp; >> - u8 arch; >> + u8 s_ex_level; > > Instead of making s_ex_level redundant I suggest to pass a struct etmv4_drvdata > to etm4_get_access_type(). I had given thought about that. But this is called from different places, e.g, etm4_set_comparator_filter() where the drvdata is not available. Thus, making that change is quite invasive, going down to the call stack. Morever, the config->arch was already redundant (also cached in drvdata), mainly due to this reason. We simply replace the arch field with the actual supported mask of the ELs for precise programming. Please let me know if you would like to make the proposed changes. Cheers Suzuki > > More comments to come tomorrow. > > Thanks, > Mathieu > >> }; >> >> /** >> -- >> 2.24.1 >> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel