From patchwork Sun Apr 17 07:48:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 611428 X-Patchwork-Delegate: trini@ti.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 3qnk2X2tx8z9t5t for ; Sun, 17 Apr 2016 17:49:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=EJw+xRvE; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A481AA766B; Sun, 17 Apr 2016 09:49:47 +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 gc07gfLJDCks; Sun, 17 Apr 2016 09:49:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2B46DA766A; Sun, 17 Apr 2016 09:49:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3DA3DA762D for ; Sun, 17 Apr 2016 09:49:30 +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 yg-efau5MoiD for ; Sun, 17 Apr 2016 09:49:30 +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 mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by theia.denx.de (Postfix) with ESMTPS id 0909BA74C6 for ; Sun, 17 Apr 2016 09:49:27 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id n3so16345074wmn.1 for ; Sun, 17 Apr 2016 00:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gGweEYDQrNlnpaSuYuHSKW4Uv61cLFL+HEgz8Ms4AKU=; b=EJw+xRvE7fSSaZuwM2HQyjrTWfBJd2QPBVjgJr0cXf9H3Q13E4w81GWk82u2s4RUgC bMmclw11s5Xw1ar5935ELx6W5LXE3sagv7vhILI9IbB4SmqeYgnm2iDtN5ijj5ildiPR 2k48eo7ZoAhjWv49YvA1GTDuvToy7tYl3burk3uyq18HQmJEb8hi8GgNLukv5wcV+VWP 1Udas6s7Ik3xiR9GEWpLP9ak9p2Gc5DDcRdGQYSuOfSaXcRE4XzUnH60F8BdeB+BM5lj TcKOwJri/MsY2Sas+tKiEJNkFaUHvl/OnypSeHJrER9FX+4OdpkcqMxABqcwUeZmMi/l mepQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gGweEYDQrNlnpaSuYuHSKW4Uv61cLFL+HEgz8Ms4AKU=; b=KW+IbrMajplxf3QdcJjTrSldZdWNjXUfJaCGHPnkW1I890+2OX5g/TWI0++vXrZtCR mpil9KVbDWIa5F5OEE/gvXtYHn0GskpWOdN4EZnVD+O9r0k1raZshYmgr8EDQeRW8C9t NjQjxKRaUlE2Idzmn+baARO4E+ZyCVoR8vZWKtAGiPxvRsiVnmPa2ioQXpMpgBldwXFb Pe4Giv6sGDaBmdASG9sf6MgpUMyUjHrMieS97qBiVchSmTlOS35w1rvx/A+Wj2SCK3HZ z5zEnjozubfweW12i7qSv2to67PdevH192srxdQPcZ6swg+4FN10w3yaNeAk1G0xPi4R dKng== X-Gm-Message-State: AOPr4FVD7L08xV1b1wBCkmasf5yEE1mSWVxHg4udIyNu8ohkUbRuLzp5d+1KapT3zFUG+A== X-Received: by 10.28.150.195 with SMTP id y186mr12066589wmd.43.1460879367376; Sun, 17 Apr 2016 00:49:27 -0700 (PDT) Received: from shire.fritz.box (host92-93-dynamic.21-79-r.retail.telecomitalia.it. [79.21.93.92]) by smtp.gmail.com with ESMTPSA id r10sm45723726wjf.2.2016.04.17.00.49.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Apr 2016 00:49:26 -0700 (PDT) From: Beniamino Galvani To: u-boot@lists.denx.de Date: Sun, 17 Apr 2016 09:48:58 +0200 Message-Id: <1460879338-7671-4-git-send-email-b.galvani@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1460879338-7671-1-git-send-email-b.galvani@gmail.com> References: <1460879338-7671-1-git-send-email-b.galvani@gmail.com> Cc: Marek Vasut , Tom Rini , linux-meson@googlegroups.com, Joe Hershberger , Carlo Caione Subject: [U-Boot] [PATCH v4 3/3] arm: meson: implement calls to secure monitor 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" Implement calls to the secure monitor to reset the board and read the MAC address from e-fuse. Signed-off-by: Beniamino Galvani --- arch/arm/include/asm/arch-meson/sm.h | 13 +++++++ arch/arm/mach-meson/Makefile | 2 +- arch/arm/mach-meson/board.c | 3 +- arch/arm/mach-meson/sm.c | 71 ++++++++++++++++++++++++++++++++++ board/hardkernel/odroid-c2/odroid-c2.c | 16 ++++++++ 5 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 arch/arm/include/asm/arch-meson/sm.h create mode 100644 arch/arm/mach-meson/sm.c diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h new file mode 100644 index 0000000..87134c6 --- /dev/null +++ b/arch/arm/include/asm/arch-meson/sm.h @@ -0,0 +1,13 @@ +/* + * (C) Copyright 2016 - Beniamino Galvani + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __MESON_SM_H__ +#define __MESON_SM_H__ + +void meson_sm_reboot(void); +ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size); + +#endif /* __MESON_SM_H__ */ diff --git a/arch/arm/mach-meson/Makefile b/arch/arm/mach-meson/Makefile index 44e3d63..bf49b8b 100644 --- a/arch/arm/mach-meson/Makefile +++ b/arch/arm/mach-meson/Makefile @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += board.o +obj-y += board.o sm.o diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c index 05f4c79..6272f2f 100644 --- a/arch/arm/mach-meson/board.c +++ b/arch/arm/mach-meson/board.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -42,7 +43,7 @@ void dram_init_banksize(void) void reset_cpu(ulong addr) { - /* Not implemented yet */ + meson_sm_reboot(); } static struct mm_region gxbb_mem_map[] = { diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c new file mode 100644 index 0000000..3065bd2 --- /dev/null +++ b/arch/arm/mach-meson/sm.c @@ -0,0 +1,71 @@ +/* + * (C) Copyright 2016 Beniamino Galvani + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Secure monitor calls. + */ + +#include +#include + +#define MIN(a, b) ((a) < (b) ? (a) : (b)) + +#define FN_GET_SHARE_MEM_INPUT_BASE 0x82000020 +#define FN_GET_SHARE_MEM_OUTPUT_BASE 0x82000021 +#define FN_EFUSE_READ 0x82000030 +#define FN_EFUSE_WRITE 0x82000031 +#define FN_REBOOT 0x84000009 + +static void *shmem_input; +static void *shmem_output; + +static void meson_init_shmem(void) +{ + struct pt_regs regs; + + if (shmem_input && shmem_output) + return; + + regs.regs[0] = FN_GET_SHARE_MEM_INPUT_BASE; + smc_call(®s); + shmem_input = (void *)regs.regs[0]; + + regs.regs[0] = FN_GET_SHARE_MEM_OUTPUT_BASE; + smc_call(®s); + shmem_output = (void *)regs.regs[0]; + + debug("Secure Monitor shmem: 0x%p 0x%p\n", shmem_input, shmem_output); +} + +void meson_sm_reboot(void) +{ + struct pt_regs regs; + + regs.regs[0] = FN_REBOOT; + regs.regs[1] = 1; /* normal reboot */ + regs.regs[2] = 0; + regs.regs[3] = 0; + + smc_call(®s); +} + +ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size) +{ + struct pt_regs regs; + + meson_init_shmem(); + + regs.regs[0] = FN_EFUSE_READ; + regs.regs[1] = offset; + regs.regs[2] = size; + + smc_call(®s); + + if (regs.regs[0] == 0) + return -1; + + memcpy(buffer, shmem_output, MIN(size, regs.regs[0])); + + return regs.regs[0]; +} diff --git a/board/hardkernel/odroid-c2/odroid-c2.c b/board/hardkernel/odroid-c2/odroid-c2.c index c258d4f..bd72100 100644 --- a/board/hardkernel/odroid-c2/odroid-c2.c +++ b/board/hardkernel/odroid-c2/odroid-c2.c @@ -7,9 +7,15 @@ #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; @@ -27,6 +33,9 @@ U_BOOT_DEVICE(meson_eth) = { int misc_init_r(void) { + u8 mac_addr[EFUSE_MAC_SIZE]; + ssize_t len; + /* Select Ethernet function */ setbits_le32(GXBB_PINMUX(6), 0x3fff); @@ -47,5 +56,12 @@ int misc_init_r(void) mdelay(10); setbits_le32(GXBB_GPIO_OUT(3), BIT(14)); + if (!eth_getenv_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_setenv_enetaddr("ethaddr", mac_addr); + } + return 0; }