Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1226543ybn; Tue, 24 Sep 2019 17:04:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqznMUm6RdkR/tS4EHJRAEIUI8Xgk82OpQrv2HpC1Oye5P0rPiVRijR89egx17MiDCEjHXkV X-Received: by 2002:a7b:c34e:: with SMTP id l14mr217444wmj.123.1569369844547; Tue, 24 Sep 2019 17:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569369844; cv=none; d=google.com; s=arc-20160816; b=PU0LO1ywysLBWLgIwMJ73SrCZlCOTt90ECbn4CvngT3f/gZBKLy30snuFduNA9ee/J /awWjJ9CvNEKEk0t4ru96HEPi21HQjiRp4ZK9vV23V2d/xdjaLcvm/aFCYTPPMGzbuIL vF9SiJIVXGSb30ofLUir8JfG5tDaZexQmuI5tV5MrfXS84Nt8g11DZAZjIugKiPUI2hD qpi+xdgE6qlgfoKqtow15LOAsqyPxvPAl7Ch2IqDr+vpnzyH+SanS7m9YCtV1Ln0IC+G lcCLMCznw78Xe47gXzwZK0Nf3/XF7l+Ol8b3aRX0D+Iz4O6kB5UtYY7lUCCQ3A4V2g8d AKmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rDH8A2VnW79/l92U64lqo7OnFCiEmSJsyFdWczTH+LY=; b=gkuyil83d0/Vg+2BHPzQWjrucCyVfgyNZqb5oKR7u6kNCHXARKSthWrP5Od1I6O/f0 iAlSYD950NWwYlIZ65zEguno426TTSsV1dPXGvGzpdwXBsSS2j6634e09XC7lCuxEUws Q+PkYZUvi9prEBCIlEUQzaDWronrYfrlsx2CD64pVmykggwL90tIXsuKz105E3YauylH bZFWG2Zcb6s1Auodhg/ZCbwcn2EKGOP1Fgp8UUYLj1mbQOsBt+dTrOUkofEOECvxYPNw M1II1JWC//th9ZYXkb/K0XgqkdICT0LLbgS+QYTUhLCJgUKkzfbYQe6JQPU+Uoov43V7 HozQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LF52Wr60; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e27si2242298edj.295.2019.09.24.17.03.37; Tue, 24 Sep 2019 17:04:04 -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; dkim=pass header.i=@kernel.org header.s=default header.b=LF52Wr60; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406829AbfIVThp (ORCPT + 99 others); Sun, 22 Sep 2019 15:37:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:41370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389539AbfIVSpl (ORCPT ); Sun, 22 Sep 2019 14:45:41 -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 13A7321928; Sun, 22 Sep 2019 18:45:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177940; bh=qC7Ybr1PEtdazV9SfUC9Px5bD8UortLRXWtE3Aen14o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LF52Wr60vi703ae/tHsIf4qDfmUVsuxiUMeud7guKiDEz41mfKmj/bQjmg+Ds+aBz 1F2GjOjreYfywJ2MmM9ScTSKHZDsjjSSH96SL60uix01zKPuBCFbN6zDWoqkWjc9Ar 0osnm7qwTJf1F9unDQI1566EaWJrNHGOGKSiqZ18= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qian Cai , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL 5.3 049/203] arm64/prefetch: fix a -Wtype-limits warning Date: Sun, 22 Sep 2019 14:41:15 -0400 Message-Id: <20190922184350.30563-49-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qian Cai [ Upstream commit b99286b088ea843b935dcfb29f187697359fe5cd ] The commit d5370f754875 ("arm64: prefetch: add alternative pattern for CPUs without a prefetcher") introduced MIDR_IS_CPU_MODEL_RANGE() to be used in has_no_hw_prefetch() with rv_min=0 which generates a compilation warning from GCC, In file included from ./arch/arm64/include/asm/cache.h:8, from ./include/linux/cache.h:6, from ./include/linux/printk.h:9, from ./include/linux/kernel.h:15, from ./include/linux/cpumask.h:10, from arch/arm64/kernel/cpufeature.c:11: arch/arm64/kernel/cpufeature.c: In function 'has_no_hw_prefetch': ./arch/arm64/include/asm/cputype.h:59:26: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] _model == (model) && rv >= (rv_min) && rv <= (rv_max); \ ^~ arch/arm64/kernel/cpufeature.c:889:9: note: in expansion of macro 'MIDR_IS_CPU_MODEL_RANGE' return MIDR_IS_CPU_MODEL_RANGE(midr, MIDR_THUNDERX, ^~~~~~~~~~~~~~~~~~~~~~~ Fix it by converting MIDR_IS_CPU_MODEL_RANGE to a static inline function. Signed-off-by: Qian Cai Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/cputype.h | 21 +++++++++++---------- arch/arm64/kernel/cpufeature.c | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index e7d46631cc42b..b1454d117cd2c 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -51,14 +51,6 @@ #define MIDR_CPU_MODEL_MASK (MIDR_IMPLEMENTOR_MASK | MIDR_PARTNUM_MASK | \ MIDR_ARCHITECTURE_MASK) -#define MIDR_IS_CPU_MODEL_RANGE(midr, model, rv_min, rv_max) \ -({ \ - u32 _model = (midr) & MIDR_CPU_MODEL_MASK; \ - u32 rv = (midr) & (MIDR_REVISION_MASK | MIDR_VARIANT_MASK); \ - \ - _model == (model) && rv >= (rv_min) && rv <= (rv_max); \ - }) - #define ARM_CPU_IMP_ARM 0x41 #define ARM_CPU_IMP_APM 0x50 #define ARM_CPU_IMP_CAVIUM 0x43 @@ -159,10 +151,19 @@ struct midr_range { #define MIDR_REV(m, v, r) MIDR_RANGE(m, v, r, v, r) #define MIDR_ALL_VERSIONS(m) MIDR_RANGE(m, 0, 0, 0xf, 0xf) +static inline bool midr_is_cpu_model_range(u32 midr, u32 model, u32 rv_min, + u32 rv_max) +{ + u32 _model = midr & MIDR_CPU_MODEL_MASK; + u32 rv = midr & (MIDR_REVISION_MASK | MIDR_VARIANT_MASK); + + return _model == model && rv >= rv_min && rv <= rv_max; +} + static inline bool is_midr_in_range(u32 midr, struct midr_range const *range) { - return MIDR_IS_CPU_MODEL_RANGE(midr, range->model, - range->rv_min, range->rv_max); + return midr_is_cpu_model_range(midr, range->model, + range->rv_min, range->rv_max); } static inline bool diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index b1fdc486aed82..9323bcc40a58a 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -894,7 +894,7 @@ static bool has_no_hw_prefetch(const struct arm64_cpu_capabilities *entry, int _ u32 midr = read_cpuid_id(); /* Cavium ThunderX pass 1.x and 2.x */ - return MIDR_IS_CPU_MODEL_RANGE(midr, MIDR_THUNDERX, + return midr_is_cpu_model_range(midr, MIDR_THUNDERX, MIDR_CPU_VAR_REV(0, 0), MIDR_CPU_VAR_REV(1, MIDR_REVISION_MASK)); } -- 2.20.1