From patchwork Wed Oct 2 13:39:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1170690 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="i61c5WbG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46jy8f1wNsz9sPh for ; Wed, 2 Oct 2019 23:46:09 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 64B2EC21E77; Wed, 2 Oct 2019 13:42:18 +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 18E46C21E3E; Wed, 2 Oct 2019 13:40:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 96CD3C21DF9; Wed, 2 Oct 2019 13:40:01 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 5F9EAC21DEC for ; Wed, 2 Oct 2019 13:39:57 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id v17so7048125wml.4 for ; Wed, 02 Oct 2019 06:39:57 -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=2dVnLAQY8jOCiWmVLjdB80DYZYJU8H0H881CWqSyMlU=; b=i61c5WbGYIPo+z2Mb0xmTPMnjPoiohEK/v26G0Cz7/O/7Xu3i6v/TZuEaks71/UVV8 TJOwpQFhtsT2ZAQhtz5pX1H+p1tFv9PLwDHcfjwz5ePHh6NWRjgcRY9uPlMwhxlLvPM6 YHGbx5VqfsSzTTiNxNzAtvDaaidMVDirut0Up7msUwPvUxSRoIrR6q3ScWUb457V6bDf u4u4PFAbnXVwzMPQ/adJ/C/cXRTQyhO+w00o/ULvQr1Zdw+QRlSm73iDHLWNLripf6UY bdAx5QKrHVEYSaZfQr0wk26cfmiA8wyugyZB282US1/s1h4HvHzsSF8uXUwF4FKbFL38 7Xtw== 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=2dVnLAQY8jOCiWmVLjdB80DYZYJU8H0H881CWqSyMlU=; b=gxgiXVg4PvT905VbOsq0uPd4uPYAXNqpUAQwwUyvMrhvazCc7JdPvYoiAPKHo9te2J 9LVdLa5djl1+WJfDElQhl/7OZ9DwLofeiomCVpIf/tCQvBuoCSe7KCE1Is0wQIBitoDf sh+jGqwKFbxDIDyGsWLHp3hy1q0xGROAAS3jGpKIQx94dC2wU5wffBtfvKTiSgraCnqE cd0P99nyhu0pGhnnLdinucpsRTyfisO1+OZUuRK77eudlurxrcyyqEdJWABc66x5yy4i mbXfXsX/nvLPYVx/RY4dWHiClTopcwMgPuh7gQCkarKj//exFjC/P3R3/IifYjXRFWp9 GmiQ== X-Gm-Message-State: APjAAAWPcjZxg6WG+iuODbH1azzg3Kv9f42OFKrWmhWgzCRbXyVDCbu2 UnA5nXI7jwxZ0QSZBi54S1WnFVCy2G0Q1w== X-Google-Smtp-Source: APXvYqxLvWYKjrnPPakxtGVpOgqIZYPfZbkJOBczxfGDuRNAZiEIDBSJECOJdoqooMexPjXpPq3g3Q== X-Received: by 2002:a1c:80d0:: with SMTP id b199mr3008952wmd.102.1570023596739; Wed, 02 Oct 2019 06:39:56 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id p85sm9657848wme.23.2019.10.02.06.39.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Oct 2019 06:39:56 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Date: Wed, 2 Oct 2019 15:39:28 +0200 Message-Id: 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 10/13] arm64: zynqmp: remove old fw version function 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 Removes the old function to get the firmware version. Signed-off-by: Ibai Erkiaga Signed-off-by: Michal Simek --- Changes in v2: None arch/arm/mach-zynqmp/cpu.c | 23 ------------------- arch/arm/mach-zynqmp/include/mach/sys_proto.h | 1 - 2 files changed, 24 deletions(-) diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c index f28b964a1560..bb21cbcadf69 100644 --- a/arch/arm/mach-zynqmp/cpu.c +++ b/arch/arm/mach-zynqmp/cpu.c @@ -180,29 +180,6 @@ int __maybe_unused invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, return regs.regs[0]; } -unsigned int __maybe_unused zynqmp_pmufw_version(void) -{ - int ret; - u32 ret_payload[PAYLOAD_ARG_CNT]; - static u32 pm_api_version = ZYNQMP_PM_VERSION_INVALID; - - /* - * Get PMU version only once and later - * just return stored values instead of - * asking PMUFW again. - */ - if (pm_api_version == ZYNQMP_PM_VERSION_INVALID) { - ret = invoke_smc(ZYNQMP_SIP_SVC_GET_API_VERSION, 0, 0, 0, 0, - ret_payload); - pm_api_version = ret_payload[1]; - - if (ret) - panic("PMUFW is not found - Please load it!\n"); - } - - return pm_api_version; -} - static int zynqmp_mmio_rawwrite(const u32 address, const u32 mask, const u32 value) diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h index 658974445417..27603a60ff8f 100644 --- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h +++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h @@ -48,7 +48,6 @@ unsigned int zynqmp_get_silicon_version(void); void handoff_setup(void); -unsigned int zynqmp_pmufw_version(void); int zynqmp_mmio_write(const u32 address, const u32 mask, const u32 value); int zynqmp_mmio_read(const u32 address, u32 *value); int invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3,