From patchwork Wed May 22 10:34:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 164784 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp693829ili; Wed, 22 May 2019 03:35:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyTOzm+pX1PpGhCCVDa4/WT5zay9/3PcNn/shtREF8ASnbjyxiIZuKXW+MmAkbmkCb7/Zwb X-Received: by 2002:a17:902:9a08:: with SMTP id v8mr90519421plp.105.1558521339152; Wed, 22 May 2019 03:35:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558521339; cv=none; d=google.com; s=arc-20160816; b=mKu2ebvUAmAcyd/0LuzP3CVHtV5Ce6hLyShRCk0tukM+snzfjLq0HK/7AWLajW3oBK sIvJwkYifka2JYr7g3wG2EpOqP+WQEoIu2Cj2UWn2tG1nKUtmj8YkVhB0JIOSV7rfUk2 wpOArbXCEvUsLL3abCMGa0krRFr06aEGm5ZwjUEOib7b3/HT+PjHV1sPd6cwVPvIjiB3 xIt2OFh/42fy0z6kIEDycCq+tVORXqQpvIFlcI1P1c70G1XpmHvRocTrxhzSj5ao/eNm VhVIsmc3Tymx6IS1yCyNXD6GwaOuOkph9yek+Q1A+YlSqS6QNGdb/Q2A1337QB7YQjgG Zefg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=5yLMiJ6Htp0svVoYjbWUGEi4NOLAK90fjo7/ZHOaSo0=; b=X43D8YxnIP3r0oTYUkQCeZeRcw+9ZHo8No+fQjkNIzxmrjkPNejzDir+o7dqRfSyq8 ikz74Ki3MLdjD2Lz1zb2yTD8B75nVDPdpAHvR33ZgFYL8ywB6oEQXdRAskukbZQ65bby nBkyI/L38aOApf+ITXDm0GwAeEiMYWeXRO7MT/udQQs2jbyZTrYEWtYqhtRC/G08qxv8 2n+nYjr+BX5kqege9X0JMRIutrKjUnUZu6OfC0lvrqiG6LrBHrRKfP3gtF/8MCQ9xSub V8H+sdp4FhoM1aDo8+7z2D+q0y1++7OLdneaL9bd6p69k57AeE4W6XFcoLh++kMG7KGc 7jdA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h68si25312309pgc.270.2019.05.22.03.35.38; Wed, 22 May 2019 03:35:39 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729358AbfEVKfh (ORCPT + 30 others); Wed, 22 May 2019 06:35:37 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:47058 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729252AbfEVKff (ORCPT ); Wed, 22 May 2019 06:35:35 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1AF12165C; Wed, 22 May 2019 03:35:35 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.196.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0B3743F575; Wed, 22 May 2019 03:35:33 -0700 (PDT) From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org, coresight@lists.linaro.org, Suzuki K Poulose Subject: [PATCH v4 13/30] coresight: tmc-etr: Rearrange probing default buffer size Date: Wed, 22 May 2019 11:34:46 +0100 Message-Id: <1558521304-27469-14-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558521304-27469-1-git-send-email-suzuki.poulose@arm.com> References: <1558521304-27469-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we are about to refactor the platform specific handling, make the default buffer size probing generic. Reviewed-by: Mathieu Poirier Signed-off-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-tmc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 3b39f43..9c5e615 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -378,6 +378,15 @@ static int tmc_etr_setup_caps(struct device *parent, u32 devid, void *dev_caps) return rc; } +static u32 tmc_etr_get_default_buffer_size(struct device *dev) +{ + u32 size; + + if (fwnode_property_read_u32(dev->fwnode, "arm,buffer-size", &size)) + size = SZ_1M; + return size; +} + static int tmc_probe(struct amba_device *adev, const struct amba_id *id) { int ret = 0; @@ -423,16 +432,10 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) /* This device is not associated with a session */ drvdata->pid = -1; - if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { - if (np) - ret = of_property_read_u32(np, - "arm,buffer-size", - &drvdata->size); - if (ret) - drvdata->size = SZ_1M; - } else { + if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) + drvdata->size = tmc_etr_get_default_buffer_size(dev); + else drvdata->size = readl_relaxed(drvdata->base + TMC_RSZ) * 4; - } desc.pdata = pdata; desc.dev = dev;