From patchwork Thu Jan 14 21:46:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 8035841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BDCC39F744 for ; Thu, 14 Jan 2016 21:50:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF30B20251 for ; Thu, 14 Jan 2016 21:50:43 +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 1FFC120390 for ; Thu, 14 Jan 2016 21:50:42 +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 1aJplW-0005eA-Re; Thu, 14 Jan 2016 21:49:10 +0000 Received: from mail-pf0-x22e.google.com ([2607:f8b0:400e:c00::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aJpju-0004J1-1r for linux-arm-kernel@lists.infradead.org; Thu, 14 Jan 2016 21:47:32 +0000 Received: by mail-pf0-x22e.google.com with SMTP id q63so109247252pfb.1 for ; Thu, 14 Jan 2016 13:47:09 -0800 (PST) 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=aDjBecOPJrJTpjCk4P0wVzAKoW/KTujnbiI8i5+juHM=; b=Joim9IkO9VbDeoV8om7SnIf2b0wymEcGY0yjXYnyUgzPbAHiraSGv7E2gWZOtSznFB jiPTp6ofV4lgr5qMjzlSoOwX7NcmDo1BSyW+p+8q6dQs7BGKY18VG6L9QouSAda+Pl8Q Zx1CoS/0E26mi3aSfRxzIqYmBFGm1NxQXLn64= 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=aDjBecOPJrJTpjCk4P0wVzAKoW/KTujnbiI8i5+juHM=; b=ZI9p+a7bgy0Qx6/j29t6YsN0VqxPqNN9L2JNz/oq8OVpO4pO+qOtW6GcwSX5J8upSK aGPqlvsXybxvwg1zRcPAH+R9v8z4DEkxhxlmcr+o5j34dQQAlQHEoFwvRaNldiDSlq1N 1lEWyPTW/QixvP2YyPfIAEW+B5RKEe9HY8dXqHRZCBcU9caHvX5j4iMujcRy5gg+nEwV /l7dO9D9x7X3J+rH1G6Sezt03Ko9eatB3dro9g7ims5/m47JWd4buxUh8PryHKJKCddT Po+t8zsOlHlW4/E9+cwle6Hujx7t4jyCdfdGTUV/rcpmf2WO2GZhRdzfFQB1cdz1YMdc 1jgQ== X-Gm-Message-State: ALoCoQlHmiP1sMGqiuwLxQ3N5HTWJ7Qn+unNPCe4CdIngCwMbFtw+hTaKJxMtk9Bniq8IE6+on3zVB+QSvzqO9+tfVuOMO0IQQ== X-Received: by 10.98.75.22 with SMTP id y22mr9669523pfa.147.1452808029385; Thu, 14 Jan 2016 13:47:09 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id c87sm11383309pfj.41.2016.01.14.13.47.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jan 2016 13:47:08 -0800 (PST) From: Mathieu Poirier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V8 06/23] coresight: etm3x: unlocking tracers in default arch init Date: Thu, 14 Jan 2016 14:46:00 -0700 Message-Id: <1452807977-8069-7-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452807977-8069-1-git-send-email-mathieu.poirier@linaro.org> References: <1452807977-8069-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160114_134730_346483_2BA0D737 X-CRM114-Status: GOOD ( 12.95 ) 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: al.grant@arm.com, Mathieu Poirier , linux-doc@vger.kernel.org, zhang.chunyan@linaro.org, rabin@rab.in, mike.leach@arm.com, tor@ti.com 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 function 'smp_call_function_single()' to unlock a tracer and calling it again right after to perform the default initialisation doesn't make sense. Moving 'etm_os_unlock()' just before making the default initialisation results in the same outcome while saving one call to 'smp_call_function_single()'. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm3x.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index 042b88ecae92..c383d218d921 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -47,11 +47,11 @@ static struct etm_drvdata *etmdrvdata[NR_CPUS]; * and OS lock must be unlocked before any memory mapped access on such * processors, otherwise memory mapped reads/writes will be invalid. */ -static void etm_os_unlock(void *info) +static void etm_os_unlock(struct etm_drvdata *drvdata) { - struct etm_drvdata *drvdata = (struct etm_drvdata *)info; /* Writing any value to ETMOSLAR unlocks the trace registers */ etm_writel(drvdata, 0x0, ETMOSLAR); + drvdata->os_unlock = true; isb(); } @@ -483,6 +483,9 @@ static void etm_init_arch_data(void *info) u32 etmccr; struct etm_drvdata *drvdata = info; + /* Make sure all registers are accessible */ + etm_os_unlock(drvdata); + CS_UNLOCK(drvdata->base); /* First dummy read */ @@ -607,9 +610,6 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) get_online_cpus(); etmdrvdata[drvdata->cpu] = drvdata; - if (!smp_call_function_single(drvdata->cpu, etm_os_unlock, drvdata, 1)) - drvdata->os_unlock = true; - if (smp_call_function_single(drvdata->cpu, etm_init_arch_data, drvdata, 1)) dev_err(dev, "ETM arch init failed\n");