| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 21 May 2024 09:32:48 +0200
From: Neil Armstrong <neil.armstrong@...aro.org>
To: Viacheslav Bocharov <adeep@...ina.in>, Kevin Hilman
<khilman@...libre.com>, Jerome Brunet <jbrunet@...libre.com>,
Martin Blumenstingl <martin.blumenstingl@...glemail.com>,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-amlogic@...ts.infradead.org
Cc: Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>
Subject: Re: [PATCH v4 2/4] soc: amlogic: meson-gx-socinfo-sm: Add Amlogic
secure-monitor SoC Information driver
HI,
On 16/05/2024 13:26, Viacheslav Bocharov wrote:
> Amlogic SoCs have a SoC information secure-monitor call for SoC type,
> package type, revision information and chipid.
> This patchs adds support for secure-monitor call decoding and exposing
> with the SoC bus infrastructure in addition to the previous SoC
> Information driver.
>
> Signed-off-by: Viacheslav Bocharov <adeep@...ina.in>
> ---
> drivers/soc/amlogic/Kconfig | 10 ++
> drivers/soc/amlogic/Makefile | 1 +
> drivers/soc/amlogic/meson-gx-socinfo-sm.c | 189 ++++++++++++++++++++++
> 3 files changed, 200 insertions(+)
> create mode 100644 drivers/soc/amlogic/meson-gx-socinfo-sm.c
>
> diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig
> index d08e398bdad4..82fc77ca3b4b 100644
> --- a/drivers/soc/amlogic/Kconfig
> +++ b/drivers/soc/amlogic/Kconfig
> @@ -26,6 +26,16 @@ config MESON_GX_SOCINFO
> Say yes to support decoding of Amlogic Meson GX SoC family
> information about the type, package and version.
>
> +config MESON_GX_SOCINFO_SM
> + bool "Amlogic Meson GX SoC Information driver via Secure Monitor"
> + depends on (ARM64 && ARCH_MESON || COMPILE_TEST) && MESON_SM=y
> + default ARCH_MESON && MESON_SM
> + select SOC_BUS
> + help
> + Say yes to support decoding of Amlogic Meson GX SoC family
> + information about the type, package and version via secure
> + monitor call.
> +
> config MESON_MX_SOCINFO
> bool "Amlogic Meson MX SoC Information driver"
> depends on (ARM && ARCH_MESON) || COMPILE_TEST
> diff --git a/drivers/soc/amlogic/Makefile b/drivers/soc/amlogic/Makefile
> index c25f835e6a26..45d9d6f5904c 100644
> --- a/drivers/soc/amlogic/Makefile
> +++ b/drivers/soc/amlogic/Makefile
> @@ -2,4 +2,5 @@
> obj-$(CONFIG_MESON_CANVAS) += meson-canvas.o
> obj-$(CONFIG_MESON_CLK_MEASURE) += meson-clk-measure.o
> obj-$(CONFIG_MESON_GX_SOCINFO) += meson-gx-socinfo.o
> +obj-$(CONFIG_MESON_GX_SOCINFO_SM) += meson-gx-socinfo-sm.o
> obj-$(CONFIG_MESON_MX_SOCINFO) += meson-mx-socinfo.o
> diff --git a/drivers/soc/amlogic/meson-gx-socinfo-sm.c b/drivers/soc/amlogic/meson-gx-socinfo-sm.c
> new file mode 100644
> index 000000000000..22acd92bb830
> --- /dev/null
> +++ b/drivers/soc/amlogic/meson-gx-socinfo-sm.c
> @@ -0,0 +1,189 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (c) 2017 BayLibre, SAS
> + * Copyright (c) 2024 JetHome
> + * Author: Neil Armstrong <neil.armstrong@...aro.org>
> + * Author: Viacheslav Bocharov <adeep@...ina.in>
> + *
> + */
> +
> +#include <linux/io.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <linux/slab.h>
> +#include <linux/sys_soc.h>
> +#include <linux/regmap.h>
> +#include <linux/mfd/syscon.h>
> +
> +#include <linux/firmware/meson/meson_sm.h>
> +
> +#include "meson-gx-socinfo-internal.h"
> +
> +static char *socinfo_get_chipid(struct device *dev, struct meson_sm_firmware *fw,
> + union meson_cpu_id *socinfo)
> +{
> + char *buf;
> + struct meson_sm_chip_id *id_buf;
> + int ret;
> +
> + id_buf = kzalloc(sizeof(struct meson_sm_chip_id)+1, GFP_KERNEL);
> + if (!id_buf)
> + return NULL;
> +
> + ret = meson_sm_call_read(fw, id_buf, sizeof(struct meson_sm_chip_id), SM_GET_CHIP_ID,
> + 2, 0, 0, 0, 0);
> + if (ret < 0) {
> + kfree(id_buf);
> + return NULL;
> + }
> + dev_info(dev, "got sm version call %i\n", id_buf->version);
> +
> + if (id_buf->version != 2) {
> +
> + u8 tmp;
> + /**
> + * Legacy 12-byte chip ID read out, transform data
> + * to expected order format
> + */
> + memmove((void *)&id_buf->serial, (void *)&id_buf->cpu_id, 12);
> + for (int i = 0; i < 6; i++) {
> + tmp = id_buf->serial[i];
> + id_buf->serial[i] = id_buf->serial[11 - i];
> + id_buf->serial[11 - i] = tmp;
> + }
> + id_buf->cpu_id.v2.major_id = socinfo->v1.major_id;
> + id_buf->cpu_id.v2.pack_id = socinfo->v1.pack_id;
> + id_buf->cpu_id.v2.chip_rev = socinfo->v1.chip_rev;
> + id_buf->cpu_id.v2.reserved = socinfo->v1.reserved;
> + id_buf->cpu_id.v2.layout_ver = socinfo->v1.layout_ver;
> + } else {
> + /**
> + * rewrite socinfo from regmap with value from secure monitor call
> + */
> + socinfo->v1.major_id = id_buf->cpu_id.v2.major_id;
> + socinfo->v1.pack_id = id_buf->cpu_id.v2.pack_id;
> + socinfo->v1.chip_rev = id_buf->cpu_id.v2.chip_rev;
> + socinfo->v1.reserved = id_buf->cpu_id.v2.reserved;
> + socinfo->v1.layout_ver = id_buf->cpu_id.v2.layout_ver;
> + }
> +
> + buf = kasprintf(GFP_KERNEL, "%4phN%12phN", &(id_buf->cpu_id), &(id_buf->serial));
> +
> + kfree(id_buf);
> +
> + return buf;
> +}
> +
> +static int meson_gx_socinfo_sm_probe(struct platform_device *pdev)
> +{
> + struct soc_device_attribute *soc_dev_attr;
> + struct soc_device *soc_dev;
> + struct device_node *sm_np;
> + struct meson_sm_firmware *fw;
> + struct regmap *regmap;
> + union meson_cpu_id socinfo;
> + struct device *dev;
> + int ret;
> +
> + /* check if chip-id is available */
> + if (!of_property_read_bool(pdev->dev.of_node, "amlogic,has-chip-id"))
> + return -ENODEV;
> +
> + /* node should be a syscon */
> + regmap = syscon_node_to_regmap(pdev->dev.of_node);
> + if (IS_ERR(regmap))
> + return dev_err_probe(&pdev->dev, PTR_ERR(regmap), "failed to get regmap\n");
> +
> + sm_np = of_parse_phandle(pdev->dev.of_node, "secure-monitor", 0);
> + if (!sm_np) {
> + dev_err(&pdev->dev, "no secure-monitor node found\n");
> + return -EINVAL;
> + }
> +
> + fw = meson_sm_get(sm_np);
> + of_node_put(sm_np);
> + if (!fw) {
> + dev_dbg(&pdev->dev, "secure-monitor device not ready, probe later\n");
> + return -EPROBE_DEFER;
> + }
> +
> + ret = regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &socinfo.raw);
> + if (ret < 0)
> + return ret;
> +
> + if (!socinfo.raw) {
> + dev_err(&pdev->dev, "invalid regmap chipid value\n");
> + return -EINVAL;
> + }
> +
> + soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr),
> + GFP_KERNEL);
> + if (!soc_dev_attr)
> + return -ENOMEM;
> +
> + soc_dev_attr->serial_number = socinfo_get_chipid(&pdev->dev, fw, &socinfo);
> +
> + soc_dev_attr->family = "Amlogic Meson";
> + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%x:%x - %x:%x",
> + socinfo.v1.major_id,
> + socinfo.v1.chip_rev,
> + socinfo.v1.pack_id,
> + (socinfo.v1.reserved<<4) + socinfo.v1.layout_ver);
> + soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%s (%s)",
> + socinfo_v1_to_soc_id(socinfo),
> + socinfo_v1_to_package_id(socinfo));
> +
> + soc_dev = soc_device_register(soc_dev_attr);
> +
> +
> + if (IS_ERR(soc_dev)) {
> + kfree(soc_dev_attr->revision);
> + kfree_const(soc_dev_attr->soc_id);
> + return PTR_ERR(soc_dev);
> + }
> +
> + dev = soc_device_to_device(soc_dev);
> + platform_set_drvdata(pdev, soc_dev);
> +
> + dev_info(dev, "Amlogic Meson %s Revision %x:%x (%x:%x) Detected (SM)\n",
> + soc_dev_attr->soc_id,
> + socinfo.v1.major_id,
> + socinfo.v1.chip_rev,
> + socinfo.v1.pack_id,
> + (socinfo.v1.reserved<<4) + socinfo.v1.layout_ver);
> +
> + return PTR_ERR_OR_ZERO(dev);
> +}
> +
> +
> +static int meson_gx_socinfo_sm_remove(struct platform_device *pdev)
> +{
> + struct soc_device *soc_dev = platform_get_drvdata(pdev);
> +
> + soc_device_unregister(soc_dev);
> + return 0;
> +}
> +
> +static const struct of_device_id meson_gx_socinfo_match[] = {
> + { .compatible = "amlogic,meson-gx-ao-secure", },
> + { /* sentinel */ },
> +};
> +MODULE_DEVICE_TABLE(of, meson_gx_socinfo_match);
> +
> +static struct platform_driver meson_gx_socinfo_driver = {
> + .probe = meson_gx_socinfo_sm_probe,
> + .remove = meson_gx_socinfo_sm_remove,
> + .driver = {
> + .name = "meson-gx-socinfo-sm",
> + .of_match_table = meson_gx_socinfo_match,
> + },
> +};
> +
> +
> +module_platform_driver(meson_gx_socinfo_driver);
> +
> +MODULE_AUTHOR("Viacheslav Bocharov <adeep@...ina.in>");
> +MODULE_DESCRIPTION("Amlogic Meson GX SOC SM driver");
> +MODULE_LICENSE("GPL");
I get this while building :
In file included from ./include/linux/string.h:374,
from ./include/linux/bitmap.h:13,
from ./include/linux/cpumask.h:13,
from ./arch/arm64/include/asm/cpufeature.h:27,
from ./arch/arm64/include/asm/ptrace.h:11,
from ./arch/arm64/include/asm/irqflags.h:9,
from ./include/linux/irqflags.h:18,
from ./include/linux/spinlock.h:59,
from ./include/linux/kref.h:16,
from ./include/linux/mm_types.h:8,
from ./include/linux/page-flags.h:13,
from ./arch/arm64/include/asm/mte.h:15,
from ./arch/arm64/include/asm/pgtable.h:12,
from ./include/linux/pgtable.h:6,
from ./arch/arm64/include/asm/io.h:12,
from ./include/linux/io.h:14,
from drivers/soc/amlogic/meson-gx-socinfo-sm.c:10:
In function ‘fortify_memcpy_chk’,
inlined from ‘socinfo_get_chipid’ at drivers/soc/amlogic/meson-gx-socinfo-sm.c:50:3:
/include/linux/fortify-string.h:566:25: error: call to ‘__read_overflow2_field’ declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror=attribute-warning]
566 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Neil
Powered by blists - more mailing lists