From patchwork Mon Jan 15 15:46:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 860954 X-Patchwork-Delegate: monstr@monstr.eu 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b="ecQD4ytu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zKyQz1ZMTz9t3l for ; Tue, 16 Jan 2018 02:47:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 34F76C21DB9; Mon, 15 Jan 2018 15:47:17 +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=RCVD_IN_DNSWL_BLOCKED, 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 E2BB2C21C34; Mon, 15 Jan 2018 15:47:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CF739C21C34; Mon, 15 Jan 2018 15:47:12 +0000 (UTC) Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by lists.denx.de (Postfix) with ESMTPS id 23DC3C21C29 for ; Mon, 15 Jan 2018 15:47:12 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id 33so14634576qtv.1 for ; Mon, 15 Jan 2018 07:47:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=3Cky8mubKtq0Y90+wYjY76YHr4zgNXJ9FLdqLL/s6eA=; b=ecQD4ytuNPexqUcGMTxQkuM8MSQqvL1dvuVgeV/nbtNxOZRhypYD9q9RxAZu/Who9K cTdhZwwRNQNbXu2PZAjgSSsYT6DLoUpRDYe9PbuKLSlmYDFT56XgEHHvTI/1/As++W2y HB4sK0Rg253hB3kIlVaxCGIDbCigiv8z9xfaCQP3LQjP99z5S2EL2uABxdWb/cNluouT 3he75Tz+sQtFSZjSXJfs38NhBtkTNxOirFpzfetgCJDGXFhksLhNsTWAnypsSLlwkKAp hpqSHAkbWBl1wRdiQIkCXikl+JK7cYDKmtzT/JLhei3mM5476qp4+io4u9Q9rGkINxba UMCA== 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; bh=3Cky8mubKtq0Y90+wYjY76YHr4zgNXJ9FLdqLL/s6eA=; b=tGrvoASmrWf3E0XvbXfV2SP8S5HyCTKpgtgVIKGcf8XQbE0iPnFc6FWh7+LEGeiNF5 YQ2m0duokG09vNv6Y2CnB65uQWgWPO0cyVOVIUBtvfZDiwHFE9XYs9EcgnXA7Ceqnh0p 1egUh8BTKyuEdNXeo5eIFkLxVq+N6cxrybE24KTcH40x++7A/bwXq1s4kURTn0yjnlqs n1aSulDKac2cwlIg2QumAVUvza9m6WG0mPb2xZ2OEy58nCKXB5XzLZ8Yk9GSwKH0Zl9H DY8Ws3RzBSmBJr+0zQ31OvXsLfgUmYekNVCaT9Wm3eNIPQcDZIwBmMW3QucfHn9xbzST LstQ== X-Gm-Message-State: AKwxytdd4tUjjsoej8V65ODwzXZpmrV4726jSdxLx7gy/RPua1+E14F1 nOvr/IsNxLOjM1Xf61sjO66F1LQW X-Google-Smtp-Source: ACJfBotb/SA24PmkyZBXYh/fQ9sWDSii9/7dsUlzrC+rjYpWL9/NL/uHW5oXQrwDXia0RNWhWHCaow== X-Received: by 10.200.35.3 with SMTP id a3mr2404124qta.311.1516031230723; Mon, 15 Jan 2018 07:47:10 -0800 (PST) Received: from localhost.localdomain ([190.210.56.45]) by smtp.gmail.com with ESMTPSA id r80sm2006856qke.27.2018.01.15.07.47.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 07:47:09 -0800 (PST) From: Ezequiel Garcia To: u-boot@lists.denx.de Date: Mon, 15 Jan 2018 12:46:48 -0300 Message-Id: <20180115154649.9551-1-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.15.1 Cc: michal.simek@xilinx.com Subject: [U-Boot] [PATCH 1/2] zynq: board: Remove checkboard() 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" Currently we are showing silicon version as board info, which should be part of the CPU info display. This commit removes the current checkboard implementation, and lets the generic show_board_info() show the DT 'model' property. CPU and silicon information will be added in a follow-up patch. Signed-off-by: Ezequiel Garcia --- board/xilinx/zynq/board.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index e59038106aa6..5785ad369fa0 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -109,22 +109,6 @@ int board_late_init(void) return 0; } -#ifdef CONFIG_DISPLAY_BOARDINFO -int checkboard(void) -{ - u32 version = zynq_get_silicon_version(); - - version <<= 1; - if (version > (PCW_SILICON_VERSION_3 << 1)) - version += 1; - - puts("Board: Xilinx Zynq\n"); - printf("Silicon: v%d.%d\n", version >> 1, version & 1); - - return 0; -} -#endif - int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) { #if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \ From patchwork Mon Jan 15 15:46:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 860955 X-Patchwork-Delegate: monstr@monstr.eu 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b="f91OADvx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zKyRR3Hmkz9t3l for ; Tue, 16 Jan 2018 02:47:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1DC61C21DAB; Mon, 15 Jan 2018 15:47: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=RCVD_IN_DNSWL_BLOCKED, 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 BA3BEC21D56; Mon, 15 Jan 2018 15:47:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1E734C21DB5; Mon, 15 Jan 2018 15:47:21 +0000 (UTC) Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by lists.denx.de (Postfix) with ESMTPS id 89D66C21DE8 for ; Mon, 15 Jan 2018 15:47:17 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id d54so2571783qtd.4 for ; Mon, 15 Jan 2018 07:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gLccqK7chTY8ZfeE29lignWV2+P/8peAgMyvrsJbviw=; b=f91OADvxaZPIn5J2eCGHFD9z/dlKW5+5/eejxk8A+/9uP/zkOEoQyJTSPpVW7fYLbn YMadorIloMajR2BLPy6iNtU3VlA4d/1MVoEbKSL6DDkm7X3vaMWezH17j/voVPA+9vF7 gxvN4DJRax+usfXlTKjX/iB9ZoQ4C/CgOVLNrrI40mZt0ndhTI+N0QThdBUXN3Wd7Ok1 JHclRaSgX1HDnlhzf18vmp4GD9FEeWxD1CUF5o6d6IKtLCZSUAG8A47p4RVsHqE5EfDM TfVVTZ51kiY6uUEy4YyL+HxWq1m8Vc2TZETf+t7z6qsoj+McwkXq1mAQcw1jQ/t/lUVM qJvA== 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=gLccqK7chTY8ZfeE29lignWV2+P/8peAgMyvrsJbviw=; b=T8DvOaUqY4e9TQlNtvBV1rXP+jEd67TAxnnTV3S6GgjBA0VA4HwnBom9FKCDKkF+J4 jF1Mnq0QnWmwlpX2c2gRO5/6f8Z1Axx2ul5PVoWAi3ITFSlCm74bsW+Et2ItNVLSrEpU ieKF8Tr4LEY66B2xnwO350bOZ1TIYsAbgnqGG8bRgyJnf4xv/v2VJF6tpRd5cm+pJO0N 4Oxrg5vgNXuEq9aatOgkMb7GGnxbms2/BcWhaZf7BFMc+5VRN8PaLBPGzS8gjCMNfKNh LLanbBFQm8fwmnmcD0zrA7OsVbJH7IN4riUIgoaEcvGOY9Z4edfDpauxRVQ20EW0wAVv /vZQ== X-Gm-Message-State: AKwxytc+pd+JrDZCONltlkL8Jh2xPF1M3cHLHL59/kpyuS/ET7hPGfbq 6SlCwm2xw4E+qAh/h5xIwlKUXdX/ X-Google-Smtp-Source: ACJfBoulRDSIE9opBGgjKnvd+IfboiPvkbWnBSFeryaFtY71llhW9gizw8H3Os6faDFlLp95GyP89w== X-Received: by 10.200.52.70 with SMTP id v6mr20611598qtb.63.1516031236388; Mon, 15 Jan 2018 07:47:16 -0800 (PST) Received: from localhost.localdomain ([190.210.56.45]) by smtp.gmail.com with ESMTPSA id r80sm2006856qke.27.2018.01.15.07.47.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 07:47:15 -0800 (PST) From: Ezequiel Garcia To: u-boot@lists.denx.de Date: Mon, 15 Jan 2018 12:46:49 -0300 Message-Id: <20180115154649.9551-2-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115154649.9551-1-ezequiel@vanguardiasur.com.ar> References: <20180115154649.9551-1-ezequiel@vanguardiasur.com.ar> Cc: michal.simek@xilinx.com Subject: [U-Boot] [PATCH 2/2] zynq: Support CPU info display 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" This commit adds CPU and silicon version information consuming the SLCR IDCODE and DEVCFG MCTRL registers, respectively. Signed-off-by: Ariel D'Alessandro Signed-off-by: Ezequiel Garcia --- arch/arm/mach-zynq/Makefile | 1 + arch/arm/mach-zynq/cpu_info.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 arch/arm/mach-zynq/cpu_info.c diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile index e3f0117da563..31f1e0d5a8ad 100644 --- a/arch/arm/mach-zynq/Makefile +++ b/arch/arm/mach-zynq/Makefile @@ -14,5 +14,6 @@ obj-y += ddrc.o obj-y += slcr.o obj-y += clk.o obj-y += lowlevel_init.o +obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o AFLAGS_lowlevel_init.o := -mfpu=neon obj-$(CONFIG_SPL_BUILD) += spl.o ps7_spl_init.o diff --git a/arch/arm/mach-zynq/cpu_info.c b/arch/arm/mach-zynq/cpu_info.c new file mode 100644 index 000000000000..730ccccb73da --- /dev/null +++ b/arch/arm/mach-zynq/cpu_info.c @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2018 VanguardiaSur - www.vanguardiasur.com.ar + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include +#include +#include +#include + +static const struct { + u8 idcode; + const char *cpuinfo; +} zynq_cpu_info[] = { + { .idcode = XILINX_ZYNQ_7007S, .cpuinfo = "7007S" }, + { .idcode = XILINX_ZYNQ_7010, .cpuinfo = "7010" }, + { .idcode = XILINX_ZYNQ_7012S, .cpuinfo = "7012S" }, + { .idcode = XILINX_ZYNQ_7014S, .cpuinfo = "7014S" }, + { .idcode = XILINX_ZYNQ_7015, .cpuinfo = "7015" }, + { .idcode = XILINX_ZYNQ_7020, .cpuinfo = "7020" }, + { .idcode = XILINX_ZYNQ_7030, .cpuinfo = "7030" }, + { .idcode = XILINX_ZYNQ_7035, .cpuinfo = "7035" }, + { .idcode = XILINX_ZYNQ_7045, .cpuinfo = "7045" }, + { .idcode = XILINX_ZYNQ_7100, .cpuinfo = "7100"}, + { /* Sentinel */ }, +}; + +int print_cpuinfo(void) +{ + u32 idcode, version; + u8 i; + + idcode = zynq_slcr_get_idcode(); + + for (i = 0; zynq_cpu_info[i].idcode; i++) { + if (zynq_cpu_info[i].idcode == idcode) { + printf("CPU: Zynq %s\n", zynq_cpu_info[i].cpuinfo); + break; + } + } + + version = zynq_get_silicon_version() << 1; + if (version > (PCW_SILICON_VERSION_3 << 1)) + version += 1; + printf("Silicon: v%d.%d\n", version >> 1, version & 1); + return 0; +}