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=-14.1 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 AC13DC433E0 for ; Wed, 27 Jan 2021 19:02:05 +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 44681601FB for ; Wed, 27 Jan 2021 19:02:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44681601FB 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=CoVm+s+aOkn+FYKvDlFoJgoRzD6gqngF78xDrslq9Q0=; b=1UhOb7MfUp+lYgULikYaldd0b PQ+vq+h9dr8a4CgwnWsjM0KhJ1I43einUECGUCStWu3U6/MFJmCp6gLYKwSCwlrD2bIM1EJJrV9tU zUeffrFkTBE8ieAAyaDeOi/IonAfe8bn6Q+kRvU6qTLjoBnHmkFOpvn+DcEzodhRNTOjnA5Ns0P9n uf3rpuYJKidgo8nZ7Bsp0ZB7oIJGxBVIsFWfoYCU49JEsOPFvLnH/6m7ljVeu1ncIDVNcwyhBf54L PYtWmkyEvlEqyYQREDFixPqyLljI/CPn4CDgJdqdXp6iEmQWQzm8+fwr6B2KpCQodhaESOZeZSqAZ tvGn19Kjw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4q3g-0007TT-QF; Wed, 27 Jan 2021 19:00:52 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4q3e-0007T0-Qq for linux-arm-kernel@lists.infradead.org; Wed, 27 Jan 2021 19:00:51 +0000 Received: by mail-pg1-x52a.google.com with SMTP id o63so2205215pgo.6 for ; Wed, 27 Jan 2021 11:00:50 -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=ju/HG28YTzw94s5luASjPbDBWwVTWkdpIdIUZsZQ7MOpbA76zKL3eVhDrIiRgoByqh IDtWOHsnybZ1PT7wp0iqqxsmiVd5Oaup0PBORgluyN9JI2TIOvLeNs0RMjkpvxQNZXme ypHFqgy1ifWK1TVw8QrFLeSsT6bdSAEjRR0sIO1rDvVmgyWoJdnJ2Qd2orRAylPJs93b hKqifvFikQRH6vbLk9lY521dRCK2rWL0FaAaoXoEW4buXuLkPr4MXXRWTbiWPMgENYTH mRsMeo2fqUa1TbZ2ugT4JeGNgAAFoyc/g4oIkLAn5Y8gwP94y+vNY/7Z5PNlUzr9TbUR pMFQ== X-Gm-Message-State: AOAM531iELXOqg8me6dw7LdCtBcY3Fwj7qQ6uuQjs+s1Sxf0bM2Gpc2i LuNdyyaQ7xrPE1IAuww9xf1Yatc+X3nN0Q== 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 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-Disposition: inline In-Reply-To: <20210127184617.3684379-1-suzuki.poulose@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210127_140050_982103_B197B7F9 X-CRM114-Status: GOOD ( 18.63 ) 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, stable@vger.kernel.org, Leo Yan , linux-arm-kernel@lists.infradead.org, Mike Leach 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 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel