From patchwork Sun Jun 11 14:03:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 106088 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2053587vqr; Sun, 11 Jun 2023 07:05:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7NkGUr7hmOl6oXuuU9v3FLB2KeT+suKvrmhn8oclPmU6yxAAy1WfDn0RL3M0GCbywW8BjH X-Received: by 2002:a17:90a:7063:b0:25b:db23:c578 with SMTP id f90-20020a17090a706300b0025bdb23c578mr1101749pjk.12.1686492300939; Sun, 11 Jun 2023 07:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686492300; cv=none; d=google.com; s=arc-20160816; b=CXtenf114Q+pMJ2etur7w+Nqyv6cBhaFdg3dmLiRZou2uAxCQTEALnqAKyrgXsTm4R CNzyWLAs0IJkNG+vlGlr3dfw6cdQH3cxMdUXkJZBVZKOtB5kBKSBy6X6Zx1392MnkutU UUPq7xkWGz6xe1nus6H2TQ2e9TulrldzSytOYCfS8JHgs4SP5IqzjFM74j2KUtHziH5X n77uzK8j75ruOUyuXGfy5dU34R/OqIrKLjCY2Cxu+IXkP8GR4Cx44RFEgJnfRg1jzZ7Q D378ZLLrKoqAUuV+dulKH7zwuvEN3MRi47mGpytEKvJV/g+qBf3HyW4xxIiruBEtSXOq yb5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IGrbdlHRBEYsKz5RMYlb0xpi4rIRjCjmXS8VS4uzx8Y=; b=P27ELcGeMMcClV1ll7FtlSxoHByHTF9P+ZotvvysUDrWfgY9WFLSXP+RQhvU8WdCCD feM6WFsRHVynYBI1kx6Ch1YV8XDD6FkGoX0LL2YNTgPgJcVPjx/vYSJwlC0FbJFqTo0K m/tqszpmdJqLdEBdLvB9g6pHSx8f99ODALe0Tet+8+oWgD43oV/1642nACzdNMGbJyhs OlgQYHWSPJqjkCB3rmlbyXN07H6iOkutceBJdA7kxQ3zQt3j79y4ufLQ1UotYvKlk04x aUioLujt3XLcIE5um0e1wXtemZnRQ/mohJ7+G7IdYI6Oabfl94YZnnK5vHzKIVT+bqDl 5BLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o8z+wNs0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f10-20020a17090ac28a00b00256b183e325si7250841pjt.56.2023.06.11.07.04.47; Sun, 11 Jun 2023 07:05:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o8z+wNs0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233781AbjFKOED (ORCPT + 99 others); Sun, 11 Jun 2023 10:04:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbjFKODv (ORCPT ); Sun, 11 Jun 2023 10:03:51 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F229CE77 for ; Sun, 11 Jun 2023 07:03:49 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f70fc4682aso24017935e9.1 for ; Sun, 11 Jun 2023 07:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686492228; x=1689084228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IGrbdlHRBEYsKz5RMYlb0xpi4rIRjCjmXS8VS4uzx8Y=; b=o8z+wNs0iEr7/TgZmIYH5V32Lr0bdhn4ARwqDtLO3ALnazR8Vyz5Q0yKaTn8x2WbRe t4jEvZNDnAewAjYidSAmmJ368aCHf56OjLnr3XxMqsfoPfjtsMqoNKHDvo1fBCtAX9Lf icrfgoM+hCzf/JGCe9weaugRzVREeauXbdS28fOm2kj0KXb/dGoluleBlgWf6TyjNW6S mSdNXK1pyAqDI4yjWLhkrPJ6rh6L7skh/xJLg4dbn5MKDyxEhNLWCQ3LooYx93Nvtia9 +TQG+jCXJPH7FC9cW8R6mIY8h9N/vQ35HGjN69Ol2Jx2Un50Tus1hs+Bo7hXZ6a5eeZ8 JE5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686492228; x=1689084228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IGrbdlHRBEYsKz5RMYlb0xpi4rIRjCjmXS8VS4uzx8Y=; b=FR+SQYCoNanVtSRc9UNkeE6ZupR/sg6J6tGBHk696CbDovhmdtBNz9m1UybgkI5HCp EXsgq+kXqRqT6HD1YJq94ooyDUjaWizm1RKKmh9132goZKgCXpYNuhtFTK12P8wcJky2 /LNhzOVUcA4X4ZqTdjwtnG3zN8ZkglaqHIjsrZ1qwmCrUMz8Prv/UcAj0VErnOiTr48k xj2mu5jUEMMkD1jEvtr4pl0r4tLcYmTHovF8kTLA4zttt9MrwqtRfIRTIdZ9k4siH3wq izOS6kahIoAdwqfLtPkWCWmaoZmnYukP9WiyNYbIDjbt/u8I2PjM53N2bpLiEuVaeVeH lFag== X-Gm-Message-State: AC+VfDwISxaX6i2++cqx0fCXba9tfOGnE6UuIGMwjlmFyCF3QFim09MY xQRwGpsEiGQ6iZX2kKoTP6/QVg== X-Received: by 2002:a7b:cc83:0:b0:3f6:13f5:d1ea with SMTP id p3-20020a7bcc83000000b003f613f5d1eamr4124351wma.11.1686492228301; Sun, 11 Jun 2023 07:03:48 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id h17-20020a05600c28d100b003f080b2f9f4sm8567222wmd.27.2023.06.11.07.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 07:03:47 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Srinivas Kandagatla Subject: [PATCH 04/26] nvmem: brcm_nvram: add .read_post_process() for MACs Date: Sun, 11 Jun 2023 15:03:08 +0100 Message-Id: <20230611140330.154222-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230611140330.154222-1-srinivas.kandagatla@linaro.org> References: <20230611140330.154222-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768415351106372128?= X-GMAIL-MSGID: =?utf-8?q?1768415351106372128?= From: Rafał Miłecki 1. Parse ASCII MAC format into byte based 2. Calculate relative addresses based on index argument Signed-off-by: Rafał Miłecki Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/Kconfig | 1 + drivers/nvmem/brcm_nvram.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig index b291b27048c7..688b70ba4826 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -55,6 +55,7 @@ config NVMEM_BRCM_NVRAM tristate "Broadcom's NVRAM support" depends on ARCH_BCM_5301X || COMPILE_TEST depends on HAS_IOMEM + select GENERIC_NET_UTILS help This driver provides support for Broadcom's NVRAM that can be accessed using I/O mapping. diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c index 39aa27942f28..4567c597c87f 100644 --- a/drivers/nvmem/brcm_nvram.c +++ b/drivers/nvmem/brcm_nvram.c @@ -4,6 +4,8 @@ */ #include +#include +#include #include #include #include @@ -42,6 +44,25 @@ static int brcm_nvram_read(void *context, unsigned int offset, void *val, return 0; } +static int brcm_nvram_read_post_process_macaddr(void *context, const char *id, int index, + unsigned int offset, void *buf, size_t bytes) +{ + u8 mac[ETH_ALEN]; + + if (bytes != 3 * ETH_ALEN - 1) + return -EINVAL; + + if (!mac_pton(buf, mac)) + return -EINVAL; + + if (index) + eth_addr_add(mac, index); + + ether_addr_copy(buf, mac); + + return 0; +} + static int brcm_nvram_add_cells(struct brcm_nvram *priv, uint8_t *data, size_t len) { @@ -75,6 +96,13 @@ static int brcm_nvram_add_cells(struct brcm_nvram *priv, uint8_t *data, priv->cells[idx].offset = value - (char *)data; priv->cells[idx].bytes = strlen(value); priv->cells[idx].np = of_get_child_by_name(dev->of_node, priv->cells[idx].name); + if (!strcmp(var, "et0macaddr") || + !strcmp(var, "et1macaddr") || + !strcmp(var, "et2macaddr")) { + priv->cells[idx].raw_len = strlen(value); + priv->cells[idx].bytes = ETH_ALEN; + priv->cells[idx].read_post_process = brcm_nvram_read_post_process_macaddr; + } } return 0;