From patchwork Fri Sep 27 13:35:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1168520 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="gbLD2Eb6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46ftGp1Fkcz9sPK for ; Fri, 27 Sep 2019 23:40:50 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C4156C22056; Fri, 27 Sep 2019 13:35:59 +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 D258DC21FA5; Fri, 27 Sep 2019 13:35:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A47BCC21F34; Fri, 27 Sep 2019 13:35:31 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 1E974C21FAC for ; Fri, 27 Sep 2019 13:35:29 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id r19so6641870wmh.2 for ; Fri, 27 Sep 2019 06:35:29 -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=yWfkAlXsQs5cHEJC3+GFT4EXzadwBL85n6mY/O5cNC4=; b=gbLD2Eb6ujtdEguHuUVsTAjORIdBDF6A2yYQodTR0D9Uy0zN7xhgUXXn2pTw9buYX9 XfYoDX17VDk+K97EgrF9DcMWUtK+mUHygqsr98ZqP7wZKNjaXNfRyzZDElGspXyyTRWt ndgm05PF6GPWhVVE78RjzCvQ6tEPPjyp7xjoqi/UGpohaFdkwgXmo6Qf6wXor9touAaE IpqLnkWJ3pg9A6JDeLKtcJpaJjSYGz0GX6oR0rfQ4ueXVq+L7UXGvoY3tDGmi5GPxott +FCOtsnwWRNQRo+wOkiZyr6uOuAxhUXNVDvm/OxsXOmR8nxdkzqwb1Yv9IFhzWEKkySz oIsg== 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=yWfkAlXsQs5cHEJC3+GFT4EXzadwBL85n6mY/O5cNC4=; b=iqhARBKqJfJCy2DQClyU5Cdm+VSUM3Yrusu7OVPDUC+194zpA4QS6TUpjp2GsRSk13 zas1hNRW4pQa8aYay3iiBTILkwiYAHV+oJCSarii+FXOEhvpK4GczH5Tmku+F0sRIY+n rh0ZCEGDOqnoT2uHpX3DNGuGjcNOaE0kSTEk6DH1hSiINYNwlciw7fFTKCD/hlJJwKWW AF0SYjrpg0r+V0/YKVZUSFbMM3F+gfhWlLBn8ZRY1DppfeldroV1BXT5RSRXVfH2TGj8 /QA4bSiZtYX14LFz4mZ/pFx+Cv0YCBD3PGaCreUxsNjPpgYqAUCa18MSqEFdjiIlZZ1h k8Xg== X-Gm-Message-State: APjAAAX1LV4rMRTuh/l4bquJv7V4wDyTukzqSMqLb5E+6853c6RGCOHA DSXDj++lu3XWt04wPI9PEriX34i9VZ9fCw== X-Google-Smtp-Source: APXvYqwexiBem81TX79pBHtFPDyhPbpCb4YPCzKigVsFj4lhz9t+n2sZwcejryVqtSyCMKecgIVkXw== X-Received: by 2002:a1c:cf05:: with SMTP id f5mr7191501wmg.131.1569591328453; Fri, 27 Sep 2019 06:35:28 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id z13sm2828793wrq.51.2019.09.27.06.35.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Sep 2019 06:35:27 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Date: Fri, 27 Sep 2019 15:35:00 +0200 Message-Id: <86a013f5480c5f811075dc4d218f8fa7fd2df6cf.1569591296.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 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 --- 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");