From patchwork Tue Mar 22 20:23:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 64199 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2294866lbc; Tue, 22 Mar 2016 13:24:14 -0700 (PDT) X-Received: by 10.66.66.46 with SMTP id c14mr2428198pat.79.1458678254169; Tue, 22 Mar 2016 13:24:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x10si4408803pas.64.2016.03.22.13.24.13; Tue, 22 Mar 2016 13:24:14 -0700 (PDT) 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=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752694AbcCVUXy (ORCPT + 29 others); Tue, 22 Mar 2016 16:23:54 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:33415 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752595AbcCVUXp (ORCPT ); Tue, 22 Mar 2016 16:23:45 -0400 Received: by mail-io0-f180.google.com with SMTP id c63so75961350iof.0 for ; Tue, 22 Mar 2016 13:23:45 -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=IEhsJqwyGHToaPvWBurxniCHS9l4TP/1KyWg0YpkYcw=; b=TPrJfDXrZ8TU76vs/w8iI+Ne8tOpxNAmEFrqVRdxg9YO9L01sMd79D1VPF2WP6LFTx nEOakhEfaey+WuOsrhK4UlJVEtx7Q0QfXIRgoJCwKVW+YGrcvqIjvZVixov1n7kF63tZ YibiOe99eSMF/ITj+wWUZnlFuKc1bTWFchFvw= 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=IEhsJqwyGHToaPvWBurxniCHS9l4TP/1KyWg0YpkYcw=; b=JUeB0ZAq1r1Y3XRyaxLJC/inP0cYUF8ob7xtkdiWIkRcxjp3oHx+T5RPXfSG7vHicT 1IFlrAKnqD+gAxHwiyVYG3idN38w9GFVWksresKnk/3j8GhfnqdMxk9LiUO7mR+VMV+2 RgiaORcBo6ZIrjNCibrq7v3a0xWDxlNFXGgu9lc4gYQkJt2sBCH+Zif5oXKFGBjZ4zjo WfvN+jBue3pX2oOlqZ8BaeZP+SfiMdsie6OdH9Y2IyH6bVGVX5BuZLp8Qv1Nu6+btb7i VN6410iAQAoKJ0b4J8IcvL+Gvv9EAwIC80SYIkdS/QAMW3u8Vzr4YrjWer2a2P4w9/JK B6lg== X-Gm-Message-State: AD7BkJLnFQRMvbJKQNQzxxRC2FgYYp7jcqrd53YGquI1rzMGlJdD3QVe1dQmwglyhYQbWhdQ X-Received: by 10.107.15.12 with SMTP id x12mr15384532ioi.129.1458678224725; Tue, 22 Mar 2016 13:23:44 -0700 (PDT) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id xo2sm8092061igb.0.2016.03.22.13.23.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Mar 2016 13:23:43 -0700 (PDT) From: Mathieu Poirier To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 03/14] coresight: tmc: re-implementing tmc_read_prepare/unprepare() functions Date: Tue, 22 Mar 2016 14:23:11 -0600 Message-Id: <1458678202-3447-4-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458678202-3447-1-git-send-email-mathieu.poirier@linaro.org> References: <1458678202-3447-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 In their current implementation the tmc_read_prepare/unprepare() are a lump of if/else that is difficult to read. This patch is alleviating that by using a switch statement. The latter also allows for a better control on the error path. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-tmc.c | 56 ++++++++++++++++++----------- 1 file changed, 36 insertions(+), 20 deletions(-) -- 2.1.4 diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index f4ba837a0810..208d47dd3083 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -430,7 +430,7 @@ static const struct coresight_ops tmc_etf_cs_ops = { static int tmc_read_prepare(struct tmc_drvdata *drvdata) { - int ret; + int ret = 0; unsigned long flags; enum tmc_mode mode; @@ -438,25 +438,31 @@ static int tmc_read_prepare(struct tmc_drvdata *drvdata) if (!drvdata->enable) goto out; - if (drvdata->config_type == TMC_CONFIG_TYPE_ETB) { + switch (drvdata->config_type) { + case TMC_CONFIG_TYPE_ETB: tmc_etb_disable_hw(drvdata); - } else if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { - tmc_etr_disable_hw(drvdata); - } else { + break; + case TMC_CONFIG_TYPE_ETF: + /* There is no point in reading a TMC in HW FIFO mode */ mode = readl_relaxed(drvdata->base + TMC_MODE); - if (mode == TMC_MODE_CIRCULAR_BUFFER) { - tmc_etb_disable_hw(drvdata); - } else { - ret = -ENODEV; + if (mode != TMC_MODE_CIRCULAR_BUFFER) { + ret = -EINVAL; goto err; } + + tmc_etb_disable_hw(drvdata); + break; + case TMC_CONFIG_TYPE_ETR: + tmc_etr_disable_hw(drvdata); + break; + default: + ret = -EINVAL; + goto err; } + out: drvdata->reading = true; - spin_unlock_irqrestore(&drvdata->spinlock, flags); - dev_info(drvdata->dev, "TMC read start\n"); - return 0; err: spin_unlock_irqrestore(&drvdata->spinlock, flags); return ret; @@ -471,20 +477,30 @@ static void tmc_read_unprepare(struct tmc_drvdata *drvdata) if (!drvdata->enable) goto out; - if (drvdata->config_type == TMC_CONFIG_TYPE_ETB) { + switch (drvdata->config_type) { + case TMC_CONFIG_TYPE_ETB: tmc_etb_enable_hw(drvdata); - } else if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { - tmc_etr_enable_hw(drvdata); - } else { + break; + case TMC_CONFIG_TYPE_ETF: + /* Make sure we don't re-enable a TMC in HW FIFO mode */ mode = readl_relaxed(drvdata->base + TMC_MODE); - if (mode == TMC_MODE_CIRCULAR_BUFFER) - tmc_etb_enable_hw(drvdata); + if (mode != TMC_MODE_CIRCULAR_BUFFER) + goto err; + + tmc_etb_enable_hw(drvdata); + break; + case TMC_CONFIG_TYPE_ETR: + tmc_etr_disable_hw(drvdata); + break; + default: + goto err; } + out: drvdata->reading = false; - spin_unlock_irqrestore(&drvdata->spinlock, flags); - dev_info(drvdata->dev, "TMC read end\n"); +err: + spin_unlock_irqrestore(&drvdata->spinlock, flags); } static int tmc_open(struct inode *inode, struct file *file)