From patchwork Tue Oct 1 08:59:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 1169795 X-Patchwork-Delegate: eugen.hristev@microchip.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=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="Ea9HO3AY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46jCth6Cy5z9sN1 for ; Tue, 1 Oct 2019 19:01:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8D448C21DFB; Tue, 1 Oct 2019 08:59:54 +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=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 09316C21DDC; Tue, 1 Oct 2019 08:59:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 09644C21BE5; Tue, 1 Oct 2019 08:59:34 +0000 (UTC) Received: from esa5.microchip.iphmx.com (esa5.microchip.iphmx.com [216.71.150.166]) by lists.denx.de (Postfix) with ESMTPS id 72540C21DA2 for ; Tue, 1 Oct 2019 08:59:31 +0000 (UTC) Received-SPF: Pass (esa5.microchip.iphmx.com: domain of Tudor.Ambarus@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com; envelope-from="Tudor.Ambarus@microchip.com"; x-sender="Tudor.Ambarus@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa5.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com; envelope-from="Tudor.Ambarus@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa5.microchip.iphmx.com; spf=Pass smtp.mailfrom=Tudor.Ambarus@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: Mn0bQNOAfN+g2B9hn8vHjuiadLa5UWIoY7qhMSN2d92QxLztg4YjLxRXqHOESTTUn5KOpXsvuD MTiUV1hWnKzkV6vjauM4Dd1/tKs9/YyVOpYoMrcZuN6/r1nv30d6jMLbqQwo3XJvRPocojFGpN WWTZLmM7MgdXhFeLQLooOSWVyM6mudw8G8mKZVSPgFeTmKFNtmh8mCo8/aClt7ryBdbhPT94dy HszFq75l6RCnV+0ououWb8g6uCU73zVEaEk4lXiNatxO8rr+tKVrQqQqMnDZ/bWnvsp5CmZggY UqM= X-IronPort-AV: E=Sophos;i="5.64,570,1559545200"; d="scan'208";a="49680983" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Oct 2019 01:59:29 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 1 Oct 2019 01:59:28 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 1 Oct 2019 01:59:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bRR0bdSmyBqsi/mr+K4degxQe5sl/NTeAhjFgzpPOtKe+kVWRDH6StI79Ja+VAb2pw1aN03WSRDfAj82jUyp6etssmvdfX4E1VcC7Qd+lJepZ7MnlxpLMGZ66wvDXV+7LIuhxbPnqs1vJKSP/FrjxNZag+wji4F4qSU2taxz+B964KZx1/o0EnFbqUbUNkS0XynbwsV0Oj1339stO9S6v+nk1sYPI6YoAKNTiaV2v0zV4M9edd7ZoooHf+0GL8eqRqkpSE7PqavgCXEHblO1U1y4/OGI+Q6WIlfa5w+8m/KiCb2fTam3uO0UydkHlDFlaAqW+dunPMWnDCp2OdR1tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cLgqdhBCAepIbYoF9juqXkmMewcM38zl3GmmRaI7+Ro=; b=QhhJBsVhfrudXl1mB4ifeH8QdbewO6pWW/ZsgPXqCkPsWQRasYwSPfmRPd6X8ChIstoK64cd4+sgaPeKLUrJpeAGA4W7KVy2sEGAyMM12q35tjbYmlxa0UC8iF1F3ZbcWJzE3Z4Q4qEiTDZnCeWl7mvx8OUpaBUo8e7mT46SDWgMjYv61TQ6F4UzA705L+ZAoshLofkOz1kD/HArl/CVvE5qTbx8E0EUQU2G1XTBkWulUJtdH82oI9K3/VRAki3gIFGOOrBfnIlsLYyojqENNwcoHUUAAVo3MxHppEL/9xQnvKuiPH6jLxZN6Ivy5AGsYZAdAJyFR4QC39qT290QWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cLgqdhBCAepIbYoF9juqXkmMewcM38zl3GmmRaI7+Ro=; b=Ea9HO3AYt1JXDnZGpHZdKbf8XnTSsTWwYN9InVV8gZQ0cn5+VxYbNWBBjHjVqsVO/L1emPp9emwoqKHTLFFiAyChcvh7MHwsM35pbxY9P0+uMN2c/UB74jNe4wpCzBWfIftt17IsxmrfhvOZpPPFpmpWFCSZ6+MtjdRCagOSDQ8= Received: from MN2PR11MB4448.namprd11.prod.outlook.com (52.135.39.157) by MN2PR11MB4238.namprd11.prod.outlook.com (52.135.36.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2305.20; Tue, 1 Oct 2019 08:59:27 +0000 Received: from MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::340d:5a33:dc79:1184]) by MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::340d:5a33:dc79:1184%5]) with mapi id 15.20.2305.017; Tue, 1 Oct 2019 08:59:27 +0000 From: To: , , , , Thread-Topic: [PATCH 2/4] board: atmel: sama5d27_wlsom1_ek: Set ethaddr from spi-nor flash Thread-Index: AQHVeDaHKHXJtiIPTkGjKiWqz4Xrjg== Date: Tue, 1 Oct 2019 08:59:26 +0000 Message-ID: <20191001085914.7635-3-tudor.ambarus@microchip.com> References: <20191001085914.7635-1-tudor.ambarus@microchip.com> In-Reply-To: <20191001085914.7635-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR02CA0055.eurprd02.prod.outlook.com (2603:10a6:802:14::26) To MN2PR11MB4448.namprd11.prod.outlook.com (2603:10b6:208:193::29) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [94.177.32.156] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 55c27c0c-4456-4dc4-72bc-08d7464da97b x-ms-traffictypediagnostic: MN2PR11MB4238: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3826; x-forefront-prvs: 0177904E6B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(136003)(396003)(376002)(39860400002)(189003)(199004)(4326008)(6506007)(66476007)(76176011)(2201001)(66446008)(25786009)(81166006)(81156014)(486006)(478600001)(8676002)(64756008)(26005)(110136005)(186003)(14454004)(102836004)(86362001)(8936002)(66946007)(36756003)(99286004)(11346002)(446003)(386003)(3846002)(476003)(2616005)(2501003)(6116002)(2906002)(66556008)(50226002)(52116002)(6486002)(71200400001)(71190400001)(107886003)(7736002)(256004)(6512007)(305945005)(5660300002)(6436002)(66066001)(316002)(1076003); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB4238; H:MN2PR11MB4448.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: BH9eNScArwZX71fL7ZIn2iYgviB/6ZxnhwWI+HcptnegRkesQ3JUW61qcDqrvs68Ex56RXFG24M0M8XhWeiFgE1q3S2/hRpYiU70aHnSFz9wDZNnGGpcnNj3p0VSEj+CWeDh/gcZXNCUtySpWTbOulx03Ig6UvKMkI2pgUh0wprmmSj4kWVI8YfL+fqk/NEiSvv5zXwn1SoiV1drmAjC53MeSphiApgmPG+ysnSZXX+8JtwVRiIYzqC0fXeT1NfiFDUJ3/09eKkQCIy6kb9xAr5MwJiReKItZsnbN2nn9svp6ITS3L+tPFfmgeQlNrnyMF9ft9VZZQGp9LURzgfZmAi+AREDTI6JymwCtz3nuvT3YGJRyUDQO33tBPZaZ0AanszR1O426+OrRmRlMcSZo5+A95OpS9T2L53KfTRqiBM= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 55c27c0c-4456-4dc4-72bc-08d7464da97b X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Oct 2019 08:59:26.8589 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: kOaBxbl4/8VRO5/uIU/vVvSNOK21fWamAIs4n0IyS2U7BrA8m3VdxkDHX3fcbL3Ei2qxmuYCG0dRwlXRdaLjpcpMdl8gO8Bp22Ri9zz5PQA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4238 Subject: [U-Boot] [PATCH 2/4] board: atmel: sama5d27_wlsom1_ek: Set ethaddr from spi-nor flash 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" From: Tudor Ambarus The SST26VF064BEUI spi-nor flash is programmed at the factory with a globally unique address stored in the SFDP vendor parameter table and it is permanently writeprotected. Retrieve the EUI-48 address and set it as ethaddr env. Signed-off-by: Tudor Ambarus --- arch/arm/mach-at91/include/mach/at91_common.h | 1 + board/atmel/common/Makefile | 1 + board/atmel/common/mac-spi-nor.c | 127 +++++++++++++++++++++ .../atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 3 + 4 files changed, 132 insertions(+) create mode 100644 board/atmel/common/mac-spi-nor.c diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h index e929b5e1d207..01e00c508a8a 100644 --- a/arch/arm/mach-at91/include/mach/at91_common.h +++ b/arch/arm/mach-at91/include/mach/at91_common.h @@ -40,6 +40,7 @@ void configure_ddrcfg_input_buffers(bool open); #endif int at91_set_ethaddr(int offset); +void at91_spi_nor_set_ethaddr(void); int at91_video_show_board_info(void); #endif /* AT91_COMMON_H */ diff --git a/board/atmel/common/Makefile b/board/atmel/common/Makefile index 4de0912f22e6..6bc8cabb8d6d 100644 --- a/board/atmel/common/Makefile +++ b/board/atmel/common/Makefile @@ -5,4 +5,5 @@ obj-y += board.o obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o +obj-$(CONFIG_SPI_FLASH_SFDP_SUPPORT) += mac-spi-nor.o obj-$(CONFIG_DM_VIDEO) += video_display.o diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c new file mode 100644 index 000000000000..96343678e0b6 --- /dev/null +++ b/board/atmel/common/mac-spi-nor.c @@ -0,0 +1,127 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries + * + * Author: Tudor Ambarus + */ + +#include +#include +#include +#include +#include + +#define ETH_ADDR_SIZE 6 + +#ifdef CONFIG_SPI_FLASH_SST +#define SFDP_MICROCHIP_MANUF_ID 0xbf +#define SFDP_MICROCHIP_MEM_TYPE 0x26 +#define SFDP_MICROCHIP_DEV_ID 0x43 + +#define SFDP_MICROCHIP_EUI_OFFSET 0x60 +#define SFDP_MICROCHIP_EUI48 0x30 + +struct sst26vf064beui { + u8 manufacturer_id; + u8 memory_type; + u8 device_id; + u8 reserved; +}; + +/** + * sst26vf064beui_check() - Check the validity of the EUI-48 information from + * the sst26vf064beui SPI NOR Microchip SFDP table. + * @manufacturer_sfdp: pointer to the Microchip manufacturer specific SFDP + * table. + * + * Return: 0 on success, -errno otherwise. + */ +static int sst26vf064beui_check(const u8 *manufacturer_sfdp) +{ + struct sst26vf064beui *sst26vf064beui = + (struct sst26vf064beui *)manufacturer_sfdp; + + if (sst26vf064beui->manufacturer_id != SFDP_MICROCHIP_MANUF_ID) + return -EINVAL; + + if (sst26vf064beui->memory_type != SFDP_MICROCHIP_MEM_TYPE) + return -EINVAL; + + if (sst26vf064beui->device_id != SFDP_MICROCHIP_DEV_ID) + return -EINVAL; + + /* + * Check if the EUI-48 MAC address is programmed in the next six address + * locations. + */ + if (manufacturer_sfdp[SFDP_MICROCHIP_EUI_OFFSET] != + SFDP_MICROCHIP_EUI48) + return -EINVAL; + + return 0; +} + +/** + * sst26vf064beui_get_ethaddr() - Get the ethernet address from the + * sst26vf064beui SPI NOR Microchip SFDP table. + * @manufacturer_sfdp: pointer to the Microchip manufacturer specific SFDP + * table. + * @ethaddr: pointer where to fill the ethernet address + * @size: size of the ethernet address. + * + * Return: 0 on success, -errno otherwise. + */ +static int sst26vf064beui_get_ethaddr(const u8 *manufacturer_sfdp, + u8 *ethaddr, size_t size) +{ + u64 eui_table[2]; + u64 *p = (u64 *)&manufacturer_sfdp[SFDP_MICROCHIP_EUI_OFFSET]; + int i, ret; + + ret = sst26vf064beui_check(manufacturer_sfdp); + if (ret) + return ret; + + for (i = 0; i < 2; i++) + eui_table[i] = le64_to_cpu(p[i]); + + /* Ethaddr starts at offset one. */ + memcpy(ethaddr, &((u8 *)eui_table)[1], size); + + return 0; +} +#endif + +/** + * at91_spi_nor_set_ethaddr() - Retrieve and set the ethernet address from the + * SPI NOR manufacturer specific SFDP table. + */ +void at91_spi_nor_set_ethaddr(void) +{ + struct udevice *dev; + struct spi_nor *nor; + const char *ethaddr_name = "ethaddr"; + u8 ethaddr[ETH_ADDR_SIZE] = {0}; + + if (env_get(ethaddr_name)) + return; + + if (uclass_first_device_err(UCLASS_SPI_FLASH, &dev)) + return; + + nor = dev_get_uclass_priv(dev); + if (!nor) + return; + + if (!nor->manufacturer_sfdp) + return; + +#ifdef CONFIG_SPI_FLASH_SST + if (sst26vf064beui_get_ethaddr(nor->manufacturer_sfdp, ethaddr, + ETH_ADDR_SIZE)) + return; +#endif + + if (is_valid_ethaddr(ethaddr)) + eth_env_set_enetaddr(ethaddr_name, ethaddr); +} diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c index fda06c824d53..fc563ebb7150 100644 --- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c +++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c @@ -68,6 +68,9 @@ int board_init(void) #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { +#ifdef CONFIG_SPI_FLASH_SFDP_SUPPORT + at91_spi_nor_set_ethaddr(); +#endif return 0; } #endif