From patchwork Fri Nov 8 12:35:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 178900 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp2636598ilf; Fri, 8 Nov 2019 04:36:37 -0800 (PST) X-Google-Smtp-Source: APXvYqxB6/kkD4XYeYF1UHM6IkmFvevBGgyGL9J2GdXv9NMbI4oe9SAbGOSqWZaiWb/nrUiWEX9T X-Received: by 2002:a17:907:2122:: with SMTP id qo2mr8619259ejb.12.1573216596899; Fri, 08 Nov 2019 04:36:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573216596; cv=none; d=google.com; s=arc-20160816; b=dC3fUf17aGSkSzpTzpF4sMXpvigWzfTG3CjZkvw5Kw/6o+v3qbN8aFiEaKm6Wb1/Uf kAyP7BFC6QT8FMkZ9Vt7+gcJkPJDGjudDEmfLr0b1MPweRENvVMmEXE/YReuCJVm4Ru1 1e4UubYrYW9gaNxVqsKjkWuag6qXR7tE4SA4LmaGqMQtwtN6oAiDiHUYNrsRJMRAXpO7 T7mG/+TdbZWpieNDtTEibA39AU8u9rkHt1WVbTA4/MwTTELat6ZFTnx1BjUJP9IOwvv6 kX3CyDksH8Fz3YPWQxj95kxd82JBajp4p44d5t2I1L7vDjUOq+pUCS6PsDunBmz7zDmu zXzA== 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=uQNi6iT8LsH7ngwMbwUNEh5pQif/Auo+VDaBLo8x8c8=; b=eAc6FPehbawJBiRn91KVhsfaKB0PnTmQfF0PYTeQ/zxxutu6HIaa7/+W+gMt2D76wV QKlqvofWLPx89EPNv83kAQ6IfRvs1zrNEXozU4lC3LEWLl0cir5qF54NA4tq/x7SoUJm uT6HIIR3drlGk/Ko6CWeykNuplILcM2mH21QsX1BsLzXUdKNbraZExww531c6Mbh1u+5 fqliYWrgiQgn4e193OZXyTqyViOC8ND3HZhu8w/pthJtPUBGfO/N8yQv1upuUDQoobUo DvvnJiLa23aORd3oOCczt71iy8os7NDOGedW8T6X6tQR2MrK5n3B4R5O4MuOrDH/g3AW cNGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WWKmmvJJ; 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; 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 o19si3411305ejc.315.2019.11.08.04.36.36; Fri, 08 Nov 2019 04:36:36 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=WWKmmvJJ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726977AbfKHMgg (ORCPT + 14 others); Fri, 8 Nov 2019 07:36:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:44112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfKHMgg (ORCPT ); Fri, 8 Nov 2019 07:36:36 -0500 Received: from localhost.localdomain (lfbn-mar-1-550-151.w90-118.abo.wanadoo.fr [90.118.131.151]) (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 4EB4A2245C; Fri, 8 Nov 2019 12:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216595; bh=eXsPx6g2htrTWxGDDFeZO3cZPAUOiKL3Y2Y3MDblzsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWKmmvJJBo+mHm6IG+Qm3vri3P5p/42onQJNwBBwIhc9XVjRWWGoyDXMwCeXmsSlW MQs8eEnYjW1xaOlb02xKACzOj5lcxZLdCQ9t+9L0KvPvNH/stqaodVoq+LgC7WXmoD zB77/9nLHnzqLjeXW5WEToaPB804RJ1fevTFDkLw= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Marc Zyngier , Ard Biesheuvel Subject: [PATCH for-stable-4.4 14/50] arm/arm64: smccc: Add SMCCC-specific return codes Date: Fri, 8 Nov 2019 13:35:18 +0100 Message-Id: <20191108123554.29004-15-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108123554.29004-1-ardb@kernel.org> References: <20191108123554.29004-1-ardb@kernel.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier commit eff0e9e1078ea7dc1d794dc50e31baef984c46d7 upstream. We've so far used the PSCI return codes for SMCCC because they were extremely similar. But with the new ARM DEN 0070A specification, "NOT_REQUIRED" (-2) is clashing with PSCI's "PSCI_RET_INVALID_PARAMS". Let's bite the bullet and add SMCCC specific return codes. Users can be repainted as and when required. Acked-by: Will Deacon Reviewed-by: Mark Rutland Signed-off-by: Marc Zyngier Signed-off-by: Catalin Marinas Signed-off-by: Marc Zyngier Signed-off-by: Greg Kroah-Hartman Signed-off-by: Ard Biesheuvel --- include/linux/arm-smccc.h | 5 +++++ 1 file changed, 5 insertions(+) -- 2.20.1 diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index eb79d0e21148..a4eec441f82d 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -264,5 +264,10 @@ asmlinkage void arm_smccc_hvc(unsigned long a0, unsigned long a1, */ #define arm_smccc_1_1_hvc(...) __arm_smccc_1_1(SMCCC_HVC_INST, __VA_ARGS__) +/* Return codes defined in ARM DEN 0070A */ +#define SMCCC_RET_SUCCESS 0 +#define SMCCC_RET_NOT_SUPPORTED -1 +#define SMCCC_RET_NOT_REQUIRED -2 + #endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/