From patchwork Mon Nov 23 18:32:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 7684971 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 BA5F19F1BE for ; Mon, 23 Nov 2015 18:36:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED63D207FD for ; Mon, 23 Nov 2015 18:36:35 +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 2CF8D207ED for ; Mon, 23 Nov 2015 18:36:35 +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 1a0vwu-0000Pc-Vy; Mon, 23 Nov 2015 18:34:49 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a0vwQ-00008o-En for linux-arm-kernel@lists.infradead.org; Mon, 23 Nov 2015 18:34:19 +0000 Received: by pacej9 with SMTP id ej9so198763325pac.2 for ; Mon, 23 Nov 2015 10:34:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nzmrJ93ajOSj+P+yxLaJjUx+wT8QG+YR/74S537g75A=; b=chdTYWElmqFjxv69MqgWUMd9fHox34EwW+bskdd8v+dQ3FLy+Bp7tRDfmRp1uAbWVE 8qy3RJPoxnNe642iXRCyu85XWyRFkj+22Q8pBPk0P6uEVRedGFmuZwVmK+Vdf35RB8iU MGNF1Bnb4M3Cva+wiUu5GAm2U2ciwxnrXmXE3wkDbVeAQag7yb8aVyBi6qUktN0eyjTL fdf0vuPrRiBxZpEhZWbtyS2w5eEVNC+wjYnQSIsf7o8tusl58ED657DywoMW6ABo2ZyB 6FNS7LcFO5DSdPZYXU3VQY7gzKsPvQwbW+xjPJAbZzFayEspoNKdKk/eIBF0YIiajlzC 1eyQ== 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=nzmrJ93ajOSj+P+yxLaJjUx+wT8QG+YR/74S537g75A=; b=DtROFj1CICYMbt/kUz+wrHUcsfKKM9kc7x4c5GVSArlRvZNlphD64h3V0KkGvLP9u1 lwFZhoL3D4Bw8J2ii2NbXRThLYmifKHTKnhMqX+wgX7DzWsXDuMGJ1Bf7BCUVsfP15YM HkJDDHaYwy6m3UGAb7JllIML4gogo7KSaRH3aMj4iEAk/ndnMTbGhMQqMCbDNB57vhbP knrWg/b2tD8FVQ6qyYBnhfDPEdZqT/pXEyjSuKskhILYbFyQUAtpAsqgsjpkSXMGJdik M1ne4ITNfWohsIXuRPbVYNVtpRLMmt2yvf/uMqQ6GT7LJ7//oiSRXvs7l4vvQbcNOFkm QfJA== X-Gm-Message-State: ALoCoQl8AjVIyRuvLXIptyJZxQk5lldXE84QHkKruOYQSv8OOWNq2/K2oHSyd5QIEU0y4sHV4km3 X-Received: by 10.68.109.196 with SMTP id hu4mr36946954pbb.71.1448303640957; Mon, 23 Nov 2015 10:34:00 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id r20sm10865186pfa.93.2015.11.23.10.33.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 10:34:00 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, a.p.zijlstra@chello.nl, alexander.shishkin@linux.intel.com, acme@kernel.org, mingo@redhat.com, corbet@lwn.net, nicolas.pitre@linaro.org Subject: [RESEND PATCH V4 03/26] coresight: etm3x: unlocking tracers in default arch init Date: Mon, 23 Nov 2015 11:32:55 -0700 Message-Id: <1448303598-11249-4-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448303598-11249-1-git-send-email-mathieu.poirier@linaro.org> References: <1448303598-11249-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151123_103418_637215_BD0B6772 X-CRM114-Status: GOOD ( 13.66 ) X-Spam-Score: -2.6 (--) 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, pawel.moll@arm.com, linux-doc@vger.kernel.org, fainelli@broadcom.com, linux-kernel@vger.kernel.org, tor@ti.com, mike.leach@arm.com, zhang.chunyan@linaro.org, linux-arm-kernel@lists.infradead.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=-4.7 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 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 2a1950d0753d..737b6164f4a5 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(); } @@ -478,6 +478,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 */ @@ -602,9 +605,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");