From patchwork Fri Dec 11 03:26:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 58258 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp893862lbb; Thu, 10 Dec 2015 19:34:04 -0800 (PST) X-Received: by 10.98.65.135 with SMTP id g7mr12018836pfd.141.1449804844076; Thu, 10 Dec 2015 19:34:04 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pv3si360525pac.61.2015.12.10.19.34.03; Thu, 10 Dec 2015 19:34:04 -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 S1752330AbbLKDeB (ORCPT + 28 others); Thu, 10 Dec 2015 22:34:01 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:32887 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751318AbbLKDd7 (ORCPT ); Thu, 10 Dec 2015 22:33:59 -0500 Received: by pfnn128 with SMTP id n128so58630114pfn.0 for ; Thu, 10 Dec 2015 19:33:59 -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; bh=Y/q48ssPx51/mzZspuJx7uu/rTuFCyWWZITmguSx6bo=; b=a7Wp1WhaSqsAMEKdrZ2kSdddCu9S9p1O0WY/Wbe50waLbCi19VTZSokRUyYX9XmpOB JNTGzODwGKxagAhs6GCXfMs6PkTbH28m8vaTa/3EuNffHhlntaxiPu4uDhwqA4sBDJlF QoUHj7jxZ7NKtqE7o119h+ZT8LbuqAqVPoMwVmJeTY1Ardr+nO92xSppMfKmcVmrunLf rtedhZ5fQpjLgkp0RWd2CHZuYhKZieXgy2iJX8+YOgTt2y5Wp6Pd56o7ZlHX4Zq4vIdR gEd4uof2zgrnS1ppTy/3eT6L2kTAwfp5VfAStu6RypejQW9uUCeAjCQ8mhAjJDpfwsAB XVnQ== 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; bh=Y/q48ssPx51/mzZspuJx7uu/rTuFCyWWZITmguSx6bo=; b=Zys9UpV1kOWc9nqiLJnIrOrUdRtiRnmaeF+ic9fQHFvf3Qm6Zn66D1VPkrHbAxGo7C Ff0Og6Okm3rKJNY4vrztDp4O0NySNTuuc3pTz91HyHLWaKy9yt4Rp9FbhyC4PyRZwI3F DPRmhmFxTZZY2/i6H0mDvsQp4jK1U3UA7orxb2DTeXkc2JcPMNMYx81gHw+w3OnF1HqG v6MvgFgCNouR1QbAwY2l8rhGigQC7DVC6oHPgXJq7SKKBA65m8wlnb+edImG8hKKrmq/ YvSWHsnV7wtxb5pCbtOZDfR8dtAgxwYnXWjzWjri19METqg+E+Dz7vV1Ug4R7imJ7WDh KW9A== X-Gm-Message-State: ALoCoQlRaU7Iwb5oKOkQNiPPUoJY+PgWxIFK1WawhOAapYiItl1DfHHAhj2QHugKVOw4Jkq04dZtnhNRLU4EFxa+BD2Gl45m7g== X-Received: by 10.98.79.202 with SMTP id f71mr12048789pfj.21.1449804481322; Thu, 10 Dec 2015 19:28:01 -0800 (PST) Received: from zcy-ubuntu.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id l20sm21387430pfi.10.2015.12.10.19.27.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Dec 2015 19:28:00 -0800 (PST) From: Chunyan Zhang To: alexander.shishkin@linux.intel.com Cc: linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH] stm: the number of masters should be (sw_end - sw_start + 1) Date: Fri, 11 Dec 2015 11:26:50 +0800 Message-Id: <1449804410-16833-1-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sw_end represents the last software master, sw_start is index of the first master, so the number of software masters should be sw_end - sw_start + 1. Signed-off-by: Chunyan Zhang --- drivers/hwtracing/intel_th/sth.c | 2 +- drivers/hwtracing/stm/core.c | 2 +- 2 files changed, 2 insertions(+), 2 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/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c index 56101c3..28917d7 100644 --- a/drivers/hwtracing/intel_th/sth.c +++ b/drivers/hwtracing/intel_th/sth.c @@ -173,7 +173,7 @@ static int intel_th_sw_init(struct sth_device *sth) sth->stm.sw_start = reg & 0xffff; sth->stm.sw_end = reg >> 16; - sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start; + sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start + 1; dev_dbg(sth->dev, "sw_start: %x sw_end: %x masters: %x nchannels: %x\n", sth->stm.sw_start, sth->stm.sw_end, sth->sw_nmasters, sth->stm.sw_nchannels); diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 7f7bdb3..cb676f2 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -632,7 +632,7 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, if (!stm_data->packet || !stm_data->sw_nchannels) return -EINVAL; - nmasters = stm_data->sw_end - stm_data->sw_start; + nmasters = stm_data->sw_end - stm_data->sw_start + 1; stm = kzalloc(sizeof(*stm) + nmasters * sizeof(void *), GFP_KERNEL); if (!stm) return -ENOMEM;