@@ -3094,6 +3094,42 @@ assigned to the domain.
=back
+=over 4
+
+=item B<arm_sci="ARM_SCI_STRING">
+
+Set ARM_SCI specific options for the guest. ARM SCI is System
+Control Protocol allows domain to manage various functions that are provided
+by HW platform firmware.
+
+B<ARM_SCI_STRING> is a comma separated list of C<KEY=VALUE> settings,
+from the following list:
+
+=over 4
+
+=item B<type=STRING>
+
+Specifies an ARM SCI type for the guest.
+
+=over 4
+
+=item B<none>
+
+Don't allow guest to use ARM SCI if present on the platform. This is the
+default value.
+
+=item B<scmi_smc>
+
+Enables ARM SCMI SMC support for the guest by enabling SCMI over SMC calls
+forwarding from domain to the EL3 firmware (like Trusted Firmware-A) with a
+single SCMI OSPM agent support.
+Should be used together with B<dom0_scmi_smc_passthrough> Xen command line
+option.
+
+=back
+
+=back
+
=head3 x86
=over 4
@@ -1082,6 +1082,15 @@ affinities to prefer but be not limited to the specified node(s).
Pin dom0 vcpus to their respective pcpus
+### dom0_scmi_smc_passthrough (ARM)
+> `= <boolean>`
+
+The option is available when `CONFIG_SCMI_SMC` is compiled in, and allows to
+enable SCMI SMC single agent interface for any, but only one guest domain,
+which serves as Driver domain. The SCMI will be disabled for Dom0/hwdom and
+SCMI nodes removed from Dom0/hwdom device tree.
+(for example, thin Dom0 with Driver domain use-case).
+
### dtuart (ARM)
> `= path [:options]`
@@ -313,6 +313,11 @@
*/
#define LIBXL_HAVE_BUILDINFO_ARCH_NR_SPIS 1
+/*
+ * libxl_domain_build_info has the arch_arm.sci* fields.
+ */
+#define LIBXL_HAVE_BUILDINFO_ARCH_ARM_SCI 1
+
/*
* LIBXL_HAVE_SOFT_RESET indicates that libxl supports performing
* 'soft reset' for domains and there is 'soft_reset' shutdown reason
@@ -222,6 +222,19 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
config->arch.sve_vl = d_config->b_info.arch_arm.sve_vl / 128U;
}
+ switch (d_config->b_info.arm_sci.type) {
+ case LIBXL_ARM_SCI_TYPE_NONE:
+ config->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_NONE;
+ break;
+ case LIBXL_ARM_SCI_TYPE_SCMI_SMC:
+ config->arch.arm_sci_type = XEN_DOMCTL_CONFIG_ARM_SCI_SCMI_SMC;
+ break;
+ default:
+ LOG(ERROR, "Unknown ARM_SCI type %d",
+ d_config->b_info.arm_sci.type);
+ return ERROR_FAIL;
+ }
+
return 0;
}
@@ -551,6 +551,15 @@ libxl_sve_type = Enumeration("sve_type", [
(2048, "2048")
], init_val = "LIBXL_SVE_TYPE_DISABLED")
+libxl_arm_sci_type = Enumeration("arm_sci_type", [
+ (0, "none"),
+ (1, "scmi_smc")
+ ], init_val = "LIBXL_ARM_SCI_TYPE_NONE")
+
+libxl_arm_sci = Struct("arm_sci", [
+ ("type", libxl_arm_sci_type),
+ ])
+
libxl_rdm_reserve = Struct("rdm_reserve", [
("strategy", libxl_rdm_reserve_strategy),
("policy", libxl_rdm_reserve_policy),
@@ -639,6 +648,7 @@ libxl_domain_build_info = Struct("domain_build_info",[
("apic", libxl_defbool),
("dm_restrict", libxl_defbool),
("tee", libxl_tee_type),
+ ("arm_sci", libxl_arm_sci),
("u", KeyedUnion(None, libxl_domain_type, "type",
[("hvm", Struct(None, [("firmware", string),
("bios", libxl_bios_type),
@@ -1284,6 +1284,63 @@ out:
if (rc) exit(EXIT_FAILURE);
}
+static int parse_arm_sci_config(XLU_Config *cfg, libxl_arm_sci *arm_sci,
+ const char *str)
+{
+ enum {
+ STATE_OPTION,
+ STATE_TYPE,
+ STATE_TERMINAL,
+ };
+ int ret, state = STATE_OPTION;
+ char *buf2, *tok, *ptr, *end;
+
+ if (NULL == (buf2 = ptr = strdup(str)))
+ return ERROR_NOMEM;
+
+ for (tok = ptr, end = ptr + strlen(ptr) + 1; ptr < end; ptr++) {
+ switch(state) {
+ case STATE_OPTION:
+ if (*ptr == '=') {
+ *ptr = '\0';
+ if (!strcmp(tok, "type")) {
+ state = STATE_TYPE;
+ } else {
+ fprintf(stderr, "Unknown ARM_SCI option: %s\n", tok);
+ goto parse_error;
+ }
+ tok = ptr + 1;
+ }
+ break;
+ case STATE_TYPE:
+ if (*ptr == '\0' || *ptr == ',') {
+ state = *ptr == ',' ? STATE_OPTION : STATE_TERMINAL;
+ *ptr = '\0';
+ ret = libxl_arm_sci_type_from_string(tok, &arm_sci->type);
+ if (ret) {
+ fprintf(stderr, "Unknown ARM_SCI type: %s\n", tok);
+ goto parse_error;
+ }
+ tok = ptr + 1;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (tok != ptr || state != STATE_TERMINAL)
+ goto parse_error;
+
+ free(buf2);
+
+ return 0;
+
+parse_error:
+ free(buf2);
+ return ERROR_INVAL;
+}
+
void parse_config_data(const char *config_source,
const char *config_data,
int config_len,
@@ -2981,6 +3038,15 @@ skip_usbdev:
if (!xlu_cfg_get_long (config, "nr_spis", &l, 0))
b_info->arch_arm.nr_spis = l;
+ if (!xlu_cfg_get_string(config, "arm_sci", &buf, 1)) {
+ libxl_arm_sci arm_sci = { 0 };
+ if (!parse_arm_sci_config(config, &arm_sci, buf)) {
+ b_info->arm_sci.type = arm_sci.type;
+ } else {
+ exit(EXIT_FAILURE);
+ }
+ }
+
parse_vkb_list(config, d_config);
d_config->virtios = NULL;
@@ -25,7 +25,9 @@ config SCMI_SMC
doorbell mechanism and Shared Memory for transport ("arm,scmi-smc"
compatible only). The value of "arm,smc-id" DT property from SCMI
firmware node is used to trap and forward corresponding SCMI SMCs
- to firmware running at EL3, for calls coming from the hardware domain.
+ to firmware running at EL3, for calls coming from the hardware domain or
+ driver domain.
+ Use with EL3 firmware which supports only single SCMI OSPM agent.
endchoice
@@ -14,6 +14,8 @@
#include <xen/device_tree.h>
#include <xen/errno.h>
#include <xen/init.h>
+#include <xen/iocap.h>
+#include <xen/param.h>
#include <xen/sched.h>
#include <xen/types.h>
@@ -22,7 +24,11 @@
#define SCMI_SMC_ID_PROP "arm,smc-id"
+static bool __ro_after_init opt_dom0_scmi_smc_passthrough = false;
+boolean_param("dom0_scmi_smc_passthrough", opt_dom0_scmi_smc_passthrough);
+
static uint32_t __ro_after_init scmi_smc_id;
+static struct domain *scmi_dom;
/*
* Check if provided SMC Function Identifier matches the one known by the SCMI
@@ -50,7 +56,7 @@ static bool scmi_handle_smc(struct cpu_user_regs *regs)
return false;
/* Only the hardware domain should use SCMI calls */
- if ( !is_hardware_domain(current->domain) )
+ if ( scmi_dom != current->domain )
{
gdprintk(XENLOG_WARNING, "SCMI: Unprivileged access attempt\n");
return false;
@@ -78,9 +84,18 @@ static bool scmi_handle_smc(struct cpu_user_regs *regs)
static int scmi_smc_domain_init(struct domain *d,
struct xen_domctl_createdomain *config)
{
- if ( !is_hardware_domain(d) )
+ if ( !opt_dom0_scmi_smc_passthrough && !is_hardware_domain(d) )
+ return 0;
+
+ if ( opt_dom0_scmi_smc_passthrough &&
+ (config->arch.arm_sci_type != XEN_DOMCTL_CONFIG_ARM_SCI_SCMI_SMC ||
+ is_hardware_domain(d)) )
return 0;
+ if ( scmi_dom )
+ return -EEXIST;
+
+ scmi_dom = d;
d->arch.sci_enabled = true;
printk(XENLOG_DEBUG "SCMI: %pd init\n", d);
return 0;
@@ -88,12 +103,68 @@ static int scmi_smc_domain_init(struct domain *d,
static void scmi_smc_domain_destroy(struct domain *d)
{
- if ( !is_hardware_domain(d) )
+ if ( scmi_dom && scmi_dom != d )
return;
+ scmi_dom = NULL;
+ d->arch.sci_enabled = false;
printk(XENLOG_DEBUG "SCMI: %pd destroy\n", d);
}
+/*
+ * Handle Dom0 SCMI SMC specific DT nodes
+ *
+ * Copy SCMI nodes into Dom0 device tree if dom0_scmi_smc_passthrough=false.
+ *
+ */
+static bool scmi_smc_dt_handle_node(struct domain *d,
+ struct dt_device_node *node)
+{
+ static const struct dt_device_match shmem_matches[] __initconst = {
+ DT_MATCH_COMPATIBLE("arm,scmi-shmem"),
+ { /* sentinel */ },
+ };
+ static const struct dt_device_match scmi_matches[] __initconst = {
+ DT_MATCH_PATH("/firmware/scmi"),
+ { /* sentinel */ },
+ };
+
+ if ( dt_match_node(shmem_matches, node) && !sci_domain_is_enabled(d) )
+ {
+ dt_dprintk(" Skip scmi shmem node\n");
+ return true;
+ }
+
+ if ( dt_match_node(scmi_matches, node) && !sci_domain_is_enabled(d) )
+ {
+ struct dt_device_node *shmem_node;
+ const __be32 *prop;
+ u64 paddr, size;
+ int ret;
+
+ dt_dprintk(" Skip scmi node\n");
+
+ prop = dt_get_property(node, "shmem", NULL);
+ if ( !prop )
+ return true;
+
+ shmem_node = dt_find_node_by_phandle(be32_to_cpup(prop));
+ if ( !shmem_node )
+ return true;
+
+ ret = dt_device_get_address(shmem_node, 0, &paddr, &size);
+ if ( ret )
+ return true;
+
+ ret = iomem_permit_access(d, paddr_to_pfn(paddr),
+ paddr_to_pfn(paddr + size - 1));
+
+ return true;
+ }
+
+ return false;
+}
+
static int __init scmi_check_smccc_ver(void)
{
if ( smccc_ver < ARM_SMCCC_VERSION_1_1 )
@@ -110,6 +181,7 @@ static const struct sci_mediator_ops scmi_smc_ops = {
.handle_call = scmi_handle_smc,
.domain_init = scmi_smc_domain_init,
.domain_destroy = scmi_smc_domain_destroy,
+ .dom0_dt_handle_node = scmi_smc_dt_handle_node,
};
/* Initialize the SCMI layer based on SMCs and Device-tree */
The commit 3e322bef8bc0 ("xen/arm: firmware: Add SCMI over SMC calls handling layer") introduces simple driver which forwards SCMI over SMC calls from hwdom/dom0 to EL3 firmware (TF-A) with a single SCMI OSPM agent support. While it working gracefully for hwdom/dom0 use case it doesn't cover "thin Dom0 with guest domain, which serves as Driver domain" use-case. In this case HW need to be enable in Driver domain and dom0 is performing only control functions. The EL3 SCMI firmware (TF-A) with a single SCMI OSPM agent support is pretty generic case for the default vendors SDK and new platforms. This patch enables passthrough of SCMI SMC single agent interface to the Driver domain which can be enabled in the following way: - dom0: add dom0_scmi_smc_passthrough to the Xen Command Line - domD: xl.cfg add "arm_sci" option as below arm_sci = "type=scmi_smc" - domD: xl.cfg enable access to the "arm,scmi-shmem" iomem = [ "47ff0,1@22001", ] - domD: add scmi nodes to the Driver domain partial device tree as in the below example: passthrough { scmi_shm_0: sram@22001000 { compatible = "arm,scmi-shmem"; reg = <0x0 0x22001000 0x0 0x1000>; }; firmware { compatible = "simple-bus"; scmi: scmi { compatible = "arm,scmi-smc"; shmem = <&scmi_shm_0>; ... } } } The SCMI SMC single agent interface can be enabled for one and only one domain. In general, the configuration is similar to any other HW passthrough, except explicitly enabling SCMI with "arm_sci" xl.cfg option. Note that SCMI and "arm,scmi-shmem" nodes will be removed from dom0 DT. Signed-off-by: Grygorii Strashko <grygorii_strashko@epam.com> --- docs/man/xl.cfg.5.pod.in | 36 ++++++++++++++ docs/misc/xen-command-line.pandoc | 9 ++++ tools/include/libxl.h | 5 ++ tools/libs/light/libxl_arm.c | 13 ++++++ tools/libs/light/libxl_types.idl | 10 ++++ tools/xl/xl_parse.c | 66 ++++++++++++++++++++++++++ xen/arch/arm/firmware/Kconfig | 4 +- xen/arch/arm/firmware/scmi-smc.c | 78 +++++++++++++++++++++++++++++-- 8 files changed, 217 insertions(+), 4 deletions(-)