From nobody Mon Apr 6 23:09:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C417ECAAD2 for ; Thu, 1 Sep 2022 22:23:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234630AbiIAWXH (ORCPT ); Thu, 1 Sep 2022 18:23:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235309AbiIAWWL (ORCPT ); Thu, 1 Sep 2022 18:22:11 -0400 Received: from mail.3ffe.de (0001.3ffe.de [IPv6:2a01:4f8:c0c:9d57::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DFC09F1A6; Thu, 1 Sep 2022 15:19:33 -0700 (PDT) Received: from mwalle01.kontron.local. (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.3ffe.de (Postfix) with ESMTPSA id 566EB2211; Fri, 2 Sep 2022 00:19:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2022082101; t=1662070754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8r9e+6V1nQNFKR3i2dJ4bG2R6mZBtVL5bazbX9Ccc+Q=; b=y1p0tb6bNbtesJ3/AG1/st3FHtfm2aY+Upnii+w30N5d+iKWcGAUZhCvQWVF+qnMxKnFTK fG8G9NFdW7fRJIdN7G5T46msPCs3MyIaMxF/+8w7/wrT3gsNF3PU8cwYXMB8PPgrFUGYi4 XefQG237GCp1K0qQzVL/AoZVqTv4Ta+avDzS37hYt15WV4WkBjqiB+g0p7E4YDSmaHl3cR 6y7FN0rHe2t/WPgVNqqMWYNEGtpNvDTKyvXzlwBrXX5LgYTePX/22Pwgh8p46FftrzcsWC Bxh8TUK8kkJAPU11utpw9fRfGb98t1QCLPWwrHfENKOONP4c/7eWLMXWq5dP1Q== From: Michael Walle To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , Shawn Guo , Li Yang , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Frank Rowand Cc: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ahmad Fatoum , Philipp Zabel , Michael Walle Subject: [PATCH v2 16/20] nvmem: layouts: add sl28vpd layout Date: Fri, 2 Sep 2022 00:18:53 +0200 Message-Id: <20220901221857.2600340-17-michael@walle.cc> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220901221857.2600340-1-michael@walle.cc> References: <20220901221857.2600340-1-michael@walle.cc> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam: Yes Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This layout applies to the VPD of the Kontron sl28 boards. The VPD only contains a base MAC address. Therefore, we have to add an individual offset to it. This is done by taking the second argument of the nvmem phandle into account. Also this let us checking the VPD version and the checksum. Signed-off-by: Michael Walle --- changes since v1: - none drivers/nvmem/layouts/Kconfig | 9 ++ drivers/nvmem/layouts/Makefile | 2 + drivers/nvmem/layouts/sl28vpd.c | 144 ++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 drivers/nvmem/layouts/sl28vpd.c diff --git a/drivers/nvmem/layouts/Kconfig b/drivers/nvmem/layouts/Kconfig index 9ad3911d1605..75082f6b471d 100644 --- a/drivers/nvmem/layouts/Kconfig +++ b/drivers/nvmem/layouts/Kconfig @@ -2,4 +2,13 @@ =20 menu "Layout Types" =20 +config NVMEM_LAYOUT_SL28_VPD + bool "Kontron sl28 VPD layout support" + select CRC8 + help + Say Y here if you want to support the VPD layout of the Kontron + SMARC-sAL28 boards. + + If unsure, say N. + endmenu diff --git a/drivers/nvmem/layouts/Makefile b/drivers/nvmem/layouts/Makefile index 6fdb3c60a4fa..fc617b9e87d0 100644 --- a/drivers/nvmem/layouts/Makefile +++ b/drivers/nvmem/layouts/Makefile @@ -2,3 +2,5 @@ # # Makefile for nvmem layouts. # + +obj-$(CONFIG_NVMEM_LAYOUT_SL28_VPD) +=3D sl28vpd.o diff --git a/drivers/nvmem/layouts/sl28vpd.c b/drivers/nvmem/layouts/sl28vp= d.c new file mode 100644 index 000000000000..8cef2633de26 --- /dev/null +++ b/drivers/nvmem/layouts/sl28vpd.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include +#include + +#define SL28VPD_MAGIC 'V' + +struct sl28vpd_header { + u8 magic; + u8 version; +} __packed; + +struct sl28vpd_v1 { + struct sl28vpd_header header; + char serial_number[15]; + u8 base_mac_address[ETH_ALEN]; + u8 crc8; +} __packed; + +static int sl28vpd_mac_address_pp(const char *id, int index, + unsigned int offset, void *buf, + size_t bytes) +{ + if (bytes !=3D ETH_ALEN) + return -EINVAL; + + if (index < 0) + return -EINVAL; + + if (!is_valid_ether_addr(buf)) + return -EINVAL; + + eth_addr_add(buf, index); + + return 0; +} + +static const struct nvmem_cell_info sl28vpd_v1_entries[] =3D { + { + .name =3D "serial-number", + .offset =3D offsetof(struct sl28vpd_v1, serial_number), + .bytes =3D sizeof_field(struct sl28vpd_v1, serial_number), + }, + { + .name =3D "base-mac-address", + .offset =3D offsetof(struct sl28vpd_v1, base_mac_address), + .bytes =3D sizeof_field(struct sl28vpd_v1, base_mac_address), + .read_post_process =3D sl28vpd_mac_address_pp, + }, +}; + +static int sl28vpd_v1_check_crc(struct device *dev, struct nvmem_device *n= vmem) +{ + struct sl28vpd_v1 data_v1; + u8 table[CRC8_TABLE_SIZE]; + int ret; + u8 crc; + + crc8_populate_msb(table, 0x07); + + ret =3D nvmem_device_read(nvmem, 0, sizeof(data_v1), &data_v1); + if (ret < 0) + return ret; + else if (ret !=3D sizeof(data_v1)) + return -EIO; + + crc =3D crc8(table, (void *)&data_v1, sizeof(data_v1) - 1, 0); + + if (crc !=3D data_v1.crc8) { + dev_err(dev, + "Checksum is invalid (got %02x, expected %02x).\n", + crc, data_v1.crc8); + return -EINVAL; + } + + return 0; +} + +static int sl28vpd_add_cells(struct device *dev, struct nvmem_device *nvme= m, + struct nvmem_layout *layout) +{ + const struct nvmem_cell_info *pinfo; + struct nvmem_cell_info info =3D {0}; + struct sl28vpd_header hdr; + int ret, i; + + /* check header */ + ret =3D nvmem_device_read(nvmem, 0, sizeof(hdr), &hdr); + if (ret < 0) + return ret; + else if (ret !=3D sizeof(hdr)) + return -EIO; + + if (hdr.magic !=3D SL28VPD_MAGIC) { + dev_err(dev, "Invalid magic value (%02x)\n", hdr.magic); + return -EINVAL; + } + + if (hdr.version !=3D 1) { + dev_err(dev, "Version %d is unsupported.\n", hdr.version); + return -EINVAL; + } + + ret =3D sl28vpd_v1_check_crc(dev, nvmem); + if (ret) + return ret; + + for (i =3D 0; i < ARRAY_SIZE(sl28vpd_v1_entries); i++) { + pinfo =3D &sl28vpd_v1_entries[i]; + + info.name =3D pinfo->name; + info.offset =3D pinfo->offset; + info.bytes =3D pinfo->bytes; + info.read_post_process =3D pinfo->read_post_process; + info.np =3D of_get_child_by_name(dev->of_node, pinfo->name); + + ret =3D nvmem_add_one_cell(nvmem, &info); + if (ret) + return ret; + } + + return 0; +} + +static const struct of_device_id sl28vpd_of_match_table[] =3D { + { .compatible =3D "kontron,sl28-vpd" }, + {}, +}; + +struct nvmem_layout sl28vpd_layout =3D { + .name =3D "sl28-vpd", + .of_match_table =3D sl28vpd_of_match_table, + .add_cells =3D sl28vpd_add_cells, +}; + +static int __init sl28vpd_init(void) +{ + return nvmem_layout_register(&sl28vpd_layout); +} +subsys_initcall(sl28vpd_init); --=20 2.30.2