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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D6442C4332F for ; Fri, 15 Dec 2023 16:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/UySvAW+kB1FXvPbaqSs00keNBPBPqIAVjFyEeSR+lY=; b=46bWyoQ+WSbXK1 mRULE/tKYyffzHLs2xHT+0F7wM/gkXF1Dn9knuEtS8Z40t5yaYuFdR581Rsxo6K8mKsymlGvbtIO5 J3PUrKKL4zAv/68JSTPifAZ5vf0eta7qZ+J7ITvWDoo1TvNSHR/RPJVWsYZRpPWyKIc1bT4mOikuf 8z6zcxfVYUtkqwug7wrEwawo+dlCSP7Tsfd+O1KGIPS4zlE19xLOMQY8lclumEMWGwTAG6lZakWq3 QhBec9n3gnlokE1EI4tE5BB6B/WH7fZRXBKlmbjrf1jQMOKfve2O1doKaEcX/63tn/Xklz48CRjQL dJdGiM6Skoi8T1ps8aUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEAwr-003qxs-05; Fri, 15 Dec 2023 16:22:01 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEAwp-003qxD-0K for linux-arm-kernel@lists.infradead.org; Fri, 15 Dec 2023 16:22:00 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5D2BFC15; Fri, 15 Dec 2023 08:22:40 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.45.203]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1150B3F5A1; Fri, 15 Dec 2023 08:21:52 -0800 (PST) Date: Fri, 15 Dec 2023 16:21:45 +0000 From: Mark Rutland To: James Clark Cc: linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-next@vger.kernel.org, will@kernel.org, u.kleine-koenig@pengutronix.de, Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Anshuman Khandual , Suzuki K Poulose , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: Re: [PATCH 1/2] arm: perf: Fix ARCH=arm build with GCC in armv8pmu_write_evtype() Message-ID: References: <20231215150040.3342183-1-james.clark@arm.com> <20231215150040.3342183-2-james.clark@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231215150040.3342183-2-james.clark@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231215_082159_202049_A6353E39 X-CRM114-Status: GOOD ( 19.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Dec 15, 2023 at 03:00:38PM +0000, James Clark wrote: > LLVM ignores everything inside the if statement and doesn't generate > errors, but GCC doesn't ignore it, resulting in the following error: > > drivers/perf/arm_pmuv3.c: In function 'armv8pmu_write_evtype': > include/linux/bits.h:34:29: error: left shift count >= width of type [-Werror=shift-count-overflow] > 34 | (((~UL(0)) - (UL(1) << (l)) + 1) & \ > > Fix it by changing the if to #if. I reckon it'd be cleaner to use GENMASK_ULL for the TH and TC fields, in include/linux/perf/arm_pmu.h have: | /* | * PMXEVTYPER: Event selection reg | */ | #define ARMV8_PMU_EVTYPE_EVENT GENMASK(15, 0) /* Mask for EVENT bits */ | #define ARMV8_PMU_EVTYPE_TH GENMASK_ULL(43, 32) /* arm64 only */ | #define ARMV8_PMU_EVTYPE_TC GENMASK_ULL(63, 61) /* arm64 only */ IIUC that should silence this warning, and it'd remove the need for the ifdeffery and other changes in patch 2. Does that work, or am I missing something? Thanks, Mark. > > Fixes: 3115ee021bfb ("arm64: perf: Include threshold control fields in PMEVTYPER mask") > Reported-by: Uwe Kleine-K"onig > Closes: https://lore.kernel.org/linux-arm-kernel/20231215120817.h2f3akgv72zhrtqo@pengutronix.de/ > Signed-off-by: James Clark > --- > drivers/perf/arm_pmuv3.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c > index 23fa6c5da82c..3ed2086cefc3 100644 > --- a/drivers/perf/arm_pmuv3.c > +++ b/drivers/perf/arm_pmuv3.c > @@ -631,8 +631,9 @@ static void armv8pmu_write_evtype(int idx, unsigned long val) > ARMV8_PMU_EXCLUDE_EL0 | > ARMV8_PMU_EXCLUDE_EL1; > > - if (IS_ENABLED(CONFIG_ARM64)) > - mask |= ARMV8_PMU_EVTYPE_TC | ARMV8_PMU_EVTYPE_TH; > +#if IS_ENABLED(CONFIG_ARM64) > + mask |= ARMV8_PMU_EVTYPE_TC | ARMV8_PMU_EVTYPE_TH; > +#endif > > val &= mask; > write_pmevtypern(counter, val); > -- > 2.34.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel