From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A6324445AD0; Fri, 2 Oct 2026 21:58:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790978336; cv=none; b=fwoBJCx8XupDKhGJ79Y8bkoYBNQ4GHzutLtsGdiwcyv5zd9rDy9WqtkWTLV723CU+ui1Mw5MI+y0ZquxAaG+JoUEF4f3MSBfJATCT236lcadI/k9GLO4Zx8FQQKkdkQmEYc5WqYkjmqJgl3flhKEA2YxrsPmLbI0aNTMIM8hfA0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790978336; c=relaxed/simple; bh=WERPy1/jcpi+6P2j6CcERlwWMflcE90MmhPm8D5CaPM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QzOHzA7UvaMOJZsCuou8u6CSCxflhiWzKKSRghfhMfl22Md+TOxU9BVbfP/pYurjFdv9QSMoVFvc8CWkDG9d6vz6HYjNvdgdhjOtQzpTI3Qj9rS9cHeWhH0ttzj3PXETTkPhtuEqALorNrAoUKQw2+4GGS8MicMojdfH0X5Udpc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=XSZ3soDN; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="XSZ3soDN" Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 245BF20B7168; Fri, 2 Oct 2026 14:58:00 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 245BF20B7168 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1790978280; bh=hEmHt3m10eoMgtvjPJXuMeA+sz+b1A4aGz4wGZrx/nk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSZ3soDNnbcKur+M3I4DJfeSKfPIoMNqlWld0861H2ry1jKugwmM03BnMSEdEo3WQ mg/C9eHVGtKXVi5fHJMEI50Jz4sKKVTL5gSEa4GEBn/UTKftty9LOUY3ecLL5+mpEW PgaiHfbasrfcMq5v1KPLW+GF/sZ8gwZKUBq1tm7g= From: Kameron Carr To: haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, mhklinux@outlook.com Cc: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, lpieralisi@kernel.org, sudeep.holla@kernel.org, arnd@arndb.de, thuth@redhat.com, linux-hyperv@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH v5 2/6] firmware: smccc: Detect hypervisor via RSI host call in CCA Realms Date: Fri, 2 Oct 2026 14:57:21 -0700 Message-ID: <20261002215725.2015959-3-kameroncarr@linux.microsoft.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20261002215725.2015959-1-kameroncarr@linux.microsoft.com> References: <20261002215725.2015959-1-kameroncarr@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Modify arm_smccc_hypervisor_has_uuid() to check is_realm_world() and use rsi_host_call() to query the hypervisor vendor UUID when inside a Realm. The realm path is factored into a helper, arm_smccc_realm_get_hypervisor_uuid(), that owns a file-static rsi_host_call buffer (uuid_hc) serialized by a spinlock. The RSI-specific includes, file-static state and helper are guarded with CONFIG_ARM64 because does not build on 32-bit ARM. For non-Realm environments, the existing arm_smccc_1_1_invoke() path is unchanged. Reviewed-by: Michael Kelley Signed-off-by: Kameron Carr --- drivers/firmware/smccc/smccc.c | 41 +++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/smccc/smccc.c b/drivers/firmware/smccc/smccc.c index afc2e4d..7e77170 100644 --- a/drivers/firmware/smccc/smccc.c +++ b/drivers/firmware/smccc/smccc.c @@ -14,6 +14,12 @@ #include +#ifdef CONFIG_ARM64 +#include +#include +#include +#endif + static u32 smccc_version = ARM_SMCCC_VERSION_1_0; static enum arm_smccc_conduit smccc_conduit = SMCCC_CONDUIT_NONE; @@ -69,12 +75,45 @@ s32 arm_smccc_get_soc_id_revision(void) } EXPORT_SYMBOL_GPL(arm_smccc_get_soc_id_revision); +#ifdef CONFIG_ARM64 +static struct rsi_host_call uuid_hc; +static DEFINE_SPINLOCK(uuid_hc_lock); + +/* + * Helper function to get the hypervisor UUID via an RsiHostCall. + */ +static void arm_smccc_realm_get_hypervisor_uuid(struct arm_smccc_res *res) +{ + guard(spinlock_irqsave)(&uuid_hc_lock); + + memset(&uuid_hc, 0, sizeof(uuid_hc)); + uuid_hc.gprs[0] = ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID; + + if (rsi_host_call(__pa_symbol(&uuid_hc)) != RSI_SUCCESS) { + res->a0 = SMCCC_RET_NOT_SUPPORTED; + return; + } + + res->a0 = uuid_hc.gprs[0]; + res->a1 = uuid_hc.gprs[1]; + res->a2 = uuid_hc.gprs[2]; + res->a3 = uuid_hc.gprs[3]; +} +#endif + bool arm_smccc_hypervisor_has_uuid(const uuid_t *hyp_uuid) { struct arm_smccc_res res = {}; uuid_t uuid; - arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, &res); +#ifdef CONFIG_ARM64 + if (is_realm_world()) + arm_smccc_realm_get_hypervisor_uuid(&res); + else +#endif + arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, + &res); + if (res.a0 == SMCCC_RET_NOT_SUPPORTED) return false; -- 2.45.4