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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 690BBC388F7 for ; Mon, 9 Nov 2020 17:44:09 +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 F238120639 for ; Mon, 9 Nov 2020 17:44:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2xoZbsRm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ClDS/YMZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F238120639 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org 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-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6EeciEFnYIt7pLfTOUzP1rgm7ElU75Y8l5g3BjUWWWo=; b=2xoZbsRmi+jodRGhUNtTguDDP nUdNDJYdoBDU/UsCfSP01bhi6IGwO7eN+thUhYH8T8sElRkldQOsAcnObIKXthlpj+oYRUk5HtFJW r0ZMYTC50Qx/BLRIzsgStm1sVQspSgz9rNqjNaLu64dRsk4U6tFCm5jGMWlCecS7i94824C2GRM2G iFbhAxSaXe1I8dI4PwWusAxdr93m8Fr/hMHEJTXfD8UEGUwyTAoXChm7XuGh4krHo+E7EUxkrWPxH xf7KdC5esWhMLB5nRP5t6UgdlqhM9pG6p0Y4zVn4mp0uNJFmbT1cyTj6vZUHruFDxEwTt3fDFqzT1 aLm2/IvXA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcBBp-0008Ly-HV; Mon, 09 Nov 2020 17:42:49 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcBBV-0008CU-Hi for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2020 17:42:30 +0000 Received: by mail-pf1-x442.google.com with SMTP id a18so8646128pfl.3 for ; Mon, 09 Nov 2020 09:42:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=BvTfF4wxBhLQMbsVUQ/52+F1c9iM5v5fNva5TTlgMnQ=; b=ClDS/YMZV1X42HHosQGL3CD5WM/7YzXTiPXE3j4CatoBBMRnad33UuSaycFNLLY7ps FdtEdMMz5oO04A83VXzTWnkGRjxBNZ9lLiTEAEZ/hs+Tct0FBIHbfrqOl3D9qqNGjf49 0DLURRGgLdZfIayMaYhLTxFCj/qCTh00CTeGpHsaG6Si6MnLeIY/Y2aBS1+esz3IgeFm GeGlgWct62i4BAdoTiJNUxOY6K3g6QJjtn8joQe8DiX+IsMgvPlL1D/POqBCLSZTBuY6 bhuI5xwitLvkSGrx5livwxIRLXJXsz6o22ExyQ0h3Rl2oDeNcdCGADjvnpVPuT4wPwVC D79A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BvTfF4wxBhLQMbsVUQ/52+F1c9iM5v5fNva5TTlgMnQ=; b=faEaQOF8nZPAyqpPKjC/MYyRfr2UTP2V3mBsVm0EVpZPP/rPHDHc+d5Ohe9yCNbImF GsV88bTuTBz+g1Yd+hR7p3VcTjhZJBP2fb18FoLCLaAfHIW593dTut+F+7MVPTKuRxkv NJGlBC7zWHhcZDyPUnTrgnVRFKkF0l/4q3Vnr4TlaEuHiqg4tElrT8llv/1DRelQUXsP ejeFmgLTIC4oOkxUzRgn6OuGPBL0yxbnIJRg2dKgHSgFOII0S0nqfOHj0B/IEOWcWWXU PZXNQcQiqdHpuymsc3Ou8M/Rnxl5LDeUJSjFoOigwKzmzRvfxXURlrpS2Tt4/gdw2YHs ElYg== X-Gm-Message-State: AOAM531YMOHd/NLk3pnbWXWz5EZLpCz/ZWnEecB+KO6d4gc8GJu4lAJp KhXsc1dqzzXYdXjCmQL0zYwtBw== X-Google-Smtp-Source: ABdhPJxd2FX98AYeY8IEDYWzZnNcyJLcHfJudtpXcyP4Mq1QJDAMGzh0Up9Cyl5Q6zZP6pu58RNcgg== X-Received: by 2002:a17:90a:7c03:: with SMTP id v3mr252000pjf.233.1604943745602; Mon, 09 Nov 2020 09:42:25 -0800 (PST) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id n11sm77621pjv.52.2020.11.09.09.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 09:42:24 -0800 (PST) Date: Mon, 9 Nov 2020 10:42:23 -0700 From: Mathieu Poirier To: Suzuki K Poulose Subject: Re: [PATCH v3 17/26] coresight: etm4x: Cleanup secure exception level masks Message-ID: <20201109174223.GB3395222@xps15> References: <20201028220945.3826358-1-suzuki.poulose@arm.com> <20201028220945.3826358-19-suzuki.poulose@arm.com> <20201105215526.GC3047244@xps15> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201109_124229_726149_BA89F826 X-CRM114-Status: GOOD ( 32.45 ) 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 09, 2020 at 09:40:54AM +0000, Suzuki K Poulose wrote: > 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. > I also noticed config->arch while looking at this patch. > Please let me know if you would like to make the proposed changes. The problem with adding s_ex_level to etmv4_config is that we are adding to the technological debt, i.e the more we add the more have to fix. The upside with the status quo is that we don't add to an already extensive patchset. We can move forward with the latter but would really like to see both ->arch and ->s_ex_level fixed in a subsequent patchset. > > 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