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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 57B6CC433E1 for ; Thu, 18 Jun 2020 01:25:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 372D920776 for ; Thu, 18 Jun 2020 01:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443549; bh=WGZwiMzYf/e6Tb5AesdZUfqhXFw8hyI1+EO6ZLgw6SA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=A80KzyPAKNHlGew1J+42Gnoktr9wDMwU73LmRlX2JGq5hM89lXE6ZMxZawAAJwPy7 4rv6+qWmF3CxUACJojoQ3ZLAJhOCSKmwZvfsR9k6mFszXwnAEE4AoOFS8MJtuRLDjh SChsH9v3f9buSZitIV+ucaB6ypr8KIqhQenkl2W4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729862AbgFRBZs (ORCPT ); Wed, 17 Jun 2020 21:25:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:32814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731489AbgFRBZp (ORCPT ); Wed, 17 Jun 2020 21:25:45 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 402E820897; Thu, 18 Jun 2020 01:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443544; bh=WGZwiMzYf/e6Tb5AesdZUfqhXFw8hyI1+EO6ZLgw6SA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sISIyPdNkIL2MJH7gRdeQGqOhLvEA4T4y3N/sYCDFunTYWQZeE3fekcax14lQyPSH y2X3J43fu31YDwOikFyPwu/c+yY/R/OB3uwp73GhcehYi3DtKj37salCLAaM0Gf2uY KNUEyP2fVCrvZxidUB0w4HFlHH7G9IETZ/bHE2X4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shaokun Zhang , Will Deacon , Mark Rutland , Sasha Levin Subject: [PATCH AUTOSEL 4.19 161/172] drivers/perf: hisi: Fix wrong value for all counters enable Date: Wed, 17 Jun 2020 21:22:07 -0400 Message-Id: <20200618012218.607130-161-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012218.607130-1-sashal@kernel.org> References: <20200618012218.607130-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shaokun Zhang [ Upstream commit 961abd78adcb4c72c343fcd9f9dc5e2ebbe9b448 ] In L3C uncore PMU drivers, bit16 is used to control all counters enable & disable. Wrong value is given in the driver and its default value is 1'b1, it can work because each PMU counter has its own control bits too. Let's fix the wrong value. Fixes: 2940bc433370 ("perf: hisi: Add support for HiSilicon SoC L3C PMU driver") Signed-off-by: Shaokun Zhang Cc: Will Deacon Cc: Mark Rutland Link: https://lore.kernel.org/r/1591350221-32275-1-git-send-email-zhangshaokun@hisilicon.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c index 0bde5d919b2e..4aff69cbb903 100644 --- a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c @@ -38,7 +38,7 @@ /* L3C has 8-counters */ #define L3C_NR_COUNTERS 0x8 -#define L3C_PERF_CTRL_EN 0x20000 +#define L3C_PERF_CTRL_EN 0x10000 #define L3C_EVTYPE_NONE 0xff /* -- 2.25.1