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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 5D959C64E7B for ; Mon, 30 Nov 2020 21:26:36 +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 CC71A206A5 for ; Mon, 30 Nov 2020 21:26:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Y0BOv/7o"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EEG7Q59n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC71A206A5 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=A8GoSWgxz9wiqxteao3+uIfq2liwMKe7rq3fzbGWQ8g=; b=Y0BOv/7oV1UbRDTJFeWYcvDwI ZLrN8lOuwAglwEnnV8FAKJYAYf5iyIaQd0BXBW2EAwB4TeFzaSXrXlJDyEfn/+0RPXbCoEIU8TCWf uGvgSAnDlllNLWQ22E8Xb7yp0T00q2AM15nAwSad9qEpuJQNtZw2JE1pzgO08qtSo0FxU1Bon8e7U me19Za3KE5ROvPxS2o0ubp9lsiC+tWxDkrzbPNZUpM3poBEgkQ0Hlec9g9FCxCZq62A79TII7o05Q TpN6g69uvSNROQ7BwMLydofRp44CxVAWCs5SqAbxlFzcU6E8OphrtyaRBO1mnRz4D10kBTKBxBUhT d010viC2Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kjqfl-0006Ud-Jt; Mon, 30 Nov 2020 21:25:25 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kjqfi-0006Tt-Hd for linux-arm-kernel@lists.infradead.org; Mon, 30 Nov 2020 21:25:23 +0000 Received: by mail-pj1-x1043.google.com with SMTP id h7so441428pjk.1 for ; Mon, 30 Nov 2020 13:25:22 -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=y7RO377EB18tjslC6Vh73hVU4r2GlVkMnINYXjKoMGI=; b=EEG7Q59nhTN7LTyzQsWDFTJ2mQKLxlunkXqY4n/f7NEO3o8/FLGmmIdYYnfumi0Yka bH5IFD4tqH1P9qgDAH4zvtO9Ihdl678rbZz7wbfICDo0Yt5FMtY4gYEhamngqcpObpCx dA3BiaGnCj8w4VEcSiyodpUqMr67upLWoAA+/PMXMFWqCeV0b5pfj+kUHg7CDKu/qZCg ZG6GuuOvR2CscxImFOXd90sSm4+zIVn8kkUZ29Tl/pNKl97iqgjvTY/zpLl1pEo99Rn0 l1x2TkduANMiFD2QqvIYr2TcGpTc5qqIZzo3c2EZVtjzFdpGkYdREhHzQjsWEFza40F2 Ez6g== 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=y7RO377EB18tjslC6Vh73hVU4r2GlVkMnINYXjKoMGI=; b=muFuVQUBdyITmmdDGQAiNzhWU5wT0vfHqYAe+Cac7ONAEi0uwaIJ12kg++GmtTeIPF ij+vojek2qBr4z77JzDBMIaWJKZq6ZVyWm1X6b3N13FZciiVRrlxFsWNnZaT3kvL8B6m 3zz/QM2PnE8Gvwf1U2P8rvlMpCCmuBCrqtnWTLxAKrvNElA5ndddkG1+KdALeWfBKxpz q23Auz2HPZjUHoMItvajJTbeKVo94HwbrI7qLR1XsYR0GvJQLPxnjQAqzUrkxHbSXku1 MPtWlWFVwm+Qmzpl/Wgh8O7m6OHbvP/bNvIityk8bAPubh8dzYvCsLkBUFjy8dGH51u/ M7Wg== X-Gm-Message-State: AOAM532r41PIftLKPLhf6jshEViSw/VASBzlJ3PUfsQpA9NEfwsmmivu goOKWwuYGxhhyHAkUvp6VSUISQ== X-Google-Smtp-Source: ABdhPJxEp792ADqyvD9lgPUNn4UqYYwWJliH9jI8V3GLi8nH4zrWI5CUDhpW7nfGnF2kgejvnPPryQ== X-Received: by 2002:a17:902:8490:b029:d6:d165:fde with SMTP id c16-20020a1709028490b02900d6d1650fdemr20389296plo.73.1606771520423; Mon, 30 Nov 2020 13:25:20 -0800 (PST) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id g31sm16358284pgl.34.2020.11.30.13.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 13:25:19 -0800 (PST) Date: Mon, 30 Nov 2020 14:25:17 -0700 From: Mathieu Poirier To: Suzuki K Poulose Subject: Re: [PATCH v4 13/25] coresight: etm4x: Cleanup secure exception level masks Message-ID: <20201130212517.GH1092947@xps15> References: <20201119164547.2982871-1-suzuki.poulose@arm.com> <20201119164547.2982871-14-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201119164547.2982871-14-suzuki.poulose@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201130_162522_694881_4C28656A X-CRM114-Status: GOOD ( 23.24 ) 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: anshuman.khandual@arm.com, coresight@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jonathan.zhouwen@huawei.com, 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 Thu, Nov 19, 2020 at 04:45:35PM +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(-) > Reviewed-by: Mathieu Poirier > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 85a165d1245e..a1f294703c43 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -742,7 +742,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); > @@ -758,6 +757,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); > > @@ -929,16 +929,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 d8f047547a36..94ead0cd98df 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -549,6 +549,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) > @@ -618,7 +620,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; > @@ -662,7 +664,7 @@ struct etmv4_config { > u32 vmid_mask0; > u32 vmid_mask1; > u32 ext_inp; > - u8 arch; > + u8 s_ex_level; > }; > > /** > -- > 2.24.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel