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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 3FA2CC433E0 for ; Wed, 27 Jan 2021 19:01:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 031DE601FB for ; Wed, 27 Jan 2021 19:01:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343907AbhA0TBi (ORCPT ); Wed, 27 Jan 2021 14:01:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231267AbhA0TB3 (ORCPT ); Wed, 27 Jan 2021 14:01:29 -0500 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD75DC06174A for ; Wed, 27 Jan 2021 11:00:48 -0800 (PST) Received: by mail-pg1-x52c.google.com with SMTP id o16so2224578pgg.5 for ; Wed, 27 Jan 2021 11:00:48 -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=COxofTr0kJgJ0XrTolT3iIHzQatztoojR6wHC+Fzy74=; b=fAEyChm6iRnVQn8MSzpwlHcYJVpgFidFFtuGRvFiIMb4hbXkSaewAhYjNVWmVkSTDm NE8p0RbxFsvC/DMHSSNM2F/CpybpBihBHF/aJnya5uuIEIEtJY7DDrBxmR0LHHkWj2Fa SbrOzL71GL+X6gl4/k2SmPr+jQ/yoBn/l69Ed+UmZABqOfyEwuj9kRkg7fWPygO5I62j CxQxw39JsWFyUJybP3ez6HVSVB2ZPVBx7Uzo8MYZ2zBCiX0Af43rHAm8kFIq+P3Orky9 Kjs2eeExdXLTMRD1ZbYoIJw1VbNUrJjjlZ/OCLIiCTWGTR5bxUl47FqQrpiKN//HqIiN n/FA== 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=COxofTr0kJgJ0XrTolT3iIHzQatztoojR6wHC+Fzy74=; b=Bhwct+i4Ty3/nYiMcDXUylkkBl+clkksHRHdP5LO5ZjOXQczd4TZ0FdYFeaKvTFQcX 3ZLasMl4bVNl5K8KyqVAk8PZgG9PEqlyNmL95praBJumbfT95ELNmRwn6WjMnUlTGKEE i3pTs/SqcdK0PfcKZq7wuXM38A5RnJZRjxcZFu9Bdq9QKeifVFbmLEcu7lOCqQORVYKv q8OIqOqIzWn8otuFWuzhaymeoOn1gX6sUVuwzrOtxvoZsqhgr09oGSnIdPwEmCrWoWTf YvtY0NSyQ7Xc4LwvTxvf00LQ//8cR0E0tt8Vk43j5jy34Apm/D9lXFutLmPvAPYm4ogd Pxnw== X-Gm-Message-State: AOAM5305326pcTGJExUz0cWgyUk9//yc0HsxH0BmMVbkKKjW8RmFSSYB 1xm/6DXEkzAuA248u6RUP1ksvQ== X-Google-Smtp-Source: ABdhPJyYU5QypQEJbdegyIzU0caaY5lQIq1bBnjC5+47zOqziEX95F2dX+L8ujg6Ft/zHLgZGrPPgg== X-Received: by 2002:a63:2d3:: with SMTP id 202mr12522670pgc.438.1611774048289; Wed, 27 Jan 2021 11:00:48 -0800 (PST) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id c5sm2738594pjo.4.2021.01.27.11.00.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 11:00:47 -0800 (PST) Date: Wed, 27 Jan 2021 12:00:45 -0700 From: Mathieu Poirier To: Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, anshuman.khandual@arm.com, stable@vger.kernel.org, Mike Leach , Leo Yan Subject: Re: [PATCH v3] coresight: etm4x: Handle accesses to TRCSTALLCTLR Message-ID: <20210127190045.GA1165637@xps15> References: <20210127184617.3684379-1-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210127184617.3684379-1-suzuki.poulose@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 27, 2021 at 06:46:17PM +0000, Suzuki K Poulose wrote: > TRCSTALLCTLR register is only implemented if > > TRCIDR3.STALLCTL == 0b1 > > Make sure the driver touches the register only it is implemented. > > Cc: stable@vger.kernel.org > Cc: Mathieu Poirier > Cc: Mike Leach > Cc: Leo Yan > Signed-off-by: Suzuki K Poulose > --- > Changes since v2: > - Ignore STALLCTL for sysfs mode > --- > drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 ++++++--- > drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 2 +- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 473ab7480a36..5017d33ba4f5 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -306,7 +306,8 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) > etm4x_relaxed_write32(csa, 0x0, TRCAUXCTLR); > etm4x_relaxed_write32(csa, config->eventctrl0, TRCEVENTCTL0R); > etm4x_relaxed_write32(csa, config->eventctrl1, TRCEVENTCTL1R); > - etm4x_relaxed_write32(csa, config->stall_ctrl, TRCSTALLCTLR); > + if (drvdata->stallctl) > + etm4x_relaxed_write32(csa, config->stall_ctrl, TRCSTALLCTLR); > etm4x_relaxed_write32(csa, config->ts_ctrl, TRCTSCTLR); > etm4x_relaxed_write32(csa, config->syncfreq, TRCSYNCPR); > etm4x_relaxed_write32(csa, config->ccctlr, TRCCCCTLR); > @@ -1463,7 +1464,8 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) > state->trcauxctlr = etm4x_read32(csa, TRCAUXCTLR); > state->trceventctl0r = etm4x_read32(csa, TRCEVENTCTL0R); > state->trceventctl1r = etm4x_read32(csa, TRCEVENTCTL1R); > - state->trcstallctlr = etm4x_read32(csa, TRCSTALLCTLR); > + if (drvdata->stallctl) > + state->trcstallctlr = etm4x_read32(csa, TRCSTALLCTLR); > state->trctsctlr = etm4x_read32(csa, TRCTSCTLR); > state->trcsyncpr = etm4x_read32(csa, TRCSYNCPR); > state->trcccctlr = etm4x_read32(csa, TRCCCCTLR); > @@ -1575,7 +1577,8 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata) > etm4x_relaxed_write32(csa, state->trcauxctlr, TRCAUXCTLR); > etm4x_relaxed_write32(csa, state->trceventctl0r, TRCEVENTCTL0R); > etm4x_relaxed_write32(csa, state->trceventctl1r, TRCEVENTCTL1R); > - etm4x_relaxed_write32(csa, state->trcstallctlr, TRCSTALLCTLR); > + if (drvdata->stallctl) > + etm4x_relaxed_write32(csa, state->trcstallctlr, TRCSTALLCTLR); > etm4x_relaxed_write32(csa, state->trctsctlr, TRCTSCTLR); > etm4x_relaxed_write32(csa, state->trcsyncpr, TRCSYNCPR); > etm4x_relaxed_write32(csa, state->trcccctlr, TRCCCCTLR); > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > index b646d53a3133..0995a10790f4 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > @@ -389,7 +389,7 @@ static ssize_t mode_store(struct device *dev, > config->eventctrl1 &= ~BIT(12); > > /* bit[8], Instruction stall bit */ > - if (config->mode & ETM_MODE_ISTALL_EN) > + if ((config->mode & ETM_MODE_ISTALL_EN) && (drvdata->stallctl == true)) I have applied this patch. > config->stall_ctrl |= BIT(8); > else > config->stall_ctrl &= ~BIT(8); > -- > 2.24.1 >