From: Andrei Stefanescu <andrei.stefanescu@oss.nxp.com>
To: linus.walleij@linaro.org, brgl@bgdev.pl, robh@kernel.org,
krzk+dt@kernel.org, conor+dt@kernel.org, chester62515@gmail.com,
mbrugger@suse.com, Ghennadi.Procopciuc@nxp.com,
larisa.grigore@nxp.com, lee@kernel.org, shawnguo@kernel.org,
s.hauer@pengutronix.de, festevam@gmail.com, aisheng.dong@nxp.com,
ping.bai@nxp.com, gregkh@linuxfoundation.org, rafael@kernel.org,
srini@kernel.org
Cc: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, s32@nxp.com,
clizzi@redhat.com, aruizrui@redhat.com, eballetb@redhat.com,
echanude@redhat.com, kernel@pengutronix.de, imx@lists.linux.dev,
vincent.guittot@linaro.org,
Andrei Stefanescu <andrei.stefanescu@oss.nxp.com>
Subject: [PATCH v7 10/12] nvmem: s32g2_siul2: add NVMEM driver for SoC information
Date: Thu, 10 Jul 2025 17:20:33 +0300 [thread overview]
Message-ID: <20250710142038.1986052-11-andrei.stefanescu@oss.nxp.com> (raw)
In-Reply-To: <20250710142038.1986052-1-andrei.stefanescu@oss.nxp.com>
The SIUL2 hardware module has registers which expose information about
the given SoC (version, SRAM size, presence of some hw modules).
Signed-off-by: Andrei Stefanescu <andrei.stefanescu@oss.nxp.com>
---
drivers/mfd/nxp-siul2.c | 6 +-
drivers/nvmem/Kconfig | 10 ++
drivers/nvmem/Makefile | 2 +
drivers/nvmem/s32g2_siul2_nvmem.c | 232 ++++++++++++++++++++++++++++++
4 files changed, 249 insertions(+), 1 deletion(-)
create mode 100644 drivers/nvmem/s32g2_siul2_nvmem.c
diff --git a/drivers/mfd/nxp-siul2.c b/drivers/mfd/nxp-siul2.c
index 904f41b3c61b..edf643e4bcba 100644
--- a/drivers/mfd/nxp-siul2.c
+++ b/drivers/mfd/nxp-siul2.c
@@ -31,7 +31,11 @@
static const struct mfd_cell nxp_siul2_devs[] = {
{
.name = "s32g-siul2-pinctrl",
- }
+ },
+ {
+
+ .name = "s32g2-siul2-nvmem",
+ },
};
/**
diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index d370b2ad11e7..6efd23a2ee17 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -454,4 +454,14 @@ config NVMEM_QORIQ_EFUSE
This driver can also be built as a module. If so, the module
will be called nvmem_qoriq_efuse.
+config NVMEM_S32G2_SIUL2
+ tristate "S32G2 SIUL2 nvmem support: SoC revision"
+ depends on ARCH_S32 || COMPILE_TEST
+ default y
+ help
+ This is a driver to access hardware related data like SoC revision
+ for S32G2/S32G3 SoCs.
+
+ The revision information is retrieved from the SIUL2 module.
+
endif
diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile
index 2021d59688db..84fef48b7ff6 100644
--- a/drivers/nvmem/Makefile
+++ b/drivers/nvmem/Makefile
@@ -89,3 +89,5 @@ obj-$(CONFIG_NVMEM_ZYNQMP) += nvmem_zynqmp_nvmem.o
nvmem_zynqmp_nvmem-y := zynqmp_nvmem.o
obj-$(CONFIG_NVMEM_QORIQ_EFUSE) += nvmem-qoriq-efuse.o
nvmem-qoriq-efuse-y := qoriq-efuse.o
+obj-$(CONFIG_NVMEM_S32G2_SIUL2) += nvmem-s32g2-siul2.o
+nvmem-s32g2-siul2-y := s32g2_siul2_nvmem.o
diff --git a/drivers/nvmem/s32g2_siul2_nvmem.c b/drivers/nvmem/s32g2_siul2_nvmem.c
new file mode 100644
index 000000000000..bf62c8885ff5
--- /dev/null
+++ b/drivers/nvmem/s32g2_siul2_nvmem.c
@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2021-2025 NXP
+ */
+
+#include <linux/mfd/nxp-siul2.h>
+#include <linux/module.h>
+#include <linux/nvmem-provider.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+
+/* SoC revision */
+#define NVRAM_CELL_SIZE 4
+#define SIUL2_MIDR1_OFF (0x00000000)
+#define SIUL2_MIDR2_OFF (0x00000004)
+
+#define SIUL20_CELL(c) (c)
+#define SIUL21_CELL(c) (100u + (c))
+#define SOC_MAJOR_CELL_OFFSET SIUL20_CELL(0)
+#define SOC_MINOR_CELL_OFFSET SIUL20_CELL(1)
+#define PCIE_DEV_ID_CELL_OFFSET SIUL20_CELL(2)
+#define SERDES_PRESENCE_CELL_OFFSET SIUL21_CELL(0)
+
+/* SIUL20_MIDR1 masks */
+#define SIUL20_MIDR1_MINOR_MASK (0xF << 0)
+#define SIUL20_MIDR1_MAJOR_SHIFT (4)
+#define SIUL20_MIDR1_MAJOR_MASK (0xF << SIUL20_MIDR1_MAJOR_SHIFT)
+#define SIUL20_MIDR1_PART_NO_SHIFT (16)
+#define SIUL20_MIDR1_PART_NO_MASK GENMASK(25, 16)
+
+/* SIUL21_MIDR2 masks */
+#define SIUL21_MIDR2_SERDES_MASK BIT(15)
+
+#define SIUL2_QUIRK_MIDR1_DECREMENT_VAL BIT(1)
+
+struct s32g2_nvmem_drvdata {
+ u32 quirks;
+};
+
+struct s32g2_siul2_nvmem_data {
+ struct device *dev;
+ struct nvmem_device *nvmem;
+ struct regmap **regmaps;
+ struct s32g2_nvmem_drvdata drvdata;
+ u8 num_siul2;
+};
+
+static int needs_minor_decrement(const struct s32g2_nvmem_drvdata *data)
+{
+ return data->quirks & SIUL2_QUIRK_MIDR1_DECREMENT_VAL;
+}
+
+/* 3 digit part number */
+static int get_part_no(struct s32g2_siul2_nvmem_data *priv, u32 *part)
+{
+ int ret;
+
+ ret = regmap_read(priv->regmaps[0], SIUL2_MIDR1_OFF, part);
+ if (ret)
+ dev_err(priv->dev, "Failed to read SIUL2 PART_NO!\n");
+
+ *part &= SIUL20_MIDR1_PART_NO_MASK;
+ *part >>= SIUL20_MIDR1_PART_NO_SHIFT;
+
+ return ret;
+}
+
+static u32 get_variant_bits(u32 value)
+{
+ /*
+ * Mapping between G3 variant ID and the PCIe Device ID,
+ * as described in the "S32G3 Reference Manual",
+ * chapter SerDes Subsystem, section "Device and revision IDs",
+ * where: index = last 2 digits of the variant
+ * value = last hex digit of the PCIe Device ID"
+ */
+ static const u32 s32g3_variants[] = {
+ [78] = 0x6,
+ [79] = 0x4,
+ [98] = 0x2,
+ [99] = 0x0,
+ };
+
+ /* PCIe variant bits with respect to PCIe Device ID update
+ * applies only to S32G3 platforms.
+ */
+ if (value / 100 != 3)
+ return 0;
+
+ value %= 100;
+
+ if (value < ARRAY_SIZE(s32g3_variants))
+ return s32g3_variants[value];
+
+ return 0;
+}
+
+static int s32g2_siul2_nvmem_read(void *context, unsigned int offset,
+ void *val, size_t bytes)
+{
+ u32 major, minor, part_no, serdes, midr1, midr2;
+ struct s32g2_siul2_nvmem_data *priv = context;
+ int ret;
+
+ if (bytes != NVRAM_CELL_SIZE)
+ return -EOPNOTSUPP;
+
+ switch (offset) {
+ /* SIUL20 cells */
+ case SOC_MAJOR_CELL_OFFSET:
+ ret = regmap_read(priv->regmaps[0], SIUL2_MIDR1_OFF, &midr1);
+ if (ret)
+ return ret;
+ major = (midr1 & SIUL20_MIDR1_MAJOR_MASK) >> SIUL20_MIDR1_MAJOR_SHIFT;
+
+ /* Bytes format: 0.0.0.MAJOR */
+ *(u32 *)val = major + 1;
+
+ return 0;
+
+ case SOC_MINOR_CELL_OFFSET:
+ ret = regmap_read(priv->regmaps[0], SIUL2_MIDR1_OFF, &midr1);
+ if (ret)
+ return ret;
+
+ minor = midr1 & SIUL20_MIDR1_MINOR_MASK;
+
+ if (minor > 0 && needs_minor_decrement(&priv->drvdata))
+ minor--;
+
+ /* Bytes format: 0.0.0.MINOR */
+ *(u32 *)val = minor;
+
+ return 0;
+
+ case PCIE_DEV_ID_CELL_OFFSET:
+ ret = get_part_no(priv, &part_no);
+ if (ret)
+ return ret;
+
+ /* Bytes format: 0.0.0.PCIE_VARIANT */
+ *(u32 *)val = get_variant_bits(part_no);
+
+ return 0;
+
+ /* SIUL21 cells */
+ case SERDES_PRESENCE_CELL_OFFSET:
+ ret = regmap_read(priv->regmaps[1], SIUL2_MIDR2_OFF, &midr2);
+ if (ret)
+ return ret;
+
+ serdes = !!(midr2 & SIUL21_MIDR2_SERDES_MASK);
+ *(u32 *)val = serdes;
+ return 0;
+
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static int s32g2_siul2_nvmem_probe(struct platform_device *pdev)
+{
+ struct nxp_siul2_mfd *mfd = dev_get_drvdata(pdev->dev.parent);
+ struct s32g2_siul2_nvmem_data *priv;
+ struct nvmem_config econfig = {
+ .name = "s32g2-siul2_nvmem",
+ .add_legacy_fixed_of_cells = false,
+ .owner = THIS_MODULE,
+ .word_size = 4,
+ .size = 4,
+ .read_only = true,
+ };
+ int i, ret;
+ u32 part;
+
+ if (!mfd)
+ return dev_err_probe(&pdev->dev, -EINVAL,
+ "Invalid SIUL2 NVMEM parent!\n");
+
+ priv = devm_kzalloc(&pdev->dev, sizeof(struct s32g2_siul2_nvmem_data),
+ GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ priv->num_siul2 = mfd->num_siul2;
+ priv->regmaps = devm_kmalloc_array(&pdev->dev, priv->num_siul2,
+ sizeof(*priv->regmaps), GFP_KERNEL);
+ if (!priv->regmaps)
+ return -ENOMEM;
+
+ for (i = 0; i < priv->num_siul2; i++)
+ priv->regmaps[i] = mfd->siul2[i].regmaps[SIUL2_MIDR];
+
+ priv->dev = &pdev->dev;
+ econfig.reg_read = s32g2_siul2_nvmem_read;
+ econfig.dev = pdev->dev.parent;
+ econfig.priv = priv;
+
+ ret = get_part_no(priv, &part);
+ if (ret)
+ return ret;
+
+ /* S32G2 SoCs have a special case. */
+ if (part / 100 == 2)
+ priv->drvdata.quirks |= SIUL2_QUIRK_MIDR1_DECREMENT_VAL;
+
+ priv->nvmem = devm_nvmem_register(pdev->dev.parent, &econfig);
+ if (IS_ERR(priv->nvmem))
+ return dev_err_probe(&pdev->dev, PTR_ERR(priv->nvmem),
+ "Failed to probe SIUL2 NVMEM!\n");
+
+ dev_info(&pdev->dev, "Initialized S32G%u SIUL2 nvmem driver\n",
+ part / 100);
+
+ return 0;
+}
+
+static struct platform_driver s32g2_siul2_nvmem_driver = {
+ .probe = s32g2_siul2_nvmem_probe,
+ .driver = {
+ .name = "s32g2-siul2-nvmem",
+ },
+};
+
+module_platform_driver(s32g2_siul2_nvmem_driver);
+
+MODULE_AUTHOR("Catalin Udma <catalin-dan.udma@nxp.com>");
+MODULE_DESCRIPTION("S32G2 SIUL2 NVMEM driver");
+MODULE_LICENSE("GPL");
--
2.45.2
next prev parent reply other threads:[~2025-07-10 14:22 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-10 14:20 [PATCH v7 00/12] gpio: siul2-s32g2: add initial GPIO driver Andrei Stefanescu
2025-07-10 14:20 ` [PATCH v7 01/12] dt-bindings: mfd: add support for the NXP SIUL2 module Andrei Stefanescu
2025-07-10 15:49 ` Frank Li
2025-07-11 7:36 ` Krzysztof Kozlowski
2025-07-11 7:45 ` Krzysztof Kozlowski
2025-07-11 7:37 ` Krzysztof Kozlowski
2025-07-11 7:39 ` Krzysztof Kozlowski
2025-07-11 12:25 ` Andrei Stefanescu
2025-07-10 14:20 ` [PATCH v7 02/12] mfd: nxp-siul2: add support for NXP SIUL2 Andrei Stefanescu
2025-07-10 16:20 ` Frank Li
2025-07-11 7:13 ` Andrei Stefanescu
2025-07-10 14:20 ` [PATCH v7 03/12] arm64: dts: s32g: change pinctrl node into the new mfd node Andrei Stefanescu
2025-07-10 14:20 ` [PATCH v7 04/12] pinctrl: s32cc: small refactoring Andrei Stefanescu
2025-07-10 16:24 ` Frank Li
2025-07-10 14:20 ` [PATCH v7 05/12] pinctrl: s32cc: change to "devm_pinctrl_register_and_init" Andrei Stefanescu
2025-07-10 16:24 ` Frank Li
2025-07-10 14:20 ` [PATCH v7 06/12] dt-bindings: pinctrl: deprecate SIUL2 pinctrl bindings Andrei Stefanescu
2025-07-10 16:26 ` Frank Li
2025-07-11 7:44 ` Krzysztof Kozlowski
2025-07-10 14:20 ` [PATCH v7 07/12] pinctrl: s32g2: change the driver to also be probed as an MFD cell Andrei Stefanescu
2025-07-11 10:52 ` kernel test robot
2025-07-10 14:20 ` [PATCH v7 08/12] pinctrl: s32cc: implement GPIO functionality Andrei Stefanescu
2025-07-10 14:20 ` [PATCH v7 09/12] MAINTAINERS: add MAINTAINER for NXP SIUL2 MFD driver Andrei Stefanescu
2025-07-10 14:20 ` Andrei Stefanescu [this message]
2025-07-11 5:37 ` [PATCH v7 10/12] nvmem: s32g2_siul2: add NVMEM driver for SoC information Arnd Bergmann
2025-07-11 12:39 ` Andrei Stefanescu
2025-08-01 14:36 ` Andrei Stefanescu
2025-08-02 8:28 ` Krzysztof Kozlowski
2025-08-02 8:32 ` Krzysztof Kozlowski
2025-08-04 7:12 ` Andrei Stefanescu
2025-08-04 7:26 ` Krzysztof Kozlowski
2025-08-05 12:53 ` Andrei Stefanescu
2025-07-18 13:45 ` Lee Jones
2025-07-10 14:20 ` [PATCH v7 11/12] MAINTAINERS: add MAINTAINER for NXP SIUL2 NVMEM cell Andrei Stefanescu
2025-07-10 14:20 ` [PATCH v7 12/12] pinctrl: s32cc: set num_custom_params to 0 Andrei Stefanescu
2025-07-10 19:05 ` [PATCH v7 00/12] gpio: siul2-s32g2: add initial GPIO driver Rob Herring (Arm)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250710142038.1986052-11-andrei.stefanescu@oss.nxp.com \
--to=andrei.stefanescu@oss.nxp.com \
--cc=Ghennadi.Procopciuc@nxp.com \
--cc=aisheng.dong@nxp.com \
--cc=aruizrui@redhat.com \
--cc=brgl@bgdev.pl \
--cc=chester62515@gmail.com \
--cc=clizzi@redhat.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=eballetb@redhat.com \
--cc=echanude@redhat.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=krzk+dt@kernel.org \
--cc=larisa.grigore@nxp.com \
--cc=lee@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mbrugger@suse.com \
--cc=ping.bai@nxp.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=s32@nxp.com \
--cc=shawnguo@kernel.org \
--cc=srini@kernel.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).