From patchwork Wed Feb 21 14:36:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viacheslav X-Patchwork-Id: 204261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1099929dyc; Wed, 21 Feb 2024 07:14:23 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXZqP7ER9X/n2nlhyeO8/YR1lnscvUx+Az07jgb1VDno1U0qJPkC+nWtvDW98mqfpvP4hZwtej4ixevM5wTh1rS4s19Kw== X-Google-Smtp-Source: AGHT+IGATj8YsEbc2O1wPdULzUq9WLV862d7/4vgG3gGxkbeXJQLuWtAO9zejdEQkK9zLCIoZO7g X-Received: by 2002:a05:6359:4c21:b0:17b:5712:70f2 with SMTP id kj33-20020a0563594c2100b0017b571270f2mr2978177rwc.11.1708528463439; Wed, 21 Feb 2024 07:14:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708528463; cv=pass; d=google.com; s=arc-20160816; b=TkW0tAsMXb15lNYlDGHgjkOEBdsNO+mGCffi1BoMFWIB5eDx2zCjG0lrKBoRrpSTKb p+if6g7uR9FXPdtgvUuXgQZbixQ1TME5uLt6bZiBJK1LJl/xY4mEi3+jbb0ME6zS0MCn sgme0+cqTZDFh//gnOX+TMt6ZvPBWI4Y6uTvVmnZPM9qFrzw08Wd8Ul1oCGqYjM/biTC sGYeGBcOQWdPeodr47suffGNOhoFCdhw9j1Z1q8d/gYGaXc6gROgTA7wXvjyf8u5HF6E X9//QU4lWcdnRa/H6LpLQJ6Q2ZGnFuHGXnNrmO/YlrxCgqbA0Qn1WG7MSzosTPt7Hsrj Dh3w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=i0Y68y9QYfs+ZNLFMH9hJGuFHOG8YfS2qWD0cNE1Ctk=; fh=6ye5sfpe/TM9xWizQQ3lHI+o0LQSsxWMiDp3fZRYvv8=; b=hq8+kNCFoHy+DH8LtHVIrM+ldIEABHOQaELSLTZru9vqvzfW5Fc6GyXHDkTrrqwAPd 4FDqtMeVLool4Yv2EKe23Xnw+NkwJH50hv/gs5WvL2gmzcFccNXeoGemfGycr6/7xuqD oLAzDcjEe14x1ezQM4Cxk4zDcHkPLLiLzRMA1kdnL+/GPgYtgTPRcYlWSOhgX1LNTtLZ BuXehy8GlBmQOPValmTAjVuq2uf+2kX3WVkKhZCja8qrTv+0Wm3XYbSSyFC1d5ojypGi Hy3kLYR6xZCQLATTwzY7WJWnjByUkp0ojz94+sq7oU9bbBKjar93kayqC4Hrm3VyARdS lPPg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@lexina.in header.s=dkim header.b=tqC+zxYw; arc=pass (i=1 spf=pass spfdomain=lexina.in dkim=pass dkdomain=lexina.in dmarc=pass fromdomain=lexina.in); spf=pass (google.com: domain of linux-kernel+bounces-74933-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74933-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=lexina.in Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id dq14-20020a056a020f8e00b005d8b30f48b6si8341146pgb.652.2024.02.21.07.14.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 07:14:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-74933-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@lexina.in header.s=dkim header.b=tqC+zxYw; arc=pass (i=1 spf=pass spfdomain=lexina.in dkim=pass dkdomain=lexina.in dmarc=pass fromdomain=lexina.in); spf=pass (google.com: domain of linux-kernel+bounces-74933-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-74933-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=lexina.in Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id A350AB283C1 for ; Wed, 21 Feb 2024 14:47:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2DA097FBD9; Wed, 21 Feb 2024 14:46:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="tqC+zxYw" Received: from mx.msync.work (mx.msync.work [62.182.159.68]) (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 6C6247EF03 for ; Wed, 21 Feb 2024 14:46:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=62.182.159.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708526780; cv=none; b=dRLJH6eMSoRc77Gz1umN9ElhityTTGStCM5JI68+gFruaQe6Kd+/TcRMJDizRa0Yh24O48FRP/JycgP92PQGwiHGJAwutEo7lH2b0u20magQTxQf7V+jp70ecoUGsXkliMNXOABRAcUAnc8gXzHBUCM77mHcjN3joGWTYr8pXk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708526780; c=relaxed/simple; bh=cA8iHN/xtQQau0sH/hngxWc02vGobYEeTWflxOyub4s=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZweDXXUMnp/5MEfUJoR/lLevVKFv9sOr/+ql+CTjI30mcbkGjaJEVfejrq+jdtc8ZyajBxg8VZfXchQ7FCSkofCyUGWSBRPVTT1d2ocFvbI3MOm8/3Bjvv3REG53XCtax4YHxK7+KfEoQ9n2IrzjqETd3Iyf4yQIAhsH6Wk11zE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in; spf=pass smtp.mailfrom=lexina.in; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b=tqC+zxYw; arc=none smtp.client-ip=62.182.159.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lexina.in Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 216E510D6F2; Wed, 21 Feb 2024 14:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1708526226; h=from:subject:date:message-id:to:mime-version: content-transfer-encoding:in-reply-to:references; bh=i0Y68y9QYfs+ZNLFMH9hJGuFHOG8YfS2qWD0cNE1Ctk=; b=tqC+zxYwCxS4jA4eJsGD2YjsBFC4lHwLuij/GMNdc2JbOuc0/NrpiOJQrW0l8zATtNoEOV a7T14c/NOjCxPN+LVTxXjAakGszfn+6pHOXFS2dJ75kAC0bKPIFOvCzWF65NcB/3naVFrk zIxaV879hZ4QIJ0kQ3r264wAaQ6EIL4F5ehYL2wEuYipboFk2L4G4MkT2Yrxb8pO4Gj0rf ioNP2InMMBSBV2tNMm2mBy8k93pL1735pqvlgcfvQsqou4HKtxaNWOSOSQnc4pmQRFZJwi 6nDMihkevezxY9qCabqQZDLHDM1XUrgFyqICPtvJFnhPeRF7jDn9u0pWrspPPg== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH v2 2/3] soc: amlogic: meson-gx-socinfo-sm: Add Amlogic secure-monitor SoC Information driver Date: Wed, 21 Feb 2024 17:36:15 +0300 Message-ID: <20240221143654.544444-3-adeep@lexina.in> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221143654.544444-1-adeep@lexina.in> References: <20240221143654.544444-1-adeep@lexina.in> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791521942073542206 X-GMAIL-MSGID: 1791521942073542206 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 --- drivers/soc/amlogic/Kconfig | 10 ++ drivers/soc/amlogic/Makefile | 1 + drivers/soc/amlogic/meson-gx-socinfo-sm.c | 192 ++++++++++++++++++++++ 3 files changed, 203 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..edb724e67968 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 && MESON_GX_SOCINFO && MESON_SM) || COMPILE_TEST + default MESON_GX_SOCINFO && 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..e30e1d2feb61 --- /dev/null +++ b/drivers/soc/amlogic/meson-gx-socinfo-sm.c @@ -0,0 +1,192 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2017 BayLibre, SAS + * Copyright (c) 2024 JetHome + * Author: Neil Armstrong + * Author: Viacheslav Bocharov + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#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 = devm_kzalloc(dev, 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)) { + dev_err(&pdev->dev, "failed to get regmap\n"); + return -ENODEV; + } + + 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 -ENODEV; + } + + fw = meson_sm_get(sm_np); + of_node_put(sm_np); + if (!fw) { + dev_info(&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); + kfree(soc_dev_attr); + 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 "); +MODULE_DESCRIPTION("Amlogic Meson GX SOC SM driver"); +MODULE_LICENSE("GPL");