From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by mx.groups.io with SMTP id smtpd.web09.20709.1604530273229237501 for ; Wed, 04 Nov 2020 14:51:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=LManUdvH; spf=pass (domain: nuviainc.com, ip: 209.85.215.196, mailfrom: rebecca@nuviainc.com) Received: by mail-pg1-f196.google.com with SMTP id r186so122998pgr.0 for ; Wed, 04 Nov 2020 14:51:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sw6PoiOnpNnVM5SzD+D4dYDYmJNZk/quSZc59Idpry0=; b=LManUdvHPteFLBHzyL+bbWq3klvOcrioHUd3USIHIUuvguVfXE5h0rsA/2JEcM2jE9 DK+ocsNrVanSZLwKp0AhkBWF5UnbaE6VsqkQKH7o8lE9V99ifrMD2VgPmuenh3wtH8OQ inDCuhYcqrL70dAobYIX3hxnsOE4u5XdFzq3e+6LHTrrNWdCXRna00kFW3Pl0mHSamDK 4tRLTLXn/pi65UK2aWTbDBFS1BcJfUfCA4AUXgL+WQ8VAS+uNpQNemreJTq+QyzSvHda H/+cSM0oAPLJeuWuQFous0x7unvk1eZ9KoSlAQ4rHuS3Q6LpmUoPc9VQkdDauwcqvUwz LPUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sw6PoiOnpNnVM5SzD+D4dYDYmJNZk/quSZc59Idpry0=; b=AYU4MntVXURqDu5inNxazOLwNSLSyg3boCNhsBDS3Rp2wA4yjdiaf1+EwdJVG0b9VT awNaexV+tSoLXduba1QFqJHUs/ckbsbgsU6y6aRSosE36zDWrrZsq2NS4togg29qZ70P kkVjO5Elqxa+ccgStkcqjsVQuqqz15Ki69NbNhVXiVwxhuV9tfeCIp8ZzPSv3teh4Iru 1ruLvDqfCQSFU6230aD9WyW69S6bEMop7hzTxUV0GNLsHrBEPxihAYHFYa2MjWX0vrr/ Rbzh8DD9vS4dQ929ClF+L8BslzWkm/jVasvZgZxJaPdkUBXEEI7UljrB7+Lq9IKpWwAi esRw== X-Gm-Message-State: AOAM5312eu+VPy/DxU7HwhWSh3239ovSzg4XY5QR2cJ7y6g/NaGSu7yv cNaa++lsiF6/2aJ09avphqwQzy5GTqeLe50qkyeqD+CX+GvED3mLH7o4yXGOCGYjfPomzT1fKyZ ENTjC0iLWPnvs9ScaPi4LWNKnM0XXDkNcOT0rL04S8FMQRcAblRRrLcl3PLLp9AZD6UYcRA== X-Google-Smtp-Source: ABdhPJywQqgzC3O3W/2BqnIHqqO3PlRHxal6zxyxxaFWdSqR03osoTqqLnFC1WK/Ukep1b93NrhvuQ== X-Received: by 2002:a17:90a:ce13:: with SMTP id f19mr164111pju.122.1604530272455; Wed, 04 Nov 2020 14:51:12 -0800 (PST) Return-Path: Received: from cube.nuviainc.com (muon.bluestop.org. [65.103.231.193]) by smtp.gmail.com with ESMTPSA id q6sm3180574pfu.23.2020.11.04.14.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:51:11 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [PATCH v2 1/3] ArmPkg: Add ARM SMC Architecture functions to ArmStdSmc.h Date: Wed, 4 Nov 2020 15:50:53 -0700 Message-Id: <20201104225055.18220-2-rebecca@nuviainc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104225055.18220-1-rebecca@nuviainc.com> References: <20201104225055.18220-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The ARM SMC Architecture functions were missing from ArmStdSmc.h. Add them, and remove the version numbers for the SMCCC and PSCI, since they're unused and look like they may have been for code that's no longer present. Signed-off-by: Rebecca Cran --- ArmPkg/Include/IndustryStandard/ArmStdSmc.h | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h index 3509eb680f18..20642756bce8 100644 --- a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h +++ b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h @@ -1,5 +1,6 @@ /** @file * +* Copyright (c) 2020, NUVIA Inc. All rights reserved. * Copyright (c) 2012-2017, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent @@ -27,13 +28,6 @@ #define ARM_SMC_STD_UUID2 0xfbc02dae #define ARM_SMC_STD_UUID3 0xe2f64156 -/* - * ARM Standard Service Calls revision numbers - * The current revision is: 0.1 - */ -#define ARM_SMC_STD_REVISION_MAJOR 0x0 -#define ARM_SMC_STD_REVISION_MINOR 0x1 - /* * Management Mode (MM) calls cover a subset of the Standard Service Call range. * The list below is not exhaustive. @@ -52,6 +46,18 @@ #define ARM_SMC_MM_RET_DENIED -3 #define ARM_SMC_MM_RET_NO_MEMORY -4 +// ARM Architecture Calls +#define ARM_SMC_ID_ARCH_VERSION 0x80000000 +#define ARM_SMC_ID_ARCH_FEATURES 0x80000001 +#define ARM_SMC_ID_ARCH_SOC_ID 0x80000002 +#define ARM_SMC_ID_ARCH_WORKAROUND_1 0x80008000 +#define ARM_SMC_ID_ARCH_WORKAROUND_2 0x80007FFF + +#define ARM_SMC_ARCH_RET_SUCCESS 0 +#define ARM_SMC_ARCH_RET_NOT_SUPPORTED -1 +#define ARM_SMC_ARCH_RET_NOT_REQUIRED -2 +#define ARM_SMC_ARCH_RET_INVALID_PARAMETER -3 + /* * Power State Coordination Interface (PSCI) calls cover a subset of the * Standard Service Call range. @@ -70,12 +76,6 @@ #define ARM_SMC_ID_PSCI_SYSTEM_OFF 0x84000008 #define ARM_SMC_ID_PSCI_SYSTEM_RESET 0x84000009 -/* The current PSCI version is: 0.2 */ -#define ARM_SMC_PSCI_VERSION_MAJOR 0 -#define ARM_SMC_PSCI_VERSION_MINOR 2 -#define ARM_SMC_PSCI_VERSION \ - ((ARM_SMC_PSCI_VERSION_MAJOR << 16) | ARM_SMC_PSCI_VERSION_MINOR) - /* PSCI return error codes */ #define ARM_SMC_PSCI_RET_SUCCESS 0 #define ARM_SMC_PSCI_RET_NOT_SUPPORTED -1 -- 2.26.2