From patchwork Mon Oct 14 11:45:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1176273 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="B+yUZLkh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46sGwS196wz9sPc for ; Mon, 14 Oct 2019 22:46:00 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CE9C4C21E63; Mon, 14 Oct 2019 11:45:28 +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.8 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 09976C21DF3; Mon, 14 Oct 2019 11:45:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8372AC21BE5; Mon, 14 Oct 2019 11:45:18 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 2A472C21BE5 for ; Mon, 14 Oct 2019 11:45:18 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id y19so19362563wrd.3 for ; Mon, 14 Oct 2019 04:45:18 -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=FqYwHFCYtCkvvpI8V5qwNBQbUSaq7ruq0hfVMymJNTQ=; b=B+yUZLkhCDhqMuvRPaWfpii1m5yJxWUUD7wHzLKT5cPgmvlFtEJmFLAsZoiG5LqA3J ybVG85XW4nu4WRoAAZl/dcQXR0cm6/TGSiBJDvj9Xsd+e1mt+J5aW9MDXCHtDLneZTUp R1OMWjwuNZ/NIedGpMOHuG4JCmqGWDC+5OybEb3J2hqahCZAaCz2VJ8aethE7THz9G+1 paSnJpP+vS51+6DFSWSV6dG2iKt+XOsoEIatm5uYg3Arcdw5fDUhLTngYzvfJICxUyj7 VNPRxRwkPlFmJnVVdWFlkuZBWOt5T7oUdnjk0kWhXVhnb3hFVDSU7nD0iW0F9Fttlk1c nZdQ== 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=FqYwHFCYtCkvvpI8V5qwNBQbUSaq7ruq0hfVMymJNTQ=; b=fldSR5lOl+OuVdhKH/XuI5OpI2bFBFdvEuMXCFqafSTZUFPOOhOgeI5G7e6lxJc3u5 zBZvaS125tfky5RwJRV2j0RHTno6RF8fJyAnTJ/4BJwBAcfu8KNb6p6JMUZv9Uy3Wxjg BC3XLesV1Sep6MmtWwzgueiyv5UnLSp0BLGGc2mObn7KfJxXyWsb5nOUj+AmlWrEI1Ha xkuA/kM1ns0WjIyaBmk3OOLCj+RUgTb2+ZykzLGcl8EWcSY4nl80mG9mLECkK1i7QcVQ L1r1acmtuz5ckq+iW7iZJGiusZnMQpEl1R8Z/I04D7aPX8gGoA+XSZrF6+Xve1J7Xz2C pt5w== X-Gm-Message-State: APjAAAV5EJmgjtA3mxy44+IItVRNRxOzYDfQaEEhh5o4IvMIl7OHHvx/ FpN5L2Lp8em70zTJ9yTn+x42t5zvCqePjA== X-Google-Smtp-Source: APXvYqzuyknjgwYrnHBBZocjBporcYPknTEGSw0TzNNoKGqbyObR55lZWW2HN+5n+o6u2lhaaILKeg== X-Received: by 2002:a5d:6445:: with SMTP id d5mr15286868wrw.149.1571053517508; Mon, 14 Oct 2019 04:45:17 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id o9sm25902501wrh.46.2019.10.14.04.45.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 04:45:16 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Date: Mon, 14 Oct 2019 13:45:10 +0200 Message-Id: <9f5eca4c3271fecd764abee1ea047de2c372fc3e.1571053509.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Cc: Luca Ceresoli , Albert Aribaud Subject: [U-Boot] [PATCH v2 1/4] arm64: versal: Clean pm_api_id usage 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" Copy enum values from platform code to firmware code. IDs are shared between ZynqMP and Versal. Signed-off-by: Michal Simek --- Changes in v2: None arch/arm/mach-versal/cpu.c | 1 + arch/arm/mach-versal/include/mach/sys_proto.h | 55 ------------------- drivers/clk/clk_versal.c | 1 + include/zynqmp_firmware.h | 50 ++++++++++++++++- 4 files changed, 51 insertions(+), 56 deletions(-) diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c index 49f1e51c8ea5..60394e761ede 100644 --- a/arch/arm/mach-versal/cpu.c +++ b/arch/arm/mach-versal/cpu.c @@ -9,6 +9,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h index 2f5ad02bf476..c282078f8626 100644 --- a/arch/arm/mach-versal/include/mach/sys_proto.h +++ b/arch/arm/mach-versal/include/mach/sys_proto.h @@ -8,61 +8,6 @@ enum { TCM_SPLIT, }; -enum pm_api_id { - PM_GET_API_VERSION = 1, - PM_SET_CONFIGURATION, - PM_GET_NODE_STATUS, - PM_GET_OPERATING_CHARACTERISTIC, - PM_REGISTER_NOTIFIER, - PM_REQUEST_SUSPEND, - PM_SELF_SUSPEND, - PM_FORCE_POWERDOWN, - PM_ABORT_SUSPEND, - PM_REQUEST_WAKEUP, - PM_SET_WAKEUP_SOURCE, - PM_SYSTEM_SHUTDOWN, - PM_REQUEST_NODE, - PM_RELEASE_NODE, - PM_SET_REQUIREMENT, - PM_SET_MAX_LATENCY, - PM_RESET_ASSERT, - PM_RESET_GET_STATUS, - PM_MMIO_WRITE, - PM_MMIO_READ, - PM_PM_INIT_FINALIZE, - PM_FPGA_LOAD, - PM_FPGA_GET_STATUS, - PM_GET_CHIPID, - PM_SECURE_SHA = 26, - PM_SECURE_RSA, - PM_PINCTRL_REQUEST, - PM_PINCTRL_RELEASE, - PM_PINCTRL_GET_FUNCTION, - PM_PINCTRL_SET_FUNCTION, - PM_PINCTRL_CONFIG_PARAM_GET, - PM_PINCTRL_CONFIG_PARAM_SET, - PM_IOCTL, - PM_QUERY_DATA, - PM_CLOCK_ENABLE, - PM_CLOCK_DISABLE, - PM_CLOCK_GETSTATE, - PM_CLOCK_SETDIVIDER, - PM_CLOCK_GETDIVIDER, - PM_CLOCK_SETRATE, - PM_CLOCK_GETRATE, - PM_CLOCK_SETPARENT, - PM_CLOCK_GETPARENT, - PM_SECURE_IMAGE, - PM_FPGA_READ = 46, - PM_SECURE_AES, - PM_CLOCK_PLL_GETPARAM = 49, - PM_REGISTER_ACCESS = 52, - PM_EFUSE_ACCESS, - PM_FEATURE_CHECK = 63, - PM_API_MAX, -}; - -#define PM_SIP_SVC 0xC2000000 #define PAYLOAD_ARG_CNT 4U void tcm_init(u8 mode); diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c index df87645774c5..e0fa661be9e0 100644 --- a/drivers/clk/clk_versal.c +++ b/drivers/clk/clk_versal.c @@ -12,6 +12,7 @@ #include #include #include +#include #define MAX_PARENT 100 #define MAX_NODES 6 diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h index a20cbcdb869e..742934814cb0 100644 --- a/include/zynqmp_firmware.h +++ b/include/zynqmp_firmware.h @@ -11,7 +11,55 @@ enum pm_api_id { PM_GET_API_VERSION = 1, PM_SET_CONFIGURATION, - PM_SECURE_IMAGE = 45, + PM_GET_NODE_STATUS, + PM_GET_OPERATING_CHARACTERISTIC, + PM_REGISTER_NOTIFIER, + PM_REQUEST_SUSPEND, + PM_SELF_SUSPEND, + PM_FORCE_POWERDOWN, + PM_ABORT_SUSPEND, + PM_REQUEST_WAKEUP, + PM_SET_WAKEUP_SOURCE, + PM_SYSTEM_SHUTDOWN, + PM_REQUEST_NODE, + PM_RELEASE_NODE, + PM_SET_REQUIREMENT, + PM_SET_MAX_LATENCY, + PM_RESET_ASSERT, + PM_RESET_GET_STATUS, + PM_MMIO_WRITE, + PM_MMIO_READ, + PM_PM_INIT_FINALIZE, + PM_FPGA_LOAD, + PM_FPGA_GET_STATUS, + PM_GET_CHIPID, + PM_SECURE_SHA = 26, + PM_SECURE_RSA, + PM_PINCTRL_REQUEST, + PM_PINCTRL_RELEASE, + PM_PINCTRL_GET_FUNCTION, + PM_PINCTRL_SET_FUNCTION, + PM_PINCTRL_CONFIG_PARAM_GET, + PM_PINCTRL_CONFIG_PARAM_SET, + PM_IOCTL, + PM_QUERY_DATA, + PM_CLOCK_ENABLE, + PM_CLOCK_DISABLE, + PM_CLOCK_GETSTATE, + PM_CLOCK_SETDIVIDER, + PM_CLOCK_GETDIVIDER, + PM_CLOCK_SETRATE, + PM_CLOCK_GETRATE, + PM_CLOCK_SETPARENT, + PM_CLOCK_GETPARENT, + PM_SECURE_IMAGE, + PM_FPGA_READ = 46, + PM_SECURE_AES, + PM_CLOCK_PLL_GETPARAM = 49, + PM_REGISTER_ACCESS = 52, + PM_EFUSE_ACCESS, + PM_FEATURE_CHECK = 63, + PM_API_MAX, }; #define PM_SIP_SVC 0xc2000000