From patchwork Thu Nov 2 07:49:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viacheslav X-Patchwork-Id: 740550 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 CBB0963DB for ; Thu, 2 Nov 2023 07:49:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="XXDo3QUD" Received: from mx.msync.work (mx.msync.work [62.182.159.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACBD6102; Thu, 2 Nov 2023 00:49:26 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 25750147B80; Thu, 2 Nov 2023 07:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1698911364; h=from:subject:date:message-id:to:mime-version: content-transfer-encoding:in-reply-to:references; bh=cD6HIvwS1+eD7lmzk4U069SbWiB68SgbaID0yXccmhM=; b=XXDo3QUDQez6r8fp1+UL4OuCuhJxp2tWksc8eDpgFkHOaUPxZJmoa2+uMCxI5iTvhJknNt t1x3grkVoj+J7HAnFgMqjusL1kqqsSE+jw5avzCrhUfSgMcLwbbUpNod1Yx0ysl1s3sI5G WbWE6IDGiJuNqYaJSgsAN/38CTqhT6dwlqmEHzLb7EZzT3FKdYzCsILoDyT42qMeGxLRPt DWDGpmYr3M79+0X97AwRpev0DNOthfXdFNMtzclvZG9X2BWqJnjV4mdUxiJwv4pfMiU99r 2crUzil/ADrHYLiCALecVnT5Kj5DsE0OnN/8toOwhpcVAoBCStukjn9c3wCYKg== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Martin Blumenstingl , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 1/4] firmware: meson-sm: change sprintf to scnprintf Date: Thu, 2 Nov 2023 10:49:13 +0300 Message-Id: <20231102074916.3280809-2-adeep@lexina.in> In-Reply-To: <20231102074916.3280809-1-adeep@lexina.in> References: <20231102074916.3280809-1-adeep@lexina.in> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Update sprintf in serial_show frunction to scnprintf command to prevent sysfs buffer overflow (buffer always is PAGE_SIZE bytes). Signed-off-by: Viacheslav Bocharov --- drivers/firmware/meson/meson_sm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index ed60f1103053..c1c694b485ee 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -265,7 +265,7 @@ static ssize_t serial_show(struct device *dev, struct device_attribute *attr, return ret; } - ret = sprintf(buf, "%12phN\n", &id_buf[SM_CHIP_ID_OFFSET]); + ret = scnprintf(buf, PAGE_SIZE, "%12phN\n", &id_buf[SM_CHIP_ID_OFFSET]); kfree(id_buf); From patchwork Thu Nov 2 07:49:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viacheslav X-Patchwork-Id: 740548 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 2DA3763DE for ; Thu, 2 Nov 2023 07:49:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="M+uw87Mk" Received: from mx.msync.work (mx.msync.work [62.182.159.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6E6D128; Thu, 2 Nov 2023 00:49:26 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id BBE92147B81; Thu, 2 Nov 2023 07:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1698911364; h=from:subject:date:message-id:to:mime-version: content-transfer-encoding:in-reply-to:references; bh=7g9Pd3xFizPczsPF4psnwonGnJy6OcmmDqrxbFQxHFA=; b=M+uw87MkkWBDPTm4zcqCcvkJd1HPT1Mp+O3c6qIgnCLra9izQxIQo39ejYoKlNdR9sdnwU TDxY8sJRRkQeTJYXryyBrXgbOZuZwHGbbWSMFa9cA6S4mRdGXIQbtwUr58eEuO32ceqwkY MS2gNiBWZ9r1RVH/1URcfdsseaU0QvUNGL+Vx6Z1rGAVuue3J8oetuCMprR+f2lOnrCrcb vp0GgTtcpBBLxiEQ4w0kLqOeYEMJnYEopdtGWIeoEQg7YFRbV4hITOZGCZDlQvZz/aLaHR 70WDEDufucemByUhdBL/q4Y3uZd3NCq1h/8EY+s402mHOB253Tfa6EIBCXt4Zg== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Martin Blumenstingl , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 2/4] firmware: meson_sm: Add chipid number sysfs entry Date: Thu, 2 Nov 2023 10:49:14 +0300 Message-Id: <20231102074916.3280809-3-adeep@lexina.in> In-Reply-To: <20231102074916.3280809-1-adeep@lexina.in> References: <20231102074916.3280809-1-adeep@lexina.in> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 The Amlogic Meson SoC Secure Monitor implements a call to retrieve an unique CHIP ID with CPU ID (128 bits length) starting from the GX Family and all new families. The chipid string is simply exposed as a sysfs entry under the firmware sysfs directory. Signed-off-by: Viacheslav Bocharov --- drivers/firmware/meson/meson_sm.c | 54 ++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index c1c694b485ee..2820f4ac871b 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -240,9 +240,10 @@ struct meson_sm_firmware *meson_sm_get(struct device_node *sm_node) } EXPORT_SYMBOL_GPL(meson_sm_get); -#define SM_CHIP_ID_LENGTH 119 +#define SM_CHIP_ID_LENGTH 128 #define SM_CHIP_ID_OFFSET 4 #define SM_CHIP_ID_SIZE 12 +#define SM_CHIP_IDv2_SIZE 16 static ssize_t serial_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -274,8 +275,59 @@ static ssize_t serial_show(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR_RO(serial); +static ssize_t chipid_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct platform_device *pdev = to_platform_device(dev); + struct meson_sm_firmware *fw; + uint8_t *id_buf; + int ret; + + fw = platform_get_drvdata(pdev); + + id_buf = kmalloc(SM_CHIP_ID_LENGTH, GFP_KERNEL); + if (!id_buf) + return -ENOMEM; + + ret = meson_sm_call_read(fw, id_buf, SM_CHIP_ID_LENGTH, SM_GET_CHIP_ID, + 2, 0, 0, 0, 0); + if (ret < 0) { + kfree(id_buf); + return ret; + } + + int version = *((unsigned int *)id_buf); + + if (version == 2) + ret = scnprintf(buf, PAGE_SIZE, "%16phN\n", &id_buf[SM_CHIP_ID_OFFSET]); + else { + /** + * Legacy 12-byte chip ID read out, transform data + * to expected order format. + */ + uint8_t *buff; + + buff = kmalloc(SM_CHIP_ID_LENGTH, GFP_KERNEL); + if (!buff) + return -ENOMEM; + ((uint32_t *)buff)[0] = 0; // CPU_ID is empty + /* Transform into expected order for display */ + ch = (uint8_t *)(id_buf + 4); + for (i = 0; i < 12; i++) + buff[i + 4] = ch[11 - i]; + ret = scnprintf(buf, PAGE_SIZE, "%16phN\n", &buff); + kfree(buff); + } + + kfree(id_buf); + return ret; +} + +static DEVICE_ATTR_RO(chipid); + static struct attribute *meson_sm_sysfs_attributes[] = { &dev_attr_serial.attr, + &dev_attr_chipid.attr, NULL, }; From patchwork Thu Nov 2 07:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viacheslav X-Patchwork-Id: 740549 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 487886AB8 for ; Thu, 2 Nov 2023 07:49:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="HWBp2KY7" Received: from mx.msync.work (mx.msync.work [62.182.159.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 247E212B; Thu, 2 Nov 2023 00:49:27 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0DC4F147AB2; Thu, 2 Nov 2023 07:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1698911365; h=from:subject:date:message-id:to:mime-version: content-transfer-encoding:in-reply-to:references; bh=8Xr/QweSmgY7p0LBTNCDzfvzvoqHoF5yll89vV6bmZg=; b=HWBp2KY7I80PU4n4CtgZLFQoURpXPvDGu6OdKU5iycx0g+S4FtILtkBU9671+oV8PNuLG8 hSPz04sYvUBGo8Um0j2QOafAylCkZiMhTehtGrc0Qo+Wx7s+V4WlLoPsQ4J6F9NuXaB/k4 DnPVjxzyO8NKz7VPxEyps1+FwvsjJxT7PKGtJlZvQ5jzGNgHkNDSTJSAyiciLxmtBxDpyk ZGJE4S4W0FmmvuqUcSpYmbIMOAHCi36a455PzlAyYu1xmE70vuIVb1GO3qQmjX8d1ddNUC GeqOOxSmmLhZ1kzqkveRn6wP0H90y7HIxs/1JNP1UR67+xnX6Sk88PaMMVS/Ow== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Martin Blumenstingl , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 3/4] soc: amlogic: meson-gx-socinfo: export socinfo for use in other modules Date: Thu, 2 Nov 2023 10:49:15 +0300 Message-Id: <20231102074916.3280809-4-adeep@lexina.in> In-Reply-To: <20231102074916.3280809-1-adeep@lexina.in> References: <20231102074916.3280809-1-adeep@lexina.in> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Move socinfo variable to global scope and export it as meson_gx_socinfo. Signed-off-by: Viacheslav Bocharov --- drivers/soc/amlogic/meson-gx-socinfo.c | 34 +++++++++++++++----------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c index 6abb730344ab..0517f96a383b 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -24,6 +24,10 @@ #define SOCINFO_MINOR GENMASK(15, 8) #define SOCINFO_MISC GENMASK(7, 0) + +unsigned int meson_gx_socinfo; +EXPORT_SYMBOL(meson_gx_socinfo); + static const struct meson_gx_soc_id { const char *name; unsigned int id; @@ -131,10 +135,10 @@ static int __init meson_gx_socinfo_init(void) struct soc_device *soc_dev; struct device_node *np; struct regmap *regmap; - unsigned int socinfo; struct device *dev; int ret; + meson_gx_socinfo = 0; /* look up for chipid node */ np = of_find_compatible_node(NULL, NULL, "amlogic,meson-gx-ao-secure"); if (!np) @@ -160,11 +164,13 @@ static int __init meson_gx_socinfo_init(void) return -ENODEV; } - ret = regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &socinfo); - if (ret < 0) + ret = regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &meson_gx_socinfo); + if (ret < 0) { + meson_gx_socinfo = 0; return ret; + } - if (!socinfo) { + if (!meson_gx_socinfo) { pr_err("%s: invalid chipid value\n", __func__); return -EINVAL; } @@ -175,13 +181,13 @@ static int __init meson_gx_socinfo_init(void) soc_dev_attr->family = "Amlogic Meson"; soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%x:%x - %x:%x", - socinfo_to_major(socinfo), - socinfo_to_minor(socinfo), - socinfo_to_pack(socinfo), - socinfo_to_misc(socinfo)); + socinfo_to_major(meson_gx_socinfo), + socinfo_to_minor(meson_gx_socinfo), + socinfo_to_pack(meson_gx_socinfo), + socinfo_to_misc(meson_gx_socinfo)); soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%s (%s)", - socinfo_to_soc_id(socinfo), - socinfo_to_package_id(socinfo)); + socinfo_to_soc_id(meson_gx_socinfo), + socinfo_to_package_id(meson_gx_socinfo)); soc_dev = soc_device_register(soc_dev_attr); if (IS_ERR(soc_dev)) { @@ -194,10 +200,10 @@ static int __init meson_gx_socinfo_init(void) dev_info(dev, "Amlogic Meson %s Revision %x:%x (%x:%x) Detected\n", soc_dev_attr->soc_id, - socinfo_to_major(socinfo), - socinfo_to_minor(socinfo), - socinfo_to_pack(socinfo), - socinfo_to_misc(socinfo)); + socinfo_to_major(meson_gx_socinfo), + socinfo_to_minor(meson_gx_socinfo), + socinfo_to_pack(meson_gx_socinfo), + socinfo_to_misc(meson_gx_socinfo)); return 0; }