From patchwork Wed Nov 11 22:17:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 56392 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp74852lbb; Wed, 11 Nov 2015 14:19:36 -0800 (PST) X-Received: by 10.68.114.36 with SMTP id jd4mr17951487pbb.135.1447280376290; Wed, 11 Nov 2015 14:19:36 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uh5si15235926pab.115.2015.11.11.14.19.36; Wed, 11 Nov 2015 14:19:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbbKKWTd (ORCPT + 28 others); Wed, 11 Nov 2015 17:19:33 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34717 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752480AbbKKWTX (ORCPT ); Wed, 11 Nov 2015 17:19:23 -0500 Received: by padhx2 with SMTP id hx2so42978013pad.1 for ; Wed, 11 Nov 2015 14:19:23 -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=Oj47QXLN48uoXzbPVzkcblpvgHSgNk5eWgv3dtvl0NZcCAE5psleGz7ZdTjoc0hL6x 2pB8FWGPqkRqUpEdp46Uq2tkkdP+DcvbUtTaF01SsG7oJwp0uFKlYM3Q2uG4GSRTEmAs vER6VS14oL/9SJ9JjF5TlCoahr4ouitDdBjFLx00E++SsaF4xyMpVaiQDoqGOY7oeSNC WjP+gJRIlfNrFGTQAcFQiBJDVgNUZ2uquq97dZNYcsselTPrf8FN/32qIaPq2raHh00k h5Qrh88s8GtxwDyRbJUqxWQ6USlqAPacI2KFIT5QPtiu7uSYRh8/0ScnL53xoSXHfR24 RMUA== 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=HgEkKvYh4mnBjsd2+/70biuwj+j1XAgCGSiy/6I7EIOZwC1ohUOBEulqRgMXENoDRH tDJQTB5pXlm0PGuWfb/zNW6P4X+S/IvqhiTq9ucZCDvc72qsg+cJlWJQ7rnWXzGGZLc+ 7fCV9rKW2orjJvaz8fGdYmvAEqxj2w2yV3eoDqw0czAEvqim/RBqITHrKu8rKLHMUukK nADvDVKTqvWGqbEU2qT5LSYVbfSsnazmsPuBRmhVB/T6PS44c2K1BlJOAcBQh/Aam9bY p5kfK3cbxToWqXnBaTM6UYKsXDBEotCEcCe/2Cb5abBvPWEMQ3OOUn0cOpjGYTBrwieY yQxg== X-Gm-Message-State: ALoCoQkCdVbiJtejUQQtnetavVJECI22fQluPJNyE5PimZlq2VJ3AqVApmdeUiQxszN7w9r8lMOS X-Received: by 10.68.91.162 with SMTP id cf2mr8046786pbb.34.1447280363092; Wed, 11 Nov 2015 14:19:23 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id h10sm11156697pat.7.2015.11.11.14.19.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Nov 2015 14:19:22 -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 Cc: adrian.hunter@intel.com, zhang.chunyan@linaro.org, mike.leach@arm.com, tor@ti.com, al.grant@arm.com, pawel.moll@arm.com, fainelli@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH V3 03/26] coresight: etm3x: unlocking tracers in default arch init Date: Wed, 11 Nov 2015 15:17:53 -0700 Message-Id: <1447280296-19147-4-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447280296-19147-1-git-send-email-mathieu.poirier@linaro.org> References: <1447280296-19147-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ 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");