Message ID | b26461aa51d7e88f1dfd2821aa7ba672bc459162.1627469480.git.michal.simek@xilinx.com |
---|---|
State | Superseded |
Delegated to: | Michal Simek |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) 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=REa5p798; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GZVph0nJhz9sRR for <incoming@patchwork.ozlabs.org>; Wed, 28 Jul 2021 20:51:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB70482C5D; Wed, 28 Jul 2021 12:51:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (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="REa5p798"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44FA182C7F; Wed, 28 Jul 2021 12:51:31 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (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 CC20D82C5D for <u-boot@lists.denx.de>; Wed, 28 Jul 2021 12:51:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x62a.google.com with SMTP id gs8so3790306ejc.13 for <u-boot@lists.denx.de>; Wed, 28 Jul 2021 03:51:27 -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 :mime-version:content-transfer-encoding; bh=HSq/oUCTdTgSbB8u5Do85X+fkK1ciBJaA4TcKEA7zYg=; b=REa5p798JY9nVCrO6PYq5WW/wrW8dB3xcAb/pFQ60CJ6RDmenJvN+t9jVDVIwc+Vif TgQspQOnd99t+0kKvfgxFeqQDN1CIjGfr5lmXEjk7b2LSZyMCGm5DcyZGW1AxP7R6emR GGNITXTRyxOgL9nrnfnijPI5+GQ+TwBatu1NiQfvEf9+dJ9stxPR3BtqsCubRr7Wsf4M Z/9y7Mso2DQm7zyWQPcIAzAgGgzwhFt6hwJumvqag67/i7CGHmWYHgdwvYyt0kXEvhb5 8jbvfQ+dUqh9SybHtpQ7rT+JKYsE7sAIHH111Cx3/C4ox7dW4t1hyagmz/4pxuYnUMM5 TNVw== 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:mime-version:content-transfer-encoding; bh=HSq/oUCTdTgSbB8u5Do85X+fkK1ciBJaA4TcKEA7zYg=; b=accANiwsC4RpCn7/sAjOKtyIE7J2Xz7OnLO5ZEWI9SEkn1NY/g1ZYlwiqHKVd7LrZC JTQKFOH4k/IVxyRAb7iomEpBn+FIXWkNyO3/TX0WlEJZA2xyFeiCZhx1OHFWvyZsczea s6g4LQZ0e7E1ZpxkXCVaRxv6lgEcD9wnBjdDzCcG25GTE8jKJdls9dalYqTkFP4wCPb+ WXu14j0mz4bwN/NnUTMnpb1k9w+HwDTR/z/wnN08zdVIA9zeHai3YTfCprxk5tlix+IJ s1viqe+7h13JQZfZOYopTpW/lQOU6gCSlNCBGcLYvkXnnTRmBuAEdGJKH+VsxFePw1QI 5xaQ== X-Gm-Message-State: AOAM532vzKioWxsca25tMc0lOSRfUD9RkWMW+AR1isSeLdLhHyOOxyUZ M/P2WeJO9XKcxUALvhsv5d2rpPw/7Cf/cvXv X-Google-Smtp-Source: ABdhPJwTkYcDJ/k2KSHrf/yroYVhBXaDG88LQHURHcNym+kCE9BahOG0IFfMr0hlb+AEP+NYbDSm+Q== X-Received: by 2002:a17:906:5d05:: with SMTP id g5mr17186640ejt.277.1627469487270; Wed, 28 Jul 2021 03:51:27 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6:f666:9af6:3fed:e53b]) by smtp.gmail.com with ESMTPSA id yc29sm546970ejb.104.2021.07.28.03.51.26 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Jul 2021 03:51:27 -0700 (PDT) From: Michal Simek <michal.simek@xilinx.com> To: u-boot@lists.denx.de, git@xilinx.com Cc: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>, Michal Simek <monstr@monstr.eu>, Simon Glass <sjg@chromium.org>, T Karthik Reddy <t.karthik.reddy@xilinx.com> Subject: [PATCH 2/4] xilinx: zynqmp: use zynqmp_mmio_read() in multi_boot() Date: Wed, 28 Jul 2021 12:51:21 +0200 Message-Id: <b26461aa51d7e88f1dfd2821aa7ba672bc459162.1627469480.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <cover.1627469480.git.michal.simek@xilinx.com> References: <cover.1627469480.git.michal.simek@xilinx.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
xilinx: zynqmp: Add support for dfu_alt_info setup at runtime
|
expand
|
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index eb67116d5b44..1b0356c84c5c 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -346,9 +346,12 @@ int board_early_init_f(void) static int multi_boot(void) { - u32 multiboot; + u32 multiboot = 0; + int ret; - multiboot = readl(&csu_base->multi_boot); + ret = zynqmp_mmio_read((ulong)&csu_base->multi_boot, &multiboot); + if (ret) + return -EINVAL; return multiboot; }
When U-Boot runs in EL2 there is no access to csu_base registers that's why this has to be done via firmware interface to find out multi boot register value. Till now this function is called only from SPL in EL3. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- board/xilinx/zynqmp/zynqmp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)