From nobody Thu Sep 24 20:30:51 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 886533546F4; Mon, 21 Sep 2026 05:38:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969112; cv=none; b=NBMjfDHV5ULjw9gP80BEcYe/k1XiCHvR7+on8uuowuhDZdKx9HWdF40GP+8Ck1D8oSN/varr44EGKSynKtc6wflcjNzksb/ORUdqsaR8SD7WYUddKuYbVqU1D3fo+77O7zghe5Bbm8y/LIKMAE92XP4mCjJUKcFZpric+BFOTwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969112; c=relaxed/simple; bh=BA4C8NukrMIwAcaFOpr7JUQ+GKNpOf9ms23gGPzWVp0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AGS5/ieDq1PMt44+E9MMHcY79a4MlKGIoJhBE2/dMOqOSTfOpZOJwYKoXCARNBXNhgP5HRKHUe9Aaomg8XYgtq0kpXOkxSVfTBQMBNVs7dEIWFHmvr/5gMrDcW7QpfZYSCgKFV/mpYZlhRHsJNTeu1/UgsIllvMP2Yd/oPemsv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WTIXJblG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WTIXJblG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 789A61F00893; Mon, 21 Sep 2026 05:38:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789969110; bh=JQQobm2iGdul4vwwk8ShCpZIU/Flt3uUKOmfroPv3c4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WTIXJblGAHB9h42Hf8VsLE0V3wPlaUE/6CjJk3kC9/qK3bzwD71DgWdzn+fZlDaV1 GpuOJSzZ5bXiXafdbfvsqnkBUhRNxbnvOAYAd+9VHMAlaZROrVj4InNvRyC1TmGzIr KAV0HFqfG3zshn0DgZu1NdIR3HRYF9W0JgHS3incwdKsuNMfAU5WXq3rz8DxEWSU1A IKV7Q4S/Eb5imzJ9nmY8M2Yy5fM/FcZgg+g8qmPmkxpoeP5pUCQnxfVC7CQVbCMR6s FvNI04JhdXmkNc1BU9zajRLI7JCDVfAtU13TQup3z92Agy79VahKKduZmSV5tzAU2B U2LWB5zNtZAPQ== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Jason Gunthorpe , Catalin Marinas , Greg KH , Jeremy Linton , Jonathan Cameron , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Will Deacon , Steven Price , Suzuki K Poulose , Andre Przywara , Jonathan Cameron , Sudeep Holla Subject: [PATCH v12 1/7] firmware: smccc: Add an Arm SMCCC bus Date: Mon, 21 Sep 2026 11:08:01 +0530 Message-ID: <20260921053807.354802-2-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921053807.354802-1-aneesh.kumar@kernel.org> References: <20260921053807.354802-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SMCCC-discovered firmware services are currently represented by separate platform devices, such as smccc_trng and arm-cca-dev. Those devices do not represent independent DT/ACPI-described platform resources; they are features of the SMCCC firmware interface. Add an Arm SMCCC bus for services discovered through the SMCCC firmware interface. The bus provides SMCCC device and driver registration helpers, function ID based matching, modalias generation, and a sysfs modalias attribute so SMCCC service drivers can bind to discovered firmware services and autoload as modules. Follow-up changes can then register SMCCC firmware services as arm-smccc devices instead of creating independent per-feature platform devices. Based on arm_ffa code Reviewed-by: Jonathan Cameron Reviewed-by: Catalin Marinas Reviewed-by: Jason Gunthorpe Reviewed-by: Sudeep Holla Signed-off-by: Aneesh Kumar K.V (Arm) --- MAINTAINERS | 1 + drivers/firmware/smccc/Makefile | 2 +- drivers/firmware/smccc/bus.c | 158 ++++++++++++++++++++++++++++ include/linux/arm-smccc-bus.h | 48 +++++++++ include/linux/device-id/arm_smccc.h | 19 ++++ include/linux/mod_devicetable.h | 1 + scripts/mod/devicetable-offsets.c | 3 + scripts/mod/file2alias.c | 8 ++ 8 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 drivers/firmware/smccc/bus.c create mode 100644 include/linux/arm-smccc-bus.h create mode 100644 include/linux/device-id/arm_smccc.h diff --git a/MAINTAINERS b/MAINTAINERS index c2414447892c..42364c540f50 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -24741,6 +24741,7 @@ M: Sudeep Holla L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: drivers/firmware/smccc/ +F: include/linux/arm-smccc-bus.h F: include/linux/arm-smccc.h =20 SECURITY CONTACT diff --git a/drivers/firmware/smccc/Makefile b/drivers/firmware/smccc/Makef= ile index 40d19144a860..68bbff1407b8 100644 --- a/drivers/firmware/smccc/Makefile +++ b/drivers/firmware/smccc/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-$(CONFIG_HAVE_ARM_SMCCC_DISCOVERY) +=3D smccc.o kvm_guest.o +obj-$(CONFIG_HAVE_ARM_SMCCC_DISCOVERY) +=3D bus.o smccc.o kvm_guest.o obj-$(CONFIG_ARM_SMCCC_SOC_ID) +=3D soc_id.o diff --git a/drivers/firmware/smccc/bus.c b/drivers/firmware/smccc/bus.c new file mode 100644 index 000000000000..21239e43adc0 --- /dev/null +++ b/drivers/firmware/smccc/bus.c @@ -0,0 +1,158 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2026 Arm Limited + */ + +#include +#include + +static int arm_smccc_bus_match(struct device *dev, + const struct device_driver *drv) +{ + const struct arm_smccc_device_id *id_table; + struct arm_smccc_device *smccc_dev =3D to_arm_smccc_device(dev); + + id_table =3D to_arm_smccc_driver(drv)->id_table; + if (!id_table) + return 0; + + while (id_table->func_id) { + if (smccc_dev->func_id =3D=3D id_table->func_id) + return 1; + id_table++; + } + + return 0; +} + +static int arm_smccc_bus_probe(struct device *dev) +{ + struct arm_smccc_driver *smccc_drv =3D to_arm_smccc_driver(dev->driver); + + return smccc_drv->probe(to_arm_smccc_device(dev)); +} + +static void arm_smccc_bus_remove(struct device *dev) +{ + struct arm_smccc_driver *smcc_drv =3D to_arm_smccc_driver(dev->driver); + + if (smcc_drv->remove) + smcc_drv->remove(to_arm_smccc_device(dev)); +} + +static int arm_smccc_bus_uevent(const struct device *dev, + struct kobj_uevent_env *env) +{ + const struct arm_smccc_device *smccc_dev =3D to_arm_smccc_device(dev); + + return add_uevent_var(env, "MODALIAS=3D" ARM_SMCCC_MODULE_PREFIX "f%08X", + smccc_dev->func_id); +} + +static ssize_t modalias_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct arm_smccc_device *smccc_dev =3D to_arm_smccc_device(dev); + + return sysfs_emit(buf, ARM_SMCCC_MODULE_PREFIX "f%08X\n", + smccc_dev->func_id); +} +static DEVICE_ATTR_RO(modalias); + +static struct attribute *arm_smccc_device_attrs[] =3D { + &dev_attr_modalias.attr, + NULL, +}; +ATTRIBUTE_GROUPS(arm_smccc_device); + +const struct bus_type arm_smccc_bus_type =3D { + .name =3D "arm_smccc", + .match =3D arm_smccc_bus_match, + .probe =3D arm_smccc_bus_probe, + .remove =3D arm_smccc_bus_remove, + .uevent =3D arm_smccc_bus_uevent, + .dev_groups =3D arm_smccc_device_groups, +}; +EXPORT_SYMBOL_GPL(arm_smccc_bus_type); + +int arm_smccc_driver_register(struct arm_smccc_driver *driver, + struct module *owner, const char *mod_name) +{ + if (!driver->probe || !driver->id_table) + return -EINVAL; + + driver->driver.bus =3D &arm_smccc_bus_type; + driver->driver.name =3D driver->name; + driver->driver.owner =3D owner; + driver->driver.mod_name =3D mod_name; + + return driver_register(&driver->driver); +} +EXPORT_SYMBOL_GPL(arm_smccc_driver_register); + +void arm_smccc_driver_unregister(struct arm_smccc_driver *driver) +{ + driver_unregister(&driver->driver); +} +EXPORT_SYMBOL_GPL(arm_smccc_driver_unregister); + +static void arm_smccc_release_device(struct device *dev) +{ + struct arm_smccc_device *smccc_dev =3D to_arm_smccc_device(dev); + + kfree(smccc_dev); +} + +static struct device *arm_smccc_device_alloc(u32 func_id) +{ + struct arm_smccc_device *smccc_dev; + + smccc_dev =3D kzalloc_obj(*smccc_dev); + if (!smccc_dev) + return NULL; + + smccc_dev->func_id =3D func_id; + smccc_dev->dev.bus =3D &arm_smccc_bus_type; + smccc_dev->dev.release =3D arm_smccc_release_device; + device_initialize(&smccc_dev->dev); + + return &smccc_dev->dev; +} + +struct arm_smccc_device *arm_smccc_device_register(const char *name, u32 f= unc_id) +{ + int ret; + + if (!name) + return ERR_PTR(-EINVAL); + + struct device *dev __free(put_device) =3D arm_smccc_device_alloc(func_id); + if (!dev) + return ERR_PTR(-ENOMEM); + + ret =3D dev_set_name(dev, "%s", name); + if (ret) + return ERR_PTR(ret); + + ret =3D device_add(dev); + if (ret) + return ERR_PTR(ret); + + return to_arm_smccc_device(no_free_ptr(dev)); +} +EXPORT_SYMBOL_GPL(arm_smccc_device_register); + +void arm_smccc_device_unregister(struct arm_smccc_device *smccc_dev) +{ + if (!smccc_dev) + return; + + device_unregister(&smccc_dev->dev); +} +EXPORT_SYMBOL_GPL(arm_smccc_device_unregister); + +static int __init arm_smccc_bus_init(void) +{ + return bus_register(&arm_smccc_bus_type); +} +subsys_initcall(arm_smccc_bus_init); diff --git a/include/linux/arm-smccc-bus.h b/include/linux/arm-smccc-bus.h new file mode 100644 index 000000000000..cde268fc2930 --- /dev/null +++ b/include/linux/arm-smccc-bus.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2026 Arm Limited + */ +#ifndef __LINUX_ARM_SMCCC_BUS_H +#define __LINUX_ARM_SMCCC_BUS_H + +#include +#include +#include + +struct arm_smccc_device { + struct device dev; + u32 func_id; +}; + +#define to_arm_smccc_device(d) container_of(d, struct arm_smccc_device, de= v) + +struct arm_smccc_driver { + struct device_driver driver; + + const char *name; + int (*probe)(struct arm_smccc_device *sdev); + void (*remove)(struct arm_smccc_device *sdev); + const struct arm_smccc_device_id *id_table; +}; + +#define to_arm_smccc_driver(d) \ + container_of_const(d, struct arm_smccc_driver, driver) + +int arm_smccc_driver_register(struct arm_smccc_driver *driver, + struct module *owner, const char *mod_name); +void arm_smccc_driver_unregister(struct arm_smccc_driver *driver); +struct arm_smccc_device *arm_smccc_device_register(const char *name, u32 f= unc_id); +void arm_smccc_device_unregister(struct arm_smccc_device *smcc_dev); + +#define arm_smccc_register(driver) \ + arm_smccc_driver_register(driver, THIS_MODULE, KBUILD_MODNAME) +#define arm_smccc_unregister(driver) \ + arm_smccc_driver_unregister(driver) + +#define module_arm_smccc_driver(__arm_smccc_driver) \ + module_driver(__arm_smccc_driver, arm_smccc_register, \ + arm_smccc_unregister) + +extern const struct bus_type arm_smccc_bus_type; + +#endif /* __LINUX_ARM_SMCCC_BUS_H */ diff --git a/include/linux/device-id/arm_smccc.h b/include/linux/device-id/= arm_smccc.h new file mode 100644 index 000000000000..a8579832fc1c --- /dev/null +++ b/include/linux/device-id/arm_smccc.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LINUX_DEVICE_ID_ARM_SMCCC_H +#define __LINUX_DEVICE_ID_ARM_SMCCC_H + +#ifdef __KERNEL__ +#include +#endif + +#define ARM_SMCCC_MODULE_PREFIX "arm_smccc:" + +/** + * struct arm_smccc_device_id - Arm SMCCC bus device identifier + * @func_id: SMCCC function identifier + */ +struct arm_smccc_device_id { + __u32 func_id; +}; + +#endif /* __LINUX_DEVICE_ID_ARM_SMCCC_H */ diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetabl= e.h index a397213bedac..318c4b5c3451 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -16,6 +16,7 @@ #include "device-id/amba.h" #include "device-id/ap.h" #include "device-id/apr.h" +#include "device-id/arm_smccc.h" #include "device-id/auxiliary.h" #include "device-id/bcma.h" #include "device-id/ccw.h" diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-of= fsets.c index b4178c42d08f..1492e9fdc7cb 100644 --- a/scripts/mod/devicetable-offsets.c +++ b/scripts/mod/devicetable-offsets.c @@ -254,6 +254,9 @@ int main(void) DEVID(auxiliary_device_id); DEVID_FIELD(auxiliary_device_id, name); =20 + DEVID(arm_smccc_device_id); + DEVID_FIELD(arm_smccc_device_id, func_id); + DEVID(ssam_device_id); DEVID_FIELD(ssam_device_id, match_flags); DEVID_FIELD(ssam_device_id, domain); diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 8d36c74dec2d..980d7da456bb 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -1349,6 +1349,13 @@ static void do_auxiliary_entry(struct module *mod, v= oid *symval) module_alias_printf(mod, false, AUXILIARY_MODULE_PREFIX "%s", *name); } =20 +static void do_arm_smccc_entry(struct module *mod, void *symval) +{ + DEF_FIELD(symval, arm_smccc_device_id, func_id); + + module_alias_printf(mod, false, ARM_SMCCC_MODULE_PREFIX "f%08X", func_id); +} + /* * Looks like: ssam:dNcNtNiNfN * @@ -1519,6 +1526,7 @@ static const struct devtable devtable[] =3D { {"mhi", SIZE_mhi_device_id, do_mhi_entry}, {"mhi_ep", SIZE_mhi_device_id, do_mhi_ep_entry}, {"auxiliary", SIZE_auxiliary_device_id, do_auxiliary_entry}, + {"arm_smccc", SIZE_arm_smccc_device_id, do_arm_smccc_entry}, {"ssam", SIZE_ssam_device_id, do_ssam_entry}, {"dfl", SIZE_dfl_device_id, do_dfl_entry}, {"ishtp", SIZE_ishtp_device_id, do_ishtp_entry}, --=20 2.43.0 From nobody Thu Sep 24 20:30:51 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C5BF35C6A0; Mon, 21 Sep 2026 05:38:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969118; cv=none; b=IEypaGCc4zaWYfk/Pmecg5LReb5MpeIDer0JQkTWvZxUE/MKQ7c2Uzt0k93wCiN88Sph/ufqrZtLldZ99Eun19+ZE82o4hSr9QFH9W+poC9eZz5+QvHJ9WBPPuMhx0c7jhF1ypc6PnWVlZ56puZAaMYIwIw1/oylDaCN3yr+zsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969118; c=relaxed/simple; bh=k8eeV88ALyIhRUp3uhGlVzse6BhAgFDnU1peAhalwhg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ugEhqyk/pdNZxuqKanL+0HrR8dfptPs4dLruj7HWYB9oITPJHgs3Yl0+VOxVGREq4nfEAs/XvQMzYE+jO57H5/UR3isdEjSxb+3RXnLdzzBB1wRI9AQBQxj0exyXjSpreEVB4zr7gpI2Sj6arQ7BIBFRxDafndfJ8E04sApQweI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YZLzkGY7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YZLzkGY7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAB0D1F00898; Mon, 21 Sep 2026 05:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789969116; bh=J6MnodCGqBDhk9JYUC6TrFA7QJqSS+1Mzv1hZs/eQjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YZLzkGY7/zSFpubxzEgO1GjGWYsHzaptq9hIeWRicsv85Wg/irC7hO7v3a6g/Lb2U 3nzFzynCQ3fBO5efDahM15zBK3FJ66PlriwZX3UUgZ+1r1FisTC/+HhvV94yDM3nAF qJvUrWLH8lbhpO6r2AfUcDIgsMrCbG1cdpBpQotPZD3U40TtKCvBaYXGtcD67UqeT/ WpXZNZc0FAHYPKYkaIeSlAXKOvlrWMsXzW7VGaglm4BOoABKftu3Zv0c5DdZ8NDjJa RiqObjE40f03ViHQd3mvNgh3JSsNylg2KF5+9ujXzb+C4ZHUATS/fZZ6bbTRxIqLeZ UQlFJETCIGXuA== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Jason Gunthorpe , Catalin Marinas , Greg KH , Jeremy Linton , Jonathan Cameron , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Will Deacon , Steven Price , Suzuki K Poulose , Andre Przywara , Jonathan Cameron Subject: [PATCH v12 2/7] firmware: hwrng: arm_smccc_trng: Register as an SMCCC device Date: Mon, 21 Sep 2026 11:08:02 +0530 Message-ID: <20260921053807.354802-3-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921053807.354802-1-aneesh.kumar@kernel.org> References: <20260921053807.354802-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The SMCCC TRNG interface is a firmware-provided SMCCC service rather than a standalone platform device. Now that the SMCCC core has an SMCCC bus, create an arm-smccc-trng device for the discovered TRNG service and convert the hwrng driver to an SMCCC driver. The SMCCC id table preserves module autoloading for systems where the TRNG driver is built as a module. The sysfs device path changes from the old smccc_trng platform-device path to an arm-smccc device path. No known userspace dependency on the old path was found; a Debian Code Search lookup for the existing platform-device name/path did not find any users. Reviewed-by: Catalin Marinas Reviewed-by: Jonathan Cameron Reviewed-by: Jason Gunthorpe Tested-by: Andre Przywara Signed-off-by: Aneesh Kumar K.V (Arm) --- arch/arm/include/asm/archrandom.h | 2 +- arch/arm64/include/asm/archrandom.h | 2 +- drivers/char/hw_random/arm_smccc_trng.c | 32 ++++++++----- drivers/firmware/smccc/smccc.c | 62 +++++++++++++++++++++---- 4 files changed, 76 insertions(+), 22 deletions(-) diff --git a/arch/arm/include/asm/archrandom.h b/arch/arm/include/asm/archr= andom.h index cc4714eb1a75..ee39a03ddf8a 100644 --- a/arch/arm/include/asm/archrandom.h +++ b/arch/arm/include/asm/archrandom.h @@ -2,7 +2,7 @@ #ifndef _ASM_ARCHRANDOM_H #define _ASM_ARCHRANDOM_H =20 -static inline bool __init smccc_probe_trng(void) +static inline bool smccc_probe_trng(void) { return false; } diff --git a/arch/arm64/include/asm/archrandom.h b/arch/arm64/include/asm/a= rchrandom.h index 8babfbe31f95..7605dd81bd1e 100644 --- a/arch/arm64/include/asm/archrandom.h +++ b/arch/arm64/include/asm/archrandom.h @@ -12,7 +12,7 @@ =20 extern bool smccc_trng_available; =20 -static inline bool __init smccc_probe_trng(void) +static inline bool smccc_probe_trng(void) { struct arm_smccc_res res; =20 diff --git a/drivers/char/hw_random/arm_smccc_trng.c b/drivers/char/hw_rand= om/arm_smccc_trng.c index dcb8e7f37f25..01c1a30cbab8 100644 --- a/drivers/char/hw_random/arm_smccc_trng.c +++ b/drivers/char/hw_random/arm_smccc_trng.c @@ -16,8 +16,10 @@ #include #include #include -#include #include +#include + +#include =20 #ifdef CONFIG_ARM64 #define ARM_SMCCC_TRNG_RND ARM_SMCCC_TRNG_RND64 @@ -94,29 +96,37 @@ static int smccc_trng_read(struct hwrng *rng, void *dat= a, size_t max, bool wait) return copied; } =20 -static int smccc_trng_probe(struct platform_device *pdev) +static int smccc_trng_probe(struct arm_smccc_device *sdev) { struct hwrng *trng; =20 - trng =3D devm_kzalloc(&pdev->dev, sizeof(*trng), GFP_KERNEL); + /* validate the minimum version requirement */ + if (!smccc_probe_trng()) + return -ENODEV; + + trng =3D devm_kzalloc(&sdev->dev, sizeof(*trng), GFP_KERNEL); if (!trng) return -ENOMEM; =20 trng->name =3D "smccc_trng"; trng->read =3D smccc_trng_read; =20 - return devm_hwrng_register(&pdev->dev, trng); + return devm_hwrng_register(&sdev->dev, trng); } =20 -static struct platform_driver smccc_trng_driver =3D { - .driver =3D { - .name =3D "smccc_trng", - }, - .probe =3D smccc_trng_probe, +static const struct arm_smccc_device_id smccc_trng_id_table[] =3D { + { .func_id =3D ARM_SMCCC_TRNG_VERSION }, + {} +}; +MODULE_DEVICE_TABLE(arm_smccc, smccc_trng_id_table); + +static struct arm_smccc_driver smccc_trng_driver =3D { + .name =3D KBUILD_MODNAME, + .probe =3D smccc_trng_probe, + .id_table =3D smccc_trng_id_table, }; -module_platform_driver(smccc_trng_driver); +module_arm_smccc_driver(smccc_trng_driver); =20 -MODULE_ALIAS("platform:smccc_trng"); MODULE_AUTHOR("Andre Przywara"); MODULE_DESCRIPTION("Arm SMCCC TRNG firmware interface support"); MODULE_LICENSE("GPL"); diff --git a/drivers/firmware/smccc/smccc.c b/drivers/firmware/smccc/smccc.c index bdee057db2fd..67e503dac409 100644 --- a/drivers/firmware/smccc/smccc.c +++ b/drivers/firmware/smccc/smccc.c @@ -9,7 +9,8 @@ #include #include #include -#include +#include + #include =20 static u32 smccc_version =3D ARM_SMCCC_VERSION_1_0; @@ -81,16 +82,59 @@ bool arm_smccc_hypervisor_has_uuid(const uuid_t *hyp_uu= id) } EXPORT_SYMBOL_GPL(arm_smccc_hypervisor_has_uuid); =20 +struct smccc_device_info { + u32 func_id; + bool requires_smc; + const char *device_name; +}; + +static const struct smccc_device_info smccc_devices[] __initconst =3D { + { + .func_id =3D ARM_SMCCC_TRNG_VERSION, + .requires_smc =3D false, + .device_name =3D "arm-smccc-trng", + }, +}; + +static bool __init smccc_probe_smccc_device(const struct smccc_device_info= *smccc_dev) +{ + int ret; + struct arm_smccc_res res =3D {}; + + if (smccc_conduit =3D=3D SMCCC_CONDUIT_NONE) + return false; + + if (smccc_dev->requires_smc && smccc_conduit !=3D SMCCC_CONDUIT_SMC) + return false; + + if (IS_ENABLED(CONFIG_ARM) && ARM_SMCCC_IS_64(smccc_dev->func_id)) + return false; + + arm_smccc_1_1_invoke(smccc_dev->func_id, + 0, 0, 0, 0, 0, 0, 0, &res); + ret =3D res.a0; + + if (ret =3D=3D SMCCC_RET_NOT_SUPPORTED) + return false; + + return true; +} + static int __init smccc_devices_init(void) { - struct platform_device *pdev; - - if (smccc_trng_available) { - pdev =3D platform_device_register_simple("smccc_trng", -1, - NULL, 0); - if (IS_ERR(pdev)) - pr_err("smccc_trng: could not register device: %ld\n", - PTR_ERR(pdev)); + struct arm_smccc_device *sdev; + const struct smccc_device_info *smccc_dev; + + for (int i =3D 0; i < ARRAY_SIZE(smccc_devices); i++) { + smccc_dev =3D &smccc_devices[i]; + + if (!smccc_probe_smccc_device(smccc_dev)) + continue; + + sdev =3D arm_smccc_device_register(smccc_dev->device_name, smccc_dev->fu= nc_id); + if (IS_ERR(sdev)) + pr_err("%s: could not register device: %pe\n", + smccc_dev->device_name, sdev); } =20 return 0; --=20 2.43.0 From nobody Thu Sep 24 20:30:51 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 826B135C6AA; Mon, 21 Sep 2026 05:38:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969124; cv=none; b=RP/CJNF3NZLVF+zD4D8K7ClSZR+BUcZkXkS1Z8Hj+octpqGPwsCp2URtY8onoXoYSxCoZHy87AFqsTr55Bxc19zzSsNft7yd6oOVoICGGZYENDvvbIyPM1w29KbPILPASni0apSqRVeBRzE1treJABeHgOQ8aidW5YWQyR1L/uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969124; c=relaxed/simple; bh=MMYKn3GHQ/Vw9WGg0TXDXai2l7keLSoRiVTU9rRmr1I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OZG/DraYpsEw74qZFZMMn4NLo/qUOuhv1ntOr0xM488TLhN1fIHA1fBcNaJd3FxfeDpUkSpUE2xnOm7yRUFq0xoeTUZprQVvv9G7HZkoJg9XL0SjJYk3KCfQbl5KYkxElNYJV9nuSfU122BdhtT7h8rF13ztXQYsYjVDbLR6dbE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Jo/Ojn/0; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Jo/Ojn/0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96F831F000FF; Mon, 21 Sep 2026 05:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789969122; bh=I2mI/Vv5wmQrmYangQMcCsfDNnh6VmXaxrmnKag01dQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jo/Ojn/0MvOmCv/yeCe7C2UydpwMlqhaNXHLZBo1oY7Hh4bI1pfXJJIP5dmNExk1D Ixd6XcwzfmayrkcLd3eA/38TMDu/AR0oThaeKo3jYDn49YKwVEepzFaATgZpQBSQHt lgVCz/LSSgwftBdfBasVy9r+PzjRalGNiRKmbs9GCuvPphPug9gRYHOvJMjzJ9rJxD UcyUKEmQP7JSLiYlb+Nybzh99FsJ8UgArRLLrY02bief/D25fHBaRvWHBwMfbXpm/7 3VXjQH0XrvknrDmFEFw1gdl7opik79PAl+w0iQLyQUtkjA76PuBk75XbNNE8r4ogkP v9dqEw89nkVMg== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Jason Gunthorpe , Catalin Marinas , Greg KH , Jeremy Linton , Jonathan Cameron , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Will Deacon , Steven Price , Suzuki K Poulose , Andre Przywara , Jonathan Cameron , Suzuki K Poulose Subject: [PATCH v12 3/7] firmware: arm_rmm: Move RSI support out of arch/arm64 Date: Mon, 21 Sep 2026 11:08:03 +0530 Message-ID: <20260921053807.354802-4-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921053807.354802-1-aneesh.kumar@kernel.org> References: <20260921053807.354802-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The RSI SMCCC function IDs describe a firmware ABI and are not arm64 architecture specific definitions. Follow-up changes need to use them from non-arch code, including drivers/firmware/smccc and the Arm CCA guest driver. Move the complete Realm Service Interface (RSI) implementation from arch/arm64 to drivers/firmware/arm_rmm. The RSI SMCCC definitions and command helpers are also moved to include/linux so they can be shared by architecture code and firmware or driver code. This also keeps the firmware interface outside architecture code, as requested [1]. [1] https://lore.kernel.org/all/agsNO9cc7H-b0H8L@willie-the-truck Reviewed-by: Jonathan Cameron Reviewed-by: Catalin Marinas Reviewed-by: Jason Gunthorpe Acked-by: Suzuki K Poulose Signed-off-by: Aneesh Kumar K.V (Arm) --- MAINTAINERS | 2 + arch/arm64/Kconfig | 1 + arch/arm64/include/asm/io.h | 2 +- arch/arm64/include/asm/mem_encrypt.h | 2 +- arch/arm64/include/asm/pgtable-prot.h | 2 +- arch/arm64/include/asm/rsi.h | 70 ----------------- arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/init.c | 3 +- drivers/firmware/Kconfig | 1 + drivers/firmware/Makefile | 1 + drivers/firmware/arm_rmm/Kconfig | 17 ++++ drivers/firmware/arm_rmm/Makefile | 2 + .../kernel =3D> drivers/firmware/arm_rmm}/rsi.c | 2 +- drivers/virt/coco/arm-cca-guest/Kconfig | 2 +- .../virt/coco/arm-cca-guest/arm-cca-guest.c | 5 +- .../linux/arm-rsi-cmds.h | 77 +++++++++++++++++-- .../linux/arm-smccc-rsi.h | 6 +- 18 files changed, 110 insertions(+), 89 deletions(-) delete mode 100644 arch/arm64/include/asm/rsi.h create mode 100644 drivers/firmware/arm_rmm/Kconfig create mode 100644 drivers/firmware/arm_rmm/Makefile rename {arch/arm64/kernel =3D> drivers/firmware/arm_rmm}/rsi.c (99%) rename arch/arm64/include/asm/rsi_cmds.h =3D> include/linux/arm-rsi-cmds.h= (69%) rename arch/arm64/include/asm/rsi_smc.h =3D> include/linux/arm-smccc-rsi.h= (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 42364c540f50..b867d537a579 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3953,6 +3953,8 @@ F: Documentation/arch/arm64/ F: arch/arm64/ F: drivers/virt/coco/arm-cca-guest/ F: drivers/virt/coco/pkvm-guest/ +F: include/linux/arm-rsi-cmds.h +F: include/linux/arm-smccc-rsi.h F: tools/testing/selftests/arm64/ X: arch/arm64/boot/dts/ X: arch/arm64/configs/defconfig diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b5a51b0ef944..ff9565d3ffa5 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -38,6 +38,7 @@ config ARM64 select ARCH_HAS_MEMBARRIER_SYNC_CORE select ARCH_HAS_MEM_ENCRYPT select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS + select ARCH_SUPPORTS_RMM select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_NONLEAF_PMD_YOUNG if ARM64_HAFT diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 49a7002661a9..1620537f0332 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -8,6 +8,7 @@ #ifndef __ASM_IO_H #define __ASM_IO_H =20 +#include #include #include =20 @@ -17,7 +18,6 @@ #include #include #include -#include =20 /* * Generic IO read/write. These perform native-endian accesses. diff --git a/arch/arm64/include/asm/mem_encrypt.h b/arch/arm64/include/asm/= mem_encrypt.h index 636f45b4d8af..f03b9d7b83b4 100644 --- a/arch/arm64/include/asm/mem_encrypt.h +++ b/arch/arm64/include/asm/mem_encrypt.h @@ -2,8 +2,8 @@ #ifndef __ASM_MEM_ENCRYPT_H #define __ASM_MEM_ENCRYPT_H =20 +#include #include -#include =20 struct device; =20 diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm= /pgtable-prot.h index 09d7c00cf405..58e71e592175 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -66,9 +66,9 @@ =20 #ifndef __ASSEMBLER__ =20 +#include #include #include -#include =20 extern bool arm64_use_ng_mappings; extern unsigned long prot_ns_shared; diff --git a/arch/arm64/include/asm/rsi.h b/arch/arm64/include/asm/rsi.h deleted file mode 100644 index 88b50d660e85..000000000000 --- a/arch/arm64/include/asm/rsi.h +++ /dev/null @@ -1,70 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2024 ARM Ltd. - */ - -#ifndef __ASM_RSI_H_ -#define __ASM_RSI_H_ - -#include -#include -#include - -#define RSI_PDEV_NAME "arm-cca-dev" - -DECLARE_STATIC_KEY_FALSE(rsi_present); - -void __init arm64_rsi_init(void); - -bool arm64_rsi_is_protected(phys_addr_t base, size_t size); - -static inline bool is_realm_world(void) -{ - return static_branch_unlikely(&rsi_present); -} - -static inline int rsi_set_memory_range(phys_addr_t start, phys_addr_t end, - enum ripas state, unsigned long flags) -{ - unsigned long ret; - phys_addr_t top; - - while (start !=3D end) { - ret =3D rsi_set_addr_range_state(start, end, state, flags, &top); - if (ret || top < start || top > end) - return -EINVAL; - start =3D top; - } - - return 0; -} - -/* - * Convert the specified range to RAM. Do not use this if you rely on the - * contents of a page that may already be in RAM state. - */ -static inline int rsi_set_memory_range_protected(phys_addr_t start, - phys_addr_t end) -{ - return rsi_set_memory_range(start, end, RSI_RIPAS_RAM, - RSI_CHANGE_DESTROYED); -} - -/* - * Convert the specified range to RAM. Do not convert any pages that may h= ave - * been DESTROYED, without our permission. - */ -static inline int rsi_set_memory_range_protected_safe(phys_addr_t start, - phys_addr_t end) -{ - return rsi_set_memory_range(start, end, RSI_RIPAS_RAM, - RSI_NO_CHANGE_DESTROYED); -} - -static inline int rsi_set_memory_range_shared(phys_addr_t start, - phys_addr_t end) -{ - return rsi_set_memory_range(start, end, RSI_RIPAS_EMPTY, - RSI_CHANGE_DESTROYED); -} -#endif /* __ASM_RSI_H_ */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index d2690c3ec528..21fc3a3d25c9 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -34,7 +34,7 @@ obj-y :=3D debug-monitors.o entry.o irq.o fpsimd.o \ cpufeature.o alternative.o cacheinfo.o \ smp.o smp_spin_table.o topology.o smccc-call.o \ syscall.o proton-pack.o idle.o patching.o pi/ \ - rsi.o jump_label.o + jump_label.o =20 obj-$(CONFIG_COMPAT) +=3D sys32.o signal32.o \ sys_compat.o diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 29c6100f0c50..a707deba6ae7 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -7,6 +7,7 @@ */ =20 #include +#include #include #include #include @@ -43,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index fbf215ecc7d0..2a8de20d2b44 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -34,6 +34,8 @@ #include #include #include +#include + =20 #include #include @@ -43,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index b7cc11e4fbfa..62660bf520a8 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -310,5 +310,6 @@ source "drivers/firmware/samsung/Kconfig" source "drivers/firmware/smccc/Kconfig" source "drivers/firmware/tegra/Kconfig" source "drivers/firmware/xilinx/Kconfig" +source "drivers/firmware/arm_rmm/Kconfig" =20 endmenu diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index be46f1e1dc77..196a650ccf02 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -39,3 +39,4 @@ obj-y +=3D samsung/ obj-y +=3D smccc/ obj-y +=3D tegra/ obj-y +=3D xilinx/ +obj-y +=3D arm_rmm/ diff --git a/drivers/firmware/arm_rmm/Kconfig b/drivers/firmware/arm_rmm/Kc= onfig new file mode 100644 index 000000000000..e981e12fdbe6 --- /dev/null +++ b/drivers/firmware/arm_rmm/Kconfig @@ -0,0 +1,17 @@ + +config ARCH_SUPPORTS_RMM + bool + +config ARM_RMM_RSI + bool "Realm Service Interface (RSI) Support" + depends on ARCH_SUPPORTS_RMM + default y + help + Enable support for running Linux as a Realm guest under a Realm + Management Monitor (RMM), as defined by the Arm Confidential + Compute Architecture. + + The RMM exposes the Realm Service Interface (RSI) to Realm guests. + Linux uses RSI to negotiate the interface version, obtain the Realm + configuration, and manage the protected or shared state of guest + memory. diff --git a/drivers/firmware/arm_rmm/Makefile b/drivers/firmware/arm_rmm/M= akefile new file mode 100644 index 000000000000..3708b37a9aaf --- /dev/null +++ b/drivers/firmware/arm_rmm/Makefile @@ -0,0 +1,2 @@ + +obj-$(CONFIG_ARM_RMM_RSI) =3D rsi.o diff --git a/arch/arm64/kernel/rsi.c b/drivers/firmware/arm_rmm/rsi.c similarity index 99% rename from arch/arm64/kernel/rsi.c rename to drivers/firmware/arm_rmm/rsi.c index 25ca75ce1a4d..8e716f1c1e31 100644 --- a/arch/arm64/kernel/rsi.c +++ b/drivers/firmware/arm_rmm/rsi.c @@ -8,11 +8,11 @@ #include #include #include +#include =20 #include #include #include -#include =20 static struct realm_config config; =20 diff --git a/drivers/virt/coco/arm-cca-guest/Kconfig b/drivers/virt/coco/ar= m-cca-guest/Kconfig index 3f0f013f03f1..2582ebb36922 100644 --- a/drivers/virt/coco/arm-cca-guest/Kconfig +++ b/drivers/virt/coco/arm-cca-guest/Kconfig @@ -1,6 +1,6 @@ config ARM_CCA_GUEST tristate "Arm CCA Guest driver" - depends on ARM64 + depends on ARM_RMM_RSI select TSM_REPORTS help The driver provides userspace interface to request and diff --git a/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c b/drivers/virt= /coco/arm-cca-guest/arm-cca-guest.c index 0eeddd1ff05b..b741643d1364 100644 --- a/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c +++ b/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c @@ -3,7 +3,8 @@ * Copyright (C) 2023 ARM Ltd. */ =20 -#include +#include +#include #include #include #include @@ -12,8 +13,6 @@ #include #include =20 -#include - /** * struct arm_cca_token_info - a descriptor for the token buffer. * @granule: PA of the granule to which the token will be written diff --git a/arch/arm64/include/asm/rsi_cmds.h b/include/linux/arm-rsi-cmds= .h similarity index 69% rename from arch/arm64/include/asm/rsi_cmds.h rename to include/linux/arm-rsi-cmds.h index c1fab41f671e..9e8a8c189ca1 100644 --- a/arch/arm64/include/asm/rsi_cmds.h +++ b/include/linux/arm-rsi-cmds.h @@ -3,14 +3,36 @@ * Copyright (C) 2023 ARM Ltd. */ =20 -#ifndef __ASM_RSI_CMDS_H -#define __ASM_RSI_CMDS_H +#ifndef __LINUX_ARM_RSI_CMDS_H_ +#define __LINUX_ARM_RSI_CMDS_H_ =20 -#include +#include +#include #include #include =20 -#include +#define RSI_PDEV_NAME "arm-cca-dev" +#ifdef CONFIG_ARM_RMM_RSI +DECLARE_STATIC_KEY_FALSE(rsi_present); + +void __init arm64_rsi_init(void); + +bool arm64_rsi_is_protected(phys_addr_t base, size_t size); + +static inline bool is_realm_world(void) +{ + return static_branch_unlikely(&rsi_present); +} +#else +static inline void arm64_rsi_init(void) { } + +static inline bool arm64_rsi_is_protected(phys_addr_t base, size_t size) +{ + return false; +} + +static inline bool is_realm_world(void) { return false; } +#endif =20 #define RSI_GRANULE_SHIFT 12 #define RSI_GRANULE_SIZE (_AC(1, UL) << RSI_GRANULE_SHIFT) @@ -88,6 +110,51 @@ static inline long rsi_set_addr_range_state(phys_addr_t= start, return res.a0; } =20 +static inline int rsi_set_memory_range(phys_addr_t start, phys_addr_t end, + enum ripas state, unsigned long flags) +{ + unsigned long ret; + phys_addr_t top; + + while (start !=3D end) { + ret =3D rsi_set_addr_range_state(start, end, state, flags, &top); + if (ret || top < start || top > end) + return -EINVAL; + start =3D top; + } + + return 0; +} + +/* + * Convert the specified range to RAM. Do not use this if you rely on the + * contents of a page that may already be in RAM state. + */ +static inline int rsi_set_memory_range_protected(phys_addr_t start, + phys_addr_t end) +{ + return rsi_set_memory_range(start, end, RSI_RIPAS_RAM, + RSI_CHANGE_DESTROYED); +} + +/* + * Convert the specified range to RAM. Do not convert any pages that may h= ave + * been DESTROYED, without our permission. + */ +static inline int rsi_set_memory_range_protected_safe(phys_addr_t start, + phys_addr_t end) +{ + return rsi_set_memory_range(start, end, RSI_RIPAS_RAM, + RSI_NO_CHANGE_DESTROYED); +} + +static inline int rsi_set_memory_range_shared(phys_addr_t start, + phys_addr_t end) +{ + return rsi_set_memory_range(start, end, RSI_RIPAS_EMPTY, + RSI_CHANGE_DESTROYED); +} + #define RSI_ATTEST_CHALLENGE_MIN_SIZE 32 #define RSI_ATTEST_CHALLENGE_MAX_SIZE 64 =20 @@ -170,4 +237,4 @@ static inline unsigned long rsi_attestation_token_conti= nue(phys_addr_t granule, return res.a0; } =20 -#endif /* __ASM_RSI_CMDS_H */ +#endif /* __LINUX_ARM_RSI_CMDS_H_ */ diff --git a/arch/arm64/include/asm/rsi_smc.h b/include/linux/arm-smccc-rsi= .h similarity index 98% rename from arch/arm64/include/asm/rsi_smc.h rename to include/linux/arm-smccc-rsi.h index e19253f96c94..fddb77986f70 100644 --- a/arch/arm64/include/asm/rsi_smc.h +++ b/include/linux/arm-smccc-rsi.h @@ -3,8 +3,8 @@ * Copyright (C) 2023 ARM Ltd. */ =20 -#ifndef __ASM_RSI_SMC_H_ -#define __ASM_RSI_SMC_H_ +#ifndef __LINUX_ARM_SMCCC_RSI_H_ +#define __LINUX_ARM_SMCCC_RSI_H_ =20 #include =20 @@ -190,4 +190,4 @@ struct realm_config { */ #define SMC_RSI_HOST_CALL SMC_RSI_FID(0x199) =20 -#endif /* __ASM_RSI_SMC_H_ */ +#endif /* __LINUX_ARM_SMCCC_RSI_H_ */ --=20 2.43.0 From nobody Thu Sep 24 20:30:51 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1F80357D09; Mon, 21 Sep 2026 05:38:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969129; cv=none; b=qunAclcNWU0DRA8bVD8oUMqkJVZRw5r0euaCEearYq83+ssSP7jitTNQJCSA4sfkQ5nf7grGhQh2Gf+GGwjqelyPsGyVcehCw1WY8aLdUYmfGxtiYro9DPZ2XdcrKgY09lLIaveO2zVVWd2QBSAp7QLENGV0hBrESz9hgURLj8k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969129; c=relaxed/simple; bh=7rVAQhoTDuDKcN2jSKLIq/CIYXI2oJnlG/on20WL4Ys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O0fxT73Fh3nXzVKkpOh0arDj6z5ogEJ27HOqJguRXqFJRv5NYcKYPbV0526TTeu+SUAfzmKG79RWSxRtnH92sfmH4Yns9565lunQCcNqZDcpxQXW7Z7NmEaPSJ5XnAgcO9idooDVivY9/sTtNoomY2IizPLhyS5sAITgWoh8hVg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d76YHmGr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d76YHmGr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4AED1F00893; Mon, 21 Sep 2026 05:38:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789969127; bh=qK/5PbD/stey1Ftb7SyyJK4Jfw9qAIxD3DOwlo1cvlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d76YHmGrVKUbbAzMuLuI0bAjQtxNKgccvsInjn8S4eYpk9T8WLh/lTzDeEf2RplzM JZ2qeXRPdc6cqOBCQPIO8NEzsFL4GFwkyP7C+6nbpi33tUcmKXhIICnRNHvImIJ0Qr uotxaK4Cn/qYB/rWtjRzV/GuHpmntGz/hZ+mAgbuzKWjygKbD01igkFcEz7jadv27C jiYvMABhH1GzgA34XE816PjIXWQHsJffWvsuuL8V5w9zJXheK/sdGgRqc2ZI9d2KTr zT/y+zfxTS1Ey8Hkl+TMjsoMOLEMnqrCFSCDYsxVoLiRic7MtXNIqoseo7orB6qeft adl9ZIvlXDn4g== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Jason Gunthorpe , Catalin Marinas , Greg KH , Jeremy Linton , Jonathan Cameron , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Will Deacon , Steven Price , Suzuki K Poulose , Andre Przywara , Suzuki K Poulose Subject: [PATCH v12 4/7] arm64: realm: Move Realm memory encryption ops to RSI code Date: Mon, 21 Sep 2026 11:08:04 +0530 Message-ID: <20260921053807.354802-5-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921053807.354802-1-aneesh.kumar@kernel.org> References: <20260921053807.354802-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Realm memory encryption callbacks are CCA-specific. Keep the Realm callback registration with the RSI initialization code instead of pageattr.c, which only needs to provide the low-level page-attribute transition helper. Export __set_memory_enc_dec() within arm64 so the RSI code can wrap it with the Realm-specific encrypt/decrypt callbacks and warning policy. No functional changes in this patch. Reviewed-by: Suzuki K Poulose Reviewed-by: Catalin Marinas Reviewed-by: Jason Gunthorpe Signed-off-by: Aneesh Kumar K.V (Arm) Reviewed-by: Jonathan Cameron Reviewed-by: Suzuki K Poulose --- arch/arm64/include/asm/mem_encrypt.h | 3 +-- arch/arm64/mm/pageattr.c | 38 +--------------------------- drivers/firmware/arm_rmm/rsi.c | 34 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 39 deletions(-) diff --git a/arch/arm64/include/asm/mem_encrypt.h b/arch/arm64/include/asm/= mem_encrypt.h index f03b9d7b83b4..ef8b8463e52b 100644 --- a/arch/arm64/include/asm/mem_encrypt.h +++ b/arch/arm64/include/asm/mem_encrypt.h @@ -16,8 +16,7 @@ int arm64_mem_crypt_ops_register(const struct arm64_mem_c= rypt_ops *ops); =20 int set_memory_encrypted(unsigned long addr, int numpages); int set_memory_decrypted(unsigned long addr, int numpages); - -int realm_register_memory_enc_ops(void); +int __set_memory_enc_dec(unsigned long addr, int numpages, bool encrypt); =20 static inline bool force_dma_unencrypted(struct device *dev) { diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index bbe98ac9ad8c..14b2a3801f40 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -275,9 +275,7 @@ int set_direct_map_default_noflush(struct page *page) PAGE_SIZE, set_mask, clear_mask); } =20 -static int __set_memory_enc_dec(unsigned long addr, - int numpages, - bool encrypt) +int __set_memory_enc_dec(unsigned long addr, int numpages, bool encrypt) { unsigned long set_prot =3D 0, clear_prot =3D 0; phys_addr_t start, end; @@ -321,40 +319,6 @@ static int __set_memory_enc_dec(unsigned long addr, __pgprot(PTE_PRESENT_INVALID)); } =20 -static int realm_set_memory_encrypted(unsigned long addr, int numpages) -{ - int ret =3D __set_memory_enc_dec(addr, numpages, true); - - /* - * If the request to change state fails, then the only sensible cause - * of action for the caller is to leak the memory - */ - WARN(ret, "Failed to encrypt memory, %d pages will be leaked", - numpages); - - return ret; -} - -static int realm_set_memory_decrypted(unsigned long addr, int numpages) -{ - int ret =3D __set_memory_enc_dec(addr, numpages, false); - - WARN(ret, "Failed to decrypt memory, %d pages will be leaked", - numpages); - - return ret; -} - -static const struct arm64_mem_crypt_ops realm_crypt_ops =3D { - .encrypt =3D realm_set_memory_encrypted, - .decrypt =3D realm_set_memory_decrypted, -}; - -int realm_register_memory_enc_ops(void) -{ - return arm64_mem_crypt_ops_register(&realm_crypt_ops); -} - int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool vali= d) { unsigned long addr =3D (unsigned long)page_address(page); diff --git a/drivers/firmware/arm_rmm/rsi.c b/drivers/firmware/arm_rmm/rsi.c index 8e716f1c1e31..ada139d0e344 100644 --- a/drivers/firmware/arm_rmm/rsi.c +++ b/drivers/firmware/arm_rmm/rsi.c @@ -127,6 +127,40 @@ static int realm_ioremap_hook(phys_addr_t phys, size_t= size, pgprot_t *prot) return 0; } =20 +static int realm_set_memory_encrypted(unsigned long addr, int numpages) +{ + int ret =3D __set_memory_enc_dec(addr, numpages, true); + + /* + * If the request to change state fails, then the only sensible cause + * of action for the caller is to leak the memory + */ + WARN(ret, "Failed to encrypt memory, %d pages will be leaked", + numpages); + + return ret; +} + +static int realm_set_memory_decrypted(unsigned long addr, int numpages) +{ + int ret =3D __set_memory_enc_dec(addr, numpages, false); + + WARN(ret, "Failed to decrypt memory, %d pages will be leaked", + numpages); + + return ret; +} + +static const struct arm64_mem_crypt_ops realm_crypt_ops =3D { + .encrypt =3D realm_set_memory_encrypted, + .decrypt =3D realm_set_memory_decrypted, +}; + +static int realm_register_memory_enc_ops(void) +{ + return arm64_mem_crypt_ops_register(&realm_crypt_ops); +} + void __init arm64_rsi_init(void) { if (arm_smccc_1_1_get_conduit() !=3D SMCCC_CONDUIT_SMC) --=20 2.43.0 From nobody Thu Sep 24 20:30:51 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFA6C35AC3E; Mon, 21 Sep 2026 05:38:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969135; cv=none; b=iKCHLNhcQtc5an31NQpBZ9CEAgmxCdxNTgnpvacM7/sY2/OQ31kajvEkUB4GkvqE1L8feSOAEmc6h/H5752EdMLtkWc8o2vZoq9TI6KcRFFfNCpy/+96EAW163VFuBYMCNcNuBwEY0pYGGeaMdhYZUIr60y3pwoeFXdxqaaAtEM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969135; c=relaxed/simple; bh=3Uwn7eQXaiTK0embnz++oZWtSanfP50l3WGCmc2DaUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bWG5Iv0uCff7/9NUZLfLq5uPruyzflS1528SQXO05uV8rfPPQRykOmnlLv0XfxykOeWimPwXJ8x4b9YiRGXKeqHAkUcwTBqxkImxYkT2LIRJ9qcpvvQ5A1ymTqGietMxphoTffIX3hkJUXh+qFZbnGLo+pDEMSF+DmspqGXMbzc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KGI3WDD0; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KGI3WDD0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7102C1F000FF; Mon, 21 Sep 2026 05:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789969133; bh=atiTdhI78JQ+M1h1EEiAmlBcUf8Fbkaf+mVs/42GC6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KGI3WDD02LC91S2+WAdaTGXlW3fiqNXY1mg+e1enGSpF7z4+BWHCc3nI5pGax7Gc8 20SohOuILi0mbYYO1sBqtOzkNygsBEwIWzqA3UItCUI2oosg7PfLQVZn74e0JqJKt0 QEwqn1cLPH8m9v/3ybo4szDbSTYOVRHssXdp3/GWwjTp0jUgrZnbCxMy4C5s3ffACp dX526Fxz9dhcs3iFFgjwQ4TyAYtao1K9X1zIFd2/L+q+8CYtl8E6nzIGCsP9qJx8BC vwpdWV06agCfbW/sOKXxyP40L3OWrCcPwwtd/ISydj7zEz+LGPvLUwnJap0wZUs2G4 67cTkULnide0Q== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Jason Gunthorpe , Catalin Marinas , Greg KH , Jeremy Linton , Jonathan Cameron , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Will Deacon , Steven Price , Suzuki K Poulose , Andre Przywara , Suzuki K Poulose Subject: [PATCH v12 5/7] virt: coco: arm-cca-guest: Rename TSM report source file Date: Mon, 21 Sep 2026 11:08:05 +0530 Message-ID: <20260921053807.354802-6-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921053807.354802-1-aneesh.kumar@kernel.org> References: <20260921053807.354802-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Arm CCA guest driver currently only implements TSM report support, but follow-up changes will add more TSM-related functionality to the same module. Rename arm-cca-guest.c to main.c and build it as an object of the arm-cca-guest module. This leaves room for the module to grow additional source files. Also rename the arm_cca_tsm_ops instance to arm_cca_tsm_report_ops to distinguish the report operations from other TSM functionality that will be added. Reviewed-by: Suzuki K Poulose Reviewed-by: Catalin Marinas Reviewed-by: Jason Gunthorpe Signed-off-by: Aneesh Kumar K.V (Arm) Reviewed-by: Jonathan Cameron --- drivers/virt/coco/arm-cca-guest/Makefile | 2 ++ drivers/virt/coco/arm-cca-guest/{arm-cca-guest.c =3D> main.c} | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) rename drivers/virt/coco/arm-cca-guest/{arm-cca-guest.c =3D> main.c} (97%) diff --git a/drivers/virt/coco/arm-cca-guest/Makefile b/drivers/virt/coco/a= rm-cca-guest/Makefile index 69eeba08e98a..7564f4fcc4a4 100644 --- a/drivers/virt/coco/arm-cca-guest/Makefile +++ b/drivers/virt/coco/arm-cca-guest/Makefile @@ -1,2 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_ARM_CCA_GUEST) +=3D arm-cca-guest.o + +arm-cca-guest-y +=3D main.o diff --git a/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c b/drivers/virt= /coco/arm-cca-guest/main.c similarity index 97% rename from drivers/virt/coco/arm-cca-guest/arm-cca-guest.c rename to drivers/virt/coco/arm-cca-guest/main.c index b741643d1364..80659f0885e9 100644 --- a/drivers/virt/coco/arm-cca-guest/arm-cca-guest.c +++ b/drivers/virt/coco/arm-cca-guest/main.c @@ -156,7 +156,7 @@ static int arm_cca_report_new(struct tsm_report *report= , void *data) return ret; } =20 -static const struct tsm_report_ops arm_cca_tsm_ops =3D { +static const struct tsm_report_ops arm_cca_tsm_report_ops =3D { .name =3D KBUILD_MODNAME, .report_new =3D arm_cca_report_new, }; @@ -177,7 +177,7 @@ static int __init arm_cca_guest_init(void) if (!is_realm_world()) return -ENODEV; =20 - ret =3D tsm_report_register(&arm_cca_tsm_ops, NULL); + ret =3D tsm_report_register(&arm_cca_tsm_report_ops, NULL); if (ret < 0) pr_err("Error %d registering with TSM\n", ret); =20 @@ -191,7 +191,7 @@ module_init(arm_cca_guest_init); */ static void __exit arm_cca_guest_exit(void) { - tsm_report_unregister(&arm_cca_tsm_ops); + tsm_report_unregister(&arm_cca_tsm_report_ops); } module_exit(arm_cca_guest_exit); =20 --=20 2.43.0 From nobody Thu Sep 24 20:30:51 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87824356771; Mon, 21 Sep 2026 05:38:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969140; cv=none; b=sIPpsk9n/WuuZAU+ATsOSRirazwG/BKba6i7QQn/kPlcPZ1qXc3jhrTrkiaFs3bp0/1lj5WufnrDyb15t+BbgcV9Rectl81yNnggAcv6bYFPIAQ3fPdqevvMXbXxWAnYKiophZvPVKl0chE05CsP5BjOAS93Y/YA9n+BZ4UQjvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969140; c=relaxed/simple; bh=Icer/cbxb1+E/GrgM9kbhOIalLLV7DNAnu+HyEU7z20=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JqdUDg/OteoKDPfjKPTmNvy1TMjZhA8zvDRj8YcIq1D45Nq/IWVD4jv4gjmVlpYtJNMNp/KaKUBjvNUHPWfa6+mTfE4s0aGftxj4qR+7hcA9duj6azv5Y2lVqknjbnp9a4Dr4uONUTjlg2g/PvRTTnIbfHGpH86yOpOvye6FYr0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hkilxC48; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hkilxC48" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E0611F00893; Mon, 21 Sep 2026 05:38:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789969139; bh=qglOwC8/qKaGEdKXUm4aqR0PQfK5d7Y1tbMfsO79AnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hkilxC48bqqc4ZL/AszIlCtnpgiD3l45LlymdctWoTobnHlaXD7Fap3U+0aytE2w5 MWabo5yplrv7nnLnPEOh9Bg6I3JcIRYjn48CKarJl4DU1UwUi5qC2lmLQX13+QCwiM 2Vh9fur9wFx+n6ykvJ5Y9owL2fv3uorvm0tuVDbC9HNOQZZWYZx/K+VXnu7PNwBe5g +S8s6WEvJIsaOzxJq2nhoEtf4f/Qv1pGd8uqTXLwCkPog/FxfATRBwOTavENi9wGcZ 6zzmdKVK87dlzsYB/k1ff0BgVXJa+dTRQlztZJiM7c1t870Cc9N9NzDNwJ7YPtB16x 8bfG9aR+Y1AZw== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Jason Gunthorpe , Catalin Marinas , Greg KH , Jeremy Linton , Jonathan Cameron , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Will Deacon , Steven Price , Suzuki K Poulose , Andre Przywara , Jonathan Cameron Subject: [PATCH v12 6/7] firmware: smccc: arm-cca-guest: Bind the TSM provider to an SMCCC device Date: Mon, 21 Sep 2026 11:08:06 +0530 Message-ID: <20260921053807.354802-7-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921053807.354802-1-aneesh.kumar@kernel.org> References: <20260921053807.354802-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Arm CCA guest TSM provider currently binds through the arm-cca-dev platform device. Like arm-smccc-trng, this device is not an independent platform resource; it is a software representation of the RSI firmware service discovered through SMCCC. Move RSI discovery into the SMCCC firmware driver. When the SMCCC conduit is SMC and if RSI ABI version call is supported, create an arm-rsi SMCCC device. Convert the Arm CCA guest TSM provider to an SMCCC driver so it binds to that discovered RSI service and keeps module autoloading through the SMCCC device id table. Keep the old arm-cca-dev platform-device registration for now. Userspace has used that device as a Realm-guest indicator, so removing it is left to a follow-up patch that adds a replacement sysfs ABI. Reviewed-by: Jason Gunthorpe Reviewed-by: Jonathan Cameron Reviewed-by: Catalin Marinas Signed-off-by: Aneesh Kumar K.V (Arm) --- drivers/firmware/arm_rmm/rsi.c | 2 +- drivers/firmware/smccc/smccc.c | 6 ++++ drivers/virt/coco/arm-cca-guest/Kconfig | 1 + drivers/virt/coco/arm-cca-guest/main.c | 41 ++++++++++--------------- include/linux/arm-rsi-cmds.h | 1 - 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/firmware/arm_rmm/rsi.c b/drivers/firmware/arm_rmm/rsi.c index ada139d0e344..2dd69febedbd 100644 --- a/drivers/firmware/arm_rmm/rsi.c +++ b/drivers/firmware/arm_rmm/rsi.c @@ -183,7 +183,7 @@ void __init arm64_rsi_init(void) } =20 static struct platform_device rsi_dev =3D { - .name =3D RSI_PDEV_NAME, + .name =3D "arm-cca-dev", .id =3D PLATFORM_DEVID_NONE }; =20 diff --git a/drivers/firmware/smccc/smccc.c b/drivers/firmware/smccc/smccc.c index 67e503dac409..afc2e4d602ba 100644 --- a/drivers/firmware/smccc/smccc.c +++ b/drivers/firmware/smccc/smccc.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #include =20 @@ -94,6 +95,11 @@ static const struct smccc_device_info smccc_devices[] __= initconst =3D { .requires_smc =3D false, .device_name =3D "arm-smccc-trng", }, + { + .func_id =3D SMC_RSI_ABI_VERSION, + .requires_smc =3D true, + .device_name =3D "arm-rsi", + }, }; =20 static bool __init smccc_probe_smccc_device(const struct smccc_device_info= *smccc_dev) diff --git a/drivers/virt/coco/arm-cca-guest/Kconfig b/drivers/virt/coco/ar= m-cca-guest/Kconfig index 2582ebb36922..0d4ce72e2d86 100644 --- a/drivers/virt/coco/arm-cca-guest/Kconfig +++ b/drivers/virt/coco/arm-cca-guest/Kconfig @@ -1,6 +1,7 @@ config ARM_CCA_GUEST tristate "Arm CCA Guest driver" depends on ARM_RMM_RSI + depends on HAVE_ARM_SMCCC_DISCOVERY select TSM_REPORTS help The driver provides userspace interface to request and diff --git a/drivers/virt/coco/arm-cca-guest/main.c b/drivers/virt/coco/arm= -cca-guest/main.c index 80659f0885e9..f97f593da6e3 100644 --- a/drivers/virt/coco/arm-cca-guest/main.c +++ b/drivers/virt/coco/arm-cca-guest/main.c @@ -4,6 +4,7 @@ */ =20 #include +#include #include #include #include @@ -161,16 +162,7 @@ static const struct tsm_report_ops arm_cca_tsm_report_= ops =3D { .report_new =3D arm_cca_report_new, }; =20 -/** - * arm_cca_guest_init - Register with the Trusted Security Module (TSM) - * interface. - * - * Return: - * * %0 - Registered successfully with the TSM interface. - * * %-ENODEV - The execution context is not an Arm Realm. - * * %-EBUSY - Already registered. - */ -static int __init arm_cca_guest_init(void) +static int cca_tsm_probe(struct arm_smccc_device *sdev) { int ret; =20 @@ -179,29 +171,30 @@ static int __init arm_cca_guest_init(void) =20 ret =3D tsm_report_register(&arm_cca_tsm_report_ops, NULL); if (ret < 0) - pr_err("Error %d registering with TSM\n", ret); + return dev_err_probe(&sdev->dev, + ret, "Error registering with TSM\n"); =20 - return ret; + return 0; } -module_init(arm_cca_guest_init); =20 -/** - * arm_cca_guest_exit - unregister with the Trusted Security Module (TSM) - * interface. - */ -static void __exit arm_cca_guest_exit(void) +static void cca_tsm_remove(struct arm_smccc_device *sdev) { tsm_report_unregister(&arm_cca_tsm_report_ops); } -module_exit(arm_cca_guest_exit); =20 -/* modalias, so userspace can autoload this module when RSI is available */ -static const struct platform_device_id arm_cca_match[] __maybe_unused =3D { - { .name =3D RSI_PDEV_NAME }, - { } +static const struct arm_smccc_device_id cca_tsm_id_table[] =3D { + { .func_id =3D SMC_RSI_ABI_VERSION }, + {} }; +MODULE_DEVICE_TABLE(arm_smccc, cca_tsm_id_table); =20 -MODULE_DEVICE_TABLE(platform, arm_cca_match); +static struct arm_smccc_driver cca_tsm_driver =3D { + .name =3D KBUILD_MODNAME, + .probe =3D cca_tsm_probe, + .remove =3D cca_tsm_remove, + .id_table =3D cca_tsm_id_table, +}; +module_arm_smccc_driver(cca_tsm_driver); MODULE_AUTHOR("Sami Mujawar "); MODULE_DESCRIPTION("Arm CCA Guest TSM Driver"); MODULE_LICENSE("GPL"); diff --git a/include/linux/arm-rsi-cmds.h b/include/linux/arm-rsi-cmds.h index 9e8a8c189ca1..3f7a6a833993 100644 --- a/include/linux/arm-rsi-cmds.h +++ b/include/linux/arm-rsi-cmds.h @@ -11,7 +11,6 @@ #include #include =20 -#define RSI_PDEV_NAME "arm-cca-dev" #ifdef CONFIG_ARM_RMM_RSI DECLARE_STATIC_KEY_FALSE(rsi_present); =20 --=20 2.43.0 From nobody Thu Sep 24 20:30:51 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4066918C933; Mon, 21 Sep 2026 05:39:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969146; cv=none; b=Jo9V3GKdkUKDdbTsbcCVdQ8PmrvvAX9YwG8aB1LsPMSxwutzF4ckHl8aTDVPCvBloa5WMSl6+WJpKKGMHXe9f/PfdougM0BTnWyHsiV8/VEn4WBuemzMXL2X6kDCCqah7H1knpbvkgGDrU09APNl3Ac4vjfVMsrPnSseRVHWdP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789969146; c=relaxed/simple; bh=QEUW1K9pFgfhB9YBF+lza9REhBEjCZELhcQFkCRw+0M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m8neItgJkZzb+/Vw5AWsVvbd4gEr7ylBHVaoCRdCgCnWT19dQ06u+RGqV+q7iFRQh++vIBXZxk3X5GJMN9u8ER0DC+4jY+iZJtKspPd6njA8/+hcAZKYSOaWnj1HeKQdo/KfcnZWSotVbMoHX/u8bX9sCj6b+BatKgwKwx1dSc8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CrI9BEZl; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CrI9BEZl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 076E31F000FF; Mon, 21 Sep 2026 05:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789969145; bh=5xq9uOaZUlju0eA9uFj+yG1J8aLC1dru00Sy5/YfvlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CrI9BEZlPhYUnxwLwPnKCEiXrJEuZX8vCVzRAr0eJ8nuRJ1Nnw2PbP0m6eGyscMsw 3zXLJd4r+YHbXkkBeL5eTGpO4+Y/f5XhEjEJQEQcbZz1a1U1b5QDeTipdu/xxJAkgt BsKjkMcHEg08VN6wkbC2woxk9gpLCboQNNdLFufLnguypxW7ZSo8RW2/TKKVVEuzmF 2m1uHV0UjtAVQHlTj1HzC66XddDO9/ReQrEakl51KUqo0NDD0JRAyej0hiqjcDBztZ l/eqm6zNLbd0cWqhf3LzAwWWf3Av7nSUDFmthZQIENuJScdQCebbUHarBRB0aoGGq5 5w3Sb7lW+E8yA== From: "Aneesh Kumar K.V (Arm)" To: linux-coco@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Jason Gunthorpe , Catalin Marinas , Greg KH , Jeremy Linton , Jonathan Cameron , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Will Deacon , Steven Price , Suzuki K Poulose , Andre Przywara , Jonathan Cameron Subject: [PATCH v12 7/7] coco: guest: arm64: Replace dummy CCA device with sysfs ABI Date: Mon, 21 Sep 2026 11:08:07 +0530 Message-ID: <20260921053807.354802-8-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921053807.354802-1-aneesh.kumar@kernel.org> References: <20260921053807.354802-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The SMCCC firmware driver now creates the arm_smccc bus and instantiates the CCA RSI device once the RSI ABI is discovered. The arm64-specific arm-cca-dev platform device stub is therefore no longer needed. However, userspace has used the arm-cca-dev platform device to detect Arm CCA Realm guests [1]. Removing it without a replacement would break that detection and would also leave userspace depending on kernel device-model details. Add /sys/firmware/cca/realm_guest as a stable ABI for detecting whether the kernel is running as an Arm CCA Realm guest. Create the file only in Realm world, where it reads 1. Remove the dummy arm-cca-dev registration now that userspace has a dedicated CCA Realm guest indicator, and document the new ABI in Documentation/ABI/testing/sysfs-firmware-cca. Link: https://lore.kernel.org/all/4a7d84b2-2ec4-4773-a2d5-7b63d5c683cf@arm.= com Reviewed-by: Jonathan Cameron Reviewed-by: Catalin Marinas Reviewed-by: Jason Gunthorpe Signed-off-by: Aneesh Kumar K.V (Arm) --- Documentation/ABI/testing/sysfs-firmware-cca | 7 ++++ drivers/firmware/arm_rmm/rsi.c | 43 +++++++++++++++----- 2 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-firmware-cca diff --git a/Documentation/ABI/testing/sysfs-firmware-cca b/Documentation/A= BI/testing/sysfs-firmware-cca new file mode 100644 index 000000000000..9cc355724f94 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-firmware-cca @@ -0,0 +1,7 @@ +What: /sys/firmware/cca/realm_guest +Date: May 2026 +Contact: Linux ARM Kernel Mailing list +Description: Read-only. Present only when the kernel is running as an + Arm Confidential Compute Architecture (CCA) Realm guest, in + which case it reads 1. If the file does not exist, the kernel + is not running as a Realm guest. diff --git a/drivers/firmware/arm_rmm/rsi.c b/drivers/firmware/arm_rmm/rsi.c index 2dd69febedbd..425b27c0cad4 100644 --- a/drivers/firmware/arm_rmm/rsi.c +++ b/drivers/firmware/arm_rmm/rsi.c @@ -7,14 +7,16 @@ #include #include #include -#include #include +#include +#include =20 #include #include #include =20 static struct realm_config config; +static struct kobject *cca_kobj; =20 unsigned long prot_ns_shared; EXPORT_SYMBOL(prot_ns_shared); @@ -182,17 +184,36 @@ void __init arm64_rsi_init(void) static_branch_enable(&rsi_present); } =20 -static struct platform_device rsi_dev =3D { - .name =3D "arm-cca-dev", - .id =3D PLATFORM_DEVID_NONE +static ssize_t realm_guest_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "1\n"); +} + +static struct kobj_attribute cca_realm_guest =3D + __ATTR(realm_guest, 0444, realm_guest_show, NULL); + +static const struct attribute *cca_realm_attrs[] =3D { + &cca_realm_guest.attr, + NULL }; =20 -static int __init arm64_create_dummy_rsi_dev(void) +static int __init realm_sysfs_init(void) { - if (is_realm_world() && - platform_device_register(&rsi_dev)) - pr_err("failed to register rsi platform device\n"); - return 0; -} + int ret; =20 -arch_initcall(arm64_create_dummy_rsi_dev) + if (!is_realm_world()) + return 0; + + cca_kobj =3D kobject_create_and_add("cca", firmware_kobj); + if (!cca_kobj) + return -ENOMEM; + + ret =3D sysfs_create_files(cca_kobj, cca_realm_attrs); + if (!ret) + return 0; + + kobject_put(cca_kobj); + return ret; +} +device_initcall(realm_sysfs_init); --=20 2.43.0