From patchwork Thu Oct 10 13:19:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 175783 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2280267ill; Thu, 10 Oct 2019 06:19:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPn5LiQyPe0Ut7SvRpZddzTRZP7xSQUP5ut9nTFduNt3xsV2NwzKhc5dtMF8BqHFEt9grU X-Received: by 2002:a05:6402:1252:: with SMTP id l18mr8097741edw.64.1570713591028; Thu, 10 Oct 2019 06:19:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570713591; cv=none; d=google.com; s=arc-20160816; b=vVCLs2TrvpzaEo2RMGA8wPwJcoIeSD1ljcY+HodN+mqr/GgET8EaL6eBRbb0zZ8ker ty7CJAsFhouOZHaWTkmZXt6CQEiWjMXrev0u/bmJQKYdHkM2BlCkDNpoiwqayRC6UNKK 95xGz4LXJjBhzCXMgKVTk2yb3wL0jrpfsRTQPFnHD3Ha5XCTdhUmGEprjGX6CNX0UuOt HL4ArqHOV6D8o/DF7Y7QODWvJ0DeMLnhCi5QZFqYpMP1HxMPsTIb7/VAeQlxKK+M7h98 helPHl6Rz1OX93/CcMCyinRAFttk324OgC/xBxhzZfWcWtNsXG7/g+EDEs/dqbISXieD wXGg== 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; bh=GuuWSPl53ZrG2XOS/zMMNAJN4FEaMD6dxxaH5Bl96H4=; b=O1YqXMorVNqop81sXihYZUPXjtch5mbYrlLszLMWoq7G2Ll41OO9SvN44P0m7+9zFU 9LNSWT3t+JwEh1bK2C4OWWVNer5RZgkYGimNmSlZIKHm+OLDICcPzXXbJOvEDwLU3HCp HGG0hSKvf/3RDxkRg4ePAAF/bzfPqtzlQHxay3bFp2XpcBVOh5fsM8J3P8+vY9ZLrqHr QkanheiR4EWQFo5gOc0XOw1EUUrgS29u8pdimJMDGtk/X3Ebo4ejS/tKgnsvd0/lPqQS cPjeghzP3casuCSuQeYzrliSQGtmOSlvL0raJ3e1lv+rz7PNyX1jTyocvJdCBjA1Hlsl Lcvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c8si3836567edb.82.2019.10.10.06.19.50; Thu, 10 Oct 2019 06:19:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387664AbfJJNTu (ORCPT + 13 others); Thu, 10 Oct 2019 09:19:50 -0400 Received: from foss.arm.com ([217.140.110.172]:59336 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727852AbfJJNTu (ORCPT ); Thu, 10 Oct 2019 09:19:50 -0400 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 B2F21337; Thu, 10 Oct 2019 06:19:49 -0700 (PDT) Received: from dawn-kernel.cambridge.arm.com (unknown [10.1.197.116]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CB26D3F68E; Thu, 10 Oct 2019 06:19:48 -0700 (PDT) From: Suzuki K Poulose To: stable@vger.kernel.org Cc: suzuki.poulose@arm.com, linux-arm-kernel@lists.infradead.org, will@kernel.org, mark.rutland@arm.com, catalin.marinas@arm.com Subject: [PATCH] arm64: cpufeature: Fix truncating a feature value Date: Thu, 10 Oct 2019 14:19:43 +0100 Message-Id: <20191010131943.26822-1-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191010122922.GA720144@kroah.com> References: <20191010122922.GA720144@kroah.com> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org A signed feature value is truncated to turn to an unsigned value causing bad state in the system wide infrastructure. This affects the discovery of FP/ASIMD support on arm64. Fix this by making sure we cast it properly. This was inadvertently fixed upstream in v4.6 onwards with the following : commit 28c5dcb22f90113dea ("arm64: Rename cpuid_feature field extract routines") Cc: stable@vger.kernel.org # v4.4 Cc: Will Deacon Cc: Mark Rutland Cc: Catalin Marinas Signed-off-by: Suzuki K Poulose --- arch/arm64/include/asm/cpufeature.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.21.0 diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 0a66f8241f18..9eb0d8072dd9 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -151,8 +151,8 @@ static inline u64 arm64_ftr_mask(struct arm64_ftr_bits *ftrp) static inline s64 arm64_ftr_value(struct arm64_ftr_bits *ftrp, u64 val) { return ftrp->sign ? - cpuid_feature_extract_field_width(val, ftrp->shift, ftrp->width) : - cpuid_feature_extract_unsigned_field_width(val, ftrp->shift, ftrp->width); + (s64)cpuid_feature_extract_field_width(val, ftrp->shift, ftrp->width) : + (s64)cpuid_feature_extract_unsigned_field_width(val, ftrp->shift, ftrp->width); } static inline bool id_aa64mmfr0_mixed_endian_el0(u64 mmfr0)