From patchwork Tue Jan 12 05:03:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Art Nikpal X-Patchwork-Id: 1425195 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BAPSyINc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DFVHk0b32z9sX5 for ; Tue, 12 Jan 2021 23:28:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93AFC827CB; Tue, 12 Jan 2021 13:28:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BAPSyINc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A413282689; Tue, 12 Jan 2021 06:04:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 992C882689 for ; Tue, 12 Jan 2021 06:04:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=email2tema@gmail.com Received: by mail-pf1-x430.google.com with SMTP id h186so691281pfe.0 for ; Mon, 11 Jan 2021 21:04:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=we+6l6zmD6SomSa7ADo0cD6JFlmtjNvGetmNmWIbFe4=; b=BAPSyINcTCuKra94ZHNj/DspcjW1Ev85FqjjOCSW1pK3EKFnUuJjDS6/gFYcAGVTo7 hK+AttLhjKNS2WiI7gkMdNgXW00qxaLGknAf9qLJYm0rXx2Kk3OGtDyoev1tN8ehZmfw p1g0pvOxLHUQn6aH9qxkyV57r4lVq2fRVvZz123P2s5FRivNwQ0Ivi156byewpjacfHc D7BqH4Iqguf2QIdbUEmHE722qSsRtvAM97N2E7ymZVn0GxvnE/bC/+CNIy2Tci1xIZH1 47KW2u068R1DiBEsEWsgDT2w9FVVoF7YFPEKJINCrgJpkL7CJ9E2sScYACjDEINZ+Q2y Wt1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=we+6l6zmD6SomSa7ADo0cD6JFlmtjNvGetmNmWIbFe4=; b=d5OhVciLn/+ghU1uOcbAM4HkEAajNwZms9VTeewj1GHPOeyyrsbXCKOdpHHBX5Ao0F 8DDlNwZMC/R4Dkt2YaBAbNOxu5yZpftLrfBCKFbS41j5lmOYQS+yPzDWZTtyj9pLKasV 0wN+tMDUr/Y9adnIMtc+O0UVNXtxiUyQjqjXnAQ8+wri554lDVLuCm4Ob2zf1DKK9Qtm C+mKXz8ABidNbTqpE5N6IIa14GW57KBpfvtAR0qiuhVJ0YYVjnt+YPv48RPaSHWIO+YN sFOOiC3Ft4oRU3UI0ZGrNhKFIdLat2YeePtMFLV4c0/B3sJUbaanQrKACLbGwH0bSGJG vhUA== X-Gm-Message-State: AOAM533ED/qfb6IIEnpSMJj0MS1U72oA2pSS4cUDQf2MsCEv8sxd+Enj aEy0tKDbAn2irm+UV0WQ/aA= X-Google-Smtp-Source: ABdhPJx0kS7Q/UMjIEYouBkay1hvZDM/w4DvagWAePZTo0OsDVjOK16l55dXn+XvsHU3UbWB+NaZGQ== X-Received: by 2002:a63:5866:: with SMTP id i38mr2979344pgm.26.1610427882756; Mon, 11 Jan 2021 21:04:42 -0800 (PST) Received: from localhost.localdomain (80.251.221.29.16clouds.com. [80.251.221.29]) by smtp.gmail.com with ESMTPSA id i130sm1376817pfe.94.2021.01.11.21.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 21:04:42 -0800 (PST) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: narmstrong@baylibre.com Cc: u-boot@lists.denx.de, u-boot-amlogic@groups.io, m.szyprowski@samsung.com, jh80.chung@samsung.com, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH] board: amlogic: vim3: fix setup ethernet mac from efuse Date: Tue, 12 Jan 2021 13:03:08 +0800 Message-Id: <20210112050308.774189-1-art@khadas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 12 Jan 2021 13:28:46 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Fix reading built-in ethernet MAC address from efuse NOTE: MAC is stored in ASCII format, 1bytes = 2characters by 0 offset if mac from efuse not valid we use meson_generate_serial_ethaddr NOTE: remake odroid-n2.c variant from Neil Armstrong Signed-off-by: Artem Lapkin --- board/amlogic/vim3/vim3.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index 824fff8262..87d9fe1f02 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -139,26 +139,42 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd) } #define EFUSE_MAC_OFFSET 0 -#define EFUSE_MAC_SIZE 6 +#define EFUSE_MAC_SIZE 12 +#define MAC_ADDR_LEN 6 int misc_init_r(void) { - uint8_t mac_addr[EFUSE_MAC_SIZE]; + uint8_t mac_addr[MAC_ADDR_LEN]; + char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3]; ssize_t len; meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0); if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, - mac_addr, EFUSE_MAC_SIZE); + efuse_mac_addr, EFUSE_MAC_SIZE); if (len != EFUSE_MAC_SIZE) return 0; + /* MAC is stored in ASCII format, 1bytes = 2characters */ + for (int i = 0; i < 6; i++) { + tmp[0] = efuse_mac_addr[i * 2]; + tmp[1] = efuse_mac_addr[i * 2 + 1]; + tmp[2] = '\0'; + mac_addr[i] = simple_strtoul(tmp, NULL, 16); + } + if (is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("ethaddr", mac_addr); else meson_generate_serial_ethaddr(); + + eth_env_get_enetaddr("ethaddr", mac_addr); + printf("[i] setup onboard mac %02X:%02X:%02X:%02X:%02X:%02X\n", + mac_addr[0],mac_addr[1],mac_addr[2], + mac_addr[3],mac_addr[4],mac_addr[5]); } return 0; } +