From patchwork Fri Jul 29 09:49:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 654065 X-Patchwork-Delegate: hdegoede@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3s13qc70s5z9s65 for ; Fri, 29 Jul 2016 19:50:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5BA2DA762F; Fri, 29 Jul 2016 11:50:00 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eqTxE6AeUDiC; Fri, 29 Jul 2016 11:50:00 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CBC9BA7616; Fri, 29 Jul 2016 11:49:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 023B9A7616 for ; Fri, 29 Jul 2016 11:49:58 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eqjaGzPOtWJS for ; Fri, 29 Jul 2016 11:49:57 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by theia.denx.de (Postfix) with ESMTPS id A104AA75BF for ; Fri, 29 Jul 2016 11:49:53 +0200 (CEST) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0B7661CC0; Fri, 29 Jul 2016 09:49:50 +0000 (UTC) Received: from shalem.localdomain.com (vpn1-6-207.ams2.redhat.com [10.36.6.207]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6T9nlXY022466; Fri, 29 Jul 2016 05:49:47 -0400 From: Hans de Goede To: Ian Campbell , Jagan Teki Date: Fri, 29 Jul 2016 11:49:45 +0200 Message-Id: <1469785785-6675-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 29 Jul 2016 09:49:51 +0000 (UTC) Cc: u-boot@lists.denx.de, Corentin LABBE Subject: [U-Boot] [PATCH v2] sun8i: On H3 Use words 1-3 instead of just word 3 from the SID X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" It seems that bytes 13-14 of the SID / bytes 1-2 from word 3 of the SID are always 0 on H3 making it a poor candidate to use as source for the serialnr / mac-address, and the other non constant words (1 and 2) also have quite a few bits which are the same for some boards, This commits switches to using words 1 - 3 ex-or-ed together to get a more unique value for the mac-address / serialnr. Cc: Chen-Yu Tsai Cc: Corentin LABBE Cc: Amit Singh Tomar Signed-off-by: Hans de Goede --- Changes in v2: -ex-or all 3 words together instead of picking a different word --- board/sunxi/board.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index ef3fe26..e0734fb 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -623,6 +623,21 @@ static void setup_environment(const void *fdt) ret = sunxi_get_sid(sid); if (ret == 0 && sid[0] != 0 && sid[3] != 0) { +#ifdef CONFIG_MACH_SUN8I_H3 + /* + * The single words 1 - 3 of the SID have quite a few bits + * which are the same on many models on the H3, so we ex-or + * them together to get a bit more unique value. + * + * Note we only do this on the H3 as we cannot change the + * algorithm on other SoCs since those have been using + * fixed mac-addresses based on only using word 3 for a + * a long time and changing a fixed mac-address with an + * u-boot update is not good. + */ + sid[3] ^= sid[1] ^ sid[2]; +#endif + /* Ensure the NIC specific bytes of the mac are not all 0 */ if ((sid[3] & 0xffffff) == 0) sid[3] |= 0x800000;