From patchwork Thu Sep 10 10:41:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1361459 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.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.a=rsa-sha256 header.s=20150623 header.b=bedfE3O6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BnFn92Nb4z9sTd for ; Thu, 10 Sep 2020 20:41:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 118B181F67; Thu, 10 Sep 2020 12:41:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; 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="bedfE3O6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8FF5D822AF; Thu, 10 Sep 2020 12:41:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BE2BF81260 for ; Thu, 10 Sep 2020 12:41:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wr1-x441.google.com with SMTP id e16so6180204wrm.2 for ; Thu, 10 Sep 2020 03:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=mQJ4OHi9An3JXnfFW/zjoJiOW4BFizjwovc/CaolENg=; b=bedfE3O6CC6/CkxplR/y/SBUSrD41y3gD7jGayWwiP7aFkwTthdKsoH2pzNxcSUSEs hZZ2EmSK1SJYbiGA1COfBVNFrDUNQdrzoONsgGMC+MJZcXrxxqxSSelFgQSFgMZTqguX Nsuv0VB3qQ4ZuPj2N+GsHDuj6IzhOGO09aklr9CFfhCIr+GGNIJSdqfpxZMcznj5582h vcQFo10FIc7/XlZdutkAoEB6wQRg7K6oy3Nzyq8oA7aJxP4CpfmHzjty8ZRp2jQnjJWN gk3mDn9UQxPROoxRHKCLSx1qRzwHlRDOfmFK0Ga3oFwBA7YOUVjLhJf7O0HjvExnxXQk JhAQ== 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:subject:date:message-id :mime-version:content-transfer-encoding; bh=mQJ4OHi9An3JXnfFW/zjoJiOW4BFizjwovc/CaolENg=; b=l8eFeNutn1eWzs9mDbw/I+cTjvYc3jLXEtp2gqV+AYU+f3sY111Q2r+F/0ocMj2hoT w0CG6/ZA5TklHPAiEnlSxDiRkbi8krJzxol2dLK9SGb/jDievnEFF9hGUfmE0C70BXlk rkqEsxEh67VT/09W3Igw70GBQ6wZBxLofGLJsCw2VeWud7xN8HmjPP1RmyL2ZMlQ80GW Vio5Th3ZUR0tzDiaEDk1ubA+TwBlBx5BxmzcVjf+U3d1YeljHcs6To+D/SBaXPwzCJQU O3SqXLgRPatZFsPAfUZuO0iq5yJZT92K8kyXH8JaHTTDpMMb49jF91vQyzeZXcz1sZd0 diLQ== X-Gm-Message-State: AOAM532NmgN2l9g/bEdD8X/+PuC7VbYfMDIVam30HALP9u7Sgufgwj+d qyAelPgkrk6GZrHry9fK3CRMoa8guJVtlw== X-Google-Smtp-Source: ABdhPJz9sdup/84mhtpamA5U+bKSNSsIVA412JCSduj/nZbq41O1VobKzM2bphBVdkkWeR+R0qhf4Q== X-Received: by 2002:a5d:560d:: with SMTP id l13mr8026600wrv.49.1599734497077; Thu, 10 Sep 2020 03:41:37 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id h17sm8962999wro.27.2020.09.10.03.41.36 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Sep 2020 03:41:36 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Subject: [PATCH] fpga: zynqmp: Get rid of ZYNQMP_SIP_SVC* macros Date: Thu, 10 Sep 2020 12:41:28 +0200 Message-Id: <2597dc800d65786208f99fa47958cb53395dff2f.1599734486.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean There is no need to use these macros because enum pm_api_id can be used instead. Signed-off-by: Michal Simek --- drivers/fpga/zynqmppl.c | 8 ++++---- include/zynqmppl.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index 5b103cfeaf18..03878d32ec1c 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -231,11 +231,11 @@ static int zynqmp_load(xilinx_desc *desc, const void *buf, size_t bsize, buf_hi = upper_32_bits(bin_buf); if (xilfpga_old) - ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo, + ret = xilinx_pm_request(PM_FPGA_LOAD, buf_lo, buf_hi, (u32)(uintptr_t)bsizeptr, bstype, ret_payload); else - ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo, + ret = xilinx_pm_request(PM_FPGA_LOAD, buf_lo, buf_hi, (u32)bsize, 0, ret_payload); if (ret) @@ -277,7 +277,7 @@ static int zynqmp_loads(xilinx_desc *desc, const void *buf, size_t bsize, buf_lo = lower_32_bits((ulong)buf); buf_hi = upper_32_bits((ulong)buf); - ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo, + ret = xilinx_pm_request(PM_FPGA_LOAD, buf_lo, buf_hi, (u32)(uintptr_t)fpga_sec_info->userkey_addr, flag, ret_payload); @@ -295,7 +295,7 @@ static int zynqmp_pcap_info(xilinx_desc *desc) int ret; u32 ret_payload[PAYLOAD_ARG_CNT]; - ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_STATUS, 0, 0, 0, + ret = xilinx_pm_request(PM_FPGA_GET_STATUS, 0, 0, 0, 0, ret_payload); if (!ret) printf("PCAP status\t0x%x\n", ret_payload[1]); diff --git a/include/zynqmppl.h b/include/zynqmppl.h index a0a52ec4c1d3..35cfe17d4441 100644 --- a/include/zynqmppl.h +++ b/include/zynqmppl.h @@ -10,9 +10,6 @@ #include #include -#define ZYNQMP_SIP_SVC_CSU_DMA_CHIPID 0xC2000018 -#define ZYNQMP_SIP_SVC_PM_FPGA_LOAD 0xC2000016 -#define ZYNQMP_SIP_SVC_PM_FPGA_STATUS 0xC2000017 #define ZYNQMP_FPGA_OP_INIT (1 << 0) #define ZYNQMP_FPGA_OP_LOAD (1 << 1) #define ZYNQMP_FPGA_OP_DONE (1 << 2)