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 28683C2D0A3 for ; Fri, 6 Nov 2020 18:54:14 +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 9964A206E3 for ; Fri, 6 Nov 2020 18:54:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZEilgMna"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XtL4kifd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9964A206E3 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=Y0qtDRmIHo/Z3lqBA7lf6ST1CCytG6NyL528E9S+TX0=; b=ZEilgMnaHtMm1kC0trm+cfCBF 8lpYx6akz9biyIeunUdhKsVuUZcs62uECrw1ivGkc4zQfmMoJClJafdY0Q2xD9FyWhpEAUmysTyc1 GdAbs7png64TTXMYfxRxBELGMNTyVZd1k8JP239tQ7zajoIeOQKBuHIpV2RKJPPHqvyenxwY0tWio JUuDsv9hVnxukeZjJ+ZGYozA+YejbN8LnZ/Erhq12T+BMmKrq94kI0xWeZ0M+gfwlpuFCVwoGfOEo 1srYIf+j4HBrjK9SjYj3dp8rzlT65SJyYOHVGUo0GMcRbTSWNve/nOMfn519Hh2V9vdj7PpRoz+zX KOaUAVmTA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb6qw-0008Pj-Fa; Fri, 06 Nov 2020 18:52:50 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kb6qt-0008Oo-Ep for linux-arm-kernel@lists.infradead.org; Fri, 06 Nov 2020 18:52:48 +0000 Received: by mail-pg1-x541.google.com with SMTP id t14so1648562pgg.1 for ; Fri, 06 Nov 2020 10:52:46 -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=vvsTsXFERb+lVOW9+teUGEwQPDYWf6fhAoxDY3KZRU4=; b=XtL4kifdsRSQg33mYbFB+uiK98KSODeLCPfpvhhRRK8ElGD6Rb2ODb+RzUWU2zcSgp XzZ76ad+avLcNYmISinyEgezRiiU4HectGnhAt3nMzgITdeGCWO2Hlq1wQsHtCmT6gOt qnImFK6nE9zkrIQtEWfRk55KRrjo+ewkTErWkEqwU2dLeYliI8Z40h4rgr7xhfsa3ZqY wNoKI0J132/X0qYQ5+nzWO+geduLvVlZIw2z4wOTL7MqcUtBqHVG4kwgN6OkOBOg4ufy N97+5aLoi6u907UG3ijQDnv9JyiK5qng1LrMU46bI4SSwFOTTf3LgxkjIWu05ogFYG/c 4VwQ== 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=vvsTsXFERb+lVOW9+teUGEwQPDYWf6fhAoxDY3KZRU4=; b=U+fEZ1LFiu9hHjp7RNz5bnOWFutJjY3lHTdXxy7exWjFKfn+jH7vMxGHVXyYealITx IhenH33iKYQVh/AIJbEJmySilGydpbglWVwfqT3/l7qf7DIFP+MCJj9vs6J4cu+Va4Tg 6KldZeWrxd1rQFEUHsYeYJEuJYkCaEKD5sWnSwtPS9vNkH5bD2hbk62/JdWYL3Kgkwne Vz4YyIyWWyGGUdouAEEBdMzW5xkuEvFDXGYsZ0ySYla00hXrOX8lvjNcACPxhgZybQRH nzyPr1VStqxeDiB0pJ1QmFNysQ/Twq7OV3em3Yt/s9jWl7bgR2Ch+20wlssXC1moHOqx iYyA== X-Gm-Message-State: AOAM533YNYTWWNwvGn78RBr0WfSYojzYtqlp2hvl+1Esag20pCLhZk5c nM4/7gBA3x6yVgxxa5HFYqNR4w== X-Google-Smtp-Source: ABdhPJwe2I956rsddmU6iXOnweZYHT8ni9l/V4hmueotIA6Rq4azUDt6zgW6C2jLd37xKUerHs1+0w== X-Received: by 2002:a63:ef4f:: with SMTP id c15mr2819789pgk.345.1604688764740; Fri, 06 Nov 2020 10:52:44 -0800 (PST) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id f21sm2527429pga.32.2020.11.06.10.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 10:52:43 -0800 (PST) Date: Fri, 6 Nov 2020 11:52:41 -0700 From: Mathieu Poirier To: Suzuki K Poulose Subject: Re: [PATCH v3 18/26] coresight: etm4x: Clean up exception level masks Message-ID: <20201106185241.GA3299843@xps15> References: <20201028220945.3826358-1-suzuki.poulose@arm.com> <20201028220945.3826358-20-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201028220945.3826358-20-suzuki.poulose@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201106_135247_539769_1EBD69DA X-CRM114-Status: GOOD ( 30.39 ) 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 Good morning, On Wed, Oct 28, 2020 at 10:09:37PM +0000, Suzuki K Poulose wrote: > etm4_get_access_type() calculates the exception level bits > for use in address comparator registers. This is also used > by the TRCVICTLR register by shifting to the required position. > > This patch cleans up the logic to make etm4_get_access_type() > calcualte a generic mask which can be used by all users by > shifting to their field. > > No functional changes, only code cleanups. > > Signed-off-by: Suzuki K Poulose > --- > Changes since previous version: > - Fix the duplicate shift. More commentary > --- > .../coresight/coresight-etm4x-core.c | 47 +++++++++---------- > .../coresight/coresight-etm4x-sysfs.c | 12 ++--- > drivers/hwtracing/coresight/coresight-etm4x.h | 46 +++++++++++------- > 3 files changed, 59 insertions(+), 46 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 6e3f9cb7de3f..f038bb10bc78 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -852,20 +852,16 @@ static void etm4_init_arch_data(void *info) > etm4_cs_lock(drvdata, csa); > } > > +static inline u32 etm4_get_victlr_access_type(struct etmv4_config *config) > +{ > + return etm4_get_access_type(config) << TRCVICTLR_EXLEVEL_SHIFT; > +} > + > /* Set ELx trace filter access in the TRCVICTLR register */ > static void etm4_set_victlr_access(struct etmv4_config *config) > { > - u64 access_type; > - > - config->vinst_ctrl &= ~(ETM_EXLEVEL_S_VICTLR_MASK | ETM_EXLEVEL_NS_VICTLR_MASK); > - > - /* > - * TRCVICTLR::EXLEVEL_NS:EXLEVELS: Set kernel / user filtering > - * bits in vinst_ctrl, same bit pattern as TRCACATRn values returned by > - * etm4_get_access_type() but with a relative shift in this register. > - */ > - access_type = etm4_get_access_type(config) << ETM_EXLEVEL_LSHIFT_TRCVICTLR; > - config->vinst_ctrl |= (u32)access_type; > + config->vinst_ctrl &= ~(TRCVICTLR_EXLEVEL_S_MASK | TRCVICTLR_EXLEVEL_NS_MASK); > + config->vinst_ctrl |= etm4_get_victlr_access_type(config); > } > > static void etm4_set_default_config(struct etmv4_config *config) > @@ -895,12 +891,9 @@ static u64 etm4_get_ns_access_type(struct etmv4_config *config) > u64 access_type = 0; > > /* > - * EXLEVEL_NS, bits[15:12] > - * The Exception levels are: > - * Bit[12] Exception level 0 - Application > - * Bit[13] Exception level 1 - OS > - * Bit[14] Exception level 2 - Hypervisor > - * Bit[15] Never implemented > + * EXLEVEL_NS, for NonSecure Exception levels. > + * The mask here is a generic value and must be > + * shifted to the corresponding field for the registers > */ > if (!is_kernel_in_hyp_mode()) { > /* Stay away from hypervisor mode for non-VHE */ > @@ -917,20 +910,26 @@ static u64 etm4_get_ns_access_type(struct etmv4_config *config) > return access_type; > } > > +/* > + * Construct the exception level masks for a given config. > + * This must be shifted to the corresponding register field > + * for usage. > + */ > static u64 etm4_get_access_type(struct etmv4_config *config) > { > - u64 access_type = etm4_get_ns_access_type(config); > - > - /* All supported secure ELs are excluded */ > - access_type |= (u64)config->s_ex_level << TRCACATR_EXLEVEL_SHIFT; > + /* All Secure exception levels are excluded from the trace */ > + return etm4_get_ns_access_type(config) | (u64)config->s_ex_level; > +} > > - return access_type; > +static u64 etm4_get_comparator_access_type(struct etmv4_config *config) > +{ > + return etm4_get_access_type(config) << TRCACATR_EXLEVEL_SHIFT; > } > > static void etm4_set_comparator_filter(struct etmv4_config *config, > u64 start, u64 stop, int comparator) > { > - u64 access_type = etm4_get_access_type(config); > + u64 access_type = etm4_get_comparator_access_type(config); > > /* First half of default address comparator */ > config->addr_val[comparator] = start; > @@ -965,7 +964,7 @@ static void etm4_set_start_stop_filter(struct etmv4_config *config, > enum etm_addr_type type) > { > int shift; > - u64 access_type = etm4_get_access_type(config); > + u64 access_type = etm4_get_comparator_access_type(config); > > /* Configure the comparator */ > config->addr_val[comparator] = address; > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > index fce9df16bfb5..009818675928 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > @@ -743,7 +743,7 @@ static ssize_t s_exlevel_vinst_show(struct device *dev, > struct etmv4_drvdata *drvdata = dev_get_drvdata(dev->parent); > struct etmv4_config *config = &drvdata->config; > > - val = (config->vinst_ctrl & ETM_EXLEVEL_S_VICTLR_MASK) >> 16; > + val = (config->vinst_ctrl & TRCVICTLR_EXLEVEL_S_MASK) >> TRCVICTLR_EXLEVEL_S_SHIFT; > return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); > } > > @@ -760,10 +760,10 @@ static ssize_t s_exlevel_vinst_store(struct device *dev, > > spin_lock(&drvdata->spinlock); > /* clear all EXLEVEL_S bits */ > - config->vinst_ctrl &= ~(ETM_EXLEVEL_S_VICTLR_MASK); > + config->vinst_ctrl &= ~(TRCVICTLR_EXLEVEL_S_MASK); > /* enable instruction tracing for corresponding exception level */ > val &= drvdata->s_ex_level; > - config->vinst_ctrl |= (val << 16); > + config->vinst_ctrl |= (val << TRCVICTLR_EXLEVEL_S_SHIFT); > spin_unlock(&drvdata->spinlock); > return size; > } > @@ -778,7 +778,7 @@ static ssize_t ns_exlevel_vinst_show(struct device *dev, > struct etmv4_config *config = &drvdata->config; > > /* EXLEVEL_NS, bits[23:20] */ > - val = (config->vinst_ctrl & ETM_EXLEVEL_NS_VICTLR_MASK) >> 20; > + val = (config->vinst_ctrl & TRCVICTLR_EXLEVEL_NS_MASK) >> TRCVICTLR_EXLEVEL_NS_SHIFT; > return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); > } > > @@ -795,10 +795,10 @@ static ssize_t ns_exlevel_vinst_store(struct device *dev, > > spin_lock(&drvdata->spinlock); > /* clear EXLEVEL_NS bits */ > - config->vinst_ctrl &= ~(ETM_EXLEVEL_NS_VICTLR_MASK); > + config->vinst_ctrl &= ~(TRCVICTLR_EXLEVEL_NS_MASK); > /* enable instruction tracing for corresponding exception level */ > val &= drvdata->ns_ex_level; > - config->vinst_ctrl |= (val << 20); > + config->vinst_ctrl |= (val << TRCVICTLR_EXLEVEL_NS_SHIFT); > spin_unlock(&drvdata->spinlock); > return size; > } > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h > index 2ac4ecb0af61..f1251ddf1984 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -548,24 +548,38 @@ > > #define TRCACATR_EXLEVEL_SHIFT 8 > > -/* secure state access levels - TRCACATRn */ > -#define ETM_EXLEVEL_S_APP BIT(8) > -#define ETM_EXLEVEL_S_OS BIT(9) > -#define ETM_EXLEVEL_S_HYP BIT(10) > -#define ETM_EXLEVEL_S_MON BIT(11) > -/* non-secure state access levels - TRCACATRn */ > -#define ETM_EXLEVEL_NS_APP BIT(12) > -#define ETM_EXLEVEL_NS_OS BIT(13) > -#define ETM_EXLEVEL_NS_HYP BIT(14) > -#define ETM_EXLEVEL_NS_NA BIT(15) > - > -/* access level control in TRCVICTLR - same bits as TRCACATRn but shifted */ > -#define ETM_EXLEVEL_LSHIFT_TRCVICTLR 8 > +/* > + * Exception level mask for Secure and Non-Secure ELs. > + * ETM defines the bits for EL control (e.g, TRVICTLR, TRCACTRn). > + * The Secure and Non-Secure ELs are always to gether. > + * Non-secure EL3 is never implemented. > + * We use the following generic mask as they appear in different > + * registers and this can be shifted for the appropriate > + * fields. > + */ > +#define ETM_EXLEVEL_S_APP BIT(0) /* Secure EL0 */ > +#define ETM_EXLEVEL_S_OS BIT(1) /* Secure EL1 */ > +#define ETM_EXLEVEL_S_HYP BIT(2) /* Secure EL2 */ > +#define ETM_EXLEVEL_S_MON BIT(3) /* Secure EL3/Montor */ s/Montor/Monitor > +#define ETM_EXLEVEL_NS_APP BIT(4) /* NonSecure EL0 */ > +#define ETM_EXLEVEL_NS_OS BIT(5) /* NonSecure EL1 */ > +#define ETM_EXLEVEL_NS_HYP BIT(6) /* NonSecure EL2 */ > + > +#define ETM_EXLEVEL_MASK (GENMASK(6, 0)) Not used. > +#define ETM_EXLEVEL_S_MASK (GENMASK(3, 0)) > +#define ETM_EXLEVEL_NS_MASK (GENMASK(6, 4)) This needs to be GENMASK(2, 0) in order TRCVICTLR_EXLEVEL_NS_SHIFT to be 20. Otherwise the resulting mask is 4 bit off to the left. > + > +/* access level controls in TRCACATRn */ > +#define TRCACATR_EXLEVEL_SHIFT 8 > + > +/* access level control in TRCVICTLR */ > +#define TRCVICTLR_EXLEVEL_SHIFT 16 > +#define TRCVICTLR_EXLEVEL_S_SHIFT 16 > +#define TRCVICTLR_EXLEVEL_NS_SHIFT 20 > > /* secure / non secure masks - TRCVICTLR, IDR3 */ > -#define ETM_EXLEVEL_S_VICTLR_MASK GENMASK(19, 16) > -/* NS MON (EL3) mode never implemented */ > -#define ETM_EXLEVEL_NS_VICTLR_MASK GENMASK(22, 20) > +#define TRCVICTLR_EXLEVEL_S_MASK (ETM_EXLEVEL_S_MASK << TRCVICTLR_EXLEVEL_S_SHIFT) > +#define TRCVICTLR_EXLEVEL_NS_MASK (ETM_EXLEVEL_NS_MASK << TRCVICTLR_EXLEVEL_NS_SHIFT) > > /* Interpretation of resource numbers change at ETM v4.3 architecture */ > #define ETM4X_ARCH_4V3 0x43 > -- > 2.24.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel