From patchwork Fri Dec 18 20:59:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 58732 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp1267442lbb; Fri, 18 Dec 2015 12:59:52 -0800 (PST) X-Received: by 10.98.72.71 with SMTP id v68mr8339251pfa.17.1450472392058; Fri, 18 Dec 2015 12:59:52 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fk7si26084456pab.219.2015.12.18.12.59.51; Fri, 18 Dec 2015 12:59:51 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965288AbbLRU7s (ORCPT + 29 others); Fri, 18 Dec 2015 15:59:48 -0500 Received: from mail-io0-f175.google.com ([209.85.223.175]:33465 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965191AbbLRU7p (ORCPT ); Fri, 18 Dec 2015 15:59:45 -0500 Received: by mail-io0-f175.google.com with SMTP id 186so103745716iow.0 for ; Fri, 18 Dec 2015 12:59:45 -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=/I+bll/CRZKlyOIyB7HMtrntGmkf7/2QjsBhMQloaKg=; b=WxOukWguhfHvfOyW9AMUKYT5DplUIvosuTh34LgmYO9tJfE0icRRnPB2VJfyW9VB7Y CF4JSTUUROPuhBG9C3On8cLxu7Hor2NlRcG0k2nb6ID41sOb5k4p5xCMdeDSQg0yya2D AaRh7CYTlgDoTfGVgUNXLHzdL1yR43MfIZd4o= 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=/I+bll/CRZKlyOIyB7HMtrntGmkf7/2QjsBhMQloaKg=; b=G+GbWIfA13Z11hAbB8VymKqAZ/PTjpWtP4P/L9SpHqdw0/OwpWRpQ0z2EY9gvQlVTr B6aQkl4zvRK7Jj2H8ZL62IbxcHmcBPshCgtCZ+nxzsHH48ucapbbpGfGXRt6SXkz/evm C0O/eYWE/cRg3y43vLn1RAKicRXF+hX5l4HXz5DEpCpiCqVXhZkkFZpheeTyBRlsjoNI U/F58tvKR5hs6Gj13MMELkwBhJ/2P9DcD41KYzhobJPL4vsvJvdbQCCUNhqNApvMqj66 42mzlSe+CSFKPbQ7ZTYG47nQIAzkWdP698AEMIbBtMqHzZoOMHClIzsyH+mgZAyPaHvx +QCg== X-Gm-Message-State: ALoCoQnyz4wqms67PMkGCujkXBrmJgNoVtJBALG0mIlvKv7GJZwYC0OO79CxKZVkcYwxcChVTE8rAdFxF1GZRgtJH2BAwcAe/A== X-Received: by 10.107.135.217 with SMTP id r86mr7135643ioi.164.1450472384758; Fri, 18 Dec 2015 12:59:44 -0800 (PST) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [184.64.168.246]) by smtp.gmail.com with ESMTPSA id l10sm843701igx.18.2015.12.18.12.59.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Dec 2015 12:59:44 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, alexander.shishkin@linux.intel.com Cc: zhang.chunyan@linaro.org, mike.leach@arm.com, tor@ti.com, al.grant@arm.com, fainelli@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Mathieu Poirier Subject: [PATCH V7 05/24] coresight: etm3x: moving etm_readl/writel to header file Date: Fri, 18 Dec 2015 13:59:01 -0700 Message-Id: <1450472361-426-6-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450472361-426-1-git-send-email-mathieu.poirier@linaro.org> References: <1450472361-426-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 Moving functions etm_readl/writel to file "coresight-etm.h" so that the main ETM3x driver can be split in more than one file. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm.h | 29 +++++++++++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm3x.c | 29 --------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) -- 2.1.4 -- 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-etm.h b/drivers/hwtracing/coresight/coresight-etm.h index b4481eb29304..34f7db881fa7 100644 --- a/drivers/hwtracing/coresight/coresight-etm.h +++ b/drivers/hwtracing/coresight/coresight-etm.h @@ -251,4 +251,33 @@ enum etm_addr_type { ETM_ADDR_TYPE_START, ETM_ADDR_TYPE_STOP, }; + +static inline void etm_writel(struct etm_drvdata *drvdata, + u32 val, u32 off) +{ + if (drvdata->use_cp14) { + if (etm_writel_cp14(off, val)) { + dev_err(drvdata->dev, + "invalid CP14 access to ETM reg: %#x", off); + } + } else { + writel_relaxed(val, drvdata->base + off); + } +} + +static inline unsigned int etm_readl(struct etm_drvdata *drvdata, u32 off) +{ + u32 val; + + if (drvdata->use_cp14) { + if (etm_readl_cp14(off, &val)) { + dev_err(drvdata->dev, + "invalid CP14 access to ETM reg: %#x", off); + } + } else { + val = readl_relaxed(drvdata->base + off); + } + + return val; +} #endif diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index fae66cb45424..3be1f14da44c 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -42,35 +42,6 @@ module_param_named(boot_enable, boot_enable, int, S_IRUGO); static int etm_count; static struct etm_drvdata *etmdrvdata[NR_CPUS]; -static inline void etm_writel(struct etm_drvdata *drvdata, - u32 val, u32 off) -{ - if (drvdata->use_cp14) { - if (etm_writel_cp14(off, val)) { - dev_err(drvdata->dev, - "invalid CP14 access to ETM reg: %#x", off); - } - } else { - writel_relaxed(val, drvdata->base + off); - } -} - -static inline unsigned int etm_readl(struct etm_drvdata *drvdata, u32 off) -{ - u32 val; - - if (drvdata->use_cp14) { - if (etm_readl_cp14(off, &val)) { - dev_err(drvdata->dev, - "invalid CP14 access to ETM reg: %#x", off); - } - } else { - val = readl_relaxed(drvdata->base + off); - } - - return val; -} - /* * Memory mapped writes to clear os lock are not supported on some processors * and OS lock must be unlocked before any memory mapped access on such