| Message ID | 20180406100624.25978-1-mpappas@fastmail.fm |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] arm64: Add SMC and HVC commands | expand |
Hi, On 6 April 2018 at 18:06, Michalis Pappas <mpappas@fastmail.fm> wrote: > This patch adds smc and hvc commands, that allow issuing Secure Monitor > Calls and Hypervisor Calls conforming to the ARM SMC Calling Convention. > > Add Kconfig items to allow each command to be individually enabled. > > Signed-off-by: Michalis Pappas <mpappas@fastmail.fm> > --- > > cmd/Kconfig | 14 ++++++++++ > cmd/Makefile | 2 ++ > cmd/smccc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 88 insertions(+) > create mode 100644 cmd/smccc.c > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index 136836d146..bed6835eca 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -1348,6 +1348,20 @@ config CMD_HASH > saved to memory or to an environment variable. It is also possible > to verify a hash against data in memory. > > +config CMD_HVC > + bool "Support the 'hvc' command" > + depends on ARM64 > + default n > + help > + Allows issuing Hypervisor Calls (HVCs) Please expand on this. Why do you want to do this, what sort of things can you do? Other than that: Reviewed-by: Simon Glass <sjg@chromium.org>
On 04/08/2018 04:50 PM, Simon Glass wrote: > Please expand on this. Why do you want to do this, what sort of things > can you do? > > Other than that: > > Reviewed-by: Simon Glass <sjg@chromium.org> The main usecase is development / testing. My motivation was testing the Secure Payload of ARM Trusted Firmware on QEMU. For HVC, I don't have a usecase TBH, but I still think it's useful (at a minimum, one can perform Call Count, UID and Revision queries). Michalis
On Sun, Apr 08, 2018 at 07:47:20PM +0300, Michalis Pappas wrote: > > On 04/08/2018 04:50 PM, Simon Glass wrote: > >Please expand on this. Why do you want to do this, what sort of things > >can you do? > > > >Other than that: > > > >Reviewed-by: Simon Glass <sjg@chromium.org> > The main usecase is development / testing. > > My motivation was testing the Secure Payload of ARM Trusted Firmware on > QEMU. > For HVC, I don't have a usecase TBH, but I still think it's useful (at a > minimum, one can perform Call Count, UID and Revision queries). Please word that into an updated help message, thanks!
On Fri, Apr 6, 2018 at 7:06 AM, Michalis Pappas <mpappas@fastmail.fm> wrote: > +config CMD_HVC > + bool "Support the 'hvc' command" > + depends on ARM64 > + default n No need to pass 'default n' as this is already the default behavior. > + help > + Allows issuing Hypervisor Calls (HVCs) > + > +config CMD_SMC > + bool "Support the 'smc' command" > + depends on ARM64 > + default n Ditto.
Thanks for the feedback, I just sent a v2 addressing both issues On 04/09/2018 04:26 AM, Fabio Estevam wrote: > On Fri, Apr 6, 2018 at 7:06 AM, Michalis Pappas <mpappas@fastmail.fm> wrote: > >> +config CMD_HVC >> + bool "Support the 'hvc' command" >> + depends on ARM64 >> + default n > No need to pass 'default n' as this is already the default behavior. > >> + help >> + Allows issuing Hypervisor Calls (HVCs) >> + >> +config CMD_SMC >> + bool "Support the 'smc' command" >> + depends on ARM64 >> + default n > Ditto.
diff --git a/cmd/Kconfig b/cmd/Kconfig index 136836d146..bed6835eca 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1348,6 +1348,20 @@ config CMD_HASH saved to memory or to an environment variable. It is also possible to verify a hash against data in memory. +config CMD_HVC + bool "Support the 'hvc' command" + depends on ARM64 + default n + help + Allows issuing Hypervisor Calls (HVCs) + +config CMD_SMC + bool "Support the 'smc' command" + depends on ARM64 + default n + help + Allows issuing Secure Monitor Calls (SMCs) + config HASH_VERIFY bool "hash -v" depends on CMD_HASH diff --git a/cmd/Makefile b/cmd/Makefile index 9a358e4801..5656a1a40a 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_CMD_FS_GENERIC) += fs.o obj-$(CONFIG_CMD_FUSE) += fuse.o obj-$(CONFIG_CMD_GETTIME) += gettime.o obj-$(CONFIG_CMD_GPIO) += gpio.o +obj-$(CONFIG_CMD_HVC) += smccc.o obj-$(CONFIG_CMD_I2C) += i2c.o obj-$(CONFIG_CMD_IOTRACE) += iotrace.o obj-$(CONFIG_CMD_HASH) += hash.o @@ -113,6 +114,7 @@ obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SPI) += spi.o obj-$(CONFIG_CMD_STRINGS) += strings.o +obj-$(CONFIG_CMD_SMC) += smccc.o obj-$(CONFIG_CMD_TERMINAL) += terminal.o obj-$(CONFIG_CMD_TIME) += time.o obj-$(CONFIG_CMD_TRACE) += trace.o diff --git a/cmd/smccc.c b/cmd/smccc.c new file mode 100644 index 0000000000..2fa7c23999 --- /dev/null +++ b/cmd/smccc.c @@ -0,0 +1,72 @@ +/* + * Copyright 2018 + * Michalis Pappas <mpappas@fastmail.fm> + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include <asm/psci.h> +#include <common.h> +#include <command.h> +#include <linux/arm-smccc.h> +#include <linux/compiler.h> +#include <linux/psci.h> + +static int do_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + struct arm_smccc_res res; + + unsigned long fid; + + unsigned long a1; + unsigned long a2; + unsigned long a3; + unsigned long a4; + unsigned long a5; + unsigned long a6; + unsigned long a7; + + if (argc < 2) + return CMD_RET_USAGE; + + fid = simple_strtoul(argv[1], NULL, 16); + + a1 = argc > 2 ? simple_strtoul(argv[2], NULL, 16) : 0; + a2 = argc > 3 ? simple_strtoul(argv[3], NULL, 16) : 0; + a3 = argc > 4 ? simple_strtoul(argv[4], NULL, 16) : 0; + a4 = argc > 5 ? simple_strtoul(argv[5], NULL, 16) : 0; + a5 = argc > 6 ? simple_strtoul(argv[6], NULL, 16) : 0; + a6 = argc > 7 ? simple_strtoul(argv[7], NULL, 16) : 0; + a7 = argc > 8 ? simple_strtoul(argv[8], NULL, 16) : 0; + + if (!strcmp(argv[0], "smc")) + arm_smccc_smc(fid, a1, a2, a3, a4, a5, a6, a7, &res); + else + arm_smccc_hvc(fid, a1, a2, a3, a4, a5, a6, a7, &res); + + printf("Res: %ld %ld %ld %ld\n", res.a0, res.a1, res.a2, res.a3); + + return 0; +} + +#ifdef CONFIG_CMD_SMC +U_BOOT_CMD( + smc, 8, 2, do_call, + "Issue a Secure Monitor Call", + "<fid> [arg1 ... arg6] [id]\n" + " - fid Function ID\n" + " - arg SMC arguments, passed to X1-X6 (default to zero)\n" + " - id Secure OS ID / Session ID, passed to W7 (defaults to zero)\n" +); +#endif + +#ifdef CONFIG_CMD_HVC +U_BOOT_CMD( + hvc, 8, 2, do_call, + "Issue a Hypervisor Call", + "<fid> [arg1...arg7] [id]\n" + " - fid Function ID\n" + " - arg HVC arguments, passed to X1-X6 (default to zero)\n" + " - id Session ID, passed to W7 (defaults to zero)\n" +); +#endif +
This patch adds smc and hvc commands, that allow issuing Secure Monitor Calls and Hypervisor Calls conforming to the ARM SMC Calling Convention. Add Kconfig items to allow each command to be individually enabled. Signed-off-by: Michalis Pappas <mpappas@fastmail.fm> --- cmd/Kconfig | 14 ++++++++++ cmd/Makefile | 2 ++ cmd/smccc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 cmd/smccc.c -- 2.17.0