* [PATCH v4 0/3] Add Amlogic secure monitor driver
@ 2016-05-25 20:18 Carlo Caione
2016-05-25 20:18 ` [PATCH v4 1/3] firmware: Amlogic: Add " Carlo Caione
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Carlo Caione @ 2016-05-25 20:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Carlo Caione <carlo@endlessm.com>
In the Amlogic SoCs the secure monitor calls are used for a lot of reasons:
interact with the NVMEM (efuses), check the reboot reason, set USB boot, ...
This driver defines a generic interface towards the secure monitor that can be
used by more specialized drivers to interact with the secure monitor itself
without worrying about bounce buffers managing.
Changelog:
v4:
* Changed patches order
* Removed now useless PATCH 2/4
* Changed compatible to be SoC-specific
* In the DT now we use SoC-agnostic IDs for the SMC functions. These IDs are
traslated into SoC specific function IDs inside the driver
* Added error checking on meson_sm_call() to retrieve the base address
* Improved printing on errors
v3:
* Moved driver to drivers/firmware
* Added EXPORT_SYMBOL macros
* Changed '_' in '-'
* Introduced 'struct meson_sm_firmware' and 'meson_sm_get_fw()' to be used by
drivers using the secure-monitor to enforce probe ordering
v2:
* All the SMC function identifiers are now in a SoC-specific header file to
be included by the DTS files so the SMC commands are now defined in the DT
instead to be hardcoded into the driver
* Patchset is no longer an RFC
* Better error management and boundary checking
* s/unsigned int/u32/
* SMC call not only on CPU 0
* Fix memory leaking
* s/amlogic/meson/ in the directory names
Carlo Caione (3):
firmware: Amlogic: Add secure monitor driver
documentation: Add secure monitor binding documentation
ARM64: dts: amlogic: gxbb: Enable secure monitor
.../bindings/firmware/meson/meson_sm.txt | 42 +++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9 +
drivers/firmware/Kconfig | 1 +
drivers/firmware/Makefile | 1 +
drivers/firmware/meson/Kconfig | 8 +
drivers/firmware/meson/Makefile | 1 +
drivers/firmware/meson/meson_sm.c | 193 +++++++++++++++++++++
include/dt-bindings/firmware/meson-sm.h | 20 +++
include/linux/firmware/meson/meson-sm.h | 49 ++++++
9 files changed, 324 insertions(+)
create mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt
create mode 100644 drivers/firmware/meson/Kconfig
create mode 100644 drivers/firmware/meson/Makefile
create mode 100644 drivers/firmware/meson/meson_sm.c
create mode 100644 include/dt-bindings/firmware/meson-sm.h
create mode 100644 include/linux/firmware/meson/meson-sm.h
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v4 1/3] firmware: Amlogic: Add secure monitor driver 2016-05-25 20:18 [PATCH v4 0/3] Add Amlogic secure monitor driver Carlo Caione @ 2016-05-25 20:18 ` Carlo Caione 2016-05-26 7:17 ` Neil Armstrong 2016-05-25 20:18 ` [PATCH v4 2/3] documentation: Add secure monitor binding documentation Carlo Caione 2016-05-25 20:18 ` [PATCH v4 3/3] ARM64: dts: amlogic: gxbb: Enable secure monitor Carlo Caione 2 siblings, 1 reply; 7+ messages in thread From: Carlo Caione @ 2016-05-25 20:18 UTC (permalink / raw) To: linux-arm-kernel From: Carlo Caione <carlo@endlessm.com> Introduce a driver to provide calls into secure monitor mode. In the Amlogic SoCs these calls are used for multiple reasons: access to NVMEM, set USB boot, enable JTAG, etc... Signed-off-by: Carlo Caione <carlo@endlessm.com> --- drivers/firmware/Kconfig | 1 + drivers/firmware/Makefile | 1 + drivers/firmware/meson/Kconfig | 8 ++ drivers/firmware/meson/Makefile | 1 + drivers/firmware/meson/meson_sm.c | 193 ++++++++++++++++++++++++++++++++ include/dt-bindings/firmware/meson-sm.h | 20 ++++ include/linux/firmware/meson/meson-sm.h | 49 ++++++++ 7 files changed, 273 insertions(+) create mode 100644 drivers/firmware/meson/Kconfig create mode 100644 drivers/firmware/meson/Makefile create mode 100644 drivers/firmware/meson/meson_sm.c create mode 100644 include/dt-bindings/firmware/meson-sm.h create mode 100644 include/linux/firmware/meson/meson-sm.h diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 6664f11..686e395 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -199,5 +199,6 @@ config HAVE_ARM_SMCCC source "drivers/firmware/broadcom/Kconfig" source "drivers/firmware/google/Kconfig" source "drivers/firmware/efi/Kconfig" +source "drivers/firmware/meson/Kconfig" endmenu diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 474bada..fc4bb09 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQUIRES_SEC=1) -march=armv7-a obj-y += broadcom/ +obj-y += meson/ obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ obj-$(CONFIG_EFI) += efi/ obj-$(CONFIG_UEFI_CPER) += efi/ diff --git a/drivers/firmware/meson/Kconfig b/drivers/firmware/meson/Kconfig new file mode 100644 index 0000000..fff11a3 --- /dev/null +++ b/drivers/firmware/meson/Kconfig @@ -0,0 +1,8 @@ +# +# Amlogic Secure Monitor driver +# +config MESON_SM + bool + default ARCH_MESON + help + Say y here to enable the Amlogic secure monitor driver diff --git a/drivers/firmware/meson/Makefile b/drivers/firmware/meson/Makefile new file mode 100644 index 0000000..9ab3884 --- /dev/null +++ b/drivers/firmware/meson/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_MESON_SM) += meson_sm.o diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c new file mode 100644 index 0000000..7f60248 --- /dev/null +++ b/drivers/firmware/meson/meson_sm.c @@ -0,0 +1,193 @@ +/* + * Amlogic Secure Monitor driver + * + * Copyright (C) 2016 Endless Mobile, Inc. + * Author: Carlo Caione <carlo@endlessm.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdarg.h> +#include <asm/cacheflush.h> +#include <asm/compiler.h> +#include <linux/arm-smccc.h> +#include <linux/io.h> +#include <linux/ioport.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/smp.h> +#include <linux/firmware/meson/meson-sm.h> + +#include <dt-bindings/firmware/meson-sm.h> + +struct meson_sm_chip gxbb_cmd = { + .mem_size = 0x1000, + .cmd_sharemem_in_base = 0x82000020, + .cmd_sharemem_out_base = 0x82000021, + .cmd = { + CMD(SM_EFUSE_READ, 0x82000030), + CMD(SM_EFUSE_WRITE, 0x82000031), + CMD(SM_EFUSE_USER_MAX, 0x82000033), + { /* sentinel */ }, + }, +}; + +static u32 meson_sm_get_cmd(const struct meson_sm_chip *chip, unsigned int cmd_index) +{ + unsigned int i; + + for (i = 0; chip->cmd[i].smc_id; i++) + if (chip->cmd[i].index == cmd_index) + return chip->cmd[i].smc_id; + + return 0; +} + +static u32 __meson_sm_call(u32 cmd, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4) +{ + struct arm_smccc_res res; + + arm_smccc_smc(cmd, arg0, arg1, arg2, arg3, arg4, 0, 0, &res); + return res.a0; +} + +u32 meson_sm_call(struct meson_sm_firmware *fw, unsigned int cmd_index, + u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4) +{ + u32 cmd; + + if (!fw) + return -EINVAL; + + cmd = meson_sm_get_cmd(fw->chip, cmd_index); + if (!cmd) + return -EINVAL; + + return __meson_sm_call(cmd, arg0, arg1, arg2, arg3, arg4); +} +EXPORT_SYMBOL(meson_sm_call); + +u32 meson_sm_call_read(struct meson_sm_firmware *fw, void *buffer, + unsigned int cmd_index, u32 arg0, u32 arg1, + u32 arg2, u32 arg3, u32 arg4) +{ + u32 size; + + size = meson_sm_call(fw, cmd_index, arg0, arg1, arg2, arg3, arg4); + if (size <= 0 || size > fw->chip->mem_size) + return -EINVAL; + + memcpy(buffer, fw->sm_sharemem_out_base, size); + + return size; +} +EXPORT_SYMBOL(meson_sm_call_read); + +u32 meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer, + unsigned int b_size, unsigned int cmd_index, + u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4) +{ + u32 size; + + if (b_size > fw->chip->mem_size) + return -EINVAL; + + memcpy(fw->sm_sharemem_in_base, buffer, b_size); + + size = meson_sm_call(fw, cmd_index, arg0, arg1, arg2, arg3, arg4); + if (size <= 0) + return -EINVAL; + + return size; +} +EXPORT_SYMBOL(meson_sm_call_write); + +static int meson_sm_probe(struct platform_device *pdev) +{ + const struct meson_sm_chip *chip; + struct meson_sm_firmware *fw; + u32 sm_phy_in_base, sm_phy_out_base; + + fw = devm_kzalloc(&pdev->dev, sizeof(*fw), GFP_KERNEL); + if (!fw) + return -ENOMEM; + + fw->dev = &pdev->dev; + + chip = of_device_get_match_data(fw->dev); + if (!chip) { + dev_err(fw->dev, "Unable to setup secure-monitor data\n"); + return -ENODEV; + } + + sm_phy_in_base = __meson_sm_call(chip->cmd_sharemem_in_base, 0, 0, 0, 0, 0); + if (!sm_phy_in_base) { + dev_err(fw->dev, "Failed to get shared input memory base \n"); + return -EINVAL; + } + + sm_phy_out_base = __meson_sm_call(chip->cmd_sharemem_out_base, 0, 0, 0, 0, 0); + if (!sm_phy_out_base) { + dev_err(fw->dev, "Failed to get shared output memory base\n"); + return -EINVAL; + } + + fw->sm_sharemem_in_base = ioremap_cache(sm_phy_in_base, chip->mem_size); + if (!fw->sm_sharemem_in_base) { + dev_err(fw->dev, "Failed iomap()\n"); + return -EINVAL; + } + + fw->sm_sharemem_out_base = ioremap_cache(sm_phy_out_base, chip->mem_size); + if (!fw->sm_sharemem_out_base) { + dev_err(fw->dev, "Failed iomap()\n"); + iounmap(fw->sm_sharemem_in_base); + return -EINVAL; + } + + fw->chip = chip; + platform_set_drvdata(pdev, fw); + + dev_info(fw->dev, "secure-monitor enabled\n"); + + return 0; +} + +struct meson_sm_firmware *meson_sm_get_fw(struct device_node *firmware_node) +{ + struct platform_device *pdev = of_find_device_by_node(firmware_node); + + /* + * Returns NULL is the firmware device is not ready. + */ + if (!pdev) + return NULL; + + return platform_get_drvdata(pdev); +} +EXPORT_SYMBOL(meson_sm_get_fw); + +static const struct of_device_id meson_sm_ids[] = { + { .compatible = "amlogic,meson-gxbb-sm", .data = &gxbb_cmd }, + { /* sentinel */}, +}; +MODULE_DEVICE_TABLE(of, meson_sm_ids); + +static struct platform_driver meson_sm_platform_driver = { + .probe = meson_sm_probe, + .driver = { + .name = "secure-monitor", + .of_match_table = meson_sm_ids, + }, +}; +module_platform_driver(meson_sm_platform_driver); + +MODULE_AUTHOR("Carlo Caione <carlo@endlessm.com>"); +MODULE_DESCRIPTION("Amlogic secure monitor driver"); +MODULE_LICENSE("GPL"); diff --git a/include/dt-bindings/firmware/meson-sm.h b/include/dt-bindings/firmware/meson-sm.h new file mode 100644 index 0000000..3a52a13 --- /dev/null +++ b/include/dt-bindings/firmware/meson-sm.h @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2016 Endless Mobile, Inc. + * Author: Carlo Caione <carlo@endlessm.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _MESON_DT_H_ +#define _MESON_DT_H_ + +#define SM_EFUSE_READ 0 +#define SM_EFUSE_WRITE 1 +#define SM_EFUSE_USER_MAX 2 + +#endif /* _MESON_DT_H_ */ diff --git a/include/linux/firmware/meson/meson-sm.h b/include/linux/firmware/meson/meson-sm.h new file mode 100644 index 0000000..1589c97 --- /dev/null +++ b/include/linux/firmware/meson/meson-sm.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2016 Endless Mobile, Inc. + * Author: Carlo Caione <carlo@endlessm.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _MESON_SM_H_ +#define _MESON_SM_H_ + +#include <linux/types.h> +#include <linux/of_device.h> + +struct meson_sm_cmd { + unsigned int index; + u32 smc_id; +}; +#define CMD(d, s) { .index = (d), .smc_id = (s), } + +struct meson_sm_chip { + unsigned int mem_size; + u32 cmd_sharemem_in_base; + u32 cmd_sharemem_out_base; + struct meson_sm_cmd cmd[]; +}; + +struct meson_sm_firmware { + struct device *dev; + const struct meson_sm_chip *chip; + void __iomem *sm_sharemem_in_base; + void __iomem *sm_sharemem_out_base; +}; + +u32 meson_sm_call(struct meson_sm_firmware *fw, unsigned int cmd_index, + u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); +u32 meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer, + unsigned int b_size, unsigned int cmd_index, + u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); +u32 meson_sm_call_read(struct meson_sm_firmware *fw, void *buffer, + unsigned int cmd_index, u32 arg0, u32 arg1, + u32 arg2, u32 arg3, u32 arg4); +struct meson_sm_firmware *meson_sm_get_fw(struct device_node *firmware_node); + +#endif /* _MESON_SM_H_ */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 1/3] firmware: Amlogic: Add secure monitor driver 2016-05-25 20:18 ` [PATCH v4 1/3] firmware: Amlogic: Add " Carlo Caione @ 2016-05-26 7:17 ` Neil Armstrong 2016-05-26 7:45 ` Carlo Caione 0 siblings, 1 reply; 7+ messages in thread From: Neil Armstrong @ 2016-05-26 7:17 UTC (permalink / raw) To: linux-arm-kernel Hi Carlo, On 05/25/2016 10:18 PM, Carlo Caione wrote: > diff --git a/include/dt-bindings/firmware/meson-sm.h b/include/dt-bindings/firmware/meson-sm.h > new file mode 100644 > index 0000000..3a52a13 > --- /dev/null > +++ b/include/dt-bindings/firmware/meson-sm.h > @@ -0,0 +1,20 @@ > +/* > + * Copyright (C) 2016 Endless Mobile, Inc. > + * Author: Carlo Caione <carlo@endlessm.com> > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * version 2 as published by the Free Software Foundation. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef _MESON_DT_H_ > +#define _MESON_DT_H_ > + > +#define SM_EFUSE_READ 0 > +#define SM_EFUSE_WRITE 1 > +#define SM_EFUSE_USER_MAX 2 > + > +#endif /* _MESON_DT_H_ */ Now this has been refactored, I don't see the point of this dt-bindings header ? These defines should take place in linux/firmware/meson/meson-sm.h Neil ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 1/3] firmware: Amlogic: Add secure monitor driver 2016-05-26 7:17 ` Neil Armstrong @ 2016-05-26 7:45 ` Carlo Caione 0 siblings, 0 replies; 7+ messages in thread From: Carlo Caione @ 2016-05-26 7:45 UTC (permalink / raw) To: linux-arm-kernel On 26/05/16 09:17, Neil Armstrong wrote: > Hi Carlo, Hi Neil, > On 05/25/2016 10:18 PM, Carlo Caione wrote: > > diff --git a/include/dt-bindings/firmware/meson-sm.h b/include/dt-bindings/firmware/meson-sm.h > > new file mode 100644 > > index 0000000..3a52a13 > > --- /dev/null > > +++ b/include/dt-bindings/firmware/meson-sm.h > > @@ -0,0 +1,20 @@ > > +/* > > + * Copyright (C) 2016 Endless Mobile, Inc. > > + * Author: Carlo Caione <carlo@endlessm.com> > > + * > > + * This program is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU General Public License > > + * version 2 as published by the Free Software Foundation. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > > + */ > > + > > +#ifndef _MESON_DT_H_ > > +#define _MESON_DT_H_ > > + > > +#define SM_EFUSE_READ 0 > > +#define SM_EFUSE_WRITE 1 > > +#define SM_EFUSE_USER_MAX 2 > > + > > +#endif /* _MESON_DT_H_ */ > > Now this has been refactored, I don't see the point of this dt-bindings header ? > > These defines should take place in linux/firmware/meson/meson-sm.h Yes, that is a possibility I considered before submitting this version and now it also seems probably the best way to do it. I'll change it in the next revision. Thanks, -- Carlo Caione ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 2/3] documentation: Add secure monitor binding documentation 2016-05-25 20:18 [PATCH v4 0/3] Add Amlogic secure monitor driver Carlo Caione 2016-05-25 20:18 ` [PATCH v4 1/3] firmware: Amlogic: Add " Carlo Caione @ 2016-05-25 20:18 ` Carlo Caione 2016-05-26 7:20 ` Neil Armstrong 2016-05-25 20:18 ` [PATCH v4 3/3] ARM64: dts: amlogic: gxbb: Enable secure monitor Carlo Caione 2 siblings, 1 reply; 7+ messages in thread From: Carlo Caione @ 2016-05-25 20:18 UTC (permalink / raw) To: linux-arm-kernel From: Carlo Caione <carlo@endlessm.com> Add the binding documentation for the Amlogic secure monitor driver. Signed-off-by: Carlo Caione <carlo@endlessm.com> --- .../bindings/firmware/meson/meson_sm.txt | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt diff --git a/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt new file mode 100644 index 0000000..896758d --- /dev/null +++ b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt @@ -0,0 +1,42 @@ +* Amlogic Secure Monitor + +In the Amlogic SoCs the Secure Monitor code is used to provide access to the +NVMEM, enable JTAG, set USB boot, etc... + +Required properties for the secure monitor node: +- compatible: Should be "amlogic,meson-gxbb-sm" + +Example: + + #include <dt-bindings/firmware/meson-sm.h> + + ... + + firmware { + compatible = "simple-bus"; + + sm: secure-monitor { + compatible = "amlogic,meson-gxbb-sm"; + }; + }; + +Node of a device using the secure monitor must have a custom property to +specify the SMC32 function ID the driver is going to use. + +Example of the node using the secure monitor: + + #include <dt-bindings/firmware/meson-sm.h> + + ... + + efuse: efuse { + compatible = "amlogic,meson-gxbb-efuse"; + secure-monitor = <&sm>; + amlogic,sm-cmd-read-efuse = <SM_EFUSE_READ>; + amlogic,sm-cmd-max-efuse = <SM_EFUSE_USER_MAX>; + #address-cells = <1>; + #size-cells = <1>; + + ... + }; + -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v4 2/3] documentation: Add secure monitor binding documentation 2016-05-25 20:18 ` [PATCH v4 2/3] documentation: Add secure monitor binding documentation Carlo Caione @ 2016-05-26 7:20 ` Neil Armstrong 0 siblings, 0 replies; 7+ messages in thread From: Neil Armstrong @ 2016-05-26 7:20 UTC (permalink / raw) To: linux-arm-kernel Hi Carlo, On 05/25/2016 10:18 PM, Carlo Caione wrote: > From: Carlo Caione <carlo@endlessm.com> > > Add the binding documentation for the Amlogic secure monitor driver. > > Signed-off-by: Carlo Caione <carlo@endlessm.com> > --- > .../bindings/firmware/meson/meson_sm.txt | 42 ++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > create mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt > > diff --git a/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt > new file mode 100644 > index 0000000..896758d > --- /dev/null > +++ b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt > @@ -0,0 +1,42 @@ > +* Amlogic Secure Monitor > + > +In the Amlogic SoCs the Secure Monitor code is used to provide access to the > +NVMEM, enable JTAG, set USB boot, etc... > + > +Required properties for the secure monitor node: > +- compatible: Should be "amlogic,meson-gxbb-sm" > + > +Example: > + > + #include <dt-bindings/firmware/meson-sm.h> > + > + ... > + > + firmware { > + compatible = "simple-bus"; > + > + sm: secure-monitor { > + compatible = "amlogic,meson-gxbb-sm"; > + }; > + }; > + > +Node of a device using the secure monitor must have a custom property to > +specify the SMC32 function ID the driver is going to use. > + > +Example of the node using the secure monitor: > + > + #include <dt-bindings/firmware/meson-sm.h> > + > + ... > + > + efuse: efuse { > + compatible = "amlogic,meson-gxbb-efuse"; > + secure-monitor = <&sm>; > + amlogic,sm-cmd-read-efuse = <SM_EFUSE_READ>; > + amlogic,sm-cmd-max-efuse = <SM_EFUSE_USER_MAX>; Same here, since the compatible is "gxbb" specific, there is no need for these properties, and so no need for the dt-bindings header. > + #address-cells = <1>; > + #size-cells = <1>; > + > + ... > + }; > + > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 3/3] ARM64: dts: amlogic: gxbb: Enable secure monitor 2016-05-25 20:18 [PATCH v4 0/3] Add Amlogic secure monitor driver Carlo Caione 2016-05-25 20:18 ` [PATCH v4 1/3] firmware: Amlogic: Add " Carlo Caione 2016-05-25 20:18 ` [PATCH v4 2/3] documentation: Add secure monitor binding documentation Carlo Caione @ 2016-05-25 20:18 ` Carlo Caione 2 siblings, 0 replies; 7+ messages in thread From: Carlo Caione @ 2016-05-25 20:18 UTC (permalink / raw) To: linux-arm-kernel From: Carlo Caione <carlo@endlessm.com> Add the secure monitor node in the Amlogic Meson GXBB DTSI file to enable it. Signed-off-by: Carlo Caione <carlo@endlessm.com> --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 76b3b6d..735a751 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -44,6 +44,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/gpio/meson-gxbb-gpio.h> +#include <dt-bindings/firmware/meson-sm.h> / { compatible = "amlogic,meson-gxbb"; @@ -98,6 +99,14 @@ method = "smc"; }; + firmware { + compatible = "simple-bus"; + + sm: secure-monitor { + compatible = "amlogic,meson-gxbb-sm"; + }; + }; + timer { compatible = "arm,armv8-timer"; interrupts = <GIC_PPI 13 -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-05-26 7:45 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-05-25 20:18 [PATCH v4 0/3] Add Amlogic secure monitor driver Carlo Caione 2016-05-25 20:18 ` [PATCH v4 1/3] firmware: Amlogic: Add " Carlo Caione 2016-05-26 7:17 ` Neil Armstrong 2016-05-26 7:45 ` Carlo Caione 2016-05-25 20:18 ` [PATCH v4 2/3] documentation: Add secure monitor binding documentation Carlo Caione 2016-05-26 7:20 ` Neil Armstrong 2016-05-25 20:18 ` [PATCH v4 3/3] ARM64: dts: amlogic: gxbb: Enable secure monitor Carlo Caione
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).