From patchwork Tue Dec 3 08:45:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1203562 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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="cEV1w7/t"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47RwZD5BQpz9sP6 for ; Tue, 3 Dec 2019 19:46:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 64D3AC21DFA; Tue, 3 Dec 2019 08:46:02 +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 BC813C21D83; Tue, 3 Dec 2019 08:45:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9E1B1C21C3F; Tue, 3 Dec 2019 08:45:51 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 555D0C21C27 for ; Tue, 3 Dec 2019 08:45:51 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id t14so2439048wmi.5 for ; Tue, 03 Dec 2019 00:45:51 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=BFcZ1fSUYIb8mCi3CsGbdjmbWMwXJ4Bs5/T4dNHSxUk=; b=cEV1w7/txPePPyT8q2yW+GtxOS0Kzq2lu1GPwplGZ2e//tunX8OAGlBIqieK1WzrmC dMRNj1G83kK+oN9lcMrUQd6pZ6dgxar9hmIUJrwWiHUtlOo79++rlPV/4xyk2menbAd4 bGNBTxfqbq//G2g/OdM4XFT21QvsFd2vEXy0CCCv7wUi8MQgABSm8sFAtvarvj10xrlO f5tq3dHOU2BlrFAJGovDFrK3y3iSGJW1/3DcS95dcLz/g8vHDoawdQ0D1KYeghsJEgDW mTUeqBrxbsKeSHbIy9tC9rOh/Ar7KDLceeeWQtmkyhlq1oJc4v1GcnqZZ9QT4BFUevwR pwUg== 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:mime-version:content-transfer-encoding; bh=BFcZ1fSUYIb8mCi3CsGbdjmbWMwXJ4Bs5/T4dNHSxUk=; b=IwHmG4nV3Yw8VLHGDW+VZrz5amI/tX6yrjwgrML4rgM1GYDXWaGBHVIguRN9FRB+sL hfajLvzRlcWwGPv1rMQE/lwwzBJilHeYz0hyLCQlRpiMIeMfrL8YpLjR4ygA61bdfFjt xwVjCWmAUFhxiESK2exRevvDY0ebf97OFSjsdbFXxodR9WPZ3nuhE5GOuVCFY0NXKs1C KFzg83cEwzMZQcHglMJAyx/d8yPJSqsVezB6RvcLprYt5/MeGYSCsMhwqvZdAz9DiqkU ltcyS+4JRE1/IOzojW5bLyulJjyu01K6qh5WkQanTpzNctOTXBiyaf4gHiFdINF3KoKd BwLA== X-Gm-Message-State: APjAAAUR7gq0UqO8m19+2UMZV8x0qQqXnK6jRQJRU4O0utsAgFQ/jzhA GanzBEspWXqSoukGa55NqHcHUSR0 X-Google-Smtp-Source: APXvYqw9U/iahdmp7geyOyZ7LAJZwQdW7opHGYkkDoT5GS9Ql6cgScs6HC/5TPLAYLICX6PA+M/DBg== X-Received: by 2002:a1c:7e91:: with SMTP id z139mr33006833wmc.15.1575362750929; Tue, 03 Dec 2019 00:45:50 -0800 (PST) Received: from mamamia.internal (a89-183-66-130.net-htp.de. [89.183.66.130]) by smtp.gmail.com with ESMTPSA id u1sm2150866wmc.3.2019.12.03.00.45.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 00:45:50 -0800 (PST) From: Andre Heider To: Jagan Teki , Maxime Ripard Date: Tue, 3 Dec 2019 09:45:36 +0100 Message-Id: <20191203084539.1956677-2-a.heider@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203084539.1956677-1-a.heider@gmail.com> References: <20191203084539.1956677-1-a.heider@gmail.com> MIME-Version: 1.0 Cc: Ondrej Jirman , u-boot@lists.denx.de, Jernej Skrabec Subject: [U-Boot] [PATCH v3 1/4] sunxi: board: extract creating a unique sid into a helper function 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Andre Heider --- board/sunxi/board.c | 105 ++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 47 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index b9450a0e36..42bec3a4d8 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -768,6 +768,38 @@ static void parse_spl_header(const uint32_t spl_addr) env_set_hex("fel_scriptaddr", spl->fel_script_address); } +static bool get_unique_sid(unsigned int *sid) +{ + if (sunxi_get_sid(sid) != 0) + return false; + + if (!sid[0]) + return false; + + /* + * The single words 1 - 3 of the SID have quite a few bits + * which are the same on many models, so we take a crc32 + * of all 3 words, to get a more unique value. + * + * Note we only do this on newer SoCs as we cannot change + * the algorithm on older SoCs since those have been using + * fixed mac-addresses based on only using word 3 for a + * long time and changing a fixed mac-address with an + * u-boot update is not good. + */ +#if !defined(CONFIG_MACH_SUN4I) && !defined(CONFIG_MACH_SUN5I) && \ + !defined(CONFIG_MACH_SUN6I) && !defined(CONFIG_MACH_SUN7I) && \ + !defined(CONFIG_MACH_SUN8I_A23) && !defined(CONFIG_MACH_SUN8I_A33) + sid[3] = crc32(0, (unsigned char *)&sid[1], 12); +#endif + + /* Ensure the NIC specific bytes of the mac are not all 0 */ + if ((sid[3] & 0xffffff) == 0) + sid[3] |= 0x800000; + + return true; +} + /* * Note this function gets called multiple times. * It must not make any changes to env variables which already exist. @@ -778,61 +810,40 @@ static void setup_environment(const void *fdt) unsigned int sid[4]; uint8_t mac_addr[6]; char ethaddr[16]; - int i, ret; + int i; - ret = sunxi_get_sid(sid); - if (ret == 0 && sid[0] != 0) { - /* - * The single words 1 - 3 of the SID have quite a few bits - * which are the same on many models, so we take a crc32 - * of all 3 words, to get a more unique value. - * - * Note we only do this on newer SoCs as we cannot change - * the algorithm on older SoCs since those have been using - * fixed mac-addresses based on only using word 3 for a - * long time and changing a fixed mac-address with an - * u-boot update is not good. - */ -#if !defined(CONFIG_MACH_SUN4I) && !defined(CONFIG_MACH_SUN5I) && \ - !defined(CONFIG_MACH_SUN6I) && !defined(CONFIG_MACH_SUN7I) && \ - !defined(CONFIG_MACH_SUN8I_A23) && !defined(CONFIG_MACH_SUN8I_A33) - sid[3] = crc32(0, (unsigned char *)&sid[1], 12); -#endif - - /* Ensure the NIC specific bytes of the mac are not all 0 */ - if ((sid[3] & 0xffffff) == 0) - sid[3] |= 0x800000; + if (!get_unique_sid(sid)) + return; - for (i = 0; i < 4; i++) { - sprintf(ethaddr, "ethernet%d", i); - if (!fdt_get_alias(fdt, ethaddr)) - continue; + for (i = 0; i < 4; i++) { + sprintf(ethaddr, "ethernet%d", i); + if (!fdt_get_alias(fdt, ethaddr)) + continue; - if (i == 0) - strcpy(ethaddr, "ethaddr"); - else - sprintf(ethaddr, "eth%daddr", i); + if (i == 0) + strcpy(ethaddr, "ethaddr"); + else + sprintf(ethaddr, "eth%daddr", i); - if (env_get(ethaddr)) - continue; + if (env_get(ethaddr)) + continue; - /* Non OUI / registered MAC address */ - mac_addr[0] = (i << 4) | 0x02; - mac_addr[1] = (sid[0] >> 0) & 0xff; - mac_addr[2] = (sid[3] >> 24) & 0xff; - mac_addr[3] = (sid[3] >> 16) & 0xff; - mac_addr[4] = (sid[3] >> 8) & 0xff; - mac_addr[5] = (sid[3] >> 0) & 0xff; + /* Non OUI / registered MAC address */ + mac_addr[0] = (i << 4) | 0x02; + mac_addr[1] = (sid[0] >> 0) & 0xff; + mac_addr[2] = (sid[3] >> 24) & 0xff; + mac_addr[3] = (sid[3] >> 16) & 0xff; + mac_addr[4] = (sid[3] >> 8) & 0xff; + mac_addr[5] = (sid[3] >> 0) & 0xff; - eth_env_set_enetaddr(ethaddr, mac_addr); - } + eth_env_set_enetaddr(ethaddr, mac_addr); + } - if (!env_get("serial#")) { - snprintf(serial_string, sizeof(serial_string), - "%08x%08x", sid[0], sid[3]); + if (!env_get("serial#")) { + snprintf(serial_string, sizeof(serial_string), + "%08x%08x", sid[0], sid[3]); - env_set("serial#", serial_string); - } + env_set("serial#", serial_string); } }