From patchwork Tue Apr 12 17:54:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 8813521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 934FCC0553 for ; Tue, 12 Apr 2016 18:00:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB23020374 for ; Tue, 12 Apr 2016 18:00:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7B5920361 for ; Tue, 12 Apr 2016 18:00:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aq2aJ-0001LG-DN; Tue, 12 Apr 2016 17:58:43 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aq2XF-0007Dl-T9 for linux-arm-kernel@lists.infradead.org; Tue, 12 Apr 2016 17:55:35 +0000 Received: by mail-pa0-x231.google.com with SMTP id bx7so17412109pad.3 for ; Tue, 12 Apr 2016 10:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xtJMKxPs7x3AzD92swUSA3FLotyPDuHGH388JYlbUwU=; b=Tg5C6XtuKNr3S7FDSmfyT/ZCz8PeIB7l+rPndHUT9EIyWv/0Qr86tJh52B6ugkLmyQ osk0OMlfPJTI2Xg1/265zZF3IMvjXWO46/1Sltc4KfwPEh67FcxkdR5mia+eB1KIsJOK dyhGfxQ7q80gvyBSU8TcY+oGRxyT84l8g2OQM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xtJMKxPs7x3AzD92swUSA3FLotyPDuHGH388JYlbUwU=; b=ZO5p8dmGGjFoL0eoTR3CsIctea5aT3PPFCdiuiZu1XyLV+PoW1ttjT+QZ31i+DFUWM 2P4Iqhe4DiZgg6muC1r7VN7BRL002ihX/HDZ4oX51jbRDd62u09Ne1ppvPLD2OwF+giA ZTrfxTh/rc1mPRp2mYGyOfNeG7SMKCbQz3BMapFbzzbLlXRD9opZk7gtQwpFtIPf/STa Yw4n3cUSDQ1aPdvDWVu6qtrmaxCyQvznlcs2TFj+Uanh/HkbVGy5jjvNNu3DaN/FaTS8 hqB6JkqTZ8zROf0sXIb4FZN+j91j6TnrCKbMCKG9ddroOXGiU5GQl1iU7Eyvq12bfpmM Os8A== X-Gm-Message-State: AOPr4FWAi06cO6dwxwVm9fAF1HA/uid/JYjoLPowgyR0m5/su2fQLfnUbRYc2ztdEllWUqZn X-Received: by 10.66.157.69 with SMTP id wk5mr6290320pab.40.1460483713190; Tue, 12 Apr 2016 10:55:13 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id p189sm24633204pfb.51.2016.04.12.10.55.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Apr 2016 10:55:12 -0700 (PDT) From: Mathieu Poirier To: linux-arm-kernel@lists.infradead.org, Suzuki.Poulose@arm.com Subject: [PATCH V2 10/15] coresight: tmc: dump system memory content only when needed Date: Tue, 12 Apr 2016 11:54:47 -0600 Message-Id: <1460483692-25061-11-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460483692-25061-1-git-send-email-mathieu.poirier@linaro.org> References: <1460483692-25061-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160412_105534_233500_5E76042E X-CRM114-Status: GOOD ( 12.06 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Calling tmc_etf/etr_dump_hw() is required only when operating from sysFS. When working from Perf, the system memory is harvested from the AUX trace API. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-tmc-etf.c | 7 ++++++- drivers/hwtracing/coresight/coresight-tmc-etr.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index 5908000e1ae0..9b4cdaed09f5 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -74,7 +74,12 @@ static void tmc_etb_disable_hw(struct tmc_drvdata *drvdata) CS_UNLOCK(drvdata->base); tmc_flush_and_stop(drvdata); - tmc_etb_dump_hw(drvdata); + /* + * When operating in sysFS mode the content of the buffer needs to be + * read before the TMC is disabled. + */ + if (local_read(&drvdata->mode) == CS_MODE_SYSFS) + tmc_etb_dump_hw(drvdata); tmc_disable_hw(drvdata); CS_LOCK(drvdata->base); diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index 8e6fe267195a..de5cf0056802 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -76,7 +76,12 @@ static void tmc_etr_disable_hw(struct tmc_drvdata *drvdata) CS_UNLOCK(drvdata->base); tmc_flush_and_stop(drvdata); - tmc_etr_dump_hw(drvdata); + /* + * When operating in sysFS mode the content of the buffer needs to be + * read before the TMC is disabled. + */ + if (local_read(&drvdata->mode) == CS_MODE_SYSFS) + tmc_etr_dump_hw(drvdata); tmc_disable_hw(drvdata); CS_LOCK(drvdata->base);