From mboxrd@z Thu Jan 1 00:00:00 1970 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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD508C77B7F for ; Tue, 16 May 2023 11:42:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 37E4B86113; Tue, 16 May 2023 13:42:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.b="P0EgGOBK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 42FFD86645; Tue, 16 May 2023 13:42:29 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20626.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::626]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 61C3C86113 for ; Tue, 16 May 2023 13:42:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=josua@solid-run.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bHnUSkBwk6Leh2ZvhjrXDJf2ju1JDHDfYtGs3RDyZmntRHeRKgG+ziv8wTnwmvxptjdyVIhX3eshBjOneh/8fMN8XcnRKbKNujeFwgf4YvCRC4l2J/ZX+ZkGHWVV5nZIK3RdANwuqICpiSZQRNf1X9n/2qFnG3NJEcotI2IQYTUbkuO3jHus7Yf2FUexS6jgMFX3gARkW3bSuZBpSPRQu9hRoG61U5ljHePD+8uR91QEHjJlV9Hut8BzQnFAtt13zEV0HHrWjwowy6jfsmzEdd7bMNHSsRm6GLSfUiv838oPg2bk/o2if8GUrhRGU0gD5EERyOqgC6HdbgHLxHQ8Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DmSCLcDKFnqqj4bVUu56bjQc7+Oj6bL58KsRck/kzDg=; b=iC7qZjtzIr461J4YxNBGt3H0h3bcOuv5zDYWpiLjLGbT3Lf0DgbaF3Wb/qFNfTsZn3mTabRcwkACTLj5s1k/iQUSNxRP3WsYSxf6awRmKNvyfIjwhqTaVTCvqL0uv1JksJLVRWu7GboQm7bth2uNYQg9FygW28jUioCkqEJiKV4tkl8LAumreZhU7x8UlnmUaO4vmZUD2IRnkxizTJHJ7KTczt02idl1ynaqwpKEe5iCPyjclFt4Od1KzzxL/O9ILswXmgG9yJPKneiOqUIh9wynJsMoG7uPx5s3wNJgPvc4qIGtsg01EKW+EkpXNcdA0v1WaH6OVa9U5X6opGCgKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DmSCLcDKFnqqj4bVUu56bjQc7+Oj6bL58KsRck/kzDg=; b=P0EgGOBKQYyv4RU9sXJ5wcmXUecZfjEYUu1NkvgxJOSDH7oc+utISiuHZL2r9XjJZo8MhFnZ5LpVZAJXy+yJbnBIkfnYFe4XH3bMVefKIFNmYlbLe9LO6271o/N4MBXKfVSAvyD8Q0u+MLx5+vJxxrLkEupnSm3/cwG+/88e2Vs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) by PA4PR04MB9270.eurprd04.prod.outlook.com (2603:10a6:102:2a5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Tue, 16 May 2023 11:42:23 +0000 Received: from AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::9e27:8c41:a8d:938e]) by AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::9e27:8c41:a8d:938e%6]) with mapi id 15.20.6387.032; Tue, 16 May 2023 11:42:23 +0000 From: Josua Mayer To: u-boot@lists.denx.de Cc: Josua Mayer Subject: [RFC v2 2/3] mvebu: clearfog: convert tlv parsing to use new library Date: Tue, 16 May 2023 14:41:52 +0300 Message-Id: <20230516114153.3896-3-josua@solid-run.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230516114153.3896-1-josua@solid-run.com> References: <20230516114153.3896-1-josua@solid-run.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR2P281CA0143.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:98::16) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|PA4PR04MB9270:EE_ X-MS-Office365-Filtering-Correlation-Id: 08f86534-35f8-4d89-849e-08db56029d78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q+ZYM+Zh91Ve+38od8LrhEq1E3m7yMauEGVDr05r7mkfvWwj8ZGDtpnnn0fF7YOfw6+WGQCd8GjnKohFGMpl9ma/Z0Tgpq/7a1bVDriFPfpA/Ot5KtbaTRgsV/0MoL4h2k8D90BbQzl326Vf98QuLi4pKosk8+PLA2RQUO93XsyB60CW7dCn+t7ixADajxvXPc730xyg5PqKYUZg6k9jHmZiuKRmOuPh1ChmBzyRaYU3J5V3qpq5nUNSuXI/9Pfxslgs1vnALCto1caQaU0iviRJKJEqHJWhzbBV1el2sjOErEtMjVq23H/pnCqhS0XNhgAiV0cC/sBKSgLRRUVyp/MxVfmt0xCuwVNFn+OHthwwbKF50MvsNkOUeJv2I8y11MfsAtjXV4LALhNfq44i7Qd6ta2kYDWm2/qtFpSvi0ov1AGv6BUkGLEtwmpc5CmeV/xNuYHxBsqUZCQ1J7TNmPNEJV07cxTW+re+hfrj9zg4ank9530vObdKhncxzrRyF4nqCvIgyiS4DZS76MNBWy+LsMGIsmPAVQQZIGJCm12oNLx4nyiASArZ/907YGGC X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8963.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(376002)(39840400004)(136003)(366004)(346002)(396003)(451199021)(83380400001)(478600001)(52116002)(6666004)(6512007)(6486002)(2616005)(1076003)(107886003)(186003)(6506007)(2906002)(36756003)(6916009)(4326008)(38100700002)(66556008)(66476007)(66946007)(8936002)(41300700001)(316002)(5660300002)(8676002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8dseslBpPhXtHJvcgMaMTxt/NI/TS6At+hhN0qhBDmERQ4N9dtzccJFVCB5J?= =?us-ascii?Q?ZXYFUoVIbbTdfE85TbH92hn0SrYSN/keTnx4bCS1bWOcKOW5zwHwSPSVFF4O?= =?us-ascii?Q?+6FtbisalYUYFYKblDOUSLehRUH/FuiEKkJqp2kZalgtQJMXqVWVsdMOWeDX?= =?us-ascii?Q?fCFNu2Q73ZDUvIlzeV9RMHAcExdRiXBUsXSX/qNUMpmvKuZYTpr+ZV4lLFkL?= =?us-ascii?Q?U5n9nFHi+9QafklrgjNRfA0DvRrRtV0oJF83tALZw2KDNFsdmBSdxz9fNafu?= =?us-ascii?Q?kFygpKJdoO9eKa8uAGhscCHv8Zc0uo7NBTiNa/SDhFjjGbcZ1p0ozJGMXdko?= =?us-ascii?Q?H5JPt8LzOkVQHw6X2hZ0HTPxGAtChSVLE45baHXYUZ7fGzJC/DSQeZlOWdEQ?= =?us-ascii?Q?KnQKigL3TC6Uh1/JK4/b+RmHTQMiTtSiDTBkxyrU977Xy3dM9YdqV2hVBQnO?= =?us-ascii?Q?u6V6G1zUab2unFpBCX72U+iICwRq5oXE/BVVxszUyZp2BmZhO3C+ESKorMnS?= =?us-ascii?Q?Ia7RzmQ4QgHJn/kegJKJOujhwb36l/kjJxk6MGFWJDii0sQUzP2jTw3mk/K9?= =?us-ascii?Q?cVcFvdC5A47Rc2EwdZrIaAElw80d3T1T/1NJV3uK6GXLZ/KdhieQdv08aQjG?= =?us-ascii?Q?o9I6d4NulNaHPok4QQeGd9baYkyny2WI+18TVPtnYRhUSMn0T4Vr7SnDJmix?= =?us-ascii?Q?oQeHJ9N8vOuDj4v6l6V2eZkYFEKC4dBzGZ7unr6CPI2UDb9OPog7sKUSBigR?= =?us-ascii?Q?JYUBzHBfsCHNT8Dj508kEBnUJPa+e2A1XWtFZKQBGTSIk2mok+AuC4/tz7O2?= =?us-ascii?Q?q3TUEUAcsWyhzMK+JntUeuZUioDIoe7dWR5d0Ll3Nxx/jWYVF1cSB1UkyPBl?= =?us-ascii?Q?A2BhRqmXpVbQga6/es5rabi0x5k4LS7W+fxOfbaLI8xJyEcvwci1/XOl95Sk?= =?us-ascii?Q?7x6VoWtuBNKhK5GJN6bhFyCIF1mTlA9+iY11Xhiga7mtDUswTE+SMlMPt2fs?= =?us-ascii?Q?zLi2NOHnhBgm9YwQt/6q+/Df9wrr5JCv6QGbVKMVjUknoYlrPP08syzK1jfu?= =?us-ascii?Q?Z0FsKZ2+jikfs+CIcm8zFBZYDyuW0nt4chRpd3aGNfXOLvsZgcjaywLrp/Ya?= =?us-ascii?Q?T7KZbAQDkWynIScNMJwPUkafAWORuGfP7EJfVXsSGf9zZTyxKJPp9zYI8/yU?= =?us-ascii?Q?uZDLn9knYZm+GTdzMArVFvVZbLdyyoYR619oiGpcUIKi7T/OPwEVrsupCQSL?= =?us-ascii?Q?QNCiWYORMQV3MA70OvqwLsXQ3WXP/RzJbsS34il9kYU+tS5TmeS9JbVDjuya?= =?us-ascii?Q?8fAH2l0IYVpPBMAwz0garKfdYxKOCNG+xxt51geZpOFGH+EtSiKHqfyvCQdC?= =?us-ascii?Q?01+8qI1N3WOiwZwY165lSQC2KfszPE7uVWEvF8IZz2dorBZsiY4B0nSJXurZ?= =?us-ascii?Q?CGCHALJExtn1Cn/6QVGU5TMxTmTV8RtuvUm4zUlDKsoGI9roIg89L78YNUnY?= =?us-ascii?Q?1TQ0Y0A0uJcVSsIRp8G7RAmzj9fia1Ows6panDBt7AZ2yVVv6xgTDtEH3oSA?= =?us-ascii?Q?oevE/k27yzwy8CjF/lKlWLnzmE70QxZbJwiOr0Rni5wmhOi/DWoCMXGGgeWc?= =?us-ascii?Q?kyFMQ1thteA724KhTqOF0Ug=3D?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08f86534-35f8-4d89-849e-08db56029d78 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 11:42:23.6880 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mYb4f/YV4ePjDFUNGGHmipKJ+E/nNcREBxV1ihaz1osWpRCAg0kdpZxJSCww3Zby/gvT38TbBgYzfV6KUF3Uqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9270 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Update the existing code reading tlv data from eeprom to use the new tlv library functions rather than relying on tlv_eeprom command internals. Signed-off-by: Josua Mayer --- board/solidrun/common/tlv_data.c | 46 ++++++++++++-------------------- configs/clearfog_defconfig | 4 ++- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c index 11d6e4a1380..31b4b473c75 100644 --- a/board/solidrun/common/tlv_data.c +++ b/board/solidrun/common/tlv_data.c @@ -5,6 +5,7 @@ #include #include +#include #include #include "tlv_data.h" @@ -50,44 +51,31 @@ static void parse_tlv_vendor_ext(struct tlvinfo_tlv *tlv_entry, td->ram_size = val[5]; } -static void parse_tlv_data(u8 *eeprom, struct tlvinfo_header *hdr, - struct tlvinfo_tlv *entry, struct tlv_data *td) +static void parse_tlv_data(u8 *eeprom, struct tlvinfo_priv *tlv, + struct tlv_data *td) { - unsigned int tlv_offset, tlv_len; - - tlv_offset = sizeof(struct tlvinfo_header); - tlv_len = sizeof(struct tlvinfo_header) + be16_to_cpu(hdr->totallen); - while (tlv_offset < tlv_len) { - entry = (struct tlvinfo_tlv *)&eeprom[tlv_offset]; - - switch (entry->type) { - case TLV_CODE_PRODUCT_NAME: - store_product_name(entry, td); - break; - case TLV_CODE_VENDOR_EXT: - parse_tlv_vendor_ext(entry, td); - break; - default: - break; - } - - tlv_offset += sizeof(struct tlvinfo_tlv) + entry->length; - } + struct tlvinfo_tlv *entry; + + entry = tlv_entry_next_by_code(tlv, NULL, TLV_CODE_PRODUCT_NAME); + if (!IS_ERR(entry)) + store_product_name(entry, td); + + entry = tlv_entry_next_by_code(tlv, NULL, TLV_CODE_VENDOR_EXT); + if (!IS_ERR(entry)) + parse_tlv_vendor_ext(entry, td); } void read_tlv_data(struct tlv_data *td) { u8 eeprom_data[TLV_TOTAL_LEN_MAX]; - struct tlvinfo_header *tlv_hdr; - struct tlvinfo_tlv *tlv_entry; - int ret, i; + struct tlvinfo_priv *priv; + int i; for (i = 0; i < 2; i++) { - ret = read_tlvinfo_tlv_eeprom(eeprom_data, &tlv_hdr, - &tlv_entry, i); - if (ret < 0) + priv = tlv_eeprom_read(tlv_eeprom_get_by_index(i), 0, eeprom_data, ARRAY_SIZE(eeprom_data)); + if (IS_ERR(priv)) continue; - parse_tlv_data(eeprom_data, tlv_hdr, tlv_entry, td); + parse_tlv_data(eeprom_data, priv, td); } } diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index b3ed1ec7bbe..fa86b23ef40 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -35,7 +35,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_I2C=y CONFIG_SYS_MAXARGS=32 -CONFIG_CMD_TLV_EEPROM=y +# CONFIG_CMD_TLV_EEPROM is not set CONFIG_SPL_CMD_TLV_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y @@ -81,3 +81,5 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0 +CONFIG_EEPROM_TLV_LIB=y +CONFIG_SPL_EEPROM_TLV_LIB=y -- 2.35.3