From patchwork Tue Aug 14 13:07:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 957516 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QsNT1Nkz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qXxW0nqyz9s8T for ; Tue, 14 Aug 2018 23:09:34 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 83D22C21DFB; Tue, 14 Aug 2018 13:08:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4D8FDC21D8A; Tue, 14 Aug 2018 13:08:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B734AC21BE5; Tue, 14 Aug 2018 13:08:26 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by lists.denx.de (Postfix) with ESMTPS id 2B6C1C21C2F for ; Tue, 14 Aug 2018 13:08:26 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id f12-v6so17126259wrv.12 for ; Tue, 14 Aug 2018 06:08:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DG9s5QiWCcf0B9BGJ3dYqjJXSSydKyWY4RFtZ7qkQRE=; b=QsNT1NkzdSreS8WUShbaXH5dy6nX/BUIy54zMUsskq2wv4fS4LP1589nrbd7F5Z8fj 7IMrsx68OQnbMn3jUx8bslysDwd3Ay1fDaNTGzTgbY2bvQ0BfnH+HviKpWGkUDw3VV+0 xJpezbM4zpvKLHLzl7OnFuOaszOn+l3PYM2EvNSSo671aZZgNhGwbot8hEqzlCrA1Eio tCvFCC6BwexHItgOMRJEkevG3/zhcTdEl2KMUAn5UbJl6XJTTM6AAyLPUGXM9UUM4uwL QhSdwn6/88/Y+X2cmg66Oy6DRR8/2XLZnB2/hWsdK3JXkEaQOYI5VtvrjkZGqOMIZ2wr 6ixw== 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:in-reply-to :references; bh=DG9s5QiWCcf0B9BGJ3dYqjJXSSydKyWY4RFtZ7qkQRE=; b=UviLP7iLGGlVtCmlaroZrYeIJCtJtsNH8DUyPRe1z3MsBWSTPoHztv/yfA4dPwGJFT aV0u88YV6LchDZpkLNLAT1tk/slkA8yvn6golEWWtMnmwa29J9+ud7NFtKu0yAaqSGPH Ab+vBV26NUKXei7VYv0+iK9msIATgskzkQvJ0V1FYxLvsmweMrkH87UI5E/neDXIafNx v9HE6fPTii/XnQ6EPYJc0vu9y/0OPdnlDERL6UiX9CstqqTebpXF/DIM9IUQ0UwyO/q8 67TfuGUt5r8Ya16iMZ4sfPgX8+WVLrS63rs59PYjz4LwW/2Ja2x6l1ej/h4L+vmiZCmA M85Q== X-Gm-Message-State: AOUpUlHwkm9H7x7t3F4fNNEGLw7sZbdOSosI0NoIaVaqpLEc4R9FeKkY 7EAuu0PsDcoDa1ZJVsNmvfIg2h/a X-Google-Smtp-Source: AA+uWPxNu5QSEkIxQfFtAgORRj1GfUsaZiCA7wCJN+35qG/JyBHPcfzDOMQD1DTLbhINnNGo0Y2wfQ== X-Received: by 2002:adf:e841:: with SMTP id d1-v6mr7888365wrn.269.1534252105364; Tue, 14 Aug 2018 06:08:25 -0700 (PDT) Received: from sark.homenet.telecomitalia.it ([79.46.68.202]) by smtp.gmail.com with ESMTPSA id r16-v6sm29123997wru.59.2018.08.14.06.08.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Aug 2018 06:08:24 -0700 (PDT) From: Beniamino Galvani To: u-boot@lists.denx.de Date: Tue, 14 Aug 2018 15:07:52 +0200 Message-Id: <20180814130754.19294-2-b.galvani@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180814130754.19294-1-b.galvani@gmail.com> References: <20180814130754.19294-1-b.galvani@gmail.com> Cc: Tom Rini , linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH u-boot 1/3] boards: amlogic: remove ethernet gpio reset code from boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The reset is already handled by the designware driver using information from device tree. Signed-off-by: Beniamino Galvani Acked-by: Neil Armstrong --- board/amlogic/nanopi-k2/nanopi-k2.c | 6 ------ board/amlogic/odroid-c2/odroid-c2.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/board/amlogic/nanopi-k2/nanopi-k2.c b/board/amlogic/nanopi-k2/nanopi-k2.c index 339dbb81db..ae29dd6fa4 100644 --- a/board/amlogic/nanopi-k2/nanopi-k2.c +++ b/board/amlogic/nanopi-k2/nanopi-k2.c @@ -30,12 +30,6 @@ int misc_init_r(void) meson_gx_eth_init(PHY_INTERFACE_MODE_RGMII, 0); - /* Reset PHY on GPIOZ_14 */ - clrbits_le32(GX_GPIO_EN(3), BIT(14)); - clrbits_le32(GX_GPIO_OUT(3), BIT(14)); - mdelay(10); - setbits_le32(GX_GPIO_OUT(3), BIT(14)); - if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, mac_addr, EFUSE_MAC_SIZE); diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c index c47b9ce9cb..2a2755c387 100644 --- a/board/amlogic/odroid-c2/odroid-c2.c +++ b/board/amlogic/odroid-c2/odroid-c2.c @@ -30,12 +30,6 @@ int misc_init_r(void) meson_gx_eth_init(PHY_INTERFACE_MODE_RGMII, 0); - /* Reset PHY on GPIOZ_14 */ - clrbits_le32(GX_GPIO_EN(3), BIT(14)); - clrbits_le32(GX_GPIO_OUT(3), BIT(14)); - mdelay(10); - setbits_le32(GX_GPIO_OUT(3), BIT(14)); - if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, mac_addr, EFUSE_MAC_SIZE); From patchwork Tue Aug 14 13:07:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 957518 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dlHTFCXH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qXyP6hQ8z9s9l for ; Tue, 14 Aug 2018 23:10:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7CCA0C21DED; Tue, 14 Aug 2018 13:09:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C1F31C21E3B; Tue, 14 Aug 2018 13:08:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3B124C21E07; Tue, 14 Aug 2018 13:08:32 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id E6403C21C93 for ; Tue, 14 Aug 2018 13:08:27 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id g1-v6so17178692wru.2 for ; Tue, 14 Aug 2018 06:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/cPa9g1ttYsZYdUcPwzKBMX632ifU5joE78RzoUZoqk=; b=dlHTFCXHdDfBquu/0D6HJ9ppdQJqe1ZZjaWVK8TJbC2MtJ87bmHy9O9yVA8+Sqhe6w NR+4e7BW6WAAgLOSF0jztJOeHSUMAJDQaZxDJdAVmOSdtURuO1Ja4Y5zZV8pt9OIj4eQ pQSVgM7VzbIf2NfnYpO9WoR0S1wrlRZ3XkKOggM3gjAaNHYj6XhlJn/avW3Pt9CG46/S lgqSjS2Aga9u7lT9iqWueLcsBXXGpBesKWbYUUgVbMyHR5jvJXxZLJyV0ZIJJjO04nkn tCtCDnuP7y5cRP1sfJvgHtLlygXdmqnHDtf7jI8s59TN+i/OJu2qOlv9AtrlQhwtcK7w CwWw== 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:in-reply-to :references; bh=/cPa9g1ttYsZYdUcPwzKBMX632ifU5joE78RzoUZoqk=; b=XeG/qtig7YQ5+p9G0GtHy6dcAXBsmS5PHabysglGfNNlDU9gN+EKZs61ApRlVas4ge x8ATzV5L9PVDfSK5LPpNL1q+kSfqQ/znxlW4BSubeiOG4rP5ii8Wy2fR0Zvdi7IL2TTz wLsukQsB+Woy7NvIIz3oag1HLWgvsJKDn6NbMgMxaEwlYocr+xtXyqquz73qIVTrndOI S1eJzLdBj/OKbCjHu82q0E+q+JJmehSgqHdok2Wzjih0qMxHSO8K/lODOcnoQ7CgyuWf kH5dsPAls6WkSu3XbM23SObRx91asdaYIy/sCuXoqHzHIl3Oytg+8Kw7hZjD4U7gjqgl KoYA== X-Gm-Message-State: AOUpUlGU3P268qs4MaG+H3J6MB/1nylXAe48xoLpCVx2yVwXzOQ2Z8/p k6qhu0zeumt06YkV06HkpLv5uTYW X-Google-Smtp-Source: AA+uWPwPwmkfYPZZ/DEBUXC9DNKrjUOR51SjsBstYujCHf2OjgpKo0IWz7Ghejk5wqgpK2J3rcfm+g== X-Received: by 2002:adf:9486:: with SMTP id 6-v6mr10170403wrr.257.1534252107187; Tue, 14 Aug 2018 06:08:27 -0700 (PDT) Received: from sark.homenet.telecomitalia.it ([79.46.68.202]) by smtp.gmail.com with ESMTPSA id r16-v6sm29123997wru.59.2018.08.14.06.08.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Aug 2018 06:08:26 -0700 (PDT) From: Beniamino Galvani To: u-boot@lists.denx.de Date: Tue, 14 Aug 2018 15:07:53 +0200 Message-Id: <20180814130754.19294-3-b.galvani@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180814130754.19294-1-b.galvani@gmail.com> References: <20180814130754.19294-1-b.galvani@gmail.com> Cc: Tom Rini , linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH u-boot 2/3] boards: amlogic: use common function for environment initialization X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Clean up board files by moving the duplicate environment initialization to arch code. Signed-off-by: Beniamino Galvani --- arch/arm/include/asm/arch-meson/sm.h | 1 + arch/arm/mach-meson/sm.c | 27 +++++++++++++++++++++++ board/amlogic/khadas-vim/khadas-vim.c | 25 +-------------------- board/amlogic/libretech-cc/libretech-cc.c | 25 +-------------------- board/amlogic/nanopi-k2/nanopi-k2.c | 25 +-------------------- board/amlogic/odroid-c2/odroid-c2.c | 25 +-------------------- board/amlogic/p212/p212.c | 25 +-------------------- 7 files changed, 33 insertions(+), 120 deletions(-) diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h index 83d6441803..db2be38fc5 100644 --- a/arch/arm/include/asm/arch-meson/sm.h +++ b/arch/arm/include/asm/arch-meson/sm.h @@ -7,5 +7,6 @@ #define __MESON_SM_H__ ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size); +void meson_init_env_from_efuse(void); #endif /* __MESON_SM_H__ */ diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index 0bba5e4a07..2628591fe6 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -6,6 +6,7 @@ */ #include +#include #include #include @@ -14,6 +15,11 @@ #define FN_EFUSE_READ 0x82000030 #define FN_EFUSE_WRITE 0x82000031 +#define EFUSE_SN_OFFSET 20 +#define EFUSE_SN_SIZE 16 +#define EFUSE_MAC_OFFSET 52 +#define EFUSE_MAC_SIZE 6 + static void *shmem_input; static void *shmem_output; @@ -54,3 +60,24 @@ ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size) return regs.regs[0]; } + +void meson_init_env_from_efuse(void) +{ + static u8 mac[EFUSE_MAC_SIZE]; + char serial[EFUSE_SN_SIZE]; + ssize_t len; + + if (!eth_env_get_enetaddr("ethaddr", mac)) { + len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, + mac, EFUSE_MAC_SIZE); + if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac)) + eth_env_set_enetaddr("ethaddr", mac); + } + + if (!env_get("serial#")) { + len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, + EFUSE_SN_SIZE); + if (len == EFUSE_SN_SIZE) + env_set("serial#", serial); + } +} diff --git a/board/amlogic/khadas-vim/khadas-vim.c b/board/amlogic/khadas-vim/khadas-vim.c index 692bf2add3..4483a96761 100644 --- a/board/amlogic/khadas-vim/khadas-vim.c +++ b/board/amlogic/khadas-vim/khadas-vim.c @@ -6,18 +6,12 @@ #include #include -#include #include #include #include #include #include -#define EFUSE_SN_OFFSET 20 -#define EFUSE_SN_SIZE 16 -#define EFUSE_MAC_OFFSET 52 -#define EFUSE_MAC_SIZE 6 - int board_init(void) { return 0; @@ -25,26 +19,9 @@ int board_init(void) int misc_init_r(void) { - u8 mac_addr[EFUSE_MAC_SIZE]; - char serial[EFUSE_SN_SIZE]; - ssize_t len; - meson_gx_eth_init(PHY_INTERFACE_MODE_RMII, MESON_GXL_USE_INTERNAL_RMII_PHY); - - if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { - len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, - mac_addr, EFUSE_MAC_SIZE); - if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) - eth_env_set_enetaddr("ethaddr", mac_addr); - } - - if (!env_get("serial#")) { - len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, - EFUSE_SN_SIZE); - if (len == EFUSE_SN_SIZE) - env_set("serial#", serial); - } + meson_init_env_from_efuse(); return 0; } diff --git a/board/amlogic/libretech-cc/libretech-cc.c b/board/amlogic/libretech-cc/libretech-cc.c index ccab1272c5..86b1d213ff 100644 --- a/board/amlogic/libretech-cc/libretech-cc.c +++ b/board/amlogic/libretech-cc/libretech-cc.c @@ -6,18 +6,12 @@ #include #include -#include #include #include #include #include #include -#define EFUSE_SN_OFFSET 20 -#define EFUSE_SN_SIZE 16 -#define EFUSE_MAC_OFFSET 52 -#define EFUSE_MAC_SIZE 6 - int board_init(void) { return 0; @@ -25,26 +19,9 @@ int board_init(void) int misc_init_r(void) { - u8 mac_addr[EFUSE_MAC_SIZE]; - char serial[EFUSE_SN_SIZE]; - ssize_t len; - meson_gx_eth_init(PHY_INTERFACE_MODE_RMII, MESON_GXL_USE_INTERNAL_RMII_PHY); - - if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { - len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, - mac_addr, EFUSE_MAC_SIZE); - if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) - eth_env_set_enetaddr("ethaddr", mac_addr); - } - - if (!env_get("serial#")) { - len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, - EFUSE_SN_SIZE); - if (len == EFUSE_SN_SIZE) - env_set("serial#", serial); - } + meson_init_env_from_efuse(); return 0; } diff --git a/board/amlogic/nanopi-k2/nanopi-k2.c b/board/amlogic/nanopi-k2/nanopi-k2.c index ae29dd6fa4..e61c23f8c6 100644 --- a/board/amlogic/nanopi-k2/nanopi-k2.c +++ b/board/amlogic/nanopi-k2/nanopi-k2.c @@ -5,18 +5,12 @@ #include #include -#include #include #include #include #include #include -#define EFUSE_SN_OFFSET 20 -#define EFUSE_SN_SIZE 16 -#define EFUSE_MAC_OFFSET 52 -#define EFUSE_MAC_SIZE 6 - int board_init(void) { return 0; @@ -24,25 +18,8 @@ int board_init(void) int misc_init_r(void) { - u8 mac_addr[EFUSE_MAC_SIZE]; - char serial[EFUSE_SN_SIZE]; - ssize_t len; - meson_gx_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); - if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) - eth_env_set_enetaddr("ethaddr", mac_addr); - } - - if (!env_get("serial#")) { - len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, - EFUSE_SN_SIZE); - if (len == EFUSE_SN_SIZE) - env_set("serial#", serial); - } + meson_init_env_from_efuse(); return 0; } diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c index 2a2755c387..fffd225485 100644 --- a/board/amlogic/odroid-c2/odroid-c2.c +++ b/board/amlogic/odroid-c2/odroid-c2.c @@ -5,18 +5,12 @@ #include #include -#include #include #include #include #include #include -#define EFUSE_SN_OFFSET 20 -#define EFUSE_SN_SIZE 16 -#define EFUSE_MAC_OFFSET 52 -#define EFUSE_MAC_SIZE 6 - int board_init(void) { return 0; @@ -24,25 +18,8 @@ int board_init(void) int misc_init_r(void) { - u8 mac_addr[EFUSE_MAC_SIZE]; - char serial[EFUSE_SN_SIZE]; - ssize_t len; - meson_gx_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); - if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) - eth_env_set_enetaddr("ethaddr", mac_addr); - } - - if (!env_get("serial#")) { - len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, - EFUSE_SN_SIZE); - if (len == EFUSE_SN_SIZE) - env_set("serial#", serial); - } + meson_init_env_from_efuse(); return 0; } diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index 06c2eaee47..57f776f404 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -6,18 +6,12 @@ #include #include -#include #include #include #include #include #include -#define EFUSE_SN_OFFSET 20 -#define EFUSE_SN_SIZE 16 -#define EFUSE_MAC_OFFSET 52 -#define EFUSE_MAC_SIZE 6 - int board_init(void) { return 0; @@ -25,25 +19,8 @@ int board_init(void) int misc_init_r(void) { - u8 mac_addr[EFUSE_MAC_SIZE]; - char serial[EFUSE_SN_SIZE]; - ssize_t len; - meson_gx_eth_init(PHY_INTERFACE_MODE_RMII, 0); - - if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { - len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, - mac_addr, EFUSE_MAC_SIZE); - if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) - eth_env_set_enetaddr("ethaddr", mac_addr); - } - - if (!env_get("serial#")) { - len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, - EFUSE_SN_SIZE); - if (len == EFUSE_SN_SIZE) - env_set("serial#", serial); - } + meson_init_env_from_efuse(); return 0; } From patchwork Tue Aug 14 13:07:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 957517 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rcHY3Puk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qXy30rTKz9s9l for ; Tue, 14 Aug 2018 23:10:02 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B2CDBC21DF3; Tue, 14 Aug 2018 13:09:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9117EC21DDC; Tue, 14 Aug 2018 13:08:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C8EC3C21C3F; Tue, 14 Aug 2018 13:08:32 +0000 (UTC) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by lists.denx.de (Postfix) with ESMTPS id 68DB7C21DF8 for ; Tue, 14 Aug 2018 13:08:29 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id y2-v6so12228339wma.1 for ; Tue, 14 Aug 2018 06:08:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vbwcmEcIuXUb0QLlRaSWHDMULR+42njV+zBxN930Ol0=; b=rcHY3Puk9MSpXE508H8jTg1o/pvbEjeBd7DxgvabMtf4xD5WHMGRp/92D0oGF/Bgd8 PLdSHQJzNThktxduQhzEFRmxhOlRPFINPloNfsePoik3EfSAAiTSI3VEdvGxVHvHvPJc C6tl+NxV7x3LCxm1BayKuUtIaT/c9anvLQQWXwtQ0wIvw/Nl7gsxy6S+cLlCgSCB5pw+ Yy0QgnV3ewrFSsYHbPPq4vt4p8Wxh6cmbhLCoijRsLAyjbmGW4+QQYGvu5JMsx6V9IeS Zl1gzAFJkDfgoi1XORRbSnSDKNV5tsRKqHNNozoUtsD0ndui5x35BUaQfvle8sfOJGKn iTww== 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:in-reply-to :references; bh=vbwcmEcIuXUb0QLlRaSWHDMULR+42njV+zBxN930Ol0=; b=G5PEqLHf3EVShh+Z8H1TAt+gFgL+Lx2ilM3lVYgw9pK+zl8MPMoteBmzby58i7YgTD l7go8T1+1ERMdC+pR1Mbv+yM4CUOHU/VfHN3zQ2F4R++nQxi1j2NXP37Cb1sBgDTcKn2 KpJpzwADSxBEhmCGTzuZUJ2DKomjNrKc2lT4DdQXUjIu/P19sxF9W+Ng3NVDV/qQiP1F U+14cPFjG7AxWXu/QqAgP+dHnGEbfEd9m0Ef7slvlt/a6VqAFzhSRVPbmzPupCTkGF+q QMPidHg+KruvtPm94RngP3e8R7GVZnzqZLPOY8kLYLUrIPJEGfNyzLYN0408oHR1+QpT 3HkA== X-Gm-Message-State: AOUpUlHEh0UtrJ1VQepNiKeJpBDCT6PJs1AZFTwfoY/4Nb7K7fd1gc1F jkF1ZvRzadcFCZEg3mFuALGkQAlA X-Google-Smtp-Source: AA+uWPxuEx73CO1T8icI3lFNHlz3jE1HlbSXLZc9ieq2BrzSxbTT3e0lQ2gZcWtLzUHJkaJE5p/0sw== X-Received: by 2002:a1c:ca0f:: with SMTP id a15-v6mr10409621wmg.102.1534252108700; Tue, 14 Aug 2018 06:08:28 -0700 (PDT) Received: from sark.homenet.telecomitalia.it ([79.46.68.202]) by smtp.gmail.com with ESMTPSA id r16-v6sm29123997wru.59.2018.08.14.06.08.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Aug 2018 06:08:27 -0700 (PDT) From: Beniamino Galvani To: u-boot@lists.denx.de Date: Tue, 14 Aug 2018 15:07:54 +0200 Message-Id: <20180814130754.19294-4-b.galvani@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180814130754.19294-1-b.galvani@gmail.com> References: <20180814130754.19294-1-b.galvani@gmail.com> Cc: Tom Rini , linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH u-boot 3/3] arm: meson: null-terminate the serial number X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Terminate the serial number variable with null to avoid printing trailing garbage. Signed-off-by: Beniamino Galvani --- arch/arm/mach-meson/sm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index 2628591fe6..23eafe87b4 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -64,7 +64,7 @@ ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size) void meson_init_env_from_efuse(void) { static u8 mac[EFUSE_MAC_SIZE]; - char serial[EFUSE_SN_SIZE]; + char serial[EFUSE_SN_SIZE + 1]; ssize_t len; if (!eth_env_get_enetaddr("ethaddr", mac)) { @@ -77,7 +77,9 @@ void meson_init_env_from_efuse(void) if (!env_get("serial#")) { len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, EFUSE_SN_SIZE); - if (len == EFUSE_SN_SIZE) + if (len == EFUSE_SN_SIZE) { + serial[EFUSE_SN_SIZE] = '\0'; env_set("serial#", serial); + } } }