From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D53AC4360F for ; Fri, 5 Apr 2019 10:26:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D139217D7 for ; Fri, 5 Apr 2019 10:26:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Wu00m+9H"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="QaBKi756"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="nVUwHoXl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D139217D7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=O/P0/JryZXRoXzofNuktNV+MkucNgJ8qpYtvdKcAlhc=; b=Wu00m+9HJaUPvn 2nin+k37Qaos2Xj1+p7i7qiXbCQawkdagC7Jzy7dpj5cziRLIclCOq0x/REfViFvWSANCfOEne6c7 c1PbXjOq58W0mxpbvd4pvY2uEr92MvLZUhkRB6B3W9i/s2bBysCHECDKgwb3OWT6UOSxBK4seFue/ w1KygmfNWRBnGnTB1QOyofKjtcWVk/od7//KPwF+HjNAqlY4RaObsEENwaENUVk13aOpXh/nechRC rF5UlJuHl9N45sERlKZimddVgP10wiPmXCpprNCegpjXUyzkJXH/+FLb558sN17JNsC4+BS7MHwcT y++PKVQqLukJTWuRYGgw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hCM2m-0003qC-Hs; Fri, 05 Apr 2019 10:25:56 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hCM2Z-0003fc-HB for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2019 10:25:54 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D05EC61845; Fri, 5 Apr 2019 10:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1554459942; bh=ecfe3QXZi1M0P/wrkMh/PeD8+1p8Ao18xx7AYBbOP38=; h=From:To:Cc:Subject:Date:From; b=QaBKi756RMuwDyCAcr37l7EVzmFNeTLsqxqvXcBRQggzyKW1SR4wACUYYTjEjeBBC oZJkc2k3cIiPj28gWuX6Mrk0mjAfE9ZA18r2SfarXZsYG4kg/6eUh/k6KfbpUEz9J6 EIa5t5cSb0bBBYglaoUtgeSK0f8CYSuIiHWzOdQ0= Received: from blr-ubuntu-253.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: saiprakash.ranjan@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 2EDB96177C; Fri, 5 Apr 2019 10:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1554459929; bh=ecfe3QXZi1M0P/wrkMh/PeD8+1p8Ao18xx7AYBbOP38=; h=From:To:Cc:Subject:Date:From; b=nVUwHoXlhGYXf4pfk93QNCIPvh1uowlBZGNrTfm7l9AV03f8Ub3W8y6BDikA/SZNv LSAKeS9EEKdz8/mCnjSX32tITFS7LoZcPX7bUtRClE/gSVJeBIDwTlYuAy0hlj9mvj yiUf7h6dvjat4+B/mnWmWCv5YPu+7bV1SdE/xlWg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2EDB96177C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=saiprakash.ranjan@codeaurora.org From: Sai Prakash Ranjan To: Alexander Shishkin , Greg Kroah-Hartman , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com, Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan Subject: [PATCH] stm class: Fix channel free in stm output free path Date: Fri, 5 Apr 2019 15:54:42 +0530 Message-Id: <20190405102442.25718-1-saiprakash.ranjan@codeaurora.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190405_032543_964706_C8D7D8AF X-CRM114-Status: GOOD ( 11.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sai Prakash Ranjan , Rajendra Nayak , Tingwei Zhang , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Sibi Sankar , Vivek Gautam , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Tingwei Zhang Number of free masters is not set correctly in stm free path. Fix this by properly adding the number of output channels before setting them to 0 in stm_output_disclaim(). Currently it is equivalent to doing nothing since master->nr_free is incremented by 0. Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices") Signed-off-by: Tingwei Zhang Signed-off-by: Sai Prakash Ranjan Cc: stable@vger.kernel.org --- drivers/hwtracing/stm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index c7ba8acfd4d5..5b5807cbcf7c 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -218,8 +218,8 @@ stm_output_disclaim(struct stm_device *stm, struct stm_output *output) bitmap_release_region(&master->chan_map[0], output->channel, ilog2(output->nr_chans)); - output->nr_chans = 0; master->nr_free += output->nr_chans; + output->nr_chans = 0; } /* -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel