From patchwork Thu Apr 12 11:11:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 133234 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1572782ljb; Thu, 12 Apr 2018 04:13:55 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/5SEPf0fzphQW61BgxxPhsPBnwFYAuYqr1Y1iK0amM6EtclnViLV+Cf3n/zi88bDNvh6Ph X-Received: by 2002:a17:902:b411:: with SMTP id x17-v6mr544204plr.402.1523531635639; Thu, 12 Apr 2018 04:13:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523531635; cv=none; d=google.com; s=arc-20160816; b=OJz92+0ZPwliiJsSnQrB8DY1g8IT7vPyEKlvO8DdPgwOoFVjozT7sPo9501y1l1FD3 wyXbouhw9sxhVDYfQz3Fj9xlg3MS5Kc1pQknl+l2knOyNSo4iTsb6hqkdK22MhrTXjIT X1BIG38y9Skdw4BVBN01/5Ae+M+dJ2hP3wqqsCBSq9+qSclycZ79p+lw0q6XVj8C+oUH dd8llPFNSj7aPlOPteR+iBdw13m2aEL3j4AG2yQhPRh081E0/UwdNKVe6TYjyjNZv57F 7RwnXelQa3C16+nd+IlufydxNUhOvdgd3sWWjjwxuJVe9NR9hR9e8eEIV21iE/sx1x1q CRqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=atnjUf46eSZChB4OXOgHQZIJdGFgPIZLCTOS4fx+dUo=; b=be8uBzzew/7AO/IaFY5OKns5ydp/fFFh9r79Bd4ooq85HANlXHsWyNTQ4vYa8ggxfT CUJY3JKCSANYKjPLjJkiDgY3wOKpmT/crwIAwOBI0p14YF+IHRGrdjoDe9RDzUVY81uL Z/4BcHpdqVwn0DmzIdFzE+GMv8bhNNdCYvvi4S6UVc18HDWG54WIk3THrqa+qh0LLYsj tGk0FOwyBva22E+6+krjqEJxLoMnU9nM8Hha7AL+8Y6UA2SxF0sy/+NHO5ryU62ZZFlm Hwkc9REOT7ivqTn7Hq/gD5LXDV8W+gh3+a0owrIt+c07d/gJUYw/FQ0KJIZZ1LWHZz+2 9hXA== 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 v23si2494850pfk.116.2018.04.12.04.13.55; Thu, 12 Apr 2018 04:13:55 -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 S1752942AbeDLLNy (ORCPT + 11 others); Thu, 12 Apr 2018 07:13:54 -0400 Received: from foss.arm.com ([217.140.101.70]:59676 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752921AbeDLLNy (ORCPT ); Thu, 12 Apr 2018 07:13:54 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 46A2880D; Thu, 12 Apr 2018 04:13:54 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A00D23F24A; Thu, 12 Apr 2018 04:13:52 -0700 (PDT) From: Mark Rutland To: stable@vger.kernel.org Cc: mark.brown@linaro.org, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, will.deacon@arm.com, catalin.marinas@arm.com, ghackmann@google.com, shankerd@codeaurora.org Subject: [PATCH v4.9.y 39/42] arm/arm64: smccc: Make function identifiers an unsigned quantity Date: Thu, 12 Apr 2018 12:11:35 +0100 Message-Id: <20180412111138.40990-40-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180412111138.40990-1-mark.rutland@arm.com> References: <20180412111138.40990-1-mark.rutland@arm.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier commit ded4c39e93f3b72968fdb79baba27f3b83dad34c upstream. Function identifiers are a 32bit, unsigned quantity. But we never tell so to the compiler, resulting in the following: 4ac: b26187e0 mov x0, #0xffffffff80000001 We thus rely on the firmware narrowing it for us, which is not always a reasonable expectation. Cc: stable@vger.kernel.org Reported-by: Ard Biesheuvel Acked-by: Ard Biesheuvel Reviewed-by: Robin Murphy Tested-by: Ard Biesheuvel Signed-off-by: Marc Zyngier Signed-off-by: Catalin Marinas Signed-off-by: Mark Rutland [v4.9 backport] --- include/linux/arm-smccc.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index e1ef944ef1da..dd44d8458c04 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -14,14 +14,16 @@ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H +#include + /* * This file provides common defines for ARM SMC Calling Convention as * specified in * http://infocenter.arm.com/help/topic/com.arm.doc.den0028a/index.html */ -#define ARM_SMCCC_STD_CALL 0 -#define ARM_SMCCC_FAST_CALL 1 +#define ARM_SMCCC_STD_CALL _AC(0,U) +#define ARM_SMCCC_FAST_CALL _AC(1,U) #define ARM_SMCCC_TYPE_SHIFT 31 #define ARM_SMCCC_SMC_32 0