From patchwork Wed Oct 2 13:39:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1170686 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; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="144Y4x86"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46jy6r41cHz9sPh for ; Wed, 2 Oct 2019 23:44:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 39555C21E63; Wed, 2 Oct 2019 13:42: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_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 A6C73C21E77; Wed, 2 Oct 2019 13:40:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 49A6BC21E44; Wed, 2 Oct 2019 13:40:00 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id 6B06CC21E45 for ; Wed, 2 Oct 2019 13:39:55 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id 3so7068001wmi.3 for ; Wed, 02 Oct 2019 06:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=M7qn5WPw82Meorls1u4QEVq7ZXytQfG1A9bN8irYH6E=; b=144Y4x86c9XAF5kb1oYoDca3FU5JLkts8NUE07qUQMdXhUti6HW7HEmGaO/6oNdE6m g5BU0Jqfl4HJdjGQa6bjil018X6kd+JT6vhRb3r5edkCYBwzRdz6ZaRjjeo/xVyZ7tKA PIil9NzQBQCL97/OgiHjh4oGudvWA41JMyiwwQE+DK6Xw6oHgG2AC76LFbivbMkIDCwy 3UqVtNwr9lqMpOOt64he6kuUtBqo4u/mIO4s4pyyRIdsABGOdJowFtzuksQkuhR0EKNt d8cjdYynEzMG/6HcqbaakHREaDzYOK0cq5Yo4PeYDk1osbaSxzCxWJ4JCM6PCMkqyXq1 MCsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=M7qn5WPw82Meorls1u4QEVq7ZXytQfG1A9bN8irYH6E=; b=MDAcmrbb2b1wIeeCBzDRf7O5kelVCJx/TO0R62PCpSHY+FiIsL8GzqvQxvwWjmJwvX ZlXqqP7JkUNpUzMsajFUBojcCcnvlQm02jrxrSKFBeI7NylLtqvhNSClmeALCIydC/Tc XbEmAvoekIbBotnpAM+K12Un2Dgyo/4vtfeDfIJ9Hz3GqhC8ZY8JmFRlG07ZnLMc6kjL KpBb0iomI/JBLWzKbroQDJG3HY5M50cr6YUcNigXnkqe2RbRICwCjnEZPxWwUrMC3fvp lD6qIXmm5jvy2T7Hx9FLXU/qxfD8pgHQgnT2iEvI2g7qUV0PPqkcJQxHLXhiUXET+Y4Q 7FQg== X-Gm-Message-State: APjAAAUugaQLZI7bIsF2nTg2STLnCW4IPIhyHVHdNMicycoHmKrS2Wd1 Tf2rVs1eNpGB5hiVpGF6+H15Qo8v7JKYvQ== X-Google-Smtp-Source: APXvYqyl8Fbz2zufCGsZJkz548DZkOqypCiuZoVs5oUqcKR0XXQp0GEsGCDFS9KOtLaYlsbKBumiIg== X-Received: by 2002:a7b:cc0b:: with SMTP id f11mr3021063wmh.112.1570023594800; Wed, 02 Oct 2019 06:39:54 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id t4sm20854167wrm.13.2019.10.02.06.39.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Oct 2019 06:39:53 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Date: Wed, 2 Oct 2019 15:39:27 +0200 Message-Id: <3a6e39a8b4dcb93ef2bf027418089d468a34c844.1570023563.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Cc: ibai.erkiaga-elorza@xilinx.com, luca@lucaceresoli.net Subject: [U-Boot] [PATCH v2 09/13] arm64: zynqmp: use firmware driver to get version 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" From: Ibai Erkiaga Use the new function from firmware version to get the firmware version. Signed-off-by: Ibai Erkiaga Signed-off-by: Michal Simek --- Changes in v2: None board/xilinx/zynqmp/zynqmp.c | 2 +- drivers/fpga/zynqmppl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index d9186f463f20..8a66d3e50aad 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -321,7 +321,7 @@ int board_early_init_f(void) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CLK_ZYNQMP) u32 pm_api_version; - pm_api_version = zynqmp_pmufw_version(); + pm_api_version = zynqmp_firmware_version(); printf("PMUFW:\tv%d.%d\n", pm_api_version >> ZYNQMP_PM_VERSION_MAJOR_SHIFT, pm_api_version & ZYNQMP_PM_VERSION_MINOR_MASK); diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index 6168626aeef3..c2670271c8ea 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -152,7 +152,7 @@ static ulong zynqmp_align_dma_buffer(u32 *buf, u32 len, u32 swap) buf = new_buf; } else if ((swap != SWAP_DONE) && - (zynqmp_pmufw_version() <= PMUFW_V1_0)) { + (zynqmp_firmware_version() <= PMUFW_V1_0)) { /* For bitstream which are aligned */ new_buf = buf; @@ -205,7 +205,7 @@ static int zynqmp_load(xilinx_desc *desc, const void *buf, size_t bsize, u32 ret_payload[PAYLOAD_ARG_CNT]; bool xilfpga_old = false; - if (zynqmp_pmufw_version() <= PMUFW_V1_0) { + if (zynqmp_firmware_version() <= PMUFW_V1_0) { puts("WARN: PMUFW v1.0 or less is detected\n"); puts("WARN: Not all bitstream formats are supported\n"); puts("WARN: Please upgrade PMUFW\n");